script to update translation files automatically; update messages.po

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@515 b3834d28-1941-0410-a4f8-b48e95affb8f

1 files changed, 798 insertions, 780 deletions

diff --git a/data/locales/messages.po b/data/locales/messages.po
index c2f50f8..68c4892 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-06-04 11:34+0200\n"
+"POT-Creation-Date: 2009-11-04 19:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,608 +17,93 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../../about.php:23 ../../../about.php:24
-#: ../../../templates/bottom.inc.php:5 ../../../templates/toolbar.inc.php:15
-#: ../../../templates/toolbar.inc.php:28
-msgid "About"
-msgstr ""
-
-#: ../../../admin.php:32
-msgid "Manage users"
-msgstr ""
-
-#: ../../../admin.php:68
-#, php-format
-msgid "%s and all his bookmarks and tags were deleted."
-msgstr ""
-
-#: ../../../admin.php:75
-msgid "Problem with "
-msgstr ""
-
-#: ../../../ajaxDelete.php:37
-msgid "You are not allowed to delete this bookmark"
-msgstr ""
-
-#: ../../../ajaxDelete.php:41 ../../../edit.php:103
-msgid "Failed to delete bookmark"
-msgstr ""
-
-#: ../../../alltags.php:49
-msgid "All Tags"
-msgstr ""
-
-#: ../../../alltags.php:55 ../../../bookmarks.php:96
-#: ../../../populartags.php:52 ../../../profile.php:51 ../../../rss.php:67
-#: ../../../search.php:101 ../../../watch.php:45 ../../../watchlist.php:61
-#, php-format
-msgid "User with username %s was not found"
-msgstr ""
-
-#: ../../../bookmarkcommondescriptionedit.php:51 ../../../tag2tagadd.php:37
-#: ../../../tag2tagdelete.php:41 ../../../tag2tagedit.php:33
-#: ../../../tagcommondescriptionedit.php:43 ../../../tagedit.php:43
-msgid "Permission denied."
-msgstr ""
-
-#: ../../../bookmarkcommondescriptionedit.php:60
-msgid "Bookmark common description updated"
-msgstr ""
-
-#: ../../../bookmarkcommondescriptionedit.php:63
-msgid "Failed to update the bookmark common description"
-msgstr ""
-
-#: ../../../bookmarkcommondescriptionedit.php:71
-msgid "Edit Bookmark Common Description"
-msgstr ""
-
-#: ../../../bookmarks.php:111 ../../../tags.php:47
-msgid "Remove the tag from the selection"
-msgstr ""
-
-#: ../../../bookmarks.php:131 ../../../edit.php:65
-msgid "Your bookmark must have a title and an address"
-msgstr ""
-
-#: ../../../bookmarks.php:152 ../../../edit.php:83 ../../../edit.php:86
-msgid "Bookmark saved"
-msgstr ""
-
-#: ../../../bookmarks.php:152
-msgid "(Come back to previous page.)"
-msgstr ""
-
-#: ../../../bookmarks.php:159 ../../../import.php:106
-#: ../../../importNetscape.php:108
-msgid ""
-"There was an error saving your bookmark. Please try again or contact the "
-"administrator."
-msgstr ""
-
-#: ../../../bookmarks.php:209 ../../../templates/toolbar.inc.php:13
-msgid "Add a Bookmark"
-msgstr ""
-
-#: ../../../bookmarks.php:213
-msgid "Add Bookmark"
-msgstr ""
-
-#: ../../../bookmarks.php:216
-msgid "You must be logged in before you can add bookmarks."
-msgstr ""
-
-#: ../../../bookmarks.php:270 ../../../bookmarks.php:271
-msgid "My Bookmarks"
-msgstr ""
-
-#: ../../../edit.php:44 ../../../edit.php:45
-msgid "Edit Bookmark"
-msgstr ""
-
-#: ../../../edit.php:51
-#, php-format
-msgid "Bookmark with id %s not was not found"
-msgstr ""
-
-#: ../../../edit.php:57
-msgid "You are not allowed to edit this bookmark"
-msgstr ""
-
-#: ../../../edit.php:77
-msgid "Error while saving your bookmark"
-msgstr ""
-
-#: ../../../edit.php:113 ../../../templates/editprofile.tpl.php:52
-msgid "Save Changes"
-msgstr ""
-
-#: ../../../functions.inc.php:144
+#: src/SemanticScuttle/functions.php:163
 msgid "message_die() was called multiple times."
 msgstr ""
 
-#: ../../../functions.inc.php:156
+#: src/SemanticScuttle/functions.php:175
 msgid "SQL Error"
 msgstr ""
 
-#: ../../../functions.inc.php:162
+#: src/SemanticScuttle/functions.php:181
 msgid "Line"
 msgstr ""
 
-#: ../../../functions.inc.php:162 ../../../templates/importDelicious.tpl.php:8
-#: ../../../templates/importNetscape.tpl.php:9
-#: ../../../templates/importStructure.tpl.php:10
+#: src/SemanticScuttle/functions.php:181
+#: data/templates/importDelicious.tpl.php:8
+#: data/templates/importNetscape.tpl.php:9
+#: data/templates/importStructure.tpl.php:10
 msgid "File"
 msgstr ""
 
-#: ../../../functions.inc.php:168
+#: src/SemanticScuttle/functions.php:189
 msgid "Information"
 msgstr ""
 
-#: ../../../functions.inc.php:173
+#: src/SemanticScuttle/functions.php:194
 msgid "Critical Information"
 msgstr ""
 
-#: ../../../functions.inc.php:178
+#: src/SemanticScuttle/functions.php:199
 msgid "An error occured"
 msgstr ""
 
-#: ../../../functions.inc.php:181
+#: src/SemanticScuttle/functions.php:202
 msgid "General Error"
 msgstr ""
 
-#: ../../../functions.inc.php:189
+#: src/SemanticScuttle/functions.php:210
 msgid "An critical error occured"
 msgstr ""
 
-#: ../../../functions.inc.php:192
+#: src/SemanticScuttle/functions.php:213
 msgid "Critical Error"
 msgstr ""
 
-#: ../../../functions.inc.php:201
+#: src/SemanticScuttle/functions.php:222
 msgid "DEBUG MODE"
 msgstr ""
 
