tazweb rev 197 1.11
Better in-pages integration, up some french doc (small, still todo)
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Thu Mar 16 22:49:04 2017 +0100 (2017-03-16) |
| parents | e7d04c8609e2 |
| children | d50f2a6a3e58 |
| files | Makefile doc/style.css doc/tazweb.en.html doc/tazweb.fr.html lib/helper.sh po/de.po po/fr.po po/ja.po po/pt_BR.po po/ru.po po/tazweb.pot po/vi.po po/zh_CN.po po/zh_TW.po src/tazweb-ng.c src/tazweb.c |
line diff
1.1 --- a/Makefile Thu Mar 16 19:58:06 2017 +0000 1.2 +++ b/Makefile Thu Mar 16 22:49:04 2017 +0100 1.3 @@ -5,7 +5,7 @@ 1.4 DESTDIR?= 1.5 1.6 PACKAGE=tazweb 1.7 -VERSION=1.10 1.8 +VERSION=1.11 1.9 LINGUAS?=$(shell grep -v "^\#" po/LINGUAS) 1.10 1.11 CC?=gcc
2.1 --- a/doc/style.css Thu Mar 16 19:58:06 2017 +0000 2.2 +++ b/doc/style.css Thu Mar 16 22:49:04 2017 +0100 2.3 @@ -1,7 +1,7 @@ 2.4 /* CSS style for TazWeb */ 2.5 2.6 body { font: 88% sans-serif; margin: 0; } 2.7 -h1 { margin: 0; padding: 8px; color: #666; font-size: 20px; } 2.8 +h1 { margin: 0; padding: 8px; color: #666; font-size: 20px; text-align: center; } 2.9 h2 { color: #666; } 2.10 h3 { color: #666; font-size: 140%; } 2.11 a:hover { text-decoration: none; } 2.12 @@ -27,6 +27,7 @@ 2.13 text-align: center; 2.14 padding: 20px; 2.15 border-top: 1px solid #ddd; 2.16 + color: #888; 2.17 } 2.18 2.19 header, main, footer { display: block; } /* for old browsers not fully supported HTML5 */
3.1 --- a/doc/tazweb.en.html Thu Mar 16 19:58:06 2017 +0000 3.2 +++ b/doc/tazweb.en.html Thu Mar 16 22:49:04 2017 +0100 3.3 @@ -8,7 +8,7 @@ 3.4 <body> 3.5 3.6 <header> 3.7 - <h1>TazWeb Documentation</h1> 3.8 + <h1>Documentation</h1> 3.9 </header> 3.10 3.11 <main> 3.12 @@ -136,14 +136,14 @@ 3.13 3.14 <h3>URL and search entry</h3> 3.15 3.16 -<p>The URL entry in the toolbar lets you enter a website address and shows the current website 3.17 -location. 3.18 -You can use selection, copy and paste in the URL entry and don't have to put http:// before 3.19 -a location, Tazweb will transform URLs for you. 3.20 -To activate a new URL you must press ENTER.</p> 3.21 +<p>The URL entry in the toolbar lets you enter a website address and shows 3.22 +the current website location. You can use selection, copy and paste in the 3.23 +URL entry and don't have to put http:// before a location, Tazweb will 3.24 +transform URLs for you. To activate a new URL you must press ENTER.</p> 3.25 3.26 -<p>The search entry lets you search the web at any time using Google. 3.27 -Just enter your query and press ENTER or click on the entry icon to validate your request.</p> 3.28 +<p>The search entry lets you search the web at any time using DuckDuck go. 3.29 +Just enter your query and press ENTER or click on the entry icon to 3.30 +validate your request.</p> 3.31 3.32 3.33 <h3>Web applications</h3>
4.1 --- a/doc/tazweb.fr.html Thu Mar 16 19:58:06 2017 +0000 4.2 +++ b/doc/tazweb.fr.html Thu Mar 16 22:49:04 2017 +0100 4.3 @@ -8,55 +8,64 @@ 4.4 <body> 4.5 4.6 <header> 4.7 - <h1>Documentation TazWeb</h1> 4.8 + <h1>Documentation</h1> 4.9 </header> 4.10 4.11 <main> 4.12 4.13 -<h2>Le navigateur Web de SliTaz</h2> 4.14 +<h2>Navigateur TazWeb</h2> 4.15 4.16 -<p>Tazweb est un navigateur radicalement simple et léger avec une seule fenêtre sans menus ni 4.17 -onglets, mais une barre d'outils très simple. 4.18 -La navigation se fait avec le clic droit de la souris, à n'importe quel endroit de la fanêtre ou 4.19 -de la barre d'outils. 4.20 -Le mode plein écran et cette documentation sont également accessible sur le côté droit de la barre 4.21 -d'outils.</p> 4.22 +<p>Tazweb est un navigateur radicalement simple et léger avec une seule 4.23 +fenêtre sans menus ni onglets, mais une barre d'outils très simple. 4.24 +La navigation se fait avec le clic droit de la souris, à n'importe quel 4.25 +endroit de la fanêtre ou de la barre d'outils. Cette documentation est 4.26 +également accessible via le menu contextuel.</p> 4.27 4.28 -<p>Le Navigateur Web SliTaz a été crée pour les besoins de TazPanel qui est l'outil d'aministration 4.29 -et de gestion de paquets pour SliTaz. 4.30 -L'interface utilisateur utilise les dernières technologies comme HTML 5 et CSS 3. 4.31 -Le contenu est alimenté par des scripts CGI et utilise le serveur HTTP de Busybox.</p> 4.32 +<p>Le Navigateur Web SliTaz a été crée pour les besoins de TazPanel qui 4.33 +est l'outil d'aministration et de gestion de paquets pour SliTaz. L'interface 4.34 +utilisateur utilise les dernières technologies comme HTML 5 et CSS 3. 4.35 +Le contenu est alimenté par des scripts CGI et utilise le serveur HTTP 4.36 +de Busybox.</p> 4.37 4.38 -<p>Le navigateur est léger, très léger, le binaire pèse à peu près 17Ko. 4.39 -Il utilise Webkit comme moteur de rendu HTML, qui supporte les derniers standards du Web tels que 4.40 -le Javascript.</p> 4.41 +<p>Le navigateur est léger, très léger, le binaire pèse à peu près 30Ko. 4.42 +Il utilise Webkit comme moteur de rendu HTML, qui supporte les derniers 4.43 +standards du Web tels que le Javascript.</p> 4.44 4.45 4.46 <h3>Page d'acceuil et URL</h3> 4.47 4.48 <p>La page d'acceuil est définie dans le code source et ne peut être modifiée. 4.49 -Il s'agit de la page d'acceuil « SliTaz WebHome ».<br> 4.50 -Mais Tazweb accepte aussi les URLs comme arguments. 4.51 -Par exemple http://www.slitaz.org.<br> 4.52 -De cette façon vous pouvez créer votre propre page d'acceuil en HTML et démarrer Tazweb avec un 4.53 -fichier .desktop ou depuis la ligne de commande.<br> 4.54 -Comme ceci :</p> 4.55 +Il s'agit de la page d'acceuil « SliTaz WebHome ». Mais Tazweb accepte aussi 4.56 +les URLs comme arguments. De cette façon vous pouvez créer votre propre page 4.57 +d'acceuil en HTML et démarrer Tazweb avec un fichier .desktop ou depuis la 4.58 +ligne de commande. Comme ceci :</p> 4.59 4.60 <pre>tazweb file://$HOME/fichier.html</pre> 4.61 4.62 -<p>Si vous souhaitez personnaliser la page d'acceuil de votre Live CD ou des autres utilisateurs, 4.63 -vous pouvez créer votre propre paquet slitaz-configs ou éditer le fichier 4.64 -/usr/share/webhome/index.html.<br> 4.65 -Si vous modifiez ce fichier, assurez-vous d'en faire une copie ou bloquez la mise à jour du paquet 4.66 -slitaz-configs car vos modifications seront écrassées si vous faites une mise à jour des 4.67 -paquets.</p> 4.68 +<p>Si vous souhaitez personnaliser la page d'acceuil de votre Live CD ou des 4.69 +autres utilisateurs, vous pouvez créer votre propre paquet slitaz-configs ou 4.70 +éditer le fichier: /usr/share/webhome/index.html. Si vous modifiez ce fichier, 4.71 +assurez-vous d'en faire une copie ou bloquez la mise à jour du paquet 4.72 +slitaz-configs car vos modifications seront écrassées si vous faites une mise 4.73 +à jour des paquets.</p> 4.74 + 4.75 +<h3>URL et recherche</h3> 4.76 + 4.77 +<p>La boîte d'URL de la barre d'outils permet d'entrer l'adresse d'un site 4.78 +internet et montre l'emplacement du site actuel. Vous pouvez utiliser la 4.79 +séléction, copier/coller et vous avez pas besoin de mettre http:// devant 4.80 +l'adresse du site. Pour activer un nouvel URL, il faut presser sur ENTER</p> 4.81 + 4.82 +<p>La boîte de recherche permet de lancer un recherche sécurisée via le service 4.83 +DuckDuck Go. Entrez votre recharger et pressez sur ENTER ou cliquez sur 4.84 +l'icon de la boîte de recherche pour lancer la requête.</p> 4.85 4.86 4.87 <h3>Applications Web</h3> 4.88 4.89 -<p>Le navigateur TazWeb est parfait pour lancer des applications via un fichier .desktop. 4.90 -Une fois crée avec un simple éditeur de textes, le fichier .desktop peut être posé sur le bureau ou 4.91 -dans le menu avec une jolie icône. 4.92 +<p>Le navigateur TazWeb est parfait pour lancer des applications via un fichier 4.93 +.desktop. Une fois crée avec un simple éditeur de textes, le fichier .desktop 4.94 +peut être posé sur le bureau ou dans le menu avec une jolie icône. 4.95 Voici un exemple de lanceur pour une application Web :</p> 4.96 4.97 <pre> 4.98 @@ -64,7 +73,7 @@ 4.99 Type=Application 4.100 Name=SliTaz SCN 4.101 Icon=slitaz-menu 4.102 -Exec=tazweb http://scn.slitaz.org/ 4.103 +Exec=tazweb --notoolbar http://scn.slitaz.org/ 4.104 </pre> 4.105 4.106 </main>
5.1 --- a/lib/helper.sh Thu Mar 16 19:58:06 2017 +0000 5.2 +++ b/lib/helper.sh Thu Mar 16 22:49:04 2017 +0100 5.3 @@ -61,7 +61,7 @@ 5.4 html_bookmarks() { 5.5 { 5.6 html_header "$(gettext 'Bookmarks')" 5.7 - echo '<ul>' 5.8 + echo '<ul style="list-style-type: none;">' 5.9 5.10 IFS="|" 5.11 while read title url null; do
6.1 --- a/po/de.po Thu Mar 16 19:58:06 2017 +0000 6.2 +++ b/po/de.po Thu Mar 16 22:49:04 2017 +0100 6.3 @@ -8,7 +8,7 @@ 6.4 msgstr "" 6.5 "Project-Id-Version: TazWeb 1.8\n" 6.6 "Report-Msgid-Bugs-To: \n" 6.7 -"POT-Creation-Date: 2017-03-16 13:23+0100\n" 6.8 +"POT-Creation-Date: 2017-03-16 22:47+0100\n" 6.9 "PO-Revision-Date: 2016-09-22 21:35+0100\n" 6.10 "Last-Translator: Hans-Günter Theisgen\n" 6.11 "Language-Team: German\n" 6.12 @@ -18,73 +18,73 @@ 6.13 "Content-Transfer-Encoding: 8bit\n" 6.14 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 6.15 6.16 -#: src/tazweb.c:314 lib/helper.sh:68 6.17 +#: src/tazweb.c:313 lib/helper.sh:63 6.18 #, fuzzy 6.19 msgid "Bookmarks" 6.20 msgstr "Lesezeichen hinzufügen" 6.21 6.22 -#: src/tazweb.c:322 6.23 +#: src/tazweb.c:321 6.24 msgid "Add a bookmark" 6.25 msgstr "Lesezeichen hinzufügen" 6.26 6.27 -#: src/tazweb.c:329 6.28 +#: src/tazweb.c:328 6.29 #, fuzzy 6.30 msgid "Edit bookmarks" 6.31 msgstr "Lesezeichen hinzufügen" 6.32 6.33 -#: src/tazweb.c:341 6.34 +#: src/tazweb.c:340 6.35 msgid "Print this page" 6.36 msgstr "Diese Seite drucken" 6.37 6.38 -#: src/tazweb.c:348 6.39 +#: src/tazweb.c:347 6.40 msgid "View source mode" 6.41 msgstr "Seitenquelltext anzeigen" 6.42 6.43 -#: src/tazweb.c:360 6.44 +#: src/tazweb.c:359 6.45 msgid "View cookies" 6.46 msgstr "" 6.47 6.48 -#: src/tazweb.c:366 6.49 +#: src/tazweb.c:365 6.50 msgid "Clean all cookies" 6.51 msgstr "" 6.52 6.53 -#: src/tazweb.c:378 6.54 +#: src/tazweb.c:377 6.55 msgid "TazWeb manual" 6.56 msgstr "TazWeb-Handbuch" 6.57 6.58 -#: src/tazweb.c:385 6.59 +#: src/tazweb.c:384 6.60 msgid "Quit TazWeb" 6.61 msgstr "TazWeb beenden" 6.62 6.63 -#: lib/helper.sh:79 6.64 +#: lib/helper.sh:74 6.65 #, fuzzy 6.66 msgid "%d bookmark" 6.67 msgid_plural "%d bookmarks" 6.68 msgstr[0] "Lesezeichen hinzufügen" 6.69 msgstr[1] "Lesezeichen hinzufügen" 6.70 6.71 -#: lib/helper.sh:91 6.72 +#: lib/helper.sh:87 6.73 #, fuzzy 6.74 msgid "TazWeb Bookmarks" 6.75 msgstr "Lesezeichen hinzufügen" 6.76 6.77 -#: lib/helper.sh:93 6.78 +#: lib/helper.sh:88 6.79 msgid "Click on a value to edit - Right click to remove a bookmark" 6.80 msgstr "" 6.81 6.82 -#: lib/helper.sh:100 6.83 +#: lib/helper.sh:96 6.84 msgid "Title" 6.85 msgstr "" 6.86 6.87 -#: lib/helper.sh:101 6.88 +#: lib/helper.sh:97 6.89 msgid "URL" 6.90 msgstr "" 6.91 6.92 -#: lib/helper.sh:119 6.93 +#: lib/helper.sh:115 6.94 msgid "Cookies" 6.95 msgstr "" 6.96 6.97 -#: lib/helper.sh:130 6.98 +#: lib/helper.sh:124 6.99 msgid "%d cookie" 6.100 msgid_plural "%d cookies" 6.101 msgstr[0] ""
7.1 --- a/po/fr.po Thu Mar 16 19:58:06 2017 +0000 7.2 +++ b/po/fr.po Thu Mar 16 22:49:04 2017 +0100 7.3 @@ -7,7 +7,7 @@ 7.4 msgstr "" 7.5 "Project-Id-Version: TazWeb 1.6.4\n" 7.6 "Report-Msgid-Bugs-To: \n" 7.7 -"POT-Creation-Date: 2017-03-16 13:23+0100\n" 7.8 +"POT-Creation-Date: 2017-03-16 22:47+0100\n" 7.9 "PO-Revision-Date: 2017-03-16 14:40+0100\n" 7.10 "Last-Translator: Christophe Lincoln <pankso@slitaz.org>\n" 7.11 "Language-Team: French\n" 7.12 @@ -18,69 +18,69 @@ 7.13 "X-Generator: Poedit 1.8.6\n" 7.14 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 7.15 7.16 -#: src/tazweb.c:314 lib/helper.sh:68 7.17 +#: src/tazweb.c:313 lib/helper.sh:63 7.18 msgid "Bookmarks" 7.19 msgstr "Marque pages" 7.20 7.21 -#: src/tazweb.c:322 7.22 +#: src/tazweb.c:321 7.23 msgid "Add a bookmark" 7.24 msgstr "Marquer cette page" 7.25 7.26 -#: src/tazweb.c:329 7.27 +#: src/tazweb.c:328 7.28 msgid "Edit bookmarks" 7.29 msgstr "Éditer les marques pages" 7.30 7.31 -#: src/tazweb.c:341 7.32 +#: src/tazweb.c:340 7.33 msgid "Print this page" 7.34 msgstr "Imprimer cette page" 7.35 7.36 -#: src/tazweb.c:348 7.37 +#: src/tazweb.c:347 7.38 msgid "View source mode" 7.39 msgstr "Code source de la page" 7.40 7.41 -#: src/tazweb.c:360 7.42 +#: src/tazweb.c:359 7.43 msgid "View cookies" 7.44 msgstr "Voir les cookies" 7.45 7.46 -#: src/tazweb.c:366 7.47 +#: src/tazweb.c:365 7.48 msgid "Clean all cookies" 7.49 msgstr "Nettoyer les cookies" 7.50 7.51 -#: src/tazweb.c:378 7.52 +#: src/tazweb.c:377 7.53 msgid "TazWeb manual" 7.54 msgstr "Manuel de TazWeb" 7.55 7.56 -#: src/tazweb.c:385 7.57 +#: src/tazweb.c:384 7.58 msgid "Quit TazWeb" 7.59 msgstr "Quitter TazWeb" 7.60 7.61 -#: lib/helper.sh:79 7.62 +#: lib/helper.sh:74 7.63 msgid "%d bookmark" 7.64 msgid_plural "%d bookmarks" 7.65 msgstr[0] "%d marque page" 7.66 msgstr[1] "%d marques pages" 7.67 7.68 -#: lib/helper.sh:91 7.69 +#: lib/helper.sh:87 7.70 msgid "TazWeb Bookmarks" 7.71 msgstr "Marque pages TazWeb" 7.72 7.73 -#: lib/helper.sh:93 7.74 +#: lib/helper.sh:88 7.75 msgid "Click on a value to edit - Right click to remove a bookmark" 7.76 msgstr "Cliquer sur une valeur pour la modifier - Clique droite pour supprimer" 7.77 7.78 -#: lib/helper.sh:100 7.79 +#: lib/helper.sh:96 7.80 msgid "Title" 7.81 msgstr "Titre" 7.82 7.83 -#: lib/helper.sh:101 7.84 +#: lib/helper.sh:97 7.85 msgid "URL" 7.86 msgstr "URL" 7.87 7.88 -#: lib/helper.sh:119 7.89 +#: lib/helper.sh:115 7.90 msgid "Cookies" 7.91 msgstr "Cookies" 7.92 7.93 -#: lib/helper.sh:130 7.94 +#: lib/helper.sh:124 7.95 msgid "%d cookie" 7.96 msgid_plural "%d cookies" 7.97 msgstr[0] "%d cookie"
8.1 --- a/po/ja.po Thu Mar 16 19:58:06 2017 +0000 8.2 +++ b/po/ja.po Thu Mar 16 22:49:04 2017 +0100 8.3 @@ -7,7 +7,7 @@ 8.4 msgstr "" 8.5 "Project-Id-Version: TazWeb 1.10\n" 8.6 "Report-Msgid-Bugs-To: \n" 8.7 -"POT-Creation-Date: 2017-03-16 13:23+0100\n" 8.8 +"POT-Creation-Date: 2017-03-16 22:47+0100\n" 8.9 "PO-Revision-Date: 2017-01-05 22:46+0900\n" 8.10 "Last-Translator: BALLOON a.k.a. Fu-sen. (Keiichi SHIGA) <balloonakafusen AT " 8.11 "gmail DOT com>\n" 8.12 @@ -19,72 +19,72 @@ 8.13 "X-Generator: Poedit 1.8.7.1\n" 8.14 "Plural-Forms: nplurals=1; plural=0;\n" 8.15 8.16 -#: src/tazweb.c:314 lib/helper.sh:68 8.17 +#: src/tazweb.c:313 lib/helper.sh:63 8.18 #, fuzzy 8.19 msgid "Bookmarks" 8.20 msgstr "ブックマークへ追加" 8.21 8.22 -#: src/tazweb.c:322 8.23 +#: src/tazweb.c:321 8.24 msgid "Add a bookmark" 8.25 msgstr "ブックマークへ追加" 8.26 8.27 -#: src/tazweb.c:329 8.28 +#: src/tazweb.c:328 8.29 #, fuzzy 8.30 msgid "Edit bookmarks" 8.31 msgstr "ブックマークへ追加" 8.32 8.33 -#: src/tazweb.c:341 8.34 +#: src/tazweb.c:340 8.35 msgid "Print this page" 8.36 msgstr "このページを印刷" 8.37 8.38 -#: src/tazweb.c:348 8.39 +#: src/tazweb.c:347 8.40 msgid "View source mode" 8.41 msgstr "ソースモードで表示" 8.42 8.43 -#: src/tazweb.c:360 8.44 +#: src/tazweb.c:359 8.45 msgid "View cookies" 8.46 msgstr "" 8.47 8.48 -#: src/tazweb.c:366 8.49 +#: src/tazweb.c:365 8.50 msgid "Clean all cookies" 8.51 msgstr "" 8.52 8.53 -#: src/tazweb.c:378 8.54 +#: src/tazweb.c:377 8.55 msgid "TazWeb manual" 8.56 msgstr "TazWeb マニュアル" 8.57 8.58 -#: src/tazweb.c:385 8.59 +#: src/tazweb.c:384 8.60 msgid "Quit TazWeb" 8.61 msgstr "TazWeb を終了" 8.62 8.63 -#: lib/helper.sh:79 8.64 +#: lib/helper.sh:74 8.65 #, fuzzy 8.66 msgid "%d bookmark" 8.67 msgid_plural "%d bookmarks" 8.68 msgstr[0] "ブックマークへ追加" 8.69 8.70 -#: lib/helper.sh:91 8.71 +#: lib/helper.sh:87 8.72 #, fuzzy 8.73 msgid "TazWeb Bookmarks" 8.74 msgstr "ブックマークへ追加" 8.75 8.76 -#: lib/helper.sh:93 8.77 +#: lib/helper.sh:88 8.78 msgid "Click on a value to edit - Right click to remove a bookmark" 8.79 msgstr "" 8.80 8.81 -#: lib/helper.sh:100 8.82 +#: lib/helper.sh:96 8.83 msgid "Title" 8.84 msgstr "" 8.85 8.86 -#: lib/helper.sh:101 8.87 +#: lib/helper.sh:97 8.88 msgid "URL" 8.89 msgstr "" 8.90 8.91 -#: lib/helper.sh:119 8.92 +#: lib/helper.sh:115 8.93 msgid "Cookies" 8.94 msgstr "" 8.95 8.96 -#: lib/helper.sh:130 8.97 +#: lib/helper.sh:124 8.98 msgid "%d cookie" 8.99 msgid_plural "%d cookies" 8.100 msgstr[0] ""
9.1 --- a/po/pt_BR.po Thu Mar 16 19:58:06 2017 +0000 9.2 +++ b/po/pt_BR.po Thu Mar 16 22:49:04 2017 +0100 9.3 @@ -7,7 +7,7 @@ 9.4 msgstr "" 9.5 "Project-Id-Version: TazWeb 1.6.4\n" 9.6 "Report-Msgid-Bugs-To: \n" 9.7 -"POT-Creation-Date: 2017-03-16 13:23+0100\n" 9.8 +"POT-Creation-Date: 2017-03-16 22:47+0100\n" 9.9 "PO-Revision-Date: 2014-01-14 21:27+0300\n" 9.10 "Last-Translator: Claudinei Pereira <claudinei@slitaz.org>\n" 9.11 "Language-Team: Portuguese (Brasilian)<i18n@slitaz.org>\n" 9.12 @@ -17,73 +17,73 @@ 9.13 "Content-Transfer-Encoding: 8bit\n" 9.14 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 9.15 9.16 -#: src/tazweb.c:314 lib/helper.sh:68 9.17 +#: src/tazweb.c:313 lib/helper.sh:63 9.18 #, fuzzy 9.19 msgid "Bookmarks" 9.20 msgstr "Adicionar aos favoritos" 9.21 9.22 -#: src/tazweb.c:322 9.23 +#: src/tazweb.c:321 9.24 msgid "Add a bookmark" 9.25 msgstr "Adicionar aos favoritos" 9.26 9.27 -#: src/tazweb.c:329 9.28 +#: src/tazweb.c:328 9.29 #, fuzzy 9.30 msgid "Edit bookmarks" 9.31 msgstr "Adicionar aos favoritos" 9.32 9.33 -#: src/tazweb.c:341 9.34 +#: src/tazweb.c:340 9.35 msgid "Print this page" 9.36 msgstr "Imprimir esta página" 9.37 9.38 -#: src/tazweb.c:348 9.39 +#: src/tazweb.c:347 9.40 msgid "View source mode" 9.41 msgstr "Código-fonte" 9.42 9.43 -#: src/tazweb.c:360 9.44 +#: src/tazweb.c:359 9.45 msgid "View cookies" 9.46 msgstr "" 9.47 9.48 -#: src/tazweb.c:366 9.49 +#: src/tazweb.c:365 9.50 msgid "Clean all cookies" 9.51 msgstr "" 9.52 9.53 -#: src/tazweb.c:378 9.54 +#: src/tazweb.c:377 9.55 msgid "TazWeb manual" 9.56 msgstr "Manual do TazWeb" 9.57 9.58 -#: src/tazweb.c:385 9.59 +#: src/tazweb.c:384 9.60 msgid "Quit TazWeb" 9.61 msgstr "Sair do Tazweb" 9.62 9.63 -#: lib/helper.sh:79 9.64 +#: lib/helper.sh:74 9.65 #, fuzzy 9.66 msgid "%d bookmark" 9.67 msgid_plural "%d bookmarks" 9.68 msgstr[0] "Adicionar aos favoritos" 9.69 msgstr[1] "Adicionar aos favoritos" 9.70 9.71 -#: lib/helper.sh:91 9.72 +#: lib/helper.sh:87 9.73 #, fuzzy 9.74 msgid "TazWeb Bookmarks" 9.75 msgstr "Adicionar aos favoritos" 9.76 9.77 -#: lib/helper.sh:93 9.78 +#: lib/helper.sh:88 9.79 msgid "Click on a value to edit - Right click to remove a bookmark" 9.80 msgstr "" 9.81 9.82 -#: lib/helper.sh:100 9.83 +#: lib/helper.sh:96 9.84 msgid "Title" 9.85 msgstr "" 9.86 9.87 -#: lib/helper.sh:101 9.88 +#: lib/helper.sh:97 9.89 msgid "URL" 9.90 msgstr "" 9.91 9.92 -#: lib/helper.sh:119 9.93 +#: lib/helper.sh:115 9.94 msgid "Cookies" 9.95 msgstr "" 9.96 9.97 -#: lib/helper.sh:130 9.98 +#: lib/helper.sh:124 9.99 msgid "%d cookie" 9.100 msgid_plural "%d cookies" 9.101 msgstr[0] ""
10.1 --- a/po/ru.po Thu Mar 16 19:58:06 2017 +0000 10.2 +++ b/po/ru.po Thu Mar 16 22:49:04 2017 +0100 10.3 @@ -7,7 +7,7 @@ 10.4 msgstr "" 10.5 "Project-Id-Version: TazWeb 1.6.4\n" 10.6 "Report-Msgid-Bugs-To: \n" 10.7 -"POT-Creation-Date: 2017-03-16 13:23+0100\n" 10.8 +"POT-Creation-Date: 2017-03-16 22:47+0100\n" 10.9 "PO-Revision-Date: 2017-03-15 05:29+0200\n" 10.10 "Last-Translator: Aleksej Bobylev <al.bobylev@gmail.com>\n" 10.11 "Language-Team: Russian\n" 10.12 @@ -19,71 +19,71 @@ 10.13 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" 10.14 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" 10.15 10.16 -#: src/tazweb.c:314 lib/helper.sh:68 10.17 +#: src/tazweb.c:313 lib/helper.sh:63 10.18 msgid "Bookmarks" 10.19 msgstr "Закладки" 10.20 10.21 -#: src/tazweb.c:322 10.22 +#: src/tazweb.c:321 10.23 msgid "Add a bookmark" 10.24 msgstr "Добавить закладку" 10.25 10.26 -#: src/tazweb.c:329 10.27 +#: src/tazweb.c:328 10.28 msgid "Edit bookmarks" 10.29 msgstr "Правка закладок" 10.30 10.31 -#: src/tazweb.c:341 10.32 +#: src/tazweb.c:340 10.33 msgid "Print this page" 10.34 msgstr "Печать страницы" 10.35 10.36 -#: src/tazweb.c:348 10.37 +#: src/tazweb.c:347 10.38 msgid "View source mode" 10.39 msgstr "Исходный код" 10.40 10.41 -#: src/tazweb.c:360 10.42 +#: src/tazweb.c:359 10.43 msgid "View cookies" 10.44 msgstr "Просмотр куки" 10.45 10.46 -#: src/tazweb.c:366 10.47 +#: src/tazweb.c:365 10.48 msgid "Clean all cookies" 10.49 msgstr "Очистить все куки" 10.50 10.51 -#: src/tazweb.c:378 10.52 +#: src/tazweb.c:377 10.53 msgid "TazWeb manual" 10.54 msgstr "Руководство TazWeb" 10.55 10.56 -#: src/tazweb.c:385 10.57 +#: src/tazweb.c:384 10.58 msgid "Quit TazWeb" 10.59 msgstr "Закрыть TazWeb" 10.60 10.61 -#: lib/helper.sh:79 10.62 +#: lib/helper.sh:74 10.63 msgid "%d bookmark" 10.64 msgid_plural "%d bookmarks" 10.65 msgstr[0] "%d закладка" 10.66 msgstr[1] "%d закладки" 10.67 msgstr[2] "%d закладок" 10.68 10.69 -#: lib/helper.sh:91 10.70 +#: lib/helper.sh:87 10.71 #, fuzzy 10.72 msgid "TazWeb Bookmarks" 10.73 msgstr "Закладки" 10.74 10.75 -#: lib/helper.sh:93 10.76 +#: lib/helper.sh:88 10.77 msgid "Click on a value to edit - Right click to remove a bookmark" 10.78 msgstr "" 10.79 10.80 -#: lib/helper.sh:100 10.81 +#: lib/helper.sh:96 10.82 msgid "Title" 10.83 msgstr "" 10.84 10.85 -#: lib/helper.sh:101 10.86 +#: lib/helper.sh:97 10.87 msgid "URL" 10.88 msgstr "" 10.89 10.90 -#: lib/helper.sh:119 10.91 +#: lib/helper.sh:115 10.92 msgid "Cookies" 10.93 msgstr "Куки" 10.94 10.95 -#: lib/helper.sh:130 10.96 +#: lib/helper.sh:124 10.97 msgid "%d cookie" 10.98 msgid_plural "%d cookies" 10.99 msgstr[0] "%d куки"
11.1 --- a/po/tazweb.pot Thu Mar 16 19:58:06 2017 +0000 11.2 +++ b/po/tazweb.pot Thu Mar 16 22:49:04 2017 +0100 11.3 @@ -6,9 +6,9 @@ 11.4 #, fuzzy 11.5 msgid "" 11.6 msgstr "" 11.7 -"Project-Id-Version: TazWeb 1.10\n" 11.8 +"Project-Id-Version: TazWeb 1.11\n" 11.9 "Report-Msgid-Bugs-To: \n" 11.10 -"POT-Creation-Date: 2017-03-16 13:23+0100\n" 11.11 +"POT-Creation-Date: 2017-03-16 22:47+0100\n" 11.12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 11.13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 11.14 "Language-Team: LANGUAGE <LL@li.org>\n" 11.15 @@ -18,69 +18,69 @@ 11.16 "Content-Transfer-Encoding: 8bit\n" 11.17 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" 11.18 11.19 -#: src/tazweb.c:314 lib/helper.sh:68 11.20 +#: src/tazweb.c:313 lib/helper.sh:63 11.21 msgid "Bookmarks" 11.22 msgstr "" 11.23 11.24 -#: src/tazweb.c:322 11.25 +#: src/tazweb.c:321 11.26 msgid "Add a bookmark" 11.27 msgstr "" 11.28 11.29 -#: src/tazweb.c:329 11.30 +#: src/tazweb.c:328 11.31 msgid "Edit bookmarks" 11.32 msgstr "" 11.33 11.34 -#: src/tazweb.c:341 11.35 +#: src/tazweb.c:340 11.36 msgid "Print this page" 11.37 msgstr "" 11.38 11.39 -#: src/tazweb.c:348 11.40 +#: src/tazweb.c:347 11.41 msgid "View source mode" 11.42 msgstr "" 11.43 11.44 -#: src/tazweb.c:360 11.45 +#: src/tazweb.c:359 11.46 msgid "View cookies" 11.47 msgstr "" 11.48 11.49 -#: src/tazweb.c:366 11.50 +#: src/tazweb.c:365 11.51 msgid "Clean all cookies" 11.52 msgstr "" 11.53 11.54 -#: src/tazweb.c:378 11.55 +#: src/tazweb.c:377 11.56 msgid "TazWeb manual" 11.57 msgstr "" 11.58 11.59 -#: src/tazweb.c:385 11.60 +#: src/tazweb.c:384 11.61 msgid "Quit TazWeb" 11.62 msgstr "" 11.63 11.64 -#: lib/helper.sh:79 11.65 +#: lib/helper.sh:74 11.66 msgid "%d bookmark" 11.67 msgid_plural "%d bookmarks" 11.68 msgstr[0] "" 11.69 msgstr[1] "" 11.70 11.71 -#: lib/helper.sh:91 11.72 +#: lib/helper.sh:87 11.73 msgid "TazWeb Bookmarks" 11.74 msgstr "" 11.75 11.76 -#: lib/helper.sh:93 11.77 +#: lib/helper.sh:88 11.78 msgid "Click on a value to edit - Right click to remove a bookmark" 11.79 msgstr "" 11.80 11.81 -#: lib/helper.sh:100 11.82 +#: lib/helper.sh:96 11.83 msgid "Title" 11.84 msgstr "" 11.85 11.86 -#: lib/helper.sh:101 11.87 +#: lib/helper.sh:97 11.88 msgid "URL" 11.89 msgstr "" 11.90 11.91 -#: lib/helper.sh:119 11.92 +#: lib/helper.sh:115 11.93 msgid "Cookies" 11.94 msgstr "" 11.95 11.96 -#: lib/helper.sh:130 11.97 +#: lib/helper.sh:124 11.98 msgid "%d cookie" 11.99 msgid_plural "%d cookies" 11.100 msgstr[0] ""
12.1 --- a/po/vi.po Thu Mar 16 19:58:06 2017 +0000 12.2 +++ b/po/vi.po Thu Mar 16 22:49:04 2017 +0100 12.3 @@ -7,7 +7,7 @@ 12.4 msgstr "" 12.5 "Project-Id-Version: TazWeb 1.8\n" 12.6 "Report-Msgid-Bugs-To: \n" 12.7 -"POT-Creation-Date: 2017-03-16 13:23+0100\n" 12.8 +"POT-Creation-Date: 2017-03-16 22:47+0100\n" 12.9 "PO-Revision-Date: 2016-10-04 17:50+0200\n" 12.10 "Last-Translator: tuananh88c25 <tuananh88c25@gmail.com>\n" 12.11 "Language-Team: \n" 12.12 @@ -16,73 +16,73 @@ 12.13 "Content-Type: text/plain; charset=utf-8\n" 12.14 "Content-Transfer-Encoding: 8bit\n" 12.15 12.16 -#: src/tazweb.c:314 lib/helper.sh:68 12.17 +#: src/tazweb.c:313 lib/helper.sh:63 12.18 #, fuzzy 12.19 msgid "Bookmarks" 12.20 msgstr "Thêm dấu trang" 12.21 12.22 -#: src/tazweb.c:322 12.23 +#: src/tazweb.c:321 12.24 msgid "Add a bookmark" 12.25 msgstr "Thêm dấu trang" 12.26 12.27 -#: src/tazweb.c:329 12.28 +#: src/tazweb.c:328 12.29 #, fuzzy 12.30 msgid "Edit bookmarks" 12.31 msgstr "Thêm dấu trang" 12.32 12.33 -#: src/tazweb.c:341 12.34 +#: src/tazweb.c:340 12.35 msgid "Print this page" 12.36 msgstr "In trang này" 12.37 12.38 -#: src/tazweb.c:348 12.39 +#: src/tazweb.c:347 12.40 msgid "View source mode" 12.41 msgstr "Xem nguồn trang" 12.42 12.43 -#: src/tazweb.c:360 12.44 +#: src/tazweb.c:359 12.45 msgid "View cookies" 12.46 msgstr "" 12.47 12.48 -#: src/tazweb.c:366 12.49 +#: src/tazweb.c:365 12.50 msgid "Clean all cookies" 12.51 msgstr "" 12.52 12.53 -#: src/tazweb.c:378 12.54 +#: src/tazweb.c:377 12.55 msgid "TazWeb manual" 12.56 msgstr "Hướng dẫn TazWeb" 12.57 12.58 -#: src/tazweb.c:385 12.59 +#: src/tazweb.c:384 12.60 msgid "Quit TazWeb" 12.61 msgstr "Thoát TazWeb" 12.62 12.63 -#: lib/helper.sh:79 12.64 +#: lib/helper.sh:74 12.65 #, fuzzy 12.66 msgid "%d bookmark" 12.67 msgid_plural "%d bookmarks" 12.68 msgstr[0] "Thêm dấu trang" 12.69 msgstr[1] "Thêm dấu trang" 12.70 12.71 -#: lib/helper.sh:91 12.72 +#: lib/helper.sh:87 12.73 #, fuzzy 12.74 msgid "TazWeb Bookmarks" 12.75 msgstr "Thêm dấu trang" 12.76 12.77 -#: lib/helper.sh:93 12.78 +#: lib/helper.sh:88 12.79 msgid "Click on a value to edit - Right click to remove a bookmark" 12.80 msgstr "" 12.81 12.82 -#: lib/helper.sh:100 12.83 +#: lib/helper.sh:96 12.84 msgid "Title" 12.85 msgstr "" 12.86 12.87 -#: lib/helper.sh:101 12.88 +#: lib/helper.sh:97 12.89 msgid "URL" 12.90 msgstr "" 12.91 12.92 -#: lib/helper.sh:119 12.93 +#: lib/helper.sh:115 12.94 msgid "Cookies" 12.95 msgstr "" 12.96 12.97 -#: lib/helper.sh:130 12.98 +#: lib/helper.sh:124 12.99 msgid "%d cookie" 12.100 msgid_plural "%d cookies" 12.101 msgstr[0] ""
13.1 --- a/po/zh_CN.po Thu Mar 16 19:58:06 2017 +0000 13.2 +++ b/po/zh_CN.po Thu Mar 16 22:49:04 2017 +0100 13.3 @@ -7,7 +7,7 @@ 13.4 msgstr "" 13.5 "Project-Id-Version: TazWeb 1.8\n" 13.6 "Report-Msgid-Bugs-To: \n" 13.7 -"POT-Creation-Date: 2017-03-16 13:23+0100\n" 13.8 +"POT-Creation-Date: 2017-03-16 22:47+0100\n" 13.9 "PO-Revision-Date: 2014-07-02 13:12+0800\n" 13.10 "Last-Translator: rhsky <rhsky@qq.com>\n" 13.11 "Language-Team: \n" 13.12 @@ -18,72 +18,72 @@ 13.13 "Plural-Forms: nplurals=1; plural=0;\n" 13.14 "X-Generator: Poedit 1.6.5\n" 13.15 13.16 -#: src/tazweb.c:314 lib/helper.sh:68 13.17 +#: src/tazweb.c:313 lib/helper.sh:63 13.18 #, fuzzy 13.19 msgid "Bookmarks" 13.20 msgstr "添加书签" 13.21 13.22 -#: src/tazweb.c:322 13.23 +#: src/tazweb.c:321 13.24 msgid "Add a bookmark" 13.25 msgstr "添加书签" 13.26 13.27 -#: src/tazweb.c:329 13.28 +#: src/tazweb.c:328 13.29 #, fuzzy 13.30 msgid "Edit bookmarks" 13.31 msgstr "添加书签" 13.32 13.33 -#: src/tazweb.c:341 13.34 +#: src/tazweb.c:340 13.35 msgid "Print this page" 13.36 msgstr "打印本页" 13.37 13.38 -#: src/tazweb.c:348 13.39 +#: src/tazweb.c:347 13.40 msgid "View source mode" 13.41 msgstr "源代码查看" 13.42 13.43 -#: src/tazweb.c:360 13.44 +#: src/tazweb.c:359 13.45 msgid "View cookies" 13.46 msgstr "" 13.47 13.48 -#: src/tazweb.c:366 13.49 +#: src/tazweb.c:365 13.50 msgid "Clean all cookies" 13.51 msgstr "" 13.52 13.53 -#: src/tazweb.c:378 13.54 +#: src/tazweb.c:377 13.55 msgid "TazWeb manual" 13.56 msgstr "TazWeb 使用手册" 13.57 13.58 -#: src/tazweb.c:385 13.59 +#: src/tazweb.c:384 13.60 msgid "Quit TazWeb" 13.61 msgstr "退出 TazWeb" 13.62 13.63 -#: lib/helper.sh:79 13.64 +#: lib/helper.sh:74 13.65 #, fuzzy 13.66 msgid "%d bookmark" 13.67 msgid_plural "%d bookmarks" 13.68 msgstr[0] "添加书签" 13.69 13.70 -#: lib/helper.sh:91 13.71 +#: lib/helper.sh:87 13.72 #, fuzzy 13.73 msgid "TazWeb Bookmarks" 13.74 msgstr "添加书签" 13.75 13.76 -#: lib/helper.sh:93 13.77 +#: lib/helper.sh:88 13.78 msgid "Click on a value to edit - Right click to remove a bookmark" 13.79 msgstr "" 13.80 13.81 -#: lib/helper.sh:100 13.82 +#: lib/helper.sh:96 13.83 msgid "Title" 13.84 msgstr "" 13.85 13.86 -#: lib/helper.sh:101 13.87 +#: lib/helper.sh:97 13.88 msgid "URL" 13.89 msgstr "" 13.90 13.91 -#: lib/helper.sh:119 13.92 +#: lib/helper.sh:115 13.93 msgid "Cookies" 13.94 msgstr "" 13.95 13.96 -#: lib/helper.sh:130 13.97 +#: lib/helper.sh:124 13.98 msgid "%d cookie" 13.99 msgid_plural "%d cookies" 13.100 msgstr[0] ""
14.1 --- a/po/zh_TW.po Thu Mar 16 19:58:06 2017 +0000 14.2 +++ b/po/zh_TW.po Thu Mar 16 22:49:04 2017 +0100 14.3 @@ -7,7 +7,7 @@ 14.4 msgstr "" 14.5 "Project-Id-Version: TazWeb 1.8\n" 14.6 "Report-Msgid-Bugs-To: \n" 14.7 -"POT-Creation-Date: 2017-03-16 13:23+0100\n" 14.8 +"POT-Creation-Date: 2017-03-16 22:47+0100\n" 14.9 "PO-Revision-Date: 2014-06-05 15:05+0800\n" 14.10 "Last-Translator: lunglungyu <lunglungyu2004@gmail.com>\n" 14.11 "Language-Team: Traditional Chinese\n" 14.12 @@ -16,73 +16,73 @@ 14.13 "Content-Type: text/plain; charset=UTF-8\n" 14.14 "Content-Transfer-Encoding: 8bit\n" 14.15 14.16 -#: src/tazweb.c:314 lib/helper.sh:68 14.17 +#: src/tazweb.c:313 lib/helper.sh:63 14.18 #, fuzzy 14.19 msgid "Bookmarks" 14.20 msgstr "加入書簽" 14.21 14.22 -#: src/tazweb.c:322 14.23 +#: src/tazweb.c:321 14.24 msgid "Add a bookmark" 14.25 msgstr "加入書簽" 14.26 14.27 -#: src/tazweb.c:329 14.28 +#: src/tazweb.c:328 14.29 #, fuzzy 14.30 msgid "Edit bookmarks" 14.31 msgstr "加入書簽" 14.32 14.33 -#: src/tazweb.c:341 14.34 +#: src/tazweb.c:340 14.35 msgid "Print this page" 14.36 msgstr "列印本頁" 14.37 14.38 -#: src/tazweb.c:348 14.39 +#: src/tazweb.c:347 14.40 msgid "View source mode" 14.41 msgstr "源代碼檢視模式" 14.42 14.43 -#: src/tazweb.c:360 14.44 +#: src/tazweb.c:359 14.45 msgid "View cookies" 14.46 msgstr "" 14.47 14.48 -#: src/tazweb.c:366 14.49 +#: src/tazweb.c:365 14.50 msgid "Clean all cookies" 14.51 msgstr "" 14.52 14.53 -#: src/tazweb.c:378 14.54 +#: src/tazweb.c:377 14.55 msgid "TazWeb manual" 14.56 msgstr "TazWeb 手冊" 14.57 14.58 -#: src/tazweb.c:385 14.59 +#: src/tazweb.c:384 14.60 msgid "Quit TazWeb" 14.61 msgstr "離開 TazWeb" 14.62 14.63 -#: lib/helper.sh:79 14.64 +#: lib/helper.sh:74 14.65 #, fuzzy 14.66 msgid "%d bookmark" 14.67 msgid_plural "%d bookmarks" 14.68 msgstr[0] "加入書簽" 14.69 msgstr[1] "加入書簽" 14.70 14.71 -#: lib/helper.sh:91 14.72 +#: lib/helper.sh:87 14.73 #, fuzzy 14.74 msgid "TazWeb Bookmarks" 14.75 msgstr "加入書簽" 14.76 14.77 -#: lib/helper.sh:93 14.78 +#: lib/helper.sh:88 14.79 msgid "Click on a value to edit - Right click to remove a bookmark" 14.80 msgstr "" 14.81 14.82 -#: lib/helper.sh:100 14.83 +#: lib/helper.sh:96 14.84 msgid "Title" 14.85 msgstr "" 14.86 14.87 -#: lib/helper.sh:101 14.88 +#: lib/helper.sh:97 14.89 msgid "URL" 14.90 msgstr "" 14.91 14.92 -#: lib/helper.sh:119 14.93 +#: lib/helper.sh:115 14.94 msgid "Cookies" 14.95 msgstr "" 14.96 14.97 -#: lib/helper.sh:130 14.98 +#: lib/helper.sh:124 14.99 msgid "%d cookie" 14.100 msgid_plural "%d cookies" 14.101 msgstr[0] ""
15.1 --- a/src/tazweb-ng.c Thu Mar 16 19:58:06 2017 +0000 15.2 +++ b/src/tazweb-ng.c Thu Mar 16 22:49:04 2017 +0100 15.3 @@ -408,7 +408,7 @@ 15.4 15.5 /* Bookmarks button */ 15.6 ttb->bookmarks = gtk_tool_button_new_from_stock(GTK_STOCK_PROPERTIES); 15.7 - //gtk_widget_set_tooltip_text(GTK_WIDGET(item), "Bookmarks"); 15.8 + gtk_widget_set_tooltip_text(GTK_WIDGET(item), "Bookmarks"); 15.9 gtk_toolbar_insert(GTK_TOOLBAR(toolbar), ttb->bookmarks, -1); 15.10 g_signal_connect(G_OBJECT(ttb->bookmarks), "clicked", 15.11 G_CALLBACK(go_bookmarks_cb), ttb);
16.1 --- a/src/tazweb.c Thu Mar 16 19:58:06 2017 +0000 16.2 +++ b/src/tazweb.c Thu Mar 16 22:49:04 2017 +0100 16.3 @@ -19,7 +19,6 @@ 16.4 16.5 #define HOME g_get_home_dir() 16.6 #define CONFIG g_strdup_printf("%s/.config/tazweb", HOME) 16.7 -#define BMTXT g_strdup_printf("%s/bookmarks.txt", CONFIG) 16.8 #define BOOKMARKS g_strdup_printf("%s/bookmarks.txt", CONFIG) 16.9 #define COOKIES g_strdup_printf("%s/cookies.txt", CONFIG) 16.10 #define DOWNLOADS g_strdup_printf("%s/Downloads", HOME) 16.11 @@ -638,7 +637,7 @@ 16.12 gtk_init(NULL, NULL); 16.13 16.14 /* Get a default bookmarks.txt if missing */ 16.15 - if (! g_file_test(BMTXT, G_FILE_TEST_EXISTS)) { 16.16 + if (! g_file_test(BOOKMARKS, G_FILE_TEST_EXISTS)) { 16.17 system("install -m 0700 -d $HOME/.config/tazweb"); 16.18 system("install -m 0600 /usr/share/tazweb/bookmarks.txt \ 16.19 $HOME/.config/tazweb/bookmarks.txt");