summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/config.default.php12
-rw-r--r--data/config.php.dist2
-rw-r--r--data/locales/de_DE/LC_MESSAGES/messages.mobin29546 -> 29547 bytes
-rw-r--r--data/locales/de_DE/LC_MESSAGES/messages.po2
-rw-r--r--data/locales/fr_CA/LC_MESSAGES/messages.po1875
-rw-r--r--data/locales/fr_FR/LC_MESSAGES/messages.po596
-rw-r--r--data/locales/messages.po134
-rw-r--r--data/templates/admin.tpl.php2
-rw-r--r--data/templates/bookmarkcommondescriptionedit.tpl.php3
-rw-r--r--data/templates/bookmarklet.inc.php117
-rw-r--r--data/templates/bookmarks.tpl.php162
-rw-r--r--data/templates/dynamictags.inc.php73
-rw-r--r--data/templates/editbookmark.tpl.php153
-rw-r--r--data/templates/editprofile.tpl.php8
-rw-r--r--data/templates/sidebar.block.linked.php133
-rw-r--r--data/templates/sidebar.block.menu.php6
-rw-r--r--data/templates/sidebar.block.menu2.php71
-rw-r--r--data/templates/sidebar.block.recent.php2
-rw-r--r--data/templates/sidebar.block.search.php45
-rw-r--r--data/templates/sidebar.block.users.php4
-rw-r--r--data/templates/sidebar.block.watchlist.php8
-rw-r--r--data/templates/tag2tagadd.tpl.php2
-rw-r--r--data/templates/tagcommondescriptionedit.tpl.php3
-rw-r--r--data/templates/tagrename.tpl.php4
-rw-r--r--data/templates/top.inc.php22
-rw-r--r--data/templates/users.tpl.php9
26 files changed, 2062 insertions, 1386 deletions
diff --git a/data/config.default.php b/data/config.default.php
index b0a6c50..672431a 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -138,7 +138,7 @@ $dbtype = 'mysql4';
*
* @var string
*/
-$dbhost = 'localhost';
+$dbhost = '127.0.0.1';
/**
* Database port.
@@ -302,7 +302,7 @@ $index_sidebar_blocks = array(
* @var string
* @link http://php.net/date
*/
-$shortdate = 'd-m-Y';
+$shortdate = 'Y-m-d';
/**
* Format of long dates.
@@ -710,4 +710,12 @@ $authEmailSuffix = null;
*/
$unittestUrl = null;
+/**
+ * Allow "unittestMode=1" in URLs.
+ * Should only be enabled on development systems
+ *
+ * @var boolean
+ */
+$allowUnittestMode = false;
+
?>
diff --git a/data/config.php.dist b/data/config.php.dist
index 6439478..c135e8e 100644
--- a/data/config.php.dist
+++ b/data/config.php.dist
@@ -88,7 +88,7 @@ $dbname = 'scuttle';
*
* @var string
*/
-$dbhost = 'localhost';
+$dbhost = '127.0.0.1';
/***************************************************
diff --git a/data/locales/de_DE/LC_MESSAGES/messages.mo b/data/locales/de_DE/LC_MESSAGES/messages.mo
index 0b18fac..05778b7 100644
--- a/data/locales/de_DE/LC_MESSAGES/messages.mo
+++ b/data/locales/de_DE/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/data/locales/de_DE/LC_MESSAGES/messages.po b/data/locales/de_DE/LC_MESSAGES/messages.po
index fdd27a5..a5c774f 100644
--- a/data/locales/de_DE/LC_MESSAGES/messages.po
+++ b/data/locales/de_DE/LC_MESSAGES/messages.po
@@ -604,7 +604,7 @@ msgid ""
"file to your computer"
msgstr ""
"Speichern Sie die resultierende <abbr title=\"Extensible Markup Language"
-"\">XML</abbr-Datei lokal auf Ihrem Computer"
+"\">XML</abbr>-Datei lokal auf Ihrem Computer"
#: data/templates/importDelicious.tpl.php:35
msgid ""
diff --git a/data/locales/fr_CA/LC_MESSAGES/messages.po b/data/locales/fr_CA/LC_MESSAGES/messages.po
index 4bdb4b9..ae74c4b 100644
--- a/data/locales/fr_CA/LC_MESSAGES/messages.po
+++ b/data/locales/fr_CA/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Scuttle\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 19:03+0200\n"
+"POT-Creation-Date: 2010-09-15 19:15+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"
@@ -19,1151 +19,1528 @@ msgstr ""
"X-Poedit-Country: FRANCE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../../../about.php:25
-#: ../../../templates/toolbar.inc.php:16
-#: ../../../templates/toolbar.inc.php:25
-msgid "About"
-msgstr "À propos"
-
-#: ../../../ajaxDelete.php:30
-msgid "You are not allowed to delete this bookmark"
-msgstr "Vous n'êtes pas autorisés à supprimer ce signet"
-
-#: ../../../ajaxDelete.php:34
-#: ../../../edit.php:78
-msgid "Failed to delete bookmark"
-msgstr "Erreur dans la suppression du signet"
-
-#: ../../../alltags.php:48
-msgid "All Tags"
-msgstr "Tous les mots-cl&eacute;s"
-
-#: ../../../alltags.php:57
-#: ../../../bookmarks.php:72
-#: ../../../populartags.php:58
-#: ../../../profile.php:44
-#: ../../../rss.php:62
-#: ../../../search.php:88
-#: ../../../watch.php:34
-#: ../../../watchlist.php:61
-#, php-format
-msgid "User with username %s was not found"
-msgstr "L'utilisateur %s n'a pas été trouvé."
-
-#: ../../../bookmarkcommondescriptionedit.php:35
-#: ../../../tag2tagadd.php:31
-#: ../../../tag2tagdelete.php:31
-#: ../../../tag2tagedit.php:31
-#: ../../../tagcommondescriptionedit.php:35
-#: ../../../tagedit.php:34
-msgid "Permission denied."
-msgstr "Permission non accordée."
-
-#: ../../../bookmarkcommondescriptionedit.php:45
-msgid "Bookmark common description updated"
-msgstr "Description commune du signet mise à jour."
-
-#: ../../../bookmarkcommondescriptionedit.php:48
-msgid "Failed to update the bookmark common description"
-msgstr "Erreur dans la mise à jour de la description du signet"
-
-#: ../../../bookmarkcommondescriptionedit.php:57
-msgid "Edit Bookmark Common Description"
-msgstr "Editer la description commune du signet"
-
-#: ../../../bookmarks.php:95
-#: ../../../edit.php:44
-msgid "Your bookmark must have a title and an address"
-msgstr "Votre signet doit avoir un titre et une adresse."
-
-#: ../../../bookmarks.php:115
-#: ../../../edit.php:58
-msgid "Bookmark saved"
-msgstr "Signet enregistré."
-
-#: ../../../bookmarks.php:123
-#: ../../../import.php:99
-#: ../../../importNetscape.php:74
-msgid "There was an error saving your bookmark. Please try again or contact the administrator."
-msgstr "Il y a eu une erreur en enregistrant ce signet. Veuillez rééssayer ou contacter votre administrateur."
-
-#: ../../../bookmarks.php:161
-#: ../../../templates/toolbar.inc.php:14
-msgid "Add a Bookmark"
-msgstr "Ajouter un signet"
-
-#: ../../../bookmarks.php:164
-msgid "Add Bookmark"
-msgstr "Ajouter signet"
-
-#: ../../../bookmarks.php:167
-msgid "You must be logged in before you can add bookmarks."
-msgstr "Vous devez être authentifié avant de pouvoir ajouter des signets."
-
-#: ../../../bookmarks.php:218
-msgid "My Bookmarks"
-msgstr "Mes signets"
-
-#: ../../../edit.php:29
-msgid "Edit Bookmark"
-msgstr "Editer le signet"
-
-#: ../../../edit.php:34
-#, php-format
-msgid "Bookmark with id %s not was not found"
-msgstr "Signet %s non trouvé"
-
-#: ../../../edit.php:39
-msgid "You are not allowed to edit this bookmark"
-msgstr "Vous n'êtes pas autorisé à éditer ce signet."
-
-#: ../../../edit.php:55
-msgid "Error while saving your bookmark"
-msgstr "Erreur pendant l'enregistrement de votre signet."
-
-#: ../../../edit.php:88
-#: ../../../templates/editprofile.tpl.php:51
-msgid "Save Changes"
-msgstr "Enregistrer les modifications"
-
-#: ../../../functions.inc.php:108
+#: src/SemanticScuttle/functions.php:189
msgid "message_die() was called multiple times."
msgstr "message_die() was called multiple times. ?"
-#: ../../../functions.inc.php:120
+#: src/SemanticScuttle/functions.php:201
msgid "SQL Error"
msgstr "Erreur SQL"
-#: ../../../functions.inc.php:126
+#: src/SemanticScuttle/functions.php:207
msgid "Line"
msgstr "Ligne"
-#: ../../../functions.inc.php:126
-#: ../../../templates/importDelicious.tpl.php:8
-#: ../../../templates/importNetscape.tpl.php:9
+#: src/SemanticScuttle/functions.php:207
+#: data/templates/importDelicious.tpl.php:8
+#: data/templates/importNetscape.tpl.php:9
+#: data/templates/importStructure.tpl.php:10
msgid "File"
msgstr "Fichier"
-#: ../../../functions.inc.php:132
+#: src/SemanticScuttle/functions.php:215
msgid "Information"
msgstr "Information"
-#: ../../../functions.inc.php:137
+#: src/SemanticScuttle/functions.php:220
msgid "Critical Information"
msgstr "Information critique."
-#: ../../../functions.inc.php:142
+#: src/SemanticScuttle/functions.php:225
msgid "An error occured"
msgstr "Une erreur s'est produite."
-#: ../../../functions.inc.php:145
+#: src/SemanticScuttle/functions.php:228
msgid "General Error"
msgstr "Erreur générale."
-#: ../../../functions.inc.php:153
+#: src/SemanticScuttle/functions.php:236
msgid "An critical error occured"
msgstr "Une erreur critique s'est produite."
-#: ../../../functions.inc.php:156
+#: src/SemanticScuttle/functions.php:239
msgid "Critical Error"
msgstr "Erreur critique."
-#: ../../../functions.inc.php:165
+#: src/SemanticScuttle/functions.php:248
msgid "DEBUG MODE"
msgstr "Mode de débogage."
-#: ../../../history.php:65
-msgid "History"
-msgstr "Historique"
+#: data/templates/about.tpl.php:6
+msgid ""
+"<strong>Store</strong> all your favourite links in one place, accessible "
+"from anywhere."
+msgstr ""
+"<strong>Conservez</strong> tous vos signets au même endroit, accessibles de "
+"partout. "
-#: ../../../history.php:66
-#, php-format
-msgid "History for %s"
-msgstr "Historique de %s"
+#: data/templates/about.tpl.php:7
+msgid ""
+"<strong>Share</strong> your bookmarks with everyone, with friends on your "
+"watchlist or just keep them private."
+msgstr ""
+"<strong>Partagez</strong> vos signets avec tout le monde, avec les "
+"utilisateurs autorisés ou gardez-les pour vous."
-#: ../../../history.php:82
-msgid "Address was not found"
-msgstr "L'adresse n'a pas été trouvée."
+#: data/templates/about.tpl.php:8
+msgid ""
+"<strong>Tag</strong> your bookmarks with as many labels as you want, instead "
+"of wrestling with folders."
+msgstr ""
+"<strong>Taggez</strong> vos signets avec autant de labels que vous le "
+"souhaitez au lieu de les hiérarchiser avec des dossiers."
-#: ../../../import.php:41
-msgid "Could not open XML input"
-msgstr "Impossible d'ouvrir le flux XML."
+#: data/templates/about.tpl.php:9
+msgid "Register now"
+msgstr "S'enregistrer maintenant"
-#: ../../../import.php:45
+#: data/templates/about.tpl.php:9
#, php-format
-msgid "XML error: %s at line %d"
-msgstr "Erreur XML: %s à la ligne %d"
-
-#: ../../../import.php:54
-msgid "Import Bookmarks from del.icio.us"
-msgstr "Importer les signet depuis del.icio.us"
-
-#: ../../../import.php:86
-#: ../../../importNetscape.php:64
-msgid "You have already submitted this bookmark."
-msgstr "Vous avez déjà enregistré ce signet."
+msgid " to start using %s!"
+msgstr "pour commencer à employer %s !"
-#: ../../../import.php:97
-#: ../../../importNetscape.php:72
-msgid "Bookmark imported."
-msgstr "Signet importé."
+#: data/templates/about.tpl.php:12
+msgid "Geek Stuff"
+msgstr "Pour les Geeks"
-#: ../../../importNetscape.php:81
-msgid "Import Bookmarks from Browser File"
-msgstr "Importer les signets depuis un fichier"
+#: data/templates/about.tpl.php:14
+msgid "is licensed under the "
+msgstr "est sous licence"
-#: ../../../index.php:32
-msgid "You have now logged out"
-msgstr "Vous êtes maintenant déconnecté."
+#: data/templates/about.tpl.php:14
+msgid "you can freely host it on your own web server."
+msgstr "vous pouvez librement l'installer sur votre serveur Web"
-#: ../../../index.php:39
+#: data/templates/about.tpl.php:15
#, php-format
-msgid "%s: Recent bookmarks"
-msgstr "%s: Signets récents"
-
-#: ../../../index.php:73
-msgid "Store, share and tag your favourite links"
-msgstr "Conservez, partagez et libellez vos liens favoris"
-
-#: ../../../index.php:74
-msgid "All Bookmarks"
-msgstr "Tous les signets"
-
-#: ../../../jsScuttle.php:22
-#: ../../../templates/tag2tagadd.tpl.php:21
-#: ../../../templates/tag2tagdelete.tpl.php:13
-#: ../../../templates/tag2tagedit.tpl.php:14
-#: ../../../templates/tag2tagedit.tpl.php:35
-#: ../../../templates/tagdelete.tpl.php:6
-msgid "Are you sure?"
-msgstr "Etes-vous sûr ?"
-
-#: ../../../jsScuttle.php:22
-#: ../../../templates/tag2tagdelete.tpl.php:15
-#: ../../../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:17
-#: ../../../templates/tagdelete.tpl.php:9
-msgid "No"
-msgstr "Non"
-
-#: ../../../jsScuttle.php:68
-msgid "Available"
-msgstr "Disponible"
-
-#: ../../../jsScuttle.php:71
-msgid "Not Available"
-msgstr "Non Disponible"
-
-#: ../../../login.php:38
-msgid "The details you have entered are incorrect. Please try again."
-msgstr "Les informations que vous avez entrées sont incorrectes. Veuillez recommencer."
+msgid ""
+"%1$s supports most of the <a href=\"http://del.icio.us/doc/api\">del.icio.us "
+"<abbr title=\"Application Programming Interface\">API</abbr></a>. Almost all "
+"of the neat tools made for that system can be modified to work with %1$s "
+"instead. If you find a tool that won't let you change the API address, ask "
+"the creator to add this setting. You never know, they might just do it."
+msgstr ""
+"%1$s supporte la plupart de l'<a href=\"http://del.icio.us/doc/api\"><abbr "
+"title=\"Application Programming Interface\">API</abbr> del.icio.us</a>."
-#: ../../../login.php:48
-#: ../../../templates/login.tpl.php:26
-#: ../../../templates/toolbar.inc.php:26
-msgid "Log In"
-msgstr "Se connecter"
+#: data/templates/about.tpl.php:24
+msgid "Tips"
+msgstr ""
-#: ../../../password.php:31
-msgid "You must enter your username."
-msgstr "Vous devez entrer votre nom d'utilisateur."
+#: data/templates/about.tpl.php:26
+msgid "Add search plugin into your browser:"
+msgstr ""
-#: ../../../password.php:35
-msgid "You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "Vous <em>devez</em> saisir une <abbr title=\"adresse électronique\">E-mail</abbr>."
+#: data/templates/about.tpl.php:27
+msgid ""
+"The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
+msgstr ""
-#: ../../../password.php:42
-msgid "No matches found for that username."
-msgstr "Rien de trouvé pour ce nom d'utilisateur."
+#: data/templates/about.tpl.php:28
+msgid ""
+"The secret tag \"system:imported\" allows you to find imported bookmarks."
+msgstr ""
-#: ../../../password.php:45
+#: data/templates/admin.tpl.php:5
#, fuzzy
-msgid "No matches found for that combination of username and <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "Nous n'avons rien trouvé pour cette combinaison de nom d'utilisateur et d'<abbr title=\"adresse mail\">e-mail</abbr>."
-
-#: ../../../password.php:53
-msgid "There was an error while generating your new password. Please try again."
-msgstr "Il y a eu une erreur en enregistrant ce signet. Veuillez rééssayer ou contacter votre administrateur."
-
-#: ../../../password.php:57
-msgid "Your new password is:"
-msgstr "Votre nouveau mot de passe est:"
-
-#: ../../../password.php:57
-msgid "To keep your bookmarks secure, you should change this password in your profile the next time you log in."
-msgstr "Pour garder vos signets sûrs, vous devriez changer ce mot de passe dans votre profil lors de votre prochaine authentification."
-
-#: ../../../password.php:60
-#, php-format
-msgid "%s Account Information"
-msgstr "Informations du compte de %s"
-
-#: ../../../password.php:62
-#, php-format
-msgid "New password generated and sent to %s"
-msgstr "Nouveau mot de passe généré et envoyé à l'adresse %s"
-
-#: ../../../password.php:69
-msgid "Forgotten Password"
-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
-msgid "Popular Tags"
-msgstr "Mots-cl&eacute;s populaires"
-
-#: ../../../profile.php:52
-#: ../../../watchlist.php:116
-msgid "Username was not specified"
-msgstr "Le nom d'utilisateur n'a pas été spécifié."
-
-#: ../../../profile.php:58
-msgid "My Profile"
-msgstr "Mon Profil"
-
-#: ../../../profile.php:60
-#: ../../../templates/toolbar.inc.php:13
-msgid "Profile"
-msgstr "Profil"
-
-#: ../../../profile.php:78
-msgid "Password and confirmation do not match."
-msgstr "Le mot de passe et sa vérification ne correspondent pas."
-
-#: ../../../profile.php:82
-msgid "Password must be at least 6 characters long."
-msgstr "Le mot de passe doit avoir au moins 6 caractères."
-
-#: ../../../profile.php:86
-msgid "E-mail address is not valid."
-msgstr "Adresse de courrier électronique invalide."
-
-#: ../../../profile.php:90
-msgid "An error occurred while saving your changes."
-msgstr "Une erreur s'est produite pendant l'enregistrement de vos modifications."
-
-#: ../../../profile.php:92
-msgid "Changes saved."
-msgstr "Modifications enregistrées."
-
-#: ../../../register.php:33
-msgid "You <em>must</em> enter a username, password and e-mail address."
-msgstr "Vous <em>devez</em> saisir un nom d'utilisateur, un mot de passe, un nom et un <abbr title=\"adresse électronique\">e-mail</abbr>"
-
-#: ../../../register.php:37
-msgid "This username has been reserved, please make another choice."
-msgstr "Ce nom d'utilisateur existe déjà, veuillez en choisir un autre."
-
-#: ../../../register.php:41
-msgid "This username already exists, please make another choice."
-msgstr "Ce nom d'utilisateur existe déjà, veuillez en choisir un autre."
-
-#: ../../../register.php:45
-msgid "E-mail address is not valid. Please try again."
-msgstr "Adresse de courrier électronique invalide. Veuilez réessayer."
-
-#: ../../../register.php:49
-msgid "Antispam answer is not valid. Please try again."
-msgstr "La réponse antispam n'est pas valide. Veuillez réessayer."
-
-#: ../../../register.php:58
-msgid "You have successfully registered. Enjoy!"
-msgstr "Votre inscription a bien été prise en compte !"
-
-#: ../../../register.php:60
-msgid "Registration failed. Please try again."
-msgstr "Enregistrement raté. Veuillez rééssayer."
-
-#: ../../../register.php:66
-#: ../../../templates/register.tpl.php:41
-#: ../../../templates/toolbar.inc.php:27
-msgid "Register"
-msgstr "S'enregistrer"
-
-#: ../../../rss.php:79
-#, php-format
-msgid "Recent bookmarks posted to %s"
-msgstr "Signets ajoutés récemment à %s"
-
-#: ../../../search.inc.php:13
-#: ../../../search.inc.php:41
-msgid "Search"
-msgstr "Chercher dans"
-
-#: ../../../search.inc.php:19
-msgid "this user's bookmarks"
-msgstr "les signets de cet utilisateur"
-
-#: ../../../search.inc.php:24
-msgid "my bookmarks"
-msgstr "mes signets"
-
-#: ../../../search.inc.php:25
-msgid "my watchlist"
-msgstr "ma liste des consultés"
-
-#: ../../../search.inc.php:29
-msgid "all bookmarks"
-msgstr "tous les signets"
-
-#: ../../../search.inc.php:32
-msgid "for"
-msgstr "pour"
-
-#: ../../../search.php:59
-#: ../../../search.php:108
-msgid "Search Bookmarks"
-msgstr "Recherche de signets"
-
-#: ../../../search.php:65
-msgid "Search Results"
-msgstr "Résultats de recherche"
-
-#: ../../../tag2tagadd.php:44
-msgid "Tag link created"
-msgstr "Lien entre mot-cl&eacute; créé."
-
-#: ../../../tag2tagadd.php:47
-msgid "Failed to create the link"
-msgstr "Impossible de créer le lien"
-
-#: ../../../tag2tagadd.php:58
-msgid "Add Tag Link"
-msgstr "Ajout d'un lien entre mots-cl&eacute;s"
-
-#: ../../../tag2tagdelete.php:43
-#: ../../../tag2tagedit.php:43
-msgid "Tag link deleted"
-msgstr "Effacement d'un lien entre mots-cl&eacute;s"
-
-#: ../../../tag2tagdelete.php:46
-#: ../../../tag2tagedit.php:46
-msgid "Failed to delete the link"
-msgstr "Impossible d'effacer le lien"
-
-#: ../../../tag2tagdelete.php:58
-msgid "Delete Link Between Tags"
-msgstr "Effacer un lien entre mots-cl&eacute;s"
-
-#: ../../../tag2tagedit.php:58
-msgid "Edit Link Between Tags"
-msgstr "Editer un lien entre mots-cl&eacute;s"
-
-#: ../../../tagcommondescriptionedit.php:45
-msgid "Tag common description updated"
-msgstr "Editer la description commune du mot-cl&eacute;"
-
-#: ../../../tagcommondescriptionedit.php:48
-msgid "Failed to update the tag common description"
-msgstr "Impossible de mettre à jour la description commune du mot-cl&eacute;"
-
-#: ../../../tagcommondescriptionedit.php:55
-#: ../../../templates/sidebar.block.tagactions.php:27
-msgid "Edit Tag Common Description"
-msgstr "Editer la description commune du mot-cl&eacute;"
-
-#: ../../../tagdelete.php:33
-msgid "Tag deleted"
-msgstr "Mot-cl&eacute; effacé"
-
-#: ../../../tagdelete.php:36
-msgid "Failed to delete the tag"
-msgstr "Impossible d'effacer le mot-cl&eacute;"
-
-#: ../../../tagdelete.php:44
-#: ../../../templates/sidebar.block.tagactions.php:23
-msgid "Delete Tag"
-msgstr "Supprimer le mot-cl&eacute;"
-
-#: ../../../tagedit.php:44
-msgid "Tag description updated"
-msgstr "Description du mot-cl&eacute; mise à jour"
-
-#: ../../../tagedit.php:47
-msgid "Failed to update the tag description"
-msgstr "Impossible de mettre à jour la description du mot-cl&eacute;"
-
-#: ../../../tagedit.php:54
-#: ../../../templates/sidebar.block.tagactions.php:25
-msgid "Edit Tag Description"
-msgstr "Editer la description du mot-cl&eacute;"
-
-#: ../../../tagrename.php:50
-msgid "Tag renamed"
-msgstr "Mot-cl&eacute; renommé"
-
-#: ../../../tagrename.php:54
-msgid "Failed to rename the tag"
-msgstr "Erreur dans le renommage du mot-cl&eacute;"
-
-#: ../../../tagrename.php:61
-#: ../../../templates/sidebar.block.tagactions.php:10
-msgid "Rename Tag"
-msgid_plural "Rename Tags"
-msgstr[0] "Renommer le mot-cl&eacute;"
-msgstr[1] "Renommer les mots-cl&eacute;s"
-
-#: ../../../tags.php:38
-#: ../../../templates/editbookmark.tpl.php:44
-#: ../../../templates/toolbar.inc.php:11
-msgid "Tags"
-msgstr "Mots-clés"
+msgid "Users management"
+msgstr "Nom d'utilisateur"
-#: ../../../users.php:33
-msgid "Users"
-msgstr "Utilisateurs"
+#: data/templates/admin.tpl.php:14
+msgid "Public/Shared/Private"
+msgstr ""
-#: ../../../watch.php:46
-msgid "User removed from your watchlist"
-msgstr "Utilisateur enlevé de votre liste des consultés"
+#: data/templates/admin.tpl.php:14 data/templates/bookmarks.tpl.php:93
+msgid "bookmark(s)"
+msgstr "signet(s)"
-#: ../../../watch.php:48
-msgid "User added to your watchlist"
-msgstr "Utilisateur ajouté à la liste des consultés."
+#: data/templates/admin.tpl.php:19 data/templates/tag2tagadd.tpl.php:21
+#: data/templates/tag2tagdelete.tpl.php:13
+#: data/templates/tag2tagedit.tpl.php:14 data/templates/tag2tagedit.tpl.php:35
+#: data/templates/tagdelete.tpl.php:6 www/jsScuttle.php:23
+msgid "Are you sure?"
+msgstr "Etes-vous sûr ?"
-#: ../../../watchlist.php:103
-#, fuzzy
-msgid "My Watchlist"
-msgstr "Liste des signets vus"
+#: data/templates/admin.tpl.php:19 data/templates/bookmarks.tpl.php:267
+msgid "Delete"
+msgstr "Supprimer"
-#: ../../../watchlist.php:105
-#: ../../../templates/toolbar.inc.php:12
+#: data/templates/admin.tpl.php:27
#, fuzzy
-msgid "Watchlist"
-msgstr "Liste des signets vus"
-
-#: ../../../templates/about.tpl.php:6
-msgid "<strong>Store</strong> all your favourite links in one place, accessible from anywhere."
-msgstr "<strong>Conservez</strong> tous vos signets au même endroit, accessibles de partout. "
-
-#: ../../../templates/about.tpl.php:7
-msgid "<strong>Share</strong> your bookmarks with everyone, with friends on your watchlist or just keep them private."
-msgstr "<strong>Partagez</strong> vos signets avec tout le monde, avec les utilisateurs autorisés ou gardez-les pour vous."
-
-#: ../../../templates/about.tpl.php:8
-msgid "<strong>Tag</strong> your bookmarks with as many labels as you want, instead of wrestling with folders."
-msgstr "<strong>Taggez</strong> vos signets avec autant de labels que vous le souhaitez au lieu de les hiérarchiser avec des dossiers."
-
-#: ../../../templates/about.tpl.php:9
-msgid "Register now"
-msgstr "S'enregistrer maintenant"
-
-#: ../../../templates/about.tpl.php:9
-#, php-format
-msgid " to start using %s!"
-msgstr "pour commencer à employer %s !"
-
-#: ../../../templates/about.tpl.php:12
-msgid "Geek Stuff"
-msgstr "Pour les Geeks"
-
-#: ../../../templates/about.tpl.php:14
-msgid "is licensed under the "
-msgstr "est sous licence"
+msgid "Other actions"
+msgstr "Instructions"
-#: ../../../templates/about.tpl.php:14
-msgid "you can freely host it on your own web server."
-msgstr "vous pouvez librement l'installer sur votre serveur Web"
+#: data/templates/admin.tpl.php:29
+msgid "Check all URLs (May take some time)"
+msgstr ""
-#: ../../../templates/about.tpl.php:15
-#, php-format
-msgid "%1$s supports most of the <a href=\"http://del.icio.us/doc/api\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></a>. Almost all of the neat tools made for that system can be modified to work with %1$s instead. If you find a tool that won't let you change the API address, ask the creator to add this setting. You never know, they might just do it."
-msgstr "%1$s supporte la plupart de l'<a href=\"http://del.icio.us/doc/api\"><abbr title=\"Application Programming Interface\">API</abbr> del.icio.us</a>."
+#: data/templates/bookmarkcommondescriptionedit.tpl.php:16
+msgid ""
+"Collaborative description: these fields can be viewed and modified by every "
+"users"
+msgstr ""
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:15
-#: ../../../templates/bookmarks.tpl.php:67
-#: ../../../templates/editbookmark.tpl.php:34
+#: data/templates/bookmarkcommondescriptionedit.tpl.php:18
+#: data/templates/bookmarks.tpl.php:137 data/templates/editbookmark.tpl.php:43
msgid "Title"
msgstr "Titre"
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:20
-#: ../../../templates/editbookmark.tpl.php:39
-#: ../../../templates/editprofile.tpl.php:46
-#: ../../../templates/profile.tpl.php:28
-#: ../../../templates/tagcommondescriptionedit.tpl.php:13
-#: ../../../templates/tagedit.tpl.php:13
+#: data/templates/bookmarkcommondescriptionedit.tpl.php:23
+#: data/templates/editbookmark.tpl.php:49
+#: data/templates/editprofile.tpl.php:47 data/templates/profile.tpl.php:33
+#: data/templates/tagcommondescriptionedit.tpl.php:13
+#: data/templates/tagedit.tpl.php:12
msgid "Description"
msgstr "Description"
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:28
-#: ../../../templates/tagcommondescriptionedit.tpl.php:21
+#: data/templates/bookmarkcommondescriptionedit.tpl.php:31
+#: data/templates/tagcommondescriptionedit.tpl.php:21
msgid "Last modification:"
msgstr "Dernière modification :"
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:39
-#: ../../../templates/tagcommondescriptionedit.tpl.php:32
-#: ../../../templates/tagedit.tpl.php:19
+#: data/templates/bookmarkcommondescriptionedit.tpl.php:42
+#: data/templates/tagcommondescriptionedit.tpl.php:32
+#: data/templates/tagedit.tpl.php:18
msgid "Update"
msgstr "Mettre à jour"
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:40
-#: ../../../templates/tag2tagadd.tpl.php:24
-#: ../../../templates/tag2tagedit.tpl.php:38
-#: ../../../templates/tagcommondescriptionedit.tpl.php:33
-#: ../../../templates/tagedit.tpl.php:20
-#: ../../../templates/tagrename.tpl.php:25
+#: data/templates/bookmarkcommondescriptionedit.tpl.php:43
+#: data/templates/editbookmark.tpl.php:103
+#: data/templates/tag2tagadd.tpl.php:24 data/templates/tag2tagedit.tpl.php:38
+#: data/templates/tagcommondescriptionedit.tpl.php:33
+#: data/templates/tagedit.tpl.php:19 data/templates/tagrename.tpl.php:25
msgid "Cancel"
msgstr "Annuler"
-#: ../../../templates/bookmarks.tpl.php:34
-#: ../../../templates/bookmarks.tpl.php:37
-msgid "edit common description"
+#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:24
+#, php-format
+msgid "Voting <span class=\"voting\">%d</span>"
+msgstr ""
+
+#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:32
+#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:35
+msgid "Vote for"
+msgstr ""
+
+#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:43
+#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:46
+msgid "Vote against"
+msgstr ""
+
+#: data/templates/bookmarks.tpl.php:26
+msgid "Bookmarks on this page are managed by an admin user."
+msgstr ""
+
+#: data/templates/bookmarks.tpl.php:51 data/templates/bookmarks.tpl.php:52
+#, fuzzy
+msgid "Edit the common description of this tag"
+msgstr "Modifier la description public de ce mot-cl&eacute;"
+
+#: data/templates/bookmarks.tpl.php:55 data/templates/bookmarks.tpl.php:56
+#, fuzzy
+msgid "Edit the common description of this bookmark"
msgstr "éditer la description commune"
-#: ../../../templates/bookmarks.tpl.php:64
-msgid "bookmark(s)"
-msgstr "signet(s)"
+#: data/templates/bookmarks.tpl.php:76 data/templates/bookmarks.tpl.php:77
+msgid "Edit your personal description of this tag"
+msgstr "Modifier la description priv&eacute;e de ce mot-cl&eacute;"
-#: ../../../templates/bookmarks.tpl.php:65
-#: ../../../templates/tags.tpl.php:10
-#: ../../../templates/users.tpl.php:8
+#: data/templates/bookmarks.tpl.php:93 data/templates/tags.tpl.php:10
+#: data/templates/users.tpl.php:8
msgid "Sort by:"
msgstr "Classer par :"
-#: ../../../templates/bookmarks.tpl.php:66
+#: data/templates/bookmarks.tpl.php:135
msgid "Date"
msgstr "Date"
-#: ../../../templates/bookmarks.tpl.php:71
-msgid "URL"
-msgstr "URL"
+#: data/templates/bookmarks.tpl.php:140
+msgid "Voting"
+msgstr ""
-#: ../../../templates/bookmarks.tpl.php:81
+#: data/templates/bookmarks.tpl.php:149
msgid "Bookmarks from other users for this tag"
msgstr "Signets des autres utilisateurs pour ce mot-cl&eacute;"
-#: ../../../templates/bookmarks.tpl.php:86
+#: data/templates/bookmarks.tpl.php:154
msgid "Only your bookmarks for this tag"
msgstr "Uniquement vos signets pour ce mot-cl&eacute;"
-#: ../../../templates/bookmarks.tpl.php:129
+#: data/templates/bookmarks.tpl.php:177 data/templates/bookmarks.tpl.php:183
+msgid "First"
+msgstr "Première"
+
+#: data/templates/bookmarks.tpl.php:178 data/templates/bookmarks.tpl.php:184
+msgid "Previous"
+msgstr "Précédent"
+
+#: data/templates/bookmarks.tpl.php:191 data/templates/bookmarks.tpl.php:194
+msgid "Next"
+msgstr "Suivant"
+
+#: data/templates/bookmarks.tpl.php:192 data/templates/bookmarks.tpl.php:195
+msgid "Last"
+msgstr "Dernière"
+
+#: data/templates/bookmarks.tpl.php:205
+#, php-format
+msgid "Page %d of %d"
+msgstr "Page %d de %d"
+
+#: data/templates/bookmarks.tpl.php:261
+#, fuzzy
+msgid "Tags:"
+msgstr "Mots-clés"
+
+#: data/templates/bookmarks.tpl.php:267
msgid "Edit"
msgstr "Editer"
-#: ../../../templates/bookmarks.tpl.php:129
-msgid "Delete"
-msgstr "Supprimer"
+#: data/templates/bookmarks.tpl.php:271
+msgid "Last update"
+msgstr ""
-#: ../../../templates/bookmarks.tpl.php:135
+#: data/templates/bookmarks.tpl.php:274
msgid "by"
msgstr "par"
-#: ../../../templates/bookmarks.tpl.php:139
-msgid "to"
-msgstr "dans"
+#: data/templates/bookmarks.tpl.php:276
+msgid "you"
+msgstr "vous"
-#: ../../../templates/bookmarks.tpl.php:147
+#: data/templates/bookmarks.tpl.php:290
#, fuzzy, php-format
msgid " and %s1 other%s"
msgstr " et les autres %s"
-#: ../../../templates/bookmarks.tpl.php:150
+#: data/templates/bookmarks.tpl.php:293
#, fuzzy, php-format
msgid " and %2$s%1$s others%3$s"
msgstr " et les autres %s"
-#: ../../../templates/bookmarks.tpl.php:159
+#: data/templates/bookmarks.tpl.php:304
+#, fuzzy
+msgid "Copy this bookmark to YOUR bookmarks."
+msgstr "Importer les signets depuis un fichier"
+
+#: data/templates/bookmarks.tpl.php:305
msgid "Copy"
msgstr "Copier"
-#: ../../../templates/bookmarks.tpl.php:218
-#: ../../../templates/bookmarks.tpl.php:224
-msgid "First"
-msgstr "Première"
-
-#: ../../../templates/bookmarks.tpl.php:219
-#: ../../../templates/bookmarks.tpl.php:225
-msgid "Previous"
-msgstr "Précédent"
+#: data/templates/bookmarks.tpl.php:325
+msgid "This bookmark is certified by an admin user."
+msgstr ""
-#: ../../../templates/bookmarks.tpl.php:232
-#: ../../../templates/bookmarks.tpl.php:235
-msgid "Next"
-msgstr "Suivant"
+#: data/templates/bookmarks.tpl.php:371
+#, fuzzy
+msgid "Private Note on this bookmark"
+msgstr "Vous n'êtes pas autorisé à éditer ce signet."
-#: ../../../templates/bookmarks.tpl.php:233
-#: ../../../templates/bookmarks.tpl.php:236
-msgid "Last"
-msgstr "Dernière"
+#: data/templates/bookmarks.tpl.php:383
+msgid "Come back to the top of this page."
+msgstr ""
-#: ../../../templates/bookmarks.tpl.php:246
-#, php-format
-msgid "Page %d of %d"
-msgstr "Page %d de %d"
+#: data/templates/bookmarks.tpl.php:383
+msgid "Top of the page"
+msgstr ""
-#: ../../../templates/bookmarks.tpl.php:252
+#: data/templates/bookmarks.tpl.php:389
msgid "No bookmarks available"
msgstr "Pas de signets disponibles."
-#: ../../../templates/dynamictags.inc.php:108
-#: ../../../templates/sidebar.block.common.php:20
-#: ../../../templates/sidebar.block.popular.php:26
-#: ../../../templates/sidebar.block.recent.php:25
-#: ../../../templates/tags.tpl.php:19
+#: data/templates/bottom.inc.php:5 data/templates/toolbar.inc.php:15
+#: data/templates/toolbar.inc.php:28 www/about.php:23 www/about.php:24
+msgid "About"
+msgstr "À propos"
+
+#: data/templates/bottom.inc.php:7
+msgid "Propulsed by "
+msgstr ""
+
+#: data/templates/dynamictags.inc.php:47
+#: data/templates/sidebar.block.common.php:19
+#: data/templates/sidebar.block.popular.php:34
+#: data/templates/sidebar.block.recent.php:29 data/templates/tags.tpl.php:19
msgid "bookmark"
msgid_plural "bookmarks"
msgstr[0] "signet"
msgstr[1] "Signets"
-#: ../../../templates/editbookmark.tpl.php:29
+#: data/templates/dynamictags.inc.php:128
+#: data/templates/sidebar.block.common.php:9
+#: data/templates/sidebar.block.menu.php:74
+#: data/templates/sidebar.block.popular.php:23
+#: data/templates/sidebar.block.recent.php:34
+#: data/templates/toolbar.inc.php:27 www/populartags.php:46
+msgid "Popular Tags"
+msgstr "Mots-cl&eacute;s populaires"
+
+#: data/templates/dynamictags.inc.php:131
+#, fuzzy
+msgid "Popular Tags From All Users"
+msgstr "Mots-cl&eacute;s populaires"
+
+#: data/templates/editbookmark.tpl.php:38
msgid "Address"
msgstr "Adresse"
-#: ../../../templates/editbookmark.tpl.php:31
-#: ../../../templates/editbookmark.tpl.php:36
-#: ../../../templates/editprofile.tpl.php:30
-#: ../../../templates/tagrename.tpl.php:14
-#: ../../../templates/tagrename.tpl.php:19
+#: data/templates/editbookmark.tpl.php:40
+#: data/templates/editbookmark.tpl.php:45
+#: data/templates/editprofile.tpl.php:31 data/templates/tagrename.tpl.php:14
+#: data/templates/tagrename.tpl.php:19
msgid "Required"
msgstr "Requis"
-#: ../../../templates/editbookmark.tpl.php:46
+#: data/templates/editbookmark.tpl.php:50
+msgid "Add Note"
+msgstr ""
+
+#: data/templates/editbookmark.tpl.php:53
+msgid ""
+"You can use anchors to delimite attributes. for example: [publisher]blah[/"
+"publisher] "
+msgstr ""
+
+#: data/templates/editbookmark.tpl.php:56
+msgid "Suggested anchors: "
+msgstr ""
+
+#: data/templates/editbookmark.tpl.php:68
+#, fuzzy
+msgid "Private Note"
+msgstr "Privée"
+
+#: data/templates/editbookmark.tpl.php:70
+msgid "Just visible by you and your contacts."
+msgstr ""
+
+#: data/templates/editbookmark.tpl.php:74 data/templates/toolbar.inc.php:10
+#: www/tags.php:45 www/tags.php:67
+msgid "Tags"
+msgstr "Mots-clés"
+
+#: data/templates/editbookmark.tpl.php:78
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 mot-cl&eacute; dans un autre. ex: europe>france>paris"
+#: data/templates/editbookmark.tpl.php:82 data/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 mot-cl&eacute; dans un autre. ex: "
+"europe>france>paris"
-#: ../../../templates/editbookmark.tpl.php:54
-#: ../../../templates/mot-cl&eacute;2tagadd.tpl.php:8
+#: data/templates/editbookmark.tpl.php:86 data/templates/tag2tagadd.tpl.php:8
msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry"
-msgstr "Note : utiliser \"=\" pour rendre deux mots-cl&eacute;s synonymes ex: europe=eu"
+msgstr ""
+"Note : utiliser \"=\" pour rendre deux mots-cl&eacute;s synonymes ex: "
+"europe=eu"
-#: ../../../templates/editbookmark.tpl.php:57
-#: ../../../templates/importDelicious.tpl.php:15
-#: ../../../templates/importNetscape.tpl.php:16
+#: data/templates/editbookmark.tpl.php:89
+#: data/templates/importDelicious.tpl.php:15
+#: data/templates/importNetscape.tpl.php:16
msgid "Privacy"
msgstr "Vision"
-#: ../../../templates/editbookmark.tpl.php:60
-#: ../../../templates/importDelicious.tpl.php:18
-#: ../../../templates/importNetscape.tpl.php:19
+#: data/templates/editbookmark.tpl.php:92
+#: data/templates/importDelicious.tpl.php:18
+#: data/templates/importNetscape.tpl.php:19
msgid "Public"
msgstr "Publique"
-#: ../../../templates/editbookmark.tpl.php:61
+#: data/templates/editbookmark.tpl.php:93
msgid "Shared with Watch List"
msgstr "Partagé avec liste d'accès"
-#: ../../../templates/editbookmark.tpl.php:62
-#: ../../../templates/importDelicious.tpl.php:20
-#: ../../../templates/importNetscape.tpl.php:21
+#: data/templates/editbookmark.tpl.php:94
+#: data/templates/importDelicious.tpl.php:20
+#: data/templates/importNetscape.tpl.php:21
msgid "Private"
msgstr "Privée"
-#: ../../../templates/editbookmark.tpl.php:74
+#: data/templates/editbookmark.tpl.php:107
msgid "Delete Bookmark"
msgstr "Supprimer le signet"
-#: ../../../templates/editbookmark.tpl.php:101
+#: data/templates/editbookmark.tpl.php:112
+msgid "edit common description"
+msgstr "éditer la description commune"
+
+#: data/templates/editbookmark.tpl.php:139
msgid "Bookmarklet"
msgstr "Bookmarklet"
-#: ../../../templates/editbookmark.tpl.php:102
+#: data/templates/editbookmark.tpl.php:145
+#, fuzzy, php-format
+msgid ""
+"Click one of the following bookmarklets to add a button you can click "
+"whenever you want to add the page you are on to %s"
+msgstr ""
+"Déplacez l'un des 'bookmarklet' suivants dans les marques-pages de votre "
+"navigateur et cliquez dessus chaque fois que vous souhaitez ajouter un "
+"signet pour la page courante dans %s "
+
+#: data/templates/editbookmark.tpl.php:149
#, php-format
-msgid "Drag one of the following bookmarklets to your browser's bookmarks and click it whenever you want to add the page you are on to %s"
-msgstr "Déplacez l'un des 'bookmarklet' suivants dans les marques-pages de votre navigateur et cliquez dessus chaque fois que vous souhaitez ajouter un signet pour la page courante dans %s "
+msgid ""
+"Drag one of the following bookmarklets to your browser's bookmarks and click "
+"it whenever you want to add the page you are on to %s"
+msgstr ""
+"Déplacez l'un des 'bookmarklet' suivants dans les marques-pages de votre "
+"navigateur et cliquez dessus chaque fois que vous souhaitez ajouter un "
+"signet pour la page courante dans %s "
-#: ../../../templates/editbookmark.tpl.php:114
+#: data/templates/editbookmark.tpl.php:162
+#: data/templates/editbookmark.tpl.php:167
#, php-format
msgid "Post to %s"
msgstr "Ajouter à %s"
-#: ../../../templates/editbookmark.tpl.php:115
+#: data/templates/editbookmark.tpl.php:163
+#: data/templates/editbookmark.tpl.php:168
#, php-format
msgid "Post to %s (Pop-up)"
msgstr "Ajouter à %s (Pop-up)"
-#: ../../../templates/editbookmark.tpl.php:119
-#: ../../../templates/importDelicious.tpl.php:26
-#: ../../../templates/importNetscape.tpl.php:27
+#: data/templates/editbookmark.tpl.php:173
+#: data/templates/importDelicious.tpl.php:26
+#: data/templates/importNetscape.tpl.php:27
+#: data/templates/importStructure.tpl.php:16
msgid "Import"
msgstr "Importer"
-#: ../../../templates/editbookmark.tpl.php:121
+#: data/templates/editbookmark.tpl.php:175
msgid "Import bookmarks from bookmark file"
msgstr "Importer les signets depuis un fichier"
-#: ../../../templates/editbookmark.tpl.php:121
+#: data/templates/editbookmark.tpl.php:175
msgid "Internet Explorer, Mozilla Firefox and Netscape"
msgstr "Internet Explorer, Mozilla Firefox et Netscape"
-#: ../../../templates/editbookmark.tpl.php:122
+#: data/templates/editbookmark.tpl.php:176
msgid "Import bookmarks from del.icio.us"
msgstr "Importer les signets depuis del.icio.us"
-#: ../../../templates/editprofile.tpl.php:9
+#: data/templates/editprofile.tpl.php:10
msgid "Account Details"
msgstr "Détail du compte"
-#: ../../../templates/editprofile.tpl.php:13
-#: ../../../templates/login.tpl.php:15
-#: ../../../templates/password.tpl.php:10
-#: ../../../templates/profile.tpl.php:7
-#: ../../../templates/register.tpl.php:16
+#: data/templates/editprofile.tpl.php:14 data/templates/login.tpl.php:21
+#: data/templates/password.tpl.php:10 data/templates/profile.tpl.php:6
+#: data/templates/register.tpl.php:16
msgid "Username"
msgstr "Nom d'utilisateur"
-#: ../../../templates/editprofile.tpl.php:18
+#: data/templates/editprofile.tpl.php:19
msgid "New Password"
msgstr "Nouveau mot de passe"
-#: ../../../templates/editprofile.tpl.php:23
+#: data/templates/editprofile.tpl.php:24
msgid "Confirm Password"
msgstr "Confirmer le mot de passe"
-#: ../../../templates/editprofile.tpl.php:28
-#: ../../../templates/password.tpl.php:14
-#: ../../../templates/register.tpl.php:26
+#: data/templates/editprofile.tpl.php:29 data/templates/password.tpl.php:14
+#: data/templates/register.tpl.php:26
msgid "E-mail"
msgstr "E-mail"
-#: ../../../templates/editprofile.tpl.php:34
+#: data/templates/editprofile.tpl.php:35
msgid "Personal Details"
msgstr "Détails personnels"
-#: ../../../templates/editprofile.tpl.php:38
-#: ../../../templates/profile.tpl.php:12
+#: data/templates/editprofile.tpl.php:39 data/templates/profile.tpl.php:17
msgid "Name"
msgstr "Nom"
-#: ../../../templates/editprofile.tpl.php:42
-#: ../../../templates/profile.tpl.php:18
+#: data/templates/editprofile.tpl.php:43 data/templates/profile.tpl.php:23
msgid "Homepage"
msgstr "Page personnelle"
-#: ../../../templates/editprofile.tpl.php:54
-#: ../../../templates/sidebar.block.tagactions.php:18
-#: ../../../templates/sidebar.block.watchstatus.php:17
+#: data/templates/editprofile.tpl.php:52 www/edit.php:113
+msgid "Save Changes"
+msgstr "Enregistrer les modifications"
+
+#: data/templates/editprofile.tpl.php:55
+#: data/templates/sidebar.block.tagactions.php:17
+#: data/templates/sidebar.block.watchstatus.php:18
#, fuzzy
msgid "Actions"
msgstr "Instructions"
-#: ../../../templates/editprofile.tpl.php:57
+#: data/templates/editprofile.tpl.php:58
msgid "Export bookmarks"
msgstr "Exporter les signets"
-#: ../../../templates/editprofile.tpl.php:59
+#: data/templates/editprofile.tpl.php:60
msgid "HTML file (for browsers)"
msgstr "Fichier HTML (pour navigateurs)"
-#: ../../../templates/editprofile.tpl.php:60
+#: data/templates/editprofile.tpl.php:61
msgid "XML file (like del.icio.us)"
msgstr "Fichier XML (comme del.icio.us)"
-#: ../../../templates/error.404.tpl.php:5
+#: data/templates/editprofile.tpl.php:62
+msgid "CSV file (for spreadsheet tools)"
+msgstr "Fichier CSV (pour les classeurs)"
+
+#: data/templates/error.404.tpl.php:5
msgid "Not Found"
msgstr "Non trouvé"
-#: ../../../templates/error.404.tpl.php:6
+#: data/templates/error.404.tpl.php:6
msgid "The requested URL was not found on this server"
msgstr "L'URL demandée n'a pas été trouvée sur ce serveur."
-#: ../../../templates/error.500.tpl.php:5
+#: data/templates/error.500.tpl.php:5
msgid "General server error"
msgstr "Erreur généralisée du serveur."
-#: ../../../templates/error.500.tpl.php:6
+#: data/templates/error.500.tpl.php:6
msgid "The requested URL could not be processed"
msgstr "L'URL demandée n'a pas été trouvée."
-#: ../../../templates/importDelicious.tpl.php:19
-#: ../../../templates/importNetscape.tpl.php:20
+#: data/templates/importDelicious.tpl.php:19
+#: data/templates/importNetscape.tpl.php:20
#, fuzzy
msgid "Shared with Watchlist"
msgstr "Partagé avec liste d'accès"
-#: ../../../templates/importDelicious.tpl.php:31
-#: ../../../templates/importNetscape.tpl.php:32
+#: data/templates/importDelicious.tpl.php:31
+#: data/templates/importNetscape.tpl.php:32
+#: data/templates/importStructure.tpl.php:21
msgid "Instructions"
msgstr "Instructions"
-#: ../../../templates/importDelicious.tpl.php:33
-msgid "Log in to the <a href=\"http://del.icio.us/api/posts/all\">export page at del.icio.us</a>"
-msgstr "Se connecter à la <a href=\"http://del.icio.us/api/posts/all\">page d'export de del.icio.us</a>"
+#: data/templates/importDelicious.tpl.php:33
+msgid ""
+"Log in to the <a href=\"http://del.icio.us/api/posts/all\">export page at "
+"del.icio.us</a>"
+msgstr ""
+"Se connecter à la <a href=\"http://del.icio.us/api/posts/all\">page d'export "
+"de del.icio.us</a>"
-#: ../../../templates/importDelicious.tpl.php:34
-msgid "Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> file to your computer"
-msgstr "Enregistrer le fichier <abbr title=\"Extensible Markup Language\">XML</abbr> résultant sur votre ordinateur"
+#: data/templates/importDelicious.tpl.php:34
+msgid ""
+"Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> "
+"file to your computer"
+msgstr ""
+"Enregistrer le fichier <abbr title=\"Extensible Markup Language\">XML</abbr> "
+"résultant sur votre ordinateur"
-#: ../../../templates/importDelicious.tpl.php:35
-msgid "Click <kbd>Browse...</kbd> to find this file on your computer. The maximum size the file can be is 1MB"
-msgstr "Cliquez sur <kbd>Parcourir...</kbd> pour trouver le fichier sur votre ordinateur. La taille maximale du fichier ne peut excèder 1Mo"
+#: data/templates/importDelicious.tpl.php:35
+msgid ""
+"Click <kbd>Browse...</kbd> to find this file on your computer. The maximum "
+"size the file can be is 1MB"
+msgstr ""
+"Cliquez sur <kbd>Parcourir...</kbd> pour trouver le fichier sur votre "
+"ordinateur. La taille maximale du fichier ne peut excèder 1Mo"
-#: ../../../templates/importDelicious.tpl.php:36
-#: ../../../templates/importNetscape.tpl.php:43
+#: data/templates/importDelicious.tpl.php:36
+#: data/templates/importNetscape.tpl.php:43
msgid "Select the default privacy setting for your imported bookmarks"
msgstr "Selectionnez la vision par défaut à appliquer à vos signets importés"
-#: ../../../templates/importDelicious.tpl.php:37
-#: ../../../templates/importNetscape.tpl.php:44
-msgid "Click <kbd>Import</kbd> to start importing the bookmarks; it may take a minute"
-msgstr "Cliquez sur <kbd>Importer</kbd> pour débuter l'import des signets; cette opération peut prendre quelques minutes"
+#: data/templates/importDelicious.tpl.php:37
+#: data/templates/importNetscape.tpl.php:44
+msgid ""
+"Click <kbd>Import</kbd> to start importing the bookmarks; it may take a "
+"minute"
+msgstr ""
+"Cliquez sur <kbd>Importer</kbd> pour débuter l'import des signets; cette "
+"opération peut prendre quelques minutes"
-#: ../../../templates/importNetscape.tpl.php:35
+#: data/templates/importNetscape.tpl.php:35
msgid "Export your bookmarks from your browser to a file"
msgstr "Exporter vos signets dans un fichier depuis votre navigateur"
-#: ../../../templates/importNetscape.tpl.php:37
-msgid "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
-msgstr "Internet Explorer: <kbd>Ficher &gt; Importer et Exporter... &gt; Exporter les favoris"
+#: data/templates/importNetscape.tpl.php:37
+msgid ""
+"Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
+msgstr ""
+"Internet Explorer: <kbd>Ficher &gt; Importer et Exporter... &gt; Exporter "
+"les favoris"
-#: ../../../templates/importNetscape.tpl.php:38
-msgid "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; Export..."
-msgstr "Mozilla Firefox: <kbd>Marques-pages &gt; Gérer les marques-pages... &gt; Fichier &gt; Exporter..."
+#: data/templates/importNetscape.tpl.php:38
+msgid ""
+"Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
+"Export..."
+msgstr ""
+"Mozilla Firefox: <kbd>Marques-pages &gt; Gérer les marques-pages... &gt; "
+"Fichier &gt; Exporter..."
-#: ../../../templates/importNetscape.tpl.php:39
-msgid "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
-msgstr "Netscape: <kbd>Marques-pages &gt; Gérer les marques-pages... &gt; Outils &gt; Exporter..."
+#: data/templates/importNetscape.tpl.php:39
+msgid ""
+"Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
+msgstr ""
+"Netscape: <kbd>Marques-pages &gt; Gérer les marques-pages... &gt; Outils "
+"&gt; Exporter..."
+
+#: data/templates/importNetscape.tpl.php:42
+msgid ""
+"Click <kbd>Browse...</kbd> to find the saved bookmark file on your computer. "
+"The maximum size the file can be is 1MB"
+msgstr ""
+"Cliquez sur <kbd>Parcourir...</kbd> pour trouver le fichier sur votre "
+"ordinateur. La taille maximale du fichier ne peut excèder 1Mo"
-#: ../../../templates/importNetscape.tpl.php:42
-msgid "Click <kbd>Browse...</kbd> to find the saved bookmark file on your computer. The maximum size the file can be is 1MB"
-msgstr "Cliquez sur <kbd>Parcourir...</kbd> pour trouver le fichier sur votre ordinateur. La taille maximale du fichier ne peut excèder 1Mo"
+#: data/templates/importStructure.tpl.php:24
+msgid "Create your structure into a simple text file and following this model:"
+msgstr ""
+
+#: data/templates/importStructure.tpl.php:35
+msgid ""
+"Then import the file. The tags and their relations will be added to your "
+"profile."
+msgstr ""
+
+#: data/templates/login.tpl.php:13
+msgid "Please activate cookies"
+msgstr ""
-#: ../../../templates/login.tpl.php:20
-#: ../../../templates/register.tpl.php:21
+#: data/templates/login.tpl.php:26 data/templates/register.tpl.php:21
msgid "Password"
msgstr "Mot de passe"
-#: ../../../templates/login.tpl.php:22
+#: data/templates/login.tpl.php:28
msgid "Don't ask for my password for 2 weeks"
msgstr "Ne pas demander mon mot de passe pendant 2 semaines"
-#: ../../../templates/login.tpl.php:30
+#: data/templates/login.tpl.php:32 data/templates/toolbar.inc.php:29
+#: www/login.php:57
+msgid "Log In"
+msgstr "Se connecter"
+
+#: data/templates/login.tpl.php:36
msgid "Forgotten your password?"
msgstr "Avez-vous oublié votre mot de passe ?"
-#: ../../../templates/password.tpl.php:5
+#: data/templates/password.tpl.php:5
#, php-format
-msgid "If you have forgotten your password, %s can generate a new one. Enter the username and e-mail address of your account into the form below and we will e-mail your new password to you."
-msgstr "Si vous avez oublié votre mot de passe, %s peut en générer un nouveau. Entrez le nom d'utilisateur et l'adresse email de votre compte dans le formulaire ci-dessous et nous vous enverrons un nouveau mot de passe."
+msgid ""
+"If you have forgotten your password, %s can generate a new one. Enter the "
+"username and e-mail address of your account into the form below and we will "
+"e-mail your new password to you."
+msgstr ""
+"Si vous avez oublié votre mot de passe, %s peut en générer un nouveau. "
+"Entrez le nom d'utilisateur et l'adresse email de votre compte dans le "
+"formulaire ci-dessous et nous vous enverrons un nouveau mot de passe."
-#: ../../../templates/password.tpl.php:19
+#: data/templates/password.tpl.php:19
msgid "Generate Password"
msgstr "Générer un mot de passe"
-#: ../../../templates/profile.tpl.php:23
+#: data/templates/profile.tpl.php:11
+#, fuzzy
+msgid "Email"
+msgstr "E-mail"
+
+#: data/templates/profile.tpl.php:28
msgid "Member Since"
msgstr "Membre depuis"
-#: ../../../templates/profile.tpl.php:35
-#: ../../../templates/sidebar.block.watchlist.php:8
+#: data/templates/profile.tpl.php:40
+#: data/templates/sidebar.block.watchlist.php:30
#, fuzzy
msgid "Watching"
-msgstr "Liste des signets vus"
+msgstr "Él&eacute;ments surveill&eacute;s"
-#: ../../../templates/profile.tpl.php:50
+#: data/templates/profile.tpl.php:55
+#: data/templates/sidebar.block.watchlist.php:52
#, fuzzy
msgid "Watched By"
-msgstr "Consultés"
+msgstr "Surveill&eacute; par"
-#: ../../../templates/profile.tpl.php:63
-#: ../../../templates/toolbar.inc.php:10
+#: data/templates/profile.tpl.php:68 data/templates/toolbar.inc.php:9
msgid "Bookmarks"
msgstr "Signets"
-#: ../../../templates/profile.tpl.php:64
+#: data/templates/profile.tpl.php:69
msgid "Go to bookmarks"
msgstr "Aller aux signets"
-#: ../../../templates/register.tpl.php:11
+#: data/templates/register.tpl.php:11
#, php-format
-msgid "Sign up here to create a free %s account. All the information requested below is required"
-msgstr "Enregistrez-vous ici pour créer un compte gratuit %s. Toutes les informations requises ci-dessous sont nécessaires."
+msgid ""
+"Sign up here to create a free %s account. All the information requested "
+"below is required"
+msgstr ""
+"Enregistrez-vous ici pour créer un compte gratuit %s. Toutes les "
+"informations requises ci-dessous sont nécessaires."
+
+#: data/templates/register.tpl.php:18
+msgid ""
+" at least 5 characters, alphanumeric (no spaces, no dots or other special "
+"ones)"
+msgstr ""
-#: ../../../templates/register.tpl.php:33
+#: data/templates/register.tpl.php:28
+msgid " to send you your password if you forget it"
+msgstr ""
+
+#: data/templates/register.tpl.php:33
msgid "Antispam question"
msgstr "Question antispam"
-#: ../../../templates/sidebar.block.linked.php:41
+#: data/templates/register.tpl.php:41 data/templates/toolbar.inc.php:31
+#: www/register.php:83
+msgid "Register"
+msgstr "S'enregistrer"
+
+#: data/templates/search.menu.php:27
+#, fuzzy
+msgid "Search..."
+msgstr "Chercher dans"
+
+#: data/templates/search.menu.php:28
+#, fuzzy
+msgid "in"
+msgstr "Ligne"
+
+#: data/templates/search.menu.php:34
+msgid "this user's bookmarks"
+msgstr "les signets de cet utilisateur"
+
+#: data/templates/search.menu.php:39
+msgid "my bookmarks"
+msgstr "mes signets"
+
+#: data/templates/search.menu.php:40
+msgid "my watchlist"
+msgstr "ma liste de suivi"
+
+#: data/templates/search.menu.php:44
+msgid "all bookmarks"
+msgstr "tous les signets"
+
+#: data/templates/search.menu.php:54
+msgid "Search"
+msgstr "Chercher dans"
+
+#: data/templates/sidebar.block.linked.php:51
msgid "Linked Tags"
msgstr "Mots-cl&eacute;s structurés"
-#: ../../../templates/sidebar.block.linked.php:55
-#: ../../../templates/sidebar.block.menu.php:40
+#: data/templates/sidebar.block.linked.php:62
+#: data/templates/sidebar.block.menu.php:46
msgid "Add new link"
msgstr "Créer un lien"
-#: ../../../templates/sidebar.block.linked.php:56
-#: ../../../templates/sidebar.block.menu.php:41
+#: data/templates/sidebar.block.linked.php:63
+#: data/templates/sidebar.block.menu.php:47
msgid "Delete link"
msgstr "Supprimer un lien"
-#: ../../../templates/sidebar.block.menu.php:29
+#: data/templates/sidebar.block.menu.php:35
#, php-format
msgid "Tags included into the tag '%s'"
msgstr "Mots-cl&eacute;s inclus dans le mot-cl&eacute; '%s'"
-#: ../../../templates/sidebar.block.menu.php:29
+#: data/templates/sidebar.block.menu.php:35
msgid "Menu Tags"
msgstr "Mots-cl&eacute;s Menu"
-#: ../../../templates/sidebar.block.menu.php:62
+#: data/templates/sidebar.block.menu.php:68
msgid "See all your tags"
msgstr "Voir tous vos mots-cl&eacute;s"
-#: ../../../templates/sidebar.block.menu.php:62
+#: data/templates/sidebar.block.menu.php:68
msgid "all your tags"
msgstr "Tous vos mots-cl&eacute;s"
-#: ../../../templates/sidebar.block.menu.php:64
+#: data/templates/sidebar.block.menu.php:70
msgid "See all tags from this user"
msgstr "Voir tous les mots-cl&eacute;s de cet utilisateur"
-#: ../../../templates/sidebar.block.menu.php:64
+#: data/templates/sidebar.block.menu.php:70
msgid "all tags from this user"
msgstr "tous les mots-cl&eacute;s de cet utilisateur"
-#: ../../../templates/sidebar.block.menu.php:68
+#: data/templates/sidebar.block.menu.php:74
#, fuzzy
msgid "See popular tags"
msgstr "Voir tous vos mots-cl&eacute;s"
-#: ../../../templates/sidebar.block.recent.php:15
+#: data/templates/sidebar.block.menu2.php:25
+#, fuzzy
+msgid "Featured Menu Tags"
+msgstr "Mots-cl&eacute;s Menu"
+
+#: data/templates/sidebar.block.menu2.php:29
+msgid "This menu is composed of keywords (tags) organized by admins."
+msgstr ""
+
+#: data/templates/sidebar.block.recent.php:18
msgid "Recent Tags"
msgstr "Mots-cl&eacute;s récents"
-#: ../../../templates/sidebar.block.related.php:17
+#: data/templates/sidebar.block.related.php:26
msgid "Related Tags"
msgstr "Mots-cl&eacute;s en relation"
-#: ../../../templates/sidebar.block.search.php:15
+#: data/templates/sidebar.block.search.php:15
msgid "Last Searches"
msgstr "Dernières recherches"
-#: ../../../templates/sidebar.block.search.php:24
+#: data/templates/sidebar.block.search.php:24
msgid "Number of bookmarks for this query"
msgstr "Nombre de signets pour cette recherche"
-#: ../../../templates/sidebar.block.tagactions.php:29
+#: data/templates/sidebar.block.tagactions.php:9 www/tagrename.php:72
+msgid "Rename Tag"
+msgid_plural "Rename Tags"
+msgstr[0] "Renommer le mot-cl&eacute;"
+msgstr[1] "Renommer les mots-cl&eacute;s"
+
+#: data/templates/sidebar.block.tagactions.php:22 www/tagdelete.php:54
+msgid "Delete Tag"
+msgstr "Supprimer le mot-cl&eacute;"
+
+#: data/templates/sidebar.block.tagactions.php:24 www/tagedit.php:61
+msgid "Edit Tag Description"
+msgstr "Editer la description du mot-cl&eacute;"
+
+#: data/templates/sidebar.block.tagactions.php:26
+#: www/tagcommondescriptionedit.php:76
+msgid "Edit Tag Common Description"
+msgstr "Editer la description commune du mot-cl&eacute;"
+
+#: data/templates/sidebar.block.tagactions.php:28
msgid "Create a link to another tag"
msgstr "Créer un lien vers un autre mot-cl&eacute;"
-#: ../../../templates/sidebar.block.users.php:13
-msgid "Last Users"
-msgstr "Derniers utilisateurs"
+#: data/templates/sidebar.block.users.php:14
+#, fuzzy
+msgid "New Users"
+msgstr "Utilisateurs"
-#: ../../../templates/sidebar.block.users.php:22
-#: ../../../templates/users.tpl.php:17
+#: data/templates/sidebar.block.users.php:23 data/templates/users.tpl.php:17
msgid "bookmarks"
msgstr "signets"
-#: ../../../templates/sidebar.block.users.php:29
+#: data/templates/sidebar.block.users.php:30
#, fuzzy
msgid "See all users"
msgstr "Voir tous vos mots-cl&eacute;s"
-#: ../../../templates/sidebar.block.users.php:29
+#: data/templates/sidebar.block.users.php:30
msgid "All users"
msgstr "Tous les utilisateurs"
-#: ../../../templates/sidebar.block.watchstatus.php:10
+#: data/templates/sidebar.block.watchlist.php:19
+msgid "Close contacts are mutual contacts"
+msgstr ""
+
+#: data/templates/sidebar.block.watchlist.php:19
+msgid "Close contacts"
+msgstr ""
+
+#: data/templates/sidebar.block.watchlist.php:36
+msgid "Add a contact..."
+msgstr ""
+
+#: data/templates/sidebar.block.watchlist.php:36
+msgid "Type a username to add it to your contacts."
+msgstr ""
+
+#: data/templates/sidebar.block.watchlist.php:44
+#, fuzzy
+msgid "Remove this contact"
+msgstr "Enlever de la liste des consultés"
+
+#: data/templates/sidebar.block.watchstatus.php:11
msgid "Remove from Watchlist"
msgstr "Enlever de la liste des consultés"
-#: ../../../templates/sidebar.block.watchstatus.php:12
+#: data/templates/sidebar.block.watchstatus.php:13
msgid "Add to Watchlist"
msgstr "Ajouter à la liste des consultés"
-#: ../../../templates/sidebar.linkedtags.inc.php:18
+#: data/templates/sidebar.linkedtags.inc.php:18
msgid "Edit link"
msgstr "Editer un lien"
-#: ../../../templates/sidebar.linkedtags.inc.php:45
+#: data/templates/sidebar.linkedtags.inc.php:47
msgid "Synonyms:"
msgstr "Synonymes :"
-#: ../../../templates/tag2tagadd.tpl.php:12
+#: data/templates/tag2tagadd.tpl.php:12
msgid "Create new link:"
msgstr "Créer un nouveau lien"
-#: ../../../templates/tag2tagadd.tpl.php:19
+#: data/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 mot-cl&eacute; dans le mot-cl&eacute; '%s' (e.g. %s>countries) affiche ce mot-cl&eacute; dans la boîte de menu"
+msgid ""
+"Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into "
+"the menu box"
+msgstr ""
+"Note : inclure un mot-cl&eacute; dans le mot-cl&eacute; '%s' (e.g. %"
+"s>countries) affiche ce mot-cl&eacute; dans la boîte de menu"
-#: ../../../templates/tag2tagadd.tpl.php:23
-#: ../../../templates/tag2tagedit.tpl.php:37
+#: data/templates/tag2tagadd.tpl.php:23 data/templates/tag2tagedit.tpl.php:37
msgid "Create"
msgstr "Créer"
-#: ../../../templates/tag2tagadd.tpl.php:35
-#: ../../../templates/tag2tagdelete.tpl.php:27
-#: ../../../templates/tag2tagedit.tpl.php:51
+#: data/templates/tag2tagadd.tpl.php:35
+#: data/templates/tag2tagdelete.tpl.php:27
+#: data/templates/tag2tagedit.tpl.php:51
msgid "Existing links:"
msgstr "Liens existants :"
-#: ../../../templates/tag2tagadd.tpl.php:53
-#: ../../../templates/tag2tagdelete.tpl.php:45
-#: ../../../templates/tag2tagedit.tpl.php:69
+#: data/templates/tag2tagadd.tpl.php:53
+#: data/templates/tag2tagdelete.tpl.php:45
+#: data/templates/tag2tagedit.tpl.php:69
msgid "No links"
msgstr "Pas de liens"
-#: ../../../templates/tag2tagedit.tpl.php:6
+#: data/templates/tag2tagdelete.tpl.php:15
+#: data/templates/tag2tagedit.tpl.php:16 data/templates/tagdelete.tpl.php:8
+#: www/jsScuttle.php:23
+msgid "Yes"
+msgstr "Oui"
+
+#: data/templates/tag2tagdelete.tpl.php:16
+#: data/templates/tag2tagedit.tpl.php:17 data/templates/tagdelete.tpl.php:9
+#: www/jsScuttle.php:23
+msgid "No"
+msgstr "Non"
+
+#: data/templates/tag2tagedit.tpl.php:6
msgid "Delete the link"
msgstr "Supprimer le lien"
-#: ../../../templates/tag2tagedit.tpl.php:29
+#: data/templates/tag2tagedit.tpl.php:29
msgid "Create new link"
msgstr "Créer un nouveau lien"
-#: ../../../templates/tagrename.tpl.php:12
+#: data/templates/tagrename.tpl.php:12
msgid "Old"
msgstr "Ancien"
-#: ../../../templates/tagrename.tpl.php:17
+#: data/templates/tagrename.tpl.php:17
msgid "New"
msgstr "Nouveau"
-#: ../../../templates/tagrename.tpl.php:24
+#: data/templates/tagrename.tpl.php:24
msgid "Rename"
msgstr "Renommer"
-#: ../../../templates/tags.tpl.php:11
-#: ../../../templates/users.tpl.php:9
+#: data/templates/tags.tpl.php:11 data/templates/users.tpl.php:9
msgid "Alphabet"
msgstr "Alphabet"
-#: ../../../templates/tags.tpl.php:12
-#: ../../../templates/users.tpl.php:10
+#: data/templates/tags.tpl.php:12 data/templates/users.tpl.php:10
msgid "Popularity"
msgstr "Popularité"
-#: ../../../templates/toolbar.inc.php:15
+#: data/templates/toolbar.inc.php:8 data/templates/toolbar.inc.php:26
+#, fuzzy
+msgid "Home"
+msgstr "Page personnelle"
+
+#: data/templates/toolbar.inc.php:11 www/watchlist.php:106
+#, fuzzy
+msgid "Watchlist"
+msgstr "Liste des signets vus"
+
+#: data/templates/toolbar.inc.php:12 www/profile.php:67
+msgid "Profile"
+msgstr "Profil"
+
+#: data/templates/toolbar.inc.php:13 www/bookmarks.php:209
+msgid "Add a Bookmark"
+msgstr "Ajouter un signet"
+
+#: data/templates/toolbar.inc.php:14
msgid "Log Out"
msgstr "Quitter"
-#: ../../../templates/users.tpl.php:17
+#: data/templates/toolbar.inc.php:17
+msgid "Admin"
+msgstr ""
+
+#: data/templates/top.inc.php:49
+msgid ""
+"Admins, your installation is in \"Debug Mode\" ($debugMode = true). To go in "
+"\"Normal Mode\" and hide debugging messages, change $debugMode to false into "
+"config.php."
+msgstr ""
+
+#: data/templates/users.tpl.php:17
msgid "profile"
msgstr "Profil"
-#: ../../../templates/users.tpl.php:17
+#: data/templates/users.tpl.php:17
msgid "created in"
msgstr "Créé en "
+#: www/admin.php:32
+msgid "Manage users"
+msgstr ""
+
+#: www/admin.php:68
+#, php-format
+msgid "%s and all his bookmarks and tags were deleted."
+msgstr ""
+
+#: www/admin.php:75
+msgid "Problem with "
+msgstr ""
+
+#: www/ajaxDelete.php:37
+msgid "You are not allowed to delete this bookmark"
+msgstr "Vous n'êtes pas autorisés à supprimer ce signet"
+
+#: www/ajaxDelete.php:41 www/edit.php:103
+msgid "Failed to delete bookmark"
+msgstr "Erreur dans la suppression du signet"
+
+#: www/alltags.php:50
+msgid "All Tags"
+msgstr "Tous les mots-cl&eacute;s"
+
+#: www/alltags.php:56 www/bookmarks.php:96 www/populartags.php:52
+#: www/profile.php:51 www/rss.php:76 www/search.php:109 www/watch.php:45
+#: www/watchlist.php:61
+#, php-format
+msgid "User with username %s was not found"
+msgstr "L'utilisateur %s n'a pas été trouvé."
+
+#: www/bookmarkcommondescriptionedit.php:51 www/tag2tagadd.php:37
+#: www/tag2tagdelete.php:41 www/tag2tagedit.php:33
+#: www/tagcommondescriptionedit.php:51 www/tagedit.php:43
+msgid "Permission denied."
+msgstr "Permission non accordée."
+
+#: www/bookmarkcommondescriptionedit.php:60
+msgid "Bookmark common description updated"
+msgstr "Description commune du signet mise à jour."
+
+#: www/bookmarkcommondescriptionedit.php:63
+msgid "Failed to update the bookmark common description"
+msgstr "Erreur dans la mise à jour de la description du signet"
+
+#: www/bookmarkcommondescriptionedit.php:71
+msgid "Edit Bookmark Common Description"
+msgstr "Editer la description commune du signet"
+
+#: www/bookmarks.php:111 www/tags.php:47
+#, fuzzy
+msgid "Remove the tag from the selection"
+msgstr "Voir tous les mots-cl&eacute;s de cet utilisateur"
+
+#: www/bookmarks.php:131 www/edit.php:65
+msgid "Your bookmark must have a title and an address"
+msgstr "Votre signet doit avoir un titre et une adresse."
+
+#: www/bookmarks.php:152 www/edit.php:83 www/edit.php:86
+msgid "Bookmark saved"
+msgstr "Signet enregistré."
+
+#: www/bookmarks.php:152
+msgid "(Come back to previous page.)"
+msgstr ""
+
+#: www/bookmarks.php:159 www/import.php:106 www/importNetscape.php:108
+msgid ""
+"There was an error saving your bookmark. Please try again or contact the "
+"administrator."
+msgstr ""
+"Il y a eu une erreur en enregistrant ce signet. Veuillez rééssayer ou "
+"contacter votre administrateur."
+
+#: www/bookmarks.php:216
+msgid "Add Bookmark"
+msgstr "Ajouter signet"
+
+#: www/bookmarks.php:219
+msgid "You must be logged in before you can add bookmarks."
+msgstr "Vous devez être authentifié avant de pouvoir ajouter des signets."
+
+#: www/bookmarks.php:274 www/bookmarks.php:275
+msgid "My Bookmarks"
+msgstr "Mes signets"
+
+#: www/edit.php:44 www/edit.php:45
+msgid "Edit Bookmark"
+msgstr "Editer le signet"
+
+#: www/edit.php:51
+#, php-format
+msgid "Bookmark with id %s not was not found"
+msgstr "Signet %s non trouvé"
+
+#: www/edit.php:57
+msgid "You are not allowed to edit this bookmark"
+msgstr "Vous n'êtes pas autorisé à éditer ce signet."
+
+#: www/edit.php:77
+msgid "Error while saving your bookmark"
+msgstr "Erreur pendant l'enregistrement de votre signet."
+
+#: www/history.php:61
+msgid "History"
+msgstr "Historique"
+
+#: www/history.php:62
+#, php-format
+msgid "History for %s"
+msgstr "Historique de %s"
+
+#: www/history.php:84
+msgid "Address was not found"
+msgstr "L'adresse n'a pas été trouvée."
+
+#: www/import.php:47
+msgid "Could not open XML input"
+msgstr "Impossible d'ouvrir le flux XML."
+
+#: www/import.php:51
+#, php-format
+msgid "XML error: %s at line %d"
+msgstr "Erreur XML: %s à la ligne %d"
+
+#: www/import.php:60
+msgid "Import Bookmarks from del.icio.us"
+msgstr "Importer les signet depuis del.icio.us"
+
+#: www/import.php:93
+msgid "You have already submitted this bookmark."
+msgstr "Vous avez déjà enregistré ce signet."
+
+#: www/import.php:104
+msgid "Bookmark imported."
+msgstr "Signet importé."
+
+#: www/importNetscape.php:95
+#, fuzzy
+msgid "You have already submitted some of these bookmarks."
+msgstr "Vous avez déjà enregistré ce signet."
+
+#: www/importNetscape.php:115
+#, fuzzy
+msgid "Bookmarks found: "
+msgstr "Pas de signets trouvés"
+
+#: www/importNetscape.php:116
+#, fuzzy
+msgid "Bookmarks imported: "
+msgstr "Signet importé."
+
+#: www/importNetscape.php:117 www/importNetscape.php:122
+msgid "Import Bookmarks from Browser File"
+msgstr "Importer les signets depuis un fichier"
+
+#: www/importStructure.php:61
+msgid "Bad indentation"
+msgstr ""
+
+#: www/importStructure.php:67
+#, fuzzy
+msgid "New links between tags: "
+msgstr "Effacer un lien entre mots-cl&eacute;s"
+
+#: www/importStructure.php:72
+msgid "Import Structure"
+msgstr ""
+
+#: www/index.php:38
+msgid "You have now logged out"
+msgstr "Vous êtes maintenant déconnecté."
+
+#: www/index.php:45
+#, php-format
+msgid "%s: Recent bookmarks"
+msgstr "%s: Signets récents"
+
+#: www/index.php:75
+msgid "Store, share and tag your favourite links"
+msgstr "Conservez, partagez et libellez vos liens favoris"
+
+#: www/index.php:76
+msgid "All Bookmarks"
+msgstr "Tous les signets"
+
+#: www/jsScuttle.php:70
+msgid "Available"
+msgstr "Disponible"
+
+#: www/jsScuttle.php:73
+msgid "Not Available"
+msgstr "Non Disponible"
+
+#: www/login.php:48
+msgid "The details you have entered are incorrect. Please try again."
+msgstr ""
+"Les informations que vous avez entrées sont incorrectes. Veuillez "
+"recommencer."
+
+#: www/password.php:36
+msgid "You must enter your username."
+msgstr "Vous devez entrer votre nom d'utilisateur."
+
+#: www/password.php:40
+msgid ""
+"You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"Vous <em>devez</em> saisir une <abbr title=\"adresse électronique\">E-mail</"
+"abbr>."
+
+#: www/password.php:48
+msgid "No matches found for that username."
+msgstr "Rien de trouvé pour ce nom d'utilisateur."
+
+#: www/password.php:51
+#, fuzzy
+msgid ""
+"No matches found for that combination of username and <abbr title="
+"\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"Nous n'avons rien trouvé pour cette combinaison de nom d'utilisateur et "
+"d'<abbr title=\"adresse mail\">e-mail</abbr>."
+
+#: www/password.php:59
+msgid ""
+"There was an error while generating your new password. Please try again."
+msgstr ""
+"Il y a eu une erreur en enregistrant ce signet. Veuillez rééssayer ou "
+"contacter votre administrateur."
+
+#: www/password.php:63
+msgid "Your new password is:"
+msgstr "Votre nouveau mot de passe est:"
+
+#: www/password.php:63
+msgid ""
+"To keep your bookmarks secure, you should change this password in your "
+"profile the next time you log in."
+msgstr ""
+"Pour garder vos signets sûrs, vous devriez changer ce mot de passe dans "
+"votre profil lors de votre prochaine authentification."
+
+#: www/password.php:66
+#, php-format
+msgid "%s Account Information"
+msgstr "Informations du compte de %s"
+
+#: www/password.php:68
+#, php-format
+msgid "New password generated and sent to %s"
+msgstr "Nouveau mot de passe généré et envoyé à l'adresse %s"
+
+#: www/password.php:75
+msgid "Forgotten Password"
+msgstr "Mot de passe oublié"
+
+#: www/profile.php:59 www/watchlist.php:119
+msgid "Username was not specified"
+msgstr "Le nom d'utilisateur n'a pas été spécifié."
+
+#: www/profile.php:65
+msgid "My Profile"
+msgstr "Mon Profil"
+
+#: www/profile.php:89
+msgid "Invalid Token"
+msgstr ""
+
+#: www/profile.php:94
+msgid "Password and confirmation do not match."
+msgstr "Le mot de passe et sa vérification ne correspondent pas."
+
+#: www/profile.php:98
+msgid "Password must be at least 6 characters long."
+msgstr "Le mot de passe doit avoir au moins 6 caractères."
+
+#: www/profile.php:102
+msgid "E-mail address is not valid."
+msgstr "Adresse de courrier électronique invalide."
+
+#: www/profile.php:106
+msgid "An error occurred while saving your changes."
+msgstr ""
+"Une erreur s'est produite pendant l'enregistrement de vos modifications."
+
+#: www/profile.php:108
+msgid "Changes saved."
+msgstr "Modifications enregistrées."
+
+#: www/register.php:46
+msgid "You <em>must</em> enter a username, password and e-mail address."
+msgstr ""
+"Vous <em>devez</em> saisir un nom d'utilisateur, un mot de passe, un nom et "
+"un <abbr title=\"adresse électronique\">e-mail</abbr>"
+
+#: www/register.php:50
+msgid "This username has been reserved, please make another choice."
+msgstr "Ce nom d'utilisateur existe déjà, veuillez en choisir un autre."
+
+#: www/register.php:54
+msgid "This username already exists, please make another choice."
+msgstr "Ce nom d'utilisateur existe déjà, veuillez en choisir un autre."
+
+#: www/register.php:58
+#, fuzzy
+msgid ""
+"This username is not valid (too short, too long, forbidden characters...), "
+"please make another choice."
+msgstr "Ce nom d'utilisateur existe déjà, veuillez en choisir un autre."
+
+#: www/register.php:62
+msgid "E-mail address is not valid. Please try again."
+msgstr "Adresse de courrier électronique invalide. Veuilez réessayer."
+
+#: www/register.php:66
+msgid "Antispam answer is not valid. Please try again."
+msgstr "La réponse antispam n'est pas valide. Veuillez réessayer."
+
+#: www/register.php:75
+msgid "You have successfully registered. Enjoy!"
+msgstr "Votre inscription a bien été prise en compte !"
+
+#: www/register.php:77
+msgid "Registration failed. Please try again."
+msgstr "Enregistrement raté. Veuillez rééssayer."
+
+#: www/rss.php:93
+#, php-format
+msgid "Recent bookmarks posted to %s"
+msgstr "Signets ajoutés récemment à %s"
+
+#: www/search.php:81 www/search.php:145
+msgid "Search Bookmarks"
+msgstr "Recherche de signets"
+
+#: www/search.php:87
+msgid "Search Results"
+msgstr "Résultats de recherche"
+
+#: www/search.php:135
+msgid "Unsatisfied? You can also try our "
+msgstr ""
+
+#: www/tag2tagadd.php:50
+msgid "Tag link created"
+msgstr "Lien entre mot-cl&eacute; créé."
+
+#: www/tag2tagadd.php:53
+msgid "Failed to create the link"
+msgstr "Impossible de créer le lien"
+
+#: www/tag2tagadd.php:65
+msgid "Add Tag Link"
+msgstr "Ajout d'un lien entre mots-cl&eacute;s"
+
+#: www/tag2tagdelete.php:66
+msgid "Tag link deleted"
+msgstr "Effacement d'un lien entre mots-cl&eacute;s"
+
+#: www/tag2tagdelete.php:69
+msgid "Failed to delete the link"
+msgstr "Impossible d'effacer le lien"
+
+#: www/tag2tagdelete.php:81
+msgid "Delete Link Between Tags"
+msgstr "Effacer un lien entre mots-cl&eacute;s"
+
+#: www/tag2tagedit.php:55
+msgid "Edit Link Between Tags"
+msgstr "Editer un lien entre mots-cl&eacute;s"
+
+#: www/tagcommondescriptionedit.php:62
+msgid "Tag common description updated"
+msgstr "Editer la description commune du mot-cl&eacute;"
+
+#: www/tagcommondescriptionedit.php:67
+msgid "Failed to update the tag common description"
+msgstr "Impossible de mettre à jour la description commune du mot-cl&eacute;"
+
+#: www/tagdelete.php:43
+msgid "Tag deleted"
+msgstr "Mot-cl&eacute; effacé"
+
+#: www/tagdelete.php:46
+msgid "Failed to delete the tag"
+msgstr "Impossible d'effacer le mot-cl&eacute;"
+
+#: www/tagedit.php:52
+msgid "Tag description updated"
+msgstr "Description du mot-cl&eacute; mise à jour"
+
+#: www/tagedit.php:55
+msgid "Failed to update the tag description"
+msgstr "Impossible de mettre à jour la description du mot-cl&eacute;"
+
+#: www/tagrename.php:63
+msgid "Tag renamed"
+msgstr "Mot-cl&eacute; renommé"
+
+#: www/tagrename.php:66
+msgid "Failed to rename the tag"
+msgstr "Erreur dans le renommage du mot-cl&eacute;"
+
+#: www/users.php:31
+msgid "Users"
+msgstr "Utilisateurs"
+
+#: www/watch.php:54
+msgid "User removed from your watchlist"
+msgstr "Utilisateur enlevé de votre liste des consultés"
+
+#: www/watch.php:56
+msgid "User added to your watchlist"
+msgstr "Utilisateur ajouté à la liste des consultés."
+
+#: www/watchlist.php:104
+#, fuzzy
+msgid "My Watchlist"
+msgstr "Ma liste de suivi"
+
+#: www/api/httpauth.inc.php:11
+msgid "Use of the API calls requires authentication."
+msgstr ""
+
+#: www/gsearch/index.php:27
+msgid "Come back to "
+msgstr ""
+
+#: www/gsearch/index.php:32
+msgid "Admin tips: "
+msgstr ""
+
+#: www/gsearch/index.php:33
+msgid "To refresh manually Google Custom Search Engine, goes to: "
+msgstr ""
+
+#: www/gsearch/index.php:35
+msgid ""
+"If no result appears, check that all the urls are valid in the admin section."
+msgstr ""
+
+#~ msgid "for"
+#~ msgstr "pour"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+msgid "to"
+msgstr "dans"
+
+#~ msgid "Last Users"
+#~ msgstr "Derniers utilisateurs"
+
#~ msgid "Recent Bookmarks"
#~ msgstr "Signets récents"
+
#~ msgid "plus"
#~ msgstr "plus"
+
#~ msgid ""
#~ "<strong><a href=\"register.php\">Register now</a></strong> to start using "
#~ "%s!"
#~ msgstr ""
#~ "<a href=\"register.php\">Enregistrez-vous maintenant</a> pour poster vos "
#~ "propres signets sur %s !"
+
#~ msgid ""
#~ "<a href=\"http://sourceforge.net/projects/semanticscuttle/\">Semantic "
#~ "Scuttle</a> is licensed under the <a href=\"http://www.gnu.org/copyleft/"
@@ -1174,13 +1551,15 @@ msgstr "Créé en "
#~ "Scuttle</a>, sous license <a href=\"http://www.gnu.org/copyleft/gpl.html"
#~ "\"><acronym title=\"GNU's Not Unix\">GNU</acronym> General Public "
#~ "License</a> (vous pouvez donc l'héberger sur votre propre serveur)."
+
#~ msgid "edit"
#~ msgstr "éditer"
+
#~ msgid "User with username %s not was not found"
#~ msgstr "L'utilisateur %s n'a pas été trouvé."
+
#~ msgid "%s Bookmarks"
#~ msgstr "Signets de %s"
+
#~ msgid "<abbr title=\"Electronic mail\">E-mail</abbr>"
#~ msgstr "<abbr title=\"Adresse électronique\">E-mail</abbr>"
-#~ msgid "No bookmarks found"
-#~ msgstr "Pas de signets trouvés"
diff --git a/data/locales/fr_FR/LC_MESSAGES/messages.po b/data/locales/fr_FR/LC_MESSAGES/messages.po
index 396c85e..0aa8be1 100644
--- a/data/locales/fr_FR/LC_MESSAGES/messages.po
+++ b/data/locales/fr_FR/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Scuttle\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 20:55+0100\n"
+"POT-Creation-Date: 2010-09-15 19:15+0200\n"
"PO-Revision-Date: 2009-11-16 21:14+0100\n"
"Last-Translator: BenjaminHKB <benjamin.huynh-kim-bang@loria.fr>\n"
"Language-Team: fr-FR <toony.sf@chezouam.net>\n"
@@ -19,64 +19,76 @@ msgstr ""
"X-Poedit-Country: FRANCE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/SemanticScuttle/functions.php:163
+#: src/SemanticScuttle/functions.php:189
msgid "message_die() was called multiple times."
msgstr "message_die() was called multiple times. ?"
-#: src/SemanticScuttle/functions.php:175
+#: src/SemanticScuttle/functions.php:201
msgid "SQL Error"
msgstr "Erreur SQL"
-#: src/SemanticScuttle/functions.php:181
+#: src/SemanticScuttle/functions.php:207
msgid "Line"
msgstr "Ligne"
-#: src/SemanticScuttle/functions.php:181
+#: src/SemanticScuttle/functions.php:207
#: data/templates/importDelicious.tpl.php:8
#: data/templates/importNetscape.tpl.php:9
#: data/templates/importStructure.tpl.php:10
msgid "File"
msgstr "Fichier"
-#: src/SemanticScuttle/functions.php:189
+#: src/SemanticScuttle/functions.php:215
msgid "Information"
msgstr "Information"
-#: src/SemanticScuttle/functions.php:194
+#: src/SemanticScuttle/functions.php:220
msgid "Critical Information"
msgstr "Information critique."
-#: src/SemanticScuttle/functions.php:199
+#: src/SemanticScuttle/functions.php:225
msgid "An error occured"
msgstr "Une erreur s'est produite."
-#: src/SemanticScuttle/functions.php:202
+#: src/SemanticScuttle/functions.php:228
msgid "General Error"
msgstr "Erreur générale."
-#: src/SemanticScuttle/functions.php:210
+#: src/SemanticScuttle/functions.php:236
msgid "An critical error occured"
msgstr "Une erreur critique s'est produite."
-#: src/SemanticScuttle/functions.php:213
+#: src/SemanticScuttle/functions.php:239
msgid "Critical Error"
msgstr "Erreur critique."
-#: src/SemanticScuttle/functions.php:222
+#: src/SemanticScuttle/functions.php:248
msgid "DEBUG MODE"
msgstr "Mode de débogage."
#: data/templates/about.tpl.php:6
-msgid "<strong>Store</strong> all your favourite links in one place, accessible from anywhere."
-msgstr "<strong>Conservez</strong> tous vos signets au même endroit, accessibles de partout. "
+msgid ""
+"<strong>Store</strong> all your favourite links in one place, accessible "
+"from anywhere."
+msgstr ""
+"<strong>Conservez</strong> tous vos signets au même endroit, accessibles de "
+"partout. "
#: data/templates/about.tpl.php:7
-msgid "<strong>Share</strong> your bookmarks with everyone, with friends on your watchlist or just keep them private."
-msgstr "<strong>Partagez</strong> vos signets avec tout le monde, avec vos contacts ou gardez-les pour vous."
+msgid ""
+"<strong>Share</strong> your bookmarks with everyone, with friends on your "
+"watchlist or just keep them private."
+msgstr ""
+"<strong>Partagez</strong> vos signets avec tout le monde, avec vos contacts "
+"ou gardez-les pour vous."
#: data/templates/about.tpl.php:8
-msgid "<strong>Tag</strong> your bookmarks with as many labels as you want, instead of wrestling with folders."
-msgstr "<strong>Taggez</strong> vos signets avec autant de labels que vous le souhaitez au lieu de les hiérarchiser avec des dossiers."
+msgid ""
+"<strong>Tag</strong> your bookmarks with as many labels as you want, instead "
+"of wrestling with folders."
+msgstr ""
+"<strong>Taggez</strong> vos signets avec autant de labels que vous le "
+"souhaitez au lieu de les hiérarchiser avec des dossiers."
#: data/templates/about.tpl.php:9
msgid "Register now"
@@ -101,8 +113,15 @@ msgstr "vous pouvez librement l'installer sur votre serveur Web"
#: data/templates/about.tpl.php:15
#, php-format
-msgid "%1$s supports most of the <a href=\"http://del.icio.us/doc/api\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></a>. Almost all of the neat tools made for that system can be modified to work with %1$s instead. If you find a tool that won't let you change the API address, ask the creator to add this setting. You never know, they might just do it."
-msgstr "%1$s supporte la plupart de l'<a href=\"http://del.icio.us/doc/api\"><abbr title=\"Application Programming Interface\">API</abbr> del.icio.us</a>."
+msgid ""
+"%1$s supports most of the <a href=\"http://del.icio.us/doc/api\">del.icio.us "
+"<abbr title=\"Application Programming Interface\">API</abbr></a>. Almost all "
+"of the neat tools made for that system can be modified to work with %1$s "
+"instead. If you find a tool that won't let you change the API address, ask "
+"the creator to add this setting. You never know, they might just do it."
+msgstr ""
+"%1$s supporte la plupart de l'<a href=\"http://del.icio.us/doc/api\"><abbr "
+"title=\"Application Programming Interface\">API</abbr> del.icio.us</a>."
#: data/templates/about.tpl.php:24
msgid "Tips"
@@ -113,12 +132,18 @@ msgid "Add search plugin into your browser:"
msgstr "Ajouter un plugin de recherche à votre navigateur :"
#: data/templates/about.tpl.php:27
-msgid "The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
-msgstr "Le tag secret \"system:unfiled\" vous permet de trouver les signets sans tags."
+msgid ""
+"The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
+msgstr ""
+"Le tag secret \"system:unfiled\" vous permet de trouver les signets sans "
+"tags."
#: data/templates/about.tpl.php:28
-msgid "The secret tag \"system:imported\" allows you to find imported bookmarks."
-msgstr "Le tag secret \"system:imported\" vous permet de trouver les signets importés."
+msgid ""
+"The secret tag \"system:imported\" allows you to find imported bookmarks."
+msgstr ""
+"Le tag secret \"system:imported\" vous permet de trouver les signets "
+"importés."
#: data/templates/admin.tpl.php:5
msgid "Users management"
@@ -128,23 +153,18 @@ msgstr "Gestion des utilisateurs"
msgid "Public/Shared/Private"
msgstr "Publique/Partagé/Privé"
-#: data/templates/admin.tpl.php:14
-#: data/templates/bookmarks.tpl.php:93
+#: data/templates/admin.tpl.php:14 data/templates/bookmarks.tpl.php:93
msgid "bookmark(s)"
msgstr "signet(s)"
-#: data/templates/admin.tpl.php:19
-#: data/templates/tag2tagadd.tpl.php:21
+#: data/templates/admin.tpl.php:19 data/templates/tag2tagadd.tpl.php:21
#: data/templates/tag2tagdelete.tpl.php:13
-#: data/templates/tag2tagedit.tpl.php:14
-#: data/templates/tag2tagedit.tpl.php:35
-#: data/templates/tagdelete.tpl.php:6
-#: www/jsScuttle.php:23
+#: data/templates/tag2tagedit.tpl.php:14 data/templates/tag2tagedit.tpl.php:35
+#: data/templates/tagdelete.tpl.php:6 www/jsScuttle.php:23
msgid "Are you sure?"
msgstr "Etes-vous sûr ?"
-#: data/templates/admin.tpl.php:19
-#: data/templates/bookmarks.tpl.php:251
+#: data/templates/admin.tpl.php:19 data/templates/bookmarks.tpl.php:267
msgid "Delete"
msgstr "Supprimer"
@@ -157,19 +177,21 @@ msgid "Check all URLs (May take some time)"
msgstr "Vérifier toutes les URLs (Peut prendre du temps)"
#: data/templates/bookmarkcommondescriptionedit.tpl.php:16
-msgid "Collaborative description: these fields can be viewed and modified by every users"
-msgstr "Description collaborative : ces champs peuvent être vus et modifiés par tous les utilisateurs."
+msgid ""
+"Collaborative description: these fields can be viewed and modified by every "
+"users"
+msgstr ""
+"Description collaborative : ces champs peuvent être vus et modifiés par tous "
+"les utilisateurs."
#: data/templates/bookmarkcommondescriptionedit.tpl.php:18
-#: data/templates/bookmarks.tpl.php:137
-#: data/templates/editbookmark.tpl.php:38
+#: data/templates/bookmarks.tpl.php:137 data/templates/editbookmark.tpl.php:43
msgid "Title"
msgstr "Titre"
#: data/templates/bookmarkcommondescriptionedit.tpl.php:23
-#: data/templates/editbookmark.tpl.php:44
-#: data/templates/editprofile.tpl.php:47
-#: data/templates/profile.tpl.php:33
+#: data/templates/editbookmark.tpl.php:49
+#: data/templates/editprofile.tpl.php:47 data/templates/profile.tpl.php:33
#: data/templates/tagcommondescriptionedit.tpl.php:13
#: data/templates/tagedit.tpl.php:12
msgid "Description"
@@ -187,12 +209,10 @@ msgid "Update"
msgstr "Mettre à jour"
#: data/templates/bookmarkcommondescriptionedit.tpl.php:43
-#: data/templates/editbookmark.tpl.php:98
-#: data/templates/tag2tagadd.tpl.php:24
-#: data/templates/tag2tagedit.tpl.php:38
+#: data/templates/editbookmark.tpl.php:103
+#: data/templates/tag2tagadd.tpl.php:24 data/templates/tag2tagedit.tpl.php:38
#: data/templates/tagcommondescriptionedit.tpl.php:33
-#: data/templates/tagedit.tpl.php:19
-#: data/templates/tagrename.tpl.php:25
+#: data/templates/tagedit.tpl.php:19 data/templates/tagrename.tpl.php:25
msgid "Cancel"
msgstr "Annuler"
@@ -215,23 +235,19 @@ msgstr "Vote contre"
msgid "Bookmarks on this page are managed by an admin user."
msgstr "Les signets de cette page sont gérés par un administrateur."
-#: data/templates/bookmarks.tpl.php:51
-#: data/templates/bookmarks.tpl.php:52
+#: data/templates/bookmarks.tpl.php:51 data/templates/bookmarks.tpl.php:52
msgid "Edit the common description of this tag"
msgstr "Editer la description commune de ce tag"
-#: data/templates/bookmarks.tpl.php:55
-#: data/templates/bookmarks.tpl.php:56
+#: data/templates/bookmarks.tpl.php:55 data/templates/bookmarks.tpl.php:56
msgid "Edit the common description of this bookmark"
msgstr "Editer la description commune de ce signet"
-#: data/templates/bookmarks.tpl.php:76
-#: data/templates/bookmarks.tpl.php:77
+#: data/templates/bookmarks.tpl.php:76 data/templates/bookmarks.tpl.php:77
msgid "Edit your personal description of this tag"
msgstr "Editer votre description personnelle de ce tag"
-#: data/templates/bookmarks.tpl.php:93
-#: data/templates/tags.tpl.php:10
+#: data/templates/bookmarks.tpl.php:93 data/templates/tags.tpl.php:10
#: data/templates/users.tpl.php:8
msgid "Sort by:"
msgstr "Classer par :"
@@ -252,23 +268,19 @@ msgstr "Signets des autres utilisateurs pour ce tag"
msgid "Only your bookmarks for this tag"
msgstr "Uniquement vos signets pour ce tag"
-#: data/templates/bookmarks.tpl.php:177
-#: data/templates/bookmarks.tpl.php:183
+#: data/templates/bookmarks.tpl.php:177 data/templates/bookmarks.tpl.php:183
msgid "First"
msgstr "Première"
-#: data/templates/bookmarks.tpl.php:178
-#: data/templates/bookmarks.tpl.php:184
+#: data/templates/bookmarks.tpl.php:178 data/templates/bookmarks.tpl.php:184
msgid "Previous"
msgstr "Précédent"
-#: data/templates/bookmarks.tpl.php:191
-#: data/templates/bookmarks.tpl.php:194
+#: data/templates/bookmarks.tpl.php:191 data/templates/bookmarks.tpl.php:194
msgid "Next"
msgstr "Suivant"
-#: data/templates/bookmarks.tpl.php:192
-#: data/templates/bookmarks.tpl.php:195
+#: data/templates/bookmarks.tpl.php:192 data/templates/bookmarks.tpl.php:195
msgid "Last"
msgstr "Dernière"
@@ -277,69 +289,66 @@ msgstr "Dernière"
msgid "Page %d of %d"
msgstr "Page %d de %d"
-#: data/templates/bookmarks.tpl.php:245
+#: data/templates/bookmarks.tpl.php:261
msgid "Tags:"
msgstr "Tags:"
-#: data/templates/bookmarks.tpl.php:251
+#: data/templates/bookmarks.tpl.php:267
msgid "Edit"
msgstr "Editer"
-#: data/templates/bookmarks.tpl.php:255
+#: data/templates/bookmarks.tpl.php:271
msgid "Last update"
msgstr "Date de dernière mise à jour"
-#: data/templates/bookmarks.tpl.php:258
+#: data/templates/bookmarks.tpl.php:274
msgid "by"
msgstr "par"
-#: data/templates/bookmarks.tpl.php:260
+#: data/templates/bookmarks.tpl.php:276
msgid "you"
msgstr "vous"
-#: data/templates/bookmarks.tpl.php:274
+#: data/templates/bookmarks.tpl.php:290
#, php-format
msgid " and %s1 other%s"
msgstr " et %s1 autre%s"
-#: data/templates/bookmarks.tpl.php:277
+#: data/templates/bookmarks.tpl.php:293
#, php-format
msgid " and %2$s%1$s others%3$s"
msgstr " et %2$s%1$s autres%3$s"
-#: data/templates/bookmarks.tpl.php:288
+#: data/templates/bookmarks.tpl.php:304
msgid "Copy this bookmark to YOUR bookmarks."
msgstr "Copier ce signet dans VOS signets."
-#: data/templates/bookmarks.tpl.php:289
+#: data/templates/bookmarks.tpl.php:305
msgid "Copy"
msgstr "Copier"
-#: data/templates/bookmarks.tpl.php:309
+#: data/templates/bookmarks.tpl.php:325
msgid "This bookmark is certified by an admin user."
msgstr "Ce signet est certifié par un administrateur."
-#: data/templates/bookmarks.tpl.php:351
+#: data/templates/bookmarks.tpl.php:371
msgid "Private Note on this bookmark"
msgstr "Note privée sur ce signet"
-#: data/templates/bookmarks.tpl.php:363
+#: data/templates/bookmarks.tpl.php:383
msgid "Come back to the top of this page."
msgstr "Revenir en haut de cette page."
-#: data/templates/bookmarks.tpl.php:363
+#: data/templates/bookmarks.tpl.php:383
msgid "Top of the page"
msgstr "Haut de page"
-#: data/templates/bookmarks.tpl.php:369
+#: data/templates/bookmarks.tpl.php:389
msgid "No bookmarks available"
msgstr "Pas de signets disponibles."
-#: data/templates/bottom.inc.php:5
-#: data/templates/toolbar.inc.php:15
-#: data/templates/toolbar.inc.php:28
-#: www/about.php:23
-#: www/about.php:24
+#: data/templates/bottom.inc.php:5 data/templates/toolbar.inc.php:15
+#: data/templates/toolbar.inc.php:28 www/about.php:23 www/about.php:24
msgid "About"
msgstr "À propos"
@@ -350,8 +359,7 @@ msgstr "Propulsé par "
#: data/templates/dynamictags.inc.php:47
#: data/templates/sidebar.block.common.php:19
#: data/templates/sidebar.block.popular.php:34
-#: data/templates/sidebar.block.recent.php:29
-#: data/templates/tags.tpl.php:19
+#: data/templates/sidebar.block.recent.php:29 data/templates/tags.tpl.php:19
msgid "bookmark"
msgid_plural "bookmarks"
msgstr[0] "signet"
@@ -362,8 +370,7 @@ msgstr[1] "Signets"
#: data/templates/sidebar.block.menu.php:74
#: data/templates/sidebar.block.popular.php:23
#: data/templates/sidebar.block.recent.php:34
-#: data/templates/toolbar.inc.php:27
-#: www/populartags.php:46
+#: data/templates/toolbar.inc.php:27 www/populartags.php:46
msgid "Popular Tags"
msgstr "Tags populaires"
@@ -371,131 +378,143 @@ msgstr "Tags populaires"
msgid "Popular Tags From All Users"
msgstr "Tags populaires pour tous les utilisateurs"
-#: data/templates/editbookmark.tpl.php:33
+#: data/templates/editbookmark.tpl.php:38
msgid "Address"
msgstr "Adresse"
-#: data/templates/editbookmark.tpl.php:35
#: data/templates/editbookmark.tpl.php:40
-#: data/templates/editprofile.tpl.php:31
-#: data/templates/tagrename.tpl.php:14
+#: data/templates/editbookmark.tpl.php:45
+#: data/templates/editprofile.tpl.php:31 data/templates/tagrename.tpl.php:14
#: data/templates/tagrename.tpl.php:19
msgid "Required"
msgstr "Requis"
-#: data/templates/editbookmark.tpl.php:45
+#: data/templates/editbookmark.tpl.php:50
msgid "Add Note"
msgstr "Ajouter une note"
-#: data/templates/editbookmark.tpl.php:48
-msgid "You can use anchors to delimite attributes. for example: [publisher]blah[/publisher] "
-msgstr "Vous pouvez utiliser des balises pour délimiter des attributs. Par exemple : [publisher]blah[/publisher]"
+#: data/templates/editbookmark.tpl.php:53
+msgid ""
+"You can use anchors to delimite attributes. for example: [publisher]blah[/"
+"publisher] "
+msgstr ""
+"Vous pouvez utiliser des balises pour délimiter des attributs. Par exemple : "
+"[publisher]blah[/publisher]"
-#: data/templates/editbookmark.tpl.php:51
+#: data/templates/editbookmark.tpl.php:56
msgid "Suggested anchors: "
msgstr "Balises suggérées : "
-#: data/templates/editbookmark.tpl.php:63
+#: data/templates/editbookmark.tpl.php:68
msgid "Private Note"
msgstr "Note privée"
-#: data/templates/editbookmark.tpl.php:65
+#: data/templates/editbookmark.tpl.php:70
msgid "Just visible by you and your contacts."
msgstr "Visible uniquement par vous et vos contacts."
-#: data/templates/editbookmark.tpl.php:69
-#: data/templates/toolbar.inc.php:10
-#: www/tags.php:45
-#: www/tags.php:67
+#: data/templates/editbookmark.tpl.php:74 data/templates/toolbar.inc.php:10
+#: www/tags.php:45 www/tags.php:67
msgid "Tags"
msgstr "Tags"
-#: data/templates/editbookmark.tpl.php:73
+#: data/templates/editbookmark.tpl.php:78
msgid "Comma-separated"
msgstr "Séparés par des virgules"
-#: data/templates/editbookmark.tpl.php:77
-#: data/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"
+#: data/templates/editbookmark.tpl.php:82 data/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"
-#: data/templates/editbookmark.tpl.php:81
-#: data/templates/tag2tagadd.tpl.php:8
+#: data/templates/editbookmark.tpl.php:86 data/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"
-#: data/templates/editbookmark.tpl.php:84
+#: data/templates/editbookmark.tpl.php:89
#: data/templates/importDelicious.tpl.php:15
#: data/templates/importNetscape.tpl.php:16
msgid "Privacy"
msgstr "Accès"
-#: data/templates/editbookmark.tpl.php:87
+#: data/templates/editbookmark.tpl.php:92
#: data/templates/importDelicious.tpl.php:18
#: data/templates/importNetscape.tpl.php:19
msgid "Public"
msgstr "Publique"
-#: data/templates/editbookmark.tpl.php:88
+#: data/templates/editbookmark.tpl.php:93
msgid "Shared with Watch List"
msgstr "Partagé avec mes contacts"
-#: data/templates/editbookmark.tpl.php:89
+#: data/templates/editbookmark.tpl.php:94
#: data/templates/importDelicious.tpl.php:20
#: data/templates/importNetscape.tpl.php:21
msgid "Private"
msgstr "Privée"
-#: data/templates/editbookmark.tpl.php:102
+#: data/templates/editbookmark.tpl.php:107
msgid "Delete Bookmark"
msgstr "Supprimer le signet"
-#: data/templates/editbookmark.tpl.php:107
+#: data/templates/editbookmark.tpl.php:112
msgid "edit common description"
msgstr "éditer la description commune"
-#: data/templates/editbookmark.tpl.php:134
+#: data/templates/editbookmark.tpl.php:139
msgid "Bookmarklet"
msgstr "Bookmarklet"
-#: data/templates/editbookmark.tpl.php:140
+#: data/templates/editbookmark.tpl.php:145
#, php-format
-msgid "Click one of the following bookmarklets to add a button you can click whenever you want to add the page you are on to %s"
-msgstr "Déplacez l'un des 'bookmarklet' suivants dans les marques-pages de votre navigateur et cliquez dessus chaque fois que vous souhaitez ajouter un signet pour la page courante dans %s "
+msgid ""
+"Click one of the following bookmarklets to add a button you can click "
+"whenever you want to add the page you are on to %s"
+msgstr ""
+"Déplacez l'un des 'bookmarklet' suivants dans les marques-pages de votre "
+"navigateur et cliquez dessus chaque fois que vous souhaitez ajouter un "
+"signet pour la page courante dans %s "
-#: data/templates/editbookmark.tpl.php:144
+#: data/templates/editbookmark.tpl.php:149
#, php-format
-msgid "Drag one of the following bookmarklets to your browser's bookmarks and click it whenever you want to add the page you are on to %s"
-msgstr "Déplacez l'un des 'bookmarklet' suivants dans les marques-pages de votre navigateur et cliquez dessus chaque fois que vous souhaitez ajouter un signet pour la page courante dans %s "
+msgid ""
+"Drag one of the following bookmarklets to your browser's bookmarks and click "
+"it whenever you want to add the page you are on to %s"
+msgstr ""
+"Déplacez l'un des 'bookmarklet' suivants dans les marques-pages de votre "
+"navigateur et cliquez dessus chaque fois que vous souhaitez ajouter un "
+"signet pour la page courante dans %s "
-#: data/templates/editbookmark.tpl.php:157
#: data/templates/editbookmark.tpl.php:162
+#: data/templates/editbookmark.tpl.php:167
#, php-format
msgid "Post to %s"
msgstr "Ajouter à %s"
-#: data/templates/editbookmark.tpl.php:158
#: data/templates/editbookmark.tpl.php:163
+#: data/templates/editbookmark.tpl.php:168
#, php-format
msgid "Post to %s (Pop-up)"
msgstr "Ajouter à %s (Pop-up)"
-#: data/templates/editbookmark.tpl.php:168
+#: data/templates/editbookmark.tpl.php:173
#: data/templates/importDelicious.tpl.php:26
#: data/templates/importNetscape.tpl.php:27
#: data/templates/importStructure.tpl.php:16
msgid "Import"
msgstr "Importer"
-#: data/templates/editbookmark.tpl.php:170
+#: data/templates/editbookmark.tpl.php:175
msgid "Import bookmarks from bookmark file"
msgstr "Importer les signets depuis un fichier"
-#: data/templates/editbookmark.tpl.php:170
+#: data/templates/editbookmark.tpl.php:175
msgid "Internet Explorer, Mozilla Firefox and Netscape"
msgstr "Internet Explorer, Mozilla Firefox et Netscape"
-#: data/templates/editbookmark.tpl.php:171
+#: data/templates/editbookmark.tpl.php:176
msgid "Import bookmarks from del.icio.us"
msgstr "Importer les signets depuis del.icio.us"
@@ -503,10 +522,8 @@ msgstr "Importer les signets depuis del.icio.us"
msgid "Account Details"
msgstr "Détail du compte"
-#: data/templates/editprofile.tpl.php:14
-#: data/templates/login.tpl.php:21
-#: data/templates/password.tpl.php:10
-#: data/templates/profile.tpl.php:6
+#: data/templates/editprofile.tpl.php:14 data/templates/login.tpl.php:21
+#: data/templates/password.tpl.php:10 data/templates/profile.tpl.php:6
#: data/templates/register.tpl.php:16
msgid "Username"
msgstr "Nom d'utilisateur"
@@ -519,8 +536,7 @@ msgstr "Nouveau mot de passe"
msgid "Confirm Password"
msgstr "Confirmer le mot de passe"
-#: data/templates/editprofile.tpl.php:29
-#: data/templates/password.tpl.php:14
+#: data/templates/editprofile.tpl.php:29 data/templates/password.tpl.php:14
#: data/templates/register.tpl.php:26
msgid "E-mail"
msgstr "E-mail"
@@ -529,18 +545,15 @@ msgstr "E-mail"
msgid "Personal Details"
msgstr "Détails personnels"
-#: data/templates/editprofile.tpl.php:39
-#: data/templates/profile.tpl.php:17
+#: data/templates/editprofile.tpl.php:39 data/templates/profile.tpl.php:17
msgid "Name"
msgstr "Nom"
-#: data/templates/editprofile.tpl.php:43
-#: data/templates/profile.tpl.php:23
+#: data/templates/editprofile.tpl.php:43 data/templates/profile.tpl.php:23
msgid "Homepage"
msgstr "Page personnelle"
-#: data/templates/editprofile.tpl.php:52
-#: www/edit.php:113
+#: data/templates/editprofile.tpl.php:52 www/edit.php:113
msgid "Save Changes"
msgstr "Enregistrer les modifications"
@@ -594,16 +607,28 @@ msgid "Instructions"
msgstr "Instructions"
#: data/templates/importDelicious.tpl.php:33
-msgid "Log in to the <a href=\"http://del.icio.us/api/posts/all\">export page at del.icio.us</a>"
-msgstr "Se connecter à la <a href=\"http://del.icio.us/api/posts/all\">page d'export de del.icio.us</a>"
+msgid ""
+"Log in to the <a href=\"http://del.icio.us/api/posts/all\">export page at "
+"del.icio.us</a>"
+msgstr ""
+"Se connecter à la <a href=\"http://del.icio.us/api/posts/all\">page d'export "
+"de del.icio.us</a>"
#: data/templates/importDelicious.tpl.php:34
-msgid "Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> file to your computer"
-msgstr "Enregistrer le fichier <abbr title=\"Extensible Markup Language\">XML</abbr> résultant sur votre ordinateur"
+msgid ""
+"Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> "
+"file to your computer"
+msgstr ""
+"Enregistrer le fichier <abbr title=\"Extensible Markup Language\">XML</abbr> "
+"résultant sur votre ordinateur"
#: data/templates/importDelicious.tpl.php:35
-msgid "Click <kbd>Browse...</kbd> to find this file on your computer. The maximum size the file can be is 1MB"
-msgstr "Cliquez sur <kbd>Parcourir...</kbd> pour trouver le fichier sur votre ordinateur. La taille maximale du fichier ne peut excèder 1Mo"
+msgid ""
+"Click <kbd>Browse...</kbd> to find this file on your computer. The maximum "
+"size the file can be is 1MB"
+msgstr ""
+"Cliquez sur <kbd>Parcourir...</kbd> pour trouver le fichier sur votre "
+"ordinateur. La taille maximale du fichier ne peut excèder 1Mo"
#: data/templates/importDelicious.tpl.php:36
#: data/templates/importNetscape.tpl.php:43
@@ -612,43 +637,62 @@ msgstr "Selectionnez la vision par défaut à appliquer à vos signets importés
#: data/templates/importDelicious.tpl.php:37
#: data/templates/importNetscape.tpl.php:44
-msgid "Click <kbd>Import</kbd> to start importing the bookmarks; it may take a minute"
-msgstr "Cliquez sur <kbd>Importer</kbd> pour débuter l'import des signets; cette opération peut prendre quelques minutes"
+msgid ""
+"Click <kbd>Import</kbd> to start importing the bookmarks; it may take a "
+"minute"
+msgstr ""
+"Cliquez sur <kbd>Importer</kbd> pour débuter l'import des signets; cette "
+"opération peut prendre quelques minutes"
#: data/templates/importNetscape.tpl.php:35
msgid "Export your bookmarks from your browser to a file"
msgstr "Exporter vos signets dans un fichier depuis votre navigateur"
#: data/templates/importNetscape.tpl.php:37
-msgid "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
-msgstr "Internet Explorer: <kbd>Ficher &gt; Importer et Exporter... &gt; Exporter les favoris"
+msgid ""
+"Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
+msgstr ""
+"Internet Explorer: <kbd>Ficher &gt; Importer et Exporter... &gt; Exporter "
+"les favoris"
#: data/templates/importNetscape.tpl.php:38
-msgid "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; Export..."
-msgstr "Mozilla Firefox: <kbd>Marques-pages &gt; Gérer les marques-pages... &gt; Fichier &gt; Exporter..."
+msgid ""
+"Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
+"Export..."
+msgstr ""
+"Mozilla Firefox: <kbd>Marques-pages &gt; Gérer les marques-pages... &gt; "
+"Fichier &gt; Exporter..."
#: data/templates/importNetscape.tpl.php:39
-msgid "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
-msgstr "Netscape: <kbd>Marques-pages &gt; Gérer les marques-pages... &gt; Outils &gt; Exporter..."
+msgid ""
+"Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
+msgstr ""
+"Netscape: <kbd>Marques-pages &gt; Gérer les marques-pages... &gt; Outils "
+"&gt; Exporter..."
#: data/templates/importNetscape.tpl.php:42
-msgid "Click <kbd>Browse...</kbd> to find the saved bookmark file on your computer. The maximum size the file can be is 1MB"
-msgstr "Cliquez sur <kbd>Parcourir...</kbd> pour trouver le fichier sur votre ordinateur. La taille maximale du fichier ne peut excèder 1Mo"
+msgid ""
+"Click <kbd>Browse...</kbd> to find the saved bookmark file on your computer. "
+"The maximum size the file can be is 1MB"
+msgstr ""
+"Cliquez sur <kbd>Parcourir...</kbd> pour trouver le fichier sur votre "
+"ordinateur. La taille maximale du fichier ne peut excèder 1Mo"
#: data/templates/importStructure.tpl.php:24
msgid "Create your structure into a simple text file and following this model:"
msgstr ""
#: data/templates/importStructure.tpl.php:35
-msgid "Then import the file. The tags and their relations will be added to your profile."
+msgid ""
+"Then import the file. The tags and their relations will be added to your "
+"profile."
msgstr ""
#: data/templates/login.tpl.php:13
msgid "Please activate cookies"
msgstr "SVP activez les cookies"
-#: data/templates/login.tpl.php:26
-#: data/templates/register.tpl.php:21
+#: data/templates/login.tpl.php:26 data/templates/register.tpl.php:21
msgid "Password"
msgstr "Mot de passe"
@@ -656,8 +700,7 @@ msgstr "Mot de passe"
msgid "Don't ask for my password for 2 weeks"
msgstr "Ne pas demander mon mot de passe pendant 2 semaines"
-#: data/templates/login.tpl.php:32
-#: data/templates/toolbar.inc.php:29
+#: data/templates/login.tpl.php:32 data/templates/toolbar.inc.php:29
#: www/login.php:57
msgid "Log In"
msgstr "Se connecter"
@@ -668,8 +711,14 @@ msgstr "Avez-vous oublié votre mot de passe ?"
#: data/templates/password.tpl.php:5
#, php-format
-msgid "If you have forgotten your password, %s can generate a new one. Enter the username and e-mail address of your account into the form below and we will e-mail your new password to you."
-msgstr "Si vous avez oublié votre mot de passe, %s peut en générer un nouveau. Entrez le nom d'utilisateur et l'adresse email de votre compte dans le formulaire ci-dessous et nous vous enverrons un nouveau mot de passe."
+msgid ""
+"If you have forgotten your password, %s can generate a new one. Enter the "
+"username and e-mail address of your account into the form below and we will "
+"e-mail your new password to you."
+msgstr ""
+"Si vous avez oublié votre mot de passe, %s peut en générer un nouveau. "
+"Entrez le nom d'utilisateur et l'adresse email de votre compte dans le "
+"formulaire ci-dessous et nous vous enverrons un nouveau mot de passe."
#: data/templates/password.tpl.php:19
msgid "Generate Password"
@@ -693,8 +742,7 @@ msgstr "Mes contacts"
msgid "Watched By"
msgstr "Dans les contacts de"
-#: data/templates/profile.tpl.php:68
-#: data/templates/toolbar.inc.php:9
+#: data/templates/profile.tpl.php:68 data/templates/toolbar.inc.php:9
msgid "Bookmarks"
msgstr "Signets"
@@ -704,12 +752,20 @@ msgstr "Aller aux signets"
#: data/templates/register.tpl.php:11
#, php-format
-msgid "Sign up here to create a free %s account. All the information requested below is required"
-msgstr "Enregistrez-vous ici pour créer un compte gratuit %s. Toutes les informations requises ci-dessous sont nécessaires."
+msgid ""
+"Sign up here to create a free %s account. All the information requested "
+"below is required"
+msgstr ""
+"Enregistrez-vous ici pour créer un compte gratuit %s. Toutes les "
+"informations requises ci-dessous sont nécessaires."
#: data/templates/register.tpl.php:18
-msgid " at least 5 characters, alphanumeric (no spaces, no dots or other special ones)"
-msgstr " au moins 5 caractères, alphanumériques (pas d'espaces, pas de points ou autre caractère spécial)"
+msgid ""
+" at least 5 characters, alphanumeric (no spaces, no dots or other special "
+"ones)"
+msgstr ""
+" au moins 5 caractères, alphanumériques (pas d'espaces, pas de points ou "
+"autre caractère spécial)"
#: data/templates/register.tpl.php:28
msgid " to send you your password if you forget it"
@@ -719,8 +775,7 @@ msgstr " pour vous envoyer votre mot de passe en cas de perte"
msgid "Antispam question"
msgstr "Question antispam"
-#: data/templates/register.tpl.php:41
-#: data/templates/toolbar.inc.php:31
+#: data/templates/register.tpl.php:41 data/templates/toolbar.inc.php:31
#: www/register.php:83
msgid "Register"
msgstr "S'enregistrer"
@@ -802,7 +857,8 @@ msgstr "Tags Principaux"
#: data/templates/sidebar.block.menu2.php:29
msgid "This menu is composed of keywords (tags) organized by admins."
-msgstr "Ce menu est composé de mots-clefs (tags) organisés par les administrateurs."
+msgstr ""
+"Ce menu est composé de mots-clefs (tags) organisés par les administrateurs."
#: data/templates/sidebar.block.recent.php:18
msgid "Recent Tags"
@@ -820,25 +876,22 @@ msgstr "Dernières recherches"
msgid "Number of bookmarks for this query"
msgstr "Nombre de signets pour cette recherche"
-#: data/templates/sidebar.block.tagactions.php:9
-#: www/tagrename.php:72
+#: data/templates/sidebar.block.tagactions.php:9 www/tagrename.php:72
msgid "Rename Tag"
msgid_plural "Rename Tags"
msgstr[0] "Renommer le tag"
msgstr[1] "Renommer les tags"
-#: data/templates/sidebar.block.tagactions.php:22
-#: www/tagdelete.php:54
+#: data/templates/sidebar.block.tagactions.php:22 www/tagdelete.php:54
msgid "Delete Tag"
msgstr "Supprimer le tag"
-#: data/templates/sidebar.block.tagactions.php:24
-#: www/tagedit.php:61
+#: data/templates/sidebar.block.tagactions.php:24 www/tagedit.php:61
msgid "Edit Tag Description"
msgstr "Editer la description du tag"
#: data/templates/sidebar.block.tagactions.php:26
-#: www/tagcommondescriptionedit.php:64
+#: www/tagcommondescriptionedit.php:76
msgid "Edit Tag Common Description"
msgstr "Editer la description commune du tag"
@@ -850,8 +903,7 @@ msgstr "Créer un lien vers un autre tag"
msgid "New Users"
msgstr "Nouveaux Utilisateurs"
-#: data/templates/sidebar.block.users.php:23
-#: data/templates/users.tpl.php:17
+#: data/templates/sidebar.block.users.php:23 data/templates/users.tpl.php:17
msgid "bookmarks"
msgstr "signets"
@@ -905,11 +957,14 @@ msgstr "Créer un nouveau lien"
#: data/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"
+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"
-#: data/templates/tag2tagadd.tpl.php:23
-#: data/templates/tag2tagedit.tpl.php:37
+#: data/templates/tag2tagadd.tpl.php:23 data/templates/tag2tagedit.tpl.php:37
msgid "Create"
msgstr "Créer"
@@ -926,15 +981,13 @@ msgid "No links"
msgstr "Pas de liens"
#: data/templates/tag2tagdelete.tpl.php:15
-#: data/templates/tag2tagedit.tpl.php:16
-#: data/templates/tagdelete.tpl.php:8
+#: data/templates/tag2tagedit.tpl.php:16 data/templates/tagdelete.tpl.php:8
#: www/jsScuttle.php:23
msgid "Yes"
msgstr "Oui"
#: data/templates/tag2tagdelete.tpl.php:16
-#: data/templates/tag2tagedit.tpl.php:17
-#: data/templates/tagdelete.tpl.php:9
+#: data/templates/tag2tagedit.tpl.php:17 data/templates/tagdelete.tpl.php:9
#: www/jsScuttle.php:23
msgid "No"
msgstr "Non"
@@ -959,33 +1012,27 @@ msgstr "Nouveau"
msgid "Rename"
msgstr "Renommer"
-#: data/templates/tags.tpl.php:11
-#: data/templates/users.tpl.php:9
+#: data/templates/tags.tpl.php:11 data/templates/users.tpl.php:9
msgid "Alphabet"
msgstr "Alphabet"
-#: data/templates/tags.tpl.php:12
-#: data/templates/users.tpl.php:10
+#: data/templates/tags.tpl.php:12 data/templates/users.tpl.php:10
msgid "Popularity"
msgstr "Popularité"
-#: data/templates/toolbar.inc.php:8
-#: data/templates/toolbar.inc.php:26
+#: data/templates/toolbar.inc.php:8 data/templates/toolbar.inc.php:26
msgid "Home"
msgstr "Accueil"
-#: data/templates/toolbar.inc.php:11
-#: www/watchlist.php:106
+#: data/templates/toolbar.inc.php:11 www/watchlist.php:106
msgid "Watchlist"
msgstr "Contacts"
-#: data/templates/toolbar.inc.php:12
-#: www/profile.php:67
+#: data/templates/toolbar.inc.php:12 www/profile.php:67
msgid "Profile"
msgstr "Profil"
-#: data/templates/toolbar.inc.php:13
-#: www/bookmarks.php:209
+#: data/templates/toolbar.inc.php:13 www/bookmarks.php:209
msgid "Add a Bookmark"
msgstr "Ajouter un signet"
@@ -998,8 +1045,14 @@ msgid "Admin"
msgstr "Admin"
#: data/templates/top.inc.php:49
-msgid "Admins, your installation is in \"Debug Mode\" ($debugMode = true). To go in \"Normal Mode\" and hide debugging messages, change $debugMode to false into config.php."
-msgstr "Admins, votre installation est en \"Mode Debug\" ($debugMode = true). Pour passer en \"Mode Normal\" et cacher les messages de debuggage, changez $debugMode à false dans config.inc.php."
+msgid ""
+"Admins, your installation is in \"Debug Mode\" ($debugMode = true). To go in "
+"\"Normal Mode\" and hide debugging messages, change $debugMode to false into "
+"config.php."
+msgstr ""
+"Admins, votre installation est en \"Mode Debug\" ($debugMode = true). Pour "
+"passer en \"Mode Normal\" et cacher les messages de debuggage, changez "
+"$debugMode à false dans config.inc.php."
#: data/templates/users.tpl.php:17
msgid "profile"
@@ -1026,33 +1079,24 @@ msgstr "Problème avec "
msgid "You are not allowed to delete this bookmark"
msgstr "Vous n'êtes pas autorisés à supprimer ce signet"
-#: www/ajaxDelete.php:41
-#: www/edit.php:103
+#: www/ajaxDelete.php:41 www/edit.php:103
msgid "Failed to delete bookmark"
msgstr "Erreur dans la suppression du signet"
-#: www/alltags.php:49
+#: www/alltags.php:50
msgid "All Tags"
msgstr "Tous les tags"
-#: www/alltags.php:55
-#: www/bookmarks.php:96
-#: www/populartags.php:52
-#: www/profile.php:51
-#: www/rss.php:67
-#: www/search.php:109
-#: www/watch.php:45
+#: www/alltags.php:56 www/bookmarks.php:96 www/populartags.php:52
+#: www/profile.php:51 www/rss.php:76 www/search.php:109 www/watch.php:45
#: www/watchlist.php:61
#, php-format
msgid "User with username %s was not found"
msgstr "L'utilisateur %s n'a pas été trouvé."
-#: www/bookmarkcommondescriptionedit.php:51
-#: www/tag2tagadd.php:37
-#: www/tag2tagdelete.php:41
-#: www/tag2tagedit.php:33
-#: www/tagcommondescriptionedit.php:43
-#: www/tagedit.php:43
+#: www/bookmarkcommondescriptionedit.php:51 www/tag2tagadd.php:37
+#: www/tag2tagdelete.php:41 www/tag2tagedit.php:33
+#: www/tagcommondescriptionedit.php:51 www/tagedit.php:43
msgid "Permission denied."
msgstr "Permission non accordée."
@@ -1068,19 +1112,15 @@ msgstr "Erreur dans la mise à jour de la description du signet"
msgid "Edit Bookmark Common Description"
msgstr "Editer la description commune du signet"
-#: www/bookmarks.php:111
-#: www/tags.php:47
+#: www/bookmarks.php:111 www/tags.php:47
msgid "Remove the tag from the selection"
msgstr "Retirer le tag de la sélection"
-#: www/bookmarks.php:131
-#: www/edit.php:65
+#: www/bookmarks.php:131 www/edit.php:65
msgid "Your bookmark must have a title and an address"
msgstr "Votre signet doit avoir un titre et une adresse."
-#: www/bookmarks.php:152
-#: www/edit.php:83
-#: www/edit.php:86
+#: www/bookmarks.php:152 www/edit.php:83 www/edit.php:86
msgid "Bookmark saved"
msgstr "Signet enregistré."
@@ -1088,11 +1128,13 @@ msgstr "Signet enregistré."
msgid "(Come back to previous page.)"
msgstr "(Revenir à la page précédente.)"
-#: www/bookmarks.php:159
-#: www/import.php:106
-#: www/importNetscape.php:108
-msgid "There was an error saving your bookmark. Please try again or contact the administrator."
-msgstr "Il y a eu une erreur en enregistrant ce signet. Veuillez rééssayer ou contacter votre administrateur."
+#: www/bookmarks.php:159 www/import.php:106 www/importNetscape.php:108
+msgid ""
+"There was an error saving your bookmark. Please try again or contact the "
+"administrator."
+msgstr ""
+"Il y a eu une erreur en enregistrant ce signet. Veuillez rééssayer ou "
+"contacter votre administrateur."
#: www/bookmarks.php:216
msgid "Add Bookmark"
@@ -1102,13 +1144,11 @@ 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."
-#: www/bookmarks.php:274
-#: www/bookmarks.php:275
+#: www/bookmarks.php:274 www/bookmarks.php:275
msgid "My Bookmarks"
msgstr "Mes signets"
-#: www/edit.php:44
-#: www/edit.php:45
+#: www/edit.php:44 www/edit.php:45
msgid "Edit Bookmark"
msgstr "Editer le signet"
@@ -1171,8 +1211,7 @@ msgstr "Signets trouvés :"
msgid "Bookmarks imported: "
msgstr "Signets importés :"
-#: www/importNetscape.php:117
-#: www/importNetscape.php:122
+#: www/importNetscape.php:117 www/importNetscape.php:122
msgid "Import Bookmarks from Browser File"
msgstr "Importer les signets depuis un fichier"
@@ -1197,11 +1236,11 @@ msgstr "Vous êtes maintenant déconnecté."
msgid "%s: Recent bookmarks"
msgstr "%s: Signets récents"
-#: www/index.php:78
+#: www/index.php:75
msgid "Store, share and tag your favourite links"
msgstr "Conservez, partagez et taggez vos liens favoris"
-#: www/index.php:79
+#: www/index.php:76
msgid "All Bookmarks"
msgstr "Tous les signets"
@@ -1215,35 +1254,51 @@ msgstr "Non Disponible"
#: www/login.php:48
msgid "The details you have entered are incorrect. Please try again."
-msgstr "Les informations que vous avez entrées sont incorrectes. Veuillez recommencer."
+msgstr ""
+"Les informations que vous avez entrées sont incorrectes. Veuillez "
+"recommencer."
#: www/password.php:36
msgid "You must enter your username."
msgstr "Vous devez entrer votre nom d'utilisateur."
#: www/password.php:40
-msgid "You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "Vous <em>devez</em> saisir une <abbr title=\"adresse électronique\">E-mail</abbr>."
+msgid ""
+"You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"Vous <em>devez</em> saisir une <abbr title=\"adresse électronique\">E-mail</"
+"abbr>."
#: www/password.php:48
msgid "No matches found for that username."
msgstr "Rien de trouvé pour ce nom d'utilisateur."
#: www/password.php:51
-msgid "No matches found for that combination of username and <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "Pas d'entrée pour ce nom d'utilisateur et cet <abbr title=\"adresse mail\">e-mail</abbr>."
+msgid ""
+"No matches found for that combination of username and <abbr title="
+"\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"Pas d'entrée pour ce nom d'utilisateur et cet <abbr title=\"adresse mail\">e-"
+"mail</abbr>."
#: www/password.php:59
-msgid "There was an error while generating your new password. Please try again."
-msgstr "Il y a eu une erreur en enregistrant ce signet. Veuillez rééssayer ou contacter votre administrateur."
+msgid ""
+"There was an error while generating your new password. Please try again."
+msgstr ""
+"Il y a eu une erreur en enregistrant ce signet. Veuillez rééssayer ou "
+"contacter votre administrateur."
#: www/password.php:63
msgid "Your new password is:"
msgstr "Votre nouveau mot de passe est:"
#: www/password.php:63
-msgid "To keep your bookmarks secure, you should change this password in your profile the next time you log in."
-msgstr "Pour garder vos signets sûrs, vous devriez changer ce mot de passe dans votre profil lors de votre prochaine authentification."
+msgid ""
+"To keep your bookmarks secure, you should change this password in your "
+"profile the next time you log in."
+msgstr ""
+"Pour garder vos signets sûrs, vous devriez changer ce mot de passe dans "
+"votre profil lors de votre prochaine authentification."
#: www/password.php:66
#, php-format
@@ -1259,8 +1314,7 @@ msgstr "Nouveau mot de passe généré et envoyé à l'adresse %s"
msgid "Forgotten Password"
msgstr "Mot de passe oublié"
-#: www/profile.php:59
-#: www/watchlist.php:119
+#: www/profile.php:59 www/watchlist.php:119
msgid "Username was not specified"
msgstr "Le nom d'utilisateur n'a pas été spécifié."
@@ -1286,7 +1340,8 @@ msgstr "Adresse de courrier électronique invalide."
#: www/profile.php:106
msgid "An error occurred while saving your changes."
-msgstr "Une erreur s'est produite pendant l'enregistrement de vos modifications."
+msgstr ""
+"Une erreur s'est produite pendant l'enregistrement de vos modifications."
#: www/profile.php:108
msgid "Changes saved."
@@ -1294,7 +1349,9 @@ msgstr "Modifications enregistrées."
#: www/register.php:46
msgid "You <em>must</em> enter a username, password and e-mail address."
-msgstr "Vous <em>devez</em> saisir un nom d'utilisateur, un mot de passe, un nom et un <abbr title=\"adresse électronique\">e-mail</abbr>"
+msgstr ""
+"Vous <em>devez</em> saisir un nom d'utilisateur, un mot de passe, un nom et "
+"un <abbr title=\"adresse électronique\">e-mail</abbr>"
#: www/register.php:50
msgid "This username has been reserved, please make another choice."
@@ -1305,8 +1362,12 @@ msgid "This username already exists, please make another choice."
msgstr "Ce nom d'utilisateur existe déjà, veuillez en choisir un autre."
#: www/register.php:58
-msgid "This username is not valid (too short, too long, forbidden characters...), please make another choice."
-msgstr "Ce nom d'utilisateur n'est pas valide (trop court, trop long, caractères interdits...), Merci de faire un autre choix."
+msgid ""
+"This username is not valid (too short, too long, forbidden characters...), "
+"please make another choice."
+msgstr ""
+"Ce nom d'utilisateur n'est pas valide (trop court, trop long, caractères "
+"interdits...), Merci de faire un autre choix."
#: www/register.php:62
msgid "E-mail address is not valid. Please try again."
@@ -1324,13 +1385,12 @@ msgstr "Votre inscription a bien été prise en compte !"
msgid "Registration failed. Please try again."
msgstr "Enregistrement raté. Veuillez rééssayer."
-#: www/rss.php:84
+#: www/rss.php:93
#, php-format
msgid "Recent bookmarks posted to %s"
msgstr "Signets ajoutés récemment à %s"
-#: www/search.php:81
-#: www/search.php:145
+#: www/search.php:81 www/search.php:145
msgid "Search Bookmarks"
msgstr "Recherche de signets"
@@ -1370,11 +1430,11 @@ msgstr "Effacer un lien entre tags"
msgid "Edit Link Between Tags"
msgstr "Editer un lien entre tags"
-#: www/tagcommondescriptionedit.php:55
+#: www/tagcommondescriptionedit.php:62
msgid "Tag common description updated"
msgstr "Editer la description commune du tag"
-#: www/tagcommondescriptionedit.php:58
+#: www/tagcommondescriptionedit.php:67
msgid "Failed to update the tag common description"
msgstr "Impossible de mettre à jour la description commune du tag"
@@ -1432,34 +1492,45 @@ msgstr "Conseil pour admin:"
#: www/gsearch/index.php:33
msgid "To refresh manually Google Custom Search Engine, goes to: "
-msgstr "Pour rafraîchir manuellement le moteur de Google Custom Search, allez à :"
+msgstr ""
+"Pour rafraîchir manuellement le moteur de Google Custom Search, allez à :"
#: www/gsearch/index.php:35
-msgid "If no result appears, check that all the urls are valid in the admin section."
-msgstr "Si aucun résultat apparaît, vérifier que toutes les urls sont valides dans la section admin."
+msgid ""
+"If no result appears, check that all the urls are valid in the admin section."
+msgstr ""
+"Si aucun résultat apparaît, vérifier que toutes les urls sont valides dans "
+"la section admin."
#~ msgid "Add this tag to the query"
#~ msgstr "Ajouter ce tag à la requête"
+
#~ msgid "Last Users"
#~ msgstr "Derniers utilisateurs"
#, fuzzy
#~ msgid "Watched by"
#~ msgstr "Consultés"
+
#~ msgid "URL"
#~ msgstr "URL"
+
#~ msgid "for"
#~ msgstr "pour"
+
#~ msgid "Recent Bookmarks"
#~ msgstr "Signets récents"
+
#~ msgid "plus"
#~ msgstr "plus"
+
#~ msgid ""
#~ "<strong><a href=\"register.php\">Register now</a></strong> to start using "
#~ "%s!"
#~ msgstr ""
#~ "<a href=\"register.php\">Enregistrez-vous maintenant</a> pour poster vos "
#~ "propres signets sur %s !"
+
#~ msgid ""
#~ "<a href=\"http://sourceforge.net/projects/semanticscuttle/\">Semantic "
#~ "Scuttle</a> is licensed under the <a href=\"http://www.gnu.org/copyleft/"
@@ -1470,12 +1541,15 @@ msgstr "Si aucun résultat apparaît, vérifier que toutes les urls sont valides
#~ "Scuttle</a>, sous license <a href=\"http://www.gnu.org/copyleft/gpl.html"
#~ "\"><acronym title=\"GNU's Not Unix\">GNU</acronym> General Public "
#~ "License</a> (vous pouvez donc l'héberger sur votre propre serveur)."
+
#~ msgid "edit"
#~ msgstr "éditer"
+
#~ msgid "User with username %s not was not found"
#~ msgstr "L'utilisateur %s n'a pas été trouvé."
+
#~ msgid "%s Bookmarks"
#~ msgstr "Signets de %s"
+
#~ msgid "<abbr title=\"Electronic mail\">E-mail</abbr>"
#~ msgstr "<abbr title=\"Adresse électronique\">E-mail</abbr>"
-
diff --git a/data/locales/messages.po b/data/locales/messages.po
index 1a142a0..2f35f64 100644
--- a/data/locales/messages.po
+++ b/data/locales/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 20:55+0100\n"
+"POT-Creation-Date: 2010-09-15 19:15+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"
@@ -17,50 +17,50 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: src/SemanticScuttle/functions.php:163
+#: src/SemanticScuttle/functions.php:189
msgid "message_die() was called multiple times."
msgstr ""
-#: src/SemanticScuttle/functions.php:175
+#: src/SemanticScuttle/functions.php:201
msgid "SQL Error"
msgstr ""
-#: src/SemanticScuttle/functions.php:181
+#: src/SemanticScuttle/functions.php:207
msgid "Line"
msgstr ""
-#: src/SemanticScuttle/functions.php:181
+#: src/SemanticScuttle/functions.php:207
#: data/templates/importDelicious.tpl.php:8
#: data/templates/importNetscape.tpl.php:9
#: data/templates/importStructure.tpl.php:10
msgid "File"
msgstr ""
-#: src/SemanticScuttle/functions.php:189
+#: src/SemanticScuttle/functions.php:215
msgid "Information"
msgstr ""
-#: src/SemanticScuttle/functions.php:194
+#: src/SemanticScuttle/functions.php:220
msgid "Critical Information"
msgstr ""
-#: src/SemanticScuttle/functions.php:199
+#: src/SemanticScuttle/functions.php:225
msgid "An error occured"
msgstr ""
-#: src/SemanticScuttle/functions.php:202
+#: src/SemanticScuttle/functions.php:228
msgid "General Error"
msgstr ""
-#: src/SemanticScuttle/functions.php:210
+#: src/SemanticScuttle/functions.php:236
msgid "An critical error occured"
msgstr ""
-#: src/SemanticScuttle/functions.php:213
+#: src/SemanticScuttle/functions.php:239
msgid "Critical Error"
msgstr ""
-#: src/SemanticScuttle/functions.php:222
+#: src/SemanticScuttle/functions.php:248
msgid "DEBUG MODE"
msgstr ""
@@ -150,7 +150,7 @@ msgstr ""
msgid "Are you sure?"
msgstr ""
-#: data/templates/admin.tpl.php:19 data/templates/bookmarks.tpl.php:251
+#: data/templates/admin.tpl.php:19 data/templates/bookmarks.tpl.php:267
msgid "Delete"
msgstr ""
@@ -169,12 +169,12 @@ msgid ""
msgstr ""
#: data/templates/bookmarkcommondescriptionedit.tpl.php:18
-#: data/templates/bookmarks.tpl.php:137 data/templates/editbookmark.tpl.php:38
+#: data/templates/bookmarks.tpl.php:137 data/templates/editbookmark.tpl.php:43
msgid "Title"
msgstr ""
#: data/templates/bookmarkcommondescriptionedit.tpl.php:23
-#: data/templates/editbookmark.tpl.php:44
+#: data/templates/editbookmark.tpl.php:49
#: data/templates/editprofile.tpl.php:47 data/templates/profile.tpl.php:33
#: data/templates/tagcommondescriptionedit.tpl.php:13
#: data/templates/tagedit.tpl.php:12
@@ -193,8 +193,8 @@ msgid "Update"
msgstr ""
#: data/templates/bookmarkcommondescriptionedit.tpl.php:43
-#: data/templates/editbookmark.tpl.php:98 data/templates/tag2tagadd.tpl.php:24
-#: data/templates/tag2tagedit.tpl.php:38
+#: data/templates/editbookmark.tpl.php:103
+#: data/templates/tag2tagadd.tpl.php:24 data/templates/tag2tagedit.tpl.php:38
#: data/templates/tagcommondescriptionedit.tpl.php:33
#: data/templates/tagedit.tpl.php:19 data/templates/tagrename.tpl.php:25
msgid "Cancel"
@@ -273,61 +273,61 @@ msgstr ""
msgid "Page %d of %d"
msgstr ""
-#: data/templates/bookmarks.tpl.php:245
+#: data/templates/bookmarks.tpl.php:261
msgid "Tags:"
msgstr ""
-#: data/templates/bookmarks.tpl.php:251
+#: data/templates/bookmarks.tpl.php:267
msgid "Edit"
msgstr ""
-#: data/templates/bookmarks.tpl.php:255
+#: data/templates/bookmarks.tpl.php:271
msgid "Last update"
msgstr ""
-#: data/templates/bookmarks.tpl.php:258
+#: data/templates/bookmarks.tpl.php:274
msgid "by"
msgstr ""
-#: data/templates/bookmarks.tpl.php:260
+#: data/templates/bookmarks.tpl.php:276
msgid "you"
msgstr ""
-#: data/templates/bookmarks.tpl.php:274
+#: data/templates/bookmarks.tpl.php:290
#, php-format
msgid " and %s1 other%s"
msgstr ""
-#: data/templates/bookmarks.tpl.php:277
+#: data/templates/bookmarks.tpl.php:293
#, php-format
msgid " and %2$s%1$s others%3$s"
msgstr ""
-#: data/templates/bookmarks.tpl.php:288
+#: data/templates/bookmarks.tpl.php:304
msgid "Copy this bookmark to YOUR bookmarks."
msgstr ""
-#: data/templates/bookmarks.tpl.php:289
+#: data/templates/bookmarks.tpl.php:305
msgid "Copy"
msgstr ""
-#: data/templates/bookmarks.tpl.php:309
+#: data/templates/bookmarks.tpl.php:325
msgid "This bookmark is certified by an admin user."
msgstr ""
-#: data/templates/bookmarks.tpl.php:351
+#: data/templates/bookmarks.tpl.php:371
msgid "Private Note on this bookmark"
msgstr ""
-#: data/templates/bookmarks.tpl.php:363
+#: data/templates/bookmarks.tpl.php:383
msgid "Come back to the top of this page."
msgstr ""
-#: data/templates/bookmarks.tpl.php:363
+#: data/templates/bookmarks.tpl.php:383
msgid "Top of the page"
msgstr ""
-#: data/templates/bookmarks.tpl.php:369
+#: data/templates/bookmarks.tpl.php:389
msgid "No bookmarks available"
msgstr ""
@@ -362,133 +362,133 @@ msgstr ""
msgid "Popular Tags From All Users"
msgstr ""
-#: data/templates/editbookmark.tpl.php:33
+#: data/templates/editbookmark.tpl.php:38
msgid "Address"
msgstr ""
-#: data/templates/editbookmark.tpl.php:35
#: data/templates/editbookmark.tpl.php:40
+#: data/templates/editbookmark.tpl.php:45
#: data/templates/editprofile.tpl.php:31 data/templates/tagrename.tpl.php:14
#: data/templates/tagrename.tpl.php:19
msgid "Required"
msgstr ""
-#: data/templates/editbookmark.tpl.php:45
+#: data/templates/editbookmark.tpl.php:50
msgid "Add Note"
msgstr ""
-#: data/templates/editbookmark.tpl.php:48
+#: data/templates/editbookmark.tpl.php:53
msgid ""
"You can use anchors to delimite attributes. for example: [publisher]blah[/"
"publisher] "
msgstr ""
-#: data/templates/editbookmark.tpl.php:51
+#: data/templates/editbookmark.tpl.php:56
msgid "Suggested anchors: "
msgstr ""
-#: data/templates/editbookmark.tpl.php:63
+#: data/templates/editbookmark.tpl.php:68
msgid "Private Note"
msgstr ""
-#: data/templates/editbookmark.tpl.php:65
+#: data/templates/editbookmark.tpl.php:70
msgid "Just visible by you and your contacts."
msgstr ""
-#: data/templates/editbookmark.tpl.php:69 data/templates/toolbar.inc.php:10
+#: data/templates/editbookmark.tpl.php:74 data/templates/toolbar.inc.php:10
#: www/tags.php:45 www/tags.php:67
msgid "Tags"
msgstr ""
-#: data/templates/editbookmark.tpl.php:73
+#: data/templates/editbookmark.tpl.php:78
msgid "Comma-separated"
msgstr ""
-#: data/templates/editbookmark.tpl.php:77 data/templates/tag2tagadd.tpl.php:9
+#: data/templates/editbookmark.tpl.php:82 data/templates/tag2tagadd.tpl.php:9
msgid ""
"Note: use \">\" to include one tag in another. e.g.: europe>france>paris"
msgstr ""
-#: data/templates/editbookmark.tpl.php:81 data/templates/tag2tagadd.tpl.php:8
+#: data/templates/editbookmark.tpl.php:86 data/templates/tag2tagadd.tpl.php:8
msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry"
msgstr ""
-#: data/templates/editbookmark.tpl.php:84
+#: data/templates/editbookmark.tpl.php:89
#: data/templates/importDelicious.tpl.php:15
#: data/templates/importNetscape.tpl.php:16
msgid "Privacy"
msgstr ""
-#: data/templates/editbookmark.tpl.php:87
+#: data/templates/editbookmark.tpl.php:92
#: data/templates/importDelicious.tpl.php:18
#: data/templates/importNetscape.tpl.php:19
msgid "Public"
msgstr ""
-#: data/templates/editbookmark.tpl.php:88
+#: data/templates/editbookmark.tpl.php:93
msgid "Shared with Watch List"
msgstr ""
-#: data/templates/editbookmark.tpl.php:89
+#: data/templates/editbookmark.tpl.php:94
#: data/templates/importDelicious.tpl.php:20
#: data/templates/importNetscape.tpl.php:21
msgid "Private"
msgstr ""
-#: data/templates/editbookmark.tpl.php:102
+#: data/templates/editbookmark.tpl.php:107
msgid "Delete Bookmark"
msgstr ""
-#: data/templates/editbookmark.tpl.php:107
+#: data/templates/editbookmark.tpl.php:112
msgid "edit common description"
msgstr ""
-#: data/templates/editbookmark.tpl.php:134
+#: data/templates/editbookmark.tpl.php:139
msgid "Bookmarklet"
msgstr ""
-#: data/templates/editbookmark.tpl.php:140
+#: data/templates/editbookmark.tpl.php:145
#, php-format
msgid ""
"Click one of the following bookmarklets to add a button you can click "
"whenever you want to add the page you are on to %s"
msgstr ""
-#: data/templates/editbookmark.tpl.php:144
+#: data/templates/editbookmark.tpl.php:149
#, php-format
msgid ""
"Drag one of the following bookmarklets to your browser's bookmarks and click "
"it whenever you want to add the page you are on to %s"
msgstr ""
-#: data/templates/editbookmark.tpl.php:157
#: data/templates/editbookmark.tpl.php:162
+#: data/templates/editbookmark.tpl.php:167
#, php-format
msgid "Post to %s"
msgstr ""
-#: data/templates/editbookmark.tpl.php:158
#: data/templates/editbookmark.tpl.php:163
+#: data/templates/editbookmark.tpl.php:168
#, php-format
msgid "Post to %s (Pop-up)"
msgstr ""
-#: data/templates/editbookmark.tpl.php:168
+#: data/templates/editbookmark.tpl.php:173
#: data/templates/importDelicious.tpl.php:26
#: data/templates/importNetscape.tpl.php:27
#: data/templates/importStructure.tpl.php:16
msgid "Import"
msgstr ""
-#: data/templates/editbookmark.tpl.php:170
+#: data/templates/editbookmark.tpl.php:175
msgid "Import bookmarks from bookmark file"
msgstr ""
-#: data/templates/editbookmark.tpl.php:170
+#: data/templates/editbookmark.tpl.php:175
msgid "Internet Explorer, Mozilla Firefox and Netscape"
msgstr ""
-#: data/templates/editbookmark.tpl.php:171
+#: data/templates/editbookmark.tpl.php:176
msgid "Import bookmarks from del.icio.us"
msgstr ""
@@ -841,7 +841,7 @@ msgid "Edit Tag Description"
msgstr ""
#: data/templates/sidebar.block.tagactions.php:26
-#: www/tagcommondescriptionedit.php:64
+#: www/tagcommondescriptionedit.php:76
msgid "Edit Tag Common Description"
msgstr ""
@@ -1028,12 +1028,12 @@ msgstr ""
msgid "Failed to delete bookmark"
msgstr ""
-#: www/alltags.php:49
+#: www/alltags.php:50
msgid "All Tags"
msgstr ""
-#: www/alltags.php:55 www/bookmarks.php:96 www/populartags.php:52
-#: www/profile.php:51 www/rss.php:67 www/search.php:109 www/watch.php:45
+#: www/alltags.php:56 www/bookmarks.php:96 www/populartags.php:52
+#: www/profile.php:51 www/rss.php:76 www/search.php:109 www/watch.php:45
#: www/watchlist.php:61
#, php-format
msgid "User with username %s was not found"
@@ -1041,7 +1041,7 @@ msgstr ""
#: www/bookmarkcommondescriptionedit.php:51 www/tag2tagadd.php:37
#: www/tag2tagdelete.php:41 www/tag2tagedit.php:33
-#: www/tagcommondescriptionedit.php:43 www/tagedit.php:43
+#: www/tagcommondescriptionedit.php:51 www/tagedit.php:43
msgid "Permission denied."
msgstr ""
@@ -1179,11 +1179,11 @@ msgstr ""
msgid "%s: Recent bookmarks"
msgstr ""
-#: www/index.php:78
+#: www/index.php:75
msgid "Store, share and tag your favourite links"
msgstr ""
-#: www/index.php:79
+#: www/index.php:76
msgid "All Bookmarks"
msgstr ""
@@ -1313,7 +1313,7 @@ msgstr ""
msgid "Registration failed. Please try again."
msgstr ""
-#: www/rss.php:84
+#: www/rss.php:93
#, php-format
msgid "Recent bookmarks posted to %s"
msgstr ""
@@ -1358,11 +1358,11 @@ msgstr ""
msgid "Edit Link Between Tags"
msgstr ""
-#: www/tagcommondescriptionedit.php:55
+#: www/tagcommondescriptionedit.php:62
msgid "Tag common description updated"
msgstr ""
-#: www/tagcommondescriptionedit.php:58
+#: www/tagcommondescriptionedit.php:67
msgid "Failed to update the tag common description"
msgstr ""
diff --git a/data/templates/admin.tpl.php b/data/templates/admin.tpl.php
index c8d47e8..50680f6 100644
--- a/data/templates/admin.tpl.php
+++ b/data/templates/admin.tpl.php
@@ -11,7 +11,7 @@ foreach($users as $user) {
echo '<div class="link">';
echo '<a href="'.createURL('profile', $user->getUsername()).'">'.$user->getUsername().'</a>';
- echo ' - <span title='. T_('Public/Shared/Private') .'>'. $user->getNbBookmarks('public') .' / '. $user->getNbBookmarks('shared') .' / '. $user->getNbBookmarks('private') .' '. T_('bookmark(s)') .'</span>';
+ echo ' - <span title="'. T_('Public/Shared/Private') .'">'. $user->getNbBookmarks('public') .' / '. $user->getNbBookmarks('shared') .' / '. $user->getNbBookmarks('private') .' '. T_('bookmark(s)') .'</span>';
echo '</div>';
if($user->getUsername() != $currentUser->getUsername()) {
diff --git a/data/templates/bookmarkcommondescriptionedit.tpl.php b/data/templates/bookmarkcommondescriptionedit.tpl.php
index af5909a..807c58b 100644
--- a/data/templates/bookmarkcommondescriptionedit.tpl.php
+++ b/data/templates/bookmarkcommondescriptionedit.tpl.php
@@ -30,7 +30,8 @@ window.onload = function() {
if(strlen($description['cdDatetime'])>0) {
echo T_('Last modification:').' '.$description['cdDatetime'].', ';
$lastUser = $userservice->getUser($description['uId']);
- echo '<a href="'.createURL('profile', $lastUser['username']).'">'.$lastUser['username'].'</a>';
+ echo '<a href="'.createURL('profile', $lastUser['username']).'">'
+ . SemanticScuttle_Model_UserArray::getName($lastUser) . '</a>';
}
?>
</td>
diff --git a/data/templates/bookmarklet.inc.php b/data/templates/bookmarklet.inc.php
new file mode 100644
index 0000000..9867745
--- /dev/null
+++ b/data/templates/bookmarklet.inc.php
@@ -0,0 +1,117 @@
+<h3><?php echo T_('Bookmarklet'); ?></h3>
+<p id="bookmarklet"></p>
+<script type="text/javascript">
+//<![CDATA[
+var browser = navigator.appName;
+jQuery(function($) {
+if (browser == "Opera") {
+ $('#bookmarklet').append(
+ <?php echo json_encode(
+ sprintf(
+ T_("Click one of the following bookmarklets to add a button you can click whenever you want to add the page you are on to %s") . ':',
+ $GLOBALS['sitename']
+ )
+ ); ?>
+ );
+} else {
+ $('#bookmarklet').append(
+ <?php echo json_encode(
+ sprintf(
+ T_("Drag one of the following bookmarklets to your browser's bookmarks and click it whenever you want to add the page you are on to %s") . ':',
+ $GLOBALS['sitename']
+ )
+ );
+ ?>
+ );
+}
+});
+//]]>
+</script>
+<script type="text/javascript">
+//<![CDATA[
+var selection = '';
+if (window.getSelection) {
+ selection = 'window.getSelection()';
+} else if (document.getSelection) {
+ selection = 'document.getSelection()';
+} else if (document.selection) {
+ selection = 'document.selection.createRange().text';
+}
+if (browser == "Opera") {
+ $('#bookmarklet').append(
+ '<ul>'
+ + '<li>'
+ + '<a class="bookmarklet" href="'
+ + '<?php
+$popupLink = 'javascript:'
+ . "location.href='"
+ . createURL('bookmarks', $GLOBALS['user'])
+ . '?action=add'
+ . "&address='+encodeURIComponent(document.location.href)+'"
+ . "&title='+encodeURIComponent(document.title)+'"
+ . "&description='+encodeURIComponent(SELECTION)"
+ . ";";
+$link = 'opera:/button/'
+ //Opera command
+ . 'Go to page'
+ //command parameter 1
+ . ',"' . rawurlencode($popupLink) . '"'
+ //command parameter 2
+ . ','
+ //button title
+ . ',"Post to ' . fixOperaButtonName($GLOBALS['sitename']) . '"'
+ //button icon name
+ . ',"Scuttle"';
+echo jsEscTitle(htmlspecialchars($link));
+?>'.replace('SELECTION', selection)
+ + '"><?php echo jsEscTitle(sprintf(T_('Post to %s'), $GLOBALS['sitename'])); ?></a>'
+ + '</li>'
+ + '<li>'
+ + '<a class="bookmarklet" href="'
+ + '<?php
+$popupLink = 'javascript:'
+ . 'open('
+ . "'" . createURL('bookmarks', $GLOBALS['user'])
+ . '?action=add'
+ . '&popup=1'
+ . "&address='+encodeURIComponent(document.location.href)+'"
+ . "&title='+encodeURIComponent(document.title)+'"
+ . "&description='+encodeURIComponent(SELECTION)"
+ . ","
+ . "'" . htmlspecialchars(jsEscTitle($GLOBALS['sitename'])) . "',"
+ . "'modal=1,status=0,scrollbars=1,toolbar=0,resizable=1,width=790,height=465"
+ . ",left='+(screen.width-790)/2+',top='+(screen.height-425)/2"
+ . ");void 0";
+$link = 'opera:/button/'
+ . 'Go to page'
+ . ',"' . rawurlencode($popupLink) . '"'
+ . ','
+ . ',"Post to ' . fixOperaButtonName($GLOBALS['sitename']) . ' (Pop-up)"'
+ . ',"Scuttle"';
+echo jsEscTitle(htmlspecialchars($link));
+?>'.replace('SELECTION', selection)
+ + '"><?php echo jsEscTitle(sprintf(T_('Post to %s (Pop-up)'), $GLOBALS['sitename'])); ?></a>'
+ + '</li>'
+ + '</ul>'
+ );
+} else {
+ $('#bookmarklet').append(
+ '<ul>'
+ + '<li><a class="bookmarklet" href="javascript:x=document;a=encodeURIComponent(x.location.href);t=encodeURIComponent(x.title);d=encodeURIComponent('+selection+');location.href=\'<?php echo createURL('bookmarks', $GLOBALS['user']); ?>?action=add&amp;address=\'+a+\'&amp;title=\'+t+\'&amp;description=\'+d;void 0;"><?php echo jsEscTitle(sprintf(T_('Post to %s'), $GLOBALS['sitename'])); ?><\/a><\/li>'
+ + '<li>'
+ + '<a class="bookmarklet" href="'
+ + 'javascript:x=document;'
+ + 'a=encodeURIComponent(x.location.href);'
+ + 't=encodeURIComponent(x.title);'
+ + 'd=encodeURIComponent('+selection+');'
+ + 'open('
+ + '\'<?php echo createURL('bookmarks', $GLOBALS['user']); ?>?action=add&amp;popup=1&amp;address=\'+a+\'&amp;title=\'+t+\'&amp;description=\'+d,\'<?php echo htmlspecialchars(jsEscTitleDouble($GLOBALS['sitename'])); ?>\',\'modal=1,status=0,scrollbars=1,toolbar=0,resizable=1,width=790,height=465,left=\'+(screen.width-790)/2+\',top=\'+(screen.height-425)/2'
+ + ');void 0;">'
+ + '<?php echo jsEscTitle(sprintf(T_('Post to %s (Pop-up)'), $GLOBALS['sitename'])); ?>'
+ + '</a>'
+ + '</li>'
+ + '</ul>'
+ );
+}
+//]]>
+</script>
diff --git a/data/templates/bookmarks.tpl.php b/data/templates/bookmarks.tpl.php
index dab2f37..55d6a0f 100644
--- a/data/templates/bookmarks.tpl.php
+++ b/data/templates/bookmarks.tpl.php
@@ -1,14 +1,30 @@
<?php
+/**
+ * Show a list of bookmarks.
+ *
+ * SemanticScuttle - your social bookmark manager.
+ *
+ * PHP version 5.
+ *
+ * @category Bookmarking
+ * @package SemanticScuttle
+ * @subcategory Templates
+ * @author Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
+ * @author Christian Weiske <cweiske@cweiske.de>
+ * @author Eric Dane <ericdane@users.sourceforge.net>
+ * @license GPL http://www.gnu.org/licenses/gpl.html
+ * @link http://sourceforge.net/projects/semanticscuttle
+ */
/* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
-$tagservice =SemanticScuttle_Service_Factory::get('Tag');
-$cdservice =SemanticScuttle_Service_Factory::get('CommonDescription');
+$bookmarkservice = SemanticScuttle_Service_Factory::get('Bookmark');
+$tagservice = SemanticScuttle_Service_Factory::get('Tag');
+$cdservice = SemanticScuttle_Service_Factory::get('CommonDescription');
-$pageName = isset($pageName)?$pageName:"";
-$user = isset($user)?$user:"";
-$currenttag = isset($currenttag)?$currenttag:"";
+$pageName = isset($pageName) ? $pageName : '';
+$user = isset($user) ? $user : '';
+$currenttag = isset($currenttag) ? $currenttag : '';
$this->includeTemplate($GLOBALS['top_include']);
@@ -46,12 +62,16 @@ if($currenttag!= '' && $cdservice->getLastTagDescription($currenttag)) {
}
//common tag description edit
-if($userservice->isLoggedOn()) {
- if($currenttag!= '' && ($GLOBALS['enableCommonTagDescriptionEditedByAll'] || $currentUser->isAdmin())) {
+if ($userservice->isLoggedOn()) {
+ if ($currenttag != ''
+ && ($GLOBALS['enableCommonTagDescriptionEditedByAll']
+ || $currentUser->isAdmin()
+ )
+ ) {
echo ' <a href="'. createURL('tagcommondescriptionedit', $currenttag).'" title="'.T_('Edit the common description of this tag').'">';
echo !is_array($cDescription) || strlen($cDescription['cdDescription'])==0?T_('Edit the common description of this tag'):'';
echo ' <img src="'.ROOT.'images/b_edit.png" /></a>';
- } elseif(isset($hash)) {
+ } else if (isset($hash)) {
echo ' (<a href="'.createURL('bookmarkcommondescriptionedit', $hash).'" title="'.T_('Edit the common description of this bookmark').'">';
echo T_('Edit the common description of this bookmark').'</a>)';
}
@@ -101,54 +121,54 @@ $votingSort = 'voting_desc';
switch(getSortOrder()) {
case 'date_asc':
- $dateArrow = ' &uarr;';
+ $dateArrow = ' ↑';
$dateSort = 'date_desc';
break;
case 'title_asc':
- $titleArrow = ' &uarr;';
+ $titleArrow = ' ↑';
$titleSort = 'title_desc';
break;
case 'title_desc':
- $titleArrow = ' &darr;';
+ $titleArrow = ' ↓';
$titleSort = 'title_asc';
break;
case 'voting_asc':
- $votingArrow = ' &uarr;';
+ $votingArrow = ' ↑';
$votingSort = 'voting_desc';
break;
case 'voting_desc':
- $votingArrow = ' &darr;';
+ $votingArrow = ' ↓';
$votingSort = 'voting_asc';
break;
case 'date_desc':
default:
- $dateArrow = ' &darr;';
+ $dateArrow = ' ↓';
$dateSort = 'date_asc';
break;
}
?>
-<a href="?sort=<?php echo $dateSort ?>"><?php echo T_("Date").$dateArrow; ?></a>
-<span>/</span>
-<a href="?sort=<?php echo $titleSort ?>"><?php echo T_("Title").$titleArrow; ?></a>
-<span>/</span>
+ <a href="?sort=<?php echo $dateSort ?>"><?php echo T_("Date").$dateArrow; ?></a>
+ <span>/</span>
+ <a href="?sort=<?php echo $titleSort ?>"><?php echo T_("Title").$titleArrow; ?></a>
+ <span>/</span>
<?php if ($GLOBALS['enableVoting']) { ?>
-<a href="?sort=<?php echo $votingSort ?>"><?php echo T_("Voting").$votingArrow; ?></a>
-<span>/</span>
+ <a href="?sort=<?php echo $votingSort ?>"><?php echo T_("Voting").$votingArrow; ?></a>
+ <span>/</span>
<?php } ?>
<?php
-if($currenttag!= '') {
- if($user!= '') {
+if ($currenttag!= '') {
+ if ($user!= '') {
echo ' - ';
echo '<a href="'. createURL('tags', $currenttag) .'">';
echo T_('Bookmarks from other users for this tag').'</a>';
//echo T_(' for these tags');
- } else if($userservice->isLoggedOn()){
+ } else if ($userservice->isLoggedOn()){
echo ' - ';
echo '<a href="'. createURL('bookmarks', $currentUser->getUsername().'/'.$currenttag) .'">';
echo T_('Only your bookmarks for this tag').'</a>';
@@ -199,7 +219,10 @@ if($currenttag!= '') {
$brss = '';
$size = count($rsschannels);
for ($i = 0; $i < $size; $i++) {
- $brss = '<a style="background:#FFFFFF" href="'. $rsschannels[$i][1] .'" title="' . htmlspecialchars($rsschannels[$i][0]) . '"><img src="'. ROOT .'images/rss.gif" width="16" height="16" alt="'. htmlspecialchars($rsschannels[$i][0]) .'" /></a>';
+ $brss = '<a style="background:#FFFFFF" href="'. htmlspecialchars($rsschannels[$i][1]) . '"'
+ . ' title="' . htmlspecialchars($rsschannels[$i][0]) . '">'
+ . '<img src="' . ROOT . 'images/rss.gif" width="16" height="16" alt="' . htmlspecialchars($rsschannels[$i][0]) .'"/>'
+ . '</a>';
}
$pagesBanner = '<p class="paging">'. $bfirst .'<span> / </span>'. $bprev .'<span> / </span>'. $bnext .'<span> / </span>'. $blast .'<span> / </span>'. sprintf(T_('Page %d of %d'), $page, $totalpages) ." ". $brss ." </p>\n";
@@ -213,10 +236,8 @@ if($currenttag!= '') {
-<ol <?php echo ($start > 0 ? ' start="'. ++$start .'"' : ''); ?>
- id="bookmarks">
-
- <?php
+<ol<?php echo ($start > 0 ? ' start="'. ++$start .'"' : ''); ?> id="bookmarks">
+<?php
$addresses = array();
foreach ($bookmarks as $key => &$row) {
$addresses[$row['bId']] = $row['bAddress'];
@@ -253,35 +274,52 @@ if($currenttag!= '') {
$tagsForCopy = '';
$tags = $row['tags'];
foreach ($tags as $tkey => &$tag) {
- $cats .= '<a href="'. sprintf($cat_url, filter($row['username'], 'url'), filter($tag, 'url')) .'" rel="tag">'. filter($tag) .'</a>, ';
- $tagsForCopy.= $tag.',';
+ $tagcaturl = sprintf(
+ $cat_url,
+ filter($row['username'], 'url'),
+ filter($tag, 'url')
+ );
+ $cats .= sprintf(
+ '<a href="%s" rel="tag">%s</a>, ',
+ $tagcaturl, filter($tag)
+ );
+ $tagsForCopy .= $tag . ',';
}
$cats = substr($cats, 0, -2);
if ($cats != '') {
- $cats = ' '.T_('Tags:').' '. $cats;
+ $cats = T_('Tags:') . ' ' . $cats;
}
// Edit and delete links
$edit = '';
if ($bookmarkservice->editAllowed($row)) {
- $edit = ' - <a href="'. createURL('edit', $row['bId']) .'">'. T_('Edit') .'</a><script type="text/javascript">document.write(" - <a href=\"#\" onclick=\"deleteBookmark(this, '. $row['bId'] .'); return false;\">'. T_('Delete') .'<\/a>");</script>';
+ $edit = ' - <a href="' . createURL('edit', $row['bId']) . '">'
+ . T_('Edit')
+ . '</a>'
+ . ' <a href="#" onclick="deleteBookmark(this, '. $row['bId'] .'); return false;">'
+ . T_('Delete')
+ .'</a>';
}
// Last update
- $update = ' <small title="'. T_('Last update') .'">('. date($GLOBALS['shortdate'], strtotime($row['bModified'])). ') </small>';
+ $update = ' <small title="'. T_('Last update') .'">('. date($GLOBALS['shortdate'], strtotime($row['bModified'])). ') </small>';
// User attribution
- $copy = ' '. T_('by'). ' ';
- if($userservice->isLoggedOn() && $currentUser->getUsername() == $row['username']) {
- $copy.= T_('you');
+ $copy = ' ' . T_('by') . ' ';
+ if ($userservice->isLoggedOn()
+ && $currentUser->getUsername() == $row['username']
+ ) {
+ $copy .= T_('you');
} else {
- $copy.= '<a href="'. createURL('bookmarks', $row['username']) .'">'. $row['username'] .'</a>';
+ $copy .= '<a href="' . createURL('bookmarks', $row['username']) . '">'
+ . SemanticScuttle_Model_UserArray::getName($row)
+ . '</a>';
}
- // Udders!
+ // others
if (!isset($hash)) {
$others = $otherCounts[$row['bAddress']];
- $ostart = '<a href="'. createURL('history', $row['bHash']) .'">';
+ $ostart = '<a href="' . createURL('history', $row['bHash']) . '">';
$oend = '</a>';
switch ($others) {
case 0:
@@ -300,7 +338,10 @@ if($currenttag!= '') {
&& !$existence[$row['bAddress']]
) {
$copy .= ' - <a href="'
- . createURL('bookmarks', $currentUser->getUsername() .'?action=add&amp;copyOf='. $row['bId'])
+ . createURL(
+ 'bookmarks',
+ $currentUser->getUsername()
+ . '?action=add&amp;copyOf=' . $row['bId'])
. '" title="'.T_('Copy this bookmark to YOUR bookmarks.').'">'
. T_('Copy')
. '</a>';
@@ -321,11 +362,11 @@ if($currenttag!= '') {
// Admin specific design
if ($userservice->isAdmin($row['username']) && $GLOBALS['enableAdminColors']) {
- $adminBgClass = 'class="adminBackground"';
- $adminStar = ' <img src="'. ROOT .'images/logo_24.gif" width="12px" title="'. T_('This bookmark is certified by an admin user.') .'" />';
+ $adminBgClass = ' class="adminBackground"';
+ $adminStar = ' <img src="'. ROOT .'images/logo_24.gif" width="12px" title="'. T_('This bookmark is certified by an admin user.') .'" />';
} else {
$adminBgClass = '';
- $adminStar = '';
+ $adminStar = '';
}
// Private Note (just visible by the owner and his/her contacts)
@@ -346,13 +387,16 @@ if($currenttag!= '') {
}
// Output
- echo '<li class="xfolkentry'. $access .'" >'."\n";
+ echo ' <li class="xfolkentry'. $access .'">'."\n";
include 'bookmarks-thumbnail.inc.tpl.php';
include 'bookmarks-vote.inc.tpl.php';
- echo '<div '.$adminBgClass.' >';;
+ echo ' <div' . $adminBgClass . '>' . "\n";
- echo '<div class="link"><a href="'. htmlspecialchars($address) .'"'. $rel .' class="taggedlink" target="_blank">'. filter($row['bTitle']) ."</a>" . $adminStar . "</div>\n";
+ echo ' <div class="link">'
+ . '<a href="'. htmlspecialchars($address) .'"'. $rel .' class="taggedlink">'
+ . filter($row['bTitle'])
+ . '</a>' . $adminStar . "</div>\n";
if ($row['bDescription'] == '') {
$bkDescription = $GLOBALS['blankDescription'];
} else {
@@ -362,17 +406,23 @@ if($currenttag!= '') {
$bkDescription = preg_replace('@((http|https|ftp)://.*?)( |\r|$)@', '<a href="$1" rel="nofollow">$1</a>$3', $bkDescription); // make url clickable
}
- echo '<div class="description">'. nl2br($bkDescription) ."</div>\n";
- //if(!isset($hash)) {
- echo '<div class="address">' . shortenString($oaddress) . '</div>';
- //}
-
- echo '<div class="meta">'. $cats . $copy . $edit . $update ."</div>\n";
- echo $privateNoteField!=''?'<div class="privateNote" title="'. T_('Private Note on this bookmark') .'">'.$privateNoteField."</div>\n":'';
+ echo ' <div class="description">'. nl2br($bkDescription) ."</div>\n";
+ echo ' <div class="address">' . shortenString($oaddress) . "</div>\n";
+
+ echo ' <div class="meta">'
+ . $cats . "\n"
+ . $copy . "\n"
+ . $edit . "\n"
+ . $update . "\n"
+ . " </div>\n";
+ echo $privateNoteField != ''
+ ? ' <div class="privateNote" title="'. T_('Private Note on this bookmark') .'">'.$privateNoteField."</div>\n"
+ : '';
+ echo ' ';
include 'bookmarks-vote-horizontal.inc.tpl.php';
- echo '</div>';
+ echo " </div>\n";
- echo "</li>\n";
+ echo " </li>\n";
}
?>
diff --git a/data/templates/dynamictags.inc.php b/data/templates/dynamictags.inc.php
index b18565b..8cf07c1 100644
--- a/data/templates/dynamictags.inc.php
+++ b/data/templates/dynamictags.inc.php
@@ -36,28 +36,40 @@ $allPopularTagsCount = count($allPopularTags);
// function printing the cloud
-function writeTagsProposition($tagsCloud, $title) {
- echo 'document.write(\'<div class="collapsible">\');';
- echo 'document.write(\'<h3>'. $title .'<\/h3>\');';
- echo 'document.write(\'<p id="popularTags" class="tags">\');';
+function writeTagsProposition($tagsCloud, $title)
+{
+ static $id = 0;
+ ++$id;
+
+ echo <<<JS
+ $('.edit-tagclouds')
+ .append(
+'<div class="collapsible" id="edit-tagcloud-$id">'
++ ' <h3>$title</h3>'
++ ' <p class="popularTags tags"></p>'
++ '</div>');
+JS;
$taglist = '';
- foreach(array_keys($tagsCloud) as $key) {
- $row =& $tagsCloud[$key];
+ foreach (array_keys($tagsCloud) as $key) {
+ $row = $tagsCloud[$key];
$entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']);
- $taglist .= '<span title="'. $row['bCount'] .' '. $entries .'" style="font-size:'. $row['size'] .'" onclick="addTag(this)">'. filter($row['tag']) .'<\/span> ';
+ $taglist .= '<span'
+ . ' title="'. $row['bCount'] . ' ' . $entries . '"'
+ . ' style="font-size:' . $row['size'] . '"'
+ . ' onclick="addTag(this)">'
+ . filter($row['tag'])
+ . '</span> ';
}
-
- echo 'document.write(\''. $taglist .'\');';
- echo 'document.write(\'<\/p>\');';
- echo 'document.write(\'<\/div>\');';
-
+ echo '$(\'#edit-tagcloud-' . $id . ' p\').append('
+ . json_encode($taglist)
+ . ");\n";
}
if ($allPopularTagsCount > 0 || $userPopularTagsCount > 0 ) { ?>
-
<script type="text/javascript">
+//<![CDATA[
Array.prototype.contains = function (ele) {
for (var i = 0; i < this.length; i++) {
if (this[i] == ele) {
@@ -87,20 +99,26 @@ function addonload(addition) {
}
}
-addonload(
- function () {
- var taglist = document.getElementById('tags');
- var tags = taglist.value.split(', ');
+jQuery(function($) {
+<?php
+if ($userPopularTagsCount > 0) {
+ writeTagsProposition($userPopularTagsCloud, T_('Popular Tags'));
+}
+if ($allPopularTagsCount > 0) {
+ writeTagsProposition($allPopularTagsCloud, T_('Popular Tags From All Users'));
+}
+?>
+ var taglist = $('#tags');
+ var tags = taglist.val().split(', ');
- var populartags = document.getElementById('popularTags').getElementsByTagName('span');
+ var populartags = $('.edit-tagclouds span');
for (var i = 0; i < populartags.length; i++) {
if (tags.contains(populartags[i].innerHTML)) {
populartags[i].className = 'selected';
}
}
- }
-);
+});
function addTag(ele) {
var thisTag = ele.innerHTML;
@@ -122,20 +140,9 @@ function addTag(ele) {
document.getElementById('tags').focus();
}
-
-<?php
-if( $userPopularTagsCount > 0) {
- writeTagsProposition($userPopularTagsCloud, T_('Popular Tags'));
-}
-if( $allPopularTagsCount > 0) {
- writeTagsProposition($allPopularTagsCloud, T_('Popular Tags From All Users'));
-}
-
-
-?>
-
+//]]>
</script>
-
+<div class="edit-tagclouds"></div>
<?php
}
?>
diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php
index c58bd1b..8b71230 100644
--- a/data/templates/editbookmark.tpl.php
+++ b/data/templates/editbookmark.tpl.php
@@ -16,33 +16,41 @@ switch ($row['bStatus']) {
break;
}
-$this->includeTemplate("dojo.inc");
-
function jsEscTitle($title)
{
return addcslashes($title, "'");
}
-?>
-
-
+function jsEscTitleDouble($title)
+{
+ return addcslashes(addcslashes($title, "'"), "'\\");
+}
+function fixOperaButtonName($name) {
+ //yes, opera has problems with double quotes in button names
+ return str_replace('"', "''", $name);
+}
-<script type="text/javascript">
-//window.onload = function() {
-// document.getElementById("address").focus();
-//}
-</script>
+if (is_array($row['tags'])) {
+ $row['tags'] = implode(', ', $row['tags']);
+}
+$ajaxUrl = ROOT . 'ajax/'
+ . (
+ ($GLOBALS['adminsAreAdvisedTagsFromOtherAdmins'] && $currentUser->isAdmin())
+ ? 'getadmintags'
+ : 'getcontacttags'
+ ) . '.php';
+?>
<form action="<?php echo $formaction; ?>" method="post">
<table>
<tr>
<th align="left"><?php echo T_('Address'); ?></th>
<td><input type="text" id="address" name="address" size="75" maxlength="65535" value="<?php echo filter($row['bAddress'], 'xml'); ?>" onblur="useAddress(this)" /></td>
- <td>&larr; <?php echo T_('Required'); ?></td>
+ <td>← <?php echo T_('Required'); ?></td>
</tr>
<tr>
<th align="left"><?php echo T_('Title'); ?></th>
<td><input type="text" id="titleField" name="title" size="75" maxlength="255" value="<?php echo filter($row['bTitle'], 'xml'); ?>" onkeypress="this.style.backgroundImage = 'none';" /></td>
- <td>&larr; <?php echo T_('Required'); ?></td>
+ <td>← <?php echo T_('Required'); ?></td>
</tr>
<tr>
<th align="left">
@@ -50,7 +58,7 @@ function jsEscTitle($title)
<a onclick="var nz = document.getElementById('privateNoteZone'); nz.style.display='';this.style.display='none';"><?php echo T_("Add Note"); ?></a>
</th>
<td><textarea name="description" id="description" rows="5" cols="63" ><?php echo filter($row['bDescription'], 'xml'); ?></textarea></td>
- <td>&larr; <?php echo T_('You can use anchors to delimite attributes. for example: [publisher]blah[/publisher] '); ?>
+ <td>← <?php echo T_('You can use anchors to delimite attributes. for example: [publisher]blah[/publisher] '); ?>
<?php if(count($GLOBALS['descriptionAnchors'])>0): ?>
<br /><br />
<?php echo T_('Suggested anchors: '); ?>
@@ -67,23 +75,23 @@ function jsEscTitle($title)
<tr id="privateNoteZone" <?php if(strlen($row['bPrivateNote'])==0):?>style="display:none"<?php endif; ?>>
<th align="left"><?php echo T_('Private Note'); ?></th>
<td><textarea name="privateNote" id="privateNote" rows="1" cols="63" ><?php echo filter($row['bPrivateNote'], 'xml'); ?></textarea></td>
- <td>&larr; <?php echo T_('Just visible by you and your contacts.'); ?>
+ <td>← <?php echo T_('Just visible by you and your contacts.'); ?>
</td>
</tr>
<tr>
<th align="left"><?php echo T_('Tags'); ?></th>
<td class="scuttletheme">
- <span dojoType="dojo.data.ItemFileReadStore" jsId="memberTagStore" url="<?php echo ROOT?>ajax/<?php echo ($GLOBALS['adminsAreAdvisedTagsFromOtherAdmins'] && $currentUser->isAdmin())?'getadmintags':'getcontacttags'?>.php"></span>
- <input type="text" dojoType="js.MultiComboBox" id="tags" name="tags" size="75" value="<?php echo filter(implode(', ', $row['tags']), 'xml'); ?>" store="memberTagStore" delimiter="," searchAttr="tag" hasDownArrow="false" queryExpr="*${0}*" autoComplete="false" highlightMatch="all"/></td>
- <td>&larr; <?php echo T_('Comma-separated'); ?></td>
+ <input type="text" id="tags" name="tags" size="75" value="<?php echo filter($row['tags'], 'xml'); ?>"/>
+ </td>
+ <td>← <?php echo T_('Comma-separated'); ?></td>
</tr>
<tr>
<th></th>
- <td align="right"><small><?php echo T_('Note: use ">" to include one tag in another. e.g.: europe>france>paris')?><small></td>
+ <td align="right"><small><?php echo htmlspecialchars(T_('Note: use ">" to include one tag in another. e.g.: europe>france>paris'))?></small></td>
</tr>
<tr>
<th></th>
- <td align="right"><small><?php echo T_('Note: use "=" to make synonym two tags. e.g.: france=frenchcountry')?><small></td>
+ <td align="right"><small><?php echo T_('Note: use "=" to make synonym two tags. e.g.: france=frenchcountry')?></small></td>
</tr>
<tr>
<th align="left"><?php echo T_('Privacy'); ?></th>
@@ -111,7 +119,7 @@ function jsEscTitle($title)
echo ' (<a href="'.createURL('bookmarkcommondescriptionedit', $row['bHash']).'">';
echo T_('edit common description').'</a>)';
}
-
+
if ($popup) {
?>
<input type="hidden" name="popup" value="1" />
@@ -124,52 +132,83 @@ function jsEscTitle($title)
?>
</td>
<td></td>
-</tr>
-</table>
+ </tr>
+ </table>
</form>
-<?php
-// Dynamic tag selection
-$this->includeTemplate('dynamictags.inc');
+<link href="<?php echo ROOT ?>js/jquery-ui-1.8.11/themes/base/jquery.ui.all.css" rel="stylesheet" type="text/css"/>
-// Bookmarklets and import links
-if (empty($_REQUEST['popup']) && (!isset($showdelete) || !$showdelete)) {
-?>
-
-<h3><?php echo T_('Bookmarklet'); ?></h3>
-<p>
+<script type="text/javascript" src="<?php echo ROOT ?>js/jquery-ui-1.8.11/jquery.ui.core.js"></script>
+<script type="text/javascript" src="<?php echo ROOT ?>js/jquery-ui-1.8.11/jquery.ui.widget.js"></script>
+<script type="text/javascript" src="<?php echo ROOT ?>js/jquery-ui-1.8.11/jquery.ui.position.js"></script>
+<script type="text/javascript" src="<?php echo ROOT ?>js/jquery-ui-1.8.11/jquery.ui.autocomplete.js"></script>
<script type="text/javascript">
-var browser=navigator.appName;
-if (browser == "Opera")
- {
- document.write('<?php echo sprintf(T_("Click one of the following bookmarklets to add a button you can click whenever you want to add the page you are on to %s"), jsEscTitle($GLOBALS['sitename'])); ?>:</p>');
- }
-else
- {
- document.write('<?php echo sprintf(T_("Drag one of the following bookmarklets to your browser's bookmarks and click it whenever you want to add the page you are on to %s"), jsEscTitle($GLOBALS['sitename'])); ?>:</p>');
- }
-var selection = '';
-if (window.getSelection) {
- selection = 'window.getSelection()';
-} else if (document.getSelection) {
- selection = 'document.getSelection()';
-} else if (document.selection) {
- selection = 'document.selection.createRange().text';
-}
-document.write('<ul>');
-if (browser == "Opera")
+//<![CDATA[
+jQuery(document).ready(function() {
+ function split(val)
{
- document.write('<li><a class="bookmarklet" href="opera:/button/Go%20to%20page,%20%22javascript:x=document;a=encodeURIComponent(x.location.href);t=encodeURIComponent(x.title);d=encodeURIComponent('+selection+');location.href=\'<?php echo createURL('bookmarks', $GLOBALS['user']); ?>?action=add&amp;address=\'+a+\'&amp;title=\'+t+\'&amp;description=\'+d;void 0%22;,,%22Post%20to%20<?php echo jsEscTitle($GLOBALS['sitename']); ?>%22,%22Scuttle%22"><?php echo jsEscTitle(sprintf(T_('Post to %s'), $GLOBALS['sitename'])); ?><\/a><\/li>');
- document.write('<li><a class="bookmarklet" href="opera:/button/Go%20to%20page,%20%22javascript:x=document;a=encodeURIComponent(x.location.href);t=encodeURIComponent(x.title);d=encodeURIComponent('+selection+');open(\'<?php echo createURL('bookmarks', $GLOBALS['user']); ?>?action=add&amp;popup=1&amp;address=\'+a+\'&amp;title=\'+t+\'&amp;description=\'+d,\'<?php echo jsEscTitle($GLOBALS['sitename']); ?>\',\'modal=1,status=0,scrollbars=1,toolbar=0,resizable=1,width=790,height=465,left=\'+(screen.width-790)/2+\',top=\'+(screen.height-425)/2);void 0;%22,,%22Post%20to%20<?php echo urlencode($GLOBALS['sitename']); ?>%20(Pop-up)%22,%22Scuttle%22"><?php echo jsEscTitle(sprintf(T_('Post to %s (Pop-up)'), $GLOBALS['sitename'])); ?><\/a><\/li>');
+ return val.split(/[,=><]\s*/);
}
-else
+
+ function extractLast(term)
{
- document.write('<li><a class="bookmarklet" href="javascript:x=document;a=encodeURIComponent(x.location.href);t=encodeURIComponent(x.title);d=encodeURIComponent('+selection+');location.href=\'<?php echo createURL('bookmarks', $GLOBALS['user']); ?>?action=add&amp;address=\'+a+\'&amp;title=\'+t+\'&amp;description=\'+d;void 0;"><?php echo jsEscTitle(sprintf(T_('Post to %s'), $GLOBALS['sitename'])); ?><\/a><\/li>');
- document.write('<li><a class="bookmarklet" href="javascript:x=document;a=encodeURIComponent(x.location.href);t=encodeURIComponent(x.title);d=encodeURIComponent('+selection+');open(\'<?php echo createURL('bookmarks', $GLOBALS['user']); ?>?action=add&amp;popup=1&amp;address=\'+a+\'&amp;title=\'+t+\'&amp;description=\'+d,\'<?php echo jsEscTitle($GLOBALS['sitename']); ?>\',\'modal=1,status=0,scrollbars=1,toolbar=0,resizable=1,width=790,height=465,left=\'+(screen.width-790)/2+\',top=\'+(screen.height-425)/2);void 0;"><?php echo jsEscTitle(sprintf(T_('Post to %s (Pop-up)'), $GLOBALS['sitename'])); ?><\/a><\/li>');
+ return split(term).pop();
}
-document.write('<\/ul>');
+ //var availableTags = ["c++", "java", "php", "coldfusion", "javascript", "asp", "ruby"];
+
+ jQuery("input#tags").autocomplete({
+ autoFocus: true,
+ minLength: 1,
+
+ source: function(request, response) {
+ // delegate back to autocomplete, but extract the last term
+ var term = extractLast(request.term);
+ if (term.length < this.options.minLength) {
+ return;
+ }
+ response(
+ /*
+ $.ui.autocomplete.filter(
+ availableTags, extractLast(request.term)
+ )
+ */
+ $.getJSON(
+ "<?php echo $ajaxUrl; ?>",
+ { beginsWith: term },
+ response
+ )
+ );
+ },
+
+ focus: function() {
+ // prevent value inserted on focus
+ return false;
+ },
+ select: function(event, ui) {
+ var terms = split(this.value);
+ // remove the current input
+ terms.pop();
+ // add the selected item
+ terms.push(ui.item.value);
+ // add placeholder to get the comma-and-space at the end
+ terms.push("");
+ this.value = terms.join(", ");
+ return false;
+ }
+ });
+});
+//]]>
</script>
+<?php
+// Dynamic tag selection
+$this->includeTemplate('dynamictags.inc');
+
+// Bookmarklets and import links
+if (empty($_REQUEST['popup']) && (!isset($showdelete) || !$showdelete)) {
+
+$this->includeTemplate('bookmarklet.inc.php');
+?>
<h3><?php echo T_('Import'); ?></h3>
<ul>
<li><a href="<?php echo createURL('importNetscape'); ?>"><?php echo T_('Import bookmarks from bookmark file'); ?></a> (<?php echo T_('Internet Explorer, Mozilla Firefox and Netscape'); ?>)</li>
@@ -178,5 +217,5 @@ document.write('<\/ul>');
<?php
}
-$this->includeTemplate($GLOBALS['bottom_include']);
+$this->includeTemplate($GLOBALS['bottom_include']);
?>
diff --git a/data/templates/editprofile.tpl.php b/data/templates/editprofile.tpl.php
index b55d250..2a3c3b8 100644
--- a/data/templates/editprofile.tpl.php
+++ b/data/templates/editprofile.tpl.php
@@ -3,9 +3,7 @@ $this->includeTemplate($GLOBALS['top_include']);
?>
<form action="<?php echo $formaction; ?>" method="post">
-<input type="hidden" name="token" value="<?php echo $token; ?>">
-
-</table>
+<input type="hidden" name="token" value="<?php echo $token; ?>"/>
<h3><?php echo T_('Account Details'); ?></h3>
@@ -28,7 +26,7 @@ $this->includeTemplate($GLOBALS['top_include']);
<tr>
<th align="left"><?php echo T_('E-mail'); ?></th>
<td><input type="text" name="pMail" size="75" value="<?php echo filter($objectUser->getEmail(), 'xml'); ?>" /></td>
- <td>&larr; <?php echo T_('Required'); ?></td>
+ <td>← <?php echo T_('Required'); ?></td>
</tr>
</table>
@@ -58,7 +56,7 @@ $this->includeTemplate($GLOBALS['top_include']);
<th align="left"><?php echo T_('Export bookmarks'); ?></th>
<td>
<a href="../api/export_html.php"><?php echo T_('HTML file (for browsers)')?></a> /
- <a href="../api/posts/all"><?php echo T_('XML file (like del.icio.us)')?></a> /
+ <a href="../api/posts_all.php"><?php echo T_('XML file (like del.icio.us)')?></a> /
<a href="../api/export_csv.php"><?php echo T_('CSV file (for spreadsheet tools)')?></a>
</td>
</tr>
diff --git a/data/templates/sidebar.block.linked.php b/data/templates/sidebar.block.linked.php
index 9e91f93..9aa3cc0 100644
--- a/data/templates/sidebar.block.linked.php
+++ b/data/templates/sidebar.block.linked.php
@@ -1,4 +1,11 @@
<?php
+/*
+ * Used in:
+ * - populartags.php
+ * - bookmarks.php
+ * - alltags.php
+ * - tags.php
+ */
/* Service creation: only useful services are created */
$tag2tagservice =SemanticScuttle_Service_Factory::get('Tag2Tag');
@@ -8,98 +15,52 @@ require_once('sidebar.linkedtags.inc.php');
$user = isset($user)?$user:'';
$userid = isset($userid)?$userid:0;
$currenttag = isset($currenttag)?$currenttag:'';
-$summarizeLinkedTags = isset($summarizeLinkedTags)?$summarizeLinkedTags:false;
-
+//$summarizeLinkedTags = isset($summarizeLinkedTags)?$summarizeLinkedTags:false;
$logged_on_userid = $userservice->getCurrentUserId();
-if ($logged_on_userid === false) {
- $logged_on_userid = NULL;
-}
-
-$explodedTags = array();
-if (strlen($currenttag)>0) {
- $explodedTags = explode('+', $currenttag);
-} else {
- if($summarizeLinkedTags == true) {
- $orphewTags = $tag2tagservice->getOrphewTags('>', $userid, 4, "nb");
- } else {
- $orphewTags = $tag2tagservice->getOrphewTags('>', $userid);
- }
-
- foreach($orphewTags as $orphewTag) {
- $explodedTags[] = $orphewTag['tag'];
- }
-}
-
+$editingMode = $logged_on_userid !== false;
?>
-
+<h2><?php echo T_('Linked Tags'); ?></h2>
+<div id="related">
<?php
-if(($logged_on_userid != null) && ($userid === $logged_on_userid)) {
- $editingMode = true;
-} else {
- $editingMode = false;
-}
-
-$this->includeTemplate("dojo.inc");
-?>
-
-<?php if(count($explodedTags)>0 || $editingMode):?>
-
-<h2><?php
-
-
-echo T_('Linked Tags').' ';
-//if($userid != null) {
-$cUser = $userservice->getUser($userid);
-//echo '<small><a href="'.createURL('alltags', $cUser['username']).'">('.T_('all tags').')</a></small>';
-//}
-?></h2>
-<?php //endif?>
-
-<div id="related"> <?php
-if($editingMode) {
+if ($editingMode) {
echo '<p style="margin-bottom: 13px;text-align:center;">';
echo ' (<a href="'. createURL('tag2tagadd','') .'" rel="tag">'.T_('Add new link').'</a>) ';
echo ' (<a href="'. createURL('tag2tagdelete','') .'" rel="tag">'.T_('Delete link').'</a>)';
echo '</p>';
}
-
-if(strlen($user)==0) {
- $cat_url = createURL('tags', '%2$s');
-}
-
-$stopList = array();
-foreach($explodedTags as $explodedTag) {
- if(!in_array($explodedTag, $stopList)) {
-
-
-
- // fathers tag
- $fatherTags = $tag2tagservice->getLinkedTags($explodedTag, '>', $userid, true);
- if(count($fatherTags)>0) {
- foreach($fatherTags as $fatherTag) {
- echo '<a href="'. sprintf($cat_url, filter($user, 'url'), filter($fatherTag, 'url')) .'" rel="tag">('. filter($fatherTag) .')</a> ';
- }
- }
- /*
- $displayLinkedTags = displayLinkedTags($explodedTag, '>', $userid, $cat_url, $user, $editingMode, null, 1);
- echo $displayLinkedTags['output'];
- if(is_array($displayLinkedTags['stopList'])) {
- $stopList = array_merge($stopList, $displayLinkedTags['stopList']);
- }*/
- echo '<div dojoType="dojo.data.ItemFileReadStore" url="'.ROOT.'ajax/getlinkedtags.php?tag='.filter($explodedTag, 'url').'&amp;uId='.$userid.'" jsid="linkedTagStore" ></div>';
- echo '<div dojoType="dijit.Tree" store="linkedTagStore" labelAttr="name" >';
- echo '<script type="dojo/method" event="onClick" args="item">';
- $returnUrl = sprintf($cat_url, filter($user, 'url'), filter('', 'url'));
- echo 'window.location = "'.$returnUrl.'"+item.name';
- echo '</script>';
- echo '<script type="dojo/method" event="getLabelClass" args="item">';
- echo 'return \'treeTag\';';
- echo '</script>';
- echo '</div>';
- }
-
-}
-?> </div>
-
-<?php endif?>
+?>
+ <div id="related-content"></div>
+ <script type="text/javascript">//<![CDATA[
+jQuery("#related-content")
+.jstree({
+ "themes" : {
+ "theme": "default",
+ "dots": false,
+ "icons": true,
+ "url": '<?php echo ROOT_JS ?>themes/default/style.css'
+ },
+ "json_data" : {
+ "ajax" : {
+ "url": function(node) {
+ //-1 is root
+ parentparam = "";
+ if (node == -1 ) {
+ node = <?php echo json_encode($currenttag); ?>;
+ parentparam = "&parent=true";
+ } else if (node.attr('rel')) {
+ node = node.attr('rel');
+ } else {
+ return;
+ }
+
+ return "<?php echo ROOT ?>ajax/getlinkedtags.php?tag=" + node
+ + parentparam;
+ }
+ }
+ },
+ plugins : [ "themes", "json_data"]
+});
+//]]>
+ </script>
+</div> \ No newline at end of file
diff --git a/data/templates/sidebar.block.menu.php b/data/templates/sidebar.block.menu.php
index ee82997..94a9fa2 100644
--- a/data/templates/sidebar.block.menu.php
+++ b/data/templates/sidebar.block.menu.php
@@ -65,13 +65,13 @@ if (sizeof($menuTags) > 0 || ($userid != 0 && $userid === $logged_on_userid)) {
<?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>
+<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> →</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>
+<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> →</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>
+<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> →</p>
<?php endif; ?>
</div>
diff --git a/data/templates/sidebar.block.menu2.php b/data/templates/sidebar.block.menu2.php
index 5f06b40..1c177a5 100644
--- a/data/templates/sidebar.block.menu2.php
+++ b/data/templates/sidebar.block.menu2.php
@@ -1,7 +1,4 @@
<?php
-/* Service creation: only useful services are created */
-$tag2tagservice =SemanticScuttle_Service_Factory::get('Tag2Tag');
-
require_once('sidebar.linkedtags.inc.php');
/* Manage input */
@@ -15,44 +12,60 @@ if ($logged_on_userid === false) {
}
-$cat_url = createURL('tags', '%2$s');
+$cat_url = createURL('tags', '%s');
$menu2Tags = $GLOBALS['menu2Tags'];
-if (sizeOf($menu2Tags) > 0) {
- $this->includeTemplate("dojo.inc");
- ?>
+if (count($menu2Tags) > 0) {
+?>
<h2><?php echo T_('Featured Menu Tags');?></h2>
<div id="maintagsmenu"
<?php echo 'title="'.T_('This menu is composed of keywords (tags) organized by admins.').'"'?>>
-
+ <ul>
<?php
-foreach($menu2Tags as $menu2Tag) {
-
- echo '<div dojoType="dojo.data.ItemFileReadStore" url="'.ROOT.'ajax/getadminlinkedtags.php?tag='.filter($menu2Tag, 'url').'" jsid="linkedTagStore" ></div>';
- echo '<div dojoType="dijit.Tree" store="linkedTagStore" labelAttr="name" >';
- echo '<script type="dojo/method" event="onClick" args="item">';
- $returnUrl = sprintf($cat_url, filter($user, 'url'), filter('', 'url'));
- echo 'window.location = "'.$returnUrl.'"+item.name';
- echo '</script>';
- //echo '<script type="dojo/method" event="getLabel" args="item">';
- //echo 'return item.name + "...";';
- //echo '</script>';
- //echo '<script type="dojo/method" event="onMouseOver" args="item">';
- //echo 'i = item.relatedTarget;';
- //echo 'if(i.innerHTML.charAt(i.innerHTML)=="a") alert(i.innerHTML)';
- //echo '</script>';
- //echo '<script type="dojo/method" event="getLabelClass" args="item">';
- //echo 'return \'treeTag\';';
- //echo '</script>';
- echo '</div>';
+//this is unneeded and replaced by the ajax tree anyway. we keep it for
+// non-js browsers
+foreach ($menu2Tags as $menu2Tag) {
+ echo ' <li>'
+ . sprintf(
+ '<a href="%s">%s</a>',
+ sprintf($cat_url, $menu2Tag),
+ $menu2Tag
+ )
+ . '</li>' . "\n";
}
?>
+ </ul>
</div>
-
-
+<script type="text/javascript">
+jQuery("#maintagsmenu")
+.jstree({
+ "themes" : {
+ "theme": "default",
+ "dots": false,
+ "icons": true,
+ "url": '<?php echo ROOT_JS ?>themes/default/style.css'
+ },
+ "json_data" : {
+ "ajax" : {
+ "url": function(node) {
+ //-1 is root
+ if (node == -1 ) {
+ node = "";
+ } else if (node.attr('rel')) {
+ node = node.attr('rel');
+ } else {
+ return;
+ }
+ return "<?php echo ROOT ?>ajax/getadminlinkedtags.php?tag=" + node;
+ }
+ }
+ },
+ plugins : [ "themes", "json_data"]
+});
+</script>
<?php
}
?>
diff --git a/data/templates/sidebar.block.recent.php b/data/templates/sidebar.block.recent.php
index e34f820..1ffeb4d 100644
--- a/data/templates/sidebar.block.recent.php
+++ b/data/templates/sidebar.block.recent.php
@@ -31,7 +31,7 @@ if ($recentTags && count($recentTags) > 0) {
}
echo $contents ."</p>\n";
?>
- <p style="text-align:right"><a href="<?php echo createURL('populartags'); ?>"><?php echo T_('Popular Tags'); ?></a> &rarr;</p>
+ <p style="text-align:right"><a href="<?php echo createURL('populartags'); ?>"><?php echo T_('Popular Tags'); ?></a> →</p>
</div>
<?php
diff --git a/data/templates/sidebar.block.search.php b/data/templates/sidebar.block.search.php
index 7efc935..d3cd8a5 100644
--- a/data/templates/sidebar.block.search.php
+++ b/data/templates/sidebar.block.search.php
@@ -1,35 +1,50 @@
<?php
+/**
+ * Show a list of the last searches.
+ *
+ * SemanticScuttle - your social bookmark manager.
+ *
+ * PHP version 5.
+ *
+ * @category Bookmarking
+ * @package SemanticScuttle
+ * @subcategory Templates
+ * @author Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net>
+ * @author Christian Weiske <cweiske@cweiske.de>
+ * @author Eric Dane <ericdane@users.sourceforge.net>
+ * @license GPL http://www.gnu.org/licenses/gpl.html
+ * @link http://sourceforge.net/projects/semanticscuttle
+ */
/* Service creation: only useful services are created */
-$searchhistoryservice =SemanticScuttle_Service_Factory::get('SearchHistory');
+$searchhistoryservice = SemanticScuttle_Service_Factory::get('SearchHistory');
-$logged_on_userid = $userservice->getCurrentUserId();
-if ($logged_on_userid === false) {
- $logged_on_userid = NULL;
-}
-
-$lastSearches = $searchhistoryservice->getAllSearches('all', NULL, 3, NULL, true, false);
+$lastSearches = $searchhistoryservice->getAllSearches(
+ 'all', NULL, 3, NULL, true, false
+);
if ($lastSearches && count($lastSearches) > 0) {
?>
<h2><?php echo T_('Last Searches'); ?></h2>
<div id="searches">
-<table>
+ <table>
<?php
foreach ($lastSearches as $row) {
- echo '<tr><td>';
- echo '<a href="' . htmlspecialchars(
- createURL('search', $range.'/'.$row['shTerms'])
- ) . '">';
+ echo ' <tr><td>';
+ echo '<a href="'
+ . htmlspecialchars(createURL('search', $range.'/'.$row['shTerms']))
+ . '">';
echo htmlspecialchars($row['shTerms']);
echo '</a>';
- echo ' <span title="'.T_('Number of bookmarks for this query').'">('.$row['shNbResults'].')</span>';
- echo '</td></tr>';
+ echo ' <span title="'
+ . T_('Number of bookmarks for this query')
+ . '">(' . $row['shNbResults'] . ')</span>';
+ echo '</td></tr>' . "\n";
}
//echo '<tr><td><a href="'.createURL('users').'">...</a></td></tr>';
?>
-</table>
+ </table>
</div>
<?php
}
diff --git a/data/templates/sidebar.block.users.php b/data/templates/sidebar.block.users.php
index 3ad18bc..58fdfb7 100644
--- a/data/templates/sidebar.block.users.php
+++ b/data/templates/sidebar.block.users.php
@@ -18,7 +18,7 @@ if ($lastUsers && count($lastUsers) > 0) {
foreach ($lastUsers as $row) {
echo '<tr><td>';
echo '<a href="'.createURL('profile', $row['username']).'">';
- echo $row['username'];
+ echo SemanticScuttle_Model_UserArray::getName($row);
echo '</a>';
echo ' (<a href="'.createURL('bookmarks', $row['username']).'">'.T_('bookmarks').'</a>)';
echo '</td></tr>';
@@ -27,7 +27,7 @@ foreach ($lastUsers as $row) {
?>
</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>
+<p style="text-align:right"><a href="<?php echo createURL('users'); ?>" title="<?php echo T_('See all users')?>"><?php echo T_('All users'); ?></a> →</p>
</div>
<?php
}
diff --git a/data/templates/sidebar.block.watchlist.php b/data/templates/sidebar.block.watchlist.php
index 07b7f15..3af9c5a 100644
--- a/data/templates/sidebar.block.watchlist.php
+++ b/data/templates/sidebar.block.watchlist.php
@@ -16,7 +16,7 @@ foreach($watching as $watchuser) {
?>
<?php if(count($closeContacts)>0):?>
-<h2 title="<?php echo T_('Close contacts are mutual contacts');?>"><?php echo ' &harr; '. T_('Close contacts'); ?></h2>
+<h2 title="<?php echo T_('Close contacts are mutual contacts');?>"><?php echo ' ↔ '. T_('Close contacts'); ?></h2>
<div id="watching">
<ul>
<?php foreach($closeContacts as $watchuser): ?>
@@ -27,7 +27,7 @@ foreach($watching as $watchuser) {
<?php endif; ?>
-<h2><?php echo ' &rarr; '. T_('Watching'); ?></h2>
+<h2><?php echo ' → '. T_('Watching'); ?></h2>
<div id="watching">
<ul>
<?php if($userservice->isLoggedOn() && $currentUser->getUsername() == $user): ?>
@@ -41,7 +41,7 @@ foreach($watching as $watchuser) {
<?php foreach($watching as $watchuser): ?>
<li><a href="<?php echo createURL('bookmarks', $watchuser); ?>"><?php echo $watchuser; ?></a>
<?php if($userservice->isLoggedOn() && $currentUser->getUsername() == $user): ?>
- - <a href="<?php echo createUrl('watch','?contact='.$watchuser); ?>" title="<?php echo T_('Remove this contact'); ?>">x<a/>
+ - <a href="<?php echo createUrl('watch','?contact='.$watchuser); ?>" title="<?php echo T_('Remove this contact'); ?>">x</a>
</li>
<?php endif; ?>
<?php endforeach; ?>
@@ -49,7 +49,7 @@ foreach($watching as $watchuser) {
</ul>
</div>
-<h2><?php echo ' &larr; '. T_('Watched By'); ?></h2>
+<h2><?php echo ' ← '. T_('Watched By'); ?></h2>
<div id="watching">
<ul>
<?php foreach($watchedBy as $watchuser): ?>
diff --git a/data/templates/tag2tagadd.tpl.php b/data/templates/tag2tagadd.tpl.php
index fcbd372..9482007 100644
--- a/data/templates/tag2tagadd.tpl.php
+++ b/data/templates/tag2tagadd.tpl.php
@@ -4,7 +4,7 @@ $this->includeTemplate($GLOBALS['top_include']);
<form action="<?php echo $formaction; ?>" method="post">
-<p align=right" style="float:right">
+<p align="right" style="float:right">
<small style="text-align:right"><?php echo T_('Note: use "=" to make synonym two tags. e.g.: france=frenchcountry')?></small><br/>
<small style="text-align:right"><?php echo T_('Note: use ">" to include one tag in another. e.g.: europe>france>paris')?></small><br/>
</p>
diff --git a/data/templates/tagcommondescriptionedit.tpl.php b/data/templates/tagcommondescriptionedit.tpl.php
index d3a006a..f938f93 100644
--- a/data/templates/tagcommondescriptionedit.tpl.php
+++ b/data/templates/tagcommondescriptionedit.tpl.php
@@ -20,7 +20,8 @@ window.onload = function() {
if(strlen($description['cdDatetime'])>0) {
echo T_('Last modification:').' '.$description['cdDatetime'].', ';
$lastUser = $userservice->getUser($description['uId']);
- echo '<a href="'.createURL('profile', $lastUser['username']).'">'.$lastUser['username'].'</a>';
+ echo '<a href="' . createURL('profile', $lastUser['username']) . '">'
+ . SemanticScuttle_Model_UserArray::getName($lastUser) . '</a>';
}
?>
</td>
diff --git a/data/templates/tagrename.tpl.php b/data/templates/tagrename.tpl.php
index ea8b516..894b964 100644
--- a/data/templates/tagrename.tpl.php
+++ b/data/templates/tagrename.tpl.php
@@ -11,12 +11,12 @@ window.onload = function() {
<tr>
<th align="left"><?php echo T_('Old'); ?></th>
<td><input type="text" name="old" id="old" value="<?php echo $old; ?>" /></td>
- <td>&larr; <?php echo T_('Required'); ?></td>
+ <td>← <?php echo T_('Required'); ?></td>
</tr>
<tr>
<th align="left"><?php echo T_('New'); ?></th>
<td><input type="text" name="new" id="new" value="" /></td>
- <td>&larr; <?php echo T_('Required'); ?></td>
+ <td>← <?php echo T_('Required'); ?></td>
</tr>
<tr>
<td></td>
diff --git a/data/templates/top.inc.php b/data/templates/top.inc.php
index 552c5de..bdd4b1a 100644
--- a/data/templates/top.inc.php
+++ b/data/templates/top.inc.php
@@ -1,30 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
<title><?php echo filter($GLOBALS['sitename'] .(isset($pagetitle) ? ' » ' . $pagetitle : '')); ?></title>
<link rel="icon" type="image/png" href="<?php echo ROOT ?>icon.png" />
<link rel="stylesheet" type="text/css" href="<?php echo ROOT ?>scuttle.css" />
<link rel="search" type="application/opensearchdescription+xml" href="<?php echo ROOT ?>api/opensearch.php" title="<?php echo htmlspecialchars($GLOBALS['sitename']) ?>"/>
<?php
-if(isset($rsschannels)) {
+if (isset($rsschannels)) {
$size = count($rsschannels);
for ($i = 0; $i < $size; $i++) {
- echo ' <link rel="alternate" type="application/rss+xml" title="' . htmlspecialchars($rsschannels[$i][0]) . '" href="'. $rsschannels[$i][1] .'" />';
+ echo ' <link rel="alternate" type="application/rss+xml" title="'
+ . htmlspecialchars($rsschannels[$i][0]) . '"'
+ . ' href="'. $rsschannels[$i][1] .'" />';
}
}
?>
- <link rel="stylesheet" type="text/css"
- href="http://ajax.googleapis.com/ajax/libs/dojo/1.2/dijit/themes/nihilo/nihilo.css" />
<?php if (isset($loadjs)) :?>
+<?php if (DEBUG_MODE) : ?>
+ <script type="text/javascript" src="<?php echo ROOT_JS ?>jquery-1.4.2.js"></script>
+ <script type="text/javascript" src="<?php echo ROOT_JS ?>jquery.jstree.js"></script>
+<?php else: ?>
+ <script type="text/javascript" src="<?php echo ROOT_JS ?>jquery-1.4.2.min.js"></script>
+ <script type="text/javascript" src="<?php echo ROOT_JS ?>jquery.jstree.min.js"></script>
+<?php endif ?>
<script type="text/javascript" src="<?php echo ROOT ?>jsScuttle.php"></script>
<?php endif ?>
</head>
-
- <body class="nihilo">
-<!-- the class is used by Dojo widgets -->
+ <body>
<?php
$headerstyle = '';
diff --git a/data/templates/users.tpl.php b/data/templates/users.tpl.php
index c209f94..fa92bef 100644
--- a/data/templates/users.tpl.php
+++ b/data/templates/users.tpl.php
@@ -14,7 +14,14 @@ if ($users && count($users) > 0) {
<?php
$contents = '<';
foreach ($users as $row) {
- echo '<li><strong>'.$row['username'].'</strong> (<a href="'.createURL('profile', $row['username']).'">'.T_('profile').'</a> '.T_('created in').' '.date('M Y',strtotime($row['uDatetime'])).') : <a href="'.createURL('bookmarks', $row['username']).'">'.T_('bookmarks').'</a></li>';
+ echo '<li><strong>'
+ . SemanticScuttle_Model_UserArray::getName($row) . '</strong>'
+ . ' (<a href="' . createURL('profile', $row['username']) . '">'
+ . T_('profile') . '</a> '
+ . T_('created in') . ' '
+ . date('M Y', strtotime($row['uDatetime'])) . ')'
+ . ' : <a href="' . createURL('bookmarks', $row['username']).'">'
+ . T_('bookmarks') . '</a></li>';
}
?>
</ul>