-#: ../../../history.php:61
-msgid "History"
-msgstr ""
-
-#: ../../../history.php:62
-#, php-format
-msgid "History for %s"
-msgstr ""
-
-#: ../../../history.php:84
-msgid "Address was not found"
-msgstr ""
-
-#: ../../../import.php:47
-msgid "Could not open XML input"
-msgstr ""
-
-#: ../../../import.php:51
-#, php-format
-msgid "XML error: %s at line %d"
-msgstr ""
-
-#: ../../../import.php:60
-msgid "Import Bookmarks from del.icio.us"
-msgstr ""
-
-#: ../../../import.php:93
-msgid "You have already submitted this bookmark."
-msgstr ""
-
-#: ../../../import.php:104
-msgid "Bookmark imported."
-msgstr ""
-
-#: ../../../importNetscape.php:95
-msgid "You have already submitted some of these bookmarks."
-msgstr ""
-
-#: ../../../importNetscape.php:115
-msgid "Bookmarks found: "
-msgstr ""
-
-#: ../../../importNetscape.php:116
-msgid "Bookmarks imported: "
-msgstr ""
-
-#: ../../../importNetscape.php:117 ../../../importNetscape.php:122
-msgid "Import Bookmarks from Browser File"
-msgstr ""
-
-#: ../../../importStructure.php:61
-msgid "Bad indentation"
-msgstr ""
-
-#: ../../../importStructure.php:67
-msgid "New links between tags: "
-msgstr ""
-
-#: ../../../importStructure.php:72
-msgid "Import Structure"
-msgstr ""
-
-#: ../../../index.php:38
-msgid "You have now logged out"
-msgstr ""
-
-#: ../../../index.php:45
-#, php-format
-msgid "%s: Recent bookmarks"
-msgstr ""
-
-#: ../../../index.php:78
-msgid "Store, share and tag your favourite links"
-msgstr ""
-
-#: ../../../index.php:79
-msgid "All Bookmarks"
-msgstr ""
-
-#: ../../../jsScuttle.php:22 ../../../templates/admin.tpl.php:19
-#: ../../../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 ""
-
-#: ../../../jsScuttle.php:22 ../../../templates/tag2tagdelete.tpl.php:15
-#: ../../../templates/tag2tagedit.tpl.php:16
-#: ../../../templates/tagdelete.tpl.php:8
-msgid "Yes"
-msgstr ""
-
-#: ../../../jsScuttle.php:22 ../../../templates/tag2tagdelete.tpl.php:16
-#: ../../../templates/tag2tagedit.tpl.php:17
-#: ../../../templates/tagdelete.tpl.php:9
-msgid "No"
-msgstr ""
-
-#: ../../../jsScuttle.php:69
-msgid "Available"
-msgstr ""
-
-#: ../../../jsScuttle.php:72
-msgid "Not Available"
-msgstr ""
-
-#: ../../../login.php:48
-msgid "The details you have entered are incorrect. Please try again."
-msgstr ""
-
-#: ../../../login.php:57 ../../../templates/login.tpl.php:26
-#: ../../../templates/toolbar.inc.php:29
-msgid "Log In"
-msgstr ""
-
-#: ../../../password.php:36
-msgid "You must enter your username."
-msgstr ""
-
-#: ../../../password.php:40
-msgid ""
-"You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr ""
-
-#: ../../../password.php:48
-msgid "No matches found for that username."
-msgstr ""
-
-#: ../../../password.php:51
-msgid ""
-"No matches found for that combination of username and <abbr title="
-"\"electronic mail\">e-mail</abbr> address."
-msgstr ""
-
-#: ../../../password.php:59
-msgid ""
-"There was an error while generating your new password. Please try again."
-msgstr ""
-
-#: ../../../password.php:63
-msgid "Your new password is:"
-msgstr ""
-
-#: ../../../password.php:63
-msgid ""
-"To keep your bookmarks secure, you should change this password in your "
-"profile the next time you log in."
-msgstr ""
-
-#: ../../../password.php:66
-#, php-format
-msgid "%s Account Information"
-msgstr ""
-
-#: ../../../password.php:68
-#, php-format
-msgid "New password generated and sent to %s"
-msgstr ""
-
-#: ../../../password.php:75
-msgid "Forgotten Password"
-msgstr ""
-
-#: ../../../populartags.php:46 ../../../templates/dynamictags.inc.php:128
-#: ../../../templates/sidebar.block.common.php:9
-#: ../../../templates/sidebar.block.menu.php:74
-#: ../../../templates/sidebar.block.popular.php:23
-#: ../../../templates/sidebar.block.recent.php:34
-#: ../../../templates/toolbar.inc.php:27
-msgid "Popular Tags"
-msgstr ""
-
-#: ../../../profile.php:59 ../../../watchlist.php:119
-msgid "Username was not specified"
-msgstr ""
-
-#: ../../../profile.php:65
-msgid "My Profile"
-msgstr ""
-
-#: ../../../profile.php:67 ../../../templates/toolbar.inc.php:12
-msgid "Profile"
-msgstr ""
-
-#: ../../../profile.php:89
-msgid "Invalid Token"
-msgstr ""
-
-#: ../../../profile.php:94
-msgid "Password and confirmation do not match."
-msgstr ""
-
-#: ../../../profile.php:98
-msgid "Password must be at least 6 characters long."
-msgstr ""
-
-#: ../../../profile.php:102
-msgid "E-mail address is not valid."
-msgstr ""
-
-#: ../../../profile.php:106
-msgid "An error occurred while saving your changes."
-msgstr ""
-
-#: ../../../profile.php:108
-msgid "Changes saved."
-msgstr ""
-
-#: ../../../register.php:40
-msgid "You <em>must</em> enter a username, password and e-mail address."
-msgstr ""
-
-#: ../../../register.php:44
-msgid "This username has been reserved, please make another choice."
-msgstr ""
-
-#: ../../../register.php:48
-msgid "This username already exists, please make another choice."
-msgstr ""
-
-#: ../../../register.php:52
-msgid ""
-"This username is not valid (too short, too long, forbidden characters...), "
-"please make another choice."
-msgstr ""
-
-#: ../../../register.php:56
-msgid "E-mail address is not valid. Please try again."
-msgstr ""
-
-#: ../../../register.php:60
-msgid "Antispam answer is not valid. Please try again."
-msgstr ""
-
-#: ../../../register.php:69
-msgid "You have successfully registered. Enjoy!"
-msgstr ""
-
-#: ../../../register.php:71
-msgid "Registration failed. Please try again."
-msgstr ""
-
-#: ../../../register.php:77 ../../../templates/register.tpl.php:41
-#: ../../../templates/toolbar.inc.php:30
-msgid "Register"
-msgstr ""
-
-#: ../../../rss.php:84
-#, php-format
-msgid "Recent bookmarks posted to %s"
-msgstr ""
-
-#: ../../../search.inc.php:23
-msgid "Search..."
-msgstr ""
-
-#: ../../../search.inc.php:24
-msgid "in"
-msgstr ""
-
-#: ../../../search.inc.php:30
-msgid "this user's bookmarks"
-msgstr ""
-
-#: ../../../search.inc.php:35
-msgid "my bookmarks"
-msgstr ""
-
-#: ../../../search.inc.php:36
-msgid "my watchlist"
-msgstr ""
-
-#: ../../../search.inc.php:40
-msgid "all bookmarks"
-msgstr ""
-
-#: ../../../search.inc.php:50
-msgid "Search"
-msgstr ""
-
-#: ../../../search.php:73 ../../../search.php:123
-msgid "Search Bookmarks"
-msgstr ""
-
-#: ../../../search.php:79
-msgid "Search Results"
-msgstr ""
-
-#: ../../../search.php:114
-msgid "Unsatisfied? You can also try our "
-msgstr ""
-
-#: ../../../tag2tagadd.php:50
-msgid "Tag link created"
-msgstr ""
-
-#: ../../../tag2tagadd.php:53
-msgid "Failed to create the link"
-msgstr ""
-
-#: ../../../tag2tagadd.php:65
-msgid "Add Tag Link"
-msgstr ""
-
-#: ../../../tag2tagdelete.php:66
-msgid "Tag link deleted"
-msgstr ""
-
-#: ../../../tag2tagdelete.php:69
-msgid "Failed to delete the link"
-msgstr ""
-
-#: ../../../tag2tagdelete.php:81
-msgid "Delete Link Between Tags"
-msgstr ""
-
-#: ../../../tag2tagedit.php:55
-msgid "Edit Link Between Tags"
-msgstr ""
-
-#: ../../../tagcommondescriptionedit.php:55
-msgid "Tag common description updated"
-msgstr ""
-
-#: ../../../tagcommondescriptionedit.php:58
-msgid "Failed to update the tag common description"
-msgstr ""
-
-#: ../../../tagcommondescriptionedit.php:64
-#: ../../../templates/sidebar.block.tagactions.php:26
-msgid "Edit Tag Common Description"
-msgstr ""
-
-#: ../../../tagdelete.php:43
-msgid "Tag deleted"
-msgstr ""
-
-#: ../../../tagdelete.php:46
-msgid "Failed to delete the tag"
-msgstr ""
-
-#: ../../../tagdelete.php:54
-#: ../../../templates/sidebar.block.tagactions.php:22
-msgid "Delete Tag"
-msgstr ""
-
-#: ../../../tagedit.php:52
-msgid "Tag description updated"
-msgstr ""
-
-#: ../../../tagedit.php:55
-msgid "Failed to update the tag description"
-msgstr ""
-
-#: ../../../tagedit.php:61 ../../../templates/sidebar.block.tagactions.php:24
-msgid "Edit Tag Description"
-msgstr ""
-
-#: ../../../tagrename.php:63
-msgid "Tag renamed"
-msgstr ""
-
-#: ../../../tagrename.php:66
-msgid "Failed to rename the tag"
-msgstr ""
-
-#: ../../../tagrename.php:72 ../../../templates/sidebar.block.tagactions.php:9
-msgid "Rename Tag"
-msgid_plural "Rename Tags"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../../tags.php:45 ../../../tags.php:67
-#: ../../../templates/editbookmark.tpl.php:69
-#: ../../../templates/toolbar.inc.php:10
-msgid "Tags"
-msgstr ""
-
-#: ../../../users.php:35
-msgid "Users"
-msgstr ""
-
-#: ../../../watch.php:54
-msgid "User removed from your watchlist"
-msgstr ""
-
-#: ../../../watch.php:56
-msgid "User added to your watchlist"
-msgstr ""
-
-#: ../../../watchlist.php:104
-msgid "My Watchlist"
-msgstr ""
-
-#: ../../../watchlist.php:106 ../../../templates/toolbar.inc.php:11
-msgid "Watchlist"
-msgstr ""
-
-#: ../../../templates/about.tpl.php:6
+#: data/templates/about.tpl.php:6
 msgid ""
 "<strong>Store</strong> all your favourite links in one place, accessible "
 "from anywhere."
 msgstr ""
 
