aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--index.php2
-rw-r--r--locales/fr_FR/LC_MESSAGES/messages.mobin19818 -> 20039 bytes
-rw-r--r--locales/fr_FR/LC_MESSAGES/messages.po55
-rw-r--r--locales/messages.po43
-rw-r--r--templates/bookmarks.tpl.php11
-rw-r--r--templates/sidebar.block.menu.php8
-rw-r--r--templates/sidebar.block.users.php3
7 files changed, 91 insertions, 31 deletions
diff --git a/index.php b/index.php
index 41b1a05..a4ce6a7 100644
--- a/index.php
+++ b/index.php
@@ -71,7 +71,7 @@ $tplVars['popCount'] = 30;
$tplVars['sidebar_blocks'] = $GLOBALS["index_sidebar_blocks"];
$tplVars['range'] = 'all';
$tplVars['pagetitle'] = T_('Store, share and tag your favourite links');
-$tplVars['subtitle'] = T_('Recent Bookmarks');
+$tplVars['subtitle'] = T_('All Bookmarks');
$tplVars['bookmarkCount'] = $start + 1;
$bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, NULL, NULL, NULL, getSortOrder(), NULL, 0, $dtend);
$tplVars['total'] = $bookmarks['total'];
diff --git a/locales/fr_FR/LC_MESSAGES/messages.mo b/locales/fr_FR/LC_MESSAGES/messages.mo
index 384f10f..56cfc7c 100644
--- a/locales/fr_FR/LC_MESSAGES/messages.mo
+++ b/locales/fr_FR/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/locales/fr_FR/LC_MESSAGES/messages.po b/locales/fr_FR/LC_MESSAGES/messages.po
index 0a213fe..d317dd8 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-04-24 09:43+0200\n"
-"PO-Revision-Date: 2008-04-24 09:47+0100\n"
+"POT-Creation-Date: 2008-04-24 19:03+0200\n"
+"PO-Revision-Date: 2008-04-24 19:07+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"
@@ -226,8 +226,8 @@ msgid "Store, share and tag your favourite links"
msgstr "Conservez, partagez et taggez vos liens favoris"
#: ../../../index.php:74
-msgid "Recent Bookmarks"
-msgstr "Signets récents"
+msgid "All Bookmarks"
+msgstr "Tous les signets"
#: ../../../jsScuttle.php:22
#: ../../../templates/tag2tagadd.tpl.php:21
@@ -316,6 +316,7 @@ msgstr "Mot de passe oublié"
#: ../../../populartags.php:49
#: ../../../templates/dynamictags.inc.php:101
#: ../../../templates/sidebar.block.common.php:9
+#: ../../../templates/sidebar.block.menu.php:68
#: ../../../templates/sidebar.block.popular.php:15
#: ../../../templates/sidebar.block.recent.php:30
#: ../../../templates/toolbar.inc.php:24
@@ -398,7 +399,7 @@ msgstr "Signets ajoutés récemment à %s"
#: ../../../search.inc.php:13
#: ../../../search.inc.php:41
msgid "Search"
-msgstr "Chercher"
+msgstr "Chercher dans"
#: ../../../search.inc.php:19
msgid "this user's bookmarks"
@@ -692,12 +693,12 @@ msgstr "Suivant"
msgid "Last"
msgstr "Dernière"
-#: ../../../templates/bookmarks.tpl.php:238
+#: ../../../templates/bookmarks.tpl.php:246
#, php-format
msgid "Page %d of %d"
msgstr "Page %d de %d"
-#: ../../../templates/bookmarks.tpl.php:240
+#: ../../../templates/bookmarks.tpl.php:252
msgid "No bookmarks available"
msgstr "Pas de signets disponibles."
@@ -1004,16 +1005,29 @@ msgstr "Tags inclus dans le tag '%s'"
#: ../../../templates/sidebar.block.menu.php:29
msgid "Menu Tags"
-msgstr "Menu Tags"
+msgstr "Tags Menu"
-#: ../../../templates/sidebar.block.menu.php:60
+#: ../../../templates/sidebar.block.menu.php:62
msgid "See all your tags"
msgstr "Voir tous vos tags"
-#: ../../../templates/sidebar.block.menu.php:60
+#: ../../../templates/sidebar.block.menu.php:62
msgid "all your tags"
msgstr "Tous vos tags"
+#: ../../../templates/sidebar.block.menu.php:64
+msgid "See all tags from this user"
+msgstr "Voir tous les tags de cet utilisateur"
+
+#: ../../../templates/sidebar.block.menu.php:64
+msgid "all tags from this user"
+msgstr "tous les tags de cet utilisateur"
+
+#: ../../../templates/sidebar.block.menu.php:68
+#, fuzzy
+msgid "See popular tags"
+msgstr "Voir tous vos tags"
+
#: ../../../templates/sidebar.block.recent.php:15
msgid "Recent Tags"
msgstr "Tags récents"
@@ -1043,6 +1057,15 @@ msgstr "Derniers utilisateurs"
msgid "bookmarks"
msgstr "signets"
+#: ../../../templates/sidebar.block.users.php:29
+#, fuzzy
+msgid "See all users"
+msgstr "Voir tous vos tags"
+
+#: ../../../templates/sidebar.block.users.php:29
+msgid "All users"
+msgstr "Tous les utilisateurs"
+
#: ../../../templates/sidebar.block.watchstatus.php:10
msgid "Remove from Watchlist"
msgstr "Enlever de la liste des consultés"
@@ -1059,15 +1082,15 @@ msgstr "Editer un lien"
msgid "Synonyms:"
msgstr "Synonymes :"
-#: ../../../templates/tag2tagadd.tpl.php:10
+#: ../../../templates/tag2tagadd.tpl.php:12
+msgid "Create new link:"
+msgstr "Créer un nouveau lien"
+
+#: ../../../templates/tag2tagadd.tpl.php:19
#, php-format
msgid "Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into the menu box"
msgstr "Note : inclure un 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:23
#: ../../../templates/tag2tagedit.tpl.php:37
msgid "Create"
@@ -1127,6 +1150,8 @@ msgstr "Profil"
msgid "created in"
msgstr "Créé en "
+#~ msgid "Recent Bookmarks"
+#~ msgstr "Signets récents"
#~ msgid "plus"
#~ msgstr "plus"
#~ msgid ""
diff --git a/locales/messages.po b/locales/messages.po
index d56bb44..4184184 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-24 09:43+0200\n"
+"POT-Creation-Date: 2008-04-24 19:03+0200\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"
@@ -208,7 +208,7 @@ msgid "Store, share and tag your favourite links"
msgstr ""
#: ../../../index.php:74
-msgid "Recent Bookmarks"
+msgid "All Bookmarks"
msgstr ""
#: ../../../jsScuttle.php:22 ../../../templates/tag2tagadd.tpl.php:21
@@ -298,6 +298,7 @@ msgstr ""
#: ../../../populartags.php:49 ../../../templates/dynamictags.inc.php:101
#: ../../../templates/sidebar.block.common.php:9
+#: ../../../templates/sidebar.block.menu.php:68
#: ../../../templates/sidebar.block.popular.php:15
#: ../../../templates/sidebar.block.recent.php:30
#: ../../../templates/toolbar.inc.php:24
@@ -672,12 +673,12 @@ msgstr ""
msgid "Last"
msgstr ""
-#: ../../../templates/bookmarks.tpl.php:238
+#: ../../../templates/bookmarks.tpl.php:246
#, php-format
msgid "Page %d of %d"
msgstr ""
-#: ../../../templates/bookmarks.tpl.php:240
+#: ../../../templates/bookmarks.tpl.php:252
msgid "No bookmarks available"
msgstr ""
@@ -1000,14 +1001,26 @@ msgstr ""
msgid "Menu Tags"
msgstr ""
-#: ../../../templates/sidebar.block.menu.php:60
+#: ../../../templates/sidebar.block.menu.php:62
msgid "See all your tags"
msgstr ""
-#: ../../../templates/sidebar.block.menu.php:60
+#: ../../../templates/sidebar.block.menu.php:62
msgid "all your tags"
msgstr ""
+#: ../../../templates/sidebar.block.menu.php:64
+msgid "See all tags from this user"
+msgstr ""
+
+#: ../../../templates/sidebar.block.menu.php:64
+msgid "all tags from this user"
+msgstr ""
+
+#: ../../../templates/sidebar.block.menu.php:68
+msgid "See popular tags"
+msgstr ""
+
#: ../../../templates/sidebar.block.recent.php:15
msgid "Recent Tags"
msgstr ""
@@ -1037,6 +1050,14 @@ msgstr ""
msgid "bookmarks"
msgstr ""
+#: ../../../templates/sidebar.block.users.php:29
+msgid "See all users"
+msgstr ""
+
+#: ../../../templates/sidebar.block.users.php:29
+msgid "All users"
+msgstr ""
+
#: ../../../templates/sidebar.block.watchstatus.php:10
msgid "Remove from Watchlist"
msgstr ""
@@ -1053,17 +1074,17 @@ msgstr ""
msgid "Synonyms:"
msgstr ""
-#: ../../../templates/tag2tagadd.tpl.php:10
+#: ../../../templates/tag2tagadd.tpl.php:12
+msgid "Create new link:"
+msgstr ""
+
+#: ../../../templates/tag2tagadd.tpl.php:19
#, 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:23
#: ../../../templates/tag2tagedit.tpl.php:37
msgid "Create"
diff --git a/templates/bookmarks.tpl.php b/templates/bookmarks.tpl.php
index 9277083..6a778bb 100644
--- a/templates/bookmarks.tpl.php
+++ b/templates/bookmarks.tpl.php
@@ -63,12 +63,17 @@ window.onload = playerLoad;
<p id="sort">
<?php echo $total.' '.T_("bookmark(s)"); ?> -
<?php echo T_("Sort by:"); ?>
- <a href="?sort=date_desc"><?php echo T_("Date"); ?></a><span> / </span>
- <a href="?sort=title_asc"><?php echo T_("Title"); ?></a><span> / </span>
+ <?php
+ $dateSort = (getSortOrder()=='date_desc')? 'date_asc':'date_desc';
+ $titleSort = (getSortOrder()=='title_asc')? 'title_desc':'title_asc';
+ $urlSort = (getSortOrder()=='url_asc')? 'url_desc':'url_asc';
+ ?>
+ <a href="?sort=<?php echo $dateSort ?>"><?php echo T_("Date"); ?></a><span> / </span>
+ <a href="?sort=<?php echo $titleSort ?>"><?php echo T_("Title"); ?></a><span> / </span>
<?php
if (!isset($hash)) {
?>
- <a href="?sort=url_asc"><?php echo T_("URL"); ?></a>
+ <a href="?sort=<?php echo $urlSort ?>"><?php echo T_("URL"); ?></a>
<?php
}
?>
diff --git a/templates/sidebar.block.menu.php b/templates/sidebar.block.menu.php
index de4f0f7..0c7087a 100644
--- a/templates/sidebar.block.menu.php
+++ b/templates/sidebar.block.menu.php
@@ -57,8 +57,16 @@ if (sizeof($menuTags) > 0 || ($userid != 0 && $userid === $logged_on_userid)) {
</table>
<?php $cUser = $userservice->getUser($userid); ?>
+<?php if($userid>0): ?>
+<?php if($userid==$logged_on_userid): ?>
<p style="text-align:right"><a href="<?php echo createURL('alltags', $cUser['username']); ?>" title="<?php echo T_('See all your tags')?>"><?php echo T_('all your tags'); ?></a> &rarr;</p>
+<?php else: ?>
+<p style="text-align:right"><a href="<?php echo createURL('alltags', $cUser['username']); ?>" title="<?php echo T_('See all tags from this user')?>"><?php echo T_('all tags from this user'); ?></a> &rarr;</p>
+<?php endif; ?>
+<?php else : ?>
+<p style="text-align:right"><a href="<?php echo createURL('populartags', $cUser['username']); ?>" title="<?php echo T_('See popular tags')?>"><?php echo T_('Popular Tags'); ?></a> &rarr;</p>
+<?php endif; ?>
</div>
<?php
diff --git a/templates/sidebar.block.users.php b/templates/sidebar.block.users.php
index 813c163..7c61acc 100644
--- a/templates/sidebar.block.users.php
+++ b/templates/sidebar.block.users.php
@@ -22,10 +22,11 @@ foreach ($lastUsers as $row) {
echo ' (<a href="'.createURL('bookmarks', $row['username']).'">'.T_('bookmarks').'</a>)';
echo '</td></tr>';
}
-echo '<tr><td><a href="'.createURL('users').'">...</a></td></tr>';
+//echo '<tr><td><a href="'.createURL('users').'">...</a></td></tr>';
?>
</table>
+<p style="text-align:right"><a href="<?php echo createURL('users'); ?>" title="<?php echo T_('See all users')?>"><?php echo T_('All users'); ?></a> &rarr;</p>
</div>
<?php
}