# HG changeset patch
# User Christophe Lincoln
# Date 1489700944 -3600
# Node ID b043c09b31f0bff7b05194de43564b7474f894e1
# Parent e7d04c8609e29dd113caf591ccdd704d7928bb7e
Better in-pages integration, up some french doc (small, still todo)
diff -r e7d04c8609e2 -r b043c09b31f0 Makefile
--- a/Makefile Thu Mar 16 19:58:06 2017 +0000
+++ b/Makefile Thu Mar 16 22:49:04 2017 +0100
@@ -5,7 +5,7 @@
DESTDIR?=
PACKAGE=tazweb
-VERSION=1.10
+VERSION=1.11
LINGUAS?=$(shell grep -v "^\#" po/LINGUAS)
CC?=gcc
diff -r e7d04c8609e2 -r b043c09b31f0 doc/style.css
--- a/doc/style.css Thu Mar 16 19:58:06 2017 +0000
+++ b/doc/style.css Thu Mar 16 22:49:04 2017 +0100
@@ -1,7 +1,7 @@
/* CSS style for TazWeb */
body { font: 88% sans-serif; margin: 0; }
-h1 { margin: 0; padding: 8px; color: #666; font-size: 20px; }
+h1 { margin: 0; padding: 8px; color: #666; font-size: 20px; text-align: center; }
h2 { color: #666; }
h3 { color: #666; font-size: 140%; }
a:hover { text-decoration: none; }
@@ -27,6 +27,7 @@
text-align: center;
padding: 20px;
border-top: 1px solid #ddd;
+ color: #888;
}
header, main, footer { display: block; } /* for old browsers not fully supported HTML5 */
diff -r e7d04c8609e2 -r b043c09b31f0 doc/tazweb.en.html
--- a/doc/tazweb.en.html Thu Mar 16 19:58:06 2017 +0000
+++ b/doc/tazweb.en.html Thu Mar 16 22:49:04 2017 +0100
@@ -8,7 +8,7 @@
- TazWeb Documentation
+ Documentation
@@ -136,14 +136,14 @@
URL and search entry
-The URL entry in the toolbar lets you enter a website address and shows the current website
-location.
-You can use selection, copy and paste in the URL entry and don't have to put http:// before
-a location, Tazweb will transform URLs for you.
-To activate a new URL you must press ENTER.
+The URL entry in the toolbar lets you enter a website address and shows
+the current website location. You can use selection, copy and paste in the
+URL entry and don't have to put http:// before a location, Tazweb will
+transform URLs for you. To activate a new URL you must press ENTER.
-The search entry lets you search the web at any time using Google.
-Just enter your query and press ENTER or click on the entry icon to validate your request.
+The search entry lets you search the web at any time using DuckDuck go.
+Just enter your query and press ENTER or click on the entry icon to
+validate your request.
Web applications
diff -r e7d04c8609e2 -r b043c09b31f0 doc/tazweb.fr.html
--- a/doc/tazweb.fr.html Thu Mar 16 19:58:06 2017 +0000
+++ b/doc/tazweb.fr.html Thu Mar 16 22:49:04 2017 +0100
@@ -8,55 +8,64 @@
- Documentation TazWeb
+ Documentation
-Le navigateur Web de SliTaz
+Navigateur TazWeb
-Tazweb est un navigateur radicalement simple et léger avec une seule fenêtre sans menus ni
-onglets, mais une barre d'outils très simple.
-La navigation se fait avec le clic droit de la souris, à n'importe quel endroit de la fanêtre ou
-de la barre d'outils.
-Le mode plein écran et cette documentation sont également accessible sur le côté droit de la barre
-d'outils.
+Tazweb est un navigateur radicalement simple et léger avec une seule
+fenêtre sans menus ni onglets, mais une barre d'outils très simple.
+La navigation se fait avec le clic droit de la souris, à n'importe quel
+endroit de la fanêtre ou de la barre d'outils. Cette documentation est
+également accessible via le menu contextuel.
-Le Navigateur Web SliTaz a été crée pour les besoins de TazPanel qui est l'outil d'aministration
-et de gestion de paquets pour SliTaz.
-L'interface utilisateur utilise les dernières technologies comme HTML 5 et CSS 3.
-Le contenu est alimenté par des scripts CGI et utilise le serveur HTTP de Busybox.
+Le Navigateur Web SliTaz a été crée pour les besoins de TazPanel qui
+est l'outil d'aministration et de gestion de paquets pour SliTaz. L'interface
+utilisateur utilise les dernières technologies comme HTML 5 et CSS 3.
+Le contenu est alimenté par des scripts CGI et utilise le serveur HTTP
+de Busybox.
-Le navigateur est léger, très léger, le binaire pèse à peu près 17Ko.
-Il utilise Webkit comme moteur de rendu HTML, qui supporte les derniers standards du Web tels que
-le Javascript.
+Le navigateur est léger, très léger, le binaire pèse à peu près 30Ko.
+Il utilise Webkit comme moteur de rendu HTML, qui supporte les derniers
+standards du Web tels que le Javascript.
Page d'acceuil et URL
La page d'acceuil est définie dans le code source et ne peut être modifiée.
-Il s'agit de la page d'acceuil « SliTaz WebHome ».
-Mais Tazweb accepte aussi les URLs comme arguments.
-Par exemple http://www.slitaz.org.
-De cette façon vous pouvez créer votre propre page d'acceuil en HTML et démarrer Tazweb avec un
-fichier .desktop ou depuis la ligne de commande.
-Comme ceci :
+Il s'agit de la page d'acceuil « SliTaz WebHome ». Mais Tazweb accepte aussi
+les URLs comme arguments. De cette façon vous pouvez créer votre propre page
+d'acceuil en HTML et démarrer Tazweb avec un fichier .desktop ou depuis la
+ligne de commande. Comme ceci :
tazweb file://$HOME/fichier.html
-Si vous souhaitez personnaliser la page d'acceuil de votre Live CD ou des autres utilisateurs,
-vous pouvez créer votre propre paquet slitaz-configs ou éditer le fichier
-/usr/share/webhome/index.html.
-Si vous modifiez ce fichier, assurez-vous d'en faire une copie ou bloquez la mise à jour du paquet
-slitaz-configs car vos modifications seront écrassées si vous faites une mise à jour des
-paquets.
+Si vous souhaitez personnaliser la page d'acceuil de votre Live CD ou des
+autres utilisateurs, vous pouvez créer votre propre paquet slitaz-configs ou
+éditer le fichier: /usr/share/webhome/index.html. Si vous modifiez ce fichier,
+assurez-vous d'en faire une copie ou bloquez la mise à jour du paquet
+slitaz-configs car vos modifications seront écrassées si vous faites une mise
+à jour des paquets.
+
+URL et recherche
+
+La boîte d'URL de la barre d'outils permet d'entrer l'adresse d'un site
+internet et montre l'emplacement du site actuel. Vous pouvez utiliser la
+séléction, copier/coller et vous avez pas besoin de mettre http:// devant
+l'adresse du site. Pour activer un nouvel URL, il faut presser sur ENTER
+
+La boîte de recherche permet de lancer un recherche sécurisée via le service
+DuckDuck Go. Entrez votre recharger et pressez sur ENTER ou cliquez sur
+l'icon de la boîte de recherche pour lancer la requête.
Applications Web
-Le navigateur TazWeb est parfait pour lancer des applications via un fichier .desktop.
-Une fois crée avec un simple éditeur de textes, le fichier .desktop peut être posé sur le bureau ou
-dans le menu avec une jolie icône.
+
Le navigateur TazWeb est parfait pour lancer des applications via un fichier
+.desktop. Une fois crée avec un simple éditeur de textes, le fichier .desktop
+peut être posé sur le bureau ou dans le menu avec une jolie icône.
Voici un exemple de lanceur pour une application Web :
@@ -64,7 +73,7 @@
Type=Application
Name=SliTaz SCN
Icon=slitaz-menu
-Exec=tazweb http://scn.slitaz.org/
+Exec=tazweb --notoolbar http://scn.slitaz.org/
diff -r e7d04c8609e2 -r b043c09b31f0 lib/helper.sh
--- a/lib/helper.sh Thu Mar 16 19:58:06 2017 +0000
+++ b/lib/helper.sh Thu Mar 16 22:49:04 2017 +0100
@@ -61,7 +61,7 @@
html_bookmarks() {
{
html_header "$(gettext 'Bookmarks')"
- echo ''
+ echo ''
IFS="|"
while read title url null; do
diff -r e7d04c8609e2 -r b043c09b31f0 po/de.po
--- a/po/de.po Thu Mar 16 19:58:06 2017 +0000
+++ b/po/de.po Thu Mar 16 22:49:04 2017 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: TazWeb 1.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-16 13:23+0100\n"
+"POT-Creation-Date: 2017-03-16 22:47+0100\n"
"PO-Revision-Date: 2016-09-22 21:35+0100\n"
"Last-Translator: Hans-Günter Theisgen\n"
"Language-Team: German\n"
@@ -18,73 +18,73 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: src/tazweb.c:314 lib/helper.sh:68
+#: src/tazweb.c:313 lib/helper.sh:63
#, fuzzy
msgid "Bookmarks"
msgstr "Lesezeichen hinzufügen"
-#: src/tazweb.c:322
+#: src/tazweb.c:321
msgid "Add a bookmark"
msgstr "Lesezeichen hinzufügen"
-#: src/tazweb.c:329
+#: src/tazweb.c:328
#, fuzzy
msgid "Edit bookmarks"
msgstr "Lesezeichen hinzufügen"
-#: src/tazweb.c:341
+#: src/tazweb.c:340
msgid "Print this page"
msgstr "Diese Seite drucken"
-#: src/tazweb.c:348
+#: src/tazweb.c:347
msgid "View source mode"
msgstr "Seitenquelltext anzeigen"
-#: src/tazweb.c:360
+#: src/tazweb.c:359
msgid "View cookies"
msgstr ""
-#: src/tazweb.c:366
+#: src/tazweb.c:365
msgid "Clean all cookies"
msgstr ""
-#: src/tazweb.c:378
+#: src/tazweb.c:377
msgid "TazWeb manual"
msgstr "TazWeb-Handbuch"
-#: src/tazweb.c:385
+#: src/tazweb.c:384
msgid "Quit TazWeb"
msgstr "TazWeb beenden"
-#: lib/helper.sh:79
+#: lib/helper.sh:74
#, fuzzy
msgid "%d bookmark"
msgid_plural "%d bookmarks"
msgstr[0] "Lesezeichen hinzufügen"
msgstr[1] "Lesezeichen hinzufügen"
-#: lib/helper.sh:91
+#: lib/helper.sh:87
#, fuzzy
msgid "TazWeb Bookmarks"
msgstr "Lesezeichen hinzufügen"
-#: lib/helper.sh:93
+#: lib/helper.sh:88
msgid "Click on a value to edit - Right click to remove a bookmark"
msgstr ""
-#: lib/helper.sh:100
+#: lib/helper.sh:96
msgid "Title"
msgstr ""
-#: lib/helper.sh:101
+#: lib/helper.sh:97
msgid "URL"
msgstr ""
-#: lib/helper.sh:119
+#: lib/helper.sh:115
msgid "Cookies"
msgstr ""
-#: lib/helper.sh:130
+#: lib/helper.sh:124
msgid "%d cookie"
msgid_plural "%d cookies"
msgstr[0] ""
diff -r e7d04c8609e2 -r b043c09b31f0 po/fr.po
--- a/po/fr.po Thu Mar 16 19:58:06 2017 +0000
+++ b/po/fr.po Thu Mar 16 22:49:04 2017 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: TazWeb 1.6.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-16 13:23+0100\n"
+"POT-Creation-Date: 2017-03-16 22:47+0100\n"
"PO-Revision-Date: 2017-03-16 14:40+0100\n"
"Last-Translator: Christophe Lincoln \n"
"Language-Team: French\n"
@@ -18,69 +18,69 @@
"X-Generator: Poedit 1.8.6\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: src/tazweb.c:314 lib/helper.sh:68
+#: src/tazweb.c:313 lib/helper.sh:63
msgid "Bookmarks"
msgstr "Marque pages"
-#: src/tazweb.c:322
+#: src/tazweb.c:321
msgid "Add a bookmark"
msgstr "Marquer cette page"
-#: src/tazweb.c:329
+#: src/tazweb.c:328
msgid "Edit bookmarks"
msgstr "Éditer les marques pages"
-#: src/tazweb.c:341
+#: src/tazweb.c:340
msgid "Print this page"
msgstr "Imprimer cette page"
-#: src/tazweb.c:348
+#: src/tazweb.c:347
msgid "View source mode"
msgstr "Code source de la page"
-#: src/tazweb.c:360
+#: src/tazweb.c:359
msgid "View cookies"
msgstr "Voir les cookies"
-#: src/tazweb.c:366
+#: src/tazweb.c:365
msgid "Clean all cookies"
msgstr "Nettoyer les cookies"
-#: src/tazweb.c:378
+#: src/tazweb.c:377
msgid "TazWeb manual"
msgstr "Manuel de TazWeb"
-#: src/tazweb.c:385
+#: src/tazweb.c:384
msgid "Quit TazWeb"
msgstr "Quitter TazWeb"
-#: lib/helper.sh:79
+#: lib/helper.sh:74
msgid "%d bookmark"
msgid_plural "%d bookmarks"
msgstr[0] "%d marque page"
msgstr[1] "%d marques pages"
-#: lib/helper.sh:91
+#: lib/helper.sh:87
msgid "TazWeb Bookmarks"
msgstr "Marque pages TazWeb"
-#: lib/helper.sh:93
+#: lib/helper.sh:88
msgid "Click on a value to edit - Right click to remove a bookmark"
msgstr "Cliquer sur une valeur pour la modifier - Clique droite pour supprimer"
-#: lib/helper.sh:100
+#: lib/helper.sh:96
msgid "Title"
msgstr "Titre"
-#: lib/helper.sh:101
+#: lib/helper.sh:97
msgid "URL"
msgstr "URL"
-#: lib/helper.sh:119
+#: lib/helper.sh:115
msgid "Cookies"
msgstr "Cookies"
-#: lib/helper.sh:130
+#: lib/helper.sh:124
msgid "%d cookie"
msgid_plural "%d cookies"
msgstr[0] "%d cookie"
diff -r e7d04c8609e2 -r b043c09b31f0 po/ja.po
--- a/po/ja.po Thu Mar 16 19:58:06 2017 +0000
+++ b/po/ja.po Thu Mar 16 22:49:04 2017 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: TazWeb 1.10\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-16 13:23+0100\n"
+"POT-Creation-Date: 2017-03-16 22:47+0100\n"
"PO-Revision-Date: 2017-01-05 22:46+0900\n"
"Last-Translator: BALLOON a.k.a. Fu-sen. (Keiichi SHIGA) \n"
@@ -19,72 +19,72 @@
"X-Generator: Poedit 1.8.7.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: src/tazweb.c:314 lib/helper.sh:68
+#: src/tazweb.c:313 lib/helper.sh:63
#, fuzzy
msgid "Bookmarks"
msgstr "ブックマークへ追加"
-#: src/tazweb.c:322
+#: src/tazweb.c:321
msgid "Add a bookmark"
msgstr "ブックマークへ追加"
-#: src/tazweb.c:329
+#: src/tazweb.c:328
#, fuzzy
msgid "Edit bookmarks"
msgstr "ブックマークへ追加"
-#: src/tazweb.c:341
+#: src/tazweb.c:340
msgid "Print this page"
msgstr "このページを印刷"
-#: src/tazweb.c:348
+#: src/tazweb.c:347
msgid "View source mode"
msgstr "ソースモードで表示"
-#: src/tazweb.c:360
+#: src/tazweb.c:359
msgid "View cookies"
msgstr ""
-#: src/tazweb.c:366
+#: src/tazweb.c:365
msgid "Clean all cookies"
msgstr ""
-#: src/tazweb.c:378
+#: src/tazweb.c:377
msgid "TazWeb manual"
msgstr "TazWeb マニュアル"
-#: src/tazweb.c:385
+#: src/tazweb.c:384
msgid "Quit TazWeb"
msgstr "TazWeb を終了"
-#: lib/helper.sh:79
+#: lib/helper.sh:74
#, fuzzy
msgid "%d bookmark"
msgid_plural "%d bookmarks"
msgstr[0] "ブックマークへ追加"
-#: lib/helper.sh:91
+#: lib/helper.sh:87
#, fuzzy
msgid "TazWeb Bookmarks"
msgstr "ブックマークへ追加"
-#: lib/helper.sh:93
+#: lib/helper.sh:88
msgid "Click on a value to edit - Right click to remove a bookmark"
msgstr ""
-#: lib/helper.sh:100
+#: lib/helper.sh:96
msgid "Title"
msgstr ""
-#: lib/helper.sh:101
+#: lib/helper.sh:97
msgid "URL"
msgstr ""
-#: lib/helper.sh:119
+#: lib/helper.sh:115
msgid "Cookies"
msgstr ""
-#: lib/helper.sh:130
+#: lib/helper.sh:124
msgid "%d cookie"
msgid_plural "%d cookies"
msgstr[0] ""
diff -r e7d04c8609e2 -r b043c09b31f0 po/pt_BR.po
--- a/po/pt_BR.po Thu Mar 16 19:58:06 2017 +0000
+++ b/po/pt_BR.po Thu Mar 16 22:49:04 2017 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: TazWeb 1.6.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-16 13:23+0100\n"
+"POT-Creation-Date: 2017-03-16 22:47+0100\n"
"PO-Revision-Date: 2014-01-14 21:27+0300\n"
"Last-Translator: Claudinei Pereira \n"
"Language-Team: Portuguese (Brasilian)\n"
@@ -17,73 +17,73 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: src/tazweb.c:314 lib/helper.sh:68
+#: src/tazweb.c:313 lib/helper.sh:63
#, fuzzy
msgid "Bookmarks"
msgstr "Adicionar aos favoritos"
-#: src/tazweb.c:322
+#: src/tazweb.c:321
msgid "Add a bookmark"
msgstr "Adicionar aos favoritos"
-#: src/tazweb.c:329
+#: src/tazweb.c:328
#, fuzzy
msgid "Edit bookmarks"
msgstr "Adicionar aos favoritos"
-#: src/tazweb.c:341
+#: src/tazweb.c:340
msgid "Print this page"
msgstr "Imprimir esta página"
-#: src/tazweb.c:348
+#: src/tazweb.c:347
msgid "View source mode"
msgstr "Código-fonte"
-#: src/tazweb.c:360
+#: src/tazweb.c:359
msgid "View cookies"
msgstr ""
-#: src/tazweb.c:366
+#: src/tazweb.c:365
msgid "Clean all cookies"
msgstr ""
-#: src/tazweb.c:378
+#: src/tazweb.c:377
msgid "TazWeb manual"
msgstr "Manual do TazWeb"
-#: src/tazweb.c:385
+#: src/tazweb.c:384
msgid "Quit TazWeb"
msgstr "Sair do Tazweb"
-#: lib/helper.sh:79
+#: lib/helper.sh:74
#, fuzzy
msgid "%d bookmark"
msgid_plural "%d bookmarks"
msgstr[0] "Adicionar aos favoritos"
msgstr[1] "Adicionar aos favoritos"
-#: lib/helper.sh:91
+#: lib/helper.sh:87
#, fuzzy
msgid "TazWeb Bookmarks"
msgstr "Adicionar aos favoritos"
-#: lib/helper.sh:93
+#: lib/helper.sh:88
msgid "Click on a value to edit - Right click to remove a bookmark"
msgstr ""
-#: lib/helper.sh:100
+#: lib/helper.sh:96
msgid "Title"
msgstr ""
-#: lib/helper.sh:101
+#: lib/helper.sh:97
msgid "URL"
msgstr ""
-#: lib/helper.sh:119
+#: lib/helper.sh:115
msgid "Cookies"
msgstr ""
-#: lib/helper.sh:130
+#: lib/helper.sh:124
msgid "%d cookie"
msgid_plural "%d cookies"
msgstr[0] ""
diff -r e7d04c8609e2 -r b043c09b31f0 po/ru.po
--- a/po/ru.po Thu Mar 16 19:58:06 2017 +0000
+++ b/po/ru.po Thu Mar 16 22:49:04 2017 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: TazWeb 1.6.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-16 13:23+0100\n"
+"POT-Creation-Date: 2017-03-16 22:47+0100\n"
"PO-Revision-Date: 2017-03-15 05:29+0200\n"
"Last-Translator: Aleksej Bobylev \n"
"Language-Team: Russian\n"
@@ -19,71 +19,71 @@
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: src/tazweb.c:314 lib/helper.sh:68
+#: src/tazweb.c:313 lib/helper.sh:63
msgid "Bookmarks"
msgstr "Закладки"
-#: src/tazweb.c:322
+#: src/tazweb.c:321
msgid "Add a bookmark"
msgstr "Добавить закладку"
-#: src/tazweb.c:329
+#: src/tazweb.c:328
msgid "Edit bookmarks"
msgstr "Правка закладок"
-#: src/tazweb.c:341
+#: src/tazweb.c:340
msgid "Print this page"
msgstr "Печать страницы"
-#: src/tazweb.c:348
+#: src/tazweb.c:347
msgid "View source mode"
msgstr "Исходный код"
-#: src/tazweb.c:360
+#: src/tazweb.c:359
msgid "View cookies"
msgstr "Просмотр куки"
-#: src/tazweb.c:366
+#: src/tazweb.c:365
msgid "Clean all cookies"
msgstr "Очистить все куки"
-#: src/tazweb.c:378
+#: src/tazweb.c:377
msgid "TazWeb manual"
msgstr "Руководство TazWeb"
-#: src/tazweb.c:385
+#: src/tazweb.c:384
msgid "Quit TazWeb"
msgstr "Закрыть TazWeb"
-#: lib/helper.sh:79
+#: lib/helper.sh:74
msgid "%d bookmark"
msgid_plural "%d bookmarks"
msgstr[0] "%d закладка"
msgstr[1] "%d закладки"
msgstr[2] "%d закладок"
-#: lib/helper.sh:91
+#: lib/helper.sh:87
#, fuzzy
msgid "TazWeb Bookmarks"
msgstr "Закладки"
-#: lib/helper.sh:93
+#: lib/helper.sh:88
msgid "Click on a value to edit - Right click to remove a bookmark"
msgstr ""
-#: lib/helper.sh:100
+#: lib/helper.sh:96
msgid "Title"
msgstr ""
-#: lib/helper.sh:101
+#: lib/helper.sh:97
msgid "URL"
msgstr ""
-#: lib/helper.sh:119
+#: lib/helper.sh:115
msgid "Cookies"
msgstr "Куки"
-#: lib/helper.sh:130
+#: lib/helper.sh:124
msgid "%d cookie"
msgid_plural "%d cookies"
msgstr[0] "%d куки"
diff -r e7d04c8609e2 -r b043c09b31f0 po/tazweb.pot
--- a/po/tazweb.pot Thu Mar 16 19:58:06 2017 +0000
+++ b/po/tazweb.pot Thu Mar 16 22:49:04 2017 +0100
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: TazWeb 1.10\n"
+"Project-Id-Version: TazWeb 1.11\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-16 13:23+0100\n"
+"POT-Creation-Date: 2017-03-16 22:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,69 +18,69 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: src/tazweb.c:314 lib/helper.sh:68
+#: src/tazweb.c:313 lib/helper.sh:63
msgid "Bookmarks"
msgstr ""
-#: src/tazweb.c:322
+#: src/tazweb.c:321
msgid "Add a bookmark"
msgstr ""
-#: src/tazweb.c:329
+#: src/tazweb.c:328
msgid "Edit bookmarks"
msgstr ""
-#: src/tazweb.c:341
+#: src/tazweb.c:340
msgid "Print this page"
msgstr ""
-#: src/tazweb.c:348
+#: src/tazweb.c:347
msgid "View source mode"
msgstr ""
-#: src/tazweb.c:360
+#: src/tazweb.c:359
msgid "View cookies"
msgstr ""
-#: src/tazweb.c:366
+#: src/tazweb.c:365
msgid "Clean all cookies"
msgstr ""
-#: src/tazweb.c:378
+#: src/tazweb.c:377
msgid "TazWeb manual"
msgstr ""
-#: src/tazweb.c:385
+#: src/tazweb.c:384
msgid "Quit TazWeb"
msgstr ""
-#: lib/helper.sh:79
+#: lib/helper.sh:74
msgid "%d bookmark"
msgid_plural "%d bookmarks"
msgstr[0] ""
msgstr[1] ""
-#: lib/helper.sh:91
+#: lib/helper.sh:87
msgid "TazWeb Bookmarks"
msgstr ""
-#: lib/helper.sh:93
+#: lib/helper.sh:88
msgid "Click on a value to edit - Right click to remove a bookmark"
msgstr ""
-#: lib/helper.sh:100
+#: lib/helper.sh:96
msgid "Title"
msgstr ""
-#: lib/helper.sh:101
+#: lib/helper.sh:97
msgid "URL"
msgstr ""
-#: lib/helper.sh:119
+#: lib/helper.sh:115
msgid "Cookies"
msgstr ""
-#: lib/helper.sh:130
+#: lib/helper.sh:124
msgid "%d cookie"
msgid_plural "%d cookies"
msgstr[0] ""
diff -r e7d04c8609e2 -r b043c09b31f0 po/vi.po
--- a/po/vi.po Thu Mar 16 19:58:06 2017 +0000
+++ b/po/vi.po Thu Mar 16 22:49:04 2017 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: TazWeb 1.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-16 13:23+0100\n"
+"POT-Creation-Date: 2017-03-16 22:47+0100\n"
"PO-Revision-Date: 2016-10-04 17:50+0200\n"
"Last-Translator: tuananh88c25 \n"
"Language-Team: \n"
@@ -16,73 +16,73 @@
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/tazweb.c:314 lib/helper.sh:68
+#: src/tazweb.c:313 lib/helper.sh:63
#, fuzzy
msgid "Bookmarks"
msgstr "Thêm dấu trang"
-#: src/tazweb.c:322
+#: src/tazweb.c:321
msgid "Add a bookmark"
msgstr "Thêm dấu trang"
-#: src/tazweb.c:329
+#: src/tazweb.c:328
#, fuzzy
msgid "Edit bookmarks"
msgstr "Thêm dấu trang"
-#: src/tazweb.c:341
+#: src/tazweb.c:340
msgid "Print this page"
msgstr "In trang này"
-#: src/tazweb.c:348
+#: src/tazweb.c:347
msgid "View source mode"
msgstr "Xem nguồn trang"
-#: src/tazweb.c:360
+#: src/tazweb.c:359
msgid "View cookies"
msgstr ""
-#: src/tazweb.c:366
+#: src/tazweb.c:365
msgid "Clean all cookies"
msgstr ""
-#: src/tazweb.c:378
+#: src/tazweb.c:377
msgid "TazWeb manual"
msgstr "Hướng dẫn TazWeb"
-#: src/tazweb.c:385
+#: src/tazweb.c:384
msgid "Quit TazWeb"
msgstr "Thoát TazWeb"
-#: lib/helper.sh:79
+#: lib/helper.sh:74
#, fuzzy
msgid "%d bookmark"
msgid_plural "%d bookmarks"
msgstr[0] "Thêm dấu trang"
msgstr[1] "Thêm dấu trang"
-#: lib/helper.sh:91
+#: lib/helper.sh:87
#, fuzzy
msgid "TazWeb Bookmarks"
msgstr "Thêm dấu trang"
-#: lib/helper.sh:93
+#: lib/helper.sh:88
msgid "Click on a value to edit - Right click to remove a bookmark"
msgstr ""
-#: lib/helper.sh:100
+#: lib/helper.sh:96
msgid "Title"
msgstr ""
-#: lib/helper.sh:101
+#: lib/helper.sh:97
msgid "URL"
msgstr ""
-#: lib/helper.sh:119
+#: lib/helper.sh:115
msgid "Cookies"
msgstr ""
-#: lib/helper.sh:130
+#: lib/helper.sh:124
msgid "%d cookie"
msgid_plural "%d cookies"
msgstr[0] ""
diff -r e7d04c8609e2 -r b043c09b31f0 po/zh_CN.po
--- a/po/zh_CN.po Thu Mar 16 19:58:06 2017 +0000
+++ b/po/zh_CN.po Thu Mar 16 22:49:04 2017 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: TazWeb 1.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-16 13:23+0100\n"
+"POT-Creation-Date: 2017-03-16 22:47+0100\n"
"PO-Revision-Date: 2014-07-02 13:12+0800\n"
"Last-Translator: rhsky \n"
"Language-Team: \n"
@@ -18,72 +18,72 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 1.6.5\n"
-#: src/tazweb.c:314 lib/helper.sh:68
+#: src/tazweb.c:313 lib/helper.sh:63
#, fuzzy
msgid "Bookmarks"
msgstr "添加书签"
-#: src/tazweb.c:322
+#: src/tazweb.c:321
msgid "Add a bookmark"
msgstr "添加书签"
-#: src/tazweb.c:329
+#: src/tazweb.c:328
#, fuzzy
msgid "Edit bookmarks"
msgstr "添加书签"
-#: src/tazweb.c:341
+#: src/tazweb.c:340
msgid "Print this page"
msgstr "打印本页"
-#: src/tazweb.c:348
+#: src/tazweb.c:347
msgid "View source mode"
msgstr "源代码查看"
-#: src/tazweb.c:360
+#: src/tazweb.c:359
msgid "View cookies"
msgstr ""
-#: src/tazweb.c:366
+#: src/tazweb.c:365
msgid "Clean all cookies"
msgstr ""
-#: src/tazweb.c:378
+#: src/tazweb.c:377
msgid "TazWeb manual"
msgstr "TazWeb 使用手册"
-#: src/tazweb.c:385
+#: src/tazweb.c:384
msgid "Quit TazWeb"
msgstr "退出 TazWeb"
-#: lib/helper.sh:79
+#: lib/helper.sh:74
#, fuzzy
msgid "%d bookmark"
msgid_plural "%d bookmarks"
msgstr[0] "添加书签"
-#: lib/helper.sh:91
+#: lib/helper.sh:87
#, fuzzy
msgid "TazWeb Bookmarks"
msgstr "添加书签"
-#: lib/helper.sh:93
+#: lib/helper.sh:88
msgid "Click on a value to edit - Right click to remove a bookmark"
msgstr ""
-#: lib/helper.sh:100
+#: lib/helper.sh:96
msgid "Title"
msgstr ""
-#: lib/helper.sh:101
+#: lib/helper.sh:97
msgid "URL"
msgstr ""
-#: lib/helper.sh:119
+#: lib/helper.sh:115
msgid "Cookies"
msgstr ""
-#: lib/helper.sh:130
+#: lib/helper.sh:124
msgid "%d cookie"
msgid_plural "%d cookies"
msgstr[0] ""
diff -r e7d04c8609e2 -r b043c09b31f0 po/zh_TW.po
--- a/po/zh_TW.po Thu Mar 16 19:58:06 2017 +0000
+++ b/po/zh_TW.po Thu Mar 16 22:49:04 2017 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: TazWeb 1.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-16 13:23+0100\n"
+"POT-Creation-Date: 2017-03-16 22:47+0100\n"
"PO-Revision-Date: 2014-06-05 15:05+0800\n"
"Last-Translator: lunglungyu \n"
"Language-Team: Traditional Chinese\n"
@@ -16,73 +16,73 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/tazweb.c:314 lib/helper.sh:68
+#: src/tazweb.c:313 lib/helper.sh:63
#, fuzzy
msgid "Bookmarks"
msgstr "加入書簽"
-#: src/tazweb.c:322
+#: src/tazweb.c:321
msgid "Add a bookmark"
msgstr "加入書簽"
-#: src/tazweb.c:329
+#: src/tazweb.c:328
#, fuzzy
msgid "Edit bookmarks"
msgstr "加入書簽"
-#: src/tazweb.c:341
+#: src/tazweb.c:340
msgid "Print this page"
msgstr "列印本頁"
-#: src/tazweb.c:348
+#: src/tazweb.c:347
msgid "View source mode"
msgstr "源代碼檢視模式"
-#: src/tazweb.c:360
+#: src/tazweb.c:359
msgid "View cookies"
msgstr ""
-#: src/tazweb.c:366
+#: src/tazweb.c:365
msgid "Clean all cookies"
msgstr ""
-#: src/tazweb.c:378
+#: src/tazweb.c:377
msgid "TazWeb manual"
msgstr "TazWeb 手冊"
-#: src/tazweb.c:385
+#: src/tazweb.c:384
msgid "Quit TazWeb"
msgstr "離開 TazWeb"
-#: lib/helper.sh:79
+#: lib/helper.sh:74
#, fuzzy
msgid "%d bookmark"
msgid_plural "%d bookmarks"
msgstr[0] "加入書簽"
msgstr[1] "加入書簽"
-#: lib/helper.sh:91
+#: lib/helper.sh:87
#, fuzzy
msgid "TazWeb Bookmarks"
msgstr "加入書簽"
-#: lib/helper.sh:93
+#: lib/helper.sh:88
msgid "Click on a value to edit - Right click to remove a bookmark"
msgstr ""
-#: lib/helper.sh:100
+#: lib/helper.sh:96
msgid "Title"
msgstr ""
-#: lib/helper.sh:101
+#: lib/helper.sh:97
msgid "URL"
msgstr ""
-#: lib/helper.sh:119
+#: lib/helper.sh:115
msgid "Cookies"
msgstr ""
-#: lib/helper.sh:130
+#: lib/helper.sh:124
msgid "%d cookie"
msgid_plural "%d cookies"
msgstr[0] ""
diff -r e7d04c8609e2 -r b043c09b31f0 src/tazweb-ng.c
--- a/src/tazweb-ng.c Thu Mar 16 19:58:06 2017 +0000
+++ b/src/tazweb-ng.c Thu Mar 16 22:49:04 2017 +0100
@@ -408,7 +408,7 @@
/* Bookmarks button */
ttb->bookmarks = gtk_tool_button_new_from_stock(GTK_STOCK_PROPERTIES);
- //gtk_widget_set_tooltip_text(GTK_WIDGET(item), "Bookmarks");
+ gtk_widget_set_tooltip_text(GTK_WIDGET(item), "Bookmarks");
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), ttb->bookmarks, -1);
g_signal_connect(G_OBJECT(ttb->bookmarks), "clicked",
G_CALLBACK(go_bookmarks_cb), ttb);
diff -r e7d04c8609e2 -r b043c09b31f0 src/tazweb.c
--- a/src/tazweb.c Thu Mar 16 19:58:06 2017 +0000
+++ b/src/tazweb.c Thu Mar 16 22:49:04 2017 +0100
@@ -19,7 +19,6 @@
#define HOME g_get_home_dir()
#define CONFIG g_strdup_printf("%s/.config/tazweb", HOME)
-#define BMTXT g_strdup_printf("%s/bookmarks.txt", CONFIG)
#define BOOKMARKS g_strdup_printf("%s/bookmarks.txt", CONFIG)
#define COOKIES g_strdup_printf("%s/cookies.txt", CONFIG)
#define DOWNLOADS g_strdup_printf("%s/Downloads", HOME)
@@ -638,7 +637,7 @@
gtk_init(NULL, NULL);
/* Get a default bookmarks.txt if missing */
- if (! g_file_test(BMTXT, G_FILE_TEST_EXISTS)) {
+ if (! g_file_test(BOOKMARKS, G_FILE_TEST_EXISTS)) {
system("install -m 0700 -d $HOME/.config/tazweb");
system("install -m 0600 /usr/share/tazweb/bookmarks.txt \
$HOME/.config/tazweb/bookmarks.txt");