-#: ../../../templates/about.tpl.php:7
+#: 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 ""
 
-#: ../../../templates/about.tpl.php:8
+#: 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 ""
 
-#: ../../../templates/about.tpl.php:9
+#: data/templates/about.tpl.php:9
 msgid "Register now"
 msgstr ""
 
-#: ../../../templates/about.tpl.php:9
+#: data/templates/about.tpl.php:9
 #, php-format
 msgid " to start using %s!"
 msgstr ""
 
-#: ../../../templates/about.tpl.php:12
+#: data/templates/about.tpl.php:12
 msgid "Geek Stuff"
 msgstr ""
 
-#: ../../../templates/about.tpl.php:14
+#: data/templates/about.tpl.php:14
 msgid "is licensed under the "
 msgstr ""
 
-#: ../../../templates/about.tpl.php:14
+#: data/templates/about.tpl.php:14
 msgid "you can freely host it on your own web server."
 msgstr ""
 
-#: ../../../templates/about.tpl.php:15
+#: 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 "
@@ -628,522 +113,561 @@ msgid ""
 "the creator to add this setting. You never know, they might just do it."
 msgstr ""
 
-#: ../../../templates/about.tpl.php:24
+#: data/templates/about.tpl.php:24
 msgid "Tips"
 msgstr ""
 
-#: ../../../templates/about.tpl.php:26
+#: data/templates/about.tpl.php:26
 msgid "Add search plugin into your browser:"
 msgstr ""
 
-#: ../../../templates/about.tpl.php:27
+#: data/templates/about.tpl.php:27
 msgid ""
 "The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
 msgstr ""
 
-#: ../../../templates/about.tpl.php:28
+#: data/templates/about.tpl.php:28
 msgid ""
 "The secret tag \"system:imported\" allows you to find imported bookmarks."
 msgstr ""
 
-#: ../../../templates/admin.tpl.php:5
+#: data/templates/admin.tpl.php:5
 msgid "Users management"
 msgstr ""
 
-#: ../../../templates/admin.tpl.php:14
+#: data/templates/admin.tpl.php:14
 msgid "Public/Shared/Private"
 msgstr ""
 
-#: ../../../templates/admin.tpl.php:14 ../../../templates/bookmarks.tpl.php:93
+#: data/templates/admin.tpl.php:14 data/templates/bookmarks.tpl.php:93
 msgid "bookmark(s)"
 msgstr ""
 
-#: ../../../templates/admin.tpl.php:19
-#: ../../../templates/bookmarks.tpl.php:231
+#: 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 ""
+
+#: data/templates/admin.tpl.php:19 data/templates/bookmarks.tpl.php:251
 msgid "Delete"
 msgstr ""
 
-#: ../../../templates/admin.tpl.php:27
+#: data/templates/admin.tpl.php:27
 msgid "Other actions"
 msgstr ""
 
-#: ../../../templates/admin.tpl.php:29
+#: data/templates/admin.tpl.php:29
 msgid "Check all URLs (May take some time)"
 msgstr ""
 
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:16
+#: data/templates/bookmarkcommondescriptionedit.tpl.php:16
 msgid ""
 "Collaborative description: these fields can be viewed and modified by every "
 "users"
 msgstr ""
 
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:18
-#: ../../../templates/bookmarks.tpl.php:123
-#: ../../../templates/editbookmark.tpl.php:38
+#: data/templates/bookmarkcommondescriptionedit.tpl.php:18
+#: data/templates/bookmarks.tpl.php:137 data/templates/editbookmark.tpl.php:38
 msgid "Title"
 msgstr ""
 
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:23
-#: ../../../templates/editbookmark.tpl.php:44
-#: ../../../templates/editprofile.tpl.php:47
-#: ../../../templates/profile.tpl.php:33
-#: ../../../templates/tagcommondescriptionedit.tpl.php:13
-#: ../../../templates/tagedit.tpl.php:12
+#: 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/tagcommondescriptionedit.tpl.php:13
+#: data/templates/tagedit.tpl.php:12
 msgid "Description"
 msgstr ""
 
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:31
-#: ../../../templates/tagcommondescriptionedit.tpl.php:21
+#: data/templates/bookmarkcommondescriptionedit.tpl.php:31
+#: data/templates/tagcommondescriptionedit.tpl.php:21
 msgid "Last modification:"
 msgstr ""
 
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:42
-#: ../../../templates/tagcommondescriptionedit.tpl.php:32
-#: ../../../templates/tagedit.tpl.php:18
+#: data/templates/bookmarkcommondescriptionedit.tpl.php:42
+#: data/templates/tagcommondescriptionedit.tpl.php:32
+#: data/templates/tagedit.tpl.php:18
 msgid "Update"
 msgstr ""
 
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:43
-#: ../../../templates/editbookmark.tpl.php:98
-#: ../../../templates/tag2tagadd.tpl.php:24
-#: ../../../templates/tag2tagedit.tpl.php:38
-#: ../../../templates/tagcommondescriptionedit.tpl.php:33
-#: ../../../templates/tagedit.tpl.php:19
-#: ../../../templates/tagrename.tpl.php:25
+#: 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/tagcommondescriptionedit.tpl.php:33
+#: data/templates/tagedit.tpl.php:19 data/templates/tagrename.tpl.php:25
 msgid "Cancel"
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:26
+#: data/templates/bookmarks.tpl.php:26
 msgid "Bookmarks on this page are managed by an admin user."
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:51
-#: ../../../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 ""
 
