From 2889c878353059c3020e838142394d4a0d2c8dfd Mon Sep 17 00:00:00 2001 From: mensonge Date: Thu, 17 Apr 2008 09:33:26 +0000 Subject: [PATCH] Interface design: help added to use relations between tags git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@110 b3834d28-1941-0410-a4f8-b48e95affb8f --- locales/fr_FR/LC_MESSAGES/messages.mo | Bin 19276 -> 19476 bytes locales/fr_FR/LC_MESSAGES/messages.po | 25 ++++++++++++++++--------- locales/messages.po | 25 +++++++++++++++++-------- templates/tag2tagadd.tpl.php | 9 +++++++++ 4 files changed, 42 insertions(+), 17 deletions(-) diff --git a/locales/fr_FR/LC_MESSAGES/messages.mo b/locales/fr_FR/LC_MESSAGES/messages.mo index bcc2e5673bc24e1b4bc058dbf366ff357b3b1dd3..ad1ca3a37d2cc9028f4b95c97624dc335ceb1e83 100644 GIT binary patch delta 4832 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 Mb=#Vsb))P5076+Lv;Y7A delta 4643 zcmYk<3vg7`9mnyLkOUIQCL6Nh5%Pj0!0rOUAXI1|fDsUgi3}iwhcGqKba>lVpq)$7 zM9afySV09fYE%&M0l@$&AR>xsilLTBvGN)_3NxhGDN#zD>G!wyFykHm`#Ion&M9XSVXP z6yLzv*w<%F1+K(sJc|i<0ej#z>rcoKj)|i;z0n5~F&CMG8HIetjKgj?)4BlrP_ICJ zz6yi58HeE!^y0rT9wT}g6N?Er0Q(?oF$L&hd{aUphlYjN9cxivsK>#$9b@n~Dk-h_ zFn)#QSkl{=V%(2fX$-T|#8NN{2O@8oAgZ4tRHmn40^^&9DCi5TQ3Gs1rS@5j!?#c! z9Yl3-7&XvwRL7@LpX)#^;D&uay02UJp%$2h)i?>&PYXJl$tem$u>&1ARd|SoJgmk5HlZeR z9(9PmLG9TU)aQRftvDskooE&+W5ZB;egYfu@g#i_UfyI?!&b7xU|{w?Zr@vJHmlTcgfLuJ4T zQqW3oN6mZ=YHurW06k zEW|OF+=97^deHoc>Zk{^Qf7SCG;0njbwf}cjzFcf2-!tbiu(RC)Ig75F4o%mZq#$- zAjata|D1wS(vJG#Ra6E#Q5~3URs->hEiuga1MGTg-mw zc`_T-e-)-PzS&4YE7*nVxY_!tZ9juiw10yf4|5p{FqUNv!bzyxcRA_|HQ;3Y0q?*< z_T!hh2BUF5K8T0V=|UlwUSiOX+*xKgW@0gt1hWjgVF-CdnCCFu5$g6jWZTcl4Wb;fGho@;CO#bacx@-SD5N!_|Sx zU<9MZVmwA-FO0*!r~z|O6D&Y&(f9!Q*97jPL3>zbt;4R=x1$DbL`~!%z8+!Bcc`t{ zJcOqo?nPy8JRj17XaTOmRX7X3MQ!z19vYh9Vbp`_ghRnY;Vde(m+c!-d2V|OazmIL z)PyD@cc3XjWnv{N6YEf0wI0>ao2X2lz%l6Md8`4aViQFlcXDy0XoCw_z)upRZi@6n5qx4R~z7L<$m+LYTUG}BOy znpxUNHzV0Nj(Q2I{Yg}ZPa}7Z*@;?F8*+=AE2ynZ80G$$rK1ME2a|CT>Nfl>>Z~+j zwhl#`ZMcs7Vw$91xQA;f(qxKpG(L*jf}^Mve}?M#3(UpuFgyWndSxgbbykL>COQK( zp(U7s4mvsn4HUGpUDo%poq8+ka5XZz2H0)=0+oUPqEgwP6Q;XoD00xv7@UcfsEK}v zK5VgGz~0n5$B=(LND|14Cg4MLl#5zvJ}$s9sMEd;)!|NDjC)ZN@bNg*Lb6czcM#`d z9;%;>s7!^BHJP2Z{Zaw>*B7qPkcu6s3B>Ur_hTe zqqC5Tns6bizhczDWypbU6+DD-VnuuE2-L`%& zYOCg;GPxKvfmNt8P-W|lsMPPl06Hxc^o35;gQhFXQ%8Q(7xPgA&P1hn9;RUhR$?vc z^Vd)*zJa~aGr^reE>5OC0{h_~@He>4ecv&O6Wu?h(oricMx}7Btvjd=H(~}hqEdPc zqp%It@oBsV|BX7F6Yk`P2P?4xU$Vv)xm&m*tiydsL5J`oh43qX6kw$-m*JztJR*VI~hR{_*{Em2$ zc#6=qhq#}3pU|ZzimvBe!mnOl?;{QoAGuFC{tBQ{P5g@JPSg`Qgq|=9IIP5yCLdi)\n" "Language-Team: fr-FR \n" "MIME-Version: 1.0\n" @@ -99,7 +99,7 @@ msgstr "Ajouter signet" msgid "You must be logged in before you can add bookmarks." msgstr "Vous devez être authentifié avant de pouvoir ajouter des signets." -#: ../../../bookmarks.php:216 +#: ../../../bookmarks.php:218 msgid "My Bookmarks" msgstr "Mes signets" @@ -230,7 +230,7 @@ msgid "Recent Bookmarks" msgstr "Signets récents" #: ../../../jsScuttle.php:22 -#: ../../../templates/tag2tagadd.tpl.php:12 +#: ../../../templates/tag2tagadd.tpl.php:21 #: ../../../templates/tag2tagdelete.tpl.php:13 #: ../../../templates/tag2tagedit.tpl.php:14 #: ../../../templates/tag2tagedit.tpl.php:35 @@ -591,7 +591,7 @@ msgid "Update" msgstr "Mettre à jour" #: ../../../templates/bookmarkcommondescriptionedit.tpl.php:40 -#: ../../../templates/tag2tagadd.tpl.php:15 +#: ../../../templates/tag2tagadd.tpl.php:24 #: ../../../templates/tag2tagedit.tpl.php:38 #: ../../../templates/tagcommondescriptionedit.tpl.php:33 #: ../../../templates/tagrename.tpl.php:25 @@ -711,10 +711,12 @@ msgid "Comma-separated" msgstr "Séparés par des virgules" #: ../../../templates/editbookmark.tpl.php:50 +#: ../../../templates/tag2tagadd.tpl.php:9 msgid "Note: use \">\" to include one tag in another. e.g.: europe>france>paris" msgstr "Note: utiliser \">\" pour inclure un tag dans un autre. ex: europe>france>paris" #: ../../../templates/editbookmark.tpl.php:54 +#: ../../../templates/tag2tagadd.tpl.php:8 msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry" msgstr "Note : utiliser \"=\" pour rendre deux tags synonymes ex: europe=eu" @@ -1041,22 +1043,27 @@ msgstr "Editer un lien" msgid "Synonyms:" msgstr "Synonymes :" -#: ../../../templates/tag2tagadd.tpl.php:6 +#: ../../../templates/tag2tagadd.tpl.php:10 +#, php-format +msgid "Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into the menu box" +msgstr "Note inclure une tag dans le tag '%s' (e.g. %s>countries) affiche ce tag dans la boîte de menu" + +#: ../../../templates/tag2tagadd.tpl.php:13 msgid "Create new link:" msgstr "Créer un nouveau lien" -#: ../../../templates/tag2tagadd.tpl.php:14 +#: ../../../templates/tag2tagadd.tpl.php:23 #: ../../../templates/tag2tagedit.tpl.php:37 msgid "Create" msgstr "Créer" -#: ../../../templates/tag2tagadd.tpl.php:26 +#: ../../../templates/tag2tagadd.tpl.php:35 #: ../../../templates/tag2tagdelete.tpl.php:27 #: ../../../templates/tag2tagedit.tpl.php:51 msgid "Existing links:" msgstr "Liens existants :" -#: ../../../templates/tag2tagadd.tpl.php:44 +#: ../../../templates/tag2tagadd.tpl.php:53 #: ../../../templates/tag2tagdelete.tpl.php:45 #: ../../../templates/tag2tagedit.tpl.php:69 msgid "No links" diff --git a/locales/messages.po b/locales/messages.po index 3628932..e932292 100644 --- a/locales/messages.po +++ b/locales/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-17 10:03+0200\n" +"POT-Creation-Date: 2008-04-17 11:29+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -86,7 +86,7 @@ msgstr "" msgid "You must be logged in before you can add bookmarks." msgstr "" -#: ../../../bookmarks.php:216 +#: ../../../bookmarks.php:218 msgid "My Bookmarks" msgstr "" @@ -211,7 +211,7 @@ msgstr "" msgid "Recent Bookmarks" msgstr "" -#: ../../../jsScuttle.php:22 ../../../templates/tag2tagadd.tpl.php:12 +#: ../../../jsScuttle.php:22 ../../../templates/tag2tagadd.tpl.php:21 #: ../../../templates/tag2tagdelete.tpl.php:13 #: ../../../templates/tag2tagedit.tpl.php:14 #: ../../../templates/tag2tagedit.tpl.php:35 @@ -573,7 +573,7 @@ msgid "Update" msgstr "" #: ../../../templates/bookmarkcommondescriptionedit.tpl.php:40 -#: ../../../templates/tag2tagadd.tpl.php:15 +#: ../../../templates/tag2tagadd.tpl.php:24 #: ../../../templates/tag2tagedit.tpl.php:38 #: ../../../templates/tagcommondescriptionedit.tpl.php:33 #: ../../../templates/tagrename.tpl.php:25 @@ -692,11 +692,13 @@ msgid "Comma-separated" msgstr "" #: ../../../templates/editbookmark.tpl.php:50 +#: ../../../templates/tag2tagadd.tpl.php:9 msgid "" "Note: use \">\" to include one tag in another. e.g.: europe>france>paris" msgstr "" #: ../../../templates/editbookmark.tpl.php:54 +#: ../../../templates/tag2tagadd.tpl.php:8 msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry" msgstr "" @@ -1036,22 +1038,29 @@ msgstr "" msgid "Synonyms:" msgstr "" -#: ../../../templates/tag2tagadd.tpl.php:6 +#: ../../../templates/tag2tagadd.tpl.php:10 +#, php-format +msgid "" +"Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into " +"the menu box" +msgstr "" + +#: ../../../templates/tag2tagadd.tpl.php:13 msgid "Create new link:" msgstr "" -#: ../../../templates/tag2tagadd.tpl.php:14 +#: ../../../templates/tag2tagadd.tpl.php:23 #: ../../../templates/tag2tagedit.tpl.php:37 msgid "Create" msgstr "" -#: ../../../templates/tag2tagadd.tpl.php:26 +#: ../../../templates/tag2tagadd.tpl.php:35 #: ../../../templates/tag2tagdelete.tpl.php:27 #: ../../../templates/tag2tagedit.tpl.php:51 msgid "Existing links:" msgstr "" -#: ../../../templates/tag2tagadd.tpl.php:44 +#: ../../../templates/tag2tagadd.tpl.php:53 #: ../../../templates/tag2tagdelete.tpl.php:45 #: ../../../templates/tag2tagedit.tpl.php:69 msgid "No links" diff --git a/templates/tag2tagadd.tpl.php b/templates/tag2tagadd.tpl.php index cb86a37..84ee31a 100644 --- a/templates/tag2tagadd.tpl.php +++ b/templates/tag2tagadd.tpl.php @@ -3,12 +3,21 @@ $this->includeTemplate($GLOBALS['top_include']); ?>
+ +

+
+" to include one tag in another. e.g.: europe>france>paris')?>
+countries) display the tag into the menu box'), $GLOBALS['menuTag'], $GLOBALS['menuTag'])?> +

+

+ +