diff options
| -rw-r--r-- | locales/fr_FR/LC_MESSAGES/messages.mo | bin | 18840 -> 18918 bytes | |||
| -rw-r--r-- | locales/fr_FR/LC_MESSAGES/messages.po | 32 | ||||
| -rw-r--r-- | locales/messages.po | 28 | ||||
| -rw-r--r-- | templates/sidebar.block.tagactions.php | 2 | ||||
| -rw-r--r-- | templates/tag2tagedit.tpl.php | 28 |
5 files changed, 50 insertions, 40 deletions
diff --git a/locales/fr_FR/LC_MESSAGES/messages.mo b/locales/fr_FR/LC_MESSAGES/messages.mo Binary files differindex e6ab4ae..2d4eba5 100644 --- a/locales/fr_FR/LC_MESSAGES/messages.mo +++ b/locales/fr_FR/LC_MESSAGES/messages.mo diff --git a/locales/fr_FR/LC_MESSAGES/messages.po b/locales/fr_FR/LC_MESSAGES/messages.po index 3dcaf1c..3c1a96a 100644 --- a/locales/fr_FR/LC_MESSAGES/messages.po +++ b/locales/fr_FR/LC_MESSAGES/messages.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Scuttle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-14 11:27+0100\n" -"PO-Revision-Date: 2008-03-14 11:29+0100\n" +"POT-Creation-Date: 2008-03-14 11:42+0100\n" +"PO-Revision-Date: 2008-03-14 11:43+0100\n" "Last-Translator: BenjaminHKB <benjamin.huynh-kim-bang@loria.fr>\n" "Language-Team: fr-FR <toony.sf@chezouam.net>\n" "MIME-Version: 1.0\n" @@ -232,7 +232,7 @@ msgstr "Signets récents" #: ../../../jsScuttle.php:22 #: ../../../templates/tag2tagadd.tpl.php:12 #: ../../../templates/tag2tagdelete.tpl.php:13 -#: ../../../templates/tag2tagedit.tpl.php:12 +#: ../../../templates/tag2tagedit.tpl.php:14 #: ../../../templates/tag2tagedit.tpl.php:35 #: ../../../templates/tagdelete.tpl.php:6 msgid "Are you sure?" @@ -240,14 +240,14 @@ msgstr "Etes-vous sûr ?" #: ../../../jsScuttle.php:22 #: ../../../templates/tag2tagdelete.tpl.php:15 -#: ../../../templates/tag2tagedit.tpl.php:37 +#: ../../../templates/tag2tagedit.tpl.php:16 #: ../../../templates/tagdelete.tpl.php:8 msgid "Yes" msgstr "Oui" #: ../../../jsScuttle.php:22 #: ../../../templates/tag2tagdelete.tpl.php:16 -#: ../../../templates/tag2tagedit.tpl.php:38 +#: ../../../templates/tag2tagedit.tpl.php:17 #: ../../../templates/tagdelete.tpl.php:9 msgid "No" msgstr "Non" @@ -467,7 +467,7 @@ msgid "Failed to update the tag common description" msgstr "Impossible de mettre à jour la description commune du tag" #: ../../../tagcommondescriptionedit.php:55 -#: ../../../templates/sidebar.block.tagactions.php:25 +#: ../../../templates/sidebar.block.tagactions.php:26 msgid "Edit Tag Common Description" msgstr "Editer la description commune du tag" @@ -480,7 +480,7 @@ msgid "Failed to delete the tag" msgstr "Impossible d'effacer le tag" #: ../../../tagdelete.php:44 -#: ../../../templates/sidebar.block.tagactions.php:22 +#: ../../../templates/sidebar.block.tagactions.php:23 msgid "Delete Tag" msgstr "Supprimer le tag" @@ -588,7 +588,7 @@ msgstr "Mettre à jour" #: ../../../templates/bookmarkcommondescriptionedit.tpl.php:40 #: ../../../templates/tag2tagadd.tpl.php:15 -#: ../../../templates/tag2tagedit.tpl.php:15 +#: ../../../templates/tag2tagedit.tpl.php:38 #: ../../../templates/tagcommondescriptionedit.tpl.php:33 #: ../../../templates/tagrename.tpl.php:25 msgid "Cancel" @@ -981,12 +981,16 @@ msgstr "Dernières recherches" msgid "Number of bookmarks for this query" msgstr "Nombre de signets pour cette recherche" -#: ../../../templates/sidebar.block.tagactions.php:17 +#: ../../../templates/sidebar.block.tagactions.php:18 #: ../../../templates/sidebar.block.watchstatus.php:17 #, fuzzy msgid "Actions" msgstr "Instructions" +#: ../../../templates/sidebar.block.tagactions.php:28 +msgid "Create a link to another tag" +msgstr "Créer un lien vers un autre tag" + #: ../../../templates/sidebar.block.users.php:14 msgid "Last Users" msgstr "Derniers utilisateurs" @@ -1009,7 +1013,7 @@ msgid "Create new link:" msgstr "Créer un nouveau lien" #: ../../../templates/tag2tagadd.tpl.php:14 -#: ../../../templates/tag2tagedit.tpl.php:14 +#: ../../../templates/tag2tagedit.tpl.php:37 msgid "Create" msgstr "Créer" @@ -1026,13 +1030,13 @@ msgid "No links" msgstr "Pas de liens" #: ../../../templates/tag2tagedit.tpl.php:6 -msgid "Create new link" -msgstr "Créer un nouveau lien" - -#: ../../../templates/tag2tagedit.tpl.php:27 msgid "Delete the link" msgstr "Supprimer le lien" +#: ../../../templates/tag2tagedit.tpl.php:29 +msgid "Create new link" +msgstr "Créer un nouveau lien" + #: ../../../templates/tagrename.tpl.php:12 msgid "Old" msgstr "Ancien" diff --git a/locales/messages.po b/locales/messages.po index 4a1c074..6d961f7 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-03-14 11:27+0100\n" +"POT-Creation-Date: 2008-03-14 11:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -213,20 +213,20 @@ msgstr "" #: ../../../jsScuttle.php:22 ../../../templates/tag2tagadd.tpl.php:12 #: ../../../templates/tag2tagdelete.tpl.php:13 -#: ../../../templates/tag2tagedit.tpl.php:12 +#: ../../../templates/tag2tagedit.tpl.php:14 #: ../../../templates/tag2tagedit.tpl.php:35 #: ../../../templates/tagdelete.tpl.php:6 msgid "Are you sure?" msgstr "" #: ../../../jsScuttle.php:22 ../../../templates/tag2tagdelete.tpl.php:15 -#: ../../../templates/tag2tagedit.tpl.php:37 +#: ../../../templates/tag2tagedit.tpl.php:16 #: ../../../templates/tagdelete.tpl.php:8 msgid "Yes" msgstr "" #: ../../../jsScuttle.php:22 ../../../templates/tag2tagdelete.tpl.php:16 -#: ../../../templates/tag2tagedit.tpl.php:38 +#: ../../../templates/tag2tagedit.tpl.php:17 #: ../../../templates/tagdelete.tpl.php:9 msgid "No" msgstr "" @@ -442,7 +442,7 @@ msgid "Failed to update the tag common description" msgstr "" #: ../../../tagcommondescriptionedit.php:55 -#: ../../../templates/sidebar.block.tagactions.php:25 +#: ../../../templates/sidebar.block.tagactions.php:26 msgid "Edit Tag Common Description" msgstr "" @@ -455,7 +455,7 @@ msgid "Failed to delete the tag" msgstr "" #: ../../../tagdelete.php:44 -#: ../../../templates/sidebar.block.tagactions.php:22 +#: ../../../templates/sidebar.block.tagactions.php:23 msgid "Delete Tag" msgstr "" @@ -571,7 +571,7 @@ msgstr "" #: ../../../templates/bookmarkcommondescriptionedit.tpl.php:40 #: ../../../templates/tag2tagadd.tpl.php:15 -#: ../../../templates/tag2tagedit.tpl.php:15 +#: ../../../templates/tag2tagedit.tpl.php:38 #: ../../../templates/tagcommondescriptionedit.tpl.php:33 #: ../../../templates/tagrename.tpl.php:25 msgid "Cancel" @@ -978,11 +978,15 @@ msgstr "" msgid "Number of bookmarks for this query" msgstr "" -#: ../../../templates/sidebar.block.tagactions.php:17 +#: ../../../templates/sidebar.block.tagactions.php:18 #: ../../../templates/sidebar.block.watchstatus.php:17 msgid "Actions" msgstr "" +#: ../../../templates/sidebar.block.tagactions.php:28 +msgid "Create a link to another tag" +msgstr "" + #: ../../../templates/sidebar.block.users.php:14 msgid "Last Users" msgstr "" @@ -1005,7 +1009,7 @@ msgid "Create new link:" msgstr "" #: ../../../templates/tag2tagadd.tpl.php:14 -#: ../../../templates/tag2tagedit.tpl.php:14 +#: ../../../templates/tag2tagedit.tpl.php:37 msgid "Create" msgstr "" @@ -1022,11 +1026,11 @@ msgid "No links" msgstr "" #: ../../../templates/tag2tagedit.tpl.php:6 -msgid "Create new link" +msgid "Delete the link" msgstr "" -#: ../../../templates/tag2tagedit.tpl.php:27 -msgid "Delete the link" +#: ../../../templates/tag2tagedit.tpl.php:29 +msgid "Create new link" msgstr "" #: ../../../templates/tagrename.tpl.php:12 diff --git a/templates/sidebar.block.tagactions.php b/templates/sidebar.block.tagactions.php index a19db0b..907a61d 100644 --- a/templates/sidebar.block.tagactions.php +++ b/templates/sidebar.block.tagactions.php @@ -12,6 +12,7 @@ if ($userservice->isLoggedOn()) { $renamelink = createURL('tagrename', $currenttag); $deletelink = createURL('tagdelete', $currenttag); $commondesclink = createURL('tagcommondescriptionedit', $currenttag); + $addtag2taglinklink = createURL('tag2tagadd', $currenttag); ?> <h2><?php echo T_('Actions'); ?></h2> @@ -24,6 +25,7 @@ if ($userservice->isLoggedOn()) { <?php if ($GLOBALS['enableCommonTagDescription']): ?> <li><a href="<?php echo $commondesclink; ?>"><?php echo T_('Edit Tag Common Description') ?></a></li> <?php endif; ?> + <li><a href="<?php echo $addtag2taglinklink; ?>"><?php echo T_('Create a link to another tag') ?></a></li> </ul> </div> diff --git a/templates/tag2tagedit.tpl.php b/templates/tag2tagedit.tpl.php index 4e5850b..740a654 100644 --- a/templates/tag2tagedit.tpl.php +++ b/templates/tag2tagedit.tpl.php @@ -2,17 +2,19 @@ $this->includeTemplate($GLOBALS['top_include']); ?> -<form action="<?= $formaddaction ?>" method="post"> -<p><?php echo T_('Create new link')?></p> +<form action="<?= $formdeleteaction ?>" method="post"> +<p><?php echo T_('Delete the link')?></p> +<!--input type="hidden" name="tag1" value="<?php echo $tag1 ?>" /> +<input type="hidden" name="tag2" value="<?php echo $tag2 ?>" /--> <p> <input type="text" name="tag1" value="<?php echo $tag1 ?>"/> <input type="text" name="linkType" value=">" size="1" maxlength="1"/> -<input type="text" name="tag2" /> +<input type="text" name="tag2" value="<?php echo $tag2 ?>"/> </p> -<!--p><?php echo T_('Are you sure?'); ?></p--> +<p><?php echo T_('Are you sure?'); ?></p> <p> - <input type="submit" name="confirm" value="<?php echo T_('Create'); ?>" /> - <input type="submit" name="cancel" value="<?php echo T_('Cancel'); ?>" /> + <input type="submit" name="confirm" value="<?php echo T_('Yes'); ?>" /> + <input type="submit" name="cancel" value="<?php echo T_('No'); ?>" /> </p> <?php if (isset($referrer)): ?> @@ -23,19 +25,17 @@ $this->includeTemplate($GLOBALS['top_include']); <hr /> -<form action="<?= $formdeleteaction ?>" method="post"> -<p><?php echo T_('Delete the link')?></p> -<!--input type="hidden" name="tag1" value="<?php echo $tag1 ?>" /> -<input type="hidden" name="tag2" value="<?php echo $tag2 ?>" /--> +<form action="<?= $formaddaction ?>" method="post"> +<p><?php echo T_('Create new link')?></p> <p> <input type="text" name="tag1" value="<?php echo $tag1 ?>"/> <input type="text" name="linkType" value=">" size="1" maxlength="1"/> -<input type="text" name="tag2" value="<?php echo $tag2 ?>"/> +<input type="text" name="tag2" /> </p> -<p><?php echo T_('Are you sure?'); ?></p> +<!--p><?php echo T_('Are you sure?'); ?></p--> <p> - <input type="submit" name="confirm" value="<?php echo T_('Yes'); ?>" /> - <input type="submit" name="cancel" value="<?php echo T_('No'); ?>" /> + <input type="submit" name="confirm" value="<?php echo T_('Create'); ?>" /> + <input type="submit" name="cancel" value="<?php echo T_('Cancel'); ?>" /> </p> <?php if (isset($referrer)): ?> |