-#: ../../../templates/bookmarks.tpl.php:55
-#: ../../../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 ""
 
-#: ../../../templates/bookmarks.tpl.php:76
-#: ../../../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 ""
 
-#: ../../../templates/bookmarks.tpl.php:93 ../../../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 ""
 
-#: ../../../templates/bookmarks.tpl.php:122
+#: data/templates/bookmarks.tpl.php:135
 msgid "Date"
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:129
+#: data/templates/bookmarks.tpl.php:140
+msgid "Voting"
+msgstr ""
+
+#: data/templates/bookmarks.tpl.php:149
 msgid "Bookmarks from other users for this tag"
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:134
+#: data/templates/bookmarks.tpl.php:154
 msgid "Only your bookmarks for this tag"
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:157
-#: ../../../templates/bookmarks.tpl.php:163
+#: data/templates/bookmarks.tpl.php:177 data/templates/bookmarks.tpl.php:183
 msgid "First"
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:158
-#: ../../../templates/bookmarks.tpl.php:164
+#: data/templates/bookmarks.tpl.php:178 data/templates/bookmarks.tpl.php:184
 msgid "Previous"
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:171
-#: ../../../templates/bookmarks.tpl.php:174
+#: data/templates/bookmarks.tpl.php:191 data/templates/bookmarks.tpl.php:194
 msgid "Next"
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:172
-#: ../../../templates/bookmarks.tpl.php:175
+#: data/templates/bookmarks.tpl.php:192 data/templates/bookmarks.tpl.php:195
 msgid "Last"
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:185
+#: data/templates/bookmarks.tpl.php:205
 #, php-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:225
+#: data/templates/bookmarks.tpl.php:245
 msgid "Tags:"
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:231
+#: data/templates/bookmarks.tpl.php:251
 msgid "Edit"
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:235
+#: data/templates/bookmarks.tpl.php:255
 msgid "Last update"
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:238
+#: data/templates/bookmarks.tpl.php:258
 msgid "by"
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:240
+#: data/templates/bookmarks.tpl.php:260
 msgid "you"
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:254
+#: data/templates/bookmarks.tpl.php:274
 #, php-format
 msgid " and %s1 other%s"
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:257
+#: data/templates/bookmarks.tpl.php:277
 #, php-format
 msgid " and %2$s%1$s others%3$s"
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:265
+#: data/templates/bookmarks.tpl.php:288
 msgid "Copy this bookmark to YOUR bookmarks."
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:265
+#: data/templates/bookmarks.tpl.php:289
 msgid "Copy"
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:284
+#: data/templates/bookmarks.tpl.php:309
 msgid "This bookmark is certified by an admin user."
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:323
+#: data/templates/bookmarks.tpl.php:345
 msgid "Private Note on this bookmark"
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:334
+#: data/templates/bookmarks.tpl.php:357
 msgid "Come back to the top of this page."
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:334
+#: data/templates/bookmarks.tpl.php:357
 msgid "Top of the page"
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:340
+#: data/templates/bookmarks.tpl.php:363
 msgid "No bookmarks available"
 msgstr ""
 
-#: ../../../templates/bottom.inc.php:7
+#: 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/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 ""
+
+#: data/templates/bottom.inc.php:7
 msgid "Propulsed by "
 msgstr ""
 
-#: ../../../templates/dynamictags.inc.php:47
-#: ../../../templates/sidebar.block.common.php:19
-#: ../../../templates/sidebar.block.popular.php:34
-#: ../../../templates/sidebar.block.recent.php:29
-#: ../../../templates/tags.tpl.php:19
+#: 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] ""
 msgstr[1] ""
 
-#: ../../../templates/dynamictags.inc.php:131
+#: 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 ""
+
+#: data/templates/dynamictags.inc.php:131
 msgid "Popular Tags From All Users"
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:33
+#: data/templates/editbookmark.tpl.php:33
 msgid "Address"
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:35
-#: ../../../templates/editbookmark.tpl.php:40
-#: ../../../templates/editprofile.tpl.php:31
-#: ../../../templates/tagrename.tpl.php:14
-#: ../../../templates/tagrename.tpl.php:19
+#: 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/tagrename.tpl.php:19
 msgid "Required"
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:45
+#: data/templates/editbookmark.tpl.php:45
 msgid "Add Note"
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:48
+#: data/templates/editbookmark.tpl.php:48
 msgid ""
 "You can use anchors to delimite attributes. for example: [publisher]blah[/"
 "publisher] "
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:51
+#: data/templates/editbookmark.tpl.php:51
 msgid "Suggested anchors: "
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:63
+#: data/templates/editbookmark.tpl.php:63
 msgid "Private Note"
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:65
+#: data/templates/editbookmark.tpl.php:65
 msgid "Just visible by you and your contacts."
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:73
+#: data/templates/editbookmark.tpl.php:69 data/templates/toolbar.inc.php:10
+#: www/tags.php:45 www/tags.php:67
+msgid "Tags"
+msgstr ""
+
+#: data/templates/editbookmark.tpl.php:73
 msgid "Comma-separated"
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:77
-#: ../../../templates/tag2tagadd.tpl.php:9
+#: 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 ""
 
-#: ../../../templates/editbookmark.tpl.php:81
-#: ../../../templates/tag2tagadd.tpl.php:8
+#: data/templates/editbookmark.tpl.php:81 data/templates/tag2tagadd.tpl.php:8
 msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry"
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:84
-#: ../../../templates/importDelicious.tpl.php:15
-#: ../../../templates/importNetscape.tpl.php:16
+#: data/templates/editbookmark.tpl.php:84
+#: data/templates/importDelicious.tpl.php:15
+#: data/templates/importNetscape.tpl.php:16
 msgid "Privacy"
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:87
-#: ../../../templates/importDelicious.tpl.php:18
-#: ../../../templates/importNetscape.tpl.php:19
+#: data/templates/editbookmark.tpl.php:87
+#: data/templates/importDelicious.tpl.php:18
+#: data/templates/importNetscape.tpl.php:19
 msgid "Public"
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:88
+#: data/templates/editbookmark.tpl.php:88
 msgid "Shared with Watch List"
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:89
-#: ../../../templates/importDelicious.tpl.php:20
-#: ../../../templates/importNetscape.tpl.php:21
+#: data/templates/editbookmark.tpl.php:89
+#: data/templates/importDelicious.tpl.php:20
+#: data/templates/importNetscape.tpl.php:21
 msgid "Private"
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:102
+#: data/templates/editbookmark.tpl.php:102
 msgid "Delete Bookmark"
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:107
+#: data/templates/editbookmark.tpl.php:107
 msgid "edit common description"
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:134
+#: data/templates/editbookmark.tpl.php:134
 msgid "Bookmarklet"
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:140
+#: data/templates/editbookmark.tpl.php:140
 #, 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 ""
 
-#: ../../../templates/editbookmark.tpl.php:144
+#: data/templates/editbookmark.tpl.php:144
 #, 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 ""
 
-#: ../../../templates/editbookmark.tpl.php:157
-#: ../../../templates/editbookmark.tpl.php:162
+#: data/templates/editbookmark.tpl.php:157
+#: data/templates/editbookmark.tpl.php:162
 #, php-format
 msgid "Post to %s"
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:158
-#: ../../../templates/editbookmark.tpl.php:163
+#: data/templates/editbookmark.tpl.php:158
+#: data/templates/editbookmark.tpl.php:163
 #, php-format
 msgid "Post to %s (Pop-up)"
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:168
-#: ../../../templates/importDelicious.tpl.php:26
-#: ../../../templates/importNetscape.tpl.php:27
-#: ../../../templates/importStructure.tpl.php:16
+#: data/templates/editbookmark.tpl.php:168
+#: data/templates/importDelicious.tpl.php:26
+#: data/templates/importNetscape.tpl.php:27
+#: data/templates/importStructure.tpl.php:16
 msgid "Import"
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:170
+#: data/templates/editbookmark.tpl.php:170
 msgid "Import bookmarks from bookmark file"
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:170
+#: data/templates/editbookmark.tpl.php:170
 msgid "Internet Explorer, Mozilla Firefox and Netscape"
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:171
+#: data/templates/editbookmark.tpl.php:171
 msgid "Import bookmarks from del.icio.us"
 msgstr ""
 
-#: ../../../templates/editprofile.tpl.php:10
+#: data/templates/editprofile.tpl.php:10
 msgid "Account Details"
 msgstr ""
 
-#: ../../../templates/editprofile.tpl.php:14
-#: ../../../templates/login.tpl.php:15 ../../../templates/password.tpl.php:10
-#: ../../../templates/profile.tpl.php:6 ../../../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 ""
 
-#: ../../../templates/editprofile.tpl.php:19
+#: data/templates/editprofile.tpl.php:19
 msgid "New Password"
 msgstr ""
 
-#: ../../../templates/editprofile.tpl.php:24
+#: data/templates/editprofile.tpl.php:24
 msgid "Confirm Password"
 msgstr ""
 
-#: ../../../templates/editprofile.tpl.php:29
-#: ../../../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 ""
 
-#: ../../../templates/editprofile.tpl.php:35
+#: data/templates/editprofile.tpl.php:35
 msgid "Personal Details"
 msgstr ""
 
-#: ../../../templates/editprofile.tpl.php:39
-#: ../../../templates/profile.tpl.php:17
+#: data/templates/editprofile.tpl.php:39 data/templates/profile.tpl.php:17
 msgid "Name"
 msgstr ""
 
-#: ../../../templates/editprofile.tpl.php:43
-#: ../../../templates/profile.tpl.php:23
+#: data/templates/editprofile.tpl.php:43 data/templates/profile.tpl.php:23
 msgid "Homepage"
 msgstr ""
 
-#: ../../../templates/editprofile.tpl.php:55
-#: ../../../templates/sidebar.block.tagactions.php:17
-#: ../../../templates/sidebar.block.watchstatus.php:18
+#: data/templates/editprofile.tpl.php:52 www/edit.php:113
+msgid "Save Changes"
+msgstr ""
+
+#: data/templates/editprofile.tpl.php:55
+#: data/templates/sidebar.block.tagactions.php:17
+#: data/templates/sidebar.block.watchstatus.php:18
 msgid "Actions"
 msgstr ""
 
-#: ../../../templates/editprofile.tpl.php:58
+#: data/templates/editprofile.tpl.php:58
 msgid "Export bookmarks"
 msgstr ""
 
-#: ../../../templates/editprofile.tpl.php:60
+#: data/templates/editprofile.tpl.php:60
 msgid "HTML file (for browsers)"
 msgstr ""
 
-#: ../../../templates/editprofile.tpl.php:61
+#: data/templates/editprofile.tpl.php:61
 msgid "XML file (like del.icio.us)"
 msgstr ""
 
-#: ../../../templates/editprofile.tpl.php:62
+#: data/templates/editprofile.tpl.php:62
 msgid "CSV file (for spreadsheet tools)"
 msgstr ""
 
-#: ../../../templates/error.404.tpl.php:5
+#: data/templates/error.404.tpl.php:5
 msgid "Not Found"
 msgstr ""
 
-#: ../../../templates/error.404.tpl.php:6
+#: data/templates/error.404.tpl.php:6
 msgid "The requested URL was not found on this server"
 msgstr ""
 
-#: ../../../templates/error.500.tpl.php:5
+#: data/templates/error.500.tpl.php:5
 msgid "General server error"
 msgstr ""
 
-#: ../../../templates/error.500.tpl.php:6
+#: data/templates/error.500.tpl.php:6
 msgid "The requested URL could not be processed"
 msgstr ""
 
-#: ../../../templates/importDelicious.tpl.php:19
-#: ../../../templates/importNetscape.tpl.php:20
+#: data/templates/importDelicious.tpl.php:19
+#: data/templates/importNetscape.tpl.php:20
 msgid "Shared with Watchlist"
 msgstr ""
 
-#: ../../../templates/importDelicious.tpl.php:31
-#: ../../../templates/importNetscape.tpl.php:32
-#: ../../../templates/importStructure.tpl.php:21
+#: data/templates/importDelicious.tpl.php:31
+#: data/templates/importNetscape.tpl.php:32
+#: data/templates/importStructure.tpl.php:21
 msgid "Instructions"
 msgstr ""
 
-#: ../../../templates/importDelicious.tpl.php:33
+#: 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 ""
 
-#: ../../../templates/importDelicious.tpl.php:34
+#: data/templates/importDelicious.tpl.php:34
 msgid ""
 "Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> "
 "file to your computer"
 msgstr ""
 
-#: ../../../templates/importDelicious.tpl.php:35
+#: 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 ""
 
-#: ../../../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 ""
 
-#: ../../../templates/importDelicious.tpl.php:37
-#: ../../../templates/importNetscape.tpl.php:44
+#: 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 ""
 
-#: ../../../templates/importNetscape.tpl.php:35
+#: data/templates/importNetscape.tpl.php:35
 msgid "Export your bookmarks from your browser to a file"
 msgstr ""
 
-#: ../../../templates/importNetscape.tpl.php:37
+#: data/templates/importNetscape.tpl.php:37
 msgid ""
 "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
 msgstr ""
 
-#: ../../../templates/importNetscape.tpl.php:38
+#: data/templates/importNetscape.tpl.php:38
 msgid ""
 "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
 "Export..."
 msgstr ""
 
-#: ../../../templates/importNetscape.tpl.php:39
+#: data/templates/importNetscape.tpl.php:39
 msgid ""
 "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
 msgstr ""
 
-#: ../../../templates/importNetscape.tpl.php:42
+#: 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 ""
 
-#: ../../../templates/importStructure.tpl.php:24
+#: data/templates/importStructure.tpl.php:24
 msgid "Create your structure into a simple text file and following this model:"
 msgstr ""
 
-#: ../../../templates/importStructure.tpl.php:35
+#: data/templates/importStructure.tpl.php:35
 msgid ""
 "Then import the file. The tags and their relations will be added to your "
 "profile."
 msgstr ""
 
-#: ../../../templates/login.tpl.php:20 ../../../templates/register.tpl.php:21
+#: data/templates/login.tpl.php:13
+msgid "Please activate cookies"
+msgstr ""
+
+#: data/templates/login.tpl.php:26 data/templates/register.tpl.php:21
 msgid "Password"
 msgstr ""
 
-#: ../../../templates/login.tpl.php:22
+#: data/templates/login.tpl.php:28
 msgid "Don't ask for my password for 2 weeks"
 msgstr ""
 
-#: ../../../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 ""
+
+#: data/templates/login.tpl.php:36
 msgid "Forgotten your password?"
 msgstr ""
 
-#: ../../../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 "
@@ -1151,260 +675,754 @@ msgid ""
 "e-mail your new password to you."
 msgstr ""
 
-#: ../../../templates/password.tpl.php:19
+#: data/templates/password.tpl.php:19
 msgid "Generate Password"
 msgstr ""
 
-#: ../../../templates/profile.tpl.php:11
+#: data/templates/profile.tpl.php:11
 msgid "Email"
 msgstr ""
 
-#: ../../../templates/profile.tpl.php:28
+#: data/templates/profile.tpl.php:28
 msgid "Member Since"
 msgstr ""
 
-#: ../../../templates/profile.tpl.php:40
-#: ../../../templates/sidebar.block.watchlist.php:30
+#: data/templates/profile.tpl.php:40
+#: data/templates/sidebar.block.watchlist.php:30
 msgid "Watching"
 msgstr ""
 
-#: ../../../templates/profile.tpl.php:55
-#: ../../../templates/sidebar.block.watchlist.php:52
+#: data/templates/profile.tpl.php:55
+#: data/templates/sidebar.block.watchlist.php:52
 msgid "Watched By"
 msgstr ""
 
-#: ../../../templates/profile.tpl.php:68 ../../../templates/toolbar.inc.php:9
+#: data/templates/profile.tpl.php:68 data/templates/toolbar.inc.php:9
 msgid "Bookmarks"
 msgstr ""
 
-#: ../../../templates/profile.tpl.php:69
+#: data/templates/profile.tpl.php:69
 msgid "Go to bookmarks"
 msgstr ""
 
-#: ../../../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 ""
 
-#: ../../../templates/register.tpl.php:18
+#: 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:28
+#: data/templates/register.tpl.php:28
 msgid " to send you your password if you forget it"
 msgstr ""
 
-#: ../../../templates/register.tpl.php:33
+#: data/templates/register.tpl.php:33
 msgid "Antispam question"
 msgstr ""
 
-#: ../../../templates/sidebar.block.linked.php:51
+#: data/templates/register.tpl.php:41 data/templates/toolbar.inc.php:31
+#: www/register.php:83
+msgid "Register"
+msgstr ""
+
+#: data/templates/search.menu.php:27
+msgid "Search..."
+msgstr ""
+
+#: data/templates/search.menu.php:28
+msgid "in"
+msgstr ""
+
+#: data/templates/search.menu.php:34
+msgid "this user's bookmarks"
+msgstr ""
+
+#: data/templates/search.menu.php:39
+msgid "my bookmarks"
+msgstr ""
+
+#: data/templates/search.menu.php:40
+msgid "my watchlist"
+msgstr ""
+
+#: data/templates/search.menu.php:44
+msgid "all bookmarks"
+msgstr ""
+
+#: data/templates/search.menu.php:54
+msgid "Search"
+msgstr ""
+
+#: data/templates/sidebar.block.linked.php:51
 msgid "Linked Tags"
 msgstr ""
 
-#: ../../../templates/sidebar.block.linked.php:62
-#: ../../../templates/sidebar.block.menu.php:46
+#: data/templates/sidebar.block.linked.php:62
+#: data/templates/sidebar.block.menu.php:46
 msgid "Add new link"
 msgstr ""
 
-#: ../../../templates/sidebar.block.linked.php:63
-#: ../../../templates/sidebar.block.menu.php:47
+#: data/templates/sidebar.block.linked.php:63
+#: data/templates/sidebar.block.menu.php:47
 msgid "Delete link"
 msgstr ""
 
-#: ../../../templates/sidebar.block.menu.php:35
+#: data/templates/sidebar.block.menu2.php:25
+msgid "Featured Menu Tags"
+msgstr ""
+
+#: data/templates/sidebar.block.menu2.php:29
+msgid "This menu is composed of keywords (tags) organized by admins."
+msgstr ""
+
+#: data/templates/sidebar.block.menu.php:35
 #, php-format
 msgid "Tags included into the tag '%s'"
 msgstr ""
 
-#: ../../../templates/sidebar.block.menu.php:35
+#: data/templates/sidebar.block.menu.php:35
 msgid "Menu Tags"
 msgstr ""
 
-#: ../../../templates/sidebar.block.menu.php:68
+#: data/templates/sidebar.block.menu.php:68
 msgid "See all your tags"
 msgstr ""
 
-#: ../../../templates/sidebar.block.menu.php:68
+#: data/templates/sidebar.block.menu.php:68
 msgid "all your tags"
 msgstr ""
 
-#: ../../../templates/sidebar.block.menu.php:70
+#: data/templates/sidebar.block.menu.php:70
 msgid "See all tags from this user"
 msgstr ""
 
-#: ../../../templates/sidebar.block.menu.php:70
+#: data/templates/sidebar.block.menu.php:70
 msgid "all tags from this user"
 msgstr ""
 
-#: ../../../templates/sidebar.block.menu.php:74
+#: data/templates/sidebar.block.menu.php:74
 msgid "See popular tags"
 msgstr ""
 
-#: ../../../templates/sidebar.block.menu2.php:25
-msgid "Featured Menu Tags"
-msgstr ""
-
-#: ../../../templates/sidebar.block.menu2.php:29
-msgid "This menu is composed of keywords (tags) organized by admins."
-msgstr ""
-
-#: ../../../templates/sidebar.block.recent.php:18
+#: data/templates/sidebar.block.recent.php:18
 msgid "Recent Tags"
 msgstr ""
 
-#: ../../../templates/sidebar.block.related.php:26
+#: data/templates/sidebar.block.related.php:26
 msgid "Related Tags"
 msgstr ""
 
-#: ../../../templates/sidebar.block.search.php:15
+#: data/templates/sidebar.block.search.php:15
 msgid "Last Searches"
 msgstr ""
 
-#: ../../../templates/sidebar.block.search.php:24
+#: data/templates/sidebar.block.search.php:24
 msgid "Number of bookmarks for this query"
 msgstr ""
 
-#: ../../../templates/sidebar.block.tagactions.php:28
+#: data/templates/sidebar.block.tagactions.php:9 www/tagrename.php:72
+msgid "Rename Tag"
+msgid_plural "Rename Tags"
+msgstr[0] ""
+msgstr[1] ""
+
+#: data/templates/sidebar.block.tagactions.php:22 www/tagdelete.php:54
+msgid "Delete Tag"
+msgstr ""
+
+#: data/templates/sidebar.block.tagactions.php:24 www/tagedit.php:61
+msgid "Edit Tag Description"
+msgstr ""
+
+#: data/templates/sidebar.block.tagactions.php:26
+#: www/tagcommondescriptionedit.php:64
+msgid "Edit Tag Common Description"
+msgstr ""
+
+#: data/templates/sidebar.block.tagactions.php:28
 msgid "Create a link to another tag"
 msgstr ""
 
-#: ../../../templates/sidebar.block.users.php:14
+#: data/templates/sidebar.block.users.php:14
 msgid "New Users"
 msgstr ""
 
-#: ../../../templates/sidebar.block.users.php:23
-#: ../../../templates/users.tpl.php:17
+#: data/templates/sidebar.block.users.php:23 data/templates/users.tpl.php:17
 msgid "bookmarks"
 msgstr ""
 
-#: ../../../templates/sidebar.block.users.php:30
+#: data/templates/sidebar.block.users.php:30
 msgid "See all users"
 msgstr ""
 
-#: ../../../templates/sidebar.block.users.php:30
+#: data/templates/sidebar.block.users.php:30
 msgid "All users"
 msgstr ""
 
-#: ../../../templates/sidebar.block.watchlist.php:19
+#: data/templates/sidebar.block.watchlist.php:19
 msgid "Close contacts are mutual contacts"
 msgstr ""
 
-#: ../../../templates/sidebar.block.watchlist.php:19
+#: data/templates/sidebar.block.watchlist.php:19
 msgid "Close contacts"
 msgstr ""
 
-#: ../../../templates/sidebar.block.watchlist.php:36
+#: data/templates/sidebar.block.watchlist.php:36
 msgid "Add a contact..."
 msgstr ""
 
-#: ../../../templates/sidebar.block.watchlist.php:36
+#: data/templates/sidebar.block.watchlist.php:36
 msgid "Type a username to add it to your contacts."
 msgstr ""
 
-#: ../../../templates/sidebar.block.watchlist.php:44
+#: data/templates/sidebar.block.watchlist.php:44
 msgid "Remove this contact"
 msgstr ""
 
-#: ../../../templates/sidebar.block.watchstatus.php:11
+#: data/templates/sidebar.block.watchstatus.php:11
 msgid "Remove from Watchlist"
 msgstr ""
 
-#: ../../../templates/sidebar.block.watchstatus.php:13
+#: data/templates/sidebar.block.watchstatus.php:13
 msgid "Add to Watchlist"
 msgstr ""
 
-#: ../../../templates/sidebar.linkedtags.inc.php:18
+#: data/templates/sidebar.linkedtags.inc.php:18
 msgid "Edit link"
 msgstr ""
 
-#: ../../../templates/sidebar.linkedtags.inc.php:47
+#: data/templates/sidebar.linkedtags.inc.php:47
 msgid "Synonyms:"
 msgstr ""
 
-#: ../../../templates/tag2tagadd.tpl.php:12
+#: data/templates/tag2tagadd.tpl.php:12
 msgid "Create new link:"
 msgstr ""
 
-#: ../../../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 ""
 
-#: ../../../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 ""
 
-#: ../../../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 ""
 
-#: ../../../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 ""
 
-#: ../../../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 ""
+
+#: 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 ""
+
+#: data/templates/tag2tagedit.tpl.php:6
 msgid "Delete the link"
 msgstr ""
 
-#: ../../../templates/tag2tagedit.tpl.php:29
+#: data/templates/tag2tagedit.tpl.php:29
 msgid "Create new link"
 msgstr ""
 
-#: ../../../templates/tagrename.tpl.php:12
+#: data/templates/tagrename.tpl.php:12
 msgid "Old"
 msgstr ""
 
-#: ../../../templates/tagrename.tpl.php:17
+#: data/templates/tagrename.tpl.php:17
 msgid "New"
 msgstr ""
 
-#: ../../../templates/tagrename.tpl.php:24
+#: data/templates/tagrename.tpl.php:24
 msgid "Rename"
 msgstr ""
 
-#: ../../../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 ""
 
-#: ../../../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 ""
 
-#: ../../../templates/toolbar.inc.php:8 ../../../templates/toolbar.inc.php:26
+#: data/templates/toolbar.inc.php:8 data/templates/toolbar.inc.php:26
 msgid "Home"
 msgstr ""
 
-#: ../../../templates/toolbar.inc.php:14
+#: data/templates/toolbar.inc.php:11 www/watchlist.php:106
+msgid "Watchlist"
+msgstr ""
+
+#: data/templates/toolbar.inc.php:12 www/profile.php:67
+msgid "Profile"
+msgstr ""
+
+#: data/templates/toolbar.inc.php:13 www/bookmarks.php:209
+msgid "Add a Bookmark"
+msgstr ""
+
+#: data/templates/toolbar.inc.php:14
 msgid "Log Out"
 msgstr ""
 
-#: ../../../templates/toolbar.inc.php:17
+#: data/templates/toolbar.inc.php:17
 msgid "Admin"
 msgstr ""
 
-#: ../../../templates/top.inc.php:51
+#: 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.inc.php."
+"config.php."
 msgstr ""
 
-#: ../../../templates/users.tpl.php:17
+#: data/templates/users.tpl.php:17
 msgid "profile"
 msgstr ""
 
-#: ../../../templates/users.tpl.php:17
+#: data/templates/users.tpl.php:17
 msgid "created in"
 msgstr ""
+
+#: 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 ""
+
+#: www/ajaxDelete.php:41 www/edit.php:103
+msgid "Failed to delete bookmark"
+msgstr ""
+
+#: www/alltags.php:49
+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/watchlist.php:61
+#: www/watch.php:45
+#, php-format
+msgid "User with username %s was not found"
+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
+msgid "Permission denied."
+msgstr ""
+
+#: www/bookmarkcommondescriptionedit.php:60
+msgid "Bookmark common description updated"
+msgstr ""
+
+#: www/bookmarkcommondescriptionedit.php:63
+msgid "Failed to update the bookmark common description"
+msgstr ""
+
+#: www/bookmarkcommondescriptionedit.php:71
+msgid "Edit Bookmark Common Description"
+msgstr ""
+
+#: www/bookmarks.php:111 www/tags.php:47
+msgid "Remove the tag from the selection"
+msgstr ""
+
+#: www/bookmarks.php:131 www/edit.php:65
+msgid "Your bookmark must have a title and an address"
+msgstr ""
+
+#: www/bookmarks.php:152 www/edit.php:83 www/edit.php:86
+msgid "Bookmark saved"
+msgstr ""
+
+#: www/bookmarks.php:152
+msgid "(Come back to previous page.)"
+msgstr ""
+
+#: www/bookmarks.php:159 www/importNetscape.php:108 www/import.php:106
+msgid ""
+"There was an error saving your bookmark. Please try again or contact the "
+"administrator."
+msgstr ""
+
+#: www/bookmarks.php:216
+msgid "Add Bookmark"
+msgstr ""
+
+#: www/bookmarks.php:219
+msgid "You must be logged in before you can add bookmarks."
+msgstr ""
+
+#: www/bookmarks.php:274 www/bookmarks.php:275
+msgid "My Bookmarks"
+msgstr ""
+
+#: www/edit.php:44 www/edit.php:45
+msgid "Edit Bookmark"
+msgstr ""
+
+#: www/edit.php:51
+#, php-format
+msgid "Bookmark with id %s not was not found"
+msgstr ""
+
+#: www/edit.php:57
+msgid "You are not allowed to edit this bookmark"
+msgstr ""
+
+#: www/edit.php:77
+msgid "Error while saving your bookmark"
+msgstr ""
+
+#: www/history.php:61
+msgid "History"
+msgstr ""
+
+#: www/history.php:62
+#, php-format
+msgid "History for %s"
+msgstr ""
+
+#: www/history.php:84
+msgid "Address was not found"
+msgstr ""
+
+#: www/importNetscape.php:95
+msgid "You have already submitted some of these bookmarks."
+msgstr ""
+
+#: www/importNetscape.php:115
+msgid "Bookmarks found: "
+msgstr ""
+
+#: www/importNetscape.php:116
+msgid "Bookmarks imported: "
+msgstr ""
+
+#: www/importNetscape.php:117 www/importNetscape.php:122
+msgid "Import Bookmarks from Browser File"
+msgstr ""
+
+#: www/import.php:47
+msgid "Could not open XML input"
+msgstr ""
+
+#: www/import.php:51
+#, php-format
+msgid "XML error: %s at line %d"
+msgstr ""
+
+#: www/import.php:60
+msgid "Import Bookmarks from del.icio.us"
+msgstr ""
+
+#: www/import.php:93
+msgid "You have already submitted this bookmark."
+msgstr ""
+
+#: www/import.php:104
+msgid "Bookmark imported."
+msgstr ""
+
+#: www/importStructure.php:61
+msgid "Bad indentation"
+msgstr ""
+
+#: www/importStructure.php:67
+msgid "New links between tags: "
+msgstr ""
+
+#: www/importStructure.php:72
+msgid "Import Structure"
+msgstr ""
+
+#: www/index.php:38
+msgid "You have now logged out"
+msgstr ""
+
+#: www/index.php:45
+#, php-format
+msgid "%s: Recent bookmarks"
+msgstr ""
+
+#: www/index.php:78
+msgid "Store, share and tag your favourite links"
+msgstr ""
+
+#: www/index.php:79
+msgid "All Bookmarks"
+msgstr ""
+
+#: www/jsScuttle.php:70
+msgid "Available"
+msgstr ""
+
+#: www/jsScuttle.php:73
+msgid "Not Available"
+msgstr ""
+
+#: www/login.php:48
+msgid "The details you have entered are incorrect. Please try again."
+msgstr ""
+
+#: www/password.php:36
+msgid "You must enter your username."
+msgstr ""
+
+#: www/password.php:40
+msgid ""
+"You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+
+#: www/password.php:48
+msgid "No matches found for that username."
+msgstr ""
+
+#: www/password.php:51
+msgid ""
+"No matches found for that combination of username and <abbr title="
+"\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+
+#: www/password.php:59
+msgid ""
+"There was an error while generating your new password. Please try again."
+msgstr ""
+
+#: www/password.php:63
+msgid "Your new password is:"
+msgstr ""
+
+#: 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 ""
+
+#: www/password.php:66
+#, php-format
+msgid "%s Account Information"
+msgstr ""
+
+#: www/password.php:68
+#, php-format
+msgid "New password generated and sent to %s"
+msgstr ""
+
+#: www/password.php:75
+msgid "Forgotten Password"
+msgstr ""
+
+#: www/profile.php:59 www/watchlist.php:119
+msgid "Username was not specified"
+msgstr ""
+
+#: www/profile.php:65
+msgid "My Profile"
+msgstr ""
+
+#: www/profile.php:89
+msgid "Invalid Token"
+msgstr ""
+
+#: www/profile.php:94
+msgid "Password and confirmation do not match."
+msgstr ""
+
+#: www/profile.php:98
+msgid "Password must be at least 6 characters long."
+msgstr ""
+
+#: www/profile.php:102
+msgid "E-mail address is not valid."
+msgstr ""
+
+#: www/profile.php:106
+msgid "An error occurred while saving your changes."
+msgstr ""
+
+#: www/profile.php:108
+msgid "Changes saved."
+msgstr ""
+
+#: www/register.php:46
+msgid "You <em>must</em> enter a username, password and e-mail address."
+msgstr ""
+
+#: www/register.php:50
+msgid "This username has been reserved, please make another choice."
+msgstr ""
+
+#: www/register.php:54
+msgid "This username already exists, please make another choice."
+msgstr ""
+
+#: www/register.php:58
+msgid ""
+"This username is not valid (too short, too long, forbidden characters...), "
+"please make another choice."
+msgstr ""
+
+#: www/register.php:62
+msgid "E-mail address is not valid. Please try again."
+msgstr ""
+
+#: www/register.php:66
+msgid "Antispam answer is not valid. Please try again."
+msgstr ""
+
+#: www/register.php:75
+msgid "You have successfully registered. Enjoy!"
+msgstr ""
+
+#: www/register.php:77
+msgid "Registration failed. Please try again."
+msgstr ""
+
+#: www/rss.php:84
+#, php-format
+msgid "Recent bookmarks posted to %s"
+msgstr ""
+
+#: www/search.php:81 www/search.php:145
+msgid "Search Bookmarks"
+msgstr ""
+
+#: www/search.php:87
+msgid "Search Results"
+msgstr ""
+
+#: www/search.php:135
+msgid "Unsatisfied? You can also try our "
+msgstr ""
+
+#: www/tag2tagadd.php:50
+msgid "Tag link created"
+msgstr ""
+
+#: www/tag2tagadd.php:53
+msgid "Failed to create the link"
+msgstr ""
+
+#: www/tag2tagadd.php:65
+msgid "Add Tag Link"
+msgstr ""
+
+#: www/tag2tagdelete.php:66
+msgid "Tag link deleted"
+msgstr ""
+
+#: www/tag2tagdelete.php:69
+msgid "Failed to delete the link"
+msgstr ""
+
+#: www/tag2tagdelete.php:81
+msgid "Delete Link Between Tags"
+msgstr ""
+
+#: www/tag2tagedit.php:55
+msgid "Edit Link Between Tags"
+msgstr ""
+
+#: www/tagcommondescriptionedit.php:55
+msgid "Tag common description updated"
+msgstr ""
+
+#: www/tagcommondescriptionedit.php:58
+msgid "Failed to update the tag common description"
+msgstr ""
+
+#: www/tagdelete.php:43
+msgid "Tag deleted"
+msgstr ""
+
+#: www/tagdelete.php:46
+msgid "Failed to delete the tag"
+msgstr ""
+
+#: www/tagedit.php:52
+msgid "Tag description updated"
+msgstr ""
+
+#: www/tagedit.php:55
+msgid "Failed to update the tag description"
+msgstr ""
+
+#: www/tagrename.php:63
+msgid "Tag renamed"
+msgstr ""
+
+#: www/tagrename.php:66
+msgid "Failed to rename the tag"
+msgstr ""
+
+#: www/users.php:31
+msgid "Users"
+msgstr ""
+
+#: www/watchlist.php:104
+msgid "My Watchlist"
+msgstr ""
+
+#: www/watch.php:54
+msgid "User removed from your watchlist"
+msgstr ""
+
+#: www/watch.php:56
+msgid "User added to your watchlist"
+msgstr ""
+
+#: 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 ""