Merge branch '0.98'

author: Christian Weiske <cweiske@cweiske.de> 2012-01-20 22:10:30 +0100
committer: Christian Weiske <cweiske@cweiske.de> 2012-01-20 22:10:30 +0100
commit: 6ff4370a20e7da8d02239b387cc0db296d7bf466 (patch)
tree: 0166e5a7b78779675507086326efd67b4fef9eb3 /data/locales
parent: d16ca9235157042604f23949f2fa6e479e882d7d (diff)
parent: d6d44c6cfa7e3e5cdb36d9e4abd3a62edad74eb9 (diff)
download: semanticscuttle-6ff4370a20e7da8d02239b387cc0db296d7bf466.tar.gz
semanticscuttle-6ff4370a20e7da8d02239b387cc0db296d7bf466.tar.bz2
33 files changed, 18245 insertions, 9362 deletions
diff --git a/data/locales/de_AT/LC_MESSAGES/messages.mo b/data/locales/de_AT/LC_MESSAGES/messages.mo
index 5ba02ab..80201d4 100644
--- a/data/locales/de_AT/LC_MESSAGES/messages.mo
+++ b/data/locales/de_AT/LC_MESSAGES/messages.mo
diff --git a/data/locales/de_AT/LC_MESSAGES/messages.po b/data/locales/de_AT/LC_MESSAGES/messages.po
index 174c902..b398eea 100644
--- a/data/locales/de_AT/LC_MESSAGES/messages.po
+++ b/data/locales/de_AT/LC_MESSAGES/messages.po
@@ -1,1137 +1,1699 @@
 # Copyright (C) 2008 by Elmar H. Beer
 # This file is distributed under the same license as the SemanticScuttle package.
 # Elmar H. Beer <info@ehb-world.com>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: SemanticScuttle\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-29 11:17+0200\n"
-"PO-Revision-Date: 2008-11-18 18:46+0100\n"
-"Last-Translator: Elmar H. Beer <info@ehb-world.com>\n"
-"Language-Team: de-AT <info@ehb-world.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: German\n"
-"X-Poedit-Country: AUSTRIA\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 "Impressum"
-
-#: ../../../ajaxDelete.php:30
-msgid "You are not allowed to delete this bookmark"
-msgstr "Leider sind Sie nicht autorisiert diesen Favoriten zu löschen."
-
-#: ../../../ajaxDelete.php:34
-#: ../../../edit.php:78
-msgid "Failed to delete bookmark"
-msgstr "Leider ist das Löschen des Favoriten fehlgeschlagen."
-
-#: ../../../alltags.php:48
-msgid "All Tags"
-msgstr "Alle Schlagwörter"
-
-#: ../../../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 "Leider wurde der/die Benutzer/in %s nicht gefunden."
-
-#: ../../../bookmarkcommondescriptionedit.php:35
-#: ../../../tag2tagadd.php:31
-#: ../../../tag2tagdelete.php:31
-#: ../../../tag2tagedit.php:31
-#: ../../../tagcommondescriptionedit.php:35
-#: ../../../tagedit.php:34
-msgid "Permission denied."
-msgstr "Zugriff verweigert."
-
-#: ../../../bookmarkcommondescriptionedit.php:45
-msgid "Bookmark common description updated"
-msgstr "Die gemeinsame Deskription des Favoriten wurde erfolgreich aktualisiert."
-
-#: ../../../bookmarkcommondescriptionedit.php:48
-msgid "Failed to update the bookmark common description"
-msgstr "Leider ist die gemeinsame Deskription des Favoriten fehlgeschlagen."
-
-#: ../../../bookmarkcommondescriptionedit.php:57
-msgid "Edit Bookmark Common Description"
-msgstr "Die gemeinsame Deskription des Favoriten editieren."
-
-#: ../../../bookmarks.php:95
-#: ../../../edit.php:44
-msgid "Your bookmark must have a title and an address"
-msgstr "Ihr Favorit muss einen Titel und eine URL beinhalten."
-
-#: ../../../bookmarks.php:115
-#: ../../../edit.php:58
-msgid "Bookmark saved"
-msgstr "Ihr Favorit wurde erfolgreich gespeichert."
-
-#: ../../../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 "Leider ist ein Fehler während der Speicherung Ihres Favoriten aufgetreten. Bitte versuchen Sie es erenut oder kontaktieren Sie den/die Administrator/in. Herzlichen Dank!"
-
-#: ../../../bookmarks.php:161
-#: ../../../templates/toolbar.inc.php:14
-msgid "Add a Bookmark"
-msgstr "Favoriten addieren"
-
-#: ../../../bookmarks.php:164
-msgid "Add Bookmark"
-msgstr "Favoriten addieren"
-
-#: ../../../bookmarks.php:167
-msgid "You must be logged in before you can add bookmarks."
-msgstr "Sie müssen sich zunächst registrieren bzw. anmelden, um einen Favoriten zu addieren."
-
-#: ../../../bookmarks.php:218
-msgid "My Bookmarks"
-msgstr "Meine Favoriten"
-
-#: ../../../edit.php:29
-msgid "Edit Bookmark"
-msgstr "Favoriten editieren"
-
-#: ../../../edit.php:34
-#, php-format
-msgid "Bookmark with id %s not was not found"
-msgstr "Der Favorit mit der id %s wurde nicht gefunden."
-
-#: ../../../edit.php:39
-msgid "You are not allowed to edit this bookmark"
-msgstr "Leider sind Sie nicht autorisiert diesen Favoriten zu editieren."
-
-#: ../../../edit.php:55
-msgid "Error while saving your bookmark"
-msgstr "Ein Fehler ist während der Speicherung Ihres Favoriten aufgetreten."
-
-#: ../../../edit.php:88
-#: ../../../templates/editprofile.tpl.php:51
-msgid "Save Changes"
-msgstr "Änderungen speichern"
-
-#: ../../../functions.inc.php:108
-msgid "message_die() was called multiple times."
-msgstr "Die Zeile message_die() wurde öfters aufgerufen."
-
-#: ../../../functions.inc.php:120
-msgid "SQL Error"
-msgstr "SQL - Fehler"
-
-#: ../../../functions.inc.php:126
-msgid "Line"
-msgstr "Zeile"
-
-#: ../../../functions.inc.php:126
-#: ../../../templates/importDelicious.tpl.php:8
-#: ../../../templates/importNetscape.tpl.php:9
-msgid "File"
-msgstr "Datei"
-
-#: ../../../functions.inc.php:132
-msgid "Information"
-msgstr "Information"
-
-#: ../../../functions.inc.php:137
-msgid "Critical Information"
-msgstr "Kritische Information"
-
-#: ../../../functions.inc.php:142
-msgid "An error occured"
-msgstr "Leider ist ein Fehler aufgetreten."
-
-#: ../../../functions.inc.php:145
-msgid "General Error"
-msgstr "Allgemeiner Fehler"
-
-#: ../../../functions.inc.php:153
-msgid "An critical error occured"
-msgstr "Leider ist ein kritischer Fehler aufgetreten."
-
-#: ../../../functions.inc.php:156
-msgid "Critical Error"
-msgstr "Kritischer Fehler"
-
-#: ../../../functions.inc.php:165
-msgid "DEBUG MODE"
-msgstr "Debugmodus"
-
-#: ../../../history.php:65
-msgid "History"
-msgstr "Verlauf"
-
-#: ../../../history.php:66
-#, php-format
-msgid "History for %s"
-msgstr "Verlauf von %s"
-
-#: ../../../history.php:82
-msgid "Address was not found"
-msgstr "Leider konnte die Webadresse nicht gefunden werden."
-
-#: ../../../import.php:41
-msgid "Could not open XML input"
-msgstr "Leider konnte die XML Dateneingabe nicht geöffnet werden."
-
-#: ../../../import.php:45
-#, php-format
-msgid "XML error: %s at line %d"
-msgstr "XML - Fehler: %s in Zeile %d"
-
-#: ../../../import.php:54
-msgid "Import Bookmarks from del.icio.us"
-msgstr "Die Favoriten aus del.icio.us importieren."
-
-#: ../../../import.php:86
-#: ../../../importNetscape.php:64
-msgid "You have already submitted this bookmark."
-msgstr "Sie haben diesen Favoriten bereits erfolgreich gespeichert."
-
-#: ../../../import.php:97
-#: ../../../importNetscape.php:72
-msgid "Bookmark imported."
-msgstr "Die Favoriten wurden erfolgreich importiert."
-
-#: ../../../importNetscape.php:81
-msgid "Import Bookmarks from Browser File"
-msgstr "Die Favoriten aus einer Favoritendatei importieren."
-
-#: ../../../index.php:32
-msgid "You have now logged out"
-msgstr "Sie haben sich nun erfolgreich abgemeldet."
-
-#: ../../../index.php:39
-#, php-format
-msgid "%s: Recent bookmarks"
-msgstr "%s: Neue Favoriten"
-
-#: ../../../index.php:73
-msgid "Store, share and tag your favourite links"
-msgstr "Speichern, teilen und kategorisieren Sie Ihre Favoriten!"
-
-#: ../../../index.php:74
-msgid "All Bookmarks"
-msgstr "Alle Favoriten"
-
-#: ../../../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 "Sind Sie sicher?"
-
-#: ../../../jsScuttle.php:22
-#: ../../../templates/tag2tagdelete.tpl.php:15
-#: ../../../templates/tag2tagedit.tpl.php:16
-#: ../../../templates/tagdelete.tpl.php:8
-msgid "Yes"
-msgstr "Ja"
-
-#: ../../../jsScuttle.php:22
-#: ../../../templates/tag2tagdelete.tpl.php:16
-#: ../../../templates/tag2tagedit.tpl.php:17
-#: ../../../templates/tagdelete.tpl.php:9
-msgid "No"
-msgstr "Nein"
-
-#: ../../../jsScuttle.php:68
-msgid "Available"
-msgstr "Vorhanden."
-
-#: ../../../jsScuttle.php:71
-msgid "Not Available"
-msgstr "Leider nicht vorhanden."
-
-#: ../../../login.php:38
-msgid "The details you have entered are incorrect. Please try again."
-msgstr "Leider sind die von Ihnen eingetragenen Details nicht korrekt. Bitte versuchen Sie es erneut."
-
-#: ../../../login.php:48
-#: ../../../templates/login.tpl.php:26
-#: ../../../templates/toolbar.inc.php:26
-msgid "Log In"
-msgstr "Anmelden"
-
-#: ../../../password.php:31
-msgid "You must enter your username."
-msgstr "Sie müssen Ihren Benutzernamen eingeben."
-
-#: ../../../password.php:35
-msgid "You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "Sie müssen Ihre <abbr title=\"electronic mail\">E-Mail</abbr> Adresse eingeben."
-
-#: ../../../password.php:42
-msgid "No matches found for that username."
-msgstr "Leider keine Resultate zu diesem Benutzernamen gefunden."
-
-#: ../../../password.php:45
-msgid "No matches found for that combination of username and <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "Leider keine Resultate zu diesem Benutzernamen und dieser <abbr title=\"electronic mail\">E-Mail</abbr> Adresse gefunden."
-
-#: ../../../password.php:53
-msgid "There was an error while generating your new password. Please try again."
-msgstr "Leider ist ein Fehler bei der Generierung des neuen Passwortes aufgetreten. Bitte versuchen Sie es erneut."
-
-#: ../../../password.php:57
-msgid "Your new password is:"
-msgstr "Ihr neues Passwort lautet:"
-
-#: ../../../password.php:57
-msgid "To keep your bookmarks secure, you should change this password in your profile the next time you log in."
-msgstr "Um den größtmöglichen Schutz Ihrer Favoriten zu gewährleisten, sollten Sie das Passwort in Ihrem Profil bei Ihrer nächsten Anmeldung editieren."
-
-#: ../../../password.php:60
-#, php-format
-msgid "%s Account Information"
-msgstr "%s Account Information"
-
-#: ../../../password.php:62
-#, php-format
-msgid "New password generated and sent to %s"
-msgstr "Ein neues Passwort wurde erfolgreich generiert und an %s gesandt."
-
-#: ../../../password.php:69
-msgid "Forgotten Password"
-msgstr "Vergessenes Passwort"
-
-#: ../../../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 "Populäre Schlagwörter"
-
-#: ../../../profile.php:52
-#: ../../../watchlist.php:116
-msgid "Username was not specified"
-msgstr "Leider wurde der Benutzername nicht angegeben."
-
-#: ../../../profile.php:58
-msgid "My Profile"
-msgstr "Mein Profil"
-
-#: ../../../profile.php:60
-#: ../../../templates/toolbar.inc.php:13
-msgid "Profile"
-msgstr "Profil"
-
-#: ../../../profile.php:78
-msgid "Password and confirmation do not match."
-msgstr "Leider ist das Passwort und deren Verifizierung nicht identisch."
-
-#: ../../../profile.php:82
-msgid "Password must be at least 6 characters long."
-msgstr "Das Passwort muss mindestens sechs Zeichen lang sein."
-
-#: ../../../profile.php:86
-msgid "E-mail address is not valid."
-msgstr "Leider ist die E-Mail Adresse nicht gültig."
-
-#: ../../../profile.php:90
-msgid "An error occurred while saving your changes."
-msgstr "Leider trat ein Fehler beim Speichern Ihrer Änderungen auf."
-
-#: ../../../profile.php:92
-msgid "Changes saved."
-msgstr "Die Änderungen wurden erfolgreich gespeichert."
-
-#: ../../../register.php:33
-msgid "You <em>must</em> enter a username, password and e-mail address."
-msgstr "Sie müssen einen Benutzernamen, ein Passwort und eine <abbr title=\"electronic mail\">E-Mail</abbr> Addresse eingeben."
-
-#: ../../../register.php:37
-msgid "This username has been reserved, please make another choice."
-msgstr "Leider wurde dieser Benutzername bereits reserviert. Bitte treffen Sie eine andere Wahl."
-
-#: ../../../register.php:41
-msgid "This username already exists, please make another choice."
-msgstr "Leider existiert dieser Benutzername bereits. Bitte treffen Sie eine andere Wahl."
-
-#: ../../../register.php:45
-msgid "E-mail address is not valid. Please try again."
-msgstr "Leider ist diese E-Mail Adresse nicht gültig. Bitte versuchen Sie es erneut."
-
-#: ../../../register.php:49
-msgid "Antispam answer is not valid. Please try again."
-msgstr "Leider wurde die Sicherheitsfrage nicht korrekt beantwortet. Bitte versuchen Sie es erneut."
-
-#: ../../../register.php:58
-msgid "You have successfully registered. Enjoy!"
-msgstr "Ihre Registrierung war erfolgreich!"
-
-#: ../../../register.php:60
-msgid "Registration failed. Please try again."
-msgstr "Leider ist Ihre Registrierung fehlgeschlagen. Bitte versuchen Sie es erneut."
-
-#: ../../../register.php:66
-#: ../../../templates/register.tpl.php:41
-#: ../../../templates/toolbar.inc.php:27
-msgid "Register"
-msgstr "Registrieren"
-
-#: ../../../rss.php:79
-#, php-format
-msgid "Recent bookmarks posted to %s"
-msgstr "Neueste Favoriten auf %s"
-
-#: ../../../search.inc.php:13
-#: ../../../search.inc.php:41
-msgid "Search"
-msgstr "Suche"
-
-#: ../../../search.inc.php:19
-msgid "this user's bookmarks"
-msgstr "Favoriten des/der Benutzers/in"
-
-#: ../../../search.inc.php:24
-msgid "my bookmarks"
-msgstr "meine Favoriten"
-
-#: ../../../search.inc.php:25
-msgid "my watchlist"
-msgstr "meine Beobachtungsliste"
-
-#: ../../../search.inc.php:29
-msgid "all bookmarks"
-msgstr "alle Favoriten"
-
-#: ../../../search.inc.php:32
-msgid "for"
-msgstr "nach"
-
-#: ../../../search.php:59
-#: ../../../search.php:108
-msgid "Search Bookmarks"
-msgstr "Suche Favoriten"
-
-#: ../../../search.php:65
-msgid "Search Results"
-msgstr "Suche Resultate"
-
-#: ../../../tag2tagadd.php:44
-msgid "Tag link created"
-msgstr "Der Weblink für das Schlagwort wurde erfolgreich kreiert."
-
-#: ../../../tag2tagadd.php:47
-msgid "Failed to create the link"
-msgstr "Leider wurde der Weblink für das Schlagwort nicht kreiert."
-
-#: ../../../tag2tagadd.php:58
-msgid "Add Tag Link"
-msgstr "Eine Verbindung für das Schlagwort addieren"
-
-#: ../../../tag2tagdelete.php:43
-#: ../../../tag2tagedit.php:43
-msgid "Tag link deleted"
-msgstr "Der Weblink für das Schlagwort wurde erfolgreich gelöscht."
-
-#: ../../../tag2tagdelete.php:46
-#: ../../../tag2tagedit.php:46
-msgid "Failed to delete the link"
-msgstr "Leider ist das Löschen des Weblinks fehlgeschlagen."
-
-#: ../../../tag2tagdelete.php:58
-msgid "Delete Link Between Tags"
-msgstr "Eine Verbindung zwischen Schlagwörtern löschen"
-
-#: ../../../tag2tagedit.php:58
-msgid "Edit Link Between Tags"
-msgstr "Einen Weblink zwischen Schlagwörtern editieren."
-
-#: ../../../tagcommondescriptionedit.php:45
-msgid "Tag common description updated"
-msgstr "Die gemeinsame Deskription des Schlagwortes wurde erfolgreich aktualisiert."
-
-#: ../../../tagcommondescriptionedit.php:48
-msgid "Failed to update the tag common description"
-msgstr "Leider ist die gemeinsame Deskription des Schlagwortes fehlgeschlagen."
-
-#: ../../../tagcommondescriptionedit.php:55
-#: ../../../templates/sidebar.block.tagactions.php:27
-msgid "Edit Tag Common Description"
-msgstr "Die gemeinsame Deskription des Schlagwortes editieren."
-
-#: ../../../tagdelete.php:33
-msgid "Tag deleted"
-msgstr "Das Schlagwort wurde erfolgreich gelöscht."
-
-#: ../../../tagdelete.php:36
-msgid "Failed to delete the tag"
-msgstr "Leider ist das Löschen des Schlagwortes fehlgeschlagen."
-
-#: ../../../tagdelete.php:44
-#: ../../../templates/sidebar.block.tagactions.php:23
-msgid "Delete Tag"
-msgstr "Das Schlagwort löschen."
-
-#: ../../../tagedit.php:44
-msgid "Tag description updated"
-msgstr "Die Deskription des Favoriten wurde erfolgreich aktualisiert."
-
-#: ../../../tagedit.php:47
-msgid "Failed to update the tag description"
-msgstr "Leider ist die Deskription des Schlagwortes fehlgeschlagen."
-
-#: ../../../tagedit.php:54
-#: ../../../templates/sidebar.block.tagactions.php:25
-msgid "Edit Tag Description"
-msgstr "Die Deskription des Schlagwortes editieren."
-
-#: ../../../tagrename.php:50
-msgid "Tag renamed"
-msgstr "Das Schlagwort wurde erfolgreich umbenannt."
-
-#: ../../../tagrename.php:54
-msgid "Failed to rename the tag"
-msgstr "Leider ist die Umbenennung des Schlagwortes fehlgeschlagen."
-
-#: ../../../tagrename.php:61
-#: ../../../templates/sidebar.block.tagactions.php:10
-msgid "Rename Tag"
-msgstr "Das Schlagwort umbenennen."
-
-#: ../../../tags.php:38
-#: ../../../templates/editbookmark.tpl.php:44
-#: ../../../templates/toolbar.inc.php:11
-msgid "Tags"
-msgstr "Schlagwörter"
-
-#: ../../../users.php:33
-msgid "Users"
-msgstr "Benutzer/innen"
-
-#: ../../../watch.php:46
-msgid "User removed from your watchlist"
-msgstr "Der/die Benutzer/in wurde aus Ihrer Beobachtungsliste entfernt."
-
-#: ../../../watch.php:48
-msgid "User added to your watchlist"
-msgstr "Der/die Benutzer/in wurde zu Ihrer Beobachtungsliste addiert."
-
-#: ../../../watchlist.php:103
-msgid "My Watchlist"
-msgstr "Meine Beobachtungsliste"
-
-#: ../../../watchlist.php:105
-#: ../../../templates/toolbar.inc.php:12
-msgid "Watchlist"
-msgstr "Beobachtungsliste"
-
-#: ../../../templates/about.tpl.php:6
-msgid "<strong>Store</strong> all your favourite links in one place, accessible from anywhere."
-msgstr "<strong>Speichern</ strong> Sie Ihre sämtlichen Favoriten an einem Ort, von überall zugänglich."
-
-#: ../../../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>Teilen</ strong> Sie Ihre Favoriten zugänglich für alle Anderen, mit Freunden/innen in Ihrer Beobachtungsliste oder einfach privat für Sie persönlich."
-
-#: ../../../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>Kategorisieren</ strong> Sie Ihre Favoriten mittels unbegrenzten Schlagwörtern, anstatt Sie in unübersichtlichen Ordnern zu speichern."
-
-#: ../../../templates/about.tpl.php:9
-msgid "Register now"
-msgstr "Registrieren Sie sich jetzt!"
-
-#: ../../../templates/about.tpl.php:9
-#, php-format
-msgid " to start using %s!"
-msgstr "um %s zu nutzen!"
-
-#: ../../../templates/about.tpl.php:12
-msgid "Geek Stuff"
-msgstr "Softwareinformationen"
-
-#: ../../../templates/about.tpl.php:14
-msgid "is licensed under the "
-msgstr "ist lizenziert unter der"
-
-#: ../../../templates/about.tpl.php:14
-msgid "you can freely host it on your own web server."
-msgstr "Sie können es selbst frei auf Ihrem Webserver oder Webspace installieren"
-
-#: ../../../templates/about.tpl.php:15
-#, php-format
-msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 unterstützt die meisten der <a href=\"http://www.delicious.com/help/api\">del.icio.us <abbr title=\"Application Programmierung Interface\">-API </ abbr> </ a>. Fast alle netten Tools, die für dieses System kreiert wurden, können für %1$s geändert und adaptiert werden. Wenn Sie eine Applikation finden, deren API-Adresse Sie nicht einfach ändern können, so fragen Sie doch einfach bei dem/der Entwickler/in nach, um dies zu adaptieren bzw. zu addieren. Man kann nie wissen, eventuell werden jene dies einfach bewerkstelligen."
-
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:15
-#: ../../../templates/bookmarks.tpl.php:67
-#: ../../../templates/editbookmark.tpl.php:34
-msgid "Title"
-msgstr "Titel"
-
-#: ../../../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
-msgid "Description"
-msgstr "Deskription"
-
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:28
-#: ../../../templates/tagcommondescriptionedit.tpl.php:21
-msgid "Last modification:"
-msgstr "Letzte Änderung:"
-
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:39
-#: ../../../templates/tagcommondescriptionedit.tpl.php:32
-#: ../../../templates/tagedit.tpl.php:19
-msgid "Update"
-msgstr "Aktualisieren"
-
-#: ../../../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
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: ../../../templates/bookmarks.tpl.php:34
-#: ../../../templates/bookmarks.tpl.php:37
-msgid "edit common description"
-msgstr "Die gemeinsame Deskription editieren."
-
-#: ../../../templates/bookmarks.tpl.php:64
-msgid "bookmark(s)"
-msgstr "Favorit(en)"
-
-#: ../../../templates/bookmarks.tpl.php:65
-#: ../../../templates/tags.tpl.php:10
-#: ../../../templates/users.tpl.php:8
-msgid "Sort by:"
-msgstr "Sortieren nach:"
-
-#: ../../../templates/bookmarks.tpl.php:66
-msgid "Date"
-msgstr "Datum"
-
-#: ../../../templates/bookmarks.tpl.php:71
-msgid "URL"
-msgstr "URL"
-
-#: ../../../templates/bookmarks.tpl.php:81
-msgid "Bookmarks from other users for this tag"
-msgstr "Favoriten anderer Benutzer/innen"
-
-#: ../../../templates/bookmarks.tpl.php:86
-msgid "Only your bookmarks for this tag"
-msgstr "nur meine Favoriten"
-
-#: ../../../templates/bookmarks.tpl.php:129
-msgid "Edit"
-msgstr "Editieren"
-
-#: ../../../templates/bookmarks.tpl.php:129
-msgid "Delete"
-msgstr "Löschen"
-
-#: ../../../templates/bookmarks.tpl.php:135
-msgid "by"
-msgstr "von"
-
-#: ../../../templates/bookmarks.tpl.php:147
-#, php-format
-msgid " and %s1 other%s"
-msgstr " und %s1 anderen Person%s"
-
-#: ../../../templates/bookmarks.tpl.php:150
-#, php-format
-msgid " and %2$s%1$s others%3$s"
-msgstr " und %2$s%1$s anderer Person%3$s"
-
-#: ../../../templates/bookmarks.tpl.php:159
-msgid "Copy"
-msgstr "Kopieren"
-
-#: ../../../templates/bookmarks.tpl.php:218
-#: ../../../templates/bookmarks.tpl.php:224
-msgid "First"
-msgstr "neueste Favoriten"
-
-#: ../../../templates/bookmarks.tpl.php:219
-#: ../../../templates/bookmarks.tpl.php:225
-msgid "Previous"
-msgstr "neuere Favoriten"
-
-#: ../../../templates/bookmarks.tpl.php:232
-#: ../../../templates/bookmarks.tpl.php:235
-msgid "Next"
-msgstr "ältere Favoriten"
-
-#: ../../../templates/bookmarks.tpl.php:233
-#: ../../../templates/bookmarks.tpl.php:236
-msgid "Last"
-msgstr "älteste Favoriten"
-
-#: ../../../templates/bookmarks.tpl.php:246
-#, php-format
-msgid "Page %d of %d"
-msgstr "Seite %d von %d"
-
-#: ../../../templates/bookmarks.tpl.php:252
-msgid "No bookmarks available"
-msgstr "Leider sind keine Favoriten vorhanden."
-
-#: ../../../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
-msgid "bookmark"
-msgstr "Favoriten"
-
-#: ../../../templates/editbookmark.tpl.php:29
-msgid "Address"
-msgstr "Webadresse"
-
-#: ../../../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
-msgid "Required"
-msgstr "Erforderlich"
-
-#: ../../../templates/editbookmark.tpl.php:46
-msgid "Comma-separated"
-msgstr "durch Komma separiert"
-
-#: ../../../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 "Anmerkung: verwenden Sie \">\" um ein Schlagwort in ein hierarchisch höheres Schlagwort zu integrieren (z.B.: Europa>Frankreich>Paris)"
-
-#: ../../../templates/editbookmark.tpl.php:54
-#: ../../../templates/tag2tagadd.tpl.php:8
-msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry"
-msgstr "Anmerkung: verwenden Sie \"=\" um ein Synonym für ein Schlagwort zu integrieren (z.B.: Frankreich=französisches Land)"
-
-#: ../../../templates/editbookmark.tpl.php:57
-#: ../../../templates/importDelicious.tpl.php:15
-#: ../../../templates/importNetscape.tpl.php:16
-msgid "Privacy"
-msgstr "Status"
-
-#: ../../../templates/editbookmark.tpl.php:60
-#: ../../../templates/importDelicious.tpl.php:18
-#: ../../../templates/importNetscape.tpl.php:19
-msgid "Public"
-msgstr "Öffentlich"
-
-#: ../../../templates/editbookmark.tpl.php:61
-msgid "Shared with Watch List"
-msgstr "Beobachtungsliste"
-
-#: ../../../templates/editbookmark.tpl.php:62
-#: ../../../templates/importDelicious.tpl.php:20
-#: ../../../templates/importNetscape.tpl.php:21
-msgid "Private"
-msgstr "Privat"
-
-#: ../../../templates/editbookmark.tpl.php:74
-msgid "Delete Bookmark"
-msgstr "Favoriten löschen"
-
-#: ../../../templates/editbookmark.tpl.php:101
-msgid "Bookmarklet"
-msgstr "Bookmarklet"
-
-#: ../../../templates/editbookmark.tpl.php:102
-#, 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 "Inkludieren Sie eine der nachfolgenden Bookmarklets in die Favoritenliste Ihres persönlichen Webbrowsers, um jederzeit auf unkomplizierte Art und Weise einen neue Favoriten auf %s zu addieren"
-
-#: ../../../templates/editbookmark.tpl.php:114
-#, php-format
-msgid "Post to %s"
-msgstr "Die Favoriten mittels %s addieren."
-
-#: ../../../templates/editbookmark.tpl.php:115
-#, php-format
-msgid "Post to %s (Pop-up)"
-msgstr "Die Favoriten mittels %s und einem Pop-up-Fenster addieren."
-
-#: ../../../templates/editbookmark.tpl.php:119
-#: ../../../templates/importDelicious.tpl.php:26
-#: ../../../templates/importNetscape.tpl.php:27
-msgid "Import"
-msgstr "Importieren"
-
-#: ../../../templates/editbookmark.tpl.php:121
-msgid "Import bookmarks from bookmark file"
-msgstr "Die Favoriten aus einer Favoritendatei importieren."
-
-#: ../../../templates/editbookmark.tpl.php:121
-msgid "Internet Explorer, Mozilla Firefox and Netscape"
-msgstr "Microsoft Internet Explorer, Mozilla Firefox und Netscape"
-
-#: ../../../templates/editbookmark.tpl.php:122
-msgid "Import bookmarks from del.icio.us"
-msgstr "Die Favoriten aus del.icio.us importieren."
-
-#: ../../../templates/editprofile.tpl.php:9
-msgid "Account Details"
-msgstr "Kontodetails"
-
-#: ../../../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
-msgid "Username"
-msgstr "Benutzername"
-
-#: ../../../templates/editprofile.tpl.php:18
-msgid "New Password"
-msgstr "Neues Passwort"
-
-#: ../../../templates/editprofile.tpl.php:23
-msgid "Confirm Password"
-msgstr "Passwort verifizieren"
-
-#: ../../../templates/editprofile.tpl.php:28
-#: ../../../templates/password.tpl.php:14
-#: ../../../templates/register.tpl.php:26
-msgid "E-mail"
-msgstr "E-Mail"
-
-#: ../../../templates/editprofile.tpl.php:34
-msgid "Personal Details"
-msgstr "Persönliche Details"
-
-#: ../../../templates/editprofile.tpl.php:38
-#: ../../../templates/profile.tpl.php:12
-msgid "Name"
-msgstr "Name"
-
-#: ../../../templates/editprofile.tpl.php:42
-#: ../../../templates/profile.tpl.php:18
-msgid "Homepage"
-msgstr "Homepage"
-
-#: ../../../templates/editprofile.tpl.php:54
-#: ../../../templates/sidebar.block.tagactions.php:18
-#: ../../../templates/sidebar.block.watchstatus.php:17
-msgid "Actions"
-msgstr "Aktionen"
-
-#: ../../../templates/editprofile.tpl.php:57
-msgid "Export bookmarks"
-msgstr "Favoriten exportieren"
-
-#: ../../../templates/editprofile.tpl.php:59
-msgid "HTML file (for browsers)"
-msgstr "HTML - Datei (für Webbrowser)"
-
-#: ../../../templates/editprofile.tpl.php:60
-msgid "XML file (like del.icio.us)"
-msgstr "XML - Datei (für del.icio.us etc.)"
-
-#: ../../../templates/error.404.tpl.php:5
-msgid "Not Found"
-msgstr "Leider nicht gefunden!"
-
-#: ../../../templates/error.404.tpl.php:6
-msgid "The requested URL was not found on this server"
-msgstr "Leider wurde die angeforderte URL auf diesem Server nicht gefunden."
-
-#: ../../../templates/error.500.tpl.php:5
-msgid "General server error"
-msgstr "Allgemeiner Serverfehler"
-
-#: ../../../templates/error.500.tpl.php:6
-msgid "The requested URL could not be processed"
-msgstr "Leider konnte die angeforderte URL nicht verarbeitet werden."
-
-#: ../../../templates/importDelicious.tpl.php:19
-#: ../../../templates/importNetscape.tpl.php:20
-msgid "Shared with Watchlist"
-msgstr "Beobachtungsliste"
-
-#: ../../../templates/importDelicious.tpl.php:31
-#: ../../../templates/importNetscape.tpl.php:32
-msgid "Instructions"
-msgstr "Instruktionen"
-
-#: ../../../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 "Melden Sie sich <a href=\"http://del.icio.us/api/posts/all\">hier</a> bei del.icio.us an, um Ihre Favoriten zu exportieren"
-
-#: ../../../templates/importDelicious.tpl.php:34
-msgid "Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> file to your computer"
-msgstr "Speichern Sie die resultierende <abbr title=\"Extensible Markup Language\">XML</abbr>- Datei lokal auf Ihrem Computer"
-
-#: ../../../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 "Klicken Sie auf <kbd>Durchsuchen...</kbd> um die bereits gespeicherte Favoritendatei auf Ihrem Computer zu lokalisieren und auszuwählen. Die maximale Dateigröße darf 1 MB betragen"
-
-#: ../../../templates/importDelicious.tpl.php:36
-#: ../../../templates/importNetscape.tpl.php:43
-msgid "Select the default privacy setting for your imported bookmarks"
-msgstr "Wählen Sie die Standardeinstellung der Privatsphäre für Ihre zu importierenden Favoriten"
-
-#: ../../../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 "Klicken Sie auf <kbd>Importieren</kbd> um die bereits lokal gespeicherte Favoritendatei zu importieren. Dieser Prozess kann bis zu einer Minute andauern"
-
-#: ../../../templates/importNetscape.tpl.php:35
-msgid "Export your bookmarks from your browser to a file"
-msgstr "Exportieren Sie Ihre Favoriten aus dem Webbrowser in eine Datei"
-
-#: ../../../templates/importNetscape.tpl.php:37
-msgid "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
-msgstr "Microsoft Internet Explorer: <kbd>Datei  &gt; Importieren und Exportieren...  &gt; Favoriten exportieren"
-
-#: ../../../templates/importNetscape.tpl.php:38
-msgid "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; Export..."
-msgstr "Mozilla Firefox: <kbd>Favoriten  &gt; Favoriten verwalten... &gt; Datei &gt; Exportieren..."
-
-#: ../../../templates/importNetscape.tpl.php:39
-msgid "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
-msgstr "Netscape: <kbd>Favoriten &gt; Favoriten verwalten... &gt; Werkzeuge &gt; Exportieren..."
-
-#: ../../../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 "Klicken Sie auf <kbd>Durchsuchen...</kbd> um die bereits gespeicherte Favoritendatei auf Ihrem Computer zu lokalisieren und auszuwählen. Die maximale Dateigröße darf 1 MB betragen"
-
-#: ../../../templates/login.tpl.php:20
-#: ../../../templates/register.tpl.php:21
-msgid "Password"
-msgstr "Passwort"
-
-#: ../../../templates/login.tpl.php:22
-msgid "Don't ask for my password for 2 weeks"
-msgstr "Zwei Wochen nicht nach meinem Passwort fragen"
-
-#: ../../../templates/login.tpl.php:30
-msgid "Forgotten your password?"
-msgstr "Haben Sie Ihr Passwort vergessen?"
-
-#: ../../../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 "Sofern Sie Ihr Passwort vergessen haben, können Sie nun durch %s ein neues Passwort generieren lassen. Geben Sie zur Verifizierung Ihren Benutzernamen und Ihre E-Mail Adresse Ihres Accounts ein. In Kürze erhalten Sie ein neues Passwort. Verwenden Sie dieses Passwort, um sich erfolgreich anzumelden."
-
-#: ../../../templates/password.tpl.php:19
-msgid "Generate Password"
-msgstr "Passwort generieren"
-
-#: ../../../templates/profile.tpl.php:23
-msgid "Member Since"
-msgstr "Mitglied seit"
-
-#: ../../../templates/profile.tpl.php:35
-#: ../../../templates/sidebar.block.watchlist.php:8
-msgid "Watching"
-msgstr "Beobachten"
-
-#: ../../../templates/profile.tpl.php:50
-msgid "Watched By"
-msgstr "Beobachtet von"
-
-#: ../../../templates/profile.tpl.php:63
-#: ../../../templates/toolbar.inc.php:10
-msgid "Bookmarks"
-msgstr "Favoriten"
-
-#: ../../../templates/profile.tpl.php:64
-msgid "Go to bookmarks"
-msgstr "Die Favoriten betrachten."
-
-#: ../../../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 "Registrieren Sie sich hier für ein kostenloses %s Konto. Alle unten angeforderten Informationen sind für die Registrierung erforderlich"
-
-#: ../../../templates/register.tpl.php:33
-msgid "Antispam question"
-msgstr "Sicherheitsfrage"
-
-#: ../../../templates/sidebar.block.linked.php:41
-msgid "Linked Tags"
-msgstr "Ausgewählte Schlagwörter"
-
-#: ../../../templates/sidebar.block.linked.php:55
-#: ../../../templates/sidebar.block.menu.php:40
-msgid "Add new link"
-msgstr "Einen neuen Navigationslink addieren."
-
-#: ../../../templates/sidebar.block.linked.php:56
-#: ../../../templates/sidebar.block.menu.php:41
-msgid "Delete link"
-msgstr "Einen Navigationslink löschen."
-
-#: ../../../templates/sidebar.block.menu.php:29
-#, php-format
-msgid "Tags included into the tag '%s'"
-msgstr "In der Navigation inkludierte, spezielle Schlagwörter mittels dem Schlagwort '%s'."
-
-#: ../../../templates/sidebar.block.menu.php:29
-msgid "Menu Tags"
-msgstr "Spezielle Schlagwörter"
-
-#: ../../../templates/sidebar.block.menu.php:62
-msgid "See all your tags"
-msgstr "Betrachten Sie Ihre sämtlichen Schlagwörter."
-
-#: ../../../templates/sidebar.block.menu.php:62
-msgid "all your tags"
-msgstr "Ihre sämtlichen Schlagwörter."
-
-#: ../../../templates/sidebar.block.menu.php:64
-msgid "See all tags from this user"
-msgstr "Betrachten Sie sämtliche Schlagwörter dieses/r Benutzers/in."
-
-#: ../../../templates/sidebar.block.menu.php:64
-msgid "all tags from this user"
-msgstr "Sämtliche Schlagwörter dieses/r Benutzers/in."
-
-#: ../../../templates/sidebar.block.menu.php:68
-msgid "See popular tags"
-msgstr "Betrachten Sie populäre Schlagwörter."
-
-#: ../../../templates/sidebar.block.recent.php:15
-msgid "Recent Tags"
-msgstr "Neueste Schlagwörter"
-
-#: ../../../templates/sidebar.block.related.php:17
-msgid "Related Tags"
-msgstr "Verwandte Schlagwörter"
-
-#: ../../../templates/sidebar.block.search.php:15
-msgid "Last Searches"
-msgstr "Neueste Suchbegriffe"
-
-#: ../../../templates/sidebar.block.search.php:24
-msgid "Number of bookmarks for this query"
-msgstr "Die Anzahl der Favoriten für diese Anfrage."
-
-#: ../../../templates/sidebar.block.tagactions.php:29
-msgid "Create a link to another tag"
-msgstr "Eine Verbindung zwischen Schlagwörtern kreieren."
-
-#: ../../../templates/sidebar.block.users.php:13
-msgid "Last Users"
-msgstr "Neueste Benutzer/innen"
-
-#: ../../../templates/sidebar.block.users.php:22
-#: ../../../templates/users.tpl.php:17
-msgid "bookmarks"
-msgstr "Favoriten"
-
-#: ../../../templates/sidebar.block.users.php:29
-msgid "See all users"
-msgstr "Betrachten Sie sämtliche Benutzer/innen."
-
-#: ../../../templates/sidebar.block.users.php:29
-msgid "All users"
-msgstr "Alle Benutzer/innen"
-
-#: ../../../templates/sidebar.block.watchstatus.php:10
-msgid "Remove from Watchlist"
-msgstr "Aus der Beobachtungsliste löschen."
-
-#: ../../../templates/sidebar.block.watchstatus.php:12
-msgid "Add to Watchlist"
-msgstr "Zur Beobachtungsliste addieren."
-
-#: ../../../templates/sidebar.linkedtags.inc.php:18
-msgid "Edit link"
-msgstr "Den Weblink editieren."
-
-#: ../../../templates/sidebar.linkedtags.inc.php:45
-msgid "Synonyms:"
-msgstr "Synonyme:"
-
-#: ../../../templates/tag2tagadd.tpl.php:12
-msgid "Create new link:"
-msgstr "Eine neue Verbindung kreieren:"
-
-#: ../../../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 "Anmerkung: inkludieren Sie ein Schlagwort in das '%s' Schlagwort (z.B.: %s>Länder), so erscheint jenes Schlagwort in der Navigationsbox."
-
-#: ../../../templates/tag2tagadd.tpl.php:23
-#: ../../../templates/tag2tagedit.tpl.php:37
-msgid "Create"
-msgstr "Kreieren"
-
-#: ../../../templates/tag2tagadd.tpl.php:35
-#: ../../../templates/tag2tagdelete.tpl.php:27
-#: ../../../templates/tag2tagedit.tpl.php:51
-msgid "Existing links:"
-msgstr "Bereits bestehende Navigationslinks:"
-
-#: ../../../templates/tag2tagadd.tpl.php:53
-#: ../../../templates/tag2tagdelete.tpl.php:45
-#: ../../../templates/tag2tagedit.tpl.php:69
-msgid "No links"
-msgstr "Leider derzeit keine Weblinks."
-
-#: ../../../templates/tag2tagedit.tpl.php:6
-msgid "Delete the link"
-msgstr "Den Weblink löschen."
-
-#: ../../../templates/tag2tagedit.tpl.php:29
-msgid "Create new link"
-msgstr "Einen neuen Weblink kreieren."
-
-#: ../../../templates/tagrename.tpl.php:12
-msgid "Old"
-msgstr "Alt"
-
-#: ../../../templates/tagrename.tpl.php:17
-msgid "New"
-msgstr "Neu"
-
-#: ../../../templates/tagrename.tpl.php:24
-msgid "Rename"
-msgstr "Umbenennen"
-
-#: ../../../templates/tags.tpl.php:11
-#: ../../../templates/users.tpl.php:9
-msgid "Alphabet"
-msgstr "Alphabet"
-
-#: ../../../templates/tags.tpl.php:12
-#: ../../../templates/users.tpl.php:10
-msgid "Popularity"
-msgstr "Popularität"
-
-#: ../../../templates/toolbar.inc.php:15
-msgid "Log Out"
-msgstr "Abmelden"
-
-#: ../../../templates/users.tpl.php:17
-msgid "profile"
-msgstr "Profil"
-
-#: ../../../templates/users.tpl.php:17
-msgid "created in"
-msgstr "erstellt in"
-
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: SemanticScuttle\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-20 13:58+0100\n"
+"PO-Revision-Date: 2008-11-18 18:46+0100\n"
+"Last-Translator: Elmar H. Beer <info@ehb-world.com>\n"
+"Language-Team: de-AT <info@ehb-world.com>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: German\n"
+"X-Poedit-Country: AUSTRIA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/SemanticScuttle/functions.php:189
+msgid "message_die() was called multiple times."
+msgstr "Die Zeile message_die() wurde öfters aufgerufen."
+
+#: src/SemanticScuttle/functions.php:201
+msgid "SQL Error"
+msgstr "SQL - Fehler"
+
+#: src/SemanticScuttle/functions.php:207
+msgid "Line"
+msgstr "Zeile"
+
+#: src/SemanticScuttle/functions.php:207
+#: data/templates/default/importDelicious.tpl.php:8
+#: data/templates/default/importNetscape.tpl.php:9
+#: data/templates/default/importStructure.tpl.php:10
+msgid "File"
+msgstr "Datei"
+
+#: src/SemanticScuttle/functions.php:215
+msgid "Information"
+msgstr "Information"
+
+#: src/SemanticScuttle/functions.php:220
+msgid "Critical Information"
+msgstr "Kritische Information"
+
+#: src/SemanticScuttle/functions.php:225
+msgid "An error occured"
+msgstr "Leider ist ein Fehler aufgetreten."
+
+#: src/SemanticScuttle/functions.php:228
+msgid "General Error"
+msgstr "Allgemeiner Fehler"
+
+#: src/SemanticScuttle/functions.php:236
+msgid "An critical error occured"
+msgstr "Leider ist ein kritischer Fehler aufgetreten."
+
+#: src/SemanticScuttle/functions.php:239
+msgid "Critical Error"
+msgstr "Kritischer Fehler"
+
+#: src/SemanticScuttle/functions.php:248
+msgid "DEBUG MODE"
+msgstr "Debugmodus"
+
+#: data/templates/default/about.tpl.php:6
+msgid ""
+"<strong>Store</strong> all your favourite links in one place, accessible "
+"from anywhere."
+msgstr ""
+"<strong>Speichern</ strong> Sie Ihre sämtlichen Favoriten an einem Ort, von "
+"überall zugänglich."
+
+#: data/templates/default/about.tpl.php:7
+msgid ""
+"<strong>Share</strong> your bookmarks with everyone, with friends on your "
+"watchlist or just keep them private."
+msgstr ""
+"<strong>Teilen</ strong> Sie Ihre Favoriten zugänglich für alle Anderen, mit "
+"Freunden/innen in Ihrer Beobachtungsliste oder einfach privat für Sie "
+"persönlich."
+
+#: data/templates/default/about.tpl.php:8
+msgid ""
+"<strong>Tag</strong> your bookmarks with as many labels as you want, instead "
+"of wrestling with folders."
+msgstr ""
+"<strong>Kategorisieren</ strong> Sie Ihre Favoriten mittels unbegrenzten "
+"Schlagwörtern, anstatt Sie in unübersichtlichen Ordnern zu speichern."
+
+#: data/templates/default/about.tpl.php:9
+msgid "Register now"
+msgstr "Registrieren Sie sich jetzt!"
+
+#: data/templates/default/about.tpl.php:9
+#, php-format
+msgid " to start using %s!"
+msgstr "um %s zu nutzen!"
+
+#: data/templates/default/about.tpl.php:12
+msgid "Geek Stuff"
+msgstr "Softwareinformationen"
+
+#: data/templates/default/about.tpl.php:14
+msgid "is licensed under the "
+msgstr "ist lizenziert unter der"
+
+#: data/templates/default/about.tpl.php:14
+msgid "you can freely host it on your own web server."
+msgstr ""
+"Sie können es selbst frei auf Ihrem Webserver oder Webspace installieren"
+
+#: data/templates/default/about.tpl.php:15
+#, php-format
+msgid ""
+"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 unterstützt die meisten der <a href=\"http://www.delicious.com/help/api"
+"\">del.icio.us <abbr title=\"Application Programmierung Interface\">-API </ "
+"abbr> </ a>. Fast alle netten Tools, die für dieses System kreiert wurden, "
+"können für %1$s geändert und adaptiert werden. Wenn Sie eine Applikation "
+"finden, deren API-Adresse Sie nicht einfach ändern können, so fragen Sie "
+"doch einfach bei dem/der Entwickler/in nach, um dies zu adaptieren bzw. zu "
+"addieren. Man kann nie wissen, eventuell werden jene dies einfach "
+"bewerkstelligen."
+
+#: data/templates/default/about.tpl.php:24
+msgid "Tips"
+msgstr ""
+
+#: data/templates/default/about.tpl.php:26
+msgid "Add search plugin into your browser:"
+msgstr ""
+
+#: data/templates/default/about.tpl.php:27
+msgid ""
+"The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
+msgstr ""
+
+#: data/templates/default/about.tpl.php:28
+msgid ""
+"The secret tag \"system:imported\" allows you to find imported bookmarks."
+msgstr ""
+
+#: data/templates/default/admin.tpl.php:5
+#, fuzzy
+msgid "Users management"
+msgstr "Benutzername"
+
+#: data/templates/default/admin.tpl.php:14
+msgid "Public/Shared/Private"
+msgstr ""
+
+#: data/templates/default/admin.tpl.php:14
+#: data/templates/default/bookmarks.tpl.php:115
+msgid "bookmark(s)"
+msgstr "Favorit(en)"
+
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/tag2tagadd.tpl.php:21
+#: data/templates/default/tag2tagdelete.tpl.php:13
+#: data/templates/default/tag2tagedit.tpl.php:14
+#: data/templates/default/tag2tagedit.tpl.php:35
+#: data/templates/default/tagdelete.tpl.php:6 www/jsScuttle.php:24
+msgid "Are you sure?"
+msgstr "Sind Sie sicher?"
+
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/bookmarks.tpl.php:305
+msgid "Delete"
+msgstr "Löschen"
+
+#: data/templates/default/admin.tpl.php:27
+#, fuzzy
+msgid "Other actions"
+msgstr "Instruktionen"
+
+#: data/templates/default/admin.tpl.php:29
+msgid "Check all URLs (May take some time)"
+msgstr ""
+
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:16
+msgid ""
+"Collaborative description: these fields can be viewed and modified by every "
+"users"
+msgstr ""
+
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:18
+#: data/templates/default/bookmarks.tpl.php:159
+#: data/templates/default/editbookmark.tpl.php:51
+msgid "Title"
+msgstr "Titel"
+
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:23
+#: data/templates/default/editbookmark.tpl.php:57
+#: data/templates/default/editprofile.tpl.php:53
+#: data/templates/default/profile.tpl.php:33
+#: data/templates/default/tagcommondescriptionedit.tpl.php:13
+#: data/templates/default/tagedit.tpl.php:12
+msgid "Description"
+msgstr "Deskription"
+
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:31
+#: data/templates/default/tagcommondescriptionedit.tpl.php:21
+msgid "Last modification:"
+msgstr "Letzte Änderung:"
+
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:43
+#: data/templates/default/tagcommondescriptionedit.tpl.php:33
+#: data/templates/default/tagedit.tpl.php:18
+msgid "Update"
+msgstr "Aktualisieren"
+
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:44
+#: data/templates/default/editbookmark.tpl.php:111
+#: data/templates/default/tag2tagadd.tpl.php:24
+#: data/templates/default/tag2tagedit.tpl.php:38
+#: data/templates/default/tagcommondescriptionedit.tpl.php:34
+#: data/templates/default/tagedit.tpl.php:19
+#: data/templates/default/tagrename.tpl.php:25
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: data/templates/default/bookmarklet.inc.php:1
+msgid "Bookmarklet"
+msgstr "Bookmarklet"
+
+#: data/templates/default/bookmarklet.inc.php:11
+#, 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 ""
+"Inkludieren Sie eine der nachfolgenden Bookmarklets in die Favoritenliste "
+"Ihres persönlichen Webbrowsers, um jederzeit auf unkomplizierte Art und "
+"Weise einen neue Favoriten auf %s zu addieren"
+
+#: data/templates/default/bookmarklet.inc.php:20
+#, 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 ""
+"Inkludieren Sie eine der nachfolgenden Bookmarklets in die Favoritenliste "
+"Ihres persönlichen Webbrowsers, um jederzeit auf unkomplizierte Art und "
+"Weise einen neue Favoriten auf %s zu addieren"
+
+#: data/templates/default/bookmarklet.inc.php:67
+#: data/templates/default/bookmarklet.inc.php:100
+#, php-format
+msgid "Post to %s"
+msgstr "Die Favoriten mittels %s addieren."
+
+#: data/templates/default/bookmarklet.inc.php:93
+#: data/templates/default/bookmarklet.inc.php:110
+#, php-format
+msgid "Post to %s (Pop-up)"
+msgstr "Die Favoriten mittels %s und einem Pop-up-Fenster addieren."
+
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:24
+#, php-format
+msgid "Voting <span class=\"voting\">%d</span>"
+msgstr ""
+
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:32
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:35
+msgid "Vote for"
+msgstr ""
+
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:43
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:46
+msgid "Vote against"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:43
+msgid "Bookmarks on this page are managed by an admin user."
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:73
+#: data/templates/default/bookmarks.tpl.php:74
+#, fuzzy
+msgid "Edit the common description of this tag"
+msgstr "Die gemeinsame Deskription editieren."
+
+#: data/templates/default/bookmarks.tpl.php:77
+#: data/templates/default/bookmarks.tpl.php:78
+#, fuzzy
+msgid "Edit the common description of this bookmark"
+msgstr "Die gemeinsame Deskription editieren."
+
+#: data/templates/default/bookmarks.tpl.php:98
+#: data/templates/default/bookmarks.tpl.php:99
+msgid "Edit your personal description of this tag"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:115
+#: data/templates/default/tags.tpl.php:10
+#: data/templates/default/users.tpl.php:8
+msgid "Sort by:"
+msgstr "Sortieren nach:"
+
+#: data/templates/default/bookmarks.tpl.php:157
+msgid "Date"
+msgstr "Datum"
+
+#: data/templates/default/bookmarks.tpl.php:162
+msgid "Voting"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:171
+msgid "Bookmarks from other users for this tag"
+msgstr "Favoriten anderer Benutzer/innen"
+
+#: data/templates/default/bookmarks.tpl.php:176
+msgid "Only your bookmarks for this tag"
+msgstr "nur meine Favoriten"
+
+#: data/templates/default/bookmarks.tpl.php:199
+#: data/templates/default/bookmarks.tpl.php:205
+msgid "First"
+msgstr "neueste Favoriten"
+
+#: data/templates/default/bookmarks.tpl.php:200
+#: data/templates/default/bookmarks.tpl.php:206
+msgid "Previous"
+msgstr "neuere Favoriten"
+
+#: data/templates/default/bookmarks.tpl.php:213
+#: data/templates/default/bookmarks.tpl.php:216
+msgid "Next"
+msgstr "ältere Favoriten"
+
+#: data/templates/default/bookmarks.tpl.php:214
+#: data/templates/default/bookmarks.tpl.php:217
+msgid "Last"
+msgstr "älteste Favoriten"
+
+#: data/templates/default/bookmarks.tpl.php:233
+#, php-format
+msgid "Page %d of %d"
+msgstr "Seite %d von %d"
+
+#: data/templates/default/bookmarks.tpl.php:295
+#, fuzzy
+msgid "Tags:"
+msgstr "Schlagwörter"
+
+#: data/templates/default/bookmarks.tpl.php:302
+msgid "Edit"
+msgstr "Editieren"
+
+#: data/templates/default/bookmarks.tpl.php:310
+msgid "Last update"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:313
+msgid "by"
+msgstr "von"
+
+#: data/templates/default/bookmarks.tpl.php:317
+msgid "you"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:333
+#, php-format
+msgid " and %s1 other%s"
+msgstr " und %s1 anderen Person%s"
+
+#: data/templates/default/bookmarks.tpl.php:336
+#, php-format
+msgid " and %2$s%1$s others%3$s"
+msgstr " und %2$s%1$s anderer Person%3$s"
+
+#: data/templates/default/bookmarks.tpl.php:350
+#, fuzzy
+msgid "Copy this bookmark to YOUR bookmarks."
+msgstr "Die Favoriten aus einer Favoritendatei importieren."
+
+#: data/templates/default/bookmarks.tpl.php:351
+msgid "Copy"
+msgstr "Kopieren"
+
+#: data/templates/default/bookmarks.tpl.php:376
+msgid "This bookmark is certified by an admin user."
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:430
+#, fuzzy
+msgid "Private Note on this bookmark"
+msgstr "Leider sind Sie nicht autorisiert diesen Favoriten zu editieren."
+
+#: data/templates/default/bookmarks.tpl.php:444
+msgid "Come back to the top of this page."
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:444
+msgid "Top of the page"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:450
+msgid "No bookmarks available"
+msgstr "Leider sind keine Favoriten vorhanden."
+
+#: data/templates/default/bottom.inc.php:5
+#: data/templates/default/toolbar.inc.php:15
+#: data/templates/default/toolbar.inc.php:28 www/about.php:23 www/about.php:24
+msgid "About"
+msgstr "Impressum"
+
+#: data/templates/default/bottom.inc.php:7
+msgid "Propulsed by "
+msgstr ""
+
+#: data/templates/default/dynamictags.inc.php:56
+#: data/templates/default/sidebar.block.common.php:19
+#: data/templates/default/sidebar.block.popular.php:34
+#: data/templates/default/sidebar.block.recent.php:29
+#: data/templates/default/tags.tpl.php:19
+#, fuzzy
+msgid "bookmark"
+msgid_plural "bookmarks"
+msgstr[0] "Favoriten"
+msgstr[1] "Favoriten"
+
+#: data/templates/default/dynamictags.inc.php:105
+#: data/templates/default/sidebar.block.common.php:9
+#: data/templates/default/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.popular.php:23
+#: data/templates/default/sidebar.block.recent.php:34
+#: data/templates/default/toolbar.inc.php:27 www/populartags.php:46
+msgid "Popular Tags"
+msgstr "Populäre Schlagwörter"
+
+#: data/templates/default/dynamictags.inc.php:108
+#, fuzzy
+msgid "Popular Tags From All Users"
+msgstr "Populäre Schlagwörter"
+
+#: data/templates/default/editbookmark.tpl.php:46
+msgid "Address"
+msgstr "Webadresse"
+
+#: data/templates/default/editbookmark.tpl.php:48
+#: data/templates/default/editbookmark.tpl.php:53
+#: data/templates/default/editprofile.tpl.php:29
+#: data/templates/default/tagrename.tpl.php:14
+#: data/templates/default/tagrename.tpl.php:19
+msgid "Required"
+msgstr "Erforderlich"
+
+#: data/templates/default/editbookmark.tpl.php:58
+msgid "Add Note"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:61
+msgid ""
+"You can use anchors to delimite attributes. for example: [publisher]blah[/"
+"publisher] "
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:64
+msgid "Suggested anchors: "
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:76
+#, fuzzy
+msgid "Private Note"
+msgstr "Privat"
+
+#: data/templates/default/editbookmark.tpl.php:78
+msgid "Just visible by you and your contacts."
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:82
+#: data/templates/default/toolbar.inc.php:10 www/tags.php:45 www/tags.php:67
+msgid "Tags"
+msgstr "Schlagwörter"
+
+#: data/templates/default/editbookmark.tpl.php:86
+msgid "Comma-separated"
+msgstr "durch Komma separiert"
+
+#: data/templates/default/editbookmark.tpl.php:90
+#: data/templates/default/tag2tagadd.tpl.php:9
+msgid ""
+"Note: use \">\" to include one tag in another. e.g.: europe>france>paris"
+msgstr ""
+"Anmerkung: verwenden Sie \">\" um ein Schlagwort in ein hierarchisch höheres "
+"Schlagwort zu integrieren (z.B.: Europa>Frankreich>Paris)"
+
+#: data/templates/default/editbookmark.tpl.php:94
+#: data/templates/default/tag2tagadd.tpl.php:8
+msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry"
+msgstr ""
+"Anmerkung: verwenden Sie \"=\" um ein Synonym für ein Schlagwort zu "
+"integrieren (z.B.: Frankreich=französisches Land)"
+
+#: data/templates/default/editbookmark.tpl.php:97
+#: data/templates/default/importDelicious.tpl.php:15
+#: data/templates/default/importNetscape.tpl.php:16
+msgid "Privacy"
+msgstr "Status"
+
+#: data/templates/default/editbookmark.tpl.php:100
+#: data/templates/default/importDelicious.tpl.php:18
+#: data/templates/default/importNetscape.tpl.php:19
+msgid "Public"
+msgstr "Öffentlich"
+
+#: data/templates/default/editbookmark.tpl.php:101
+msgid "Shared with Watch List"
+msgstr "Beobachtungsliste"
+
+#: data/templates/default/editbookmark.tpl.php:102
+#: data/templates/default/importDelicious.tpl.php:20
+#: data/templates/default/importNetscape.tpl.php:21
+msgid "Private"
+msgstr "Privat"
+
+#: data/templates/default/editbookmark.tpl.php:115
+msgid "Delete Bookmark"
+msgstr "Favoriten löschen"
+
+#: data/templates/default/editbookmark.tpl.php:120
+msgid "edit common description"
+msgstr "Die gemeinsame Deskription editieren."
+
+#: data/templates/default/editbookmark.tpl.php:212
+#: data/templates/default/importDelicious.tpl.php:26
+#: data/templates/default/importNetscape.tpl.php:27
+#: data/templates/default/importStructure.tpl.php:16
+msgid "Import"
+msgstr "Importieren"
+
+#: data/templates/default/editbookmark.tpl.php:214
+msgid "Import bookmarks from bookmark file"
+msgstr "Die Favoriten aus einer Favoritendatei importieren."
+
+#: data/templates/default/editbookmark.tpl.php:214
+msgid "Internet Explorer, Mozilla Firefox and Netscape"
+msgstr "Microsoft Internet Explorer, Mozilla Firefox und Netscape"
+
+#: data/templates/default/editbookmark.tpl.php:215
+msgid "Import bookmarks from del.icio.us"
+msgstr "Die Favoriten aus del.icio.us importieren."
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:11
+msgid "SSL client certificates"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:17
+msgid "Serial"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:45
+#: data/templates/default/profile.tpl.php:17
+msgid "Name"
+msgstr "Name"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:19
+#: data/templates/default/profile.tpl.php:11
+#, fuzzy
+msgid "Email"
+msgstr "E-Mail"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:20
+msgid "Issuer"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:30
+#, fuzzy
+msgid "delete"
+msgstr "Löschen"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:43
+msgid "No certificates registered"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:48
+msgid "Your current certificate is already registered with your account."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:53
+msgid "Register current certificate to automatically login."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:59
+msgid "Your browser does not provide a certificate."
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:8
+msgid "Account Details"
+msgstr "Kontodetails"
+
+#: data/templates/default/editprofile.tpl.php:12
+#: data/templates/default/login.tpl.php:21
+#: data/templates/default/password.tpl.php:10
+#: data/templates/default/profile.tpl.php:6
+#: data/templates/default/register.tpl.php:16
+msgid "Username"
+msgstr "Benutzername"
+
+#: data/templates/default/editprofile.tpl.php:17
+msgid "New Password"
+msgstr "Neues Passwort"
+
+#: data/templates/default/editprofile.tpl.php:22
+msgid "Confirm Password"
+msgstr "Passwort verifizieren"
+
+#: data/templates/default/editprofile.tpl.php:27
+#: data/templates/default/password.tpl.php:14
+#: data/templates/default/register.tpl.php:26
+msgid "E-mail"
+msgstr "E-Mail"
+
+#: data/templates/default/editprofile.tpl.php:32
+#, fuzzy
+msgid "Private RSS Feed"
+msgstr "Privat"
+
+#: data/templates/default/editprofile.tpl.php:34
+msgid "Enable"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:36
+#, fuzzy
+msgid "Generate New Key"
+msgstr "Passwort generieren"
+
+#: data/templates/default/editprofile.tpl.php:41
+msgid "Personal Details"
+msgstr "Persönliche Details"
+
+#: data/templates/default/editprofile.tpl.php:49
+#: data/templates/default/profile.tpl.php:23
+msgid "Homepage"
+msgstr "Homepage"
+
+#: data/templates/default/editprofile.tpl.php:58 www/edit.php:113
+msgid "Save Changes"
+msgstr "Änderungen speichern"
+
+#: data/templates/default/editprofile.tpl.php:63
+#: data/templates/default/sidebar.block.tagactions.php:17
+#: data/templates/default/sidebar.block.watchstatus.php:18
+msgid "Actions"
+msgstr "Aktionen"
+
+#: data/templates/default/editprofile.tpl.php:66
+msgid "Export bookmarks"
+msgstr "Favoriten exportieren"
+
+#: data/templates/default/editprofile.tpl.php:68
+msgid "HTML file (for browsers)"
+msgstr "HTML - Datei (für Webbrowser)"
+
+#: data/templates/default/editprofile.tpl.php:69
+msgid "XML file (like del.icio.us)"
+msgstr "XML - Datei (für del.icio.us etc.)"
+
+#: data/templates/default/editprofile.tpl.php:70
+msgid "CSV file (for spreadsheet tools)"
+msgstr ""
+
+#: data/templates/default/error.404.tpl.php:5
+msgid "Not Found"
+msgstr "Leider nicht gefunden!"
+
+#: data/templates/default/error.404.tpl.php:6
+msgid "The requested URL was not found on this server"
+msgstr "Leider wurde die angeforderte URL auf diesem Server nicht gefunden."
+
+#: data/templates/default/error.500.tpl.php:5
+msgid "General server error"
+msgstr "Allgemeiner Serverfehler"
+
+#: data/templates/default/error.500.tpl.php:6
+msgid "The requested URL could not be processed"
+msgstr "Leider konnte die angeforderte URL nicht verarbeitet werden."
+
+#: data/templates/default/importDelicious.tpl.php:19
+#: data/templates/default/importNetscape.tpl.php:20
+msgid "Shared with Watchlist"
+msgstr "Beobachtungsliste"
+
+#: data/templates/default/importDelicious.tpl.php:31
+#: data/templates/default/importNetscape.tpl.php:32
+#: data/templates/default/importStructure.tpl.php:21
+msgid "Instructions"
+msgstr "Instruktionen"
+
+#: data/templates/default/importDelicious.tpl.php:33
+#, fuzzy
+msgid ""
+"Log in to the <a href=\"https://api.del.icio.us/v1/posts/all\">export page "
+"at del.icio.us</a>"
+msgstr ""
+"Melden Sie sich <a href=\"http://del.icio.us/api/posts/all\">hier</a> bei "
+"del.icio.us an, um Ihre Favoriten zu exportieren"
+
+#: data/templates/default/importDelicious.tpl.php:34
+msgid ""
+"Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> "
+"file to your computer"
+msgstr ""
+"Speichern Sie die resultierende <abbr title=\"Extensible Markup Language"
+"\">XML</abbr>- Datei lokal auf Ihrem Computer"
+
+#: data/templates/default/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 ""
+"Klicken Sie auf <kbd>Durchsuchen...</kbd> um die bereits gespeicherte "
+"Favoritendatei auf Ihrem Computer zu lokalisieren und auszuwählen. Die "
+"maximale Dateigröße darf 1 MB betragen"
+
+#: data/templates/default/importDelicious.tpl.php:36
+#: data/templates/default/importNetscape.tpl.php:43
+msgid "Select the default privacy setting for your imported bookmarks"
+msgstr ""
+"Wählen Sie die Standardeinstellung der Privatsphäre für Ihre zu "
+"importierenden Favoriten"
+
+#: data/templates/default/importDelicious.tpl.php:37
+#: data/templates/default/importNetscape.tpl.php:44
+msgid ""
+"Click <kbd>Import</kbd> to start importing the bookmarks; it may take a "
+"minute"
+msgstr ""
+"Klicken Sie auf <kbd>Importieren</kbd> um die bereits lokal gespeicherte "
+"Favoritendatei zu importieren. Dieser Prozess kann bis zu einer Minute "
+"andauern"
+
+#: data/templates/default/importNetscape.tpl.php:35
+msgid "Export your bookmarks from your browser to a file"
+msgstr "Exportieren Sie Ihre Favoriten aus dem Webbrowser in eine Datei"
+
+#: data/templates/default/importNetscape.tpl.php:37
+msgid ""
+"Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
+msgstr ""
+"Microsoft Internet Explorer: <kbd>Datei  &gt; Importieren und "
+"Exportieren...  &gt; Favoriten exportieren"
+
+#: data/templates/default/importNetscape.tpl.php:38
+msgid ""
+"Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
+"Export..."
+msgstr ""
+"Mozilla Firefox: <kbd>Favoriten  &gt; Favoriten verwalten... &gt; Datei &gt; "
+"Exportieren..."
+
+#: data/templates/default/importNetscape.tpl.php:39
+msgid ""
+"Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
+msgstr ""
+"Netscape: <kbd>Favoriten &gt; Favoriten verwalten... &gt; Werkzeuge &gt; "
+"Exportieren..."
+
+#: data/templates/default/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 ""
+"Klicken Sie auf <kbd>Durchsuchen...</kbd> um die bereits gespeicherte "
+"Favoritendatei auf Ihrem Computer zu lokalisieren und auszuwählen. Die "
+"maximale Dateigröße darf 1 MB betragen"
+
+#: data/templates/default/importStructure.tpl.php:24
+msgid "Create your structure into a simple text file and following this model:"
+msgstr ""
+
+#: data/templates/default/importStructure.tpl.php:35
+msgid ""
+"Then import the file. The tags and their relations will be added to your "
+"profile."
+msgstr ""
+
+#: data/templates/default/login.tpl.php:13
+msgid "Please activate cookies"
+msgstr ""
+
+#: data/templates/default/login.tpl.php:26
+#: data/templates/default/register.tpl.php:21
+msgid "Password"
+msgstr "Passwort"
+
+#: data/templates/default/login.tpl.php:28
+msgid "Don't ask for my password for 2 weeks"
+msgstr "Zwei Wochen nicht nach meinem Passwort fragen"
+
+#: data/templates/default/login.tpl.php:32
+#: data/templates/default/toolbar.inc.php:29 www/login.php:57
+msgid "Log In"
+msgstr "Anmelden"
+
+#: data/templates/default/login.tpl.php:36
+msgid "Forgotten your password?"
+msgstr "Haben Sie Ihr Passwort vergessen?"
+
+#: data/templates/default/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 ""
+"Sofern Sie Ihr Passwort vergessen haben, können Sie nun durch %s ein neues "
+"Passwort generieren lassen. Geben Sie zur Verifizierung Ihren Benutzernamen "
+"und Ihre E-Mail Adresse Ihres Accounts ein. In Kürze erhalten Sie ein neues "
+"Passwort. Verwenden Sie dieses Passwort, um sich erfolgreich anzumelden."
+
+#: data/templates/default/password.tpl.php:19
+msgid "Generate Password"
+msgstr "Passwort generieren"
+
+#: data/templates/default/profile.tpl.php:28
+msgid "Member Since"
+msgstr "Mitglied seit"
+
+#: data/templates/default/profile.tpl.php:40
+#: data/templates/default/sidebar.block.watchlist.php:30
+msgid "Watching"
+msgstr "Beobachten"
+
+#: data/templates/default/profile.tpl.php:55
+#: data/templates/default/sidebar.block.watchlist.php:52
+msgid "Watched By"
+msgstr "Beobachtet von"
+
+#: data/templates/default/profile.tpl.php:68
+#: data/templates/default/toolbar.inc.php:9
+msgid "Bookmarks"
+msgstr "Favoriten"
+
+#: data/templates/default/profile.tpl.php:69
+msgid "Go to bookmarks"
+msgstr "Die Favoriten betrachten."
+
+#: data/templates/default/register.tpl.php:11
+#, php-format
+msgid ""
+"Sign up here to create a free %s account. All the information requested "
+"below is required"
+msgstr ""
+"Registrieren Sie sich hier für ein kostenloses %s Konto. Alle unten "
+"angeforderten Informationen sind für die Registrierung erforderlich"
+
+#: data/templates/default/register.tpl.php:18
+msgid ""
+" at least 5 characters, alphanumeric (no spaces, no dots or other special "
+"ones)"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:28
+msgid " to send you your password if you forget it"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:33
+msgid "Antispam question"
+msgstr "Sicherheitsfrage"
+
+#: data/templates/default/register.tpl.php:41
+#: data/templates/default/toolbar.inc.php:31 www/register.php:99
+msgid "Register"
+msgstr "Registrieren"
+
+#: data/templates/default/search.menu.php:27
+#, fuzzy
+msgid "Search..."
+msgstr "Suche"
+
+#: data/templates/default/search.menu.php:28
+#, fuzzy
+msgid "in"
+msgstr "Zeile"
+
+#: data/templates/default/search.menu.php:34
+msgid "this user's bookmarks"
+msgstr "Favoriten des/der Benutzers/in"
+
+#: data/templates/default/search.menu.php:39
+msgid "my bookmarks"
+msgstr "meine Favoriten"
+
+#: data/templates/default/search.menu.php:40
+msgid "my watchlist"
+msgstr "meine Beobachtungsliste"
+
+#: data/templates/default/search.menu.php:44
+msgid "all bookmarks"
+msgstr "alle Favoriten"
+
+#: data/templates/default/search.menu.php:54
+msgid "Search"
+msgstr "Suche"
+
+#: data/templates/default/sidebar.block.linked.php:23
+msgid "Linked Tags"
+msgstr "Ausgewählte Schlagwörter"
+
+#: data/templates/default/sidebar.block.linked.php:28
+#: data/templates/default/sidebar.block.menu.php:46
+msgid "Add new link"
+msgstr "Einen neuen Navigationslink addieren."
+
+#: data/templates/default/sidebar.block.linked.php:29
+#: data/templates/default/sidebar.block.menu.php:47
+msgid "Delete link"
+msgstr "Einen Navigationslink löschen."
+
+#: data/templates/default/sidebar.block.menu.php:35
+#, php-format
+msgid "Tags included into the tag '%s'"
+msgstr ""
+"In der Navigation inkludierte, spezielle Schlagwörter mittels dem Schlagwort "
+"'%s'."
+
+#: data/templates/default/sidebar.block.menu.php:35
+msgid "Menu Tags"
+msgstr "Spezielle Schlagwörter"
+
+#: data/templates/default/sidebar.block.menu.php:68
+msgid "See all your tags"
+msgstr "Betrachten Sie Ihre sämtlichen Schlagwörter."
+
+#: data/templates/default/sidebar.block.menu.php:68
+msgid "all your tags"
+msgstr "Ihre sämtlichen Schlagwörter."
+
+#: data/templates/default/sidebar.block.menu.php:70
+msgid "See all tags from this user"
+msgstr "Betrachten Sie sämtliche Schlagwörter dieses/r Benutzers/in."
+
+#: data/templates/default/sidebar.block.menu.php:70
+msgid "all tags from this user"
+msgstr "Sämtliche Schlagwörter dieses/r Benutzers/in."
+
+#: data/templates/default/sidebar.block.menu.php:74
+msgid "See popular tags"
+msgstr "Betrachten Sie populäre Schlagwörter."
+
+#: data/templates/default/sidebar.block.menu2.php:21
+#, fuzzy
+msgid "Featured Menu Tags"
+msgstr "Spezielle Schlagwörter"
+
+#: data/templates/default/sidebar.block.menu2.php:25
+msgid "This menu is composed of keywords (tags) organized by admins."
+msgstr ""
+
+#: data/templates/default/sidebar.block.recent.php:18
+msgid "Recent Tags"
+msgstr "Neueste Schlagwörter"
+
+#: data/templates/default/sidebar.block.related.php:26
+msgid "Related Tags"
+msgstr "Verwandte Schlagwörter"
+
+#: data/templates/default/sidebar.block.search.php:28
+msgid "Last Searches"
+msgstr "Neueste Suchbegriffe"
+
+#: data/templates/default/sidebar.block.search.php:40
+msgid "Number of bookmarks for this query"
+msgstr "Die Anzahl der Favoriten für diese Anfrage."
+
+#: data/templates/default/sidebar.block.tagactions.php:9 www/tagrename.php:72
+#, fuzzy
+msgid "Rename Tag"
+msgid_plural "Rename Tags"
+msgstr[0] "Das Schlagwort umbenennen."
+msgstr[1] "Das Schlagwort umbenennen."
+
+#: data/templates/default/sidebar.block.tagactions.php:22 www/tagdelete.php:54
+msgid "Delete Tag"
+msgstr "Das Schlagwort löschen."
+
+#: data/templates/default/sidebar.block.tagactions.php:24 www/tagedit.php:61
+msgid "Edit Tag Description"
+msgstr "Die Deskription des Schlagwortes editieren."
+
+#: data/templates/default/sidebar.block.tagactions.php:26
+#: www/tagcommondescriptionedit.php:76
+msgid "Edit Tag Common Description"
+msgstr "Die gemeinsame Deskription des Schlagwortes editieren."
+
+#: data/templates/default/sidebar.block.tagactions.php:28
+msgid "Create a link to another tag"
+msgstr "Eine Verbindung zwischen Schlagwörtern kreieren."
+
+#: data/templates/default/sidebar.block.users.php:14
+#, fuzzy
+msgid "New Users"
+msgstr "Benutzer/innen"
+
+#: data/templates/default/sidebar.block.users.php:23
+#: data/templates/default/users.tpl.php:24
+msgid "bookmarks"
+msgstr "Favoriten"
+
+#: data/templates/default/sidebar.block.users.php:30
+msgid "See all users"
+msgstr "Betrachten Sie sämtliche Benutzer/innen."
+
+#: data/templates/default/sidebar.block.users.php:30
+msgid "All users"
+msgstr "Alle Benutzer/innen"
+
+#: data/templates/default/sidebar.block.watchlist.php:19
+msgid "Close contacts are mutual contacts"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:19
+msgid "Close contacts"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:36
+msgid "Add a contact..."
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:36
+msgid "Type a username to add it to your contacts."
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:44
+#, fuzzy
+msgid "Remove this contact"
+msgstr "Aus der Beobachtungsliste löschen."
+
+#: data/templates/default/sidebar.block.watchstatus.php:11
+msgid "Remove from Watchlist"
+msgstr "Aus der Beobachtungsliste löschen."
+
+#: data/templates/default/sidebar.block.watchstatus.php:13
+msgid "Add to Watchlist"
+msgstr "Zur Beobachtungsliste addieren."
+
+#: data/templates/default/sidebar.linkedtags.inc.php:18
+msgid "Edit link"
+msgstr "Den Weblink editieren."
+
+#: data/templates/default/sidebar.linkedtags.inc.php:47
+msgid "Synonyms:"
+msgstr "Synonyme:"
+
+#: data/templates/default/tag2tagadd.tpl.php:12
+msgid "Create new link:"
+msgstr "Eine neue Verbindung kreieren:"
+
+#: data/templates/default/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 ""
+"Anmerkung: inkludieren Sie ein Schlagwort in das '%s' Schlagwort (z.B.: "
+"%s>Länder), so erscheint jenes Schlagwort in der Navigationsbox."
+
+#: data/templates/default/tag2tagadd.tpl.php:23
+#: data/templates/default/tag2tagedit.tpl.php:37
+msgid "Create"
+msgstr "Kreieren"
+
+#: data/templates/default/tag2tagadd.tpl.php:35
+#: data/templates/default/tag2tagdelete.tpl.php:27
+#: data/templates/default/tag2tagedit.tpl.php:51
+msgid "Existing links:"
+msgstr "Bereits bestehende Navigationslinks:"
+
+#: data/templates/default/tag2tagadd.tpl.php:53
+#: data/templates/default/tag2tagdelete.tpl.php:45
+#: data/templates/default/tag2tagedit.tpl.php:69
+msgid "No links"
+msgstr "Leider derzeit keine Weblinks."
+
+#: data/templates/default/tag2tagdelete.tpl.php:15
+#: data/templates/default/tag2tagedit.tpl.php:16
+#: data/templates/default/tagdelete.tpl.php:8 www/jsScuttle.php:24
+msgid "Yes"
+msgstr "Ja"
+
+#: data/templates/default/tag2tagdelete.tpl.php:16
+#: data/templates/default/tag2tagedit.tpl.php:17
+#: data/templates/default/tagdelete.tpl.php:9 www/jsScuttle.php:24
+msgid "No"
+msgstr "Nein"
+
+#: data/templates/default/tag2tagedit.tpl.php:6
+msgid "Delete the link"
+msgstr "Den Weblink löschen."
+
+#: data/templates/default/tag2tagedit.tpl.php:29
+msgid "Create new link"
+msgstr "Einen neuen Weblink kreieren."
+
+#: data/templates/default/tagrename.tpl.php:12
+msgid "Old"
+msgstr "Alt"
+
+#: data/templates/default/tagrename.tpl.php:17
+msgid "New"
+msgstr "Neu"
+
+#: data/templates/default/tagrename.tpl.php:24
+msgid "Rename"
+msgstr "Umbenennen"
+
+#: data/templates/default/tags.tpl.php:11
+#: data/templates/default/users.tpl.php:9
+msgid "Alphabet"
+msgstr "Alphabet"
+
+#: data/templates/default/tags.tpl.php:12
+#: data/templates/default/users.tpl.php:10
+msgid "Popularity"
+msgstr "Popularität"
+
+#: data/templates/default/toolbar.inc.php:8
+#: data/templates/default/toolbar.inc.php:26
+#, fuzzy
+msgid "Home"
+msgstr "Homepage"
+
+#: data/templates/default/toolbar.inc.php:11 www/watchlist.php:106
+msgid "Watchlist"
+msgstr "Beobachtungsliste"
+
+#: data/templates/default/toolbar.inc.php:12 www/profile.php:79
+msgid "Profile"
+msgstr "Profil"
+
+#: data/templates/default/toolbar.inc.php:13 www/bookmarks.php:215
+msgid "Add a Bookmark"
+msgstr "Favoriten addieren"
+
+#: data/templates/default/toolbar.inc.php:14
+msgid "Log Out"
+msgstr "Abmelden"
+
+#: data/templates/default/toolbar.inc.php:17
+msgid "Admin"
+msgstr ""
+
+#: data/templates/default/top.inc.php:57
+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/default/users.tpl.php:20
+msgid "profile"
+msgstr "Profil"
+
+#: data/templates/default/users.tpl.php:21
+msgid "created in"
+msgstr "erstellt in"
+
+#: www/admin.php:32
+msgid "Manage users"
+msgstr ""
+
+#: www/admin.php:69
+#, php-format
+msgid "%s and all his bookmarks and tags were deleted."
+msgstr ""
+
+#: www/admin.php:76
+msgid "Problem with "
+msgstr ""
+
+#: www/ajaxDelete.php:37
+msgid "You are not allowed to delete this bookmark"
+msgstr "Leider sind Sie nicht autorisiert diesen Favoriten zu löschen."
+
+#: www/ajaxDelete.php:41 www/edit.php:103
+msgid "Failed to delete bookmark"
+msgstr "Leider ist das Löschen des Favoriten fehlgeschlagen."
+
+#: www/alltags.php:50
+msgid "All Tags"
+msgstr "Alle Schlagwörter"
+
+#: www/alltags.php:56 www/bookmarks.php:99 www/populartags.php:52
+#: www/profile.php:55 www/rss.php:100 www/search.php:111 www/watch.php:45
+#: www/watchlist.php:61
+#, php-format
+msgid "User with username %s was not found"
+msgstr "Leider wurde der/die Benutzer/in %s nicht gefunden."
+
+#: 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 "Zugriff verweigert."
+
+#: www/bookmarkcommondescriptionedit.php:60
+msgid "Bookmark common description updated"
+msgstr ""
+"Die gemeinsame Deskription des Favoriten wurde erfolgreich aktualisiert."
+
+#: www/bookmarkcommondescriptionedit.php:63
+msgid "Failed to update the bookmark common description"
+msgstr "Leider ist die gemeinsame Deskription des Favoriten fehlgeschlagen."
+
+#: www/bookmarkcommondescriptionedit.php:71
+msgid "Edit Bookmark Common Description"
+msgstr "Die gemeinsame Deskription des Favoriten editieren."
+
+#: www/bookmarks.php:114 www/tags.php:47
+#, fuzzy
+msgid "Remove the tag from the selection"
+msgstr "Betrachten Sie sämtliche Schlagwörter dieses/r Benutzers/in."
+
+#: www/bookmarks.php:134 www/edit.php:65
+msgid "Your bookmark must have a title and an address"
+msgstr "Ihr Favorit muss einen Titel und eine URL beinhalten."
+
+#: www/bookmarks.php:139
+msgid "This bookmark URL may not be added"
+msgstr ""
+
+#: www/bookmarks.php:158 www/edit.php:83 www/edit.php:86
+msgid "Bookmark saved"
+msgstr "Ihr Favorit wurde erfolgreich gespeichert."
+
+#: www/bookmarks.php:158
+msgid "(Come back to previous page.)"
+msgstr ""
+
+#: www/bookmarks.php:165 www/import.php:106 www/importNetscape.php:108
+msgid ""
+"There was an error saving your bookmark. Please try again or contact the "
+"administrator."
+msgstr ""
+"Leider ist ein Fehler während der Speicherung Ihres Favoriten aufgetreten. "
+"Bitte versuchen Sie es erenut oder kontaktieren Sie den/die Administrator/"
+"in. Herzlichen Dank!"
+
+#: www/bookmarks.php:222
+msgid "Add Bookmark"
+msgstr "Favoriten addieren"
+
+#: www/bookmarks.php:225
+msgid "You must be logged in before you can add bookmarks."
+msgstr ""
+"Sie müssen sich zunächst registrieren bzw. anmelden, um einen Favoriten zu "
+"addieren."
+
+#: www/bookmarks.php:270
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: www/bookmarks.php:283
+#, php-format
+msgid "%s: %s (+private %s)"
+msgstr ""
+
+#: www/bookmarks.php:305 www/bookmarks.php:306
+msgid "My Bookmarks"
+msgstr "Meine Favoriten"
+
+#: www/edit.php:44 www/edit.php:45
+msgid "Edit Bookmark"
+msgstr "Favoriten editieren"
+
+#: www/edit.php:51
+#, php-format
+msgid "Bookmark with id %s not was not found"
+msgstr "Der Favorit mit der id %s wurde nicht gefunden."
+
+#: www/edit.php:57
+msgid "You are not allowed to edit this bookmark"
+msgstr "Leider sind Sie nicht autorisiert diesen Favoriten zu editieren."
+
+#: www/edit.php:77
+msgid "Error while saving your bookmark"
+msgstr "Ein Fehler ist während der Speicherung Ihres Favoriten aufgetreten."
+
+#: www/history.php:61
+msgid "History"
+msgstr "Verlauf"
+
+#: www/history.php:62
+#, php-format
+msgid "History for %s"
+msgstr "Verlauf von %s"
+
+#: www/history.php:84
+msgid "Address was not found"
+msgstr "Leider konnte die Webadresse nicht gefunden werden."
+
+#: www/import.php:47
+msgid "Could not open XML input"
+msgstr "Leider konnte die XML Dateneingabe nicht geöffnet werden."
+
+#: www/import.php:51
+#, php-format
+msgid "XML error: %s at line %d"
+msgstr "XML - Fehler: %s in Zeile %d"
+
+#: www/import.php:60
+msgid "Import Bookmarks from del.icio.us"
+msgstr "Die Favoriten aus del.icio.us importieren."
+
+#: www/import.php:93
+msgid "You have already submitted this bookmark."
+msgstr "Sie haben diesen Favoriten bereits erfolgreich gespeichert."
+
+#: www/import.php:104
+msgid "Bookmark imported."
+msgstr "Die Favoriten wurden erfolgreich importiert."
+
+#: www/importNetscape.php:95
+#, fuzzy
+msgid "You have already submitted some of these bookmarks."
+msgstr "Sie haben diesen Favoriten bereits erfolgreich gespeichert."
+
+#: www/importNetscape.php:115
+#, fuzzy
+msgid "Bookmarks found: "
+msgstr "Favoriten"
+
+#: www/importNetscape.php:116
+#, fuzzy
+msgid "Bookmarks imported: "
+msgstr "Die Favoriten wurden erfolgreich importiert."
+
+#: www/importNetscape.php:117 www/importNetscape.php:122
+msgid "Import Bookmarks from Browser File"
+msgstr "Die Favoriten aus einer Favoritendatei importieren."
+
+#: www/importStructure.php:61
+msgid "Bad indentation"
+msgstr ""
+
+#: www/importStructure.php:67
+#, fuzzy
+msgid "New links between tags: "
+msgstr "Eine Verbindung zwischen Schlagwörtern löschen"
+
+#: www/importStructure.php:72
+msgid "Import Structure"
+msgstr ""
+
+#: www/index.php:38
+msgid "You have now logged out"
+msgstr "Sie haben sich nun erfolgreich abgemeldet."
+
+#: www/index.php:46
+#, php-format
+msgid "%s: Recent bookmarks"
+msgstr "%s: Neue Favoriten"
+
+#: www/index.php:58
+#, fuzzy, php-format
+msgid "%s: Recent bookmarks (+private %s)"
+msgstr "%s: Neue Favoriten"
+
+#: www/index.php:96
+msgid "Store, share and tag your favourite links"
+msgstr "Speichern, teilen und kategorisieren Sie Ihre Favoriten!"
+
+#: www/index.php:97
+msgid "All Bookmarks"
+msgstr "Alle Favoriten"
+
+#: www/jsScuttle.php:71
+msgid "Available"
+msgstr "Vorhanden."
+
+#: www/jsScuttle.php:74
+msgid "Not Available"
+msgstr "Leider nicht vorhanden."
+
+#: www/login.php:48
+msgid "The details you have entered are incorrect. Please try again."
+msgstr ""
+"Leider sind die von Ihnen eingetragenen Details nicht korrekt. Bitte "
+"versuchen Sie es erneut."
+
+#: www/password.php:36
+msgid "You must enter your username."
+msgstr "Sie müssen Ihren Benutzernamen eingeben."
+
+#: www/password.php:40
+msgid ""
+"You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"Sie müssen Ihre <abbr title=\"electronic mail\">E-Mail</abbr> Adresse "
+"eingeben."
+
+#: www/password.php:48
+msgid "No matches found for that username."
+msgstr "Leider keine Resultate zu diesem Benutzernamen gefunden."
+
+#: www/password.php:51
+msgid ""
+"No matches found for that combination of username and <abbr title="
+"\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"Leider keine Resultate zu diesem Benutzernamen und dieser <abbr title="
+"\"electronic mail\">E-Mail</abbr> Adresse gefunden."
+
+#: www/password.php:59
+msgid ""
+"There was an error while generating your new password. Please try again."
+msgstr ""
+"Leider ist ein Fehler bei der Generierung des neuen Passwortes aufgetreten. "
+"Bitte versuchen Sie es erneut."
+
+#: www/password.php:63
+msgid "Your new password is:"
+msgstr "Ihr neues Passwort lautet:"
+
+#: 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 ""
+"Um den größtmöglichen Schutz Ihrer Favoriten zu gewährleisten, sollten Sie "
+"das Passwort in Ihrem Profil bei Ihrer nächsten Anmeldung editieren."
+
+#: www/password.php:66
+#, php-format
+msgid "%s Account Information"
+msgstr "%s Account Information"
+
+#: www/password.php:68
+#, php-format
+msgid "New password generated and sent to %s"
+msgstr "Ein neues Passwort wurde erfolgreich generiert und an %s gesandt."
+
+#: www/password.php:75
+msgid "Forgotten Password"
+msgstr "Vergessenes Passwort"
+
+#: www/profile.php:63 www/watchlist.php:119
+msgid "Username was not specified"
+msgstr "Leider wurde der Benutzername nicht angegeben."
+
+#: www/profile.php:70
+msgid "My Profile"
+msgstr "Mein Profil"
+
+#: www/profile.php:110
+msgid "Invalid Token"
+msgstr ""
+
+#: www/profile.php:115
+msgid "Password and confirmation do not match."
+msgstr "Leider ist das Passwort und deren Verifizierung nicht identisch."
+
+#: www/profile.php:119
+msgid "Password must be at least 6 characters long."
+msgstr "Das Passwort muss mindestens sechs Zeichen lang sein."
+
+#: www/profile.php:123
+msgid "E-mail address is not valid."
+msgstr "Leider ist die E-Mail Adresse nicht gültig."
+
+#: www/profile.php:127
+msgid "An error occurred while saving your changes."
+msgstr "Leider trat ein Fehler beim Speichern Ihrer Änderungen auf."
+
+#: www/profile.php:129
+msgid "Changes saved."
+msgstr "Die Änderungen wurden erfolgreich gespeichert."
+
+#: www/profile.php:148
+msgid "You do not have a valid SSL client certificate"
+msgstr ""
+
+#: www/profile.php:150
+msgid "This certificate is already registered"
+msgstr ""
+
+#: www/profile.php:152
+msgid "Failed to register SSL client certificate."
+msgstr ""
+
+#: www/profile.php:154
+msgid "SSL client certificate registered."
+msgstr ""
+
+#: www/profile.php:163
+msgid "Certificate not found."
+msgstr ""
+
+#: www/profile.php:165
+msgid "The certificate does not belong to you."
+msgstr ""
+
+#: www/profile.php:167
+#, fuzzy
+msgid "Failed to delete SSL client certificate."
+msgstr "Leider ist das Löschen des Schlagwortes fehlgeschlagen."
+
+#: www/profile.php:169
+msgid "SSL client certificate deleted."
+msgstr ""
+
+#: www/register.php:52
+msgid "You <em>must</em> enter a username, password and e-mail address."
+msgstr ""
+"Sie müssen einen Benutzernamen, ein Passwort und eine <abbr title="
+"\"electronic mail\">E-Mail</abbr> Addresse eingeben."
+
+#: www/register.php:56
+msgid "This username has been reserved, please make another choice."
+msgstr ""
+"Leider wurde dieser Benutzername bereits reserviert. Bitte treffen Sie eine "
+"andere Wahl."
+
+#: www/register.php:60
+msgid "This username already exists, please make another choice."
+msgstr ""
+"Leider existiert dieser Benutzername bereits. Bitte treffen Sie eine andere "
+"Wahl."
+
+#: www/register.php:64
+#, fuzzy
+msgid ""
+"This username is not valid (too short, too long, forbidden characters...), "
+"please make another choice."
+msgstr ""
+"Leider wurde dieser Benutzername bereits reserviert. Bitte treffen Sie eine "
+"andere Wahl."
+
+#: www/register.php:68
+msgid "E-mail address is not valid. Please try again."
+msgstr ""
+"Leider ist diese E-Mail Adresse nicht gültig. Bitte versuchen Sie es erneut."
+
+#: www/register.php:72
+msgid "Antispam answer is not valid. Please try again."
+msgstr ""
+"Leider wurde die Sicherheitsfrage nicht korrekt beantwortet. Bitte versuchen "
+"Sie es erneut."
+
+#: www/register.php:90
+msgid "You have successfully registered. Enjoy!"
+msgstr "Ihre Registrierung war erfolgreich!"
+
+#: www/register.php:92
+msgid "Registration failed. Please try again."
+msgstr ""
+"Leider ist Ihre Registrierung fehlgeschlagen. Bitte versuchen Sie es erneut."
+
+#: www/rss.php:90 www/rss.php:111
+#, php-format
+msgid "Failed to Autenticate User with username %s using private key"
+msgstr ""
+
+#: www/rss.php:128
+#, php-format
+msgid "Recent bookmarks posted to %s"
+msgstr "Neueste Favoriten auf %s"
+
+#: www/search.php:83 www/search.php:147
+msgid "Search Bookmarks"
+msgstr "Suche Favoriten"
+
+#: www/search.php:89
+msgid "Search Results"
+msgstr "Suche Resultate"
+
+#: www/search.php:137
+msgid "Unsatisfied? You can also try our "
+msgstr ""
+
+#: www/tag2tagadd.php:54
+msgid "Tag link created"
+msgstr "Der Weblink für das Schlagwort wurde erfolgreich kreiert."
+
+#: www/tag2tagadd.php:57
+msgid "Failed to create the link"
+msgstr "Leider wurde der Weblink für das Schlagwort nicht kreiert."
+
+#: www/tag2tagadd.php:69
+msgid "Add Tag Link"
+msgstr "Eine Verbindung für das Schlagwort addieren"
+
+#: www/tag2tagdelete.php:66
+msgid "Tag link deleted"
+msgstr "Der Weblink für das Schlagwort wurde erfolgreich gelöscht."
+
+#: www/tag2tagdelete.php:69
+msgid "Failed to delete the link"
+msgstr "Leider ist das Löschen des Weblinks fehlgeschlagen."
+
+#: www/tag2tagdelete.php:81
+msgid "Delete Link Between Tags"
+msgstr "Eine Verbindung zwischen Schlagwörtern löschen"
+
+#: www/tag2tagedit.php:55
+msgid "Edit Link Between Tags"
+msgstr "Einen Weblink zwischen Schlagwörtern editieren."
+
+#: www/tagcommondescriptionedit.php:62
+msgid "Tag common description updated"
+msgstr ""
+"Die gemeinsame Deskription des Schlagwortes wurde erfolgreich aktualisiert."
+
+#: www/tagcommondescriptionedit.php:67
+msgid "Failed to update the tag common description"
+msgstr "Leider ist die gemeinsame Deskription des Schlagwortes fehlgeschlagen."
+
+#: www/tagdelete.php:43
+msgid "Tag deleted"
+msgstr "Das Schlagwort wurde erfolgreich gelöscht."
+
+#: www/tagdelete.php:46
+msgid "Failed to delete the tag"
+msgstr "Leider ist das Löschen des Schlagwortes fehlgeschlagen."
+
+#: www/tagedit.php:52
+msgid "Tag description updated"
+msgstr "Die Deskription des Favoriten wurde erfolgreich aktualisiert."
+
+#: www/tagedit.php:55
+msgid "Failed to update the tag description"
+msgstr "Leider ist die Deskription des Schlagwortes fehlgeschlagen."
+
+#: www/tagrename.php:63
+msgid "Tag renamed"
+msgstr "Das Schlagwort wurde erfolgreich umbenannt."
+
+#: www/tagrename.php:66
+msgid "Failed to rename the tag"
+msgstr "Leider ist die Umbenennung des Schlagwortes fehlgeschlagen."
+
+#: www/tags.php:71
+#, php-format
+msgid "%s: tagged with \"%s\""
+msgstr ""
+
+#: www/tags.php:84
+#, php-format
+msgid "%s: tagged with \"%s\" (+private %s)"
+msgstr ""
+
+#: www/users.php:31
+msgid "Users"
+msgstr "Benutzer/innen"
+
+#: www/watch.php:54
+msgid "User removed from your watchlist"
+msgstr "Der/die Benutzer/in wurde aus Ihrer Beobachtungsliste entfernt."
+
+#: www/watch.php:56
+msgid "User added to your watchlist"
+msgstr "Der/die Benutzer/in wurde zu Ihrer Beobachtungsliste addiert."
+
+#: www/watchlist.php:104
+msgid "My Watchlist"
+msgstr "Meine Beobachtungsliste"
+
+#: www/api/httpauth.inc.php:30
+msgid "Use of the API calls requires authentication."
+msgstr ""
+
+#: www/gsearch/index.php:51
+msgid "Come back to "
+msgstr ""
+
+#: www/gsearch/index.php:56
+msgid "Admin tips: "
+msgstr ""
+
+#: www/gsearch/index.php:57
+msgid "To refresh manually Google Custom Search Engine, goes to: "
+msgstr ""
+
+#: www/gsearch/index.php:61
+msgid ""
+"If no result appears, check that all the urls are valid in the admin section."
+msgstr ""
+
+#~ msgid "for"
+#~ msgstr "nach"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Last Users"
+#~ msgstr "Neueste Benutzer/innen"
diff --git a/data/locales/de_DE/LC_MESSAGES/messages.mo b/data/locales/de_DE/LC_MESSAGES/messages.mo
index b75e365..d1ef779 100644
--- a/data/locales/de_DE/LC_MESSAGES/messages.mo
+++ b/data/locales/de_DE/LC_MESSAGES/messages.mo
diff --git a/data/locales/de_DE/LC_MESSAGES/messages.po b/data/locales/de_DE/LC_MESSAGES/messages.po
index c82298c..cba3bb3 100644
--- a/data/locales/de_DE/LC_MESSAGES/messages.po
+++ b/data/locales/de_DE/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SemanticScuttle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-11 17:51+0200\n"
+"POT-Creation-Date: 2012-01-20 13:58+0100\n"
 "PO-Revision-Date: 2011-05-11 17:57+0100\n"
 "Last-Translator: Christian Weiske <cweiske@cweiske.de>\n"
 "Language-Team: de-AT <info@ehb-world.com>\n"
@@ -31,9 +31,9 @@ msgid "Line"
 msgstr "Zeile"
 
 #: src/SemanticScuttle/functions.php:207
-#: data/templates/importDelicious.tpl.php:8
-#: data/templates/importNetscape.tpl.php:9
-#: data/templates/importStructure.tpl.php:10
+#: data/templates/default/importDelicious.tpl.php:8
+#: data/templates/default/importNetscape.tpl.php:9
+#: data/templates/default/importStructure.tpl.php:10
 msgid "File"
 msgstr "Datei"
 
@@ -65,980 +65,1097 @@ msgstr "Kritischer Fehler"
 msgid "DEBUG MODE"
 msgstr "Debugmodus"
 
-#: data/templates/about.tpl.php:6
-msgid "<strong>Store</strong> all your favourite links in one place, accessible from anywhere."
-msgstr "<strong>Speichern</strong> Sie Ihre sämtlichen Lesezeichen an einem Ort, von überall zugänglich."
+#: data/templates/default/about.tpl.php:6
+msgid ""
+"<strong>Store</strong> all your favourite links in one place, accessible "
+"from anywhere."
+msgstr ""
+"<strong>Speichern</strong> Sie Ihre sämtlichen Lesezeichen an einem Ort, von "
+"überall zugänglich."
 
-#: 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>Teilen</strong> Sie Ihre Lesezeichen mit allen anderen, mit Freunden auf Ihrer Beobachtungsliste oder einfach privat für Sie persönlich."
+#: data/templates/default/about.tpl.php:7
+msgid ""
+"<strong>Share</strong> your bookmarks with everyone, with friends on your "
+"watchlist or just keep them private."
+msgstr ""
+"<strong>Teilen</strong> Sie Ihre Lesezeichen mit allen anderen, mit Freunden "
+"auf Ihrer Beobachtungsliste oder einfach privat für Sie persönlich."
 
-#: 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>Kategorisieren</strong> Sie Ihre Lesezeichen mittels unbegrenzten Schlagwörtern, anstatt Sie in unübersichtlichen Ordnern zu speichern."
+#: data/templates/default/about.tpl.php:8
+msgid ""
+"<strong>Tag</strong> your bookmarks with as many labels as you want, instead "
+"of wrestling with folders."
+msgstr ""
+"<strong>Kategorisieren</strong> Sie Ihre Lesezeichen mittels unbegrenzten "
+"Schlagwörtern, anstatt Sie in unübersichtlichen Ordnern zu speichern."
 
-#: data/templates/about.tpl.php:9
+#: data/templates/default/about.tpl.php:9
 msgid "Register now"
 msgstr "Registrieren Sie sich jetzt"
 
-#: data/templates/about.tpl.php:9
+#: data/templates/default/about.tpl.php:9
 #, php-format
 msgid " to start using %s!"
 msgstr "um %s zu nutzen!"
 
-#: data/templates/about.tpl.php:12
+#: data/templates/default/about.tpl.php:12
 msgid "Geek Stuff"
 msgstr "Softwareinformationen"
 
-#: data/templates/about.tpl.php:14
+#: data/templates/default/about.tpl.php:14
 msgid "is licensed under the "
 msgstr "ist lizenziert unter der"
 
-#: data/templates/about.tpl.php:14
+#: data/templates/default/about.tpl.php:14
 msgid "you can freely host it on your own web server."
 msgstr "Sie können es selbst auf Ihrem Webserver oder Webspace installieren"
 
-#: data/templates/about.tpl.php:15
+#: data/templates/default/about.tpl.php:15
 #, php-format
-msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 unterstützt die meisten der <a href=\"http://www.delicious.com/help/api\">del.icio.us-<abbr title=\"Application Programming Interface\">API</abbr></a>. Fast alle coolen Tools, die für dieses System erstellt wurden, können für %1$s geändert und adaptiert werden. Wenn Sie ein Programm finden, bei dem Sie die API-Adresse nicht ändern können, so fragen Sie doch einfach beim Entwickler nach. Man kann nie wissen, vielleicht machen sie es einfach."
-
-#: data/templates/about.tpl.php:24
+msgid ""
+"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 unterstützt die meisten der <a href=\"http://www.delicious.com/help/api"
+"\">del.icio.us-<abbr title=\"Application Programming Interface\">API</abbr></"
+"a>. Fast alle coolen Tools, die für dieses System erstellt wurden, können "
+"für %1$s geändert und adaptiert werden. Wenn Sie ein Programm finden, bei "
+"dem Sie die API-Adresse nicht ändern können, so fragen Sie doch einfach beim "
+"Entwickler nach. Man kann nie wissen, vielleicht machen sie es einfach."
+
+#: data/templates/default/about.tpl.php:24
 msgid "Tips"
 msgstr "Hinweise"
 
-#: data/templates/about.tpl.php:26
+#: data/templates/default/about.tpl.php:26
 msgid "Add search plugin into your browser:"
 msgstr "Suchplugin zum Browser hinzufügen"
 
-#: data/templates/about.tpl.php:27
-msgid "The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
-msgstr "Mit dem geheimen Schlagwort \"system:unfiled\" findet man Lesezeichen ohne Schlagwörter"
+#: data/templates/default/about.tpl.php:27
+msgid ""
+"The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
+msgstr ""
+"Mit dem geheimen Schlagwort \"system:unfiled\" findet man Lesezeichen ohne "
+"Schlagwörter"
 
-#: data/templates/about.tpl.php:28
-msgid "The secret tag \"system:imported\" allows you to find imported bookmarks."
-msgstr "Mit dem geheimen Schlagwort \"system:imported\" findet man importierte Lesezeichen."
+#: data/templates/default/about.tpl.php:28
+msgid ""
+"The secret tag \"system:imported\" allows you to find imported bookmarks."
+msgstr ""
+"Mit dem geheimen Schlagwort \"system:imported\" findet man importierte "
+"Lesezeichen."
 
-#: data/templates/admin.tpl.php:5
+#: data/templates/default/admin.tpl.php:5
 msgid "Users management"
 msgstr "Benutzerverwaltung"
 
-#: data/templates/admin.tpl.php:14
+#: data/templates/default/admin.tpl.php:14
 msgid "Public/Shared/Private"
 msgstr "Öffentlich/Gemeinsam/Privat"
 
-#: data/templates/admin.tpl.php:14
-#: data/templates/bookmarks.tpl.php:113
+#: data/templates/default/admin.tpl.php:14
+#: data/templates/default/bookmarks.tpl.php:115
 msgid "bookmark(s)"
 msgstr "Lesezeichen"
 
-#: 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/default/admin.tpl.php:19
+#: data/templates/default/tag2tagadd.tpl.php:21
+#: data/templates/default/tag2tagdelete.tpl.php:13
+#: data/templates/default/tag2tagedit.tpl.php:14
+#: data/templates/default/tag2tagedit.tpl.php:35
+#: data/templates/default/tagdelete.tpl.php:6 www/jsScuttle.php:24
 msgid "Are you sure?"
 msgstr "Sind Sie sicher?"
 
-#: data/templates/admin.tpl.php:19
-#: data/templates/bookmarks.tpl.php:300
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/bookmarks.tpl.php:305
 msgid "Delete"
 msgstr "Löschen"
 
-#: data/templates/admin.tpl.php:27
+#: data/templates/default/admin.tpl.php:27
 msgid "Other actions"
 msgstr "Andere Aktionen"
 
-#: data/templates/admin.tpl.php:29
+#: data/templates/default/admin.tpl.php:29
 msgid "Check all URLs (May take some time)"
 msgstr "Alle URLs überprüfen (Kann eine Weile dauern)"
 
-#: data/templates/bookmarkcommondescriptionedit.tpl.php:16
-msgid "Collaborative description: these fields can be viewed and modified by every users"
-msgstr "Gemeinsame Beschreibung: Diese Felder können von jedem Benutzer angeschaut und verändert werden."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:16
+msgid ""
+"Collaborative description: these fields can be viewed and modified by every "
+"users"
+msgstr ""
+"Gemeinsame Beschreibung: Diese Felder können von jedem Benutzer angeschaut "
+"und verändert werden."
 
-#: data/templates/bookmarkcommondescriptionedit.tpl.php:18
-#: data/templates/bookmarks.tpl.php:157
-#: data/templates/editbookmark.tpl.php:51
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:18
+#: data/templates/default/bookmarks.tpl.php:159
+#: data/templates/default/editbookmark.tpl.php:51
 msgid "Title"
 msgstr "Titel"
 
-#: data/templates/bookmarkcommondescriptionedit.tpl.php:23
-#: data/templates/editbookmark.tpl.php:57
-#: data/templates/editprofile.tpl.php:45
-#: data/templates/profile.tpl.php:33
-#: data/templates/tagcommondescriptionedit.tpl.php:13
-#: data/templates/tagedit.tpl.php:12
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:23
+#: data/templates/default/editbookmark.tpl.php:57
+#: data/templates/default/editprofile.tpl.php:53
+#: data/templates/default/profile.tpl.php:33
+#: data/templates/default/tagcommondescriptionedit.tpl.php:13
+#: data/templates/default/tagedit.tpl.php:12
 msgid "Description"
 msgstr "Beschreibung"
 
-#: data/templates/bookmarkcommondescriptionedit.tpl.php:31
-#: data/templates/tagcommondescriptionedit.tpl.php:21
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:31
+#: data/templates/default/tagcommondescriptionedit.tpl.php:21
 msgid "Last modification:"
 msgstr "Letzte Änderung:"
 
-#: data/templates/bookmarkcommondescriptionedit.tpl.php:43
-#: data/templates/tagcommondescriptionedit.tpl.php:33
-#: data/templates/tagedit.tpl.php:18
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:43
+#: data/templates/default/tagcommondescriptionedit.tpl.php:33
+#: data/templates/default/tagedit.tpl.php:18
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: data/templates/bookmarkcommondescriptionedit.tpl.php:44
-#: data/templates/editbookmark.tpl.php:111
-#: data/templates/tag2tagadd.tpl.php:24
-#: data/templates/tag2tagedit.tpl.php:38
-#: data/templates/tagcommondescriptionedit.tpl.php:34
-#: data/templates/tagedit.tpl.php:19
-#: data/templates/tagrename.tpl.php:25
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:44
+#: data/templates/default/editbookmark.tpl.php:111
+#: data/templates/default/tag2tagadd.tpl.php:24
+#: data/templates/default/tag2tagedit.tpl.php:38
+#: data/templates/default/tagcommondescriptionedit.tpl.php:34
+#: data/templates/default/tagedit.tpl.php:19
+#: data/templates/default/tagrename.tpl.php:25
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: data/templates/bookmarklet.inc.php:1
+#: data/templates/default/bookmarklet.inc.php:1
 msgid "Bookmarklet"
 msgstr "Bookmarklet"
 
-#: data/templates/bookmarklet.inc.php:11
+#: data/templates/default/bookmarklet.inc.php:11
 #, 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 "Ziehen Sie eines der folgenden Bookmarklets in die Lesezeichen Ihres Webbrowsers, um jederzeit auf unkomplizierte Art und Weise einen neue Lesezeichen zu %s hinzuzufügen"
+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 ""
+"Ziehen Sie eines der folgenden Bookmarklets in die Lesezeichen Ihres "
+"Webbrowsers, um jederzeit auf unkomplizierte Art und Weise einen neue "
+"Lesezeichen zu %s hinzuzufügen"
 
-#: data/templates/bookmarklet.inc.php:20
+#: data/templates/default/bookmarklet.inc.php:20
 #, 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 "Ziehen Sie eines der folgenden Bookmarklets in die Lesezeichen Ihres Webbrowsers, um jederzeit auf unkomplizierte Art und Weise einen neue Lesezeichen zu %s hinzuzufügen"
+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 ""
+"Ziehen Sie eines der folgenden Bookmarklets in die Lesezeichen Ihres "
+"Webbrowsers, um jederzeit auf unkomplizierte Art und Weise einen neue "
+"Lesezeichen zu %s hinzuzufügen"
 
-#: data/templates/bookmarklet.inc.php:67
-#: data/templates/bookmarklet.inc.php:100
+#: data/templates/default/bookmarklet.inc.php:67
+#: data/templates/default/bookmarklet.inc.php:100
 #, php-format
 msgid "Post to %s"
 msgstr "Lesezeichen zu %s hinzufügen."
 
-#: data/templates/bookmarklet.inc.php:93
-#: data/templates/bookmarklet.inc.php:110
+#: data/templates/default/bookmarklet.inc.php:93
+#: data/templates/default/bookmarklet.inc.php:110
 #, php-format
 msgid "Post to %s (Pop-up)"
 msgstr "Lesezeichen zu %s hinzufügen (Pop-up)"
 
-#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:24
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:24
 #, php-format
 msgid "Voting <span class=\"voting\">%d</span>"
 msgstr "Stimmen: <span class=\"voting\">%d</span>"
 
-#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:32
-#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:35
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:32
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:35
 msgid "Vote for"
 msgstr "Dafür"
 
-#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:43
-#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:46
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:43
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:46
 msgid "Vote against"
 msgstr "Dagegen"
 
-#: data/templates/bookmarks.tpl.php:42
+#: data/templates/default/bookmarks.tpl.php:43
 msgid "Bookmarks on this page are managed by an admin user."
 msgstr "Lesezeichen auf dieser Seite werden von einem Administrator gepflegt."
 
-#: data/templates/bookmarks.tpl.php:71
-#: data/templates/bookmarks.tpl.php:72
+#: data/templates/default/bookmarks.tpl.php:73
+#: data/templates/default/bookmarks.tpl.php:74
 msgid "Edit the common description of this tag"
 msgstr "Den gemeinsamen Beschreibungstext bearbeiten"
 
-#: data/templates/bookmarks.tpl.php:75
-#: data/templates/bookmarks.tpl.php:76
+#: data/templates/default/bookmarks.tpl.php:77
+#: data/templates/default/bookmarks.tpl.php:78
 msgid "Edit the common description of this bookmark"
 msgstr "Den gemeinsamen Beschreibungstext bearbeiten"
 
-#: data/templates/bookmarks.tpl.php:96
-#: data/templates/bookmarks.tpl.php:97
+#: data/templates/default/bookmarks.tpl.php:98
+#: data/templates/default/bookmarks.tpl.php:99
 msgid "Edit your personal description of this tag"
 msgstr "Privaten Beschreibungstext bearbeiten"
 
-#: data/templates/bookmarks.tpl.php:113
-#: data/templates/tags.tpl.php:10
-#: data/templates/users.tpl.php:8
+#: data/templates/default/bookmarks.tpl.php:115
+#: data/templates/default/tags.tpl.php:10
+#: data/templates/default/users.tpl.php:8
 msgid "Sort by:"
 msgstr "Sortieren nach:"
 
-#: data/templates/bookmarks.tpl.php:155
+#: data/templates/default/bookmarks.tpl.php:157
 msgid "Date"
 msgstr "Datum"
 
-#: data/templates/bookmarks.tpl.php:160
+#: data/templates/default/bookmarks.tpl.php:162
 msgid "Voting"
 msgstr "Stimmen"
 
-#: data/templates/bookmarks.tpl.php:169
+#: data/templates/default/bookmarks.tpl.php:171
 msgid "Bookmarks from other users for this tag"
 msgstr "Lesezeichen anderer Benutzer mit diesem Schlagwort"
 
-#: data/templates/bookmarks.tpl.php:174
+#: data/templates/default/bookmarks.tpl.php:176
 msgid "Only your bookmarks for this tag"
 msgstr "Nur meine Lesezeichen für dieses Schlagwort"
 
-#: data/templates/bookmarks.tpl.php:197
-#: data/templates/bookmarks.tpl.php:203
+#: data/templates/default/bookmarks.tpl.php:199
+#: data/templates/default/bookmarks.tpl.php:205
 msgid "First"
 msgstr "neueste Lesezeichen"
 
-#: data/templates/bookmarks.tpl.php:198
-#: data/templates/bookmarks.tpl.php:204
+#: data/templates/default/bookmarks.tpl.php:200
+#: data/templates/default/bookmarks.tpl.php:206
 msgid "Previous"
 msgstr "vorherige"
 
-#: data/templates/bookmarks.tpl.php:211
-#: data/templates/bookmarks.tpl.php:214
+#: data/templates/default/bookmarks.tpl.php:213
+#: data/templates/default/bookmarks.tpl.php:216
 msgid "Next"
 msgstr "weitere"
 
-#: data/templates/bookmarks.tpl.php:212
-#: data/templates/bookmarks.tpl.php:215
+#: data/templates/default/bookmarks.tpl.php:214
+#: data/templates/default/bookmarks.tpl.php:217
 msgid "Last"
 msgstr "älteste Lesezeichen"
 
-#: data/templates/bookmarks.tpl.php:228
+#: data/templates/default/bookmarks.tpl.php:233
 #, php-format
 msgid "Page %d of %d"
 msgstr "Seite %d von %d"
 
-#: data/templates/bookmarks.tpl.php:290
+#: data/templates/default/bookmarks.tpl.php:295
 msgid "Tags:"
 msgstr "Schlagwörter:"
 
-#: data/templates/bookmarks.tpl.php:297
+#: data/templates/default/bookmarks.tpl.php:302
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: data/templates/bookmarks.tpl.php:305
+#: data/templates/default/bookmarks.tpl.php:310
 msgid "Last update"
 msgstr "Letzte Änderung"
 
-#: data/templates/bookmarks.tpl.php:308
+#: data/templates/default/bookmarks.tpl.php:313
 msgid "by"
 msgstr "von"
 
-#: data/templates/bookmarks.tpl.php:312
+#: data/templates/default/bookmarks.tpl.php:317
 msgid "you"
 msgstr "dir"
 
-#: data/templates/bookmarks.tpl.php:328
+#: data/templates/default/bookmarks.tpl.php:333
 #, php-format
 msgid " and %s1 other%s"
 msgstr " und %s1 anderen Person%s"
 
-#: data/templates/bookmarks.tpl.php:331
+#: data/templates/default/bookmarks.tpl.php:336
 #, php-format
 msgid " and %2$s%1$s others%3$s"
 msgstr " und %2$s%1$s anderer Person%3$s"
 
-#: data/templates/bookmarks.tpl.php:345
+#: data/templates/default/bookmarks.tpl.php:350
 msgid "Copy this bookmark to YOUR bookmarks."
 msgstr "Dieses Lesezeichen in DEINE Lesezeichen kopieren."
 
-#: data/templates/bookmarks.tpl.php:346
+#: data/templates/default/bookmarks.tpl.php:351
 msgid "Copy"
 msgstr "Kopieren"
 
-#: data/templates/bookmarks.tpl.php:366
+#: data/templates/default/bookmarks.tpl.php:376
 msgid "This bookmark is certified by an admin user."
 msgstr "Dieses Lesezeichen wurde von einem Administrator verifiziert"
 
-#: data/templates/bookmarks.tpl.php:419
+#: data/templates/default/bookmarks.tpl.php:430
 msgid "Private Note on this bookmark"
 msgstr "Private Notiz zu diesem Lesezeichen"
 
-#: data/templates/bookmarks.tpl.php:433
+#: data/templates/default/bookmarks.tpl.php:444
 msgid "Come back to the top of this page."
 msgstr "Zurück zum Seitenanfang"
 
-#: data/templates/bookmarks.tpl.php:433
+#: data/templates/default/bookmarks.tpl.php:444
 msgid "Top of the page"
 msgstr "Seitenanfang"
 
-#: data/templates/bookmarks.tpl.php:439
+#: data/templates/default/bookmarks.tpl.php:450
 msgid "No bookmarks available"
 msgstr "Leider sind keine Lesezeichen vorhanden."
 
-#: 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/default/bottom.inc.php:5
+#: data/templates/default/toolbar.inc.php:15
+#: data/templates/default/toolbar.inc.php:28 www/about.php:23 www/about.php:24
 msgid "About"
 msgstr "Impressum"
 
-#: data/templates/bottom.inc.php:7
+#: data/templates/default/bottom.inc.php:7
 msgid "Propulsed by "
 msgstr "Angetrieben von"
 
-#: data/templates/dynamictags.inc.php:56
-#: 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/default/dynamictags.inc.php:56
+#: data/templates/default/sidebar.block.common.php:19
+#: data/templates/default/sidebar.block.popular.php:34
+#: data/templates/default/sidebar.block.recent.php:29
+#: data/templates/default/tags.tpl.php:19
 msgid "bookmark"
 msgid_plural "bookmarks"
 msgstr[0] "Lesezeichen"
 msgstr[1] "Lesezeichen"
 
-#: data/templates/dynamictags.inc.php:105
-#: 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
+#: data/templates/default/dynamictags.inc.php:105
+#: data/templates/default/sidebar.block.common.php:9
+#: data/templates/default/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.popular.php:23
+#: data/templates/default/sidebar.block.recent.php:34
+#: data/templates/default/toolbar.inc.php:27 www/populartags.php:46
 msgid "Popular Tags"
 msgstr "Populäre Schlagwörter"
 
-#: data/templates/dynamictags.inc.php:108
+#: data/templates/default/dynamictags.inc.php:108
 msgid "Popular Tags From All Users"
 msgstr "Populäre Schlagwörter von allen Benutzern"
 
-#: data/templates/editbookmark.tpl.php:46
+#: data/templates/default/editbookmark.tpl.php:46
 msgid "Address"
 msgstr "Webadresse"
 
-#: data/templates/editbookmark.tpl.php:48
-#: data/templates/editbookmark.tpl.php:53
-#: data/templates/editprofile.tpl.php:29
-#: data/templates/tagrename.tpl.php:14
-#: data/templates/tagrename.tpl.php:19
+#: data/templates/default/editbookmark.tpl.php:48
+#: data/templates/default/editbookmark.tpl.php:53
+#: data/templates/default/editprofile.tpl.php:29
+#: data/templates/default/tagrename.tpl.php:14
+#: data/templates/default/tagrename.tpl.php:19
 msgid "Required"
 msgstr "Erforderlich"
 
-#: data/templates/editbookmark.tpl.php:58
+#: data/templates/default/editbookmark.tpl.php:58
 msgid "Add Note"
 msgstr "Notiz hinzufügen"
 
-#: data/templates/editbookmark.tpl.php:61
-msgid "You can use anchors to delimite attributes. for example: [publisher]blah[/publisher] "
-msgstr "Anker können benutzt werden, um Attribute zu begrenzen: [publisher]blah[/publisher] "
+#: data/templates/default/editbookmark.tpl.php:61
+msgid ""
+"You can use anchors to delimite attributes. for example: [publisher]blah[/"
+"publisher] "
+msgstr ""
+"Anker können benutzt werden, um Attribute zu begrenzen: [publisher]blah[/"
+"publisher] "
 
-#: data/templates/editbookmark.tpl.php:64
+#: data/templates/default/editbookmark.tpl.php:64
 msgid "Suggested anchors: "
 msgstr "Vorschläge: "
 
-#: data/templates/editbookmark.tpl.php:76
+#: data/templates/default/editbookmark.tpl.php:76
 msgid "Private Note"
 msgstr "Privatnotiz"
 
-#: data/templates/editbookmark.tpl.php:78
+#: data/templates/default/editbookmark.tpl.php:78
 msgid "Just visible by you and your contacts."
 msgstr "Nur für dich und deine Kontakte sichtbar."
 
-#: data/templates/editbookmark.tpl.php:82
-#: data/templates/toolbar.inc.php:10
-#: www/tags.php:45
-#: www/tags.php:67
+#: data/templates/default/editbookmark.tpl.php:82
+#: data/templates/default/toolbar.inc.php:10 www/tags.php:45 www/tags.php:67
 msgid "Tags"
 msgstr "Schlagwörter"
 
-#: data/templates/editbookmark.tpl.php:86
+#: data/templates/default/editbookmark.tpl.php:86
 msgid "Comma-separated"
 msgstr "kommagetrennt"
 
-#: data/templates/editbookmark.tpl.php:90
-#: data/templates/tag2tagadd.tpl.php:9
-msgid "Note: use \">\" to include one tag in another. e.g.: europe>france>paris"
-msgstr "Anmerkung: verwenden Sie \">\" um ein Schlagwort in ein hierarchisch höheres Schlagwort zu integrieren (z.B.: Europa>Frankreich>Paris)"
+#: data/templates/default/editbookmark.tpl.php:90
+#: data/templates/default/tag2tagadd.tpl.php:9
+msgid ""
+"Note: use \">\" to include one tag in another. e.g.: europe>france>paris"
+msgstr ""
+"Anmerkung: verwenden Sie \">\" um ein Schlagwort in ein hierarchisch höheres "
+"Schlagwort zu integrieren (z.B.: Europa>Frankreich>Paris)"
 
-#: data/templates/editbookmark.tpl.php:94
-#: data/templates/tag2tagadd.tpl.php:8
+#: data/templates/default/editbookmark.tpl.php:94
+#: data/templates/default/tag2tagadd.tpl.php:8
 msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry"
-msgstr "Anmerkung: verwenden Sie \"=\" um ein Synonym für ein Schlagwort zu integrieren (z.B.: Frankreich=französisches Land)"
+msgstr ""
+"Anmerkung: verwenden Sie \"=\" um ein Synonym für ein Schlagwort zu "
+"integrieren (z.B.: Frankreich=französisches Land)"
 
-#: data/templates/editbookmark.tpl.php:97
-#: data/templates/importDelicious.tpl.php:15
-#: data/templates/importNetscape.tpl.php:16
+#: data/templates/default/editbookmark.tpl.php:97
+#: data/templates/default/importDelicious.tpl.php:15
+#: data/templates/default/importNetscape.tpl.php:16
 msgid "Privacy"
 msgstr "Status"
 
-#: data/templates/editbookmark.tpl.php:100
-#: data/templates/importDelicious.tpl.php:18
-#: data/templates/importNetscape.tpl.php:19
+#: data/templates/default/editbookmark.tpl.php:100
+#: data/templates/default/importDelicious.tpl.php:18
+#: data/templates/default/importNetscape.tpl.php:19
 msgid "Public"
 msgstr "Öffentlich"
 
-#: data/templates/editbookmark.tpl.php:101
+#: data/templates/default/editbookmark.tpl.php:101
 msgid "Shared with Watch List"
 msgstr "Beobachtungsliste"
 
-#: data/templates/editbookmark.tpl.php:102
-#: data/templates/importDelicious.tpl.php:20
-#: data/templates/importNetscape.tpl.php:21
+#: data/templates/default/editbookmark.tpl.php:102
+#: data/templates/default/importDelicious.tpl.php:20
+#: data/templates/default/importNetscape.tpl.php:21
 msgid "Private"
 msgstr "Privat"
 
-#: data/templates/editbookmark.tpl.php:115
+#: data/templates/default/editbookmark.tpl.php:115
 msgid "Delete Bookmark"
 msgstr "Lesezeichen löschen"
 
-#: data/templates/editbookmark.tpl.php:120
+#: data/templates/default/editbookmark.tpl.php:120
 msgid "edit common description"
 msgstr "Die gemeinsame Beschreibung bearbeiten"
 
-#: data/templates/editbookmark.tpl.php:212
-#: data/templates/importDelicious.tpl.php:26
-#: data/templates/importNetscape.tpl.php:27
-#: data/templates/importStructure.tpl.php:16
+#: data/templates/default/editbookmark.tpl.php:212
+#: data/templates/default/importDelicious.tpl.php:26
+#: data/templates/default/importNetscape.tpl.php:27
+#: data/templates/default/importStructure.tpl.php:16
 msgid "Import"
 msgstr "Importieren"
 
-#: data/templates/editbookmark.tpl.php:214
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Import bookmarks from bookmark file"
 msgstr "Die Lesezeichen aus einer Lesezeichendatei importieren."
 
-#: data/templates/editbookmark.tpl.php:214
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Internet Explorer, Mozilla Firefox and Netscape"
 msgstr "Microsoft Internet Explorer, Mozilla Firefox und Netscape"
 
-#: data/templates/editbookmark.tpl.php:215
+#: data/templates/default/editbookmark.tpl.php:215
 msgid "Import bookmarks from del.icio.us"
 msgstr "Lesezeichen von del.icio.us importieren."
 
-#: data/templates/editprofile-sslclientcerts.tpl.php:11
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:11
 msgid "SSL client certificates"
 msgstr "SSL-Client-Zertifikate"
 
-#: data/templates/editprofile-sslclientcerts.tpl.php:17
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:17
 msgid "Serial"
 msgstr "Seriennummer"
 
-#: data/templates/editprofile-sslclientcerts.tpl.php:18
-#: data/templates/editprofile.tpl.php:37
-#: data/templates/profile.tpl.php:17
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:45
+#: data/templates/default/profile.tpl.php:17
 msgid "Name"
 msgstr "Name"
 
-#: data/templates/editprofile-sslclientcerts.tpl.php:19
-#: data/templates/profile.tpl.php:11
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:19
+#: data/templates/default/profile.tpl.php:11
 msgid "Email"
 msgstr "E-Mail"
 
-#: data/templates/editprofile-sslclientcerts.tpl.php:20
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:20
 msgid "Issuer"
 msgstr "Herausgeber"
 
-#: data/templates/editprofile-sslclientcerts.tpl.php:30
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:30
 msgid "delete"
 msgstr "Löschen"
 
-#: data/templates/editprofile-sslclientcerts.tpl.php:43
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:43
 msgid "No certificates registered"
 msgstr "Es sind keine Zertifikate registriert."
 
-#: data/templates/editprofile-sslclientcerts.tpl.php:48
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:48
 msgid "Your current certificate is already registered with your account."
 msgstr "Dein aktuelles Zertifikat ist bereits registriert."
 
-#: data/templates/editprofile-sslclientcerts.tpl.php:53
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:53
 msgid "Register current certificate to automatically login."
 msgstr "Aktuelles Zertifikat zum automatischen Einloggen registrieren."
 
-#: data/templates/editprofile-sslclientcerts.tpl.php:59
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:59
 msgid "Your browser does not provide a certificate."
 msgstr "Dein Browser stellt kein Zertifikat zu Verfügung."
 
-#: data/templates/editprofile.tpl.php:8
+#: data/templates/default/editprofile.tpl.php:8
 msgid "Account Details"
 msgstr "Kontodetails"
 
-#: data/templates/editprofile.tpl.php:12
-#: data/templates/login.tpl.php:21
-#: data/templates/password.tpl.php:10
-#: data/templates/profile.tpl.php:6
-#: data/templates/register.tpl.php:16
+#: data/templates/default/editprofile.tpl.php:12
+#: data/templates/default/login.tpl.php:21
+#: data/templates/default/password.tpl.php:10
+#: data/templates/default/profile.tpl.php:6
+#: data/templates/default/register.tpl.php:16
 msgid "Username"
 msgstr "Benutzername"
 
-#: data/templates/editprofile.tpl.php:17
+#: data/templates/default/editprofile.tpl.php:17
 msgid "New Password"
 msgstr "Neues Passwort"
 
-#: data/templates/editprofile.tpl.php:22
+#: data/templates/default/editprofile.tpl.php:22
 msgid "Confirm Password"
 msgstr "Passwort bestätigen"
 
-#: data/templates/editprofile.tpl.php:27
-#: data/templates/password.tpl.php:14
-#: data/templates/register.tpl.php:26
+#: data/templates/default/editprofile.tpl.php:27
+#: data/templates/default/password.tpl.php:14
+#: data/templates/default/register.tpl.php:26
 msgid "E-mail"
 msgstr "E-Mail"
 
-#: data/templates/editprofile.tpl.php:33
+#: data/templates/default/editprofile.tpl.php:32
+#, fuzzy
+msgid "Private RSS Feed"
+msgstr "Privatnotiz"
+
+#: data/templates/default/editprofile.tpl.php:34
+msgid "Enable"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:36
+#, fuzzy
+msgid "Generate New Key"
+msgstr "Passwort generieren"
+
+#: data/templates/default/editprofile.tpl.php:41
 msgid "Personal Details"
 msgstr "Persönliche Details"
 
-#: data/templates/editprofile.tpl.php:41
-#: data/templates/profile.tpl.php:23
+#: data/templates/default/editprofile.tpl.php:49
+#: data/templates/default/profile.tpl.php:23
 msgid "Homepage"
 msgstr "Homepage"
 
-#: data/templates/editprofile.tpl.php:50
-#: www/edit.php:113
+#: data/templates/default/editprofile.tpl.php:58 www/edit.php:113
 msgid "Save Changes"
 msgstr "Änderungen speichern"
 
-#: data/templates/editprofile.tpl.php:55
-#: data/templates/sidebar.block.tagactions.php:17
-#: data/templates/sidebar.block.watchstatus.php:18
+#: data/templates/default/editprofile.tpl.php:63
+#: data/templates/default/sidebar.block.tagactions.php:17
+#: data/templates/default/sidebar.block.watchstatus.php:18
 msgid "Actions"
 msgstr "Aktionen"
 
-#: data/templates/editprofile.tpl.php:58
+#: data/templates/default/editprofile.tpl.php:66
 msgid "Export bookmarks"
 msgstr "Lesezeichen exportieren"
 
-#: data/templates/editprofile.tpl.php:60
+#: data/templates/default/editprofile.tpl.php:68
 msgid "HTML file (for browsers)"
 msgstr "HTML-Datei (für Webbrowser)"
 
-#: data/templates/editprofile.tpl.php:61
+#: data/templates/default/editprofile.tpl.php:69
 msgid "XML file (like del.icio.us)"
 msgstr "XML-Datei (für del.icio.us etc.)"
 
-#: data/templates/editprofile.tpl.php:62
+#: data/templates/default/editprofile.tpl.php:70
 msgid "CSV file (for spreadsheet tools)"
 msgstr "CSV-Datei (für Tabellenkalkulationen)"
 
-#: data/templates/error.404.tpl.php:5
+#: data/templates/default/error.404.tpl.php:5
 msgid "Not Found"
 msgstr "Nicht gefunden!"
 
-#: data/templates/error.404.tpl.php:6
+#: data/templates/default/error.404.tpl.php:6
 msgid "The requested URL was not found on this server"
 msgstr "Die angeforderte URL wurde auf diesem Server nicht gefunden"
 
-#: data/templates/error.500.tpl.php:5
+#: data/templates/default/error.500.tpl.php:5
 msgid "General server error"
 msgstr "Allgemeiner Serverfehler"
 
-#: data/templates/error.500.tpl.php:6
+#: data/templates/default/error.500.tpl.php:6
 msgid "The requested URL could not be processed"
 msgstr "Die angeforderte URL konnte nicht verarbeitet werden"
 
-#: data/templates/importDelicious.tpl.php:19
-#: data/templates/importNetscape.tpl.php:20
+#: data/templates/default/importDelicious.tpl.php:19
+#: data/templates/default/importNetscape.tpl.php:20
 msgid "Shared with Watchlist"
 msgstr "Beobachtungsliste"
 
-#: data/templates/importDelicious.tpl.php:31
-#: data/templates/importNetscape.tpl.php:32
-#: data/templates/importStructure.tpl.php:21
+#: data/templates/default/importDelicious.tpl.php:31
+#: data/templates/default/importNetscape.tpl.php:32
+#: data/templates/default/importStructure.tpl.php:21
 msgid "Instructions"
 msgstr "Instruktionen"
 
-#: 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 "Melden Sie sich <a href=\"http://del.icio.us/api/posts/all\">bei del.icio.us an</a>, um Ihre Lesezeichen zu exportieren"
+#: data/templates/default/importDelicious.tpl.php:33
+#, fuzzy
+msgid ""
+"Log in to the <a href=\"https://api.del.icio.us/v1/posts/all\">export page "
+"at del.icio.us</a>"
+msgstr ""
+"Melden Sie sich <a href=\"http://del.icio.us/api/posts/all\">bei del.icio.us "
+"an</a>, um Ihre Lesezeichen zu exportieren"
 
-#: data/templates/importDelicious.tpl.php:34
-msgid "Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> file to your computer"
-msgstr "Speichern Sie die resultierende <abbr title=\"Extensible Markup Language\">XML</abbr>-Datei lokal auf Ihrem Computer"
+#: data/templates/default/importDelicious.tpl.php:34
+msgid ""
+"Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> "
+"file to your computer"
+msgstr ""
+"Speichern Sie die resultierende <abbr title=\"Extensible Markup Language"
+"\">XML</abbr>-Datei lokal auf Ihrem Computer"
 
-#: 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 "Klicken Sie auf <kbd>Durchsuchen...</kbd> um die bereits gespeicherte Lesezeichendatei auszuwählen. Die Dateigröße darf maximal 1 MB betragen"
+#: data/templates/default/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 ""
+"Klicken Sie auf <kbd>Durchsuchen...</kbd> um die bereits gespeicherte "
+"Lesezeichendatei auszuwählen. Die Dateigröße darf maximal 1 MB betragen"
 
-#: data/templates/importDelicious.tpl.php:36
-#: data/templates/importNetscape.tpl.php:43
+#: data/templates/default/importDelicious.tpl.php:36
+#: data/templates/default/importNetscape.tpl.php:43
 msgid "Select the default privacy setting for your imported bookmarks"
-msgstr "Wählen Sie die Standardeinstellung der Privatsphäre für Ihre zu importierenden Lesezeichen"
+msgstr ""
+"Wählen Sie die Standardeinstellung der Privatsphäre für Ihre zu "
+"importierenden Lesezeichen"
 
-#: 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 "Klicken Sie auf <kbd>Importieren</kbd> um die bereits lokal gespeicherte Lesezeichendatei zu importieren. Dieser Prozess kann bis zu eine Minute andauern"
+#: data/templates/default/importDelicious.tpl.php:37
+#: data/templates/default/importNetscape.tpl.php:44
+msgid ""
+"Click <kbd>Import</kbd> to start importing the bookmarks; it may take a "
+"minute"
+msgstr ""
+"Klicken Sie auf <kbd>Importieren</kbd> um die bereits lokal gespeicherte "
+"Lesezeichendatei zu importieren. Dieser Prozess kann bis zu eine Minute "
+"andauern"
 
-#: data/templates/importNetscape.tpl.php:35
+#: data/templates/default/importNetscape.tpl.php:35
 msgid "Export your bookmarks from your browser to a file"
 msgstr "Exportieren Sie Ihre Lesezeichen aus dem Webbrowser in eine Datei"
 
-#: data/templates/importNetscape.tpl.php:37
-msgid "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
-msgstr "Microsoft Internet Explorer: <kbd>Datei  &gt; Importieren und Exportieren...  &gt; Favoriten exportieren"
+#: data/templates/default/importNetscape.tpl.php:37
+msgid ""
+"Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
+msgstr ""
+"Microsoft Internet Explorer: <kbd>Datei  &gt; Importieren und "
+"Exportieren...  &gt; Favoriten exportieren"
 
-#: data/templates/importNetscape.tpl.php:38
-msgid "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; Export..."
-msgstr "Mozilla Firefox: <kbd>Lesezeichen  &gt; Lesezeichen verwalten... &gt; Datei &gt; Exportieren..."
+#: data/templates/default/importNetscape.tpl.php:38
+msgid ""
+"Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
+"Export..."
+msgstr ""
+"Mozilla Firefox: <kbd>Lesezeichen  &gt; Lesezeichen verwalten... &gt; Datei "
+"&gt; Exportieren..."
 
-#: data/templates/importNetscape.tpl.php:39
-msgid "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
-msgstr "Netscape: <kbd>Lesezeichen &gt; Lesezeichen verwalten... &gt; Werkzeuge &gt; Exportieren..."
+#: data/templates/default/importNetscape.tpl.php:39
+msgid ""
+"Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
+msgstr ""
+"Netscape: <kbd>Lesezeichen &gt; Lesezeichen verwalten... &gt; Werkzeuge &gt; "
+"Exportieren..."
 
-#: 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 "Klicken Sie auf <kbd>Durchsuchen...</kbd> um die bereits gespeicherte Lesezeichendatei auszuwählen. Die Dateigröße darf maximal 1 MB betragen"
+#: data/templates/default/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 ""
+"Klicken Sie auf <kbd>Durchsuchen...</kbd> um die bereits gespeicherte "
+"Lesezeichendatei auszuwählen. Die Dateigröße darf maximal 1 MB betragen"
 
-#: data/templates/importStructure.tpl.php:24
+#: data/templates/default/importStructure.tpl.php:24
 msgid "Create your structure into a simple text file and following this model:"
-msgstr "Erstelle deine eigene Struktur in einer einfachen Textdatei und folge folgendem Modell:"
+msgstr ""
+"Erstelle deine eigene Struktur in einer einfachen Textdatei und folge "
+"folgendem Modell:"
 
-#: data/templates/importStructure.tpl.php:35
-msgid "Then import the file. The tags and their relations will be added to your profile."
-msgstr "Importiere die Datei. Die Schlagwörter und ihre Beziehungen werden deinem Profil hinzugefügt."
+#: data/templates/default/importStructure.tpl.php:35
+msgid ""
+"Then import the file. The tags and their relations will be added to your "
+"profile."
+msgstr ""
+"Importiere die Datei. Die Schlagwörter und ihre Beziehungen werden deinem "
+"Profil hinzugefügt."
 
-#: data/templates/login.tpl.php:13
+#: data/templates/default/login.tpl.php:13
 msgid "Please activate cookies"
 msgstr "Bitte Cookies aktivieren"
 
-#: data/templates/login.tpl.php:26
-#: data/templates/register.tpl.php:21
+#: data/templates/default/login.tpl.php:26
+#: data/templates/default/register.tpl.php:21
 msgid "Password"
 msgstr "Passwort"
 
-#: data/templates/login.tpl.php:28
+#: data/templates/default/login.tpl.php:28
 msgid "Don't ask for my password for 2 weeks"
 msgstr "Zwei Wochen nicht nach meinem Passwort fragen"
 
-#: data/templates/login.tpl.php:32
-#: data/templates/toolbar.inc.php:29
-#: www/login.php:57
+#: data/templates/default/login.tpl.php:32
+#: data/templates/default/toolbar.inc.php:29 www/login.php:57
 msgid "Log In"
 msgstr "Anmelden"
 
-#: data/templates/login.tpl.php:36
+#: data/templates/default/login.tpl.php:36
 msgid "Forgotten your password?"
 msgstr "Haben Sie Ihr Passwort vergessen?"
 
-#: data/templates/password.tpl.php:5
+#: data/templates/default/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 "Sofern Sie Ihr Passwort vergessen haben, können Sie nun durch %s ein neues Passwort erstellen lassen. Geben Sie zur Verifizierung Ihren Benutzernamen und Ihre E-Mail Adresse Ihres Accounts ein. In Kürze erhalten Sie ein neues Passwort. Verwenden Sie dieses Passwort, um sich erfolgreich anzumelden."
+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 ""
+"Sofern Sie Ihr Passwort vergessen haben, können Sie nun durch %s ein neues "
+"Passwort erstellen lassen. Geben Sie zur Verifizierung Ihren Benutzernamen "
+"und Ihre E-Mail Adresse Ihres Accounts ein. In Kürze erhalten Sie ein neues "
+"Passwort. Verwenden Sie dieses Passwort, um sich erfolgreich anzumelden."
 
-#: data/templates/password.tpl.php:19
+#: data/templates/default/password.tpl.php:19
 msgid "Generate Password"
 msgstr "Passwort generieren"
 
-#: data/templates/profile.tpl.php:28
+#: data/templates/default/profile.tpl.php:28
 msgid "Member Since"
 msgstr "Mitglied seit"
 
-#: data/templates/profile.tpl.php:40
-#: data/templates/sidebar.block.watchlist.php:30
+#: data/templates/default/profile.tpl.php:40
+#: data/templates/default/sidebar.block.watchlist.php:30
 msgid "Watching"
 msgstr "Beobachten"
 
-#: data/templates/profile.tpl.php:55
-#: data/templates/sidebar.block.watchlist.php:52
+#: data/templates/default/profile.tpl.php:55
+#: data/templates/default/sidebar.block.watchlist.php:52
 msgid "Watched By"
 msgstr "Beobachtet von"
 
-#: data/templates/profile.tpl.php:68
-#: data/templates/toolbar.inc.php:9
+#: data/templates/default/profile.tpl.php:68
+#: data/templates/default/toolbar.inc.php:9
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
-#: data/templates/profile.tpl.php:69
+#: data/templates/default/profile.tpl.php:69
 msgid "Go to bookmarks"
 msgstr "Zu den Lesezeichen"
 
-#: data/templates/register.tpl.php:11
+#: data/templates/default/register.tpl.php:11
 #, php-format
-msgid "Sign up here to create a free %s account. All the information requested below is required"
-msgstr "Registrieren Sie sich hier für ein kostenloses %s Konto. Alle unten angeforderten Informationen sind für die Registrierung erforderlich"
+msgid ""
+"Sign up here to create a free %s account. All the information requested "
+"below is required"
+msgstr ""
+"Registrieren Sie sich hier für ein kostenloses %s Konto. Alle unten "
+"angeforderten Informationen sind für die Registrierung erforderlich"
 
-#: data/templates/register.tpl.php:18
-msgid " at least 5 characters, alphanumeric (no spaces, no dots or other special ones)"
-msgstr " mindestens 5 alphanumerische Zeichen (keine Leerzeichen, keine Punkte oder andere Sonderzeichen)"
+#: data/templates/default/register.tpl.php:18
+msgid ""
+" at least 5 characters, alphanumeric (no spaces, no dots or other special "
+"ones)"
+msgstr ""
+" mindestens 5 alphanumerische Zeichen (keine Leerzeichen, keine Punkte oder "
+"andere Sonderzeichen)"
 
-#: data/templates/register.tpl.php:28
+#: data/templates/default/register.tpl.php:28
 msgid " to send you your password if you forget it"
 msgstr " zum Versenden des Passworts"
 
-#: data/templates/register.tpl.php:33
+#: data/templates/default/register.tpl.php:33
 msgid "Antispam question"
 msgstr "Sicherheitsfrage"
 
-#: data/templates/register.tpl.php:41
-#: data/templates/toolbar.inc.php:31
-#: www/register.php:99
+#: data/templates/default/register.tpl.php:41
+#: data/templates/default/toolbar.inc.php:31 www/register.php:99
 msgid "Register"
 msgstr "Registrieren"
 
-#: data/templates/search.menu.php:27
+#: data/templates/default/search.menu.php:27
 msgid "Search..."
 msgstr "Suche"
 
-#: data/templates/search.menu.php:28
+#: data/templates/default/search.menu.php:28
 msgid "in"
 msgstr "in"
 
-#: data/templates/search.menu.php:34
+#: data/templates/default/search.menu.php:34
 msgid "this user's bookmarks"
 msgstr "Lesezeichen des Benutzers"
 
-#: data/templates/search.menu.php:39
+#: data/templates/default/search.menu.php:39
 msgid "my bookmarks"
 msgstr "meine Lesezeichen"
 
-#: data/templates/search.menu.php:40
+#: data/templates/default/search.menu.php:40
 msgid "my watchlist"
 msgstr "meine Beobachtungsliste"
 
-#: data/templates/search.menu.php:44
+#: data/templates/default/search.menu.php:44
 msgid "all bookmarks"
 msgstr "alle Lesezeichen"
 
-#: data/templates/search.menu.php:54
+#: data/templates/default/search.menu.php:54
 msgid "Search"
 msgstr "Suche"
 
-#: data/templates/sidebar.block.linked.php:23
+#: data/templates/default/sidebar.block.linked.php:23
 msgid "Linked Tags"
 msgstr "Ausgewählte Schlagwörter"
 
-#: data/templates/sidebar.block.linked.php:28
-#: data/templates/sidebar.block.menu.php:46
+#: data/templates/default/sidebar.block.linked.php:28
+#: data/templates/default/sidebar.block.menu.php:46
 msgid "Add new link"
 msgstr "Einen neuen Navigationslink hinzufügen."
 
-#: data/templates/sidebar.block.linked.php:29
-#: data/templates/sidebar.block.menu.php:47
+#: data/templates/default/sidebar.block.linked.php:29
+#: data/templates/default/sidebar.block.menu.php:47
 msgid "Delete link"
 msgstr "Einen Navigationslink löschen."
 
-#: data/templates/sidebar.block.menu.php:35
+#: data/templates/default/sidebar.block.menu.php:35
 #, php-format
 msgid "Tags included into the tag '%s'"
 msgstr "Schlagwörter, die im Schlagwort '%s' enthalten sind."
 
-#: data/templates/sidebar.block.menu.php:35
+#: data/templates/default/sidebar.block.menu.php:35
 msgid "Menu Tags"
 msgstr "Spezielle Schlagwörter"
 
-#: data/templates/sidebar.block.menu.php:68
+#: data/templates/default/sidebar.block.menu.php:68
 msgid "See all your tags"
 msgstr "Betrachten Sie all Ihre Schlagwörter."
 
-#: data/templates/sidebar.block.menu.php:68
+#: data/templates/default/sidebar.block.menu.php:68
 msgid "all your tags"
 msgstr "All Ihre Schlagwörter."
 
-#: data/templates/sidebar.block.menu.php:70
+#: data/templates/default/sidebar.block.menu.php:70
 msgid "See all tags from this user"
 msgstr "Betrachten Sie sämtliche Schlagwörter dieses Benutzers."
 
-#: data/templates/sidebar.block.menu.php:70
+#: data/templates/default/sidebar.block.menu.php:70
 msgid "all tags from this user"
 msgstr "Sämtliche Schlagwörter dieses Benutzers."
 
-#: data/templates/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.menu.php:74
 msgid "See popular tags"
 msgstr "Betrachten Sie populäre Schlagwörter."
 
-#: data/templates/sidebar.block.menu2.php:21
+#: data/templates/default/sidebar.block.menu2.php:21
 msgid "Featured Menu Tags"
 msgstr "Spezielle Schlagwörter"
 
-#: data/templates/sidebar.block.menu2.php:25
+#: data/templates/default/sidebar.block.menu2.php:25
 msgid "This menu is composed of keywords (tags) organized by admins."
-msgstr "Dieses Menü ist aus von Administratoren ausgesuchten Schlagwörtern zusammengestellt"
+msgstr ""
+"Dieses Menü ist aus von Administratoren ausgesuchten Schlagwörtern "
+"zusammengestellt"
 
-#: data/templates/sidebar.block.recent.php:18
+#: data/templates/default/sidebar.block.recent.php:18
 msgid "Recent Tags"
 msgstr "Neueste Schlagwörter"
 
-#: data/templates/sidebar.block.related.php:26
+#: data/templates/default/sidebar.block.related.php:26
 msgid "Related Tags"
 msgstr "Verwandte Schlagwörter"
 
-#: data/templates/sidebar.block.search.php:28
+#: data/templates/default/sidebar.block.search.php:28
 msgid "Last Searches"
 msgstr "Neueste Suchbegriffe"
 
-#: data/templates/sidebar.block.search.php:40
+#: data/templates/default/sidebar.block.search.php:40
 msgid "Number of bookmarks for this query"
 msgstr "Die Anzahl der Favoriten für diese Anfrage"
 
-#: data/templates/sidebar.block.tagactions.php:9
-#: www/tagrename.php:72
+#: data/templates/default/sidebar.block.tagactions.php:9 www/tagrename.php:72
 msgid "Rename Tag"
 msgid_plural "Rename Tags"
 msgstr[0] "Das Schlagwort umbenennen."
 msgstr[1] "Die Schlagwörter umbenennen."
 
-#: data/templates/sidebar.block.tagactions.php:22
-#: www/tagdelete.php:54
+#: data/templates/default/sidebar.block.tagactions.php:22 www/tagdelete.php:54
 msgid "Delete Tag"
 msgstr "Das Schlagwort löschen."
 
-#: data/templates/sidebar.block.tagactions.php:24
-#: www/tagedit.php:61
+#: data/templates/default/sidebar.block.tagactions.php:24 www/tagedit.php:61
 msgid "Edit Tag Description"
 msgstr "Die Schlagwortbeschreibung bearbeiten"
 
-#: data/templates/sidebar.block.tagactions.php:26
+#: data/templates/default/sidebar.block.tagactions.php:26
 #: www/tagcommondescriptionedit.php:76
 msgid "Edit Tag Common Description"
 msgstr "Die gemeinsame Beschreibung des Schlagwortes bearbeiten."
 
-#: data/templates/sidebar.block.tagactions.php:28
+#: data/templates/default/sidebar.block.tagactions.php:28
 msgid "Create a link to another tag"
 msgstr "Eine Verbindung zwischen Schlagwörtern erstellen."
 
-#: data/templates/sidebar.block.users.php:14
+#: data/templates/default/sidebar.block.users.php:14
 msgid "New Users"
 msgstr "Neue Benutzer"
 
-#: data/templates/sidebar.block.users.php:23
-#: data/templates/users.tpl.php:24
+#: data/templates/default/sidebar.block.users.php:23
+#: data/templates/default/users.tpl.php:24
 msgid "bookmarks"
 msgstr "Lesezeichen"
 
-#: data/templates/sidebar.block.users.php:30
+#: data/templates/default/sidebar.block.users.php:30
 msgid "See all users"
 msgstr "Alle Benutzer anzeigen"
 
-#: data/templates/sidebar.block.users.php:30
+#: data/templates/default/sidebar.block.users.php:30
 msgid "All users"
 msgstr "Alle Benutzer"
 
-#: data/templates/sidebar.block.watchlist.php:19
+#: data/templates/default/sidebar.block.watchlist.php:19
 msgid "Close contacts are mutual contacts"
 msgstr "Nahe Kontakte sind gemeinsame Kontakte"
 
-#: data/templates/sidebar.block.watchlist.php:19
+#: data/templates/default/sidebar.block.watchlist.php:19
 msgid "Close contacts"
 msgstr "Nahe Kontakte"
 
-#: data/templates/sidebar.block.watchlist.php:36
+#: data/templates/default/sidebar.block.watchlist.php:36
 msgid "Add a contact..."
 msgstr "Kontakt hinzufügen"
 
-#: data/templates/sidebar.block.watchlist.php:36
+#: data/templates/default/sidebar.block.watchlist.php:36
 msgid "Type a username to add it to your contacts."
 msgstr "Benutzername eingeben, der den Kontakten hinzugefügt werden soll."
 
-#: data/templates/sidebar.block.watchlist.php:44
+#: data/templates/default/sidebar.block.watchlist.php:44
 msgid "Remove this contact"
 msgstr "Kontakt entfernen"
 
-#: data/templates/sidebar.block.watchstatus.php:11
+#: data/templates/default/sidebar.block.watchstatus.php:11
 msgid "Remove from Watchlist"
 msgstr "Aus der Beobachtungsliste löschen"
 
-#: data/templates/sidebar.block.watchstatus.php:13
+#: data/templates/default/sidebar.block.watchstatus.php:13
 msgid "Add to Watchlist"
 msgstr "Zur Beobachtungsliste hinzufügen"
 
-#: data/templates/sidebar.linkedtags.inc.php:18
+#: data/templates/default/sidebar.linkedtags.inc.php:18
 msgid "Edit link"
 msgstr "Den Weblink bearbeiten."
 
-#: data/templates/sidebar.linkedtags.inc.php:47
+#: data/templates/default/sidebar.linkedtags.inc.php:47
 msgid "Synonyms:"
 msgstr "Synonyme:"
 
-#: data/templates/tag2tagadd.tpl.php:12
+#: data/templates/default/tag2tagadd.tpl.php:12
 msgid "Create new link:"
 msgstr "Eine neue Verbindung erstellen:"
 
-#: data/templates/tag2tagadd.tpl.php:19
+#: data/templates/default/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 "Anmerkung: Fügen Sie ein Schlagwort dem '%s' Schlagwort hinzu (z.B.: %s>Länder), so erscheint dieses Schlagwort in der Navigationsbox."
+msgid ""
+"Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into "
+"the menu box"
+msgstr ""
+"Anmerkung: Fügen Sie ein Schlagwort dem '%s' Schlagwort hinzu (z.B.: "
+"%s>Länder), so erscheint dieses Schlagwort in der Navigationsbox."
 
-#: data/templates/tag2tagadd.tpl.php:23
-#: data/templates/tag2tagedit.tpl.php:37
+#: data/templates/default/tag2tagadd.tpl.php:23
+#: data/templates/default/tag2tagedit.tpl.php:37
 msgid "Create"
 msgstr "Erstellen"
 
-#: data/templates/tag2tagadd.tpl.php:35
-#: data/templates/tag2tagdelete.tpl.php:27
-#: data/templates/tag2tagedit.tpl.php:51
+#: data/templates/default/tag2tagadd.tpl.php:35
+#: data/templates/default/tag2tagdelete.tpl.php:27
+#: data/templates/default/tag2tagedit.tpl.php:51
 msgid "Existing links:"
 msgstr "Bereits bestehende Navigationslinks:"
 
-#: data/templates/tag2tagadd.tpl.php:53
-#: data/templates/tag2tagdelete.tpl.php:45
-#: data/templates/tag2tagedit.tpl.php:69
+#: data/templates/default/tag2tagadd.tpl.php:53
+#: data/templates/default/tag2tagdelete.tpl.php:45
+#: data/templates/default/tag2tagedit.tpl.php:69
 msgid "No links"
 msgstr "Leider derzeit keine Weblinks."
 
-#: data/templates/tag2tagdelete.tpl.php:15
-#: data/templates/tag2tagedit.tpl.php:16
-#: data/templates/tagdelete.tpl.php:8
-#: www/jsScuttle.php:23
+#: data/templates/default/tag2tagdelete.tpl.php:15
+#: data/templates/default/tag2tagedit.tpl.php:16
+#: data/templates/default/tagdelete.tpl.php:8 www/jsScuttle.php:24
 msgid "Yes"
 msgstr "Ja"
 
-#: data/templates/tag2tagdelete.tpl.php:16
-#: data/templates/tag2tagedit.tpl.php:17
-#: data/templates/tagdelete.tpl.php:9
-#: www/jsScuttle.php:23
+#: data/templates/default/tag2tagdelete.tpl.php:16
+#: data/templates/default/tag2tagedit.tpl.php:17
+#: data/templates/default/tagdelete.tpl.php:9 www/jsScuttle.php:24
 msgid "No"
 msgstr "Nein"
 
-#: data/templates/tag2tagedit.tpl.php:6
+#: data/templates/default/tag2tagedit.tpl.php:6
 msgid "Delete the link"
 msgstr "Den Weblink löschen."
 
-#: data/templates/tag2tagedit.tpl.php:29
+#: data/templates/default/tag2tagedit.tpl.php:29
 msgid "Create new link"
 msgstr "Einen neuen Weblink erstellen"
 
-#: data/templates/tagrename.tpl.php:12
+#: data/templates/default/tagrename.tpl.php:12
 msgid "Old"
 msgstr "Alt"
 
-#: data/templates/tagrename.tpl.php:17
+#: data/templates/default/tagrename.tpl.php:17
 msgid "New"
 msgstr "Neu"
 
-#: data/templates/tagrename.tpl.php:24
+#: data/templates/default/tagrename.tpl.php:24
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: data/templates/tags.tpl.php:11
-#: data/templates/users.tpl.php:9
+#: data/templates/default/tags.tpl.php:11
+#: data/templates/default/users.tpl.php:9
 msgid "Alphabet"
 msgstr "Alphabet"
 
-#: data/templates/tags.tpl.php:12
-#: data/templates/users.tpl.php:10
+#: data/templates/default/tags.tpl.php:12
+#: data/templates/default/users.tpl.php:10
 msgid "Popularity"
 msgstr "Popularität"
 
-#: data/templates/toolbar.inc.php:8
-#: data/templates/toolbar.inc.php:26
+#: data/templates/default/toolbar.inc.php:8
+#: data/templates/default/toolbar.inc.php:26
 msgid "Home"
 msgstr "Start"
 
-#: data/templates/toolbar.inc.php:11
-#: www/watchlist.php:106
+#: data/templates/default/toolbar.inc.php:11 www/watchlist.php:106
 msgid "Watchlist"
 msgstr "Beobachtungsliste"
 
-#: data/templates/toolbar.inc.php:12
-#: www/profile.php:67
+#: data/templates/default/toolbar.inc.php:12 www/profile.php:79
 msgid "Profile"
 msgstr "Profil"
 
-#: data/templates/toolbar.inc.php:13
-#: www/bookmarks.php:215
+#: data/templates/default/toolbar.inc.php:13 www/bookmarks.php:215
 msgid "Add a Bookmark"
 msgstr "Lesezeichen hinzufügen"
 
-#: data/templates/toolbar.inc.php:14
+#: data/templates/default/toolbar.inc.php:14
 msgid "Log Out"
 msgstr "Abmelden"
 
-#: data/templates/toolbar.inc.php:17
+#: data/templates/default/toolbar.inc.php:17
 msgid "Admin"
 msgstr "Administration"
 
-#: data/templates/top.inc.php:55
-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 "SemanticScuttle befindet sich im \"Debugmodus\" ($debugMode = true). Um in den normalen Modus zu wechseln und die Debugmeldungen zu verstecken, einfach $debugMode in der config.php auf \"false\" setzen."
+#: data/templates/default/top.inc.php:57
+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 ""
+"SemanticScuttle befindet sich im \"Debugmodus\" ($debugMode = true). Um in "
+"den normalen Modus zu wechseln und die Debugmeldungen zu verstecken, einfach "
+"$debugMode in der config.php auf \"false\" setzen."
 
-#: data/templates/users.tpl.php:20
+#: data/templates/default/users.tpl.php:20
 msgid "profile"
 msgstr "Profil"
 
-#: data/templates/users.tpl.php:21
+#: data/templates/default/users.tpl.php:21
 msgid "created in"
 msgstr "erstellt in"
 
@@ -1046,12 +1163,12 @@ msgstr "erstellt in"
 msgid "Manage users"
 msgstr "Benutzer verwalten"
 
-#: www/admin.php:68
+#: www/admin.php:69
 #, php-format
 msgid "%s and all his bookmarks and tags were deleted."
 msgstr "Benutzer %s und alle seine Lesezeichen wurden gelöscht"
 
-#: www/admin.php:75
+#: www/admin.php:76
 msgid "Problem with "
 msgstr "Problem mit "
 
@@ -1059,8 +1176,7 @@ msgstr "Problem mit "
 msgid "You are not allowed to delete this bookmark"
 msgstr "Sie dürfen dieses Lesezeichen nicht löschen"
 
-#: www/ajaxDelete.php:41
-#: www/edit.php:103
+#: www/ajaxDelete.php:41 www/edit.php:103
 msgid "Failed to delete bookmark"
 msgstr "Das Löschen des Lesezeichens ist fehlgeschlagen."
 
@@ -1068,24 +1184,16 @@ msgstr "Das Löschen des Lesezeichens ist fehlgeschlagen."
 msgid "All Tags"
 msgstr "Alle Schlagwörter"
 
-#: www/alltags.php:56
-#: www/bookmarks.php:99
-#: www/populartags.php:52
-#: www/profile.php:51
-#: www/rss.php:82
-#: www/search.php:111
-#: www/watch.php:45
+#: www/alltags.php:56 www/bookmarks.php:99 www/populartags.php:52
+#: www/profile.php:55 www/rss.php:100 www/search.php:111 www/watch.php:45
 #: www/watchlist.php:61
 #, php-format
 msgid "User with username %s was not found"
 msgstr "Der Benutzer %s wurde nicht gefunden."
 
-#: www/bookmarkcommondescriptionedit.php:51
-#: www/tag2tagadd.php:37
-#: www/tag2tagdelete.php:41
-#: www/tag2tagedit.php:33
-#: www/tagcommondescriptionedit.php:51
-#: 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 "Zugriff verweigert."
 
@@ -1101,13 +1209,11 @@ msgstr "Das Ändern der gemeinsamen Lesezeichenbeschreibung ist fehlgeschlagen."
 msgid "Edit Bookmark Common Description"
 msgstr "Die gemeinsame Lesezeichenbeschreibung bearbeiten."
 
-#: www/bookmarks.php:114
-#: www/tags.php:47
+#: www/bookmarks.php:114 www/tags.php:47
 msgid "Remove the tag from the selection"
 msgstr "Schlagwort aus der Auswahl entfernen"
 
-#: www/bookmarks.php:134
-#: www/edit.php:65
+#: www/bookmarks.php:134 www/edit.php:65
 msgid "Your bookmark must have a title and an address"
 msgstr "Ihr Lesezeichen muss einen Titel und eine URL haben."
 
@@ -1115,9 +1221,7 @@ msgstr "Ihr Lesezeichen muss einen Titel und eine URL haben."
 msgid "This bookmark URL may not be added"
 msgstr "Diese Lesezeichen-URL darf nicht hinzugefügt werden."
 
-#: www/bookmarks.php:158
-#: www/edit.php:83
-#: www/edit.php:86
+#: www/bookmarks.php:158 www/edit.php:83 www/edit.php:86
 msgid "Bookmark saved"
 msgstr "Ihr Lesezeichen wurde erfolgreich gespeichert."
 
@@ -1125,11 +1229,13 @@ msgstr "Ihr Lesezeichen wurde erfolgreich gespeichert."
 msgid "(Come back to previous page.)"
 msgstr "Zur vorherigen Seite zurück"
 
-#: www/bookmarks.php:165
-#: www/import.php:106
-#: www/importNetscape.php:108
-msgid "There was an error saving your bookmark. Please try again or contact the administrator."
-msgstr "Beim Speichern des Lesezeichens ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut oder kontaktieren Sie den Administrator."
+#: www/bookmarks.php:165 www/import.php:106 www/importNetscape.php:108
+msgid ""
+"There was an error saving your bookmark. Please try again or contact the "
+"administrator."
+msgstr ""
+"Beim Speichern des Lesezeichens ist ein Fehler aufgetreten. Bitte versuchen "
+"Sie es erneut oder kontaktieren Sie den Administrator."
 
 #: www/bookmarks.php:222
 msgid "Add Bookmark"
@@ -1139,13 +1245,21 @@ msgstr "Lesezeichen hinzufügen"
 msgid "You must be logged in before you can add bookmarks."
 msgstr "Sie müssen angemeldet sein, um ein Lesezeichen hinzuzufügen."
 
-#: www/bookmarks.php:280
-#: www/bookmarks.php:281
+#: www/bookmarks.php:270
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: www/bookmarks.php:283
+#, php-format
+msgid "%s: %s (+private %s)"
+msgstr ""
+
+#: www/bookmarks.php:305 www/bookmarks.php:306
 msgid "My Bookmarks"
 msgstr "Meine Lesezeichen"
 
-#: www/edit.php:44
-#: www/edit.php:45
+#: www/edit.php:44 www/edit.php:45
 msgid "Edit Bookmark"
 msgstr "Lesezeichen bearbeiten"
 
@@ -1208,8 +1322,7 @@ msgstr "Lesezeichen gefunden: "
 msgid "Bookmarks imported: "
 msgstr "Importierte Lesezeichen: "
 
-#: www/importNetscape.php:117
-#: www/importNetscape.php:122
+#: www/importNetscape.php:117 www/importNetscape.php:122
 msgid "Import Bookmarks from Browser File"
 msgstr "Lesezeichen aus Browser-Lesezeichendatei importieren"
 
@@ -1229,58 +1342,79 @@ msgstr "Struktur importieren"
 msgid "You have now logged out"
 msgstr "Sie sind jetzt abgemeldet."
 
-#: www/index.php:45
+#: www/index.php:46
 #, php-format
 msgid "%s: Recent bookmarks"
 msgstr "%s: Neue Lesezeichen"
 
-#: www/index.php:75
+#: www/index.php:58
+#, fuzzy, php-format
+msgid "%s: Recent bookmarks (+private %s)"
+msgstr "%s: Neue Lesezeichen"
+
+#: www/index.php:96
 msgid "Store, share and tag your favourite links"
 msgstr "Speichern, teilen und kategorisieren Sie Ihre Lesezeichen!"
 
-#: www/index.php:76
+#: www/index.php:97
 msgid "All Bookmarks"
 msgstr "Alle Lesezeichen"
 
-#: www/jsScuttle.php:70
+#: www/jsScuttle.php:71
 msgid "Available"
 msgstr "Vorhanden"
 
-#: www/jsScuttle.php:73
+#: www/jsScuttle.php:74
 msgid "Not Available"
 msgstr "Nicht vorhanden"
 
 #: www/login.php:48
 msgid "The details you have entered are incorrect. Please try again."
-msgstr "Die von Ihnen angegebenen Daten sind nicht korrekt. Bitte versuchen Sie es erneut."
+msgstr ""
+"Die von Ihnen angegebenen Daten sind nicht korrekt. Bitte versuchen Sie es "
+"erneut."
 
 #: www/password.php:36
 msgid "You must enter your username."
 msgstr "Sie müssen Ihren Benutzernamen eingeben."
 
 #: www/password.php:40
-msgid "You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "Sie müssen Ihre <abbr title=\"electronic mail\">E-Mail</abbr>adresse eingeben."
+msgid ""
+"You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"Sie müssen Ihre <abbr title=\"electronic mail\">E-Mail</abbr>adresse "
+"eingeben."
 
 #: www/password.php:48
 msgid "No matches found for that username."
 msgstr "Keine Ergebnisse für diesen Benutzernamen gefunden."
 
 #: www/password.php:51
-msgid "No matches found for that combination of username and <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "Keine Ergebnisse für diesen Benutzernamen und diese <abbr title=\"electronic mail\">E-Mail</abbr>adresse gefunden."
+msgid ""
+"No matches found for that combination of username and <abbr title="
+"\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"Keine Ergebnisse für diesen Benutzernamen und diese <abbr title=\"electronic "
+"mail\">E-Mail</abbr>adresse gefunden."
 
 #: www/password.php:59
-msgid "There was an error while generating your new password. Please try again."
-msgstr "Bei der Generierung des neuen Passwortes ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut."
+msgid ""
+"There was an error while generating your new password. Please try again."
+msgstr ""
+"Bei der Generierung des neuen Passwortes ist ein Fehler aufgetreten. Bitte "
+"versuchen Sie es erneut."
 
 #: www/password.php:63
 msgid "Your new password is:"
 msgstr "Ihr neues Passwort lautet:"
 
 #: 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 "Um den größtmöglichen Schutz Ihrer Lesezeichen zu gewährleisten, sollten Sie das Passwort in Ihrem Profil bei Ihrer nächsten Anmeldung editieren."
+msgid ""
+"To keep your bookmarks secure, you should change this password in your "
+"profile the next time you log in."
+msgstr ""
+"Um den größtmöglichen Schutz Ihrer Lesezeichen zu gewährleisten, sollten Sie "
+"das Passwort in Ihrem Profil bei Ihrer nächsten Anmeldung editieren."
 
 #: www/password.php:66
 #, php-format
@@ -1296,86 +1430,94 @@ msgstr "Ein neues Passwort wurde erstellt und an %s gesandt."
 msgid "Forgotten Password"
 msgstr "Vergessenes Passwort"
 
-#: www/profile.php:59
-#: www/watchlist.php:119
+#: www/profile.php:63 www/watchlist.php:119
 msgid "Username was not specified"
 msgstr "Der Benutzername wurde nicht angegeben."
 
-#: www/profile.php:65
+#: www/profile.php:70
 msgid "My Profile"
 msgstr "Mein Profil"
 
-#: www/profile.php:89
+#: www/profile.php:110
 msgid "Invalid Token"
 msgstr "Unzulässiges Token"
 
-#: www/profile.php:94
+#: www/profile.php:115
 msgid "Password and confirmation do not match."
 msgstr "Das Passwort und dessen Bestätigung ist nicht identisch."
 
-#: www/profile.php:98
+#: www/profile.php:119
 msgid "Password must be at least 6 characters long."
 msgstr "Das Passwort muss mindestens sechs Zeichen lang sein."
 
-#: www/profile.php:102
+#: www/profile.php:123
 msgid "E-mail address is not valid."
 msgstr "Die E-Mailadresse ist nicht gültig."
 
-#: www/profile.php:106
+#: www/profile.php:127
 msgid "An error occurred while saving your changes."
 msgstr "Beim Speichern Ihrer Änderungen trat ein Fehler auf."
 
-#: www/profile.php:108
+#: www/profile.php:129
 msgid "Changes saved."
 msgstr "Die Änderungen wurden gespeichert."
 
-#: www/profile.php:121
+#: www/profile.php:148
 msgid "You do not have a valid SSL client certificate"
 msgstr "Du hast kein gültiges SSL-Client-Zertifikat."
 
-#: www/profile.php:123
+#: www/profile.php:150
 msgid "This certificate is already registered"
 msgstr "Das Zertifikat ist bereits registriert."
 
-#: www/profile.php:125
+#: www/profile.php:152
 msgid "Failed to register SSL client certificate."
 msgstr "Fehler beim registrieren des SSL-Client-Zertifikats."
 
-#: www/profile.php:127
+#: www/profile.php:154
 msgid "SSL client certificate registered."
 msgstr "SSL-Client-Zertifikat wurde registriert."
 
-#: www/profile.php:136
+#: www/profile.php:163
 msgid "Certificate not found."
 msgstr "Zertifikat nicht gefunden."
 
-#: www/profile.php:138
+#: www/profile.php:165
 msgid "The certificate does not belong to you."
 msgstr "Dieses Zertifikat gehört nicht zu dir."
 
-#: www/profile.php:140
+#: www/profile.php:167
 msgid "Failed to delete SSL client certificate."
 msgstr "Das Löschen des SSL-Client-Zertifikats ist fehlgeschlagen."
 
-#: www/profile.php:142
+#: www/profile.php:169
 msgid "SSL client certificate deleted."
 msgstr "SSL-Client-Zertifikat gelöscht."
 
 #: www/register.php:52
 msgid "You <em>must</em> enter a username, password and e-mail address."
-msgstr "Sie müssen einen Benutzernamen, ein Passwort und eine <abbr title=\"electronic mail\">E-Mail</abbr>addresse eingeben."
+msgstr ""
+"Sie müssen einen Benutzernamen, ein Passwort und eine <abbr title="
+"\"electronic mail\">E-Mail</abbr>addresse eingeben."
 
 #: www/register.php:56
 msgid "This username has been reserved, please make another choice."
-msgstr "Dieser Benutzername ist bereits reserviert. Bitte treffen Sie eine andere Wahl."
+msgstr ""
+"Dieser Benutzername ist bereits reserviert. Bitte treffen Sie eine andere "
+"Wahl."
 
 #: www/register.php:60
 msgid "This username already exists, please make another choice."
-msgstr "Dieser Benutzername existiert bereits. Bitte treffen Sie eine andere Wahl."
+msgstr ""
+"Dieser Benutzername existiert bereits. Bitte treffen Sie eine andere Wahl."
 
 #: www/register.php:64
-msgid "This username is not valid (too short, too long, forbidden characters...), please make another choice."
-msgstr "Dieser Benutzername ist unzulässig (zu kurz, zu lang, nicht erlaubte Zeichen, ...). Bitte treffen Sie eine andere Wahl."
+msgid ""
+"This username is not valid (too short, too long, forbidden characters...), "
+"please make another choice."
+msgstr ""
+"Dieser Benutzername ist unzulässig (zu kurz, zu lang, nicht erlaubte "
+"Zeichen, ...). Bitte treffen Sie eine andere Wahl."
 
 #: www/register.php:68
 msgid "E-mail address is not valid. Please try again."
@@ -1383,7 +1525,9 @@ msgstr "Diese E-Mailadresse ist nicht gültig. Bitte versuchen Sie es erneut."
 
 #: www/register.php:72
 msgid "Antispam answer is not valid. Please try again."
-msgstr "Die Sicherheitsfrage wurde nicht korrekt beantwortet. Bitte versuchen Sie es erneut."
+msgstr ""
+"Die Sicherheitsfrage wurde nicht korrekt beantwortet. Bitte versuchen Sie es "
+"erneut."
 
 #: www/register.php:90
 msgid "You have successfully registered. Enjoy!"
@@ -1393,13 +1537,17 @@ msgstr "Ihre Registrierung war erfolgreich!"
 msgid "Registration failed. Please try again."
 msgstr "Ihre Registrierung ist fehlgeschlagen. Bitte versuchen Sie es erneut."
 
-#: www/rss.php:99
+#: www/rss.php:90 www/rss.php:111
+#, php-format
+msgid "Failed to Autenticate User with username %s using private key"
+msgstr ""
+
+#: www/rss.php:128
 #, php-format
 msgid "Recent bookmarks posted to %s"
 msgstr "Neueste Lesezeichen in %s"
 
-#: www/search.php:83
-#: www/search.php:147
+#: www/search.php:83 www/search.php:147
 msgid "Search Bookmarks"
 msgstr "Suche Lesezeichen"
 
@@ -1441,11 +1589,13 @@ msgstr "Einen Weblink zwischen Schlagwörtern editieren"
 
 #: www/tagcommondescriptionedit.php:62
 msgid "Tag common description updated"
-msgstr "Die gemeinsame Beschreibung des Schlagwortes wurde erfolgreich aktualisiert."
+msgstr ""
+"Die gemeinsame Beschreibung des Schlagwortes wurde erfolgreich aktualisiert."
 
 #: www/tagcommondescriptionedit.php:67
 msgid "Failed to update the tag common description"
-msgstr "Ändern der gemeinsame Beschreibung des Schlagwortes ist fehlgeschlagen."
+msgstr ""
+"Ändern der gemeinsame Beschreibung des Schlagwortes ist fehlgeschlagen."
 
 #: www/tagdelete.php:43
 msgid "Tag deleted"
@@ -1471,6 +1621,16 @@ msgstr "Das Schlagwort wurde umbenannt."
 msgid "Failed to rename the tag"
 msgstr "Die Umbenennung des Schlagwortes ist fehlgeschlagen."
 
+#: www/tags.php:71
+#, php-format
+msgid "%s: tagged with \"%s\""
+msgstr ""
+
+#: www/tags.php:84
+#, php-format
+msgid "%s: tagged with \"%s\" (+private %s)"
+msgstr ""
+
 #: www/users.php:31
 msgid "Users"
 msgstr "Benutzer"
@@ -1491,26 +1651,30 @@ msgstr "Meine Beobachtungsliste"
 msgid "Use of the API calls requires authentication."
 msgstr "Die API kann nur nach Authentifizierung benutzt werden."
 
-#: www/gsearch/index.php:27
+#: www/gsearch/index.php:51
 msgid "Come back to "
 msgstr "Zurück zu "
 
-#: www/gsearch/index.php:32
+#: www/gsearch/index.php:56
 msgid "Admin tips: "
 msgstr "Administratorhinweise: "
 
-#: www/gsearch/index.php:33
+#: www/gsearch/index.php:57
 msgid "To refresh manually Google Custom Search Engine, goes to: "
 msgstr "Um die Google Custom Search Engine manuell zu aktualsieren, gehe zu "
 
-#: www/gsearch/index.php:37
-msgid "If no result appears, check that all the urls are valid in the admin section."
-msgstr "Wenn keine Ergebnisse gefunden werden, sollten alle URLs im Administrationsbereich geprüft werden."
+#: www/gsearch/index.php:61
+msgid ""
+"If no result appears, check that all the urls are valid in the admin section."
+msgstr ""
+"Wenn keine Ergebnisse gefunden werden, sollten alle URLs im "
+"Administrationsbereich geprüft werden."
 
 #~ msgid "for"
 #~ msgstr "nach"
+
 #~ msgid "URL"
 #~ msgstr "URL"
+
 #~ msgid "Last Users"
 #~ msgstr "Neueste Benutzer"
-
diff --git a/data/locales/dk_DK/LC_MESSAGES/messages.mo b/data/locales/dk_DK/LC_MESSAGES/messages.mo
index 4966a54..94c98ac 100644
--- a/data/locales/dk_DK/LC_MESSAGES/messages.mo
+++ b/data/locales/dk_DK/LC_MESSAGES/messages.mo
diff --git a/data/locales/dk_DK/LC_MESSAGES/messages.po b/data/locales/dk_DK/LC_MESSAGES/messages.po
index 02f9eaf..98f5f6d 100644
--- a/data/locales/dk_DK/LC_MESSAGES/messages.po
+++ b/data/locales/dk_DK/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Scuttle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-29 11:17+0200\n"
+"POT-Creation-Date: 2012-01-20 13:58+0100\n"
 "PO-Revision-Date: 2006-04-16 22:04-0800\n"
 "Last-Translator: Marcus Campbell <marcus.campbell@gmail.com>\n"
 "Language-Team: dk-DK <Nicki.brochner@gmail.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,791 +19,1693 @@ msgstr ""
 "X-Poedit-Country: DENMARK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ..\..\..\about.php:25
-#: ..\..\..\templates\toolbar.inc.php:24
-msgid "About"
-msgstr "Om programmet"
-
-#: ..\..\..\ajaxDelete.php:29
-msgid "You are not allowed to delete this bookmark"
-msgstr "Du har ikke tilladelse til at slette dette bogmærke"
-
-#: ..\..\..\ajaxDelete.php:33
-msgid "Failed to delete bookmark"
-msgstr "Kunne ikke slette bogmærket"
-
-#: ..\..\..\alltags.php:50
-msgid "All Tags"
-msgstr "Alle mærker"
-
-#: ..\..\..\alltags.php:59
-#: ..\..\..\populartags.php:63
-#: ..\..\..\profile.php:46
-#: ..\..\..\rss.php:55
-#: ..\..\..\search.php:61
-#: ..\..\..\watch.php:35
-#: ..\..\..\watched.php:62
-#, php-format
-msgid "User with username %s not was not found"
-msgstr "Bruger med brugernavn %s kunne ikke findes"
-
-#: ..\..\..\bookmarks.php:71
-#, php-format
-msgid "User with username %s was not found"
-msgstr "Bruger med brugernavn %s kunne ikke findes"
-
-#: ..\..\..\bookmarks.php:94
-#: ..\..\..\edit.php:44
-msgid "Your bookmark must have a title and an address"
-msgstr "Dit bogmærke skal have både en titel og en adresse"
-
-#: ..\..\..\bookmarks.php:114
-#: ..\..\..\edit.php:58
-msgid "Bookmark saved"
-msgstr "Bogmærke gemt"
-
-#: ..\..\..\bookmarks.php:122
-#: ..\..\..\import.php:99
-#: ..\..\..\importNetscape.php:74
-msgid "There was an error saving your bookmark. Please try again or contact the administrator."
-msgstr "Der opstod en fejl, ved forsøg på at gemme dit bogmærke. Prøv venligst igen eller kontakt Administrator"
-
-#: ..\..\..\bookmarks.php:160
-#: ..\..\..\templates\toolbar.inc.php:13
-msgid "Add a Bookmark"
-msgstr "Tilføj et bogmærke"
-
-#: ..\..\..\bookmarks.php:163
-msgid "Add Bookmark"
-msgstr "Tilføj bogmærke"
-
-#: ..\..\..\bookmarks.php:166
-msgid "You must be logged in before you can add bookmarks."
-msgstr "Du skal være logget ind før du kan tilføje bogmærker"
-
-#: ..\..\..\bookmarks.php:213
-msgid "My Bookmarks"
-msgstr "Mine bogmærker"
-
-#: ..\..\..\edit.php:29
-msgid "Edit Bookmark"
-msgstr "Rediger bogmærker"
-
-#: ..\..\..\edit.php:34
-#, php-format
-msgid "Bookmark with id %s not was not found"
-msgstr "Bogmærke med id %s kunne ikke findes"
-
-#: ..\..\..\edit.php:39
-msgid "You are not allowed to edit this bookmark"
-msgstr "Du har ikke tilladelse til at redigere dette bogmærke"
-
-#: ..\..\..\edit.php:55
-msgid "Error while saving your bookmark"
-msgstr "Der opstod en fejl, ved forsøg på at gemme dit bogmærke."
-
-#: ..\..\..\edit.php:78
-msgid "Failed to delete the bookmark"
-msgstr "Kunne ikke slette bogmærket"
-
-#: ..\..\..\edit.php:88
-#: ..\..\..\templates\editprofile.tpl.php:52
-msgid "Save Changes"
-msgstr "Gem ændringer"
-
-#: ..\..\..\functions.inc.php:92
+#: src/SemanticScuttle/functions.php:189
 msgid "message_die() was called multiple times."
 msgstr "message_die() blev kaldt flere gange"
 
-#: ..\..\..\functions.inc.php:104
+#: src/SemanticScuttle/functions.php:201
 msgid "SQL Error"
 msgstr "SQL fejl"
 
-#: ..\..\..\functions.inc.php:110
+#: src/SemanticScuttle/functions.php:207
 msgid "Line"
 msgstr "Line"
 
-#: ..\..\..\functions.inc.php:110
-#: ..\..\..\templates\importDelicious.tpl.php:8
-#: ..\..\..\templates\importNetscape.tpl.php:9
+#: src/SemanticScuttle/functions.php:207
+#: data/templates/default/importDelicious.tpl.php:8
+#: data/templates/default/importNetscape.tpl.php:9
+#: data/templates/default/importStructure.tpl.php:10
 msgid "File"
 msgstr "Filer"
 
-#: ..\..\..\functions.inc.php:116
+#: src/SemanticScuttle/functions.php:215
 msgid "Information"
 msgstr "Information"
 
-#: ..\..\..\functions.inc.php:121
+#: src/SemanticScuttle/functions.php:220
 msgid "Critical Information"
 msgstr "Kritisk information"
 
-#: ..\..\..\functions.inc.php:126
+#: src/SemanticScuttle/functions.php:225
 msgid "An error occured"
 msgstr "En fejl opstod"
 
-#: ..\..\..\functions.inc.php:129
+#: src/SemanticScuttle/functions.php:228
 msgid "General Error"
 msgstr "General fejl"
 
-#: ..\..\..\functions.inc.php:137
+#: src/SemanticScuttle/functions.php:236
 msgid "An critical error occured"
 msgstr "En kritisk fejl opstod"
 
-#: ..\..\..\functions.inc.php:140
+#: src/SemanticScuttle/functions.php:239
 msgid "Critical Error"
 msgstr "Kritisk fejl"
 
-#: ..\..\..\functions.inc.php:149
+#: src/SemanticScuttle/functions.php:248
 msgid "DEBUG MODE"
 msgstr "DEBUG MODE"
 
-#: ..\..\..\history.php:65
-msgid "History"
-msgstr "Historie"
+#: data/templates/default/about.tpl.php:6
+msgid ""
+"<strong>Store</strong> all your favourite links in one place, accessible "
+"from anywhere."
+msgstr ""
+"<strong>Gem</strong> alle dine favorit links et sted, tilgængelig fra hvor "
+"som helst"
 
-#: ..\..\..\history.php:66
-#, php-format
-msgid "History for %s"
-msgstr "Historie for %s"
+#: data/templates/default/about.tpl.php:7
+msgid ""
+"<strong>Share</strong> your bookmarks with everyone, with friends on your "
+"watchlist or just keep them private."
+msgstr ""
+"Del dine bogmærker med alle, med vennerne på din overvågningsliste eller "
+"behold dem private."
 
-#: ..\..\..\history.php:81
-msgid "Address was not found"
-msgstr "Adressen kunne ikke findes"
+#: data/templates/default/about.tpl.php:8
+msgid ""
+"<strong>Tag</strong> your bookmarks with as many labels as you want, instead "
+"of wrestling with folders."
+msgstr ""
+"<strong>Marker</strong> dine bogmærker med så mange mærkater som du ønsker, "
+"i stedet for at kæmpe med mapper."
 
-#: ..\..\..\import.php:41
-msgid "Could not open XML input"
-msgstr "Kunne ikke åbne XML input"
+#: data/templates/default/about.tpl.php:9
+#, fuzzy
+msgid "Register now"
+msgstr "Registrere"
 
-#: ..\..\..\import.php:45
+#: data/templates/default/about.tpl.php:9
 #, php-format
-msgid "XML error: %s at line %d"
-msgstr "XLM fejl: %s i line %d"
+msgid " to start using %s!"
+msgstr ""
 
-#: ..\..\..\import.php:54
-msgid "Import Bookmarks from del.icio.us"
-msgstr "Importere bogmærker fra del.icio.us"
+#: data/templates/default/about.tpl.php:12
+msgid "Geek Stuff"
+msgstr "Nørd Ting"
 
-#: ..\..\..\import.php:86
-#: ..\..\..\importNetscape.php:64
-msgid "You have already submitted this bookmark."
-msgstr "Du har allerede tilføjet dette bogmærke"
+#: data/templates/default/about.tpl.php:14
+msgid "is licensed under the "
+msgstr ""
 
-#: ..\..\..\import.php:97
-#: ..\..\..\importNetscape.php:72
-msgid "Bookmark imported."
-msgstr "Bogmærke importeret"
+#: data/templates/default/about.tpl.php:14
+msgid "you can freely host it on your own web server."
+msgstr ""
 
-#: ..\..\..\importNetscape.php:81
-msgid "Import Bookmarks from Browser File"
-msgstr "Importere bogmærker fra browser"
+#: data/templates/default/about.tpl.php:15
+#, php-format
+msgid ""
+"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 understøtter de fleste <a href=\"http://www.delicious.com/help/api"
+"\">del.icio.us <abbr title=\"Forbindelsesflade imellem forskellige "
+"programmer \">API</abbr></a>. Næsten alle de værktøjer udviklet til det "
+"system kan modificeres til at fungere med %1$s i stedet for. Hvis du finder "
+"et værktøj som ikke tillader at du fortager ændringer i API adresse, kunne "
+"du jo spørge udviklerne. Man ved aldrig det kunne jo være de ville."
+
+#: data/templates/default/about.tpl.php:24
+msgid "Tips"
+msgstr ""
 
-#: ..\..\..\index.php:32
-msgid "You have now logged out"
-msgstr "Du er nu logget ud"
+#: data/templates/default/about.tpl.php:26
+msgid "Add search plugin into your browser:"
+msgstr ""
 
-#: ..\..\..\index.php:39
-#, php-format
-msgid "%s: Recent bookmarks"
-msgstr "%s: Seneste bogmærker"
+#: data/templates/default/about.tpl.php:27
+msgid ""
+"The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
+msgstr ""
 
-#: ..\..\..\index.php:72
-msgid "Store, share and tag your favourite links"
-msgstr "Gem, del og mærk dine favorit links"
+#: data/templates/default/about.tpl.php:28
+msgid ""
+"The secret tag \"system:imported\" allows you to find imported bookmarks."
+msgstr ""
+
+#: data/templates/default/admin.tpl.php:5
+#, fuzzy
+msgid "Users management"
+msgstr "Brugernavn"
 
-#: ..\..\..\index.php:73
-msgid "Recent Bookmarks"
-msgstr "Seneste bogmærker"
+#: data/templates/default/admin.tpl.php:14
+msgid "Public/Shared/Private"
+msgstr ""
 
-#: ..\..\..\jsScuttle.php:22
+#: data/templates/default/admin.tpl.php:14
+#: data/templates/default/bookmarks.tpl.php:115
+#, fuzzy
+msgid "bookmark(s)"
+msgstr "bogmærke"
+
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/tag2tagadd.tpl.php:21
+#: data/templates/default/tag2tagdelete.tpl.php:13
+#: data/templates/default/tag2tagedit.tpl.php:14
+#: data/templates/default/tag2tagedit.tpl.php:35
+#: data/templates/default/tagdelete.tpl.php:6 www/jsScuttle.php:24
 msgid "Are you sure?"
 msgstr "Er du sikker?"
 
-#: ..\..\..\jsScuttle.php:22
-msgid "Yes"
-msgstr "Ja"
-
-#: ..\..\..\jsScuttle.php:22
-msgid "No"
-msgstr "Nej"
-
-#: ..\..\..\jsScuttle.php:68
-msgid "Available"
-msgstr "Tilgængelig"
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/bookmarks.tpl.php:305
+msgid "Delete"
+msgstr "Slet"
 
-#: ..\..\..\jsScuttle.php:71
-msgid "Not Available"
-msgstr "Ikke tilgængelig"
+#: data/templates/default/admin.tpl.php:27
+#, fuzzy
+msgid "Other actions"
+msgstr "Instruktioner"
 
-#: ..\..\..\login.php:38
-msgid "The details you have entered are incorrect. Please try again."
-msgstr "Detaljerne du har indtastet er forkerte. Prøv venligst igen."
+#: data/templates/default/admin.tpl.php:29
+msgid "Check all URLs (May take some time)"
+msgstr ""
 
-#: ..\..\..\login.php:48
-#: ..\..\..\templates\login.tpl.php:26
-#: ..\..\..\templates\toolbar.inc.php:28
-msgid "Log In"
-msgstr "Log ind"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:16
+msgid ""
+"Collaborative description: these fields can be viewed and modified by every "
+"users"
+msgstr ""
 
-#: ..\..\..\password.php:31
-msgid "You must enter your username."
-msgstr "Du skal indtaste dit brugernavn"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:18
+#: data/templates/default/bookmarks.tpl.php:159
+#: data/templates/default/editbookmark.tpl.php:51
+msgid "Title"
+msgstr "Titel"
 
-#: ..\..\..\password.php:35
-msgid "You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "Du skal indtaste din <abbr title=\"Elektronisk post\">E-mail</abbr> adresse."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:23
+#: data/templates/default/editbookmark.tpl.php:57
+#: data/templates/default/editprofile.tpl.php:53
+#: data/templates/default/profile.tpl.php:33
+#: data/templates/default/tagcommondescriptionedit.tpl.php:13
+#: data/templates/default/tagedit.tpl.php:12
+msgid "Description"
+msgstr "Beskrivelse"
 
-#: ..\..\..\password.php:42
-msgid "No matches found for that username."
-msgstr "Søgning gav igen resultat på det brugernavn."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:31
+#: data/templates/default/tagcommondescriptionedit.tpl.php:21
+msgid "Last modification:"
+msgstr ""
 
-#: ..\..\..\password.php:45
-msgid "No matches found for that combination of username and <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "Søgning gav igen resultat på den kombination af brugernavn og <abbr title=\"elektronisk post\">e-mail</abbr> adresse."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:43
+#: data/templates/default/tagcommondescriptionedit.tpl.php:33
+#: data/templates/default/tagedit.tpl.php:18
+msgid "Update"
+msgstr ""
 
-#: ..\..\..\password.php:53
-msgid "There was an error while generating your new password. Please try again."
-msgstr "Der opstod en fejl under genereringen af dit nye kodeord. Prøv venligst igen."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:44
+#: data/templates/default/editbookmark.tpl.php:111
+#: data/templates/default/tag2tagadd.tpl.php:24
+#: data/templates/default/tag2tagedit.tpl.php:38
+#: data/templates/default/tagcommondescriptionedit.tpl.php:34
+#: data/templates/default/tagedit.tpl.php:19
+#: data/templates/default/tagrename.tpl.php:25
+msgid "Cancel"
+msgstr ""
 
-#: ..\..\..\password.php:57
-msgid "Your new password is:"
-msgstr "Dit nye kodeord er:"
+#: data/templates/default/bookmarklet.inc.php:1
+msgid "Bookmarklet"
+msgstr "Bogmærkelet"
 
-#: ..\..\..\password.php:57
-msgid "To keep your bookmarks secure, you should change this password in your profile the next time you log in."
-msgstr "FFor at bevare dine bogmærker sikrere, bør du skifte dette kodeord i din profil næste gang du logger ind."
+#: data/templates/default/bookmarklet.inc.php:11
+#, 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 ""
+"Træk en af de følgende bogmærkeletter til din browsers bogmærker, og tryk på "
+"den hver gang du ønsker at tilføje den side du er på til %s"
 
-#: ..\..\..\password.php:60
+#: data/templates/default/bookmarklet.inc.php:20
 #, php-format
-msgid "%s Account Information"
-msgstr "%s Konto oplysninger"
+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 ""
+"Træk en af de følgende bogmærkeletter til din browsers bogmærker, og tryk på "
+"den hver gang du ønsker at tilføje den side du er på til %s"
 
-#: ..\..\..\password.php:62
+#: data/templates/default/bookmarklet.inc.php:67
+#: data/templates/default/bookmarklet.inc.php:100
 #, php-format
-msgid "New password generated and sent to %s"
-msgstr "Nyt kodeord er blevet genereret og sendt til %s"
-
-#: ..\..\..\password.php:69
-msgid "Forgotten Password"
-msgstr "Glemt kodeord"
-
-#: ..\..\..\populartags.php:54
-#: ..\..\..\templates\dynamictags.inc.php:101
-#: ..\..\..\templates\sidebar.block.common.php:9
-#: ..\..\..\templates\sidebar.block.popular.php:15
-#: ..\..\..\templates\sidebar.block.recent.php:25
-msgid "Popular Tags"
-msgstr "Populære mærkater"
-
-#: ..\..\..\profile.php:54
-#: ..\..\..\watched.php:114
-msgid "Username was not specified"
-msgstr "Brugernavn var ikke specificerede"
-
-#: ..\..\..\profile.php:60
-msgid "My Profile"
-msgstr "Min profil"
-
-#: ..\..\..\profile.php:62
-#: ..\..\..\templates\sidebar.block.profile.php:12
-msgid "Profile"
-msgstr "Profil"
-
-#: ..\..\..\profile.php:80
-msgid "Password and confirmation do not match."
-msgstr "Kodeord og bekræftelse matcher ikke."
-
-#: ..\..\..\profile.php:84
-msgid "Password must be at least 6 characters long."
-msgstr "Kodeordet skal mindst være på 6 karakterer."
-
-#: ..\..\..\profile.php:88
-msgid "E-mail address is not valid."
-msgstr "E-mail adressen er ikke gyldig."
-
-#: ..\..\..\profile.php:92
-msgid "An error occurred while saving your changes."
-msgstr "En fejl opstod ved forsøg på at gemme dine ændringer."
-
-#: ..\..\..\profile.php:94
-msgid "Changes saved."
-msgstr "Ændringer gemt."
-
-#: ..\..\..\register.php:33
-msgid "You <em>must</em> enter a username, password and e-mail address."
-msgstr "Du <em>skal</em> indtaste et brugernavn, kodeord og e-mail adresse."
-
-#: ..\..\..\register.php:37
-msgid "This username already exists, please make another choice."
-msgstr "Brugernavnet eksistere allerede, vælg venligst et andet."
-
-#: ..\..\..\register.php:41
-msgid "E-mail address is not valid. Please try again."
-msgstr "E-mail addressen er ikke gyldig. Prøv venligst igen."
-
-#: ..\..\..\register.php:50
-msgid "You have successfully registered. Enjoy!"
-msgstr "Du er nu succesfuldt registeret. God fornøjelse!"
-
-#: ..\..\..\register.php:52
-msgid "Registration failed. Please try again."
-msgstr "Registreringen fejlede. Prøv venligst igen."
-
-#: ..\..\..\register.php:57
-#: ..\..\..\templates\register.tpl.php:32
-#: ..\..\..\templates\toolbar.inc.php:27
-msgid "Register"
-msgstr "Registrere"
-
-#: ..\..\..\search.inc.php:29
-#: ..\..\..\search.inc.php:57
-msgid "Search"
-msgstr "Søg"
-
-#: ..\..\..\search.inc.php:35
-msgid "this user's bookmarks"
-msgstr "denne brugers bogmærker"
-
-#: ..\..\..\search.inc.php:40
-msgid "my bookmarks"
-msgstr "mine bogmærker"
+msgid "Post to %s"
+msgstr "Send til %s"
 
-#: ..\..\..\search.inc.php:41
-msgid "my watchlist"
-msgstr "Min Overvågningsliste"
+#: data/templates/default/bookmarklet.inc.php:93
+#: data/templates/default/bookmarklet.inc.php:110
+#, php-format
+msgid "Post to %s (Pop-up)"
+msgstr "Send til %s (Pop-up)"
 
-#: ..\..\..\search.inc.php:45
-msgid "all bookmarks"
-msgstr "alle bogmærkerne"
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:24
+#, php-format
+msgid "Voting <span class=\"voting\">%d</span>"
+msgstr ""
 
-#: ..\..\..\search.inc.php:48
-msgid "for"
-msgstr "for"
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:32
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:35
+msgid "Vote for"
+msgstr ""
 
-#: ..\..\..\search.php:91
-#: ..\..\..\search.php:128
-msgid "Search Bookmarks"
-msgstr "Søge i bogmærker"
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:43
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:46
+msgid "Vote against"
+msgstr ""
 
-#: ..\..\..\search.php:97
-msgid "Search Results"
-msgstr "Søge resultat"
+#: data/templates/default/bookmarks.tpl.php:43
+msgid "Bookmarks on this page are managed by an admin user."
+msgstr ""
 
-#: ..\..\..\tags.php:38
-#: ..\..\..\templates\editbookmark.tpl.php:44
-#: ..\..\..\templates\sidebar.block.profile.php:13
-msgid "Tags"
-msgstr "Mærkater"
+#: data/templates/default/bookmarks.tpl.php:73
+#: data/templates/default/bookmarks.tpl.php:74
+msgid "Edit the common description of this tag"
+msgstr ""
 
-#: ..\..\..\watch.php:79
-#, php-format
-msgid "%s Bookmarks"
-msgstr "%s Bogmærker"
+#: data/templates/default/bookmarks.tpl.php:77
+#: data/templates/default/bookmarks.tpl.php:78
+msgid "Edit the common description of this bookmark"
+msgstr ""
 
-#: ..\..\..\watch.php:84
-msgid "User removed from your watchlist"
-msgstr "Bruger fjernet fra din overvågningsliste"
+#: data/templates/default/bookmarks.tpl.php:98
+#: data/templates/default/bookmarks.tpl.php:99
+msgid "Edit your personal description of this tag"
+msgstr ""
 
-#: ..\..\..\watch.php:86
-msgid "User added to your watchlist"
-msgstr "Bruger tilføjet til din overvågningsliste "
+#: data/templates/default/bookmarks.tpl.php:115
+#: data/templates/default/tags.tpl.php:10
+#: data/templates/default/users.tpl.php:8
+msgid "Sort by:"
+msgstr "Sortere efter:"
 
-#: ..\..\..\watched.php:105
-msgid "My Watchlist"
-msgstr "Min Overvågningsliste "
+#: data/templates/default/bookmarks.tpl.php:157
+msgid "Date"
+msgstr "Dato"
 
-#: ..\..\..\watched.php:107
-#: ..\..\..\templates\sidebar.block.profile.php:14
-#: ..\..\..\templates\toolbar.inc.php:12
-msgid "Watchlist"
-msgstr "Overvågningsliste"
+#: data/templates/default/bookmarks.tpl.php:162
+msgid "Voting"
+msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:6
-msgid "<strong>Store</strong> all your favourite links in one place, accessible from anywhere."
-msgstr "<strong>Gem</strong> alle dine favorit links et sted, tilgængelig fra hvor som helst"
+#: data/templates/default/bookmarks.tpl.php:171
+msgid "Bookmarks from other users for this tag"
+msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:7
-msgid "<strong>Share</strong> your bookmarks with everyone, with friends on your watchlist or just keep them private."
-msgstr "Del dine bogmærker med alle, med vennerne på din overvågningsliste eller behold dem private."
+#: data/templates/default/bookmarks.tpl.php:176
+msgid "Only your bookmarks for this tag"
+msgstr ""
 
-#: ..\..\..\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>Marker</strong> dine bogmærker med så mange mærkater som du ønsker, i stedet for at kæmpe med mapper."
+#: data/templates/default/bookmarks.tpl.php:199
+#: data/templates/default/bookmarks.tpl.php:205
+msgid "First"
+msgstr "Første"
 
-#: ..\..\..\templates\about.tpl.php:9
-#, php-format
-msgid "<strong><a href=\"register.php\">Register now</a></strong> to start using %s!"
-msgstr "<strong><a href=\"register.php\">Register nu</a></strong> for at starte med at bruge %s!"
+#: data/templates/default/bookmarks.tpl.php:200
+#: data/templates/default/bookmarks.tpl.php:206
+msgid "Previous"
+msgstr "Forrige"
 
-#: ..\..\..\templates\about.tpl.php:12
-msgid "Geek Stuff"
-msgstr "Nørd Ting"
+#: data/templates/default/bookmarks.tpl.php:213
+#: data/templates/default/bookmarks.tpl.php:216
+msgid "Next"
+msgstr "Næste"
 
-#: ..\..\..\templates\about.tpl.php:14
-#, php-format
-msgid "%s is based on <a href=\"http://sourceforge.net/projects/scuttle/\">an open-source project</a> licensed under the <a href=\"http://www.gnu.org/copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> General Public License</a>. This means you can host it on your own web server for free, whether it is on the Internet, a private network or just your own computer."
-msgstr "%s er baseret på <a href=\"http://sourceforge.net/projects/scuttle/\">et åbent-kode projekt</a> licenseret under <a href=\"http://www.gnu.org/copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> General Public License</a>. Dette betyder at du kan hoste systemet på din egen server gratis, lige meget om det er på Internet, et privat netværk eller bare på din egen computer."
+#: data/templates/default/bookmarks.tpl.php:214
+#: data/templates/default/bookmarks.tpl.php:217
+msgid "Last"
+msgstr "Sidste"
 
-#: ..\..\..\templates\about.tpl.php:15
+#: data/templates/default/bookmarks.tpl.php:233
 #, php-format
-msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 understøtter de fleste <a href=\"http://www.delicious.com/help/api\">del.icio.us <abbr title=\"Forbindelsesflade imellem forskellige programmer \">API</abbr></a>. Næsten alle de værktøjer udviklet til det system kan modificeres til at fungere med %1$s i stedet for. Hvis du finder et værktøj som ikke tillader at du fortager ændringer i API adresse, kunne du jo spørge udviklerne. Man ved aldrig det kunne jo være de ville."
-
-#: ..\..\..\templates\bookmarks.tpl.php:17
-#: ..\..\..\templates\tags.tpl.php:7
-msgid "Sort by:"
-msgstr "Sortere efter:"
-
-#: ..\..\..\templates\bookmarks.tpl.php:18
-msgid "Date"
-msgstr "Dato"
-
-#: ..\..\..\templates\bookmarks.tpl.php:19
-#: ..\..\..\templates\editbookmark.tpl.php:34
-msgid "Title"
-msgstr "Titel"
+msgid "Page %d of %d"
+msgstr "Side %d af %d"
 
-#: ..\..\..\templates\bookmarks.tpl.php:23
-msgid "URL"
-msgstr "URL"
+#: data/templates/default/bookmarks.tpl.php:295
+#, fuzzy
+msgid "Tags:"
+msgstr "Mærkater"
 
-#: ..\..\..\templates\bookmarks.tpl.php:60
+#: data/templates/default/bookmarks.tpl.php:302
 msgid "Edit"
 msgstr "Redigere"
 
-#: ..\..\..\templates\bookmarks.tpl.php:60
-msgid "Delete"
-msgstr "Slet"
+#: data/templates/default/bookmarks.tpl.php:310
+msgid "Last update"
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:66
+#: data/templates/default/bookmarks.tpl.php:313
 msgid "by"
 msgstr "af"
 
-#: ..\..\..\templates\bookmarks.tpl.php:78
+#: data/templates/default/bookmarks.tpl.php:317
+msgid "you"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:333
 #, php-format
 msgid " and %s1 other%s"
 msgstr "og %s1 andre%s"
 
-#: ..\..\..\templates\bookmarks.tpl.php:81
+#: data/templates/default/bookmarks.tpl.php:336
 #, php-format
 msgid " and %2$s%1$s others%3$s"
 msgstr " og %2$s%1$s andre%3$s"
 
-#: ..\..\..\templates\bookmarks.tpl.php:90
+#: data/templates/default/bookmarks.tpl.php:350
+#, fuzzy
+msgid "Copy this bookmark to YOUR bookmarks."
+msgstr "Importere bogmærker fra bogmærke fil"
+
+#: data/templates/default/bookmarks.tpl.php:351
 msgid "Copy"
 msgstr "Kopi"
 
-#: ..\..\..\templates\bookmarks.tpl.php:136
-#: ..\..\..\templates\bookmarks.tpl.php:142
-msgid "First"
-msgstr "Første"
-
-#: ..\..\..\templates\bookmarks.tpl.php:137
-#: ..\..\..\templates\bookmarks.tpl.php:143
-msgid "Previous"
-msgstr "Forrige"
+#: data/templates/default/bookmarks.tpl.php:376
+msgid "This bookmark is certified by an admin user."
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:150
-#: ..\..\..\templates\bookmarks.tpl.php:153
-msgid "Next"
-msgstr "Næste"
+#: data/templates/default/bookmarks.tpl.php:430
+#, fuzzy
+msgid "Private Note on this bookmark"
+msgstr "Du har ikke tilladelse til at redigere dette bogmærke"
 
-#: ..\..\..\templates\bookmarks.tpl.php:151
-#: ..\..\..\templates\bookmarks.tpl.php:154
-msgid "Last"
-msgstr "Sidste"
+#: data/templates/default/bookmarks.tpl.php:444
+msgid "Come back to the top of this page."
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:156
-#, php-format
-msgid "Page %d of %d"
-msgstr "Side %d af %d"
+#: data/templates/default/bookmarks.tpl.php:444
+msgid "Top of the page"
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:160
+#: data/templates/default/bookmarks.tpl.php:450
 msgid "No bookmarks available"
 msgstr "Igen bogmærker tilgængelig"
 
-#: ..\..\..\templates\dynamictags.inc.php:108
-#: ..\..\..\templates\sidebar.block.common.php:15
-#: ..\..\..\templates\sidebar.block.popular.php:21
-#: ..\..\..\templates\sidebar.block.recent.php:20
-#: ..\..\..\templates\tags.tpl.php:16
+#: data/templates/default/bottom.inc.php:5
+#: data/templates/default/toolbar.inc.php:15
+#: data/templates/default/toolbar.inc.php:28 www/about.php:23 www/about.php:24
+msgid "About"
+msgstr "Om programmet"
+
+#: data/templates/default/bottom.inc.php:7
+msgid "Propulsed by "
+msgstr ""
+
+#: data/templates/default/dynamictags.inc.php:56
+#: data/templates/default/sidebar.block.common.php:19
+#: data/templates/default/sidebar.block.popular.php:34
+#: data/templates/default/sidebar.block.recent.php:29
+#: data/templates/default/tags.tpl.php:19
 msgid "bookmark"
 msgid_plural "bookmarks"
 msgstr[0] "bogmærke"
 msgstr[1] "bogmærker"
 
-#: ..\..\..\templates\editbookmark.tpl.php:29
+#: data/templates/default/dynamictags.inc.php:105
+#: data/templates/default/sidebar.block.common.php:9
+#: data/templates/default/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.popular.php:23
+#: data/templates/default/sidebar.block.recent.php:34
+#: data/templates/default/toolbar.inc.php:27 www/populartags.php:46
+msgid "Popular Tags"
+msgstr "Populære mærkater"
+
+#: data/templates/default/dynamictags.inc.php:108
+#, fuzzy
+msgid "Popular Tags From All Users"
+msgstr "Populære mærkater"
+
+#: data/templates/default/editbookmark.tpl.php:46
 msgid "Address"
 msgstr "Adresse"
 
-#: ..\..\..\templates\editbookmark.tpl.php:31
-#: ..\..\..\templates\editbookmark.tpl.php:36
-#: ..\..\..\templates\editprofile.tpl.php:31
+#: data/templates/default/editbookmark.tpl.php:48
+#: data/templates/default/editbookmark.tpl.php:53
+#: data/templates/default/editprofile.tpl.php:29
+#: data/templates/default/tagrename.tpl.php:14
+#: data/templates/default/tagrename.tpl.php:19
 msgid "Required"
 msgstr "Påkrævet"
 
-#: ..\..\..\templates\editbookmark.tpl.php:39
-#: ..\..\..\templates\editprofile.tpl.php:47
-#: ..\..\..\templates\profile.tpl.php:28
-msgid "Description"
-msgstr "Beskrivelse"
+#: data/templates/default/editbookmark.tpl.php:58
+msgid "Add Note"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:61
+msgid ""
+"You can use anchors to delimite attributes. for example: [publisher]blah[/"
+"publisher] "
+msgstr ""
 
-#: ..\..\..\templates\editbookmark.tpl.php:46
+#: data/templates/default/editbookmark.tpl.php:64
+msgid "Suggested anchors: "
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:76
+#, fuzzy
+msgid "Private Note"
+msgstr "Private"
+
+#: data/templates/default/editbookmark.tpl.php:78
+msgid "Just visible by you and your contacts."
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:82
+#: data/templates/default/toolbar.inc.php:10 www/tags.php:45 www/tags.php:67
+msgid "Tags"
+msgstr "Mærkater"
+
+#: data/templates/default/editbookmark.tpl.php:86
 msgid "Comma-separated"
 msgstr "Komma adskillelse"
 
-#: ..\..\..\templates\editbookmark.tpl.php:49
-#: ..\..\..\templates\importDelicious.tpl.php:15
-#: ..\..\..\templates\importNetscape.tpl.php:16
+#: data/templates/default/editbookmark.tpl.php:90
+#: data/templates/default/tag2tagadd.tpl.php:9
+msgid ""
+"Note: use \">\" to include one tag in another. e.g.: europe>france>paris"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:94
+#: data/templates/default/tag2tagadd.tpl.php:8
+msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:97
+#: data/templates/default/importDelicious.tpl.php:15
+#: data/templates/default/importNetscape.tpl.php:16
 msgid "Privacy"
 msgstr "Privat"
 
-#: ..\..\..\templates\editbookmark.tpl.php:52
-#: ..\..\..\templates\importDelicious.tpl.php:18
-#: ..\..\..\templates\importNetscape.tpl.php:19
+#: data/templates/default/editbookmark.tpl.php:100
+#: data/templates/default/importDelicious.tpl.php:18
+#: data/templates/default/importNetscape.tpl.php:19
 msgid "Public"
 msgstr "Offentligt"
 
-#: ..\..\..\templates\editbookmark.tpl.php:53
-#: ..\..\..\templates\importDelicious.tpl.php:19
-#: ..\..\..\templates\importNetscape.tpl.php:20
+#: data/templates/default/editbookmark.tpl.php:101
 msgid "Shared with Watch List"
 msgstr "Del med Overvågningslisten"
 
-#: ..\..\..\templates\editbookmark.tpl.php:54
-#: ..\..\..\templates\importDelicious.tpl.php:20
-#: ..\..\..\templates\importNetscape.tpl.php:21
+#: data/templates/default/editbookmark.tpl.php:102
+#: data/templates/default/importDelicious.tpl.php:20
+#: data/templates/default/importNetscape.tpl.php:21
 msgid "Private"
 msgstr "Private"
 
-#: ..\..\..\templates\editbookmark.tpl.php:66
+#: data/templates/default/editbookmark.tpl.php:115
 msgid "Delete Bookmark"
 msgstr "Slet bogmærker"
 
-#: ..\..\..\templates\editbookmark.tpl.php:93
-msgid "Bookmarklet"
-msgstr "Bogmærkelet"
-
-#: ..\..\..\templates\editbookmark.tpl.php:94
-#, 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 "Træk en af de følgende bogmærkeletter til din browsers bogmærker, og tryk på den hver gang du ønsker at tilføje den side du er på til %s"
-
-#: ..\..\..\templates\editbookmark.tpl.php:106
-#, php-format
-msgid "Post to %s"
-msgstr "Send til %s"
-
-#: ..\..\..\templates\editbookmark.tpl.php:107
-#, php-format
-msgid "Post to %s (Pop-up)"
-msgstr "Send til %s (Pop-up)"
+#: data/templates/default/editbookmark.tpl.php:120
+msgid "edit common description"
+msgstr ""
 
-#: ..\..\..\templates\editbookmark.tpl.php:111
-#: ..\..\..\templates\importDelicious.tpl.php:26
-#: ..\..\..\templates\importNetscape.tpl.php:27
+#: data/templates/default/editbookmark.tpl.php:212
+#: data/templates/default/importDelicious.tpl.php:26
+#: data/templates/default/importNetscape.tpl.php:27
+#: data/templates/default/importStructure.tpl.php:16
 msgid "Import"
 msgstr "Importere"
 
-#: ..\..\..\templates\editbookmark.tpl.php:113
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Import bookmarks from bookmark file"
 msgstr "Importere bogmærker fra bogmærke fil"
 
-#: ..\..\..\templates\editbookmark.tpl.php:113
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Internet Explorer, Mozilla Firefox and Netscape"
 msgstr "Internet Explorer, Mozilla Firefox og Netscape"
 
-#: ..\..\..\templates\editbookmark.tpl.php:114
+#: data/templates/default/editbookmark.tpl.php:215
 msgid "Import bookmarks from del.icio.us"
 msgstr "Importere bogmærker fra del.icio.us"
 
-#: ..\..\..\templates\editprofile.tpl.php:10
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:11
+msgid "SSL client certificates"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:17
+msgid "Serial"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:45
+#: data/templates/default/profile.tpl.php:17
+msgid "Name"
+msgstr "Navn"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:19
+#: data/templates/default/profile.tpl.php:11
+#, fuzzy
+msgid "Email"
+msgstr "E-mail"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:20
+msgid "Issuer"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:30
+#, fuzzy
+msgid "delete"
+msgstr "Slet"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:43
+msgid "No certificates registered"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:48
+msgid "Your current certificate is already registered with your account."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:53
+msgid "Register current certificate to automatically login."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:59
+msgid "Your browser does not provide a certificate."
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:8
 msgid "Account Details"
 msgstr "Konto oplysninger"
 
-#: ..\..\..\templates\editprofile.tpl.php:14
-#: ..\..\..\templates\login.tpl.php:15
-#: ..\..\..\templates\password.tpl.php:10
-#: ..\..\..\templates\profile.tpl.php:7
-#: ..\..\..\templates\register.tpl.php:16
+#: data/templates/default/editprofile.tpl.php:12
+#: data/templates/default/login.tpl.php:21
+#: data/templates/default/password.tpl.php:10
+#: data/templates/default/profile.tpl.php:6
+#: data/templates/default/register.tpl.php:16
 msgid "Username"
 msgstr "Brugernavn"
 
-#: ..\..\..\templates\editprofile.tpl.php:19
+#: data/templates/default/editprofile.tpl.php:17
 msgid "New Password"
 msgstr "Nyt kodeord"
 
-#: ..\..\..\templates\editprofile.tpl.php:24
+#: data/templates/default/editprofile.tpl.php:22
 msgid "Confirm Password"
 msgstr "bekræft kodeord"
 
-#: ..\..\..\templates\editprofile.tpl.php:29
-#: ..\..\..\templates\register.tpl.php:26
+#: data/templates/default/editprofile.tpl.php:27
+#: data/templates/default/password.tpl.php:14
+#: data/templates/default/register.tpl.php:26
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ..\..\..\templates\editprofile.tpl.php:35
+#: data/templates/default/editprofile.tpl.php:32
+#, fuzzy
+msgid "Private RSS Feed"
+msgstr "Private"
+
+#: data/templates/default/editprofile.tpl.php:34
+msgid "Enable"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:36
+#, fuzzy
+msgid "Generate New Key"
+msgstr "Generere kodeord"
+
+#: data/templates/default/editprofile.tpl.php:41
 msgid "Personal Details"
 msgstr "Personlige detaljer"
 
-#: ..\..\..\templates\editprofile.tpl.php:39
-#: ..\..\..\templates\profile.tpl.php:12
-msgid "Name"
-msgstr "Navn"
-
-#: ..\..\..\templates\editprofile.tpl.php:43
-#: ..\..\..\templates\profile.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:49
+#: data/templates/default/profile.tpl.php:23
 msgid "Homepage"
 msgstr "Hjemmeside"
 
-#: ..\..\..\templates\error.404.tpl.php:5
+#: data/templates/default/editprofile.tpl.php:58 www/edit.php:113
+msgid "Save Changes"
+msgstr "Gem ændringer"
+
+#: data/templates/default/editprofile.tpl.php:63
+#: data/templates/default/sidebar.block.tagactions.php:17
+#: data/templates/default/sidebar.block.watchstatus.php:18
+msgid "Actions"
+msgstr "Aktion"
+
+#: data/templates/default/editprofile.tpl.php:66
+#, fuzzy
+msgid "Export bookmarks"
+msgstr "mine bogmærker"
+
+#: data/templates/default/editprofile.tpl.php:68
+msgid "HTML file (for browsers)"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:69
+msgid "XML file (like del.icio.us)"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:70
+msgid "CSV file (for spreadsheet tools)"
+msgstr ""
+
+#: data/templates/default/error.404.tpl.php:5
 msgid "Not Found"
 msgstr "Ikke fundet"
 
-#: ..\..\..\templates\error.404.tpl.php:6
+#: data/templates/default/error.404.tpl.php:6
 msgid "The requested URL was not found on this server"
 msgstr "Den forespurgte adresse kunne ikke findes på denne server"
 
-#: ..\..\..\templates\error.500.tpl.php:5
+#: data/templates/default/error.500.tpl.php:5
 msgid "General server error"
 msgstr "General server fejl"
 
-#: ..\..\..\templates\error.500.tpl.php:6
+#: data/templates/default/error.500.tpl.php:6
 msgid "The requested URL could not be processed"
 msgstr "Den forespurgte adresse kunne ikke afvikles"
 
-#: ..\..\..\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 "Log ind på <a href=\"http://del.icio.us/api/posts/all\">del.icio.us' eksport side</a>"
+#: data/templates/default/importDelicious.tpl.php:19
+#: data/templates/default/importNetscape.tpl.php:20
+#, fuzzy
+msgid "Shared with Watchlist"
+msgstr "Del med Overvågningslisten"
 
-#: ..\..\..\templates\importDelicious.tpl.php:34
-msgid "Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> file to your computer"
-msgstr "Gem <abbr title=\"Extensible Markup Language\">XML</abbr> fillen på din computer"
+#: data/templates/default/importDelicious.tpl.php:31
+#: data/templates/default/importNetscape.tpl.php:32
+#: data/templates/default/importStructure.tpl.php:21
+msgid "Instructions"
+msgstr "Instruktioner"
 
-#: ..\..\..\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 "Tryk <kbd>Gennemse...</kbd> for at finde denne fil på din computer. Filstørrelsen må maksimum være på 1MB"
+#: data/templates/default/importDelicious.tpl.php:33
+#, fuzzy
+msgid ""
+"Log in to the <a href=\"https://api.del.icio.us/v1/posts/all\">export page "
+"at del.icio.us</a>"
+msgstr ""
+"Log ind på <a href=\"http://del.icio.us/api/posts/all\">del.icio.us' eksport "
+"side</a>"
 
-#: ..\..\..\templates\importDelicious.tpl.php:36
-#: ..\..\..\templates\importNetscape.tpl.php:43
-msgid "Select the default privacy setting for your imported bookmarks"
-msgstr "Vælg den ønskede standart privatindstilling for dine importerede bogmærker"
+#: data/templates/default/importDelicious.tpl.php:34
+msgid ""
+"Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> "
+"file to your computer"
+msgstr ""
+"Gem <abbr title=\"Extensible Markup Language\">XML</abbr> fillen på din "
+"computer"
 
-#: ..\..\..\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 "Tryk Import for at starte med at importere dine bogmærker; dette kan tage et par minutter."
+#: data/templates/default/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 ""
+"Tryk <kbd>Gennemse...</kbd> for at finde denne fil på din computer. "
+"Filstørrelsen må maksimum være på 1MB"
 
-#: ..\..\..\templates\importNetscape.tpl.php:32
-msgid "Instructions"
-msgstr "Instruktioner"
+#: data/templates/default/importDelicious.tpl.php:36
+#: data/templates/default/importNetscape.tpl.php:43
+msgid "Select the default privacy setting for your imported bookmarks"
+msgstr ""
+"Vælg den ønskede standart privatindstilling for dine importerede bogmærker"
+
+#: data/templates/default/importDelicious.tpl.php:37
+#: data/templates/default/importNetscape.tpl.php:44
+msgid ""
+"Click <kbd>Import</kbd> to start importing the bookmarks; it may take a "
+"minute"
+msgstr ""
+"Tryk Import for at starte med at importere dine bogmærker; dette kan tage et "
+"par minutter."
 
-#: ..\..\..\templates\importNetscape.tpl.php:35
+#: data/templates/default/importNetscape.tpl.php:35
 msgid "Export your bookmarks from your browser to a file"
 msgstr "Eksportere dine bogmærker fra din browser til en fil"
 
-#: ..\..\..\templates\importNetscape.tpl.php:37
-msgid "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
-msgstr "Internet Explorer: <kbd>Filer &gt; Importer og eksporter... &gt; Eksporter foretrukne emner"
+#: data/templates/default/importNetscape.tpl.php:37
+msgid ""
+"Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
+msgstr ""
+"Internet Explorer: <kbd>Filer &gt; Importer og eksporter... &gt; Eksporter "
+"foretrukne emner"
+
+#: data/templates/default/importNetscape.tpl.php:38
+msgid ""
+"Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
+"Export..."
+msgstr ""
+"Mozilla Firefox: <kbd>Bogmærker &gt; Arranger bogmærker... &gt; Filer &gt; "
+"Eksporter..."
+
+#: data/templates/default/importNetscape.tpl.php:39
+msgid ""
+"Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
+msgstr ""
+"Netscape: <kbd>Bogmærker &gt; Arranger bogmærker... &gt; Værktøjer &gt; "
+"Eksporter..."
+
+#: data/templates/default/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 ""
+"Tryk <kbd>Gennemse...</kbd> for at finde den gemte bogmærke fil på din "
+"computer. Filstørrelsen må maksimum være på 1MB"
 
-#: ..\..\..\templates\importNetscape.tpl.php:38
-msgid "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; Export..."
-msgstr "Mozilla Firefox: <kbd>Bogmærker &gt; Arranger bogmærker... &gt; Filer &gt; Eksporter..."
+#: data/templates/default/importStructure.tpl.php:24
+msgid "Create your structure into a simple text file and following this model:"
+msgstr ""
 
-#: ..\..\..\templates\importNetscape.tpl.php:39
-msgid "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
-msgstr "Netscape: <kbd>Bogmærker &gt; Arranger bogmærker... &gt; Værktøjer &gt; Eksporter..."
+#: data/templates/default/importStructure.tpl.php:35
+msgid ""
+"Then import the file. The tags and their relations will be added to your "
+"profile."
+msgstr ""
 
-#: ..\..\..\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 "Tryk <kbd>Gennemse...</kbd> for at finde den gemte bogmærke fil på din computer. Filstørrelsen må maksimum være på 1MB"
+#: data/templates/default/login.tpl.php:13
+msgid "Please activate cookies"
+msgstr ""
 
-#: ..\..\..\templates\login.tpl.php:20
-#: ..\..\..\templates\register.tpl.php:21
+#: data/templates/default/login.tpl.php:26
+#: data/templates/default/register.tpl.php:21
 msgid "Password"
 msgstr "Kodeord"
 
-#: ..\..\..\templates\login.tpl.php:22
+#: data/templates/default/login.tpl.php:28
 msgid "Don't ask for my password for 2 weeks"
 msgstr "Søg ikke efter mit kodeord i 2 uger"
 
-#: ..\..\..\templates\login.tpl.php:30
+#: data/templates/default/login.tpl.php:32
+#: data/templates/default/toolbar.inc.php:29 www/login.php:57
+msgid "Log In"
+msgstr "Log ind"
+
+#: data/templates/default/login.tpl.php:36
 msgid "Forgotten your password?"
 msgstr "Glemt dit kodeord?"
 
-#: ..\..\..\templates\password.tpl.php:5
+#: data/templates/default/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 "Hvis du har glemte dit kodeord, kan %s generere et nyt et. Skriv brugernavnet og e-mail adressen på din konto i formularen nedenfor og vi vil sende dit nye kodeord til dig via e-mail."
-
-#: ..\..\..\templates\password.tpl.php:14
-msgid "<abbr title=\"Electronic mail\">E-mail</abbr>"
-msgstr "<abbr title=\"Elektronisk post\">E-mail</abbr>"
+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 ""
+"Hvis du har glemte dit kodeord, kan %s generere et nyt et. Skriv "
+"brugernavnet og e-mail adressen på din konto i formularen nedenfor og vi vil "
+"sende dit nye kodeord til dig via e-mail."
 
-#: ..\..\..\templates\password.tpl.php:19
+#: data/templates/default/password.tpl.php:19
 msgid "Generate Password"
 msgstr "Generere kodeord"
 
-#: ..\..\..\templates\profile.tpl.php:23
+#: data/templates/default/profile.tpl.php:28
 msgid "Member Since"
 msgstr "Medlem siden"
 
-#: ..\..\..\templates\profile.tpl.php:35
-#: ..\..\..\templates\sidebar.block.watchlist.php:8
+#: data/templates/default/profile.tpl.php:40
+#: data/templates/default/sidebar.block.watchlist.php:30
 msgid "Watching"
 msgstr "Overvåger"
 
-#: ..\..\..\templates\profile.tpl.php:50
+#: data/templates/default/profile.tpl.php:55
+#: data/templates/default/sidebar.block.watchlist.php:52
 msgid "Watched By"
 msgstr "Overvågede af"
 
-#: ..\..\..\templates\register.tpl.php:11
+#: data/templates/default/profile.tpl.php:68
+#: data/templates/default/toolbar.inc.php:9
+msgid "Bookmarks"
+msgstr "Bogmærker"
+
+#: data/templates/default/profile.tpl.php:69
+#, fuzzy
+msgid "Go to bookmarks"
+msgstr "mine bogmærker"
+
+#: data/templates/default/register.tpl.php:11
 #, php-format
-msgid "Sign up here to create a free %s account. All the information requested below is required"
-msgstr "Tilmeld dig her for at oprette en gratis %s konto. Alle forspurgte informationerne neden for er påkrævet."
+msgid ""
+"Sign up here to create a free %s account. All the information requested "
+"below is required"
+msgstr ""
+"Tilmeld dig her for at oprette en gratis %s konto. Alle forspurgte "
+"informationerne neden for er påkrævet."
 
-#: ..\..\..\templates\rss.tpl.php:9
+#: data/templates/default/register.tpl.php:18
+msgid ""
+" at least 5 characters, alphanumeric (no spaces, no dots or other special "
+"ones)"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:28
+msgid " to send you your password if you forget it"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:33
+msgid "Antispam question"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:41
+#: data/templates/default/toolbar.inc.php:31 www/register.php:99
+msgid "Register"
+msgstr "Registrere"
+
+#: data/templates/default/search.menu.php:27
+#, fuzzy
+msgid "Search..."
+msgstr "Søg"
+
+#: data/templates/default/search.menu.php:28
+#, fuzzy
+msgid "in"
+msgstr "Line"
+
+#: data/templates/default/search.menu.php:34
+msgid "this user's bookmarks"
+msgstr "denne brugers bogmærker"
+
+#: data/templates/default/search.menu.php:39
+msgid "my bookmarks"
+msgstr "mine bogmærker"
+
+#: data/templates/default/search.menu.php:40
+msgid "my watchlist"
+msgstr "Min Overvågningsliste"
+
+#: data/templates/default/search.menu.php:44
+msgid "all bookmarks"
+msgstr "alle bogmærkerne"
+
+#: data/templates/default/search.menu.php:54
+msgid "Search"
+msgstr "Søg"
+
+#: data/templates/default/sidebar.block.linked.php:23
+#, fuzzy
+msgid "Linked Tags"
+msgstr "Lignede mærker"
+
+#: data/templates/default/sidebar.block.linked.php:28
+#: data/templates/default/sidebar.block.menu.php:46
+msgid "Add new link"
+msgstr ""
+
+#: data/templates/default/sidebar.block.linked.php:29
+#: data/templates/default/sidebar.block.menu.php:47
+#, fuzzy
+msgid "Delete link"
+msgstr "Slet"
+
+#: data/templates/default/sidebar.block.menu.php:35
 #, php-format
-msgid "Recent bookmarks posted to %s"
-msgstr "Seneste bogmærker sendt til %s"
+msgid "Tags included into the tag '%s'"
+msgstr ""
 
-#: ..\..\..\templates\rss.tpl.php:17
-#: ..\..\..\templates\rss.tpl.php:19
-msgid "No bookmarks found"
-msgstr "Igen bogmærker fundet"
+#: data/templates/default/sidebar.block.menu.php:35
+#, fuzzy
+msgid "Menu Tags"
+msgstr "Nylig mærker"
+
+#: data/templates/default/sidebar.block.menu.php:68
+msgid "See all your tags"
+msgstr ""
 
-#: ..\..\..\templates\sidebar.block.recent.php:15
+#: data/templates/default/sidebar.block.menu.php:68
+msgid "all your tags"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:70
+msgid "See all tags from this user"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:70
+msgid "all tags from this user"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:74
+#, fuzzy
+msgid "See popular tags"
+msgstr "Populære mærkater"
+
+#: data/templates/default/sidebar.block.menu2.php:21
+#, fuzzy
+msgid "Featured Menu Tags"
+msgstr "Lignede mærker"
+
+#: data/templates/default/sidebar.block.menu2.php:25
+msgid "This menu is composed of keywords (tags) organized by admins."
+msgstr ""
+
+#: data/templates/default/sidebar.block.recent.php:18
 msgid "Recent Tags"
 msgstr "Nylig mærker"
 
-#: ..\..\..\templates\sidebar.block.related.php:15
+#: data/templates/default/sidebar.block.related.php:26
 msgid "Related Tags"
 msgstr "Lignede mærker"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:10
+#: data/templates/default/sidebar.block.search.php:28
+#, fuzzy
+msgid "Last Searches"
+msgstr "Søg"
+
+#: data/templates/default/sidebar.block.search.php:40
+#, fuzzy
+msgid "Number of bookmarks for this query"
+msgstr "Igen bogmærker fundet"
+
+#: data/templates/default/sidebar.block.tagactions.php:9 www/tagrename.php:72
+#, fuzzy
+msgid "Rename Tag"
+msgid_plural "Rename Tags"
+msgstr[0] "Lignede mærker"
+msgstr[1] "Lignede mærker"
+
+#: data/templates/default/sidebar.block.tagactions.php:22 www/tagdelete.php:54
+#, fuzzy
+msgid "Delete Tag"
+msgstr "Slet"
+
+#: data/templates/default/sidebar.block.tagactions.php:24 www/tagedit.php:61
+#, fuzzy
+msgid "Edit Tag Description"
+msgstr "Beskrivelse"
+
+#: data/templates/default/sidebar.block.tagactions.php:26
+#: www/tagcommondescriptionedit.php:76
+msgid "Edit Tag Common Description"
+msgstr ""
+
+#: data/templates/default/sidebar.block.tagactions.php:28
+msgid "Create a link to another tag"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:14
+msgid "New Users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:23
+#: data/templates/default/users.tpl.php:24
+#, fuzzy
+msgid "bookmarks"
+msgstr "bogmærke"
+
+#: data/templates/default/sidebar.block.users.php:30
+msgid "See all users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:30
+msgid "All users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:19
+msgid "Close contacts are mutual contacts"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:19
+msgid "Close contacts"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:36
+msgid "Add a contact..."
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:36
+msgid "Type a username to add it to your contacts."
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:44
+#, fuzzy
+msgid "Remove this contact"
+msgstr "Fjern fra Overvågningslisten"
+
+#: data/templates/default/sidebar.block.watchstatus.php:11
 msgid "Remove from Watchlist"
 msgstr "Fjern fra Overvågningslisten"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:12
+#: data/templates/default/sidebar.block.watchstatus.php:13
 msgid "Add to Watchlist"
 msgstr "Tilføj til Overvågningslisten"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:17
-msgid "Actions"
-msgstr "Aktion"
+#: data/templates/default/sidebar.linkedtags.inc.php:18
+#, fuzzy
+msgid "Edit link"
+msgstr "Redigere"
+
+#: data/templates/default/sidebar.linkedtags.inc.php:47
+msgid "Synonyms:"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:12
+msgid "Create new link:"
+msgstr ""
+
+#: data/templates/default/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 ""
+
+#: data/templates/default/tag2tagadd.tpl.php:23
+#: data/templates/default/tag2tagedit.tpl.php:37
+msgid "Create"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:35
+#: data/templates/default/tag2tagdelete.tpl.php:27
+#: data/templates/default/tag2tagedit.tpl.php:51
+msgid "Existing links:"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:53
+#: data/templates/default/tag2tagdelete.tpl.php:45
+#: data/templates/default/tag2tagedit.tpl.php:69
+msgid "No links"
+msgstr ""
+
+#: data/templates/default/tag2tagdelete.tpl.php:15
+#: data/templates/default/tag2tagedit.tpl.php:16
+#: data/templates/default/tagdelete.tpl.php:8 www/jsScuttle.php:24
+msgid "Yes"
+msgstr "Ja"
+
+#: data/templates/default/tag2tagdelete.tpl.php:16
+#: data/templates/default/tag2tagedit.tpl.php:17
+#: data/templates/default/tagdelete.tpl.php:9 www/jsScuttle.php:24
+msgid "No"
+msgstr "Nej"
+
+#: data/templates/default/tag2tagedit.tpl.php:6
+msgid "Delete the link"
+msgstr ""
+
+#: data/templates/default/tag2tagedit.tpl.php:29
+msgid "Create new link"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:12
+msgid "Old"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:17
+msgid "New"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:24
+#, fuzzy
+msgid "Rename"
+msgstr "Brugernavn"
 
-#: ..\..\..\templates\tags.tpl.php:8
+#: data/templates/default/tags.tpl.php:11
+#: data/templates/default/users.tpl.php:9
 msgid "Alphabet"
 msgstr "Alfabet"
 
-#: ..\..\..\templates\tags.tpl.php:9
+#: data/templates/default/tags.tpl.php:12
+#: data/templates/default/users.tpl.php:10
 msgid "Popularity"
 msgstr "Popularitet"
 
-#: ..\..\..\templates\toolbar.inc.php:11
-msgid "Bookmarks"
-msgstr "Bogmærker"
+#: data/templates/default/toolbar.inc.php:8
+#: data/templates/default/toolbar.inc.php:26
+#, fuzzy
+msgid "Home"
+msgstr "Hjemmeside"
+
+#: data/templates/default/toolbar.inc.php:11 www/watchlist.php:106
+msgid "Watchlist"
+msgstr "Overvågningsliste"
 
-#: ..\..\..\templates\toolbar.inc.php:16
+#: data/templates/default/toolbar.inc.php:12 www/profile.php:79
+msgid "Profile"
+msgstr "Profil"
+
+#: data/templates/default/toolbar.inc.php:13 www/bookmarks.php:215
+msgid "Add a Bookmark"
+msgstr "Tilføj et bogmærke"
+
+#: data/templates/default/toolbar.inc.php:14
 msgid "Log Out"
 msgstr "Log ud"
 
+#: data/templates/default/toolbar.inc.php:17
+msgid "Admin"
+msgstr ""
+
+#: data/templates/default/top.inc.php:57
+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/default/users.tpl.php:20
+#, fuzzy
+msgid "profile"
+msgstr "Profil"
+
+#: data/templates/default/users.tpl.php:21
+msgid "created in"
+msgstr ""
+
+#: www/admin.php:32
+msgid "Manage users"
+msgstr ""
+
+#: www/admin.php:69
+#, php-format
+msgid "%s and all his bookmarks and tags were deleted."
+msgstr ""
+
+#: www/admin.php:76
+msgid "Problem with "
+msgstr ""
+
+#: www/ajaxDelete.php:37
+msgid "You are not allowed to delete this bookmark"
+msgstr "Du har ikke tilladelse til at slette dette bogmærke"
+
+#: www/ajaxDelete.php:41 www/edit.php:103
+msgid "Failed to delete bookmark"
+msgstr "Kunne ikke slette bogmærket"
+
+#: www/alltags.php:50
+msgid "All Tags"
+msgstr "Alle mærker"
+
+#: www/alltags.php:56 www/bookmarks.php:99 www/populartags.php:52
+#: www/profile.php:55 www/rss.php:100 www/search.php:111 www/watch.php:45
+#: www/watchlist.php:61
+#, php-format
+msgid "User with username %s was not found"
+msgstr "Bruger med brugernavn %s kunne ikke findes"
+
+#: 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 ""
+
+#: www/bookmarkcommondescriptionedit.php:60
+msgid "Bookmark common description updated"
+msgstr ""
+
+#: www/bookmarkcommondescriptionedit.php:63
+#, fuzzy
+msgid "Failed to update the bookmark common description"
+msgstr "Kunne ikke slette bogmærket"
+
+#: www/bookmarkcommondescriptionedit.php:71
+msgid "Edit Bookmark Common Description"
+msgstr ""
+
+#: www/bookmarks.php:114 www/tags.php:47
+msgid "Remove the tag from the selection"
+msgstr ""
+
+#: www/bookmarks.php:134 www/edit.php:65
+msgid "Your bookmark must have a title and an address"
+msgstr "Dit bogmærke skal have både en titel og en adresse"
+
+#: www/bookmarks.php:139
+msgid "This bookmark URL may not be added"
+msgstr ""
+
+#: www/bookmarks.php:158 www/edit.php:83 www/edit.php:86
+msgid "Bookmark saved"
+msgstr "Bogmærke gemt"
+
+#: www/bookmarks.php:158
+msgid "(Come back to previous page.)"
+msgstr ""
+
+#: www/bookmarks.php:165 www/import.php:106 www/importNetscape.php:108
+msgid ""
+"There was an error saving your bookmark. Please try again or contact the "
+"administrator."
+msgstr ""
+"Der opstod en fejl, ved forsøg på at gemme dit bogmærke. Prøv venligst igen "
+"eller kontakt Administrator"
+
+#: www/bookmarks.php:222
+msgid "Add Bookmark"
+msgstr "Tilføj bogmærke"
+
+#: www/bookmarks.php:225
+msgid "You must be logged in before you can add bookmarks."
+msgstr "Du skal være logget ind før du kan tilføje bogmærker"
+
+#: www/bookmarks.php:270
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: www/bookmarks.php:283
+#, php-format
+msgid "%s: %s (+private %s)"
+msgstr ""
+
+#: www/bookmarks.php:305 www/bookmarks.php:306
+msgid "My Bookmarks"
+msgstr "Mine bogmærker"
+
+#: www/edit.php:44 www/edit.php:45
+msgid "Edit Bookmark"
+msgstr "Rediger bogmærker"
+
+#: www/edit.php:51
+#, php-format
+msgid "Bookmark with id %s not was not found"
+msgstr "Bogmærke med id %s kunne ikke findes"
+
+#: www/edit.php:57
+msgid "You are not allowed to edit this bookmark"
+msgstr "Du har ikke tilladelse til at redigere dette bogmærke"
+
+#: www/edit.php:77
+msgid "Error while saving your bookmark"
+msgstr "Der opstod en fejl, ved forsøg på at gemme dit bogmærke."
+
+#: www/history.php:61
+msgid "History"
+msgstr "Historie"
+
+#: www/history.php:62
+#, php-format
+msgid "History for %s"
+msgstr "Historie for %s"
+
+#: www/history.php:84
+msgid "Address was not found"
+msgstr "Adressen kunne ikke findes"
+
+#: www/import.php:47
+msgid "Could not open XML input"
+msgstr "Kunne ikke åbne XML input"
+
+#: www/import.php:51
+#, php-format
+msgid "XML error: %s at line %d"
+msgstr "XLM fejl: %s i line %d"
+
+#: www/import.php:60
+msgid "Import Bookmarks from del.icio.us"
+msgstr "Importere bogmærker fra del.icio.us"
+
+#: www/import.php:93
+msgid "You have already submitted this bookmark."
+msgstr "Du har allerede tilføjet dette bogmærke"
+
+#: www/import.php:104
+msgid "Bookmark imported."
+msgstr "Bogmærke importeret"
+
+#: www/importNetscape.php:95
+#, fuzzy
+msgid "You have already submitted some of these bookmarks."
+msgstr "Du har allerede tilføjet dette bogmærke"
+
+#: www/importNetscape.php:115
+#, fuzzy
+msgid "Bookmarks found: "
+msgstr "Igen bogmærker fundet"
+
+#: www/importNetscape.php:116
+#, fuzzy
+msgid "Bookmarks imported: "
+msgstr "Bogmærke importeret"
+
+#: www/importNetscape.php:117 www/importNetscape.php:122
+msgid "Import Bookmarks from Browser File"
+msgstr "Importere bogmærker fra browser"
+
+#: 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 "Du er nu logget ud"
+
+#: www/index.php:46
+#, php-format
+msgid "%s: Recent bookmarks"
+msgstr "%s: Seneste bogmærker"
+
+#: www/index.php:58
+#, fuzzy, php-format
+msgid "%s: Recent bookmarks (+private %s)"
+msgstr "%s: Seneste bogmærker"
+
+#: www/index.php:96
+msgid "Store, share and tag your favourite links"
+msgstr "Gem, del og mærk dine favorit links"
+
+#: www/index.php:97
+#, fuzzy
+msgid "All Bookmarks"
+msgstr "alle bogmærkerne"
+
+#: www/jsScuttle.php:71
+msgid "Available"
+msgstr "Tilgængelig"
+
+#: www/jsScuttle.php:74
+msgid "Not Available"
+msgstr "Ikke tilgængelig"
+
+#: www/login.php:48
+msgid "The details you have entered are incorrect. Please try again."
+msgstr "Detaljerne du har indtastet er forkerte. Prøv venligst igen."
+
+#: www/password.php:36
+msgid "You must enter your username."
+msgstr "Du skal indtaste dit brugernavn"
+
+#: www/password.php:40
+msgid ""
+"You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"Du skal indtaste din <abbr title=\"Elektronisk post\">E-mail</abbr> adresse."
+
+#: www/password.php:48
+msgid "No matches found for that username."
+msgstr "Søgning gav igen resultat på det brugernavn."
+
+#: www/password.php:51
+msgid ""
+"No matches found for that combination of username and <abbr title="
+"\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"Søgning gav igen resultat på den kombination af brugernavn og <abbr title="
+"\"elektronisk post\">e-mail</abbr> adresse."
+
+#: www/password.php:59
+msgid ""
+"There was an error while generating your new password. Please try again."
+msgstr ""
+"Der opstod en fejl under genereringen af dit nye kodeord. Prøv venligst igen."
+
+#: www/password.php:63
+msgid "Your new password is:"
+msgstr "Dit nye kodeord er:"
+
+#: 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 ""
+"FFor at bevare dine bogmærker sikrere, bør du skifte dette kodeord i din "
+"profil næste gang du logger ind."
+
+#: www/password.php:66
+#, php-format
+msgid "%s Account Information"
+msgstr "%s Konto oplysninger"
+
+#: www/password.php:68
+#, php-format
+msgid "New password generated and sent to %s"
+msgstr "Nyt kodeord er blevet genereret og sendt til %s"
+
+#: www/password.php:75
+msgid "Forgotten Password"
+msgstr "Glemt kodeord"
+
+#: www/profile.php:63 www/watchlist.php:119
+msgid "Username was not specified"
+msgstr "Brugernavn var ikke specificerede"
+
+#: www/profile.php:70
+msgid "My Profile"
+msgstr "Min profil"
+
+#: www/profile.php:110
+msgid "Invalid Token"
+msgstr ""
+
+#: www/profile.php:115
+msgid "Password and confirmation do not match."
+msgstr "Kodeord og bekræftelse matcher ikke."
+
+#: www/profile.php:119
+msgid "Password must be at least 6 characters long."
+msgstr "Kodeordet skal mindst være på 6 karakterer."
+
+#: www/profile.php:123
+msgid "E-mail address is not valid."
+msgstr "E-mail adressen er ikke gyldig."
+
+#: www/profile.php:127
+msgid "An error occurred while saving your changes."
+msgstr "En fejl opstod ved forsøg på at gemme dine ændringer."
+
+#: www/profile.php:129
+msgid "Changes saved."
+msgstr "Ændringer gemt."
+
+#: www/profile.php:148
+msgid "You do not have a valid SSL client certificate"
+msgstr ""
+
+#: www/profile.php:150
+msgid "This certificate is already registered"
+msgstr ""
+
+#: www/profile.php:152
+msgid "Failed to register SSL client certificate."
+msgstr ""
+
+#: www/profile.php:154
+msgid "SSL client certificate registered."
+msgstr ""
+
+#: www/profile.php:163
+msgid "Certificate not found."
+msgstr ""
+
+#: www/profile.php:165
+msgid "The certificate does not belong to you."
+msgstr ""
+
+#: www/profile.php:167
+msgid "Failed to delete SSL client certificate."
+msgstr ""
+
+#: www/profile.php:169
+msgid "SSL client certificate deleted."
+msgstr ""
+
+#: www/register.php:52
+msgid "You <em>must</em> enter a username, password and e-mail address."
+msgstr "Du <em>skal</em> indtaste et brugernavn, kodeord og e-mail adresse."
+
+#: www/register.php:56
+#, fuzzy
+msgid "This username has been reserved, please make another choice."
+msgstr "Brugernavnet eksistere allerede, vælg venligst et andet."
+
+#: www/register.php:60
+msgid "This username already exists, please make another choice."
+msgstr "Brugernavnet eksistere allerede, vælg venligst et andet."
+
+#: www/register.php:64
+#, fuzzy
+msgid ""
+"This username is not valid (too short, too long, forbidden characters...), "
+"please make another choice."
+msgstr "Brugernavnet eksistere allerede, vælg venligst et andet."
+
+#: www/register.php:68
+msgid "E-mail address is not valid. Please try again."
+msgstr "E-mail addressen er ikke gyldig. Prøv venligst igen."
+
+#: www/register.php:72
+#, fuzzy
+msgid "Antispam answer is not valid. Please try again."
+msgstr "E-mail addressen er ikke gyldig. Prøv venligst igen."
+
+#: www/register.php:90
+msgid "You have successfully registered. Enjoy!"
+msgstr "Du er nu succesfuldt registeret. God fornøjelse!"
+
+#: www/register.php:92
+msgid "Registration failed. Please try again."
+msgstr "Registreringen fejlede. Prøv venligst igen."
+
+#: www/rss.php:90 www/rss.php:111
+#, php-format
+msgid "Failed to Autenticate User with username %s using private key"
+msgstr ""
+
+#: www/rss.php:128
+#, php-format
+msgid "Recent bookmarks posted to %s"
+msgstr "Seneste bogmærker sendt til %s"
+
+#: www/search.php:83 www/search.php:147
+msgid "Search Bookmarks"
+msgstr "Søge i bogmærker"
+
+#: www/search.php:89
+msgid "Search Results"
+msgstr "Søge resultat"
+
+#: www/search.php:137
+msgid "Unsatisfied? You can also try our "
+msgstr ""
+
+#: www/tag2tagadd.php:54
+msgid "Tag link created"
+msgstr ""
+
+#: www/tag2tagadd.php:57
+#, fuzzy
+msgid "Failed to create the link"
+msgstr "Kunne ikke slette bogmærket"
+
+#: www/tag2tagadd.php:69
+msgid "Add Tag Link"
+msgstr ""
+
+#: www/tag2tagdelete.php:66
+msgid "Tag link deleted"
+msgstr ""
+
+#: www/tag2tagdelete.php:69
+#, fuzzy
+msgid "Failed to delete the link"
+msgstr "Kunne ikke slette bogmærket"
+
+#: www/tag2tagdelete.php:81
+msgid "Delete Link Between Tags"
+msgstr ""
+
+#: www/tag2tagedit.php:55
+msgid "Edit Link Between Tags"
+msgstr ""
+
+#: www/tagcommondescriptionedit.php:62
+msgid "Tag common description updated"
+msgstr ""
+
+#: www/tagcommondescriptionedit.php:67
+msgid "Failed to update the tag common description"
+msgstr ""
+
+#: www/tagdelete.php:43
+msgid "Tag deleted"
+msgstr ""
+
+#: www/tagdelete.php:46
+#, fuzzy
+msgid "Failed to delete the tag"
+msgstr "Kunne ikke slette bogmærket"
+
+#: www/tagedit.php:52
+msgid "Tag description updated"
+msgstr ""
+
+#: www/tagedit.php:55
+#, fuzzy
+msgid "Failed to update the tag description"
+msgstr "Kunne ikke slette bogmærket"
+
+#: www/tagrename.php:63
+msgid "Tag renamed"
+msgstr ""
+
+#: www/tagrename.php:66
+#, fuzzy
+msgid "Failed to rename the tag"
+msgstr "Kunne ikke slette bogmærket"
+
+#: www/tags.php:71
+#, php-format
+msgid "%s: tagged with \"%s\""
+msgstr ""
+
+#: www/tags.php:84
+#, php-format
+msgid "%s: tagged with \"%s\" (+private %s)"
+msgstr ""
+
+#: www/users.php:31
+#, fuzzy
+msgid "Users"
+msgstr "Brugernavn"
+
+#: www/watch.php:54
+msgid "User removed from your watchlist"
+msgstr "Bruger fjernet fra din overvågningsliste"
+
+#: www/watch.php:56
+msgid "User added to your watchlist"
+msgstr "Bruger tilføjet til din overvågningsliste "
+
+#: www/watchlist.php:104
+msgid "My Watchlist"
+msgstr "Min Overvågningsliste "
+
+#: www/api/httpauth.inc.php:30
+msgid "Use of the API calls requires authentication."
+msgstr ""
+
+#: www/gsearch/index.php:51
+msgid "Come back to "
+msgstr ""
+
+#: www/gsearch/index.php:56
+msgid "Admin tips: "
+msgstr ""
+
+#: www/gsearch/index.php:57
+msgid "To refresh manually Google Custom Search Engine, goes to: "
+msgstr ""
+
+#: www/gsearch/index.php:61
+msgid ""
+"If no result appears, check that all the urls are valid in the admin section."
+msgstr ""
+
+#~ msgid "User with username %s not was not found"
+#~ msgstr "Bruger med brugernavn %s kunne ikke findes"
+
+#~ msgid "Recent Bookmarks"
+#~ msgstr "Seneste bogmærker"
+
+#~ msgid "for"
+#~ msgstr "for"
+
+#~ msgid "%s Bookmarks"
+#~ msgstr "%s Bogmærker"
+
+#~ msgid ""
+#~ "<strong><a href=\"register.php\">Register now</a></strong> to start using "
+#~ "%s!"
+#~ msgstr ""
+#~ "<strong><a href=\"register.php\">Register nu</a></strong> for at starte "
+#~ "med at bruge %s!"
+
+#~ msgid ""
+#~ "%s is based on <a href=\"http://sourceforge.net/projects/scuttle/\">an "
+#~ "open-source project</a> licensed under the <a href=\"http://www.gnu.org/"
+#~ "copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> "
+#~ "General Public License</a>. This means you can host it on your own web "
+#~ "server for free, whether it is on the Internet, a private network or just "
+#~ "your own computer."
+#~ msgstr ""
+#~ "%s er baseret på <a href=\"http://sourceforge.net/projects/scuttle/\">et "
+#~ "åbent-kode projekt</a> licenseret under <a href=\"http://www.gnu.org/"
+#~ "copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> "
+#~ "General Public License</a>. Dette betyder at du kan hoste systemet på din "
+#~ "egen server gratis, lige meget om det er på Internet, et privat netværk "
+#~ "eller bare på din egen computer."
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "<abbr title=\"Electronic mail\">E-mail</abbr>"
+#~ msgstr "<abbr title=\"Elektronisk post\">E-mail</abbr>"
diff --git a/data/locales/en_GB/LC_MESSAGES/messages.mo b/data/locales/en_GB/LC_MESSAGES/messages.mo
index 818af5b..e877f98 100644
--- a/data/locales/en_GB/LC_MESSAGES/messages.mo
+++ b/data/locales/en_GB/LC_MESSAGES/messages.mo
diff --git a/data/locales/en_GB/LC_MESSAGES/messages.po b/data/locales/en_GB/LC_MESSAGES/messages.po
index 9176c4f..b5bee79 100644
--- a/data/locales/en_GB/LC_MESSAGES/messages.po
+++ b/data/locales/en_GB/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Semantic Scuttle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-04 11:33+0200\n"
+"POT-Creation-Date: 2012-01-20 13:58+0100\n"
 "PO-Revision-Date: 2009-06-01 02:29+0100\n"
 "Last-Translator: Jan Seifert <seif1301@users.sourceforge.net>\n"
 "Language-Team: Ogee <ogee@ogee.de>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,579 +20,54 @@ msgstr ""
 "X-Poedit-Country: UNITED KINGDOM\n"
 "X-Poedit-SourceCharset: utf-8\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 "About"
-
-#: ../../../admin.php:32
-msgid "Manage users"
-msgstr "Manage users"
-
-#: ../../../admin.php:68
-#, php-format
-msgid "%s and all his bookmarks and tags were deleted."
-msgstr "%s and all his bookmarks and tags were deleted."
-
-#: ../../../admin.php:75
-msgid "Problem with "
-msgstr "Problem with "
-
-#: ../../../ajaxDelete.php:37
-msgid "You are not allowed to delete this bookmark"
-msgstr "You are not allowed to delete this bookmark"
-
-#: ../../../ajaxDelete.php:41 ../../../edit.php:103
-msgid "Failed to delete bookmark"
-msgstr "Failed to delete bookmark"
-
-#: ../../../alltags.php:49
-msgid "All Tags"
-msgstr "All Tags"
-
-#: ../../../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 "User with username %s was not found"
-
-#: ../../../bookmarkcommondescriptionedit.php:51 ../../../tag2tagadd.php:37
-#: ../../../tag2tagdelete.php:41 ../../../tag2tagedit.php:33
-#: ../../../tagcommondescriptionedit.php:43 ../../../tagedit.php:43
-msgid "Permission denied."
-msgstr "Permission denied."
-
-#: ../../../bookmarkcommondescriptionedit.php:60
-msgid "Bookmark common description updated"
-msgstr "Bookmark common description updated"
-
-#: ../../../bookmarkcommondescriptionedit.php:63
-msgid "Failed to update the bookmark common description"
-msgstr "Failed to update the bookmark common description"
-
-#: ../../../bookmarkcommondescriptionedit.php:71
-msgid "Edit Bookmark Common Description"
-msgstr "Edit Bookmark common description"
-
-#: ../../../bookmarks.php:111 ../../../tags.php:47
-msgid "Remove the tag from the selection"
-msgstr "Remove the tag from the selection"
-
-#: ../../../bookmarks.php:131 ../../../edit.php:65
-msgid "Your bookmark must have a title and an address"
-msgstr "Your bookmark must have a title and an address"
-
-#: ../../../bookmarks.php:152 ../../../edit.php:83 ../../../edit.php:86
-msgid "Bookmark saved"
-msgstr "Bookmark saved"
-
-#: ../../../bookmarks.php:152
-msgid "(Come back to previous page.)"
-msgstr "(Go back to previous page.)"
-
-#: ../../../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 ""
-"There was an error saving your bookmark. Please try again or contact the "
-"administrator."
-
-#: ../../../bookmarks.php:209 ../../../templates/toolbar.inc.php:13
-msgid "Add a Bookmark"
-msgstr "Add a Bookmark"
-
-#: ../../../bookmarks.php:213
-msgid "Add Bookmark"
-msgstr "Add Bookmark"
-
-#: ../../../bookmarks.php:216
-msgid "You must be logged in before you can add bookmarks."
-msgstr "You must be logged in before you can add bookmarks."
-
-#: ../../../bookmarks.php:270 ../../../bookmarks.php:271
-msgid "My Bookmarks"
-msgstr "My Bookmarks"
-
-#: ../../../edit.php:44 ../../../edit.php:45
-msgid "Edit Bookmark"
-msgstr "Edit Bookmark"
-
-#: ../../../edit.php:51
-#, php-format
-msgid "Bookmark with id %s not was not found"
-msgstr "Bookmark with id %s was not found"
-
-#: ../../../edit.php:57
-msgid "You are not allowed to edit this bookmark"
-msgstr "You are not allowed to edit this bookmark"
-
-#: ../../../edit.php:77
-msgid "Error while saving your bookmark"
-msgstr "Error while saving your bookmark"
-
-#: ../../../edit.php:113 ../../../templates/editprofile.tpl.php:52
-msgid "Save Changes"
-msgstr "Save Changes"
-
-#: ../../../functions.inc.php:144
+#: src/SemanticScuttle/functions.php:189
 msgid "message_die() was called multiple times."
 msgstr "message_die() was called multiple times."
 
-#: ../../../functions.inc.php:156
+#: src/SemanticScuttle/functions.php:201
 msgid "SQL Error"
 msgstr "SQL Error"
 
-#: ../../../functions.inc.php:162
+#: src/SemanticScuttle/functions.php:207
 msgid "Line"
 msgstr "Line"
 
-#: ../../../functions.inc.php:162 ../../../templates/importDelicious.tpl.php:8
-#: ../../../templates/importNetscape.tpl.php:9
-#: ../../../templates/importStructure.tpl.php:10
+#: src/SemanticScuttle/functions.php:207
+#: data/templates/default/importDelicious.tpl.php:8
+#: data/templates/default/importNetscape.tpl.php:9
+#: data/templates/default/importStructure.tpl.php:10
 msgid "File"
 msgstr "File"
 
-#: ../../../functions.inc.php:168
+#: src/SemanticScuttle/functions.php:215
 msgid "Information"
 msgstr "Information"
 
-#: ../../../functions.inc.php:173
+#: src/SemanticScuttle/functions.php:220
 msgid "Critical Information"
 msgstr "Critical Information"
 
-#: ../../../functions.inc.php:178
+#: src/SemanticScuttle/functions.php:225
 msgid "An error occured"
 msgstr "An error has occurred"
 
-#: ../../../functions.inc.php:181
+#: src/SemanticScuttle/functions.php:228
 msgid "General Error"
 msgstr "General Error"
 
-#: ../../../functions.inc.php:189
+#: src/SemanticScuttle/functions.php:236
 msgid "An critical error occured"
 msgstr "A critical error has occurred"
 
-#: ../../../functions.inc.php:192
+#: src/SemanticScuttle/functions.php:239
 msgid "Critical Error"
 msgstr "Critical Error"
 
-#: ../../../functions.inc.php:201
+#: src/SemanticScuttle/functions.php:248
 msgid "DEBUG MODE"
 msgstr "DEBUG MODE"
 
-#: ../../../history.php:61
-msgid "History"
-msgstr "History"
-
-#: ../../../history.php:62
-#, php-format
-msgid "History for %s"
-msgstr "History for %s"
-
-#: ../../../history.php:84
-msgid "Address was not found"
-msgstr "Address was not found"
-
-#: ../../../import.php:47
-msgid "Could not open XML input"
-msgstr "Could not open XML input"
-
-#: ../../../import.php:51
-#, php-format
-msgid "XML error: %s at line %d"
-msgstr "XML error: %s at line %d"
-
-#: ../../../import.php:60
-msgid "Import Bookmarks from del.icio.us"
-msgstr "Import bookmarks from del.icio.us"
-
-#: ../../../import.php:93
-msgid "You have already submitted this bookmark."
-msgstr "You have already submitted this bookmark."
-
-#: ../../../import.php:104
-msgid "Bookmark imported."
-msgstr "Bookmark imported."
-
-#: ../../../importNetscape.php:95
-msgid "You have already submitted some of these bookmarks."
-msgstr "You have already submitted some of these bookmarks."
-
-#: ../../../importNetscape.php:115
-msgid "Bookmarks found: "
-msgstr "Bookmarks found: "
-
-#: ../../../importNetscape.php:116
-msgid "Bookmarks imported: "
-msgstr "Bookmarks imported: "
-
-#: ../../../importNetscape.php:117 ../../../importNetscape.php:122
-msgid "Import Bookmarks from Browser File"
-msgstr "Import Bookmarks from browser file"
-
-#: ../../../importStructure.php:61
-msgid "Bad indentation"
-msgstr "Bad indentation"
-
-#: ../../../importStructure.php:67
-msgid "New links between tags: "
-msgstr "New links between tags: "
-
-#: ../../../importStructure.php:72
-msgid "Import Structure"
-msgstr "Import Structure"
-
-#: ../../../index.php:38
-msgid "You have now logged out"
-msgstr "You have now logged out"
-
-#: ../../../index.php:45
-#, php-format
-msgid "%s: Recent bookmarks"
-msgstr "%s: Recent bookmarks"
-
-#: ../../../index.php:78
-msgid "Store, share and tag your favourite links"
-msgstr "Store, share and tag your favourite links"
-
-#: ../../../index.php:79
-msgid "All Bookmarks"
-msgstr "All Bookmarks"
-
-#: ../../../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 "Are you sure?"
-
-#: ../../../jsScuttle.php:22 ../../../templates/tag2tagdelete.tpl.php:15
-#: ../../../templates/tag2tagedit.tpl.php:16
-#: ../../../templates/tagdelete.tpl.php:8
-msgid "Yes"
-msgstr "Yes"
-
-#: ../../../jsScuttle.php:22 ../../../templates/tag2tagdelete.tpl.php:16
-#: ../../../templates/tag2tagedit.tpl.php:17
-#: ../../../templates/tagdelete.tpl.php:9
-msgid "No"
-msgstr "No"
-
-#: ../../../jsScuttle.php:69
-msgid "Available"
-msgstr "Available"
-
-#: ../../../jsScuttle.php:72
-msgid "Not Available"
-msgstr "Not available"
-
-#: ../../../login.php:48
-msgid "The details you have entered are incorrect. Please try again."
-msgstr "The details you have entered are incorrect. Please try again."
-
-#: ../../../login.php:57 ../../../templates/login.tpl.php:26
-#: ../../../templates/toolbar.inc.php:29
-msgid "Log In"
-msgstr "Log In"
-
-#: ../../../password.php:36
-msgid "You must enter your username."
-msgstr "You must enter your username."
-
-#: ../../../password.php:40
-msgid ""
-"You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr ""
-"You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
-
-#: ../../../password.php:48
-msgid "No matches found for that username."
-msgstr "No matches found for that username."
-
-#: ../../../password.php:51
-msgid ""
-"No matches found for that combination of username and <abbr title="
-"\"electronic mail\">e-mail</abbr> address."
-msgstr ""
-"No matches found for that combination of username and <abbr title="
-"\"electronic mail\">e-mail</abbr> address."
-
-#: ../../../password.php:59
-msgid ""
-"There was an error while generating your new password. Please try again."
-msgstr ""
-"There was an error while generating your new password. Please try again."
-
-#: ../../../password.php:63
-msgid "Your new password is:"
-msgstr "Your new password is:"
-
-#: ../../../password.php:63
-msgid ""
-"To keep your bookmarks secure, you should change this password in your "
-"profile the next time you log in."
-msgstr ""
-"To keep your bookmarks secure, you should change this password in your "
-"profile the next time you log in."
-
-#: ../../../password.php:66
-#, php-format
-msgid "%s Account Information"
-msgstr "%s Account Information"
-
-#: ../../../password.php:68
-#, php-format
-msgid "New password generated and sent to %s"
-msgstr "New password generated and sent to %s"
-
-#: ../../../password.php:75
-msgid "Forgotten Password"
-msgstr "Forgotten Password"
-
-#: ../../../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 "Popular Tags"
-
-#: ../../../profile.php:59 ../../../watchlist.php:119
-msgid "Username was not specified"
-msgstr "Username was not specified"
-
-#: ../../../profile.php:65
-msgid "My Profile"
-msgstr "My Profile"
-
-#: ../../../profile.php:67 ../../../templates/toolbar.inc.php:12
-msgid "Profile"
-msgstr "Profile"
-
-#: ../../../profile.php:89
-msgid "Invalid Token"
-msgstr "Invalid token"
-
-#: ../../../profile.php:94
-msgid "Password and confirmation do not match."
-msgstr "Password and confirmation do not match."
-
-#: ../../../profile.php:98
-msgid "Password must be at least 6 characters long."
-msgstr "Password must be at least 6 characters long."
-
-#: ../../../profile.php:102
-msgid "E-mail address is not valid."
-msgstr "E-mail address is not valid."
-
-#: ../../../profile.php:106
-msgid "An error occurred while saving your changes."
-msgstr "An error occurred while saving your changes."
-
-#: ../../../profile.php:108
-msgid "Changes saved."
-msgstr "Changes saved."
-
-#: ../../../register.php:40
-msgid "You <em>must</em> enter a username, password and e-mail address."
-msgstr "You <em>must</em> enter a username, password and e-mail address."
-
-#: ../../../register.php:44
-msgid "This username has been reserved, please make another choice."
-msgstr "This username has been reserved, please make another choice."
-
-#: ../../../register.php:48
-msgid "This username already exists, please make another choice."
-msgstr "This username already exists, please make another choice."
-
-#: ../../../register.php:52
-msgid ""
-"This username is not valid (too short, too long, forbidden characters...), "
-"please make another choice."
-msgstr ""
-"This username is not valid (too short, too long, forbidden characters...), "
-"please make another choice."
-
-#: ../../../register.php:56
-msgid "E-mail address is not valid. Please try again."
-msgstr "E-mail address is not valid. Please try again."
-
-#: ../../../register.php:60
-msgid "Antispam answer is not valid. Please try again."
-msgstr "Antispam answer is not valid. Please try again."
-
-#: ../../../register.php:69
-msgid "You have successfully registered. Enjoy!"
-msgstr "You have successfully registered. Enjoy!"
-
-#: ../../../register.php:71
-msgid "Registration failed. Please try again."
-msgstr "Registration failed. Please try again."
-
-#: ../../../register.php:77 ../../../templates/register.tpl.php:41
-#: ../../../templates/toolbar.inc.php:30
-msgid "Register"
-msgstr "Register"
-
-#: ../../../rss.php:84
-#, php-format
-msgid "Recent bookmarks posted to %s"
-msgstr "Recent bookmarks posted to %s"
-
-#: ../../../search.inc.php:23
-msgid "Search..."
-msgstr "Search..."
-
-#: ../../../search.inc.php:24
-msgid "in"
-msgstr "in"
-
-#: ../../../search.inc.php:30
-msgid "this user's bookmarks"
-msgstr "this user's bookmarks"
-
-#: ../../../search.inc.php:35
-msgid "my bookmarks"
-msgstr "my bookmarks"
-
-#: ../../../search.inc.php:36
-msgid "my watchlist"
-msgstr "my watchlist"
-
-#: ../../../search.inc.php:40
-msgid "all bookmarks"
-msgstr "all bookmarks"
-
-#: ../../../search.inc.php:50
-msgid "Search"
-msgstr "Search"
-
-#: ../../../search.php:73 ../../../search.php:123
-msgid "Search Bookmarks"
-msgstr "Search Bookmarks"
-
-#: ../../../search.php:79
-msgid "Search Results"
-msgstr "Search Results"
-
-#: ../../../search.php:114
-msgid "Unsatisfied? You can also try our "
-msgstr "Unsatisfied? You can also try our "
-
-#: ../../../tag2tagadd.php:50
-msgid "Tag link created"
-msgstr "Tag link created"
-
-#: ../../../tag2tagadd.php:53
-msgid "Failed to create the link"
-msgstr "Failed to create the link"
-
-#: ../../../tag2tagadd.php:65
-msgid "Add Tag Link"
-msgstr "Add Tag Link"
-
-#: ../../../tag2tagdelete.php:66
-msgid "Tag link deleted"
-msgstr "Tag link deleted"
-
-#: ../../../tag2tagdelete.php:69
-msgid "Failed to delete the link"
-msgstr "Failed to delete the link"
-
-#: ../../../tag2tagdelete.php:81
-msgid "Delete Link Between Tags"
-msgstr "Delete Link between Tags"
-
-#: ../../../tag2tagedit.php:55
-msgid "Edit Link Between Tags"
-msgstr "Edit Link between Tags"
-
-#: ../../../tagcommondescriptionedit.php:55
-msgid "Tag common description updated"
-msgstr "Tag common description updated"
-
-#: ../../../tagcommondescriptionedit.php:58
-msgid "Failed to update the tag common description"
-msgstr "Failed to update the tag common description"
-
-#: ../../../tagcommondescriptionedit.php:64
-#: ../../../templates/sidebar.block.tagactions.php:26
-msgid "Edit Tag Common Description"
-msgstr "Edit Tag common description"
-
-#: ../../../tagdelete.php:43
-msgid "Tag deleted"
-msgstr "Tag deleted"
-
-#: ../../../tagdelete.php:46
-msgid "Failed to delete the tag"
-msgstr "Failed to delete the tag"
-
-#: ../../../tagdelete.php:54
-#: ../../../templates/sidebar.block.tagactions.php:22
-msgid "Delete Tag"
-msgstr "Delete tag"
-
-#: ../../../tagedit.php:52
-msgid "Tag description updated"
-msgstr "Tag description updated"
-
-#: ../../../tagedit.php:55
-msgid "Failed to update the tag description"
-msgstr "Failed to update the tag description"
-
-#: ../../../tagedit.php:61 ../../../templates/sidebar.block.tagactions.php:24
-msgid "Edit Tag Description"
-msgstr "Edit tag description"
-
-#: ../../../tagrename.php:63
-msgid "Tag renamed"
-msgstr "Tag renamed"
-
-#: ../../../tagrename.php:66
-msgid "Failed to rename the tag"
-msgstr "Failed to rename the tag"
-
-#: ../../../tagrename.php:72 ../../../templates/sidebar.block.tagactions.php:9
-msgid "Rename Tag"
-msgid_plural "Rename Tags"
-msgstr[0] "Rename tag"
-msgstr[1] "Rename tags"
-
-#: ../../../tags.php:45 ../../../tags.php:67
-#: ../../../templates/editbookmark.tpl.php:69
-#: ../../../templates/toolbar.inc.php:10
-msgid "Tags"
-msgstr "Tags"
-
-#: ../../../users.php:35
-msgid "Users"
-msgstr "Users"
-
-#: ../../../watch.php:54
-msgid "User removed from your watchlist"
-msgstr "User removed from your watchlist"
-
-#: ../../../watch.php:56
-msgid "User added to your watchlist"
-msgstr "User added to your watchlist"
-
-#: ../../../watchlist.php:104
-msgid "My Watchlist"
-msgstr "My Watchlist"
-
-#: ../../../watchlist.php:106 ../../../templates/toolbar.inc.php:11
-msgid "Watchlist"
-msgstr "Watchlist"
-
-#: ../../../templates/about.tpl.php:6
+#: data/templates/default/about.tpl.php:6
 msgid ""
 "<strong>Store</strong> all your favourite links in one place, accessible "
 "from anywhere."
@@ -599,7 +75,7 @@ msgstr ""
 "<strong>Store</strong> all your favourite links in one place, accessible "
 "from anywhere."
 
-#: ../../../templates/about.tpl.php:7
+#: data/templates/default/about.tpl.php:7
 msgid ""
 "<strong>Share</strong> your bookmarks with everyone, with friends on your "
 "watchlist or just keep them private."
@@ -607,7 +83,7 @@ msgstr ""
 "<strong>Share</strong> your bookmarks with everyone, with friends on your "
 "watchlist or just keep them private."
 
-#: ../../../templates/about.tpl.php:8
+#: data/templates/default/about.tpl.php:8
 msgid ""
 "<strong>Tag</strong> your bookmarks with as many labels as you want, instead "
 "of wrestling with folders."
@@ -615,88 +91,100 @@ msgstr ""
 "<strong>Tag</strong> your bookmarks with as many labels as you want, instead "
 "of wrestling with folders."
 
-#: ../../../templates/about.tpl.php:9
+#: data/templates/default/about.tpl.php:9
 msgid "Register now"
 msgstr "Register now"
 
-#: ../../../templates/about.tpl.php:9
+#: data/templates/default/about.tpl.php:9
 #, php-format
 msgid " to start using %s!"
 msgstr " to start using %s!"
 
-#: ../../../templates/about.tpl.php:12
+#: data/templates/default/about.tpl.php:12
 msgid "Geek Stuff"
 msgstr "Geek Stuff"
 
-#: ../../../templates/about.tpl.php:14
+#: data/templates/default/about.tpl.php:14
 msgid "is licensed under the "
 msgstr "is licensed under the "
 
-#: ../../../templates/about.tpl.php:14
+#: data/templates/default/about.tpl.php:14
 msgid "you can freely host it on your own web server."
 msgstr "you can freely host it on your own web server."
 
-#: ../../../templates/about.tpl.php:15
+#: data/templates/default/about.tpl.php:15
 #, php-format
 msgid ""
-"%1$s supports most of the <a href=\"http://www.delicious.com/help/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."
+"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 supports most of the <a href=\"http://www.delicious.com/help/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."
-
-#: ../../../templates/about.tpl.php:24
+"%1$s supports most of the <a href=\"http://www.delicious.com/help/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."
+
+#: data/templates/default/about.tpl.php:24
 msgid "Tips"
 msgstr "Tips"
 
-#: ../../../templates/about.tpl.php:26
+#: data/templates/default/about.tpl.php:26
 msgid "Add search plugin into your browser:"
 msgstr "Add search plugin into your browser:"
 
-#: ../../../templates/about.tpl.php:27
+#: data/templates/default/about.tpl.php:27
 msgid ""
 "The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
 msgstr ""
 "The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
 
-#: ../../../templates/about.tpl.php:28
+#: data/templates/default/about.tpl.php:28
 msgid ""
 "The secret tag \"system:imported\" allows you to find imported bookmarks."
 msgstr ""
 "The secret tag \"system:imported\" allows you to find imported bookmarks."
 
-#: ../../../templates/admin.tpl.php:5
+#: data/templates/default/admin.tpl.php:5
 msgid "Users management"
 msgstr "User management"
 
-#: ../../../templates/admin.tpl.php:14
+#: data/templates/default/admin.tpl.php:14
 msgid "Public/Shared/Private"
 msgstr "Public/Shared/Private"
 
-#: ../../../templates/admin.tpl.php:14 ../../../templates/bookmarks.tpl.php:93
+#: data/templates/default/admin.tpl.php:14
+#: data/templates/default/bookmarks.tpl.php:115
 msgid "bookmark(s)"
 msgstr "bookmark(s)"
 
-#: ../../../templates/admin.tpl.php:19
-#: ../../../templates/bookmarks.tpl.php:231
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/tag2tagadd.tpl.php:21
+#: data/templates/default/tag2tagdelete.tpl.php:13
+#: data/templates/default/tag2tagedit.tpl.php:14
+#: data/templates/default/tag2tagedit.tpl.php:35
+#: data/templates/default/tagdelete.tpl.php:6 www/jsScuttle.php:24
+msgid "Are you sure?"
+msgstr "Are you sure?"
+
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/bookmarks.tpl.php:305
 msgid "Delete"
 msgstr "Delete"
 
-#: ../../../templates/admin.tpl.php:27
+#: data/templates/default/admin.tpl.php:27
 msgid "Other actions"
 msgstr "Other actions"
 
-#: ../../../templates/admin.tpl.php:29
+#: data/templates/default/admin.tpl.php:29
 msgid "Check all URLs (May take some time)"
 msgstr "Check all URLs (may take some time)"
 
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:16
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:16
 msgid ""
 "Collaborative description: these fields can be viewed and modified by every "
 "users"
@@ -704,410 +192,510 @@ msgstr ""
 "Collaborative description: these fields can be viewed and modified by every "
 "users"
 
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:18
-#: ../../../templates/bookmarks.tpl.php:123
-#: ../../../templates/editbookmark.tpl.php:38
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:18
+#: data/templates/default/bookmarks.tpl.php:159
+#: data/templates/default/editbookmark.tpl.php:51
 msgid "Title"
 msgstr "Title"
 
-#: ../../../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/default/bookmarkcommondescriptionedit.tpl.php:23
+#: data/templates/default/editbookmark.tpl.php:57
+#: data/templates/default/editprofile.tpl.php:53
+#: data/templates/default/profile.tpl.php:33
+#: data/templates/default/tagcommondescriptionedit.tpl.php:13
+#: data/templates/default/tagedit.tpl.php:12
 msgid "Description"
 msgstr "Description"
 
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:31
-#: ../../../templates/tagcommondescriptionedit.tpl.php:21
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:31
+#: data/templates/default/tagcommondescriptionedit.tpl.php:21
 msgid "Last modification:"
 msgstr "Last modification:"
 
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:42
-#: ../../../templates/tagcommondescriptionedit.tpl.php:32
-#: ../../../templates/tagedit.tpl.php:18
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:43
+#: data/templates/default/tagcommondescriptionedit.tpl.php:33
+#: data/templates/default/tagedit.tpl.php:18
 msgid "Update"
 msgstr "Update"
 
-#: ../../../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/default/bookmarkcommondescriptionedit.tpl.php:44
+#: data/templates/default/editbookmark.tpl.php:111
+#: data/templates/default/tag2tagadd.tpl.php:24
+#: data/templates/default/tag2tagedit.tpl.php:38
+#: data/templates/default/tagcommondescriptionedit.tpl.php:34
+#: data/templates/default/tagedit.tpl.php:19
+#: data/templates/default/tagrename.tpl.php:25
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../../../templates/bookmarks.tpl.php:26
+#: data/templates/default/bookmarklet.inc.php:1
+msgid "Bookmarklet"
+msgstr "Bookmarklet"
+
+#: data/templates/default/bookmarklet.inc.php:11
+#, 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 ""
+"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"
+
+#: data/templates/default/bookmarklet.inc.php:20
+#, 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 ""
+"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"
+
+#: data/templates/default/bookmarklet.inc.php:67
+#: data/templates/default/bookmarklet.inc.php:100
+#, php-format
+msgid "Post to %s"
+msgstr "Post to %s"
+
+#: data/templates/default/bookmarklet.inc.php:93
+#: data/templates/default/bookmarklet.inc.php:110
+#, php-format
+msgid "Post to %s (Pop-up)"
+msgstr "Post to %s (pop-up)"
+
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:24
+#, php-format
+msgid "Voting <span class=\"voting\">%d</span>"
+msgstr ""
+
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:32
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:35
+msgid "Vote for"
+msgstr ""
+
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:43
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:46
+msgid "Vote against"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:43
 msgid "Bookmarks on this page are managed by an admin user."
 msgstr "Bookmarks on this page are managed by an admin user."
 
-#: ../../../templates/bookmarks.tpl.php:51
-#: ../../../templates/bookmarks.tpl.php:52
+#: data/templates/default/bookmarks.tpl.php:73
+#: data/templates/default/bookmarks.tpl.php:74
 msgid "Edit the common description of this tag"
 msgstr "Edit the common description of this tag"
 
-#: ../../../templates/bookmarks.tpl.php:55
-#: ../../../templates/bookmarks.tpl.php:56
+#: data/templates/default/bookmarks.tpl.php:77
+#: data/templates/default/bookmarks.tpl.php:78
 msgid "Edit the common description of this bookmark"
 msgstr "Edit the common description of this bookmark"
 
-#: ../../../templates/bookmarks.tpl.php:76
-#: ../../../templates/bookmarks.tpl.php:77
+#: data/templates/default/bookmarks.tpl.php:98
+#: data/templates/default/bookmarks.tpl.php:99
 msgid "Edit your personal description of this tag"
 msgstr "Edit your personal description of this tag"
 
-#: ../../../templates/bookmarks.tpl.php:93 ../../../templates/tags.tpl.php:10
-#: ../../../templates/users.tpl.php:8
+#: data/templates/default/bookmarks.tpl.php:115
+#: data/templates/default/tags.tpl.php:10
+#: data/templates/default/users.tpl.php:8
 msgid "Sort by:"
 msgstr "Sort by:"
 
-#: ../../../templates/bookmarks.tpl.php:122
+#: data/templates/default/bookmarks.tpl.php:157
 msgid "Date"
 msgstr "Date"
 
-#: ../../../templates/bookmarks.tpl.php:129
+#: data/templates/default/bookmarks.tpl.php:162
+msgid "Voting"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:171
 msgid "Bookmarks from other users for this tag"
 msgstr "Bookmarks from other users for this tag"
 
-#: ../../../templates/bookmarks.tpl.php:134
+#: data/templates/default/bookmarks.tpl.php:176
 msgid "Only your bookmarks for this tag"
 msgstr "Only your bookmarks for this tag"
 
-#: ../../../templates/bookmarks.tpl.php:157
-#: ../../../templates/bookmarks.tpl.php:163
+#: data/templates/default/bookmarks.tpl.php:199
+#: data/templates/default/bookmarks.tpl.php:205
 msgid "First"
 msgstr "First"
 
-#: ../../../templates/bookmarks.tpl.php:158
-#: ../../../templates/bookmarks.tpl.php:164
+#: data/templates/default/bookmarks.tpl.php:200
+#: data/templates/default/bookmarks.tpl.php:206
 msgid "Previous"
 msgstr "Previous"
 
-#: ../../../templates/bookmarks.tpl.php:171
-#: ../../../templates/bookmarks.tpl.php:174
+#: data/templates/default/bookmarks.tpl.php:213
+#: data/templates/default/bookmarks.tpl.php:216
 msgid "Next"
 msgstr "Next"
 
-#: ../../../templates/bookmarks.tpl.php:172
-#: ../../../templates/bookmarks.tpl.php:175
+#: data/templates/default/bookmarks.tpl.php:214
+#: data/templates/default/bookmarks.tpl.php:217
 msgid "Last"
 msgstr "Last"
 
-#: ../../../templates/bookmarks.tpl.php:185
+#: data/templates/default/bookmarks.tpl.php:233
 #, php-format
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
-#: ../../../templates/bookmarks.tpl.php:225
+#: data/templates/default/bookmarks.tpl.php:295
 msgid "Tags:"
 msgstr "Tags:"
 
-#: ../../../templates/bookmarks.tpl.php:231
+#: data/templates/default/bookmarks.tpl.php:302
 msgid "Edit"
 msgstr "Edit"
 
-#: ../../../templates/bookmarks.tpl.php:235
+#: data/templates/default/bookmarks.tpl.php:310
 msgid "Last update"
 msgstr "Last update"
 
-#: ../../../templates/bookmarks.tpl.php:238
+#: data/templates/default/bookmarks.tpl.php:313
 msgid "by"
 msgstr "by"
 
-#: ../../../templates/bookmarks.tpl.php:240
+#: data/templates/default/bookmarks.tpl.php:317
 msgid "you"
 msgstr "you"
 
-#: ../../../templates/bookmarks.tpl.php:254
+#: data/templates/default/bookmarks.tpl.php:333
 #, php-format
 msgid " and %s1 other%s"
 msgstr " and %s1 other%s"
 
-#: ../../../templates/bookmarks.tpl.php:257
+#: data/templates/default/bookmarks.tpl.php:336
 #, php-format
 msgid " and %2$s%1$s others%3$s"
 msgstr " and %2$s%1$s others%3$s"
 
-#: ../../../templates/bookmarks.tpl.php:265
+#: data/templates/default/bookmarks.tpl.php:350
 msgid "Copy this bookmark to YOUR bookmarks."
 msgstr "Copy this bookmark to YOUR bookmarks."
 
-#: ../../../templates/bookmarks.tpl.php:265
+#: data/templates/default/bookmarks.tpl.php:351
 msgid "Copy"
 msgstr "Copy"
 
-#: ../../../templates/bookmarks.tpl.php:284
+#: data/templates/default/bookmarks.tpl.php:376
 msgid "This bookmark is certified by an admin user."
 msgstr "This bookmark is certified by an admin user."
 
-#: ../../../templates/bookmarks.tpl.php:323
+#: data/templates/default/bookmarks.tpl.php:430
 msgid "Private Note on this bookmark"
 msgstr "Private note on this bookmark"
 
-#: ../../../templates/bookmarks.tpl.php:334
+#: data/templates/default/bookmarks.tpl.php:444
 msgid "Come back to the top of this page."
 msgstr "Come back to the top of this page."
 
-#: ../../../templates/bookmarks.tpl.php:334
+#: data/templates/default/bookmarks.tpl.php:444
 msgid "Top of the page"
 msgstr "Top of the page"
 
-#: ../../../templates/bookmarks.tpl.php:340
+#: data/templates/default/bookmarks.tpl.php:450
 msgid "No bookmarks available"
 msgstr "No bookmarks available"
 
-#: ../../../templates/bottom.inc.php:7
+#: data/templates/default/bottom.inc.php:5
+#: data/templates/default/toolbar.inc.php:15
+#: data/templates/default/toolbar.inc.php:28 www/about.php:23 www/about.php:24
+msgid "About"
+msgstr "About"
+
+#: data/templates/default/bottom.inc.php:7
 msgid "Propulsed by "
 msgstr "Propulsed by "
 
-#: ../../../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/default/dynamictags.inc.php:56
+#: data/templates/default/sidebar.block.common.php:19
+#: data/templates/default/sidebar.block.popular.php:34
+#: data/templates/default/sidebar.block.recent.php:29
+#: data/templates/default/tags.tpl.php:19
 msgid "bookmark"
 msgid_plural "bookmarks"
 msgstr[0] "bookmark"
 msgstr[1] "bookmarks"
 
-#: ../../../templates/dynamictags.inc.php:131
+#: data/templates/default/dynamictags.inc.php:105
+#: data/templates/default/sidebar.block.common.php:9
+#: data/templates/default/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.popular.php:23
+#: data/templates/default/sidebar.block.recent.php:34
+#: data/templates/default/toolbar.inc.php:27 www/populartags.php:46
+msgid "Popular Tags"
+msgstr "Popular Tags"
+
+#: data/templates/default/dynamictags.inc.php:108
 msgid "Popular Tags From All Users"
 msgstr "Popular tags from all users"
 
-#: ../../../templates/editbookmark.tpl.php:33
+#: data/templates/default/editbookmark.tpl.php:46
 msgid "Address"
 msgstr "Address"
 
-#: ../../../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/default/editbookmark.tpl.php:48
+#: data/templates/default/editbookmark.tpl.php:53
+#: data/templates/default/editprofile.tpl.php:29
+#: data/templates/default/tagrename.tpl.php:14
+#: data/templates/default/tagrename.tpl.php:19
 msgid "Required"
 msgstr "Required"
 
-#: ../../../templates/editbookmark.tpl.php:45
+#: data/templates/default/editbookmark.tpl.php:58
 msgid "Add Note"
 msgstr "Add Note"
 
-#: ../../../templates/editbookmark.tpl.php:48
+#: data/templates/default/editbookmark.tpl.php:61
 msgid ""
 "You can use anchors to delimite attributes. for example: [publisher]blah[/"
 "publisher] "
 msgstr ""
 "You can use anchors to delimite attributes, e.g. [publisher]blah[/publisher] "
 
-#: ../../../templates/editbookmark.tpl.php:51
+#: data/templates/default/editbookmark.tpl.php:64
 msgid "Suggested anchors: "
 msgstr "Suggested anchors: "
 
-#: ../../../templates/editbookmark.tpl.php:63
+#: data/templates/default/editbookmark.tpl.php:76
 msgid "Private Note"
 msgstr "Private Note"
 
-#: ../../../templates/editbookmark.tpl.php:65
+#: data/templates/default/editbookmark.tpl.php:78
 #, fuzzy
 msgid "Just visible by you and your contacts."
 msgstr "Just visible by you and your friends."
 
-#: ../../../templates/editbookmark.tpl.php:73
+#: data/templates/default/editbookmark.tpl.php:82
+#: data/templates/default/toolbar.inc.php:10 www/tags.php:45 www/tags.php:67
+msgid "Tags"
+msgstr "Tags"
+
+#: data/templates/default/editbookmark.tpl.php:86
 msgid "Comma-separated"
 msgstr "Comma-separated"
 
-#: ../../../templates/editbookmark.tpl.php:77
-#: ../../../templates/tag2tagadd.tpl.php:9
+#: data/templates/default/editbookmark.tpl.php:90
+#: data/templates/default/tag2tagadd.tpl.php:9
 msgid ""
 "Note: use \">\" to include one tag in another. e.g.: europe>france>paris"
 msgstr ""
 "Note: use \">\" to include one tag in another. e.g.: europe>britain>edinburgh"
 
-#: ../../../templates/editbookmark.tpl.php:81
-#: ../../../templates/tag2tagadd.tpl.php:8
+#: data/templates/default/editbookmark.tpl.php:94
+#: data/templates/default/tag2tagadd.tpl.php:8
 msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry"
 msgstr "Note: use \"=\" to make synonym two tags. e.g.: britain=united kingdom"
 
-#: ../../../templates/editbookmark.tpl.php:84
-#: ../../../templates/importDelicious.tpl.php:15
-#: ../../../templates/importNetscape.tpl.php:16
+#: data/templates/default/editbookmark.tpl.php:97
+#: data/templates/default/importDelicious.tpl.php:15
+#: data/templates/default/importNetscape.tpl.php:16
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../../../templates/editbookmark.tpl.php:87
-#: ../../../templates/importDelicious.tpl.php:18
-#: ../../../templates/importNetscape.tpl.php:19
+#: data/templates/default/editbookmark.tpl.php:100
+#: data/templates/default/importDelicious.tpl.php:18
+#: data/templates/default/importNetscape.tpl.php:19
 msgid "Public"
 msgstr "Public"
 
-#: ../../../templates/editbookmark.tpl.php:88
+#: data/templates/default/editbookmark.tpl.php:101
 msgid "Shared with Watch List"
 msgstr "Shared with Watchlist"
 
-#: ../../../templates/editbookmark.tpl.php:89
-#: ../../../templates/importDelicious.tpl.php:20
-#: ../../../templates/importNetscape.tpl.php:21
+#: data/templates/default/editbookmark.tpl.php:102
+#: data/templates/default/importDelicious.tpl.php:20
+#: data/templates/default/importNetscape.tpl.php:21
 msgid "Private"
 msgstr "Private"
 
-#: ../../../templates/editbookmark.tpl.php:102
+#: data/templates/default/editbookmark.tpl.php:115
 msgid "Delete Bookmark"
 msgstr "Delete Bookmark"
 
-#: ../../../templates/editbookmark.tpl.php:107
+#: data/templates/default/editbookmark.tpl.php:120
 msgid "edit common description"
 msgstr "edit common description"
 
-#: ../../../templates/editbookmark.tpl.php:134
-msgid "Bookmarklet"
-msgstr "Bookmarklet"
-
-#: ../../../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 ""
-"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"
-
-#: ../../../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 ""
-"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"
-
-#: ../../../templates/editbookmark.tpl.php:157
-#: ../../../templates/editbookmark.tpl.php:162
-#, php-format
-msgid "Post to %s"
-msgstr "Post to %s"
-
-#: ../../../templates/editbookmark.tpl.php:158
-#: ../../../templates/editbookmark.tpl.php:163
-#, php-format
-msgid "Post to %s (Pop-up)"
-msgstr "Post to %s (pop-up)"
-
-#: ../../../templates/editbookmark.tpl.php:168
-#: ../../../templates/importDelicious.tpl.php:26
-#: ../../../templates/importNetscape.tpl.php:27
-#: ../../../templates/importStructure.tpl.php:16
+#: data/templates/default/editbookmark.tpl.php:212
+#: data/templates/default/importDelicious.tpl.php:26
+#: data/templates/default/importNetscape.tpl.php:27
+#: data/templates/default/importStructure.tpl.php:16
 msgid "Import"
 msgstr "Import"
 
-#: ../../../templates/editbookmark.tpl.php:170
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Import bookmarks from bookmark file"
 msgstr "Import bookmarks from bookmark file"
 
-#: ../../../templates/editbookmark.tpl.php:170
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Internet Explorer, Mozilla Firefox and Netscape"
 msgstr "Internet Explorer, Mozilla Firefox and Netscape"
 
-#: ../../../templates/editbookmark.tpl.php:171
+#: data/templates/default/editbookmark.tpl.php:215
 msgid "Import bookmarks from del.icio.us"
 msgstr "Import bookmarks from del.icio.us"
 
-#: ../../../templates/editprofile.tpl.php:10
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:11
+msgid "SSL client certificates"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:17
+msgid "Serial"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:45
+#: data/templates/default/profile.tpl.php:17
+msgid "Name"
+msgstr "Name"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:19
+#: data/templates/default/profile.tpl.php:11
+msgid "Email"
+msgstr "Email"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:20
+msgid "Issuer"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:30
+#, fuzzy
+msgid "delete"
+msgstr "Delete"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:43
+msgid "No certificates registered"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:48
+msgid "Your current certificate is already registered with your account."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:53
+msgid "Register current certificate to automatically login."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:59
+msgid "Your browser does not provide a certificate."
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:8
 msgid "Account Details"
 msgstr "Account Details"
 
-#: ../../../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/default/editprofile.tpl.php:12
+#: data/templates/default/login.tpl.php:21
+#: data/templates/default/password.tpl.php:10
+#: data/templates/default/profile.tpl.php:6
+#: data/templates/default/register.tpl.php:16
 msgid "Username"
 msgstr "Username"
 
-#: ../../../templates/editprofile.tpl.php:19
+#: data/templates/default/editprofile.tpl.php:17
 msgid "New Password"
 msgstr "New Password"
 
-#: ../../../templates/editprofile.tpl.php:24
+#: data/templates/default/editprofile.tpl.php:22
 msgid "Confirm Password"
 msgstr "Confirm Password"
 
-#: ../../../templates/editprofile.tpl.php:29
-#: ../../../templates/password.tpl.php:14
-#: ../../../templates/register.tpl.php:26
+#: data/templates/default/editprofile.tpl.php:27
+#: data/templates/default/password.tpl.php:14
+#: data/templates/default/register.tpl.php:26
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ../../../templates/editprofile.tpl.php:35
+#: data/templates/default/editprofile.tpl.php:32
+#, fuzzy
+msgid "Private RSS Feed"
+msgstr "Private Note"
+
+#: data/templates/default/editprofile.tpl.php:34
+msgid "Enable"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:36
+#, fuzzy
+msgid "Generate New Key"
+msgstr "Generate Password"
+
+#: data/templates/default/editprofile.tpl.php:41
 msgid "Personal Details"
 msgstr "Personal Details"
 
-#: ../../../templates/editprofile.tpl.php:39
-#: ../../../templates/profile.tpl.php:17
-msgid "Name"
-msgstr "Name"
-
-#: ../../../templates/editprofile.tpl.php:43
-#: ../../../templates/profile.tpl.php:23
+#: data/templates/default/editprofile.tpl.php:49
+#: data/templates/default/profile.tpl.php:23
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../../../templates/editprofile.tpl.php:55
-#: ../../../templates/sidebar.block.tagactions.php:17
-#: ../../../templates/sidebar.block.watchstatus.php:18
+#: data/templates/default/editprofile.tpl.php:58 www/edit.php:113
+msgid "Save Changes"
+msgstr "Save Changes"
+
+#: data/templates/default/editprofile.tpl.php:63
+#: data/templates/default/sidebar.block.tagactions.php:17
+#: data/templates/default/sidebar.block.watchstatus.php:18
 msgid "Actions"
 msgstr "Actions"
 
-#: ../../../templates/editprofile.tpl.php:58
+#: data/templates/default/editprofile.tpl.php:66
 msgid "Export bookmarks"
 msgstr "Export bookmarks"
 
-#: ../../../templates/editprofile.tpl.php:60
+#: data/templates/default/editprofile.tpl.php:68
 msgid "HTML file (for browsers)"
 msgstr "HTML file (for browsers)"
 
-#: ../../../templates/editprofile.tpl.php:61
+#: data/templates/default/editprofile.tpl.php:69
 msgid "XML file (like del.icio.us)"
 msgstr "XML file (like del.icio.us)"
 
-#: ../../../templates/editprofile.tpl.php:62
+#: data/templates/default/editprofile.tpl.php:70
 msgid "CSV file (for spreadsheet tools)"
 msgstr "CSV file (for spreadsheet tools)"
 
-#: ../../../templates/error.404.tpl.php:5
+#: data/templates/default/error.404.tpl.php:5
 msgid "Not Found"
 msgstr "Not Found"
 
-#: ../../../templates/error.404.tpl.php:6
+#: data/templates/default/error.404.tpl.php:6
 msgid "The requested URL was not found on this server"
 msgstr "The requested URL was not found on this server"
 
-#: ../../../templates/error.500.tpl.php:5
+#: data/templates/default/error.500.tpl.php:5
 msgid "General server error"
 msgstr "General server error"
 
-#: ../../../templates/error.500.tpl.php:6
+#: data/templates/default/error.500.tpl.php:6
 msgid "The requested URL could not be processed"
 msgstr "The requested URL could not be processed"
 
-#: ../../../templates/importDelicious.tpl.php:19
-#: ../../../templates/importNetscape.tpl.php:20
+#: data/templates/default/importDelicious.tpl.php:19
+#: data/templates/default/importNetscape.tpl.php:20
 msgid "Shared with Watchlist"
 msgstr "Shared with Watchlist"
 
-#: ../../../templates/importDelicious.tpl.php:31
-#: ../../../templates/importNetscape.tpl.php:32
-#: ../../../templates/importStructure.tpl.php:21
+#: data/templates/default/importDelicious.tpl.php:31
+#: data/templates/default/importNetscape.tpl.php:32
+#: data/templates/default/importStructure.tpl.php:21
 msgid "Instructions"
 msgstr "Instructions"
 
-#: ../../../templates/importDelicious.tpl.php:33
+#: data/templates/default/importDelicious.tpl.php:33
+#, fuzzy
 msgid ""
-"Log in to the <a href=\"http://del.icio.us/api/posts/all\">export page at "
-"del.icio.us</a>"
+"Log in to the <a href=\"https://api.del.icio.us/v1/posts/all\">export page "
+"at del.icio.us</a>"
 msgstr ""
 "Log in to the <a href=\"http://del.icio.us/api/posts/all\">export page at "
 "del.icio.us</a>"
 
-#: ../../../templates/importDelicious.tpl.php:34
+#: data/templates/default/importDelicious.tpl.php:34
 msgid ""
 "Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> "
 "file to your computer"
@@ -1115,7 +703,7 @@ msgstr ""
 "Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> "
 "file to your computer"
 
-#: ../../../templates/importDelicious.tpl.php:35
+#: data/templates/default/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"
@@ -1123,13 +711,13 @@ msgstr ""
 "Click <kbd>Browse...</kbd> to find this file on your computer. The maximum "
 "size the file can be is 1MB"
 
-#: ../../../templates/importDelicious.tpl.php:36
-#: ../../../templates/importNetscape.tpl.php:43
+#: data/templates/default/importDelicious.tpl.php:36
+#: data/templates/default/importNetscape.tpl.php:43
 msgid "Select the default privacy setting for your imported bookmarks"
 msgstr "Select the default privacy setting for your imported bookmarks"
 
-#: ../../../templates/importDelicious.tpl.php:37
-#: ../../../templates/importNetscape.tpl.php:44
+#: data/templates/default/importDelicious.tpl.php:37
+#: data/templates/default/importNetscape.tpl.php:44
 msgid ""
 "Click <kbd>Import</kbd> to start importing the bookmarks; it may take a "
 "minute"
@@ -1137,17 +725,17 @@ msgstr ""
 "Click <kbd>Import</kbd> to start importing the bookmarks; it may take a "
 "minute"
 
-#: ../../../templates/importNetscape.tpl.php:35
+#: data/templates/default/importNetscape.tpl.php:35
 msgid "Export your bookmarks from your browser to a file"
 msgstr "Export your bookmarks from your browser to a file"
 
-#: ../../../templates/importNetscape.tpl.php:37
+#: data/templates/default/importNetscape.tpl.php:37
 msgid ""
 "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
 msgstr ""
 "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
 
-#: ../../../templates/importNetscape.tpl.php:38
+#: data/templates/default/importNetscape.tpl.php:38
 msgid ""
 "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
 "Export..."
@@ -1155,13 +743,13 @@ msgstr ""
 "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
 "Export..."
 
-#: ../../../templates/importNetscape.tpl.php:39
+#: data/templates/default/importNetscape.tpl.php:39
 msgid ""
 "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
 msgstr ""
 "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
 
-#: ../../../templates/importNetscape.tpl.php:42
+#: data/templates/default/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"
@@ -1169,12 +757,12 @@ msgstr ""
 "Click <kbd>Browse...</kbd> to find the saved bookmark file on your computer. "
 "The maximum size the file can be is 1MB"
 
-#: ../../../templates/importStructure.tpl.php:24
+#: data/templates/default/importStructure.tpl.php:24
 msgid "Create your structure into a simple text file and following this model:"
 msgstr ""
 "Create your structure into a simple text file and following this model:"
 
-#: ../../../templates/importStructure.tpl.php:35
+#: data/templates/default/importStructure.tpl.php:35
 msgid ""
 "Then import the file. The tags and their relations will be added to your "
 "profile."
@@ -1182,19 +770,29 @@ msgstr ""
 "Then import the file. The tags and their relations will be added to your "
 "profile."
 
-#: ../../../templates/login.tpl.php:20 ../../../templates/register.tpl.php:21
+#: data/templates/default/login.tpl.php:13
+msgid "Please activate cookies"
+msgstr ""
+
+#: data/templates/default/login.tpl.php:26
+#: data/templates/default/register.tpl.php:21
 msgid "Password"
 msgstr "Password"
 
-#: ../../../templates/login.tpl.php:22
+#: data/templates/default/login.tpl.php:28
 msgid "Don't ask for my password for 2 weeks"
 msgstr "Don't ask for my password for 2 weeks"
 
-#: ../../../templates/login.tpl.php:30
+#: data/templates/default/login.tpl.php:32
+#: data/templates/default/toolbar.inc.php:29 www/login.php:57
+msgid "Log In"
+msgstr "Log In"
+
+#: data/templates/default/login.tpl.php:36
 msgid "Forgotten your password?"
 msgstr "Forgotten your password?"
 
-#: ../../../templates/password.tpl.php:5
+#: data/templates/default/password.tpl.php:5
 #, php-format
 msgid ""
 "If you have forgotten your password, %s can generate a new one. Enter the "
@@ -1205,37 +803,34 @@ msgstr ""
 "username and e-mail address of your account into the form below and we will "
 "e-mail your new password to you."
 
-#: ../../../templates/password.tpl.php:19
+#: data/templates/default/password.tpl.php:19
 msgid "Generate Password"
 msgstr "Generate Password"
 
-#: ../../../templates/profile.tpl.php:11
-msgid "Email"
-msgstr "Email"
-
-#: ../../../templates/profile.tpl.php:28
+#: data/templates/default/profile.tpl.php:28
 msgid "Member Since"
 msgstr "Member Since"
 
-#: ../../../templates/profile.tpl.php:40
-#: ../../../templates/sidebar.block.watchlist.php:30
+#: data/templates/default/profile.tpl.php:40
+#: data/templates/default/sidebar.block.watchlist.php:30
 msgid "Watching"
 msgstr "Watching"
 
-#: ../../../templates/profile.tpl.php:55
-#: ../../../templates/sidebar.block.watchlist.php:52
+#: data/templates/default/profile.tpl.php:55
+#: data/templates/default/sidebar.block.watchlist.php:52
 msgid "Watched By"
 msgstr "Watched By"
 
-#: ../../../templates/profile.tpl.php:68 ../../../templates/toolbar.inc.php:9
+#: data/templates/default/profile.tpl.php:68
+#: data/templates/default/toolbar.inc.php:9
 msgid "Bookmarks"
 msgstr "Bookmarks"
 
-#: ../../../templates/profile.tpl.php:69
+#: data/templates/default/profile.tpl.php:69
 msgid "Go to bookmarks"
 msgstr "Go to bookmarks"
 
-#: ../../../templates/register.tpl.php:11
+#: data/templates/default/register.tpl.php:11
 #, php-format
 msgid ""
 "Sign up here to create a free %s account. All the information requested "
@@ -1244,7 +839,7 @@ msgstr ""
 "Sign up here to create a free %s account. All the information requested "
 "below is required"
 
-#: ../../../templates/register.tpl.php:18
+#: data/templates/default/register.tpl.php:18
 msgid ""
 " at least 5 characters, alphanumeric (no spaces, no dots or other special "
 "ones)"
@@ -1252,143 +847,195 @@ msgstr ""
 " at least 5 characters, alphanumeric (no spaces, no dots or other special "
 "ones)"
 
-#: ../../../templates/register.tpl.php:28
+#: data/templates/default/register.tpl.php:28
 msgid " to send you your password if you forget it"
 msgstr " to send you your password if you forget it"
 
-#: ../../../templates/register.tpl.php:33
+#: data/templates/default/register.tpl.php:33
 msgid "Antispam question"
 msgstr "Antispam question"
 
-#: ../../../templates/sidebar.block.linked.php:51
+#: data/templates/default/register.tpl.php:41
+#: data/templates/default/toolbar.inc.php:31 www/register.php:99
+msgid "Register"
+msgstr "Register"
+
+#: data/templates/default/search.menu.php:27
+msgid "Search..."
+msgstr "Search..."
+
+#: data/templates/default/search.menu.php:28
+msgid "in"
+msgstr "in"
+
+#: data/templates/default/search.menu.php:34
+msgid "this user's bookmarks"
+msgstr "this user's bookmarks"
+
+#: data/templates/default/search.menu.php:39
+msgid "my bookmarks"
+msgstr "my bookmarks"
+
+#: data/templates/default/search.menu.php:40
+msgid "my watchlist"
+msgstr "my watchlist"
+
+#: data/templates/default/search.menu.php:44
+msgid "all bookmarks"
+msgstr "all bookmarks"
+
+#: data/templates/default/search.menu.php:54
+msgid "Search"
+msgstr "Search"
+
+#: data/templates/default/sidebar.block.linked.php:23
 msgid "Linked Tags"
 msgstr "Linked Tags"
 
-#: ../../../templates/sidebar.block.linked.php:62
-#: ../../../templates/sidebar.block.menu.php:46
+#: data/templates/default/sidebar.block.linked.php:28
+#: data/templates/default/sidebar.block.menu.php:46
 msgid "Add new link"
 msgstr "Add new link"
 
-#: ../../../templates/sidebar.block.linked.php:63
-#: ../../../templates/sidebar.block.menu.php:47
+#: data/templates/default/sidebar.block.linked.php:29
+#: data/templates/default/sidebar.block.menu.php:47
 msgid "Delete link"
 msgstr "Delete link"
 
-#: ../../../templates/sidebar.block.menu.php:35
+#: data/templates/default/sidebar.block.menu.php:35
 #, php-format
 msgid "Tags included into the tag '%s'"
 msgstr "Tags included into the tag '%s'"
 
-#: ../../../templates/sidebar.block.menu.php:35
+#: data/templates/default/sidebar.block.menu.php:35
 msgid "Menu Tags"
 msgstr "Menu Tags"
 
-#: ../../../templates/sidebar.block.menu.php:68
+#: data/templates/default/sidebar.block.menu.php:68
 msgid "See all your tags"
 msgstr "See all your tags"
 
-#: ../../../templates/sidebar.block.menu.php:68
+#: data/templates/default/sidebar.block.menu.php:68
 msgid "all your tags"
 msgstr "all your tags"
 
-#: ../../../templates/sidebar.block.menu.php:70
+#: data/templates/default/sidebar.block.menu.php:70
 msgid "See all tags from this user"
 msgstr "See all tags from this user"
 
-#: ../../../templates/sidebar.block.menu.php:70
+#: data/templates/default/sidebar.block.menu.php:70
 msgid "all tags from this user"
 msgstr "all tags from this user"
 
-#: ../../../templates/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.menu.php:74
 msgid "See popular tags"
 msgstr "See popular tags"
 
-#: ../../../templates/sidebar.block.menu2.php:25
+#: data/templates/default/sidebar.block.menu2.php:21
 msgid "Featured Menu Tags"
 msgstr "Featured Menu Tags"
 
-#: ../../../templates/sidebar.block.menu2.php:29
+#: data/templates/default/sidebar.block.menu2.php:25
 msgid "This menu is composed of keywords (tags) organized by admins."
 msgstr "This menu is composed of keywords (tags) organized by admins."
 
-#: ../../../templates/sidebar.block.recent.php:18
+#: data/templates/default/sidebar.block.recent.php:18
 msgid "Recent Tags"
 msgstr "Recent Tags"
 
-#: ../../../templates/sidebar.block.related.php:26
+#: data/templates/default/sidebar.block.related.php:26
 msgid "Related Tags"
 msgstr "Related Tags"
 
-#: ../../../templates/sidebar.block.search.php:15
+#: data/templates/default/sidebar.block.search.php:28
 msgid "Last Searches"
 msgstr "Last searches"
 
-#: ../../../templates/sidebar.block.search.php:24
+#: data/templates/default/sidebar.block.search.php:40
 msgid "Number of bookmarks for this query"
 msgstr "Number of bookmarks for this query"
 
-#: ../../../templates/sidebar.block.tagactions.php:28
+#: data/templates/default/sidebar.block.tagactions.php:9 www/tagrename.php:72
+msgid "Rename Tag"
+msgid_plural "Rename Tags"
+msgstr[0] "Rename tag"
+msgstr[1] "Rename tags"
+
+#: data/templates/default/sidebar.block.tagactions.php:22 www/tagdelete.php:54
+msgid "Delete Tag"
+msgstr "Delete tag"
+
+#: data/templates/default/sidebar.block.tagactions.php:24 www/tagedit.php:61
+msgid "Edit Tag Description"
+msgstr "Edit tag description"
+
+#: data/templates/default/sidebar.block.tagactions.php:26
+#: www/tagcommondescriptionedit.php:76
+msgid "Edit Tag Common Description"
+msgstr "Edit Tag common description"
+
+#: data/templates/default/sidebar.block.tagactions.php:28
 msgid "Create a link to another tag"
 msgstr "Create a link to another tag"
 
-#: ../../../templates/sidebar.block.users.php:14
+#: data/templates/default/sidebar.block.users.php:14
 msgid "New Users"
 msgstr "New users"
 
-#: ../../../templates/sidebar.block.users.php:23
-#: ../../../templates/users.tpl.php:17
+#: data/templates/default/sidebar.block.users.php:23
+#: data/templates/default/users.tpl.php:24
 msgid "bookmarks"
 msgstr "bookmarks"
 
-#: ../../../templates/sidebar.block.users.php:30
+#: data/templates/default/sidebar.block.users.php:30
 msgid "See all users"
 msgstr "See all users"
 
-#: ../../../templates/sidebar.block.users.php:30
+#: data/templates/default/sidebar.block.users.php:30
 msgid "All users"
 msgstr "All users"
 
-#: ../../../templates/sidebar.block.watchlist.php:19
+#: data/templates/default/sidebar.block.watchlist.php:19
 msgid "Close contacts are mutual contacts"
 msgstr "Close contacts are mutual contacts"
 
-#: ../../../templates/sidebar.block.watchlist.php:19
+#: data/templates/default/sidebar.block.watchlist.php:19
 msgid "Close contacts"
 msgstr "Close contacts"
 
-#: ../../../templates/sidebar.block.watchlist.php:36
+#: data/templates/default/sidebar.block.watchlist.php:36
 msgid "Add a contact..."
 msgstr "Add a contact..."
 
-#: ../../../templates/sidebar.block.watchlist.php:36
+#: data/templates/default/sidebar.block.watchlist.php:36
 msgid "Type a username to add it to your contacts."
 msgstr "Type a username to add it to your contacts."
 
-#: ../../../templates/sidebar.block.watchlist.php:44
+#: data/templates/default/sidebar.block.watchlist.php:44
 msgid "Remove this contact"
 msgstr "Remove this contact"
 
-#: ../../../templates/sidebar.block.watchstatus.php:11
+#: data/templates/default/sidebar.block.watchstatus.php:11
 msgid "Remove from Watchlist"
 msgstr "Remove from Watchlist"
 
-#: ../../../templates/sidebar.block.watchstatus.php:13
+#: data/templates/default/sidebar.block.watchstatus.php:13
 msgid "Add to Watchlist"
 msgstr "Add to Watchlist"
 
-#: ../../../templates/sidebar.linkedtags.inc.php:18
+#: data/templates/default/sidebar.linkedtags.inc.php:18
 msgid "Edit link"
 msgstr "Edit link"
 
-#: ../../../templates/sidebar.linkedtags.inc.php:47
+#: data/templates/default/sidebar.linkedtags.inc.php:47
 msgid "Synonyms:"
 msgstr "Synonyms:"
 
-#: ../../../templates/tag2tagadd.tpl.php:12
+#: data/templates/default/tag2tagadd.tpl.php:12
 msgid "Create new link:"
 msgstr "Create new link:"
 
-#: ../../../templates/tag2tagadd.tpl.php:19
+#: data/templates/default/tag2tagadd.tpl.php:19
 #, php-format
 msgid ""
 "Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into "
@@ -1397,74 +1044,599 @@ msgstr ""
 "Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into "
 "the menu box"
 
-#: ../../../templates/tag2tagadd.tpl.php:23
-#: ../../../templates/tag2tagedit.tpl.php:37
+#: data/templates/default/tag2tagadd.tpl.php:23
+#: data/templates/default/tag2tagedit.tpl.php:37
 msgid "Create"
 msgstr "Create"
 
-#: ../../../templates/tag2tagadd.tpl.php:35
-#: ../../../templates/tag2tagdelete.tpl.php:27
-#: ../../../templates/tag2tagedit.tpl.php:51
+#: data/templates/default/tag2tagadd.tpl.php:35
+#: data/templates/default/tag2tagdelete.tpl.php:27
+#: data/templates/default/tag2tagedit.tpl.php:51
 msgid "Existing links:"
 msgstr "Existing links:"
 
-#: ../../../templates/tag2tagadd.tpl.php:53
-#: ../../../templates/tag2tagdelete.tpl.php:45
-#: ../../../templates/tag2tagedit.tpl.php:69
+#: data/templates/default/tag2tagadd.tpl.php:53
+#: data/templates/default/tag2tagdelete.tpl.php:45
+#: data/templates/default/tag2tagedit.tpl.php:69
 msgid "No links"
 msgstr "No links"
 
-#: ../../../templates/tag2tagedit.tpl.php:6
+#: data/templates/default/tag2tagdelete.tpl.php:15
+#: data/templates/default/tag2tagedit.tpl.php:16
+#: data/templates/default/tagdelete.tpl.php:8 www/jsScuttle.php:24
+msgid "Yes"
+msgstr "Yes"
+
+#: data/templates/default/tag2tagdelete.tpl.php:16
+#: data/templates/default/tag2tagedit.tpl.php:17
+#: data/templates/default/tagdelete.tpl.php:9 www/jsScuttle.php:24
+msgid "No"
+msgstr "No"
+
+#: data/templates/default/tag2tagedit.tpl.php:6
 msgid "Delete the link"
 msgstr "Delete the link"
 
-#: ../../../templates/tag2tagedit.tpl.php:29
+#: data/templates/default/tag2tagedit.tpl.php:29
 msgid "Create new link"
 msgstr "Create new link"
 
-#: ../../../templates/tagrename.tpl.php:12
+#: data/templates/default/tagrename.tpl.php:12
 msgid "Old"
 msgstr "Old"
 
-#: ../../../templates/tagrename.tpl.php:17
+#: data/templates/default/tagrename.tpl.php:17
 msgid "New"
 msgstr "New"
 
-#: ../../../templates/tagrename.tpl.php:24
+#: data/templates/default/tagrename.tpl.php:24
 msgid "Rename"
 msgstr "Rename"
 
-#: ../../../templates/tags.tpl.php:11 ../../../templates/users.tpl.php:9
+#: data/templates/default/tags.tpl.php:11
+#: data/templates/default/users.tpl.php:9
 msgid "Alphabet"
 msgstr "Alphabet"
 
-#: ../../../templates/tags.tpl.php:12 ../../../templates/users.tpl.php:10
+#: data/templates/default/tags.tpl.php:12
+#: data/templates/default/users.tpl.php:10
 msgid "Popularity"
 msgstr "Popularity"
 
-#: ../../../templates/toolbar.inc.php:8 ../../../templates/toolbar.inc.php:26
+#: data/templates/default/toolbar.inc.php:8
+#: data/templates/default/toolbar.inc.php:26
 msgid "Home"
 msgstr "Home"
 
-#: ../../../templates/toolbar.inc.php:14
+#: data/templates/default/toolbar.inc.php:11 www/watchlist.php:106
+msgid "Watchlist"
+msgstr "Watchlist"
+
+#: data/templates/default/toolbar.inc.php:12 www/profile.php:79
+msgid "Profile"
+msgstr "Profile"
+
+#: data/templates/default/toolbar.inc.php:13 www/bookmarks.php:215
+msgid "Add a Bookmark"
+msgstr "Add a Bookmark"
+
+#: data/templates/default/toolbar.inc.php:14
 msgid "Log Out"
 msgstr "Log Out"
 
-#: ../../../templates/toolbar.inc.php:17
+#: data/templates/default/toolbar.inc.php:17
 msgid "Admin"
 msgstr "Admin"
 
-#: ../../../templates/top.inc.php:51
+#: data/templates/default/top.inc.php:57
 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/default/users.tpl.php:20
 msgid "profile"
 msgstr "Profile"
 
-#: ../../../templates/users.tpl.php:17
+#: data/templates/default/users.tpl.php:21
 msgid "created in"
 msgstr "created in"
+
+#: www/admin.php:32
+msgid "Manage users"
+msgstr "Manage users"
+
+#: www/admin.php:69
+#, php-format
+msgid "%s and all his bookmarks and tags were deleted."
+msgstr "%s and all his bookmarks and tags were deleted."
+
+#: www/admin.php:76
+msgid "Problem with "
+msgstr "Problem with "
+
+#: www/ajaxDelete.php:37
+msgid "You are not allowed to delete this bookmark"
+msgstr "You are not allowed to delete this bookmark"
+
+#: www/ajaxDelete.php:41 www/edit.php:103
+msgid "Failed to delete bookmark"
+msgstr "Failed to delete bookmark"
+
+#: www/alltags.php:50
+msgid "All Tags"
+msgstr "All Tags"
+
+#: www/alltags.php:56 www/bookmarks.php:99 www/populartags.php:52
+#: www/profile.php:55 www/rss.php:100 www/search.php:111 www/watch.php:45
+#: www/watchlist.php:61
+#, php-format
+msgid "User with username %s was not found"
+msgstr "User with username %s was not found"
+
+#: 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 denied."
+
+#: www/bookmarkcommondescriptionedit.php:60
+msgid "Bookmark common description updated"
+msgstr "Bookmark common description updated"
+
+#: www/bookmarkcommondescriptionedit.php:63
+msgid "Failed to update the bookmark common description"
+msgstr "Failed to update the bookmark common description"
+
+#: www/bookmarkcommondescriptionedit.php:71
+msgid "Edit Bookmark Common Description"
+msgstr "Edit Bookmark common description"
+
+#: www/bookmarks.php:114 www/tags.php:47
+msgid "Remove the tag from the selection"
+msgstr "Remove the tag from the selection"
+
+#: www/bookmarks.php:134 www/edit.php:65
+msgid "Your bookmark must have a title and an address"
+msgstr "Your bookmark must have a title and an address"
+
+#: www/bookmarks.php:139
+msgid "This bookmark URL may not be added"
+msgstr ""
+
+#: www/bookmarks.php:158 www/edit.php:83 www/edit.php:86
+msgid "Bookmark saved"
+msgstr "Bookmark saved"
+
+#: www/bookmarks.php:158
+msgid "(Come back to previous page.)"
+msgstr "(Go back to previous page.)"
+
+#: www/bookmarks.php:165 www/import.php:106 www/importNetscape.php:108
+msgid ""
+"There was an error saving your bookmark. Please try again or contact the "
+"administrator."
+msgstr ""
+"There was an error saving your bookmark. Please try again or contact the "
+"administrator."
+
+#: www/bookmarks.php:222
+msgid "Add Bookmark"
+msgstr "Add Bookmark"
+
+#: www/bookmarks.php:225
+msgid "You must be logged in before you can add bookmarks."
+msgstr "You must be logged in before you can add bookmarks."
+
+#: www/bookmarks.php:270
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: www/bookmarks.php:283
+#, php-format
+msgid "%s: %s (+private %s)"
+msgstr ""
+
+#: www/bookmarks.php:305 www/bookmarks.php:306
+msgid "My Bookmarks"
+msgstr "My Bookmarks"
+
+#: www/edit.php:44 www/edit.php:45
+msgid "Edit Bookmark"
+msgstr "Edit Bookmark"
+
+#: www/edit.php:51
+#, php-format
+msgid "Bookmark with id %s not was not found"
+msgstr "Bookmark with id %s was not found"
+
+#: www/edit.php:57
+msgid "You are not allowed to edit this bookmark"
+msgstr "You are not allowed to edit this bookmark"
+
+#: www/edit.php:77
+msgid "Error while saving your bookmark"
+msgstr "Error while saving your bookmark"
+
+#: www/history.php:61
+msgid "History"
+msgstr "History"
+
+#: www/history.php:62
+#, php-format
+msgid "History for %s"
+msgstr "History for %s"
+
+#: www/history.php:84
+msgid "Address was not found"
+msgstr "Address was not found"
+
+#: www/import.php:47
+msgid "Could not open XML input"
+msgstr "Could not open XML input"
+
+#: www/import.php:51
+#, php-format
+msgid "XML error: %s at line %d"
+msgstr "XML error: %s at line %d"
+
+#: www/import.php:60
+msgid "Import Bookmarks from del.icio.us"
+msgstr "Import bookmarks from del.icio.us"
+
+#: www/import.php:93
+msgid "You have already submitted this bookmark."
+msgstr "You have already submitted this bookmark."
+
+#: www/import.php:104
+msgid "Bookmark imported."
+msgstr "Bookmark imported."
+
+#: www/importNetscape.php:95
+msgid "You have already submitted some of these bookmarks."
+msgstr "You have already submitted some of these bookmarks."
+
+#: www/importNetscape.php:115
+msgid "Bookmarks found: "
+msgstr "Bookmarks found: "
+
+#: www/importNetscape.php:116
+msgid "Bookmarks imported: "
+msgstr "Bookmarks imported: "
+
+#: www/importNetscape.php:117 www/importNetscape.php:122
+msgid "Import Bookmarks from Browser File"
+msgstr "Import Bookmarks from browser file"
+
+#: www/importStructure.php:61
+msgid "Bad indentation"
+msgstr "Bad indentation"
+
+#: www/importStructure.php:67
+msgid "New links between tags: "
+msgstr "New links between tags: "
+
+#: www/importStructure.php:72
+msgid "Import Structure"
+msgstr "Import Structure"
+
+#: www/index.php:38
+msgid "You have now logged out"
+msgstr "You have now logged out"
+
+#: www/index.php:46
+#, php-format
+msgid "%s: Recent bookmarks"
+msgstr "%s: Recent bookmarks"
+
+#: www/index.php:58
+#, fuzzy, php-format
+msgid "%s: Recent bookmarks (+private %s)"
+msgstr "%s: Recent bookmarks"
+
+#: www/index.php:96
+msgid "Store, share and tag your favourite links"
+msgstr "Store, share and tag your favourite links"
+
+#: www/index.php:97
+msgid "All Bookmarks"
+msgstr "All Bookmarks"
+
+#: www/jsScuttle.php:71
+msgid "Available"
+msgstr "Available"
+
+#: www/jsScuttle.php:74
+msgid "Not Available"
+msgstr "Not available"
+
+#: www/login.php:48
+msgid "The details you have entered are incorrect. Please try again."
+msgstr "The details you have entered are incorrect. Please try again."
+
+#: www/password.php:36
+msgid "You must enter your username."
+msgstr "You must enter your username."
+
+#: www/password.php:40
+msgid ""
+"You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
+
+#: www/password.php:48
+msgid "No matches found for that username."
+msgstr "No matches found for that username."
+
+#: www/password.php:51
+msgid ""
+"No matches found for that combination of username and <abbr title="
+"\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"No matches found for that combination of username and <abbr title="
+"\"electronic mail\">e-mail</abbr> address."
+
+#: www/password.php:59
+msgid ""
+"There was an error while generating your new password. Please try again."
+msgstr ""
+"There was an error while generating your new password. Please try again."
+
+#: www/password.php:63
+msgid "Your new password is:"
+msgstr "Your new password is:"
+
+#: 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 ""
+"To keep your bookmarks secure, you should change this password in your "
+"profile the next time you log in."
+
+#: www/password.php:66
+#, php-format
+msgid "%s Account Information"
+msgstr "%s Account Information"
+
+#: www/password.php:68
+#, php-format
+msgid "New password generated and sent to %s"
+msgstr "New password generated and sent to %s"
+
+#: www/password.php:75
+msgid "Forgotten Password"
+msgstr "Forgotten Password"
+
+#: www/profile.php:63 www/watchlist.php:119
+msgid "Username was not specified"
+msgstr "Username was not specified"
+
+#: www/profile.php:70
+msgid "My Profile"
+msgstr "My Profile"
+
+#: www/profile.php:110
+msgid "Invalid Token"
+msgstr "Invalid token"
+
+#: www/profile.php:115
+msgid "Password and confirmation do not match."
+msgstr "Password and confirmation do not match."
+
+#: www/profile.php:119
+msgid "Password must be at least 6 characters long."
+msgstr "Password must be at least 6 characters long."
+
+#: www/profile.php:123
+msgid "E-mail address is not valid."
+msgstr "E-mail address is not valid."
+
+#: www/profile.php:127
+msgid "An error occurred while saving your changes."
+msgstr "An error occurred while saving your changes."
+
+#: www/profile.php:129
+msgid "Changes saved."
+msgstr "Changes saved."
+
+#: www/profile.php:148
+msgid "You do not have a valid SSL client certificate"
+msgstr ""
+
+#: www/profile.php:150
+msgid "This certificate is already registered"
+msgstr ""
+
+#: www/profile.php:152
+msgid "Failed to register SSL client certificate."
+msgstr ""
+
+#: www/profile.php:154
+msgid "SSL client certificate registered."
+msgstr ""
+
+#: www/profile.php:163
+msgid "Certificate not found."
+msgstr ""
+
+#: www/profile.php:165
+msgid "The certificate does not belong to you."
+msgstr ""
+
+#: www/profile.php:167
+#, fuzzy
+msgid "Failed to delete SSL client certificate."
+msgstr "Failed to delete the tag"
+
+#: www/profile.php:169
+msgid "SSL client certificate deleted."
+msgstr ""
+
+#: www/register.php:52
+msgid "You <em>must</em> enter a username, password and e-mail address."
+msgstr "You <em>must</em> enter a username, password and e-mail address."
+
+#: www/register.php:56
+msgid "This username has been reserved, please make another choice."
+msgstr "This username has been reserved, please make another choice."
+
+#: www/register.php:60
+msgid "This username already exists, please make another choice."
+msgstr "This username already exists, please make another choice."
+
+#: www/register.php:64
+msgid ""
+"This username is not valid (too short, too long, forbidden characters...), "
+"please make another choice."
+msgstr ""
+"This username is not valid (too short, too long, forbidden characters...), "
+"please make another choice."
+
+#: www/register.php:68
+msgid "E-mail address is not valid. Please try again."
+msgstr "E-mail address is not valid. Please try again."
+
+#: www/register.php:72
+msgid "Antispam answer is not valid. Please try again."
+msgstr "Antispam answer is not valid. Please try again."
+
+#: www/register.php:90
+msgid "You have successfully registered. Enjoy!"
+msgstr "You have successfully registered. Enjoy!"
+
+#: www/register.php:92
+msgid "Registration failed. Please try again."
+msgstr "Registration failed. Please try again."
+
+#: www/rss.php:90 www/rss.php:111
+#, php-format
+msgid "Failed to Autenticate User with username %s using private key"
+msgstr ""
+
+#: www/rss.php:128
+#, php-format
+msgid "Recent bookmarks posted to %s"
+msgstr "Recent bookmarks posted to %s"
+
+#: www/search.php:83 www/search.php:147
+msgid "Search Bookmarks"
+msgstr "Search Bookmarks"
+
+#: www/search.php:89
+msgid "Search Results"
+msgstr "Search Results"
+
+#: www/search.php:137
+msgid "Unsatisfied? You can also try our "
+msgstr "Unsatisfied? You can also try our "
+
+#: www/tag2tagadd.php:54
+msgid "Tag link created"
+msgstr "Tag link created"
+
+#: www/tag2tagadd.php:57
+msgid "Failed to create the link"
+msgstr "Failed to create the link"
+
+#: www/tag2tagadd.php:69
+msgid "Add Tag Link"
+msgstr "Add Tag Link"
+
+#: www/tag2tagdelete.php:66
+msgid "Tag link deleted"
+msgstr "Tag link deleted"
+
+#: www/tag2tagdelete.php:69
+msgid "Failed to delete the link"
+msgstr "Failed to delete the link"
+
+#: www/tag2tagdelete.php:81
+msgid "Delete Link Between Tags"
+msgstr "Delete Link between Tags"
+
+#: www/tag2tagedit.php:55
+msgid "Edit Link Between Tags"
+msgstr "Edit Link between Tags"
+
+#: www/tagcommondescriptionedit.php:62
+msgid "Tag common description updated"
+msgstr "Tag common description updated"
+
+#: www/tagcommondescriptionedit.php:67
+msgid "Failed to update the tag common description"
+msgstr "Failed to update the tag common description"
+
+#: www/tagdelete.php:43
+msgid "Tag deleted"
+msgstr "Tag deleted"
+
+#: www/tagdelete.php:46
+msgid "Failed to delete the tag"
+msgstr "Failed to delete the tag"
+
+#: www/tagedit.php:52
+msgid "Tag description updated"
+msgstr "Tag description updated"
+
+#: www/tagedit.php:55
+msgid "Failed to update the tag description"
+msgstr "Failed to update the tag description"
+
+#: www/tagrename.php:63
+msgid "Tag renamed"
+msgstr "Tag renamed"
+
+#: www/tagrename.php:66
+msgid "Failed to rename the tag"
+msgstr "Failed to rename the tag"
+
+#: www/tags.php:71
+#, php-format
+msgid "%s: tagged with \"%s\""
+msgstr ""
+
+#: www/tags.php:84
+#, php-format
+msgid "%s: tagged with \"%s\" (+private %s)"
+msgstr ""
+
+#: www/users.php:31
+msgid "Users"
+msgstr "Users"
+
+#: www/watch.php:54
+msgid "User removed from your watchlist"
+msgstr "User removed from your watchlist"
+
+#: www/watch.php:56
+msgid "User added to your watchlist"
+msgstr "User added to your watchlist"
+
+#: www/watchlist.php:104
+msgid "My Watchlist"
+msgstr "My Watchlist"
+
+#: www/api/httpauth.inc.php:30
+msgid "Use of the API calls requires authentication."
+msgstr ""
+
+#: www/gsearch/index.php:51
+#, fuzzy
+msgid "Come back to "
+msgstr "(Go back to previous page.)"
+
+#: www/gsearch/index.php:56
+msgid "Admin tips: "
+msgstr ""
+
+#: www/gsearch/index.php:57
+msgid "To refresh manually Google Custom Search Engine, goes to: "
+msgstr ""
+
+#: www/gsearch/index.php:61
+msgid ""
+"If no result appears, check that all the urls are valid in the admin section."
+msgstr ""
diff --git a/data/locales/es_ES/LC_MESSAGES/messages.mo b/data/locales/es_ES/LC_MESSAGES/messages.mo
index 0929a72..c72a054 100644
--- a/data/locales/es_ES/LC_MESSAGES/messages.mo
+++ b/data/locales/es_ES/LC_MESSAGES/messages.mo
diff --git a/data/locales/es_ES/LC_MESSAGES/messages.po b/data/locales/es_ES/LC_MESSAGES/messages.po
index 1451d64..576391f 100644
--- a/data/locales/es_ES/LC_MESSAGES/messages.po
+++ b/data/locales/es_ES/LC_MESSAGES/messages.po
@@ -7,820 +7,1730 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Scuttle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-16 06:31+0200\n"
+"POT-Creation-Date: 2012-01-20 13:58+0100\n"
 "PO-Revision-Date: 2006-03-26 14:28-0800\n"
 "Last-Translator: Marcus Campbell <marcus.campbell@gmail.com>\n"
 "Language-Team: es-ES <fportero@serbinario.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ..\..\..\about.php:25
-#: ..\..\..\templates\toolbar.inc.php:24
-msgid "About"
-msgstr "Acerca de"
-
-#: ..\..\..\ajaxDelete.php:29
-msgid "You are not allowed to delete this bookmark"
-msgstr "No puede borrar estos enlaces"
-
-#: ..\..\..\ajaxDelete.php:33
-msgid "Failed to delete bookmark"
-msgstr "Error al borrar los enlaces"
-
-#: ..\..\..\alltags.php:50
-msgid "All Tags"
-msgstr "Todas"
-
-#: ..\..\..\alltags.php:59
-#: ..\..\..\populartags.php:63
-#: ..\..\..\profile.php:46
-#: ..\..\..\rss.php:55
-#: ..\..\..\search.php:61
-#: ..\..\..\watch.php:35
-#: ..\..\..\watched.php:62
-#, php-format
-msgid "User with username %s not was not found"
-msgstr "No se encontro el usuario %s"
-
-#: ..\..\..\bookmarks.php:71
-#, fuzzy, php-format
-msgid "User with username %s was not found"
-msgstr "No se encontro el usuario %s"
-
-#: ..\..\..\bookmarks.php:94
-#: ..\..\..\edit.php:44
-msgid "Your bookmark must have a title and an address"
-msgstr "Su enlace debe tener un t&iacute;tulo y una direcci&oacute;n"
-
-#: ..\..\..\bookmarks.php:114
-#: ..\..\..\edit.php:58
-msgid "Bookmark saved"
-msgstr "Enlace salvado"
-
-#: ..\..\..\bookmarks.php:122
-#: ..\..\..\import.php:99
-#: ..\..\..\importNetscape.php:74
-msgid "There was an error saving your bookmark. Please try again or contact the administrator."
-msgstr "Hay un error al salvar su enlace. Por favor intentelo de nuevo o contacte con el administrador."
-
-#: ..\..\..\bookmarks.php:160
-#: ..\..\..\templates\toolbar.inc.php:13
-msgid "Add a Bookmark"
-msgstr "Agregar"
-
-#: ..\..\..\bookmarks.php:163
-msgid "Add Bookmark"
-msgstr "Agregar Enlace"
-
-#: ..\..\..\bookmarks.php:166
-msgid "You must be logged in before you can add bookmarks."
-msgstr "Debe introducir su usuario y contrase&ntilde;a para poder agregar enlaces"
-
-#: ..\..\..\bookmarks.php:213
-msgid "My Bookmarks"
-msgstr "Mis Enlaces"
-
-#: ..\..\..\edit.php:29
-msgid "Edit Bookmark"
-msgstr "Editar enlace"
-
-#: ..\..\..\edit.php:34
-#, php-format
-msgid "Bookmark with id %s not was not found"
-msgstr "El enlace con id %s no funciona"
-
-#: ..\..\..\edit.php:39
-msgid "You are not allowed to edit this bookmark"
-msgstr "Usted no tiene permisos para editar este enlace"
-
-#: ..\..\..\edit.php:55
-msgid "Error while saving your bookmark"
-msgstr "Se ha producido un error al salvar su enlace"
-
-#: ..\..\..\edit.php:78
-msgid "Failed to delete the bookmark"
-msgstr "Fallo al borrar el enlace"
-
-#: ..\..\..\edit.php:88
-#: ..\..\..\templates\editprofile.tpl.php:52
-msgid "Save Changes"
-msgstr "Guardar Cambios"
-
-#: ..\..\..\functions.inc.php:92
+#: src/SemanticScuttle/functions.php:189
 msgid "message_die() was called multiple times."
 msgstr "message_die() requerido en varios ocasiones."
 
-#: ..\..\..\functions.inc.php:104
+#: src/SemanticScuttle/functions.php:201
 msgid "SQL Error"
 msgstr "Error de SQL"
 
-#: ..\..\..\functions.inc.php:110
+#: src/SemanticScuttle/functions.php:207
 msgid "Line"
 msgstr "L&iacute;nea"
 
-#: ..\..\..\functions.inc.php:110
-#: ..\..\..\templates\importDelicious.tpl.php:8
-#: ..\..\..\templates\importNetscape.tpl.php:9
+#: src/SemanticScuttle/functions.php:207
+#: data/templates/default/importDelicious.tpl.php:8
+#: data/templates/default/importNetscape.tpl.php:9
+#: data/templates/default/importStructure.tpl.php:10
 msgid "File"
 msgstr "Archivo"
 
-#: ..\..\..\functions.inc.php:116
+#: src/SemanticScuttle/functions.php:215
 msgid "Information"
 msgstr "Informaci&oacute;n"
 
-#: ..\..\..\functions.inc.php:121
+#: src/SemanticScuttle/functions.php:220
 msgid "Critical Information"
 msgstr "Informaci&oacute;n Critica"
 
-#: ..\..\..\functions.inc.php:126
+#: src/SemanticScuttle/functions.php:225
 msgid "An error occured"
 msgstr "Ha habido un error"
 
-#: ..\..\..\functions.inc.php:129
+#: src/SemanticScuttle/functions.php:228
 msgid "General Error"
 msgstr "Error General"
 
-#: ..\..\..\functions.inc.php:137
+#: src/SemanticScuttle/functions.php:236
 msgid "An critical error occured"
 msgstr "Ha habido un error critico"
 
-#: ..\..\..\functions.inc.php:140
+#: src/SemanticScuttle/functions.php:239
 msgid "Critical Error"
 msgstr "Error Critico"
 
-#: ..\..\..\functions.inc.php:149
+#: src/SemanticScuttle/functions.php:248
 msgid "DEBUG MODE"
 msgstr "MODO DEPURACION"
 
-#: ..\..\..\history.php:65
-msgid "History"
-msgstr "Historial"
+#: data/templates/default/about.tpl.php:6
+msgid ""
+"<strong>Store</strong> all your favourite links in one place, accessible "
+"from anywhere."
+msgstr ""
+"<strong>Guarde</strong> todos sus enlaces favoritos en un lugar y acceda "
+"desde donde quiera."
 
-#: ..\..\..\history.php:66
-#, php-format
-msgid "History for %s"
-msgstr "Historial de %s"
+#: data/templates/default/about.tpl.php:7
+msgid ""
+"<strong>Share</strong> your bookmarks with everyone, with friends on your "
+"watchlist or just keep them private."
+msgstr ""
+"<strong>Comparte</strong> tus enlaces, solo con los amigos de la lista de "
+"consultados o mant&eacute;ngalos privados.."
 
-#: ..\..\..\history.php:81
-msgid "Address was not found"
-msgstr "La direcci&oacute;n no existe"
+#: data/templates/default/about.tpl.php:8
+msgid ""
+"<strong>Tag</strong> your bookmarks with as many labels as you want, instead "
+"of wrestling with folders."
+msgstr ""
+"<strong>Etiquete</strong> sus enlaces con tantas etiquetas como usted desea, "
+"en lugar de pellearse con las carpetas."
 
-#: ..\..\..\import.php:41
-msgid "Could not open XML input"
-msgstr "No se pude abrir la entrada XML"
+#: data/templates/default/about.tpl.php:9
+#, fuzzy
+msgid "Register now"
+msgstr "Registrarse"
 
-#: ..\..\..\import.php:45
+#: data/templates/default/about.tpl.php:9
 #, php-format
-msgid "XML error: %s at line %d"
-msgstr "Errores: %s en la linea %d del XML"
-
-#: ..\..\..\import.php:54
-msgid "Import Bookmarks from del.icio.us"
-msgstr "Importar enlaces de del.icio.us"
-
-#: ..\..\..\import.php:86
-#: ..\..\..\importNetscape.php:64
-msgid "You have already submitted this bookmark."
-msgstr "Usted ya ha agregado este enlace"
+msgid " to start using %s!"
+msgstr ""
 
-#: ..\..\..\import.php:97
-#: ..\..\..\importNetscape.php:72
-msgid "Bookmark imported."
-msgstr "Enlaces importados."
+#: data/templates/default/about.tpl.php:12
+msgid "Geek Stuff"
+msgstr "Adelante"
 
-#: ..\..\..\importNetscape.php:81
-msgid "Import Bookmarks from Browser File"
-msgstr "Importar enlaces de un Navegador"
+#: data/templates/default/about.tpl.php:14
+msgid "is licensed under the "
+msgstr ""
 
-#: ..\..\..\index.php:32
-msgid "You have now logged out"
-msgstr "Usted esta ahora desconectado"
+#: data/templates/default/about.tpl.php:14
+msgid "you can freely host it on your own web server."
+msgstr ""
 
-#: ..\..\..\index.php:39
+#: data/templates/default/about.tpl.php:15
 #, php-format
-msgid "%s: Recent bookmarks"
-msgstr "%s: Enlaces recientes"
-
-#: ..\..\..\index.php:72
-msgid "Store, share and tag your favourite links"
-msgstr "Almacene, navege y etiquete sus enlaces favoritos"
-
-#: ..\..\..\index.php:73
-msgid "Recent Bookmarks"
-msgstr "Enlaces Recientes"
-
-#: ..\..\..\jsScuttle.php:22
-msgid "Are you sure?"
-msgstr "Esta usted seguro?"
-
-#: ..\..\..\jsScuttle.php:22
-msgid "Yes"
-msgstr "Si"
-
-#: ..\..\..\jsScuttle.php:22
-msgid "No"
-msgstr "No"
-
-#: ..\..\..\jsScuttle.php:68
-msgid "Available"
-msgstr "Disponible"
-
-#: ..\..\..\jsScuttle.php:71
-#, fuzzy
-msgid "Not Available"
-msgstr "No hay enlaces disponibles"
+msgid ""
+"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 esta basado en la <a href=\"http://www.delicious.com/help/api\"><abbr "
+"title=\"Application Programming Interface\">API</abbr></a> de <a href="
+"\"http://www.delicious.com/help/api\">del.icio.us <abbr title=\"Application "
+"Programming Interface\">API</abbr></a>. La mayor&iacute;a de las "
+"herramientas utilizadas para construir este sistema se pueden modificar para "
+"trabajar con %1$s. Si usted encuentra una herramienta en la que no puede "
+"modificar la direccion de la API, pregunte al creador si puede cambiar esta "
+"configuraci&oacute;n. Nunca se sabe, puede que ya se haya cambiado esa "
+"configuraci&oacute;n."
+
+#: data/templates/default/about.tpl.php:24
+msgid "Tips"
+msgstr ""
 
-#: ..\..\..\login.php:38
-msgid "The details you have entered are incorrect. Please try again."
-msgstr "Los datos introducidos son incorrectos. Por favor intentelo de nuevo."
+#: data/templates/default/about.tpl.php:26
+msgid "Add search plugin into your browser:"
+msgstr ""
 
-#: ..\..\..\login.php:48
-#: ..\..\..\templates\login.tpl.php:26
-#: ..\..\..\templates\toolbar.inc.php:28
-msgid "Log In"
-msgstr "Acceder"
+#: data/templates/default/about.tpl.php:27
+msgid ""
+"The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
+msgstr ""
 
-#: ..\..\..\password.php:31
-msgid "You must enter your username."
-msgstr "Introduzca su nombre de usuario"
+#: data/templates/default/about.tpl.php:28
+msgid ""
+"The secret tag \"system:imported\" allows you to find imported bookmarks."
+msgstr ""
 
-#: ..\..\..\password.php:35
+#: data/templates/default/admin.tpl.php:5
 #, fuzzy
-msgid "You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "Debe  <em>especificar</em> usuario, clave, nombre y <abbr title=\"electronic mail\">correo electr&oacute;nico</abbr>."
+msgid "Users management"
+msgstr "Usuario"
 
-#: ..\..\..\password.php:42
-msgid "No matches found for that username."
-msgstr "No se encuentra ning&uacute;n usuario con ese nombre"
+#: data/templates/default/admin.tpl.php:14
+msgid "Public/Shared/Private"
+msgstr ""
 
-#: ..\..\..\password.php:45
+#: data/templates/default/admin.tpl.php:14
+#: data/templates/default/bookmarks.tpl.php:115
 #, fuzzy
-msgid "No matches found for that combination of username and <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "Debe  <em>especificar</em> usuario, clave, nombre y <abbr title=\"electronic mail\">correolectr&oacute;nico</abbr>."
+msgid "bookmark(s)"
+msgstr "enlace"
+
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/tag2tagadd.tpl.php:21
+#: data/templates/default/tag2tagdelete.tpl.php:13
+#: data/templates/default/tag2tagedit.tpl.php:14
+#: data/templates/default/tag2tagedit.tpl.php:35
+#: data/templates/default/tagdelete.tpl.php:6 www/jsScuttle.php:24
+msgid "Are you sure?"
+msgstr "Esta usted seguro?"
 
-#: ..\..\..\password.php:53
-#, fuzzy
-msgid "There was an error while generating your new password. Please try again."
-msgstr "Hay un error al salvar su enlace. Por favor intentelo de nuevo o contacte con el administrador."
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/bookmarks.tpl.php:305
+msgid "Delete"
+msgstr "Borrar"
 
-#: ..\..\..\password.php:57
+#: data/templates/default/admin.tpl.php:27
 #, fuzzy
-msgid "Your new password is:"
-msgstr "Confirmar la nueva clave"
+msgid "Other actions"
+msgstr "Instrucciones"
 
-#: ..\..\..\password.php:57
-msgid "To keep your bookmarks secure, you should change this password in your profile the next time you log in."
-msgstr "Para que sean seguros sus enlaces, debe cambiar la clave de su usuario en el siguiente acceso"
+#: data/templates/default/admin.tpl.php:29
+msgid "Check all URLs (May take some time)"
+msgstr ""
 
-#: ..\..\..\password.php:60
-#, fuzzy, php-format
-msgid "%s Account Information"
-msgstr "Informaci&oacute;n"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:16
+msgid ""
+"Collaborative description: these fields can be viewed and modified by every "
+"users"
+msgstr ""
 
-#: ..\..\..\password.php:62
-#, php-format
-msgid "New password generated and sent to %s"
-msgstr "Se ha creado una nueva clave y se ha enviado a %s"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:18
+#: data/templates/default/bookmarks.tpl.php:159
+#: data/templates/default/editbookmark.tpl.php:51
+msgid "Title"
+msgstr "T&iacute;tulo"
 
-#: ..\..\..\password.php:69
-#, fuzzy
-msgid "Forgotten Password"
-msgstr "Nueva clave"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:23
+#: data/templates/default/editbookmark.tpl.php:57
+#: data/templates/default/editprofile.tpl.php:53
+#: data/templates/default/profile.tpl.php:33
+#: data/templates/default/tagcommondescriptionedit.tpl.php:13
+#: data/templates/default/tagedit.tpl.php:12
+msgid "Description"
+msgstr "Descripci&oacute;n"
 
-#: ..\..\..\populartags.php:54
-#: ..\..\..\templates\dynamictags.inc.php:101
-#: ..\..\..\templates\sidebar.block.common.php:9
-#: ..\..\..\templates\sidebar.block.popular.php:15
-#: ..\..\..\templates\sidebar.block.recent.php:25
-msgid "Popular Tags"
-msgstr "M&aacute;s visitadas"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:31
+#: data/templates/default/tagcommondescriptionedit.tpl.php:21
+msgid "Last modification:"
+msgstr ""
 
-#: ..\..\..\profile.php:54
-#: ..\..\..\watched.php:114
-msgid "Username was not specified"
-msgstr "Usuario no introducido"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:43
+#: data/templates/default/tagcommondescriptionedit.tpl.php:33
+#: data/templates/default/tagedit.tpl.php:18
+msgid "Update"
+msgstr ""
 
-#: ..\..\..\profile.php:60
-#, fuzzy
-msgid "My Profile"
-msgstr "Mi P&eacute;rfil"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:44
+#: data/templates/default/editbookmark.tpl.php:111
+#: data/templates/default/tag2tagadd.tpl.php:24
+#: data/templates/default/tag2tagedit.tpl.php:38
+#: data/templates/default/tagcommondescriptionedit.tpl.php:34
+#: data/templates/default/tagedit.tpl.php:19
+#: data/templates/default/tagrename.tpl.php:25
+msgid "Cancel"
+msgstr ""
 
-#: ..\..\..\profile.php:62
-#: ..\..\..\templates\sidebar.block.profile.php:12
-msgid "Profile"
-msgstr "P&eacute;rfil"
+#: data/templates/default/bookmarklet.inc.php:1
+msgid "Bookmarklet"
+msgstr "Marcadores"
 
-#: ..\..\..\profile.php:80
-msgid "Password and confirmation do not match."
-msgstr "La clave y su confirmaci&oacute;n no es correcta."
+#: data/templates/default/bookmarklet.inc.php:11
+#, 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 ""
+"Arrastre los enlaces a los marcadores de su navegador y pulselos siempre que "
+"usted desee agregar la pagina que esta viendo a %s"
 
-#: ..\..\..\profile.php:84
-msgid "Password must be at least 6 characters long."
-msgstr "La clave debe tener al menos 6 acracteres."
+#: data/templates/default/bookmarklet.inc.php:20
+#, 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 ""
+"Arrastre los enlaces a los marcadores de su navegador y pulselos siempre que "
+"usted desee agregar la pagina que esta viendo a %s"
 
-#: ..\..\..\profile.php:88
-msgid "E-mail address is not valid."
-msgstr "Correo incorrecto."
+#: data/templates/default/bookmarklet.inc.php:67
+#: data/templates/default/bookmarklet.inc.php:100
+#, php-format
+msgid "Post to %s"
+msgstr "Agregar a %s"
 
-#: ..\..\..\profile.php:92
-msgid "An error occurred while saving your changes."
-msgstr "Ha habido un error al guardar los cambios."
+#: data/templates/default/bookmarklet.inc.php:93
+#: data/templates/default/bookmarklet.inc.php:110
+#, php-format
+msgid "Post to %s (Pop-up)"
+msgstr "Agregar a %s (Pop-up)"
 
-#: ..\..\..\profile.php:94
-msgid "Changes saved."
-msgstr "Cambios guardados."
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:24
+#, php-format
+msgid "Voting <span class=\"voting\">%d</span>"
+msgstr ""
 
-#: ..\..\..\register.php:33
-#, fuzzy
-msgid "You <em>must</em> enter a username, password and e-mail address."
-msgstr "Debe  <em>especificar</em> usuario, clave, nombre y <abbr title=\"electronic mail\">correo electr&oacute;nico</abbr>."
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:32
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:35
+msgid "Vote for"
+msgstr ""
 
-#: ..\..\..\register.php:37
-msgid "This username already exists, please make another choice."
-msgstr "Este usuario ya existe, por favor introduzca otro."
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:43
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:46
+msgid "Vote against"
+msgstr ""
 
-#: ..\..\..\register.php:41
-#, fuzzy
-msgid "E-mail address is not valid. Please try again."
-msgstr "Correo incorrecto."
+#: data/templates/default/bookmarks.tpl.php:43
+msgid "Bookmarks on this page are managed by an admin user."
+msgstr ""
 
-#: ..\..\..\register.php:50
-msgid "You have successfully registered. Enjoy!"
-msgstr "El registro ha sido correcto. Puede continuar!"
+#: data/templates/default/bookmarks.tpl.php:73
+#: data/templates/default/bookmarks.tpl.php:74
+msgid "Edit the common description of this tag"
+msgstr ""
 
-#: ..\..\..\register.php:52
-msgid "Registration failed. Please try again."
-msgstr "Registro erroneo. Por favor intentelo de nuevo."
+#: data/templates/default/bookmarks.tpl.php:77
+#: data/templates/default/bookmarks.tpl.php:78
+msgid "Edit the common description of this bookmark"
+msgstr ""
 
-#: ..\..\..\register.php:57
-#: ..\..\..\templates\register.tpl.php:32
-#: ..\..\..\templates\toolbar.inc.php:27
-msgid "Register"
-msgstr "Registrarse"
+#: data/templates/default/bookmarks.tpl.php:98
+#: data/templates/default/bookmarks.tpl.php:99
+msgid "Edit your personal description of this tag"
+msgstr ""
 
-#: ..\..\..\search.inc.php:29
-#: ..\..\..\search.inc.php:57
-msgid "Search"
-msgstr "Buscar"
+#: data/templates/default/bookmarks.tpl.php:115
+#: data/templates/default/tags.tpl.php:10
+#: data/templates/default/users.tpl.php:8
+msgid "Sort by:"
+msgstr "Por:"
 
-#: ..\..\..\search.inc.php:35
-#, fuzzy
-msgid "this user's bookmarks"
-msgstr "enlaces de %s"
+#: data/templates/default/bookmarks.tpl.php:157
+msgid "Date"
+msgstr "Fecha"
 
-#: ..\..\..\search.inc.php:40
-msgid "my bookmarks"
-msgstr "mis enlaces"
+#: data/templates/default/bookmarks.tpl.php:162
+msgid "Voting"
+msgstr ""
 
-#: ..\..\..\search.inc.php:41
-#, fuzzy
-msgid "my watchlist"
-msgstr "mis consultados"
+#: data/templates/default/bookmarks.tpl.php:171
+msgid "Bookmarks from other users for this tag"
+msgstr ""
 
-#: ..\..\..\search.inc.php:45
-msgid "all bookmarks"
-msgstr "todos"
+#: data/templates/default/bookmarks.tpl.php:176
+msgid "Only your bookmarks for this tag"
+msgstr ""
 
-#: ..\..\..\search.inc.php:48
-msgid "for"
-msgstr "por"
+#: data/templates/default/bookmarks.tpl.php:199
+#: data/templates/default/bookmarks.tpl.php:205
+msgid "First"
+msgstr "Primera"
 
-#: ..\..\..\search.php:91
-#: ..\..\..\search.php:128
-msgid "Search Bookmarks"
-msgstr "Buscar Enlaces"
+#: data/templates/default/bookmarks.tpl.php:200
+#: data/templates/default/bookmarks.tpl.php:206
+msgid "Previous"
+msgstr "Anterior"
 
-#: ..\..\..\search.php:97
-msgid "Search Results"
-msgstr "Buscar Resultados"
+#: data/templates/default/bookmarks.tpl.php:213
+#: data/templates/default/bookmarks.tpl.php:216
+msgid "Next"
+msgstr "Siguiente"
 
-#: ..\..\..\tags.php:38
-#: ..\..\..\templates\editbookmark.tpl.php:44
-#: ..\..\..\templates\sidebar.block.profile.php:13
-msgid "Tags"
-msgstr "Etiquetas"
+#: data/templates/default/bookmarks.tpl.php:214
+#: data/templates/default/bookmarks.tpl.php:217
+msgid "Last"
+msgstr "&Uacute;ltima"
 
-#: ..\..\..\watch.php:79
+#: data/templates/default/bookmarks.tpl.php:233
 #, php-format
-msgid "%s Bookmarks"
-msgstr "Enlace de %s"
-
-#: ..\..\..\watch.php:84
-msgid "User removed from your watchlist"
-msgstr "Usuario borrado de consultados"
-
-#: ..\..\..\watch.php:86
-msgid "User added to your watchlist"
-msgstr "Usuario agregado a consultados"
-
-#: ..\..\..\watched.php:105
-#, fuzzy
-msgid "My Watchlist"
-msgstr "Mis Consultados"
+msgid "Page %d of %d"
+msgstr "P&aacute;gina %d de %d"
 
-#: ..\..\..\watched.php:107
-#: ..\..\..\templates\sidebar.block.profile.php:14
-#: ..\..\..\templates\toolbar.inc.php:12
+#: data/templates/default/bookmarks.tpl.php:295
 #, fuzzy
-msgid "Watchlist"
-msgstr "Consultados"
-
-#: ..\..\..\templates\about.tpl.php:6
-msgid "<strong>Store</strong> all your favourite links in one place, accessible from anywhere."
-msgstr "<strong>Guarde</strong> todos sus enlaces favoritos en un lugar y acceda desde donde quiera."
-
-#: ..\..\..\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>Comparte</strong> tus enlaces, solo con los amigos de la lista de consultados o mant&eacute;ngalos privados.."
-
-#: ..\..\..\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>Etiquete</strong> sus enlaces con tantas etiquetas como usted desea, en lugar de pellearse con las carpetas."
-
-#: ..\..\..\templates\about.tpl.php:9
-#, php-format
-msgid "<strong><a href=\"register.php\">Register now</a></strong> to start using %s!"
-msgstr "<strong><a href=\"register.php\">Registrese ahora</a></strong> para usar %s!"
-
-#: ..\..\..\templates\about.tpl.php:12
-msgid "Geek Stuff"
-msgstr "Adelante"
-
-#: ..\..\..\templates\about.tpl.php:14
-#, php-format
-msgid "%s is based on <a href=\"http://sourceforge.net/projects/scuttle/\">an open-source project</a> licensed under the <a href=\"http://www.gnu.org/copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> General Public License</a>. This means you can host it on your own web server for free, whether it is on the Internet, a private network or just your own computer."
-msgstr "%s esta basado en <a href=\"http://sourceforge.net/projects/scuttle/\">un proyecto de codigo abierto</a> licenciado bajo <a href=\"http://www.gnu.org/copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> General Public License</a>. Esto quiere decir que usted puede instalarlo en su propio web server para uso libre, en una red privada o en su propia computadora."
-
-#: ..\..\..\templates\about.tpl.php:15
-#, php-format
-msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 esta basado en la <a href=\"http://www.delicious.com/help/api\"><abbr title=\"Application Programming Interface\">API</abbr></a> de <a href=\"http://www.delicious.com/help/api\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></a>. La mayor&iacute;a de las herramientas utilizadas para construir este sistema se pueden modificar para trabajar con %1$s. Si usted encuentra una herramienta en la que no puede modificar la direccion de la API, pregunte al creador si puede cambiar esta configuraci&oacute;n. Nunca se sabe, puede que ya se haya cambiado esa configuraci&oacute;n."
-
-#: ..\..\..\templates\bookmarks.tpl.php:17
-#: ..\..\..\templates\tags.tpl.php:7
-msgid "Sort by:"
-msgstr "Por:"
-
-#: ..\..\..\templates\bookmarks.tpl.php:18
-msgid "Date"
-msgstr "Fecha"
-
-#: ..\..\..\templates\bookmarks.tpl.php:19
-#: ..\..\..\templates\editbookmark.tpl.php:34
-msgid "Title"
-msgstr "T&iacute;tulo"
-
-#: ..\..\..\templates\bookmarks.tpl.php:23
-msgid "URL"
-msgstr "URL"
+msgid "Tags:"
+msgstr "Etiquetas"
 
-#: ..\..\..\templates\bookmarks.tpl.php:60
+#: data/templates/default/bookmarks.tpl.php:302
 msgid "Edit"
 msgstr "Editar"
 
-#: ..\..\..\templates\bookmarks.tpl.php:60
-msgid "Delete"
-msgstr "Borrar"
+#: data/templates/default/bookmarks.tpl.php:310
+msgid "Last update"
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:66
+#: data/templates/default/bookmarks.tpl.php:313
 msgid "by"
 msgstr "por"
 
-#: ..\..\..\templates\bookmarks.tpl.php:78
+#: data/templates/default/bookmarks.tpl.php:317
+msgid "you"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:333
 #, fuzzy, php-format
 msgid " and %s1 other%s"
 msgstr " y %s mas"
 
-#: ..\..\..\templates\bookmarks.tpl.php:81
+#: data/templates/default/bookmarks.tpl.php:336
 #, fuzzy, php-format
 msgid " and %2$s%1$s others%3$s"
 msgstr " y %s mas"
 
-#: ..\..\..\templates\bookmarks.tpl.php:90
+#: data/templates/default/bookmarks.tpl.php:350
+#, fuzzy
+msgid "Copy this bookmark to YOUR bookmarks."
+msgstr "Improtar enlaces de un archivo"
+
+#: data/templates/default/bookmarks.tpl.php:351
 msgid "Copy"
 msgstr "Copiar"
 
-#: ..\..\..\templates\bookmarks.tpl.php:136
-#: ..\..\..\templates\bookmarks.tpl.php:142
-msgid "First"
-msgstr "Primera"
-
-#: ..\..\..\templates\bookmarks.tpl.php:137
-#: ..\..\..\templates\bookmarks.tpl.php:143
-msgid "Previous"
-msgstr "Anterior"
+#: data/templates/default/bookmarks.tpl.php:376
+msgid "This bookmark is certified by an admin user."
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:150
-#: ..\..\..\templates\bookmarks.tpl.php:153
-msgid "Next"
-msgstr "Siguiente"
+#: data/templates/default/bookmarks.tpl.php:430
+#, fuzzy
+msgid "Private Note on this bookmark"
+msgstr "Usted no tiene permisos para editar este enlace"
 
-#: ..\..\..\templates\bookmarks.tpl.php:151
-#: ..\..\..\templates\bookmarks.tpl.php:154
-msgid "Last"
-msgstr "&Uacute;ltima"
+#: data/templates/default/bookmarks.tpl.php:444
+msgid "Come back to the top of this page."
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:156
-#, php-format
-msgid "Page %d of %d"
-msgstr "P&aacute;gina %d de %d"
+#: data/templates/default/bookmarks.tpl.php:444
+msgid "Top of the page"
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:160
+#: data/templates/default/bookmarks.tpl.php:450
 msgid "No bookmarks available"
 msgstr "No hay enlaces disponibles"
 
-#: ..\..\..\templates\dynamictags.inc.php:108
-#: ..\..\..\templates\sidebar.block.common.php:15
-#: ..\..\..\templates\sidebar.block.popular.php:21
-#: ..\..\..\templates\sidebar.block.recent.php:20
-#: ..\..\..\templates\tags.tpl.php:16
+#: data/templates/default/bottom.inc.php:5
+#: data/templates/default/toolbar.inc.php:15
+#: data/templates/default/toolbar.inc.php:28 www/about.php:23 www/about.php:24
+msgid "About"
+msgstr "Acerca de"
+
+#: data/templates/default/bottom.inc.php:7
+msgid "Propulsed by "
+msgstr ""
+
+#: data/templates/default/dynamictags.inc.php:56
+#: data/templates/default/sidebar.block.common.php:19
+#: data/templates/default/sidebar.block.popular.php:34
+#: data/templates/default/sidebar.block.recent.php:29
+#: data/templates/default/tags.tpl.php:19
 #, fuzzy
 msgid "bookmark"
 msgid_plural "bookmarks"
 msgstr[0] "enlace"
 msgstr[1] "enlaces"
 
-#: ..\..\..\templates\editbookmark.tpl.php:29
+#: data/templates/default/dynamictags.inc.php:105
+#: data/templates/default/sidebar.block.common.php:9
+#: data/templates/default/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.popular.php:23
+#: data/templates/default/sidebar.block.recent.php:34
+#: data/templates/default/toolbar.inc.php:27 www/populartags.php:46
+msgid "Popular Tags"
+msgstr "M&aacute;s visitadas"
+
+#: data/templates/default/dynamictags.inc.php:108
+#, fuzzy
+msgid "Popular Tags From All Users"
+msgstr "M&aacute;s visitadas"
+
+#: data/templates/default/editbookmark.tpl.php:46
 msgid "Address"
 msgstr "Direcci&oacute;n"
 
-#: ..\..\..\templates\editbookmark.tpl.php:31
-#: ..\..\..\templates\editbookmark.tpl.php:36
-#: ..\..\..\templates\editprofile.tpl.php:31
+#: data/templates/default/editbookmark.tpl.php:48
+#: data/templates/default/editbookmark.tpl.php:53
+#: data/templates/default/editprofile.tpl.php:29
+#: data/templates/default/tagrename.tpl.php:14
+#: data/templates/default/tagrename.tpl.php:19
 msgid "Required"
 msgstr "Requerido"
 
-#: ..\..\..\templates\editbookmark.tpl.php:39
-#: ..\..\..\templates\editprofile.tpl.php:47
-#: ..\..\..\templates\profile.tpl.php:28
-msgid "Description"
-msgstr "Descripci&oacute;n"
+#: data/templates/default/editbookmark.tpl.php:58
+msgid "Add Note"
+msgstr ""
 
-#: ..\..\..\templates\editbookmark.tpl.php:46
+#: data/templates/default/editbookmark.tpl.php:61
+msgid ""
+"You can use anchors to delimite attributes. for example: [publisher]blah[/"
+"publisher] "
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:64
+msgid "Suggested anchors: "
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:76
+#, fuzzy
+msgid "Private Note"
+msgstr "Privado"
+
+#: data/templates/default/editbookmark.tpl.php:78
+msgid "Just visible by you and your contacts."
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:82
+#: data/templates/default/toolbar.inc.php:10 www/tags.php:45 www/tags.php:67
+msgid "Tags"
+msgstr "Etiquetas"
+
+#: data/templates/default/editbookmark.tpl.php:86
 msgid "Comma-separated"
 msgstr "Con comas"
 
-#: ..\..\..\templates\editbookmark.tpl.php:49
-#: ..\..\..\templates\importDelicious.tpl.php:15
-#: ..\..\..\templates\importNetscape.tpl.php:16
+#: data/templates/default/editbookmark.tpl.php:90
+#: data/templates/default/tag2tagadd.tpl.php:9
+msgid ""
+"Note: use \">\" to include one tag in another. e.g.: europe>france>paris"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:94
+#: data/templates/default/tag2tagadd.tpl.php:8
+msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:97
+#: data/templates/default/importDelicious.tpl.php:15
+#: data/templates/default/importNetscape.tpl.php:16
 msgid "Privacy"
 msgstr "Permisos"
 
-#: ..\..\..\templates\editbookmark.tpl.php:52
-#: ..\..\..\templates\importDelicious.tpl.php:18
-#: ..\..\..\templates\importNetscape.tpl.php:19
+#: data/templates/default/editbookmark.tpl.php:100
+#: data/templates/default/importDelicious.tpl.php:18
+#: data/templates/default/importNetscape.tpl.php:19
 msgid "Public"
 msgstr "P&uacute;blico"
 
-#: ..\..\..\templates\editbookmark.tpl.php:53
-#: ..\..\..\templates\importDelicious.tpl.php:19
-#: ..\..\..\templates\importNetscape.tpl.php:20
+#: data/templates/default/editbookmark.tpl.php:101
 msgid "Shared with Watch List"
 msgstr "Compartido en Consultados"
 
-#: ..\..\..\templates\editbookmark.tpl.php:54
-#: ..\..\..\templates\importDelicious.tpl.php:20
-#: ..\..\..\templates\importNetscape.tpl.php:21
+#: data/templates/default/editbookmark.tpl.php:102
+#: data/templates/default/importDelicious.tpl.php:20
+#: data/templates/default/importNetscape.tpl.php:21
 msgid "Private"
 msgstr "Privado"
 
-#: ..\..\..\templates\editbookmark.tpl.php:66
+#: data/templates/default/editbookmark.tpl.php:115
 msgid "Delete Bookmark"
 msgstr "Borrar enlace"
 
-#: ..\..\..\templates\editbookmark.tpl.php:93
-msgid "Bookmarklet"
-msgstr "Marcadores"
-
-#: ..\..\..\templates\editbookmark.tpl.php:94
-#, 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 "Arrastre los enlaces a los marcadores de su navegador y pulselos siempre que usted desee agregar la pagina que esta viendo a %s"
-
-#: ..\..\..\templates\editbookmark.tpl.php:106
-#, php-format
-msgid "Post to %s"
-msgstr "Agregar a %s"
-
-#: ..\..\..\templates\editbookmark.tpl.php:107
-#, php-format
-msgid "Post to %s (Pop-up)"
-msgstr "Agregar a %s (Pop-up)"
+#: data/templates/default/editbookmark.tpl.php:120
+msgid "edit common description"
+msgstr ""
 
-#: ..\..\..\templates\editbookmark.tpl.php:111
-#: ..\..\..\templates\importDelicious.tpl.php:26
-#: ..\..\..\templates\importNetscape.tpl.php:27
+#: data/templates/default/editbookmark.tpl.php:212
+#: data/templates/default/importDelicious.tpl.php:26
+#: data/templates/default/importNetscape.tpl.php:27
+#: data/templates/default/importStructure.tpl.php:16
 msgid "Import"
 msgstr "Importar"
 
-#: ..\..\..\templates\editbookmark.tpl.php:113
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Import bookmarks from bookmark file"
 msgstr "Improtar enlaces de un archivo"
 
-#: ..\..\..\templates\editbookmark.tpl.php:113
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Internet Explorer, Mozilla Firefox and Netscape"
 msgstr "Internet Explorer, Mozilla Firefox y Netscape"
 
-#: ..\..\..\templates\editbookmark.tpl.php:114
+#: data/templates/default/editbookmark.tpl.php:215
 msgid "Import bookmarks from del.icio.us"
 msgstr "Importar los enlaces de del.icio.us"
 
-#: ..\..\..\templates\editprofile.tpl.php:10
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:11
+msgid "SSL client certificates"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:17
+msgid "Serial"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:45
+#: data/templates/default/profile.tpl.php:17
+msgid "Name"
+msgstr "Nombre"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:19
+#: data/templates/default/profile.tpl.php:11
+#, fuzzy
+msgid "Email"
+msgstr "Correo"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:20
+msgid "Issuer"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:30
+#, fuzzy
+msgid "delete"
+msgstr "Borrar"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:43
+msgid "No certificates registered"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:48
+msgid "Your current certificate is already registered with your account."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:53
+msgid "Register current certificate to automatically login."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:59
+msgid "Your browser does not provide a certificate."
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:8
 msgid "Account Details"
 msgstr "Detalles de usuario"
 
-#: ..\..\..\templates\editprofile.tpl.php:14
-#: ..\..\..\templates\login.tpl.php:15
-#: ..\..\..\templates\password.tpl.php:10
-#: ..\..\..\templates\profile.tpl.php:7
-#: ..\..\..\templates\register.tpl.php:16
+#: data/templates/default/editprofile.tpl.php:12
+#: data/templates/default/login.tpl.php:21
+#: data/templates/default/password.tpl.php:10
+#: data/templates/default/profile.tpl.php:6
+#: data/templates/default/register.tpl.php:16
 msgid "Username"
 msgstr "Usuario"
 
-#: ..\..\..\templates\editprofile.tpl.php:19
+#: data/templates/default/editprofile.tpl.php:17
 msgid "New Password"
 msgstr "Nueva clave"
 
-#: ..\..\..\templates\editprofile.tpl.php:24
+#: data/templates/default/editprofile.tpl.php:22
 #, fuzzy
 msgid "Confirm Password"
 msgstr "Confirmar la clave"
 
-#: ..\..\..\templates\editprofile.tpl.php:29
-#: ..\..\..\templates\register.tpl.php:26
+#: data/templates/default/editprofile.tpl.php:27
+#: data/templates/default/password.tpl.php:14
+#: data/templates/default/register.tpl.php:26
 msgid "E-mail"
 msgstr "Correo"
 
-#: ..\..\..\templates\editprofile.tpl.php:35
+#: data/templates/default/editprofile.tpl.php:32
+#, fuzzy
+msgid "Private RSS Feed"
+msgstr "Privado"
+
+#: data/templates/default/editprofile.tpl.php:34
+msgid "Enable"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:36
+#, fuzzy
+msgid "Generate New Key"
+msgstr "Nueva clave"
+
+#: data/templates/default/editprofile.tpl.php:41
 msgid "Personal Details"
 msgstr "Datos del usuario"
 
-#: ..\..\..\templates\editprofile.tpl.php:39
-#: ..\..\..\templates\profile.tpl.php:12
-msgid "Name"
-msgstr "Nombre"
-
-#: ..\..\..\templates\editprofile.tpl.php:43
-#: ..\..\..\templates\profile.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:49
+#: data/templates/default/profile.tpl.php:23
 msgid "Homepage"
 msgstr "P&aacute;gina web"
 
-#: ..\..\..\templates\error.404.tpl.php:5
+#: data/templates/default/editprofile.tpl.php:58 www/edit.php:113
+msgid "Save Changes"
+msgstr "Guardar Cambios"
+
+#: data/templates/default/editprofile.tpl.php:63
+#: data/templates/default/sidebar.block.tagactions.php:17
+#: data/templates/default/sidebar.block.watchstatus.php:18
+#, fuzzy
+msgid "Actions"
+msgstr "Instrucciones"
+
+#: data/templates/default/editprofile.tpl.php:66
+#, fuzzy
+msgid "Export bookmarks"
+msgstr "mis enlaces"
+
+#: data/templates/default/editprofile.tpl.php:68
+msgid "HTML file (for browsers)"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:69
+msgid "XML file (like del.icio.us)"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:70
+msgid "CSV file (for spreadsheet tools)"
+msgstr ""
+
+#: data/templates/default/error.404.tpl.php:5
 msgid "Not Found"
 msgstr "No funciona"
 
-#: ..\..\..\templates\error.404.tpl.php:6
+#: data/templates/default/error.404.tpl.php:6
 msgid "The requested URL was not found on this server"
 msgstr "No se encontr&oacute; la URL solicitada"
 
-#: ..\..\..\templates\error.500.tpl.php:5
+#: data/templates/default/error.500.tpl.php:5
 msgid "General server error"
 msgstr "Error general del servidor"
 
-#: ..\..\..\templates\error.500.tpl.php:6
+#: data/templates/default/error.500.tpl.php:6
 msgid "The requested URL could not be processed"
 msgstr "La URL solicitada no puede ser encontrada"
 
-#: ..\..\..\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 "Registrese para <a href=\"http://del.icio.us/api/posts/all\">exportar la pagina a del.icio.us</a>"
+#: data/templates/default/importDelicious.tpl.php:19
+#: data/templates/default/importNetscape.tpl.php:20
+#, fuzzy
+msgid "Shared with Watchlist"
+msgstr "Compartido en Consultados"
 
-#: ..\..\..\templates\importDelicious.tpl.php:34
-msgid "Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> file to your computer"
-msgstr "Guardar los resultados en un archivo <abbr title=\"Extensible Markup Language\">XML</abbr> de su ordenador"
+#: data/templates/default/importDelicious.tpl.php:31
+#: data/templates/default/importNetscape.tpl.php:32
+#: data/templates/default/importStructure.tpl.php:21
+msgid "Instructions"
+msgstr "Instrucciones"
 
-#: ..\..\..\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 "Pulse <kbd>Examinar...</kbd> para buscar el archivo en su ordenador. El tamaño maximo no puede ser superior a 1MB"
+#: data/templates/default/importDelicious.tpl.php:33
+#, fuzzy
+msgid ""
+"Log in to the <a href=\"https://api.del.icio.us/v1/posts/all\">export page "
+"at del.icio.us</a>"
+msgstr ""
+"Registrese para <a href=\"http://del.icio.us/api/posts/all\">exportar la "
+"pagina a del.icio.us</a>"
 
-#: ..\..\..\templates\importDelicious.tpl.php:36
-#: ..\..\..\templates\importNetscape.tpl.php:43
+#: data/templates/default/importDelicious.tpl.php:34
+msgid ""
+"Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> "
+"file to your computer"
+msgstr ""
+"Guardar los resultados en un archivo <abbr title=\"Extensible Markup Language"
+"\">XML</abbr> de su ordenador"
+
+#: data/templates/default/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 ""
+"Pulse <kbd>Examinar...</kbd> para buscar el archivo en su ordenador. El "
+"tamaño maximo no puede ser superior a 1MB"
+
+#: data/templates/default/importDelicious.tpl.php:36
+#: data/templates/default/importNetscape.tpl.php:43
 msgid "Select the default privacy setting for your imported bookmarks"
 msgstr "Elija los permisos para los enlaces importados"
 
-#: ..\..\..\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 "Pulse <kbd>Importar</kbd> para comenzar a importar los enlaces, esto puede tartar algunos minutos"
-
-#: ..\..\..\templates\importNetscape.tpl.php:32
-msgid "Instructions"
-msgstr "Instrucciones"
+#: data/templates/default/importDelicious.tpl.php:37
+#: data/templates/default/importNetscape.tpl.php:44
+msgid ""
+"Click <kbd>Import</kbd> to start importing the bookmarks; it may take a "
+"minute"
+msgstr ""
+"Pulse <kbd>Importar</kbd> para comenzar a importar los enlaces, esto puede "
+"tartar algunos minutos"
 
-#: ..\..\..\templates\importNetscape.tpl.php:35
+#: data/templates/default/importNetscape.tpl.php:35
 msgid "Export your bookmarks from your browser to a file"
 msgstr "Expote sus enlaces a su navegador a un archivo"
 
-#: ..\..\..\templates\importNetscape.tpl.php:37
-msgid "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
-msgstr "Internet Explorer: <kbd>Archivo &gt; Importar y Exportar... &gt; Exportar Favoritos"
+#: data/templates/default/importNetscape.tpl.php:37
+msgid ""
+"Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
+msgstr ""
+"Internet Explorer: <kbd>Archivo &gt; Importar y Exportar... &gt; Exportar "
+"Favoritos"
 
-#: ..\..\..\templates\importNetscape.tpl.php:38
-msgid "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; Export..."
-msgstr "Mozilla Firefox: <kbd>Enlaces &gt; Manejar Enlaces... &gt; Archivo &gt; Exportar..."
+#: data/templates/default/importNetscape.tpl.php:38
+msgid ""
+"Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
+"Export..."
+msgstr ""
+"Mozilla Firefox: <kbd>Enlaces &gt; Manejar Enlaces... &gt; Archivo &gt; "
+"Exportar..."
 
-#: ..\..\..\templates\importNetscape.tpl.php:39
-msgid "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
-msgstr "Netscape: <kbd>Enlaces &gt; Manejar Enlaces... &gt; Utilidades &gt; Exportar..."
+#: data/templates/default/importNetscape.tpl.php:39
+msgid ""
+"Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
+msgstr ""
+"Netscape: <kbd>Enlaces &gt; Manejar Enlaces... &gt; Utilidades &gt; "
+"Exportar..."
+
+#: data/templates/default/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 ""
+"Pulse <kbd>Examinar...</kbd> para buscar los enlaces guardados en un archivo "
+"de us ordenador. El tamaño maximo no puede ser superior a 1MB"
+
+#: data/templates/default/importStructure.tpl.php:24
+msgid "Create your structure into a simple text file and following this model:"
+msgstr ""
 
-#: ..\..\..\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 "Pulse <kbd>Examinar...</kbd> para buscar los enlaces guardados en un archivo de us ordenador. El tamaño maximo no puede ser superior a 1MB"
+#: data/templates/default/importStructure.tpl.php:35
+msgid ""
+"Then import the file. The tags and their relations will be added to your "
+"profile."
+msgstr ""
+
+#: data/templates/default/login.tpl.php:13
+msgid "Please activate cookies"
+msgstr ""
 
-#: ..\..\..\templates\login.tpl.php:20
-#: ..\..\..\templates\register.tpl.php:21
+#: data/templates/default/login.tpl.php:26
+#: data/templates/default/register.tpl.php:21
 msgid "Password"
 msgstr "Clave"
 
-#: ..\..\..\templates\login.tpl.php:22
+#: data/templates/default/login.tpl.php:28
 msgid "Don't ask for my password for 2 weeks"
 msgstr "Recordar mi clave 2 semanas"
 
-#: ..\..\..\templates\login.tpl.php:30
+#: data/templates/default/login.tpl.php:32
+#: data/templates/default/toolbar.inc.php:29 www/login.php:57
+msgid "Log In"
+msgstr "Acceder"
+
+#: data/templates/default/login.tpl.php:36
 msgid "Forgotten your password?"
 msgstr "Olvido su clave?"
 
-#: ..\..\..\templates\password.tpl.php:5
+#: data/templates/default/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 olvido su clave, %s puede crearle una nueva. Introduzca su direccion de correo electr&oacute;nico de su perfil en el formulario siguiente y se le enviara una nueva clave"
-
-#: ..\..\..\templates\password.tpl.php:14
-msgid "<abbr title=\"Electronic mail\">E-mail</abbr>"
-msgstr "<abbr title=\"Electronic mail\">Correo</abbr>"
+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 olvido su clave, %s puede crearle una nueva. Introduzca su direccion de "
+"correo electr&oacute;nico de su perfil en el formulario siguiente y se le "
+"enviara una nueva clave"
 
-#: ..\..\..\templates\password.tpl.php:19
+#: data/templates/default/password.tpl.php:19
 #, fuzzy
 msgid "Generate Password"
 msgstr "Nueva clave"
 
-#: ..\..\..\templates\profile.tpl.php:23
+#: data/templates/default/profile.tpl.php:28
 msgid "Member Since"
 msgstr "Miembro desde"
 
-#: ..\..\..\templates\profile.tpl.php:35
-#: ..\..\..\templates\sidebar.block.watchlist.php:8
+#: data/templates/default/profile.tpl.php:40
+#: data/templates/default/sidebar.block.watchlist.php:30
 #, fuzzy
 msgid "Watching"
 msgstr "Consultados"
 
-#: ..\..\..\templates\profile.tpl.php:50
+#: data/templates/default/profile.tpl.php:55
+#: data/templates/default/sidebar.block.watchlist.php:52
 msgid "Watched By"
 msgstr "Consultado de"
 
-#: ..\..\..\templates\register.tpl.php:11
+#: data/templates/default/profile.tpl.php:68
+#: data/templates/default/toolbar.inc.php:9
+#, fuzzy
+msgid "Bookmarks"
+msgstr "Enlaces"
+
+#: data/templates/default/profile.tpl.php:69
+#, fuzzy
+msgid "Go to bookmarks"
+msgstr "mis enlaces"
+
+#: data/templates/default/register.tpl.php:11
 #, php-format
-msgid "Sign up here to create a free %s account. All the information requested below is required"
-msgstr "Inserte los datos para crear una cuenta gratis en %s. Es cesaria toda la informacion requerida"
+msgid ""
+"Sign up here to create a free %s account. All the information requested "
+"below is required"
+msgstr ""
+"Inserte los datos para crear una cuenta gratis en %s. Es cesaria toda la "
+"informacion requerida"
 
-#: ..\..\..\templates\rss.tpl.php:9
-#, fuzzy, php-format
-msgid "Recent bookmarks posted to %s"
-msgstr "Enlaces recientes agregados a %s"
+#: data/templates/default/register.tpl.php:18
+msgid ""
+" at least 5 characters, alphanumeric (no spaces, no dots or other special "
+"ones)"
+msgstr ""
 
-#: ..\..\..\templates\rss.tpl.php:17
-#: ..\..\..\templates\rss.tpl.php:19
-msgid "No bookmarks found"
-msgstr "No se han encontrado enlaces"
+#: data/templates/default/register.tpl.php:28
+msgid " to send you your password if you forget it"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:33
+msgid "Antispam question"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:41
+#: data/templates/default/toolbar.inc.php:31 www/register.php:99
+msgid "Register"
+msgstr "Registrarse"
+
+#: data/templates/default/search.menu.php:27
+#, fuzzy
+msgid "Search..."
+msgstr "Buscar"
+
+#: data/templates/default/search.menu.php:28
+#, fuzzy
+msgid "in"
+msgstr "L&iacute;nea"
+
+#: data/templates/default/search.menu.php:34
+#, fuzzy
+msgid "this user's bookmarks"
+msgstr "enlaces de %s"
+
+#: data/templates/default/search.menu.php:39
+msgid "my bookmarks"
+msgstr "mis enlaces"
+
+#: data/templates/default/search.menu.php:40
+#, fuzzy
+msgid "my watchlist"
+msgstr "mis consultados"
+
+#: data/templates/default/search.menu.php:44
+msgid "all bookmarks"
+msgstr "todos"
 
-#: ..\..\..\templates\sidebar.block.recent.php:15
+#: data/templates/default/search.menu.php:54
+msgid "Search"
+msgstr "Buscar"
+
+#: data/templates/default/sidebar.block.linked.php:23
+#, fuzzy
+msgid "Linked Tags"
+msgstr "Etiquetas mencionadas"
+
+#: data/templates/default/sidebar.block.linked.php:28
+#: data/templates/default/sidebar.block.menu.php:46
+msgid "Add new link"
+msgstr ""
+
+#: data/templates/default/sidebar.block.linked.php:29
+#: data/templates/default/sidebar.block.menu.php:47
+#, fuzzy
+msgid "Delete link"
+msgstr "Borrar"
+
+#: data/templates/default/sidebar.block.menu.php:35
+#, php-format
+msgid "Tags included into the tag '%s'"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:35
+#, fuzzy
+msgid "Menu Tags"
+msgstr "Recientes"
+
+#: data/templates/default/sidebar.block.menu.php:68
+msgid "See all your tags"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:68
+msgid "all your tags"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:70
+msgid "See all tags from this user"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:70
+msgid "all tags from this user"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:74
+#, fuzzy
+msgid "See popular tags"
+msgstr "M&aacute;s visitadas"
+
+#: data/templates/default/sidebar.block.menu2.php:21
+#, fuzzy
+msgid "Featured Menu Tags"
+msgstr "Etiquetas mencionadas"
+
+#: data/templates/default/sidebar.block.menu2.php:25
+msgid "This menu is composed of keywords (tags) organized by admins."
+msgstr ""
+
+#: data/templates/default/sidebar.block.recent.php:18
 msgid "Recent Tags"
 msgstr "Recientes"
 
-#: ..\..\..\templates\sidebar.block.related.php:15
+#: data/templates/default/sidebar.block.related.php:26
 msgid "Related Tags"
 msgstr "Etiquetas mencionadas"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:10
+#: data/templates/default/sidebar.block.search.php:28
+#, fuzzy
+msgid "Last Searches"
+msgstr "Buscar"
+
+#: data/templates/default/sidebar.block.search.php:40
+#, fuzzy
+msgid "Number of bookmarks for this query"
+msgstr "No se han encontrado enlaces"
+
+#: data/templates/default/sidebar.block.tagactions.php:9 www/tagrename.php:72
+#, fuzzy
+msgid "Rename Tag"
+msgid_plural "Rename Tags"
+msgstr[0] "Etiquetas mencionadas"
+msgstr[1] "Etiquetas mencionadas"
+
+#: data/templates/default/sidebar.block.tagactions.php:22 www/tagdelete.php:54
+#, fuzzy
+msgid "Delete Tag"
+msgstr "Borrar"
+
+#: data/templates/default/sidebar.block.tagactions.php:24 www/tagedit.php:61
+#, fuzzy
+msgid "Edit Tag Description"
+msgstr "Descripci&oacute;n"
+
+#: data/templates/default/sidebar.block.tagactions.php:26
+#: www/tagcommondescriptionedit.php:76
+msgid "Edit Tag Common Description"
+msgstr ""
+
+#: data/templates/default/sidebar.block.tagactions.php:28
+msgid "Create a link to another tag"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:14
+msgid "New Users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:23
+#: data/templates/default/users.tpl.php:24
+#, fuzzy
+msgid "bookmarks"
+msgstr "enlace"
+
+#: data/templates/default/sidebar.block.users.php:30
+msgid "See all users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:30
+msgid "All users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:19
+msgid "Close contacts are mutual contacts"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:19
+msgid "Close contacts"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:36
+msgid "Add a contact..."
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:36
+msgid "Type a username to add it to your contacts."
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:44
+#, fuzzy
+msgid "Remove this contact"
+msgstr "Borrar de Consultados"
+
+#: data/templates/default/sidebar.block.watchstatus.php:11
 msgid "Remove from Watchlist"
 msgstr "Borrar de Consultados"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:12
+#: data/templates/default/sidebar.block.watchstatus.php:13
 msgid "Add to Watchlist"
 msgstr "Agregar a Consultados"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:17
+#: data/templates/default/sidebar.linkedtags.inc.php:18
 #, fuzzy
-msgid "Actions"
-msgstr "Instrucciones"
+msgid "Edit link"
+msgstr "Editar"
+
+#: data/templates/default/sidebar.linkedtags.inc.php:47
+msgid "Synonyms:"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:12
+msgid "Create new link:"
+msgstr ""
+
+#: data/templates/default/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 ""
+
+#: data/templates/default/tag2tagadd.tpl.php:23
+#: data/templates/default/tag2tagedit.tpl.php:37
+msgid "Create"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:35
+#: data/templates/default/tag2tagdelete.tpl.php:27
+#: data/templates/default/tag2tagedit.tpl.php:51
+msgid "Existing links:"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:53
+#: data/templates/default/tag2tagdelete.tpl.php:45
+#: data/templates/default/tag2tagedit.tpl.php:69
+msgid "No links"
+msgstr ""
+
+#: data/templates/default/tag2tagdelete.tpl.php:15
+#: data/templates/default/tag2tagedit.tpl.php:16
+#: data/templates/default/tagdelete.tpl.php:8 www/jsScuttle.php:24
+msgid "Yes"
+msgstr "Si"
+
+#: data/templates/default/tag2tagdelete.tpl.php:16
+#: data/templates/default/tag2tagedit.tpl.php:17
+#: data/templates/default/tagdelete.tpl.php:9 www/jsScuttle.php:24
+msgid "No"
+msgstr "No"
+
+#: data/templates/default/tag2tagedit.tpl.php:6
+msgid "Delete the link"
+msgstr ""
+
+#: data/templates/default/tag2tagedit.tpl.php:29
+msgid "Create new link"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:12
+msgid "Old"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:17
+msgid "New"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:24
+#, fuzzy
+msgid "Rename"
+msgstr "Usuario"
 
-#: ..\..\..\templates\tags.tpl.php:8
+#: data/templates/default/tags.tpl.php:11
+#: data/templates/default/users.tpl.php:9
 msgid "Alphabet"
 msgstr "Alfab&eacute;tico"
 
-#: ..\..\..\templates\tags.tpl.php:9
+#: data/templates/default/tags.tpl.php:12
+#: data/templates/default/users.tpl.php:10
 #, fuzzy
 msgid "Popularity"
 msgstr "Mas visitadas"
 
-#: ..\..\..\templates\toolbar.inc.php:11
+#: data/templates/default/toolbar.inc.php:8
+#: data/templates/default/toolbar.inc.php:26
 #, fuzzy
-msgid "Bookmarks"
-msgstr "Enlaces"
+msgid "Home"
+msgstr "P&aacute;gina web"
+
+#: data/templates/default/toolbar.inc.php:11 www/watchlist.php:106
+#, fuzzy
+msgid "Watchlist"
+msgstr "Consultados"
+
+#: data/templates/default/toolbar.inc.php:12 www/profile.php:79
+msgid "Profile"
+msgstr "P&eacute;rfil"
+
+#: data/templates/default/toolbar.inc.php:13 www/bookmarks.php:215
+msgid "Add a Bookmark"
+msgstr "Agregar"
 
-#: ..\..\..\templates\toolbar.inc.php:16
+#: data/templates/default/toolbar.inc.php:14
 msgid "Log Out"
 msgstr "Salir"
 
+#: data/templates/default/toolbar.inc.php:17
+msgid "Admin"
+msgstr ""
+
+#: data/templates/default/top.inc.php:57
+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/default/users.tpl.php:20
+#, fuzzy
+msgid "profile"
+msgstr "P&eacute;rfil"
+
+#: data/templates/default/users.tpl.php:21
+msgid "created in"
+msgstr ""
+
+#: www/admin.php:32
+msgid "Manage users"
+msgstr ""
+
+#: www/admin.php:69
+#, php-format
+msgid "%s and all his bookmarks and tags were deleted."
+msgstr ""
+
+#: www/admin.php:76
+msgid "Problem with "
+msgstr ""
+
+#: www/ajaxDelete.php:37
+msgid "You are not allowed to delete this bookmark"
+msgstr "No puede borrar estos enlaces"
+
+#: www/ajaxDelete.php:41 www/edit.php:103
+msgid "Failed to delete bookmark"
+msgstr "Error al borrar los enlaces"
+
+#: www/alltags.php:50
+msgid "All Tags"
+msgstr "Todas"
+
+#: www/alltags.php:56 www/bookmarks.php:99 www/populartags.php:52
+#: www/profile.php:55 www/rss.php:100 www/search.php:111 www/watch.php:45
+#: www/watchlist.php:61
+#, fuzzy, php-format
+msgid "User with username %s was not found"
+msgstr "No se encontro el usuario %s"
+
+#: 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 ""
+
+#: www/bookmarkcommondescriptionedit.php:60
+msgid "Bookmark common description updated"
+msgstr ""
+
+#: www/bookmarkcommondescriptionedit.php:63
+#, fuzzy
+msgid "Failed to update the bookmark common description"
+msgstr "Fallo al borrar el enlace"
+
+#: www/bookmarkcommondescriptionedit.php:71
+msgid "Edit Bookmark Common Description"
+msgstr ""
+
+#: www/bookmarks.php:114 www/tags.php:47
+msgid "Remove the tag from the selection"
+msgstr ""
+
+#: www/bookmarks.php:134 www/edit.php:65
+msgid "Your bookmark must have a title and an address"
+msgstr "Su enlace debe tener un t&iacute;tulo y una direcci&oacute;n"
+
+#: www/bookmarks.php:139
+msgid "This bookmark URL may not be added"
+msgstr ""
+
+#: www/bookmarks.php:158 www/edit.php:83 www/edit.php:86
+msgid "Bookmark saved"
+msgstr "Enlace salvado"
+
+#: www/bookmarks.php:158
+msgid "(Come back to previous page.)"
+msgstr ""
+
+#: www/bookmarks.php:165 www/import.php:106 www/importNetscape.php:108
+msgid ""
+"There was an error saving your bookmark. Please try again or contact the "
+"administrator."
+msgstr ""
+"Hay un error al salvar su enlace. Por favor intentelo de nuevo o contacte "
+"con el administrador."
+
+#: www/bookmarks.php:222
+msgid "Add Bookmark"
+msgstr "Agregar Enlace"
+
+#: www/bookmarks.php:225
+msgid "You must be logged in before you can add bookmarks."
+msgstr ""
+"Debe introducir su usuario y contrase&ntilde;a para poder agregar enlaces"
+
+#: www/bookmarks.php:270
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: www/bookmarks.php:283
+#, php-format
+msgid "%s: %s (+private %s)"
+msgstr ""
+
+#: www/bookmarks.php:305 www/bookmarks.php:306
+msgid "My Bookmarks"
+msgstr "Mis Enlaces"
+
+#: www/edit.php:44 www/edit.php:45
+msgid "Edit Bookmark"
+msgstr "Editar enlace"
+
+#: www/edit.php:51
+#, php-format
+msgid "Bookmark with id %s not was not found"
+msgstr "El enlace con id %s no funciona"
+
+#: www/edit.php:57
+msgid "You are not allowed to edit this bookmark"
+msgstr "Usted no tiene permisos para editar este enlace"
+
+#: www/edit.php:77
+msgid "Error while saving your bookmark"
+msgstr "Se ha producido un error al salvar su enlace"
+
+#: www/history.php:61
+msgid "History"
+msgstr "Historial"
+
+#: www/history.php:62
+#, php-format
+msgid "History for %s"
+msgstr "Historial de %s"
+
+#: www/history.php:84
+msgid "Address was not found"
+msgstr "La direcci&oacute;n no existe"
+
+#: www/import.php:47
+msgid "Could not open XML input"
+msgstr "No se pude abrir la entrada XML"
+
+#: www/import.php:51
+#, php-format
+msgid "XML error: %s at line %d"
+msgstr "Errores: %s en la linea %d del XML"
+
+#: www/import.php:60
+msgid "Import Bookmarks from del.icio.us"
+msgstr "Importar enlaces de del.icio.us"
+
+#: www/import.php:93
+msgid "You have already submitted this bookmark."
+msgstr "Usted ya ha agregado este enlace"
+
+#: www/import.php:104
+msgid "Bookmark imported."
+msgstr "Enlaces importados."
+
+#: www/importNetscape.php:95
+#, fuzzy
+msgid "You have already submitted some of these bookmarks."
+msgstr "Usted ya ha agregado este enlace"
+
+#: www/importNetscape.php:115
+#, fuzzy
+msgid "Bookmarks found: "
+msgstr "No se han encontrado enlaces"
+
+#: www/importNetscape.php:116
+#, fuzzy
+msgid "Bookmarks imported: "
+msgstr "Enlaces importados."
+
+#: www/importNetscape.php:117 www/importNetscape.php:122
+msgid "Import Bookmarks from Browser File"
+msgstr "Importar enlaces de un Navegador"
+
+#: 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 "Usted esta ahora desconectado"
+
+#: www/index.php:46
+#, php-format
+msgid "%s: Recent bookmarks"
+msgstr "%s: Enlaces recientes"
+
+#: www/index.php:58
+#, fuzzy, php-format
+msgid "%s: Recent bookmarks (+private %s)"
+msgstr "%s: Enlaces recientes"
+
+#: www/index.php:96
+msgid "Store, share and tag your favourite links"
+msgstr "Almacene, navege y etiquete sus enlaces favoritos"
+
+#: www/index.php:97
+#, fuzzy
+msgid "All Bookmarks"
+msgstr "todos"
+
+#: www/jsScuttle.php:71
+msgid "Available"
+msgstr "Disponible"
+
+#: www/jsScuttle.php:74
+#, fuzzy
+msgid "Not Available"
+msgstr "No hay enlaces disponibles"
+
+#: www/login.php:48
+msgid "The details you have entered are incorrect. Please try again."
+msgstr "Los datos introducidos son incorrectos. Por favor intentelo de nuevo."
+
+#: www/password.php:36
+msgid "You must enter your username."
+msgstr "Introduzca su nombre de usuario"
+
+#: www/password.php:40
+#, fuzzy
+msgid ""
+"You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"Debe  <em>especificar</em> usuario, clave, nombre y <abbr title=\"electronic "
+"mail\">correo electr&oacute;nico</abbr>."
+
+#: www/password.php:48
+msgid "No matches found for that username."
+msgstr "No se encuentra ning&uacute;n usuario con ese nombre"
+
+#: www/password.php:51
+#, fuzzy
+msgid ""
+"No matches found for that combination of username and <abbr title="
+"\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"Debe  <em>especificar</em> usuario, clave, nombre y <abbr title=\"electronic "
+"mail\">correolectr&oacute;nico</abbr>."
+
+#: www/password.php:59
+#, fuzzy
+msgid ""
+"There was an error while generating your new password. Please try again."
+msgstr ""
+"Hay un error al salvar su enlace. Por favor intentelo de nuevo o contacte "
+"con el administrador."
+
+#: www/password.php:63
+#, fuzzy
+msgid "Your new password is:"
+msgstr "Confirmar la nueva clave"
+
+#: 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 ""
+"Para que sean seguros sus enlaces, debe cambiar la clave de su usuario en el "
+"siguiente acceso"
+
+#: www/password.php:66
+#, fuzzy, php-format
+msgid "%s Account Information"
+msgstr "Informaci&oacute;n"
+
+#: www/password.php:68
+#, php-format
+msgid "New password generated and sent to %s"
+msgstr "Se ha creado una nueva clave y se ha enviado a %s"
+
+#: www/password.php:75
+#, fuzzy
+msgid "Forgotten Password"
+msgstr "Nueva clave"
+
+#: www/profile.php:63 www/watchlist.php:119
+msgid "Username was not specified"
+msgstr "Usuario no introducido"
+
+#: www/profile.php:70
+#, fuzzy
+msgid "My Profile"
+msgstr "Mi P&eacute;rfil"
+
+#: www/profile.php:110
+msgid "Invalid Token"
+msgstr ""
+
+#: www/profile.php:115
+msgid "Password and confirmation do not match."
+msgstr "La clave y su confirmaci&oacute;n no es correcta."
+
+#: www/profile.php:119
+msgid "Password must be at least 6 characters long."
+msgstr "La clave debe tener al menos 6 acracteres."
+
+#: www/profile.php:123
+msgid "E-mail address is not valid."
+msgstr "Correo incorrecto."
+
+#: www/profile.php:127
+msgid "An error occurred while saving your changes."
+msgstr "Ha habido un error al guardar los cambios."
+
+#: www/profile.php:129
+msgid "Changes saved."
+msgstr "Cambios guardados."
+
+#: www/profile.php:148
+msgid "You do not have a valid SSL client certificate"
+msgstr ""
+
+#: www/profile.php:150
+msgid "This certificate is already registered"
+msgstr ""
+
+#: www/profile.php:152
+msgid "Failed to register SSL client certificate."
+msgstr ""
+
+#: www/profile.php:154
+msgid "SSL client certificate registered."
+msgstr ""
+
+#: www/profile.php:163
+msgid "Certificate not found."
+msgstr ""
+
+#: www/profile.php:165
+msgid "The certificate does not belong to you."
+msgstr ""
+
+#: www/profile.php:167
+msgid "Failed to delete SSL client certificate."
+msgstr ""
+
+#: www/profile.php:169
+msgid "SSL client certificate deleted."
+msgstr ""
+
+#: www/register.php:52
+#, fuzzy
+msgid "You <em>must</em> enter a username, password and e-mail address."
+msgstr ""
+"Debe  <em>especificar</em> usuario, clave, nombre y <abbr title=\"electronic "
+"mail\">correo electr&oacute;nico</abbr>."
+
+#: www/register.php:56
+#, fuzzy
+msgid "This username has been reserved, please make another choice."
+msgstr "Este usuario ya existe, por favor introduzca otro."
+
+#: www/register.php:60
+msgid "This username already exists, please make another choice."
+msgstr "Este usuario ya existe, por favor introduzca otro."
+
+#: www/register.php:64
+#, fuzzy
+msgid ""
+"This username is not valid (too short, too long, forbidden characters...), "
+"please make another choice."
+msgstr "Este usuario ya existe, por favor introduzca otro."
+
+#: www/register.php:68
+#, fuzzy
+msgid "E-mail address is not valid. Please try again."
+msgstr "Correo incorrecto."
+
+#: www/register.php:72
+#, fuzzy
+msgid "Antispam answer is not valid. Please try again."
+msgstr "Correo incorrecto."
+
+#: www/register.php:90
+msgid "You have successfully registered. Enjoy!"
+msgstr "El registro ha sido correcto. Puede continuar!"
+
+#: www/register.php:92
+msgid "Registration failed. Please try again."
+msgstr "Registro erroneo. Por favor intentelo de nuevo."
+
+#: www/rss.php:90 www/rss.php:111
+#, php-format
+msgid "Failed to Autenticate User with username %s using private key"
+msgstr ""
+
+#: www/rss.php:128
+#, fuzzy, php-format
+msgid "Recent bookmarks posted to %s"
+msgstr "Enlaces recientes agregados a %s"
+
+#: www/search.php:83 www/search.php:147
+msgid "Search Bookmarks"
+msgstr "Buscar Enlaces"
+
+#: www/search.php:89
+msgid "Search Results"
+msgstr "Buscar Resultados"
+
+#: www/search.php:137
+msgid "Unsatisfied? You can also try our "
+msgstr ""
+
+#: www/tag2tagadd.php:54
+msgid "Tag link created"
+msgstr ""
+
+#: www/tag2tagadd.php:57
+#, fuzzy
+msgid "Failed to create the link"
+msgstr "Fallo al borrar el enlace"
+
+#: www/tag2tagadd.php:69
+msgid "Add Tag Link"
+msgstr ""
+
+#: www/tag2tagdelete.php:66
+msgid "Tag link deleted"
+msgstr ""
+
+#: www/tag2tagdelete.php:69
+#, fuzzy
+msgid "Failed to delete the link"
+msgstr "Fallo al borrar el enlace"
+
+#: www/tag2tagdelete.php:81
+msgid "Delete Link Between Tags"
+msgstr ""
+
+#: www/tag2tagedit.php:55
+msgid "Edit Link Between Tags"
+msgstr ""
+
+#: www/tagcommondescriptionedit.php:62
+msgid "Tag common description updated"
+msgstr ""
+
+#: www/tagcommondescriptionedit.php:67
+msgid "Failed to update the tag common description"
+msgstr ""
+
+#: www/tagdelete.php:43
+msgid "Tag deleted"
+msgstr ""
+
+#: www/tagdelete.php:46
+#, fuzzy
+msgid "Failed to delete the tag"
+msgstr "Fallo al borrar el enlace"
+
+#: www/tagedit.php:52
+msgid "Tag description updated"
+msgstr ""
+
+#: www/tagedit.php:55
+#, fuzzy
+msgid "Failed to update the tag description"
+msgstr "Fallo al borrar el enlace"
+
+#: www/tagrename.php:63
+msgid "Tag renamed"
+msgstr ""
+
+#: www/tagrename.php:66
+#, fuzzy
+msgid "Failed to rename the tag"
+msgstr "Fallo al borrar el enlace"
+
+#: www/tags.php:71
+#, php-format
+msgid "%s: tagged with \"%s\""
+msgstr ""
+
+#: www/tags.php:84
+#, php-format
+msgid "%s: tagged with \"%s\" (+private %s)"
+msgstr ""
+
+#: www/users.php:31
+#, fuzzy
+msgid "Users"
+msgstr "Usuario"
+
+#: www/watch.php:54
+msgid "User removed from your watchlist"
+msgstr "Usuario borrado de consultados"
+
+#: www/watch.php:56
+msgid "User added to your watchlist"
+msgstr "Usuario agregado a consultados"
+
+#: www/watchlist.php:104
+#, fuzzy
+msgid "My Watchlist"
+msgstr "Mis Consultados"
+
+#: www/api/httpauth.inc.php:30
+msgid "Use of the API calls requires authentication."
+msgstr ""
+
+#: www/gsearch/index.php:51
+msgid "Come back to "
+msgstr ""
+
+#: www/gsearch/index.php:56
+msgid "Admin tips: "
+msgstr ""
+
+#: www/gsearch/index.php:57
+msgid "To refresh manually Google Custom Search Engine, goes to: "
+msgstr ""
+
+#: www/gsearch/index.php:61
+msgid ""
+"If no result appears, check that all the urls are valid in the admin section."
+msgstr ""
+
+#~ msgid "User with username %s not was not found"
+#~ msgstr "No se encontro el usuario %s"
+
+#~ msgid "Recent Bookmarks"
+#~ msgstr "Enlaces Recientes"
+
+#~ msgid "for"
+#~ msgstr "por"
+
+#~ msgid "%s Bookmarks"
+#~ msgstr "Enlace de %s"
+
+#~ msgid ""
+#~ "<strong><a href=\"register.php\">Register now</a></strong> to start using "
+#~ "%s!"
+#~ msgstr ""
+#~ "<strong><a href=\"register.php\">Registrese ahora</a></strong> para usar "
+#~ "%s!"
+
+#~ msgid ""
+#~ "%s is based on <a href=\"http://sourceforge.net/projects/scuttle/\">an "
+#~ "open-source project</a> licensed under the <a href=\"http://www.gnu.org/"
+#~ "copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> "
+#~ "General Public License</a>. This means you can host it on your own web "
+#~ "server for free, whether it is on the Internet, a private network or just "
+#~ "your own computer."
+#~ msgstr ""
+#~ "%s esta basado en <a href=\"http://sourceforge.net/projects/scuttle/\">un "
+#~ "proyecto de codigo abierto</a> licenciado bajo <a href=\"http://www.gnu."
+#~ "org/copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> "
+#~ "General Public License</a>. Esto quiere decir que usted puede instalarlo "
+#~ "en su propio web server para uso libre, en una red privada o en su propia "
+#~ "computadora."
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "<abbr title=\"Electronic mail\">E-mail</abbr>"
+#~ msgstr "<abbr title=\"Electronic mail\">Correo</abbr>"
diff --git a/data/locales/fr_CA/LC_MESSAGES/messages.mo b/data/locales/fr_CA/LC_MESSAGES/messages.mo
index 83ef490..cd57b64 100644
--- a/data/locales/fr_CA/LC_MESSAGES/messages.mo
+++ b/data/locales/fr_CA/LC_MESSAGES/messages.mo
diff --git a/data/locales/fr_CA/LC_MESSAGES/messages.po b/data/locales/fr_CA/LC_MESSAGES/messages.po
index e8b7f01..ff8beef 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: 2011-11-01 17:15+0100\n"
+"POT-Creation-Date: 2012-01-20 13:58+0100\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"
@@ -700,9 +700,10 @@ msgid "Instructions"
 msgstr "Instructions"
 
 #: data/templates/default/importDelicious.tpl.php:33
+#, fuzzy
 msgid ""
-"Log in to the <a href=\"http://del.icio.us/api/posts/all\">export page at "
-"del.icio.us</a>"
+"Log in to the <a href=\"https://api.del.icio.us/v1/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>"
diff --git a/data/locales/fr_FR/LC_MESSAGES/messages.mo b/data/locales/fr_FR/LC_MESSAGES/messages.mo
index 764b38f..e0ea52a 100644
--- a/data/locales/fr_FR/LC_MESSAGES/messages.mo
+++ b/data/locales/fr_FR/LC_MESSAGES/messages.mo
diff --git a/data/locales/fr_FR/LC_MESSAGES/messages.po b/data/locales/fr_FR/LC_MESSAGES/messages.po
index 992a248..ab2286f 100644
--- a/data/locales/fr_FR/LC_MESSAGES/messages.po
+++ b/data/locales/fr_FR/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Scuttle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-15 19:15+0200\n"
+"POT-Creation-Date: 2012-01-20 13:58+0100\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,9 +33,9 @@ msgid "Line"
 msgstr "Ligne"
 
 #: src/SemanticScuttle/functions.php:207
-#: data/templates/importDelicious.tpl.php:8
-#: data/templates/importNetscape.tpl.php:9
-#: data/templates/importStructure.tpl.php:10
+#: data/templates/default/importDelicious.tpl.php:8
+#: data/templates/default/importNetscape.tpl.php:9
+#: data/templates/default/importStructure.tpl.php:10
 msgid "File"
 msgstr "Fichier"
 
@@ -66,7 +67,7 @@ msgstr "Erreur critique."
 msgid "DEBUG MODE"
 msgstr "Mode de débogage."
 
-#: data/templates/about.tpl.php:6
+#: data/templates/default/about.tpl.php:6
 msgid ""
 "<strong>Store</strong> all your favourite links in one place, accessible "
 "from anywhere."
@@ -74,7 +75,7 @@ msgstr ""
 "<strong>Conservez</strong> tous vos signets au même endroit, accessibles de "
 "partout. "
 
-#: data/templates/about.tpl.php:7
+#: data/templates/default/about.tpl.php:7
 msgid ""
 "<strong>Share</strong> your bookmarks with everyone, with friends on your "
 "watchlist or just keep them private."
@@ -82,7 +83,7 @@ msgstr ""
 "<strong>Partagez</strong> vos signets avec tout le monde, avec vos contacts "
 "ou gardez-les pour vous."
 
-#: data/templates/about.tpl.php:8
+#: data/templates/default/about.tpl.php:8
 msgid ""
 "<strong>Tag</strong> your bookmarks with as many labels as you want, instead "
 "of wrestling with folders."
@@ -90,93 +91,99 @@ 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
+#: data/templates/default/about.tpl.php:9
 msgid "Register now"
 msgstr "S'enregistrer maintenant"
 
-#: data/templates/about.tpl.php:9
+#: data/templates/default/about.tpl.php:9
 #, php-format
 msgid " to start using %s!"
 msgstr "pour commencer à employer %s !"
 
-#: data/templates/about.tpl.php:12
+#: data/templates/default/about.tpl.php:12
 msgid "Geek Stuff"
 msgstr "Pour les Geeks"
 
-#: data/templates/about.tpl.php:14
+#: data/templates/default/about.tpl.php:14
 msgid "is licensed under the "
 msgstr "est sous licence"
 
-#: data/templates/about.tpl.php:14
+#: data/templates/default/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/about.tpl.php:15
+#: data/templates/default/about.tpl.php:15
 #, php-format
 msgid ""
-"%1$s supports most of the <a href=\"http://www.delicious.com/help/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."
+"%1$s supports most of the <a href=\"http://www.delicious.com/help/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://www.delicious.com/help/api\"><abbr "
-"title=\"Application Programming Interface\">API</abbr> del.icio.us</a>."
+"%1$s supporte la plupart de l'<a href=\"http://www.delicious.com/help/api"
+"\"><abbr title=\"Application Programming Interface\">API</abbr> del.icio.us</"
+"a>."
 
-#: data/templates/about.tpl.php:24
+#: data/templates/default/about.tpl.php:24
 msgid "Tips"
 msgstr "Astuces"
 
-#: data/templates/about.tpl.php:26
+#: data/templates/default/about.tpl.php:26
 msgid "Add search plugin into your browser:"
 msgstr "Ajouter un plugin de recherche à votre navigateur :"
 
-#: data/templates/about.tpl.php:27
+#: data/templates/default/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."
 
-#: data/templates/about.tpl.php:28
+#: data/templates/default/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."
 
-#: data/templates/admin.tpl.php:5
+#: data/templates/default/admin.tpl.php:5
 msgid "Users management"
 msgstr "Gestion des utilisateurs"
 
-#: data/templates/admin.tpl.php:14
+#: data/templates/default/admin.tpl.php:14
 msgid "Public/Shared/Private"
 msgstr "Publique/Partagé/Privé"
 
-#: data/templates/admin.tpl.php:14 data/templates/bookmarks.tpl.php:93
+#: data/templates/default/admin.tpl.php:14
+#: data/templates/default/bookmarks.tpl.php:115
 msgid "bookmark(s)"
 msgstr "signet(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
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/tag2tagadd.tpl.php:21
+#: data/templates/default/tag2tagdelete.tpl.php:13
+#: data/templates/default/tag2tagedit.tpl.php:14
+#: data/templates/default/tag2tagedit.tpl.php:35
+#: data/templates/default/tagdelete.tpl.php:6 www/jsScuttle.php:24
 msgid "Are you sure?"
 msgstr "Etes-vous sûr ?"
 
-#: data/templates/admin.tpl.php:19 data/templates/bookmarks.tpl.php:267
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/bookmarks.tpl.php:305
 msgid "Delete"
 msgstr "Supprimer"
 
-#: data/templates/admin.tpl.php:27
+#: data/templates/default/admin.tpl.php:27
 msgid "Other actions"
 msgstr "Autres actions"
 
-#: data/templates/admin.tpl.php:29
+#: data/templates/default/admin.tpl.php:29
 msgid "Check all URLs (May take some time)"
 msgstr "Vérifier toutes les URLs (Peut prendre du temps)"
 
-#: data/templates/bookmarkcommondescriptionedit.tpl.php:16
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:16
 msgid ""
 "Collaborative description: these fields can be viewed and modified by every "
 "users"
@@ -184,216 +191,267 @@ 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:43
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:18
+#: data/templates/default/bookmarks.tpl.php:159
+#: data/templates/default/editbookmark.tpl.php:51
 msgid "Title"
 msgstr "Titre"
 
-#: 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
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:23
+#: data/templates/default/editbookmark.tpl.php:57
+#: data/templates/default/editprofile.tpl.php:53
+#: data/templates/default/profile.tpl.php:33
+#: data/templates/default/tagcommondescriptionedit.tpl.php:13
+#: data/templates/default/tagedit.tpl.php:12
 msgid "Description"
 msgstr "Description"
 
-#: data/templates/bookmarkcommondescriptionedit.tpl.php:31
-#: data/templates/tagcommondescriptionedit.tpl.php:21
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:31
+#: data/templates/default/tagcommondescriptionedit.tpl.php:21
 msgid "Last modification:"
 msgstr "Dernière modification :"
 
-#: data/templates/bookmarkcommondescriptionedit.tpl.php:42
-#: data/templates/tagcommondescriptionedit.tpl.php:32
-#: data/templates/tagedit.tpl.php:18
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:43
+#: data/templates/default/tagcommondescriptionedit.tpl.php:33
+#: data/templates/default/tagedit.tpl.php:18
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: 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
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:44
+#: data/templates/default/editbookmark.tpl.php:111
+#: data/templates/default/tag2tagadd.tpl.php:24
+#: data/templates/default/tag2tagedit.tpl.php:38
+#: data/templates/default/tagcommondescriptionedit.tpl.php:34
+#: data/templates/default/tagedit.tpl.php:19
+#: data/templates/default/tagrename.tpl.php:25
 msgid "Cancel"
 msgstr "Annuler"
 
-#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:24
+#: data/templates/default/bookmarklet.inc.php:1
+msgid "Bookmarklet"
+msgstr "Bookmarklet"
+
+#: data/templates/default/bookmarklet.inc.php:11
+#, 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/default/bookmarklet.inc.php:20
+#, 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 "
+
+#: data/templates/default/bookmarklet.inc.php:67
+#: data/templates/default/bookmarklet.inc.php:100
+#, php-format
+msgid "Post to %s"
+msgstr "Ajouter à %s"
+
+#: data/templates/default/bookmarklet.inc.php:93
+#: data/templates/default/bookmarklet.inc.php:110
+#, php-format
+msgid "Post to %s (Pop-up)"
+msgstr "Ajouter à %s (Pop-up)"
+
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:24
 #, php-format
 msgid "Voting <span class=\"voting\">%d</span>"
 msgstr "Vote <span class=\"voting\">%d</span>"
 
-#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:32
-#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:35
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:32
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:35
 msgid "Vote for"
 msgstr "Vote pour"
 
-#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:43
-#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:46
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:43
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:46
 msgid "Vote against"
 msgstr "Vote contre"
 
-#: data/templates/bookmarks.tpl.php:26
+#: data/templates/default/bookmarks.tpl.php:43
 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/default/bookmarks.tpl.php:73
+#: data/templates/default/bookmarks.tpl.php:74
 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/default/bookmarks.tpl.php:77
+#: data/templates/default/bookmarks.tpl.php:78
 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/default/bookmarks.tpl.php:98
+#: data/templates/default/bookmarks.tpl.php:99
 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/users.tpl.php:8
+#: data/templates/default/bookmarks.tpl.php:115
+#: data/templates/default/tags.tpl.php:10
+#: data/templates/default/users.tpl.php:8
 msgid "Sort by:"
 msgstr "Classer par :"
 
-#: data/templates/bookmarks.tpl.php:135
+#: data/templates/default/bookmarks.tpl.php:157
 msgid "Date"
 msgstr "Date"
 
-#: data/templates/bookmarks.tpl.php:140
+#: data/templates/default/bookmarks.tpl.php:162
 msgid "Voting"
 msgstr "Vote"
 
-#: data/templates/bookmarks.tpl.php:149
+#: data/templates/default/bookmarks.tpl.php:171
 msgid "Bookmarks from other users for this tag"
 msgstr "Signets des autres utilisateurs pour ce tag"
 
-#: data/templates/bookmarks.tpl.php:154
+#: data/templates/default/bookmarks.tpl.php:176
 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/default/bookmarks.tpl.php:199
+#: data/templates/default/bookmarks.tpl.php:205
 msgid "First"
 msgstr "Première"
 
-#: data/templates/bookmarks.tpl.php:178 data/templates/bookmarks.tpl.php:184
+#: data/templates/default/bookmarks.tpl.php:200
+#: data/templates/default/bookmarks.tpl.php:206
 msgid "Previous"
 msgstr "Précédent"
 
-#: data/templates/bookmarks.tpl.php:191 data/templates/bookmarks.tpl.php:194
+#: data/templates/default/bookmarks.tpl.php:213
+#: data/templates/default/bookmarks.tpl.php:216
 msgid "Next"
 msgstr "Suivant"
 
-#: data/templates/bookmarks.tpl.php:192 data/templates/bookmarks.tpl.php:195
+#: data/templates/default/bookmarks.tpl.php:214
+#: data/templates/default/bookmarks.tpl.php:217
 msgid "Last"
 msgstr "Dernière"
 
-#: data/templates/bookmarks.tpl.php:205
+#: data/templates/default/bookmarks.tpl.php:233
 #, php-format
 msgid "Page %d of %d"
 msgstr "Page %d de %d"
 
-#: data/templates/bookmarks.tpl.php:261
+#: data/templates/default/bookmarks.tpl.php:295
 msgid "Tags:"
 msgstr "Tags:"
 
-#: data/templates/bookmarks.tpl.php:267
+#: data/templates/default/bookmarks.tpl.php:302
 msgid "Edit"
 msgstr "Editer"
 
-#: data/templates/bookmarks.tpl.php:271
+#: data/templates/default/bookmarks.tpl.php:310
 msgid "Last update"
 msgstr "Date de dernière mise à jour"
 
-#: data/templates/bookmarks.tpl.php:274
+#: data/templates/default/bookmarks.tpl.php:313
 msgid "by"
 msgstr "par"
 
-#: data/templates/bookmarks.tpl.php:276
+#: data/templates/default/bookmarks.tpl.php:317
 msgid "you"
 msgstr "vous"
 
-#: data/templates/bookmarks.tpl.php:290
+#: data/templates/default/bookmarks.tpl.php:333
 #, php-format
 msgid " and %s1 other%s"
 msgstr " et %s1 autre%s"
 
-#: data/templates/bookmarks.tpl.php:293
+#: data/templates/default/bookmarks.tpl.php:336
 #, 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:304
+#: data/templates/default/bookmarks.tpl.php:350
 msgid "Copy this bookmark to YOUR bookmarks."
 msgstr "Copier ce signet dans VOS signets."
 
-#: data/templates/bookmarks.tpl.php:305
+#: data/templates/default/bookmarks.tpl.php:351
 msgid "Copy"
 msgstr "Copier"
 
-#: data/templates/bookmarks.tpl.php:325
+#: data/templates/default/bookmarks.tpl.php:376
 msgid "This bookmark is certified by an admin user."
 msgstr "Ce signet est certifié par un administrateur."
 
-#: data/templates/bookmarks.tpl.php:371
+#: data/templates/default/bookmarks.tpl.php:430
 msgid "Private Note on this bookmark"
 msgstr "Note privée sur ce signet"
 
-#: data/templates/bookmarks.tpl.php:383
+#: data/templates/default/bookmarks.tpl.php:444
 msgid "Come back to the top of this page."
 msgstr "Revenir en haut de cette page."
 
-#: data/templates/bookmarks.tpl.php:383
+#: data/templates/default/bookmarks.tpl.php:444
 msgid "Top of the page"
 msgstr "Haut de page"
 
-#: data/templates/bookmarks.tpl.php:389
+#: data/templates/default/bookmarks.tpl.php:450
 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/default/bottom.inc.php:5
+#: data/templates/default/toolbar.inc.php:15
+#: data/templates/default/toolbar.inc.php:28 www/about.php:23 www/about.php:24
 msgid "About"
 msgstr "À propos"
 
-#: data/templates/bottom.inc.php:7
+#: data/templates/default/bottom.inc.php:7
 msgid "Propulsed by "
 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/default/dynamictags.inc.php:56
+#: data/templates/default/sidebar.block.common.php:19
+#: data/templates/default/sidebar.block.popular.php:34
+#: data/templates/default/sidebar.block.recent.php:29
+#: data/templates/default/tags.tpl.php:19
 msgid "bookmark"
 msgid_plural "bookmarks"
 msgstr[0] "signet"
 msgstr[1] "Signets"
 
-#: 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
+#: data/templates/default/dynamictags.inc.php:105
+#: data/templates/default/sidebar.block.common.php:9
+#: data/templates/default/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.popular.php:23
+#: data/templates/default/sidebar.block.recent.php:34
+#: data/templates/default/toolbar.inc.php:27 www/populartags.php:46
 msgid "Popular Tags"
 msgstr "Tags populaires"
 
-#: data/templates/dynamictags.inc.php:131
+#: data/templates/default/dynamictags.inc.php:108
 msgid "Popular Tags From All Users"
 msgstr "Tags populaires pour tous les utilisateurs"
 
-#: data/templates/editbookmark.tpl.php:38
+#: data/templates/default/editbookmark.tpl.php:46
 msgid "Address"
 msgstr "Adresse"
 
-#: 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
+#: data/templates/default/editbookmark.tpl.php:48
+#: data/templates/default/editbookmark.tpl.php:53
+#: data/templates/default/editprofile.tpl.php:29
+#: data/templates/default/tagrename.tpl.php:14
+#: data/templates/default/tagrename.tpl.php:19
 msgid "Required"
 msgstr "Requis"
 
-#: data/templates/editbookmark.tpl.php:50
+#: data/templates/default/editbookmark.tpl.php:58
 msgid "Add Note"
 msgstr "Ajouter une note"
 
-#: data/templates/editbookmark.tpl.php:53
+#: data/templates/default/editbookmark.tpl.php:61
 msgid ""
 "You can use anchors to delimite attributes. for example: [publisher]blah[/"
 "publisher] "
@@ -401,220 +459,245 @@ msgstr ""
 "Vous pouvez utiliser des balises pour délimiter des attributs. Par exemple : "
 "[publisher]blah[/publisher]"
 
-#: data/templates/editbookmark.tpl.php:56
+#: data/templates/default/editbookmark.tpl.php:64
 msgid "Suggested anchors: "
 msgstr "Balises suggérées : "
 
-#: data/templates/editbookmark.tpl.php:68
+#: data/templates/default/editbookmark.tpl.php:76
 msgid "Private Note"
 msgstr "Note privée"
 
-#: data/templates/editbookmark.tpl.php:70
+#: data/templates/default/editbookmark.tpl.php:78
 msgid "Just visible by you and your contacts."
 msgstr "Visible uniquement par vous et vos contacts."
 
-#: data/templates/editbookmark.tpl.php:74 data/templates/toolbar.inc.php:10
-#: www/tags.php:45 www/tags.php:67
+#: data/templates/default/editbookmark.tpl.php:82
+#: data/templates/default/toolbar.inc.php:10 www/tags.php:45 www/tags.php:67
 msgid "Tags"
 msgstr "Tags"
 
-#: data/templates/editbookmark.tpl.php:78
+#: data/templates/default/editbookmark.tpl.php:86
 msgid "Comma-separated"
 msgstr "Séparés par des virgules"
 
-#: data/templates/editbookmark.tpl.php:82 data/templates/tag2tagadd.tpl.php:9
+#: data/templates/default/editbookmark.tpl.php:90
+#: data/templates/default/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:86 data/templates/tag2tagadd.tpl.php:8
+#: data/templates/default/editbookmark.tpl.php:94
+#: data/templates/default/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:89
-#: data/templates/importDelicious.tpl.php:15
-#: data/templates/importNetscape.tpl.php:16
+#: data/templates/default/editbookmark.tpl.php:97
+#: data/templates/default/importDelicious.tpl.php:15
+#: data/templates/default/importNetscape.tpl.php:16
 msgid "Privacy"
 msgstr "Accès"
 
-#: data/templates/editbookmark.tpl.php:92
-#: data/templates/importDelicious.tpl.php:18
-#: data/templates/importNetscape.tpl.php:19
+#: data/templates/default/editbookmark.tpl.php:100
+#: data/templates/default/importDelicious.tpl.php:18
+#: data/templates/default/importNetscape.tpl.php:19
 msgid "Public"
 msgstr "Publique"
 
-#: data/templates/editbookmark.tpl.php:93
+#: data/templates/default/editbookmark.tpl.php:101
 msgid "Shared with Watch List"
 msgstr "Partagé avec mes contacts"
 
-#: data/templates/editbookmark.tpl.php:94
-#: data/templates/importDelicious.tpl.php:20
-#: data/templates/importNetscape.tpl.php:21
+#: data/templates/default/editbookmark.tpl.php:102
+#: data/templates/default/importDelicious.tpl.php:20
+#: data/templates/default/importNetscape.tpl.php:21
 msgid "Private"
 msgstr "Privée"
 
-#: data/templates/editbookmark.tpl.php:107
+#: data/templates/default/editbookmark.tpl.php:115
 msgid "Delete Bookmark"
 msgstr "Supprimer le signet"
 
-#: data/templates/editbookmark.tpl.php:112
+#: data/templates/default/editbookmark.tpl.php:120
 msgid "edit common description"
 msgstr "éditer la description commune"
 
-#: data/templates/editbookmark.tpl.php:139
-msgid "Bookmarklet"
-msgstr "Bookmarklet"
-
-#: 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 "
-
-#: 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 "
-
-#: 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: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:173
-#: data/templates/importDelicious.tpl.php:26
-#: data/templates/importNetscape.tpl.php:27
-#: data/templates/importStructure.tpl.php:16
+#: data/templates/default/editbookmark.tpl.php:212
+#: data/templates/default/importDelicious.tpl.php:26
+#: data/templates/default/importNetscape.tpl.php:27
+#: data/templates/default/importStructure.tpl.php:16
 msgid "Import"
 msgstr "Importer"
 
-#: data/templates/editbookmark.tpl.php:175
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Import bookmarks from bookmark file"
 msgstr "Importer les signets depuis un fichier"
 
-#: data/templates/editbookmark.tpl.php:175
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Internet Explorer, Mozilla Firefox and Netscape"
 msgstr "Internet Explorer, Mozilla Firefox et Netscape"
 
-#: data/templates/editbookmark.tpl.php:176
+#: data/templates/default/editbookmark.tpl.php:215
 msgid "Import bookmarks from del.icio.us"
 msgstr "Importer les signets depuis del.icio.us"
 
-#: data/templates/editprofile.tpl.php:10
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:11
+msgid "SSL client certificates"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:17
+msgid "Serial"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:45
+#: data/templates/default/profile.tpl.php:17
+msgid "Name"
+msgstr "Nom"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:19
+#: data/templates/default/profile.tpl.php:11
+msgid "Email"
+msgstr "E-mail"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:20
+msgid "Issuer"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:30
+#, fuzzy
+msgid "delete"
+msgstr "Supprimer"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:43
+msgid "No certificates registered"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:48
+msgid "Your current certificate is already registered with your account."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:53
+msgid "Register current certificate to automatically login."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:59
+msgid "Your browser does not provide a certificate."
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:8
 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/register.tpl.php:16
+#: data/templates/default/editprofile.tpl.php:12
+#: data/templates/default/login.tpl.php:21
+#: data/templates/default/password.tpl.php:10
+#: data/templates/default/profile.tpl.php:6
+#: data/templates/default/register.tpl.php:16
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: data/templates/editprofile.tpl.php:19
+#: data/templates/default/editprofile.tpl.php:17
 msgid "New Password"
 msgstr "Nouveau mot de passe"
 
-#: data/templates/editprofile.tpl.php:24
+#: data/templates/default/editprofile.tpl.php:22
 msgid "Confirm Password"
 msgstr "Confirmer le mot de passe"
 
-#: data/templates/editprofile.tpl.php:29 data/templates/password.tpl.php:14
-#: data/templates/register.tpl.php:26
+#: data/templates/default/editprofile.tpl.php:27
+#: data/templates/default/password.tpl.php:14
+#: data/templates/default/register.tpl.php:26
 msgid "E-mail"
 msgstr "E-mail"
 
-#: data/templates/editprofile.tpl.php:35
+#: data/templates/default/editprofile.tpl.php:32
+#, fuzzy
+msgid "Private RSS Feed"
+msgstr "Note privée"
+
+#: data/templates/default/editprofile.tpl.php:34
+msgid "Enable"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:36
+#, fuzzy
+msgid "Generate New Key"
+msgstr "Générer un mot de passe"
+
+#: data/templates/default/editprofile.tpl.php:41
 msgid "Personal Details"
 msgstr "Détails personnels"
 
-#: 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/default/editprofile.tpl.php:49
+#: data/templates/default/profile.tpl.php:23
 msgid "Homepage"
 msgstr "Page personnelle"
 
-#: data/templates/editprofile.tpl.php:52 www/edit.php:113
+#: data/templates/default/editprofile.tpl.php:58 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
+#: data/templates/default/editprofile.tpl.php:63
+#: data/templates/default/sidebar.block.tagactions.php:17
+#: data/templates/default/sidebar.block.watchstatus.php:18
 msgid "Actions"
 msgstr "Actions"
 
-#: data/templates/editprofile.tpl.php:58
+#: data/templates/default/editprofile.tpl.php:66
 msgid "Export bookmarks"
 msgstr "Exporter les signets"
 
-#: data/templates/editprofile.tpl.php:60
+#: data/templates/default/editprofile.tpl.php:68
 msgid "HTML file (for browsers)"
 msgstr "Fichier HTML (pour navigateurs)"
 
-#: data/templates/editprofile.tpl.php:61
+#: data/templates/default/editprofile.tpl.php:69
 msgid "XML file (like del.icio.us)"
 msgstr "Fichier XML (comme del.icio.us)"
 
-#: data/templates/editprofile.tpl.php:62
+#: data/templates/default/editprofile.tpl.php:70
 msgid "CSV file (for spreadsheet tools)"
 msgstr "Fichier CSV (pour tableurs)"
 
-#: data/templates/error.404.tpl.php:5
+#: data/templates/default/error.404.tpl.php:5
 msgid "Not Found"
 msgstr "Non trouvé"
 
-#: data/templates/error.404.tpl.php:6
+#: data/templates/default/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."
 
-#: data/templates/error.500.tpl.php:5
+#: data/templates/default/error.500.tpl.php:5
 msgid "General server error"
 msgstr "Erreur généralisée du serveur."
 
-#: data/templates/error.500.tpl.php:6
+#: data/templates/default/error.500.tpl.php:6
 msgid "The requested URL could not be processed"
 msgstr "L'URL demandée n'a pas été trouvée."
 
-#: data/templates/importDelicious.tpl.php:19
-#: data/templates/importNetscape.tpl.php:20
+#: data/templates/default/importDelicious.tpl.php:19
+#: data/templates/default/importNetscape.tpl.php:20
 msgid "Shared with Watchlist"
 msgstr "Partagé avec mes contacts"
 
-#: data/templates/importDelicious.tpl.php:31
-#: data/templates/importNetscape.tpl.php:32
-#: data/templates/importStructure.tpl.php:21
+#: data/templates/default/importDelicious.tpl.php:31
+#: data/templates/default/importNetscape.tpl.php:32
+#: data/templates/default/importStructure.tpl.php:21
 msgid "Instructions"
 msgstr "Instructions"
 
-#: data/templates/importDelicious.tpl.php:33
+#: data/templates/default/importDelicious.tpl.php:33
+#, fuzzy
 msgid ""
-"Log in to the <a href=\"http://del.icio.us/api/posts/all\">export page at "
-"del.icio.us</a>"
+"Log in to the <a href=\"https://api.del.icio.us/v1/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
+#: data/templates/default/importDelicious.tpl.php:34
 msgid ""
 "Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> "
 "file to your computer"
@@ -622,7 +705,7 @@ msgstr ""
 "Enregistrer le fichier <abbr title=\"Extensible Markup Language\">XML</abbr> "
 "résultant sur votre ordinateur"
 
-#: data/templates/importDelicious.tpl.php:35
+#: data/templates/default/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"
@@ -630,13 +713,13 @@ 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
+#: data/templates/default/importDelicious.tpl.php:36
+#: data/templates/default/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"
 
-#: data/templates/importDelicious.tpl.php:37
-#: data/templates/importNetscape.tpl.php:44
+#: data/templates/default/importDelicious.tpl.php:37
+#: data/templates/default/importNetscape.tpl.php:44
 msgid ""
 "Click <kbd>Import</kbd> to start importing the bookmarks; it may take a "
 "minute"
@@ -644,18 +727,18 @@ 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
+#: data/templates/default/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
+#: data/templates/default/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:38
+#: data/templates/default/importNetscape.tpl.php:38
 msgid ""
 "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
 "Export..."
@@ -663,14 +746,14 @@ msgstr ""
 "Mozilla Firefox: <kbd>Marques-pages &gt; Gérer les marques-pages... &gt; "
 "Fichier &gt; Exporter..."
 
-#: data/templates/importNetscape.tpl.php:39
+#: data/templates/default/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
+#: data/templates/default/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"
@@ -678,38 +761,39 @@ 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
+#: data/templates/default/importStructure.tpl.php:24
 msgid "Create your structure into a simple text file and following this model:"
 msgstr ""
 
-#: data/templates/importStructure.tpl.php:35
+#: data/templates/default/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
+#: data/templates/default/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/default/login.tpl.php:26
+#: data/templates/default/register.tpl.php:21
 msgid "Password"
 msgstr "Mot de passe"
 
-#: data/templates/login.tpl.php:28
+#: data/templates/default/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"
 
-#: data/templates/login.tpl.php:32 data/templates/toolbar.inc.php:29
-#: www/login.php:57
+#: data/templates/default/login.tpl.php:32
+#: data/templates/default/toolbar.inc.php:29 www/login.php:57
 msgid "Log In"
 msgstr "Se connecter"
 
-#: data/templates/login.tpl.php:36
+#: data/templates/default/login.tpl.php:36
 msgid "Forgotten your password?"
 msgstr "Avez-vous oublié votre mot de passe ?"
 
-#: data/templates/password.tpl.php:5
+#: data/templates/default/password.tpl.php:5
 #, php-format
 msgid ""
 "If you have forgotten your password, %s can generate a new one. Enter the "
@@ -720,37 +804,34 @@ msgstr ""
 "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
+#: data/templates/default/password.tpl.php:19
 msgid "Generate Password"
 msgstr "Générer un mot de passe"
 
-#: data/templates/profile.tpl.php:11
-msgid "Email"
-msgstr "E-mail"
-
-#: data/templates/profile.tpl.php:28
+#: data/templates/default/profile.tpl.php:28
 msgid "Member Since"
 msgstr "Membre depuis"
 
-#: data/templates/profile.tpl.php:40
-#: data/templates/sidebar.block.watchlist.php:30
+#: data/templates/default/profile.tpl.php:40
+#: data/templates/default/sidebar.block.watchlist.php:30
 msgid "Watching"
 msgstr "Mes contacts"
 
-#: data/templates/profile.tpl.php:55
-#: data/templates/sidebar.block.watchlist.php:52
+#: data/templates/default/profile.tpl.php:55
+#: data/templates/default/sidebar.block.watchlist.php:52
 msgid "Watched By"
 msgstr "Dans les contacts de"
 
-#: data/templates/profile.tpl.php:68 data/templates/toolbar.inc.php:9
+#: data/templates/default/profile.tpl.php:68
+#: data/templates/default/toolbar.inc.php:9
 msgid "Bookmarks"
 msgstr "Signets"
 
-#: data/templates/profile.tpl.php:69
+#: data/templates/default/profile.tpl.php:69
 msgid "Go to bookmarks"
 msgstr "Aller aux signets"
 
-#: data/templates/register.tpl.php:11
+#: data/templates/default/register.tpl.php:11
 #, php-format
 msgid ""
 "Sign up here to create a free %s account. All the information requested "
@@ -759,7 +840,7 @@ 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
+#: data/templates/default/register.tpl.php:18
 msgid ""
 " at least 5 characters, alphanumeric (no spaces, no dots or other special "
 "ones)"
@@ -767,195 +848,196 @@ 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
+#: data/templates/default/register.tpl.php:28
 msgid " to send you your password if you forget it"
 msgstr " pour vous envoyer votre mot de passe en cas de perte"
 
-#: data/templates/register.tpl.php:33
+#: data/templates/default/register.tpl.php:33
 msgid "Antispam question"
 msgstr "Question antispam"
 
-#: data/templates/register.tpl.php:41 data/templates/toolbar.inc.php:31
-#: www/register.php:83
+#: data/templates/default/register.tpl.php:41
+#: data/templates/default/toolbar.inc.php:31 www/register.php:99
 msgid "Register"
 msgstr "S'enregistrer"
 
-#: data/templates/search.menu.php:27
+#: data/templates/default/search.menu.php:27
 msgid "Search..."
 msgstr "Chercher..."
 
-#: data/templates/search.menu.php:28
+#: data/templates/default/search.menu.php:28
 msgid "in"
 msgstr "dans"
 
-#: data/templates/search.menu.php:34
+#: data/templates/default/search.menu.php:34
 msgid "this user's bookmarks"
 msgstr "les signets de cet utilisateur"
 
-#: data/templates/search.menu.php:39
+#: data/templates/default/search.menu.php:39
 msgid "my bookmarks"
 msgstr "mes signets"
 
-#: data/templates/search.menu.php:40
+#: data/templates/default/search.menu.php:40
 msgid "my watchlist"
 msgstr "mes contacts"
 
-#: data/templates/search.menu.php:44
+#: data/templates/default/search.menu.php:44
 msgid "all bookmarks"
 msgstr "tous les signets"
 
-#: data/templates/search.menu.php:54
+#: data/templates/default/search.menu.php:54
 msgid "Search"
 msgstr "Chercher"
 
-#: data/templates/sidebar.block.linked.php:51
+#: data/templates/default/sidebar.block.linked.php:23
 msgid "Linked Tags"
 msgstr "Tags structurés"
 
-#: data/templates/sidebar.block.linked.php:62
-#: data/templates/sidebar.block.menu.php:46
+#: data/templates/default/sidebar.block.linked.php:28
+#: data/templates/default/sidebar.block.menu.php:46
 msgid "Add new link"
 msgstr "Créer un lien"
 
-#: data/templates/sidebar.block.linked.php:63
-#: data/templates/sidebar.block.menu.php:47
+#: data/templates/default/sidebar.block.linked.php:29
+#: data/templates/default/sidebar.block.menu.php:47
 msgid "Delete link"
 msgstr "Supprimer un lien"
 
-#: data/templates/sidebar.block.menu.php:35
+#: data/templates/default/sidebar.block.menu.php:35
 #, php-format
 msgid "Tags included into the tag '%s'"
 msgstr "Tags inclus dans le tag '%s'"
 
-#: data/templates/sidebar.block.menu.php:35
+#: data/templates/default/sidebar.block.menu.php:35
 msgid "Menu Tags"
 msgstr "Tags Menu"
 
-#: data/templates/sidebar.block.menu.php:68
+#: data/templates/default/sidebar.block.menu.php:68
 msgid "See all your tags"
 msgstr "Voir tous vos tags"
 
-#: data/templates/sidebar.block.menu.php:68
+#: data/templates/default/sidebar.block.menu.php:68
 msgid "all your tags"
 msgstr "Tous vos tags"
 
-#: data/templates/sidebar.block.menu.php:70
+#: data/templates/default/sidebar.block.menu.php:70
 msgid "See all tags from this user"
 msgstr "Voir tous les tags de cet utilisateur"
 
-#: data/templates/sidebar.block.menu.php:70
+#: data/templates/default/sidebar.block.menu.php:70
 msgid "all tags from this user"
 msgstr "tous les tags de cet utilisateur"
 
-#: data/templates/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.menu.php:74
 msgid "See popular tags"
 msgstr "Voir les tags populaires"
 
-#: data/templates/sidebar.block.menu2.php:25
+#: data/templates/default/sidebar.block.menu2.php:21
 msgid "Featured Menu Tags"
 msgstr "Tags Principaux"
 
-#: data/templates/sidebar.block.menu2.php:29
+#: data/templates/default/sidebar.block.menu2.php:25
 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."
 
-#: data/templates/sidebar.block.recent.php:18
+#: data/templates/default/sidebar.block.recent.php:18
 msgid "Recent Tags"
 msgstr "Tags récents"
 
-#: data/templates/sidebar.block.related.php:26
+#: data/templates/default/sidebar.block.related.php:26
 msgid "Related Tags"
 msgstr "Tags en relation"
 
-#: data/templates/sidebar.block.search.php:15
+#: data/templates/default/sidebar.block.search.php:28
 msgid "Last Searches"
 msgstr "Dernières recherches"
 
-#: data/templates/sidebar.block.search.php:24
+#: data/templates/default/sidebar.block.search.php:40
 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/default/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/default/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/default/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
+#: data/templates/default/sidebar.block.tagactions.php:26
 #: www/tagcommondescriptionedit.php:76
 msgid "Edit Tag Common Description"
 msgstr "Editer la description commune du tag"
 
-#: data/templates/sidebar.block.tagactions.php:28
+#: data/templates/default/sidebar.block.tagactions.php:28
 msgid "Create a link to another tag"
 msgstr "Créer un lien vers un autre tag"
 
-#: data/templates/sidebar.block.users.php:14
+#: data/templates/default/sidebar.block.users.php:14
 msgid "New Users"
 msgstr "Nouveaux Utilisateurs"
 
-#: data/templates/sidebar.block.users.php:23 data/templates/users.tpl.php:17
+#: data/templates/default/sidebar.block.users.php:23
+#: data/templates/default/users.tpl.php:24
 msgid "bookmarks"
 msgstr "signets"
 
-#: data/templates/sidebar.block.users.php:30
+#: data/templates/default/sidebar.block.users.php:30
 msgid "See all users"
 msgstr "Voir tous les utilisateurs"
 
-#: data/templates/sidebar.block.users.php:30
+#: data/templates/default/sidebar.block.users.php:30
 msgid "All users"
 msgstr "Tous les utilisateurs"
 
-#: data/templates/sidebar.block.watchlist.php:19
+#: data/templates/default/sidebar.block.watchlist.php:19
 msgid "Close contacts are mutual contacts"
 msgstr "Les contacts proches sont des contacts mutuels"
 
-#: data/templates/sidebar.block.watchlist.php:19
+#: data/templates/default/sidebar.block.watchlist.php:19
 msgid "Close contacts"
 msgstr "Contacts proches"
 
-#: data/templates/sidebar.block.watchlist.php:36
+#: data/templates/default/sidebar.block.watchlist.php:36
 msgid "Add a contact..."
 msgstr "Ajouter un contact..."
 
-#: data/templates/sidebar.block.watchlist.php:36
+#: data/templates/default/sidebar.block.watchlist.php:36
 msgid "Type a username to add it to your contacts."
 msgstr "Entrer un nom d'utilisateur pour l'ajouter à vos contacts."
 
-#: data/templates/sidebar.block.watchlist.php:44
+#: data/templates/default/sidebar.block.watchlist.php:44
 msgid "Remove this contact"
 msgstr "Enlever ce contact"
 
-#: data/templates/sidebar.block.watchstatus.php:11
+#: data/templates/default/sidebar.block.watchstatus.php:11
 msgid "Remove from Watchlist"
 msgstr "Enlever des contacts"
 
-#: data/templates/sidebar.block.watchstatus.php:13
+#: data/templates/default/sidebar.block.watchstatus.php:13
 msgid "Add to Watchlist"
 msgstr "Ajouter aux contacts"
 
-#: data/templates/sidebar.linkedtags.inc.php:18
+#: data/templates/default/sidebar.linkedtags.inc.php:18
 msgid "Edit link"
 msgstr "Editer un lien"
 
-#: data/templates/sidebar.linkedtags.inc.php:47
+#: data/templates/default/sidebar.linkedtags.inc.php:47
 msgid "Synonyms:"
 msgstr "Synonymes :"
 
-#: data/templates/tag2tagadd.tpl.php:12
+#: data/templates/default/tag2tagadd.tpl.php:12
 msgid "Create new link:"
 msgstr "Créer un nouveau lien"
 
-#: data/templates/tag2tagadd.tpl.php:19
+#: data/templates/default/tag2tagadd.tpl.php:19
 #, php-format
 msgid ""
 "Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into "
@@ -964,87 +1046,91 @@ 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/default/tag2tagadd.tpl.php:23
+#: data/templates/default/tag2tagedit.tpl.php:37
 msgid "Create"
 msgstr "Créer"
 
-#: data/templates/tag2tagadd.tpl.php:35
-#: data/templates/tag2tagdelete.tpl.php:27
-#: data/templates/tag2tagedit.tpl.php:51
+#: data/templates/default/tag2tagadd.tpl.php:35
+#: data/templates/default/tag2tagdelete.tpl.php:27
+#: data/templates/default/tag2tagedit.tpl.php:51
 msgid "Existing links:"
 msgstr "Liens existants :"
 
-#: data/templates/tag2tagadd.tpl.php:53
-#: data/templates/tag2tagdelete.tpl.php:45
-#: data/templates/tag2tagedit.tpl.php:69
+#: data/templates/default/tag2tagadd.tpl.php:53
+#: data/templates/default/tag2tagdelete.tpl.php:45
+#: data/templates/default/tag2tagedit.tpl.php:69
 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
-#: www/jsScuttle.php:23
+#: data/templates/default/tag2tagdelete.tpl.php:15
+#: data/templates/default/tag2tagedit.tpl.php:16
+#: data/templates/default/tagdelete.tpl.php:8 www/jsScuttle.php:24
 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
+#: data/templates/default/tag2tagdelete.tpl.php:16
+#: data/templates/default/tag2tagedit.tpl.php:17
+#: data/templates/default/tagdelete.tpl.php:9 www/jsScuttle.php:24
 msgid "No"
 msgstr "Non"
 
-#: data/templates/tag2tagedit.tpl.php:6
+#: data/templates/default/tag2tagedit.tpl.php:6
 msgid "Delete the link"
 msgstr "Supprimer le lien"
 
-#: data/templates/tag2tagedit.tpl.php:29
+#: data/templates/default/tag2tagedit.tpl.php:29
 msgid "Create new link"
 msgstr "Créer un nouveau lien"
 
-#: data/templates/tagrename.tpl.php:12
+#: data/templates/default/tagrename.tpl.php:12
 msgid "Old"
 msgstr "Ancien"
 
-#: data/templates/tagrename.tpl.php:17
+#: data/templates/default/tagrename.tpl.php:17
 msgid "New"
 msgstr "Nouveau"
 
-#: data/templates/tagrename.tpl.php:24
+#: data/templates/default/tagrename.tpl.php:24
 msgid "Rename"
 msgstr "Renommer"
 
-#: data/templates/tags.tpl.php:11 data/templates/users.tpl.php:9
+#: data/templates/default/tags.tpl.php:11
+#: data/templates/default/users.tpl.php:9
 msgid "Alphabet"
 msgstr "Alphabet"
 
-#: data/templates/tags.tpl.php:12 data/templates/users.tpl.php:10
+#: data/templates/default/tags.tpl.php:12
+#: data/templates/default/users.tpl.php:10
 msgid "Popularity"
 msgstr "Popularité"
 
-#: data/templates/toolbar.inc.php:8 data/templates/toolbar.inc.php:26
+#: data/templates/default/toolbar.inc.php:8
+#: data/templates/default/toolbar.inc.php:26
 msgid "Home"
 msgstr "Accueil"
 
-#: data/templates/toolbar.inc.php:11 www/watchlist.php:106
+#: data/templates/default/toolbar.inc.php:11 www/watchlist.php:106
 msgid "Watchlist"
 msgstr "Contacts"
 
-#: data/templates/toolbar.inc.php:12 www/profile.php:67
+#: data/templates/default/toolbar.inc.php:12 www/profile.php:79
 msgid "Profile"
 msgstr "Profil"
 
-#: data/templates/toolbar.inc.php:13 www/bookmarks.php:209
+#: data/templates/default/toolbar.inc.php:13 www/bookmarks.php:215
 msgid "Add a Bookmark"
 msgstr "Ajouter un signet"
 
-#: data/templates/toolbar.inc.php:14
+#: data/templates/default/toolbar.inc.php:14
 msgid "Log Out"
 msgstr "Quitter"
 
-#: data/templates/toolbar.inc.php:17
+#: data/templates/default/toolbar.inc.php:17
 msgid "Admin"
 msgstr "Admin"
 
-#: data/templates/top.inc.php:49
+#: data/templates/default/top.inc.php:57
 msgid ""
 "Admins, your installation is in \"Debug Mode\" ($debugMode = true). To go in "
 "\"Normal Mode\" and hide debugging messages, change $debugMode to false into "
@@ -1054,11 +1140,11 @@ msgstr ""
 "passer en \"Mode Normal\" et cacher les messages de debuggage, changez "
 "$debugMode à false dans config.inc.php."
 
-#: data/templates/users.tpl.php:17
+#: data/templates/default/users.tpl.php:20
 msgid "profile"
 msgstr "Profil"
 
-#: data/templates/users.tpl.php:17
+#: data/templates/default/users.tpl.php:21
 msgid "created in"
 msgstr "Créé en "
 
@@ -1066,12 +1152,12 @@ msgstr "Créé en "
 msgid "Manage users"
 msgstr "Gérer les utilisateurs"
 
-#: www/admin.php:68
+#: www/admin.php:69
 #, php-format
 msgid "%s and all his bookmarks and tags were deleted."
 msgstr "%s, ses signets et ses tags ont été effacés."
 
-#: www/admin.php:75
+#: www/admin.php:76
 msgid "Problem with "
 msgstr "Problème avec "
 
@@ -1087,8 +1173,8 @@ msgstr "Erreur dans la suppression du signet"
 msgid "All Tags"
 msgstr "Tous les tags"
 
-#: 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/alltags.php:56 www/bookmarks.php:99 www/populartags.php:52
+#: www/profile.php:55 www/rss.php:100 www/search.php:111 www/watch.php:45
 #: www/watchlist.php:61
 #, php-format
 msgid "User with username %s was not found"
@@ -1112,23 +1198,27 @@ 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:114 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:134 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:139
+msgid "This bookmark URL may not be added"
+msgstr ""
+
+#: www/bookmarks.php:158 www/edit.php:83 www/edit.php:86
 msgid "Bookmark saved"
 msgstr "Signet enregistré."
 
-#: www/bookmarks.php:152
+#: www/bookmarks.php:158
 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
+#: www/bookmarks.php:165 www/import.php:106 www/importNetscape.php:108
 msgid ""
 "There was an error saving your bookmark. Please try again or contact the "
 "administrator."
@@ -1136,15 +1226,25 @@ msgstr ""
 "Il y a eu une erreur en enregistrant ce signet. Veuillez rééssayer ou "
 "contacter votre administrateur."
 
-#: www/bookmarks.php:216
+#: www/bookmarks.php:222
 msgid "Add Bookmark"
 msgstr "Ajouter signet"
 
-#: www/bookmarks.php:219
+#: www/bookmarks.php:225
 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:270
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: www/bookmarks.php:283
+#, php-format
+msgid "%s: %s (+private %s)"
+msgstr ""
+
+#: www/bookmarks.php:305 www/bookmarks.php:306
 msgid "My Bookmarks"
 msgstr "Mes signets"
 
@@ -1231,24 +1331,29 @@ msgstr "Importer une structure"
 msgid "You have now logged out"
 msgstr "Vous êtes maintenant déconnecté."
 
-#: www/index.php:45
+#: www/index.php:46
 #, php-format
 msgid "%s: Recent bookmarks"
 msgstr "%s: Signets récents"
 
-#: www/index.php:75
+#: www/index.php:58
+#, fuzzy, php-format
+msgid "%s: Recent bookmarks (+private %s)"
+msgstr "%s: Signets récents"
+
+#: www/index.php:96
 msgid "Store, share and tag your favourite links"
 msgstr "Conservez, partagez et taggez vos liens favoris"
 
-#: www/index.php:76
+#: www/index.php:97
 msgid "All Bookmarks"
 msgstr "Tous les signets"
 
-#: www/jsScuttle.php:70
+#: www/jsScuttle.php:71
 msgid "Available"
 msgstr "Disponible"
 
-#: www/jsScuttle.php:73
+#: www/jsScuttle.php:74
 msgid "Not Available"
 msgstr "Non Disponible"
 
@@ -1314,54 +1419,87 @@ 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:63 www/watchlist.php:119
 msgid "Username was not specified"
 msgstr "Le nom d'utilisateur n'a pas été spécifié."
 
-#: www/profile.php:65
+#: www/profile.php:70
 msgid "My Profile"
 msgstr "Mon Profil"
 
-#: www/profile.php:89
+#: www/profile.php:110
 msgid "Invalid Token"
 msgstr "Token invalide"
 
-#: www/profile.php:94
+#: www/profile.php:115
 msgid "Password and confirmation do not match."
 msgstr "Le mot de passe et sa vérification ne correspondent pas."
 
-#: www/profile.php:98
+#: www/profile.php:119
 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
+#: www/profile.php:123
 msgid "E-mail address is not valid."
 msgstr "Adresse de courrier électronique invalide."
 
-#: www/profile.php:106
+#: www/profile.php:127
 msgid "An error occurred while saving your changes."
 msgstr ""
 "Une erreur s'est produite pendant l'enregistrement de vos modifications."
 
-#: www/profile.php:108
+#: www/profile.php:129
 msgid "Changes saved."
 msgstr "Modifications enregistrées."
 
-#: www/register.php:46
+#: www/profile.php:148
+msgid "You do not have a valid SSL client certificate"
+msgstr ""
+
+#: www/profile.php:150
+msgid "This certificate is already registered"
+msgstr ""
+
+#: www/profile.php:152
+msgid "Failed to register SSL client certificate."
+msgstr ""
+
+#: www/profile.php:154
+msgid "SSL client certificate registered."
+msgstr ""
+
+#: www/profile.php:163
+msgid "Certificate not found."
+msgstr ""
+
+#: www/profile.php:165
+msgid "The certificate does not belong to you."
+msgstr ""
+
+#: www/profile.php:167
+#, fuzzy
+msgid "Failed to delete SSL client certificate."
+msgstr "Impossible d'effacer le tag"
+
+#: www/profile.php:169
+msgid "SSL client certificate deleted."
+msgstr ""
+
+#: www/register.php:52
 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
+#: www/register.php:56
 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
+#: www/register.php:60
 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
+#: www/register.php:64
 msgid ""
 "This username is not valid (too short, too long, forbidden characters...), "
 "please make another choice."
@@ -1369,48 +1507,53 @@ 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
+#: www/register.php:68
 msgid "E-mail address is not valid. Please try again."
 msgstr "Adresse de courrier électronique invalide. Veuillez réessayer."
 
-#: www/register.php:66
+#: www/register.php:72
 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
+#: www/register.php:90
 msgid "You have successfully registered. Enjoy!"
 msgstr "Votre inscription a bien été prise en compte !"
 
-#: www/register.php:77
+#: www/register.php:92
 msgid "Registration failed. Please try again."
 msgstr "Enregistrement raté. Veuillez rééssayer."
 
-#: www/rss.php:93
+#: www/rss.php:90 www/rss.php:111
+#, php-format
+msgid "Failed to Autenticate User with username %s using private key"
+msgstr ""
+
+#: www/rss.php:128
 #, 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:83 www/search.php:147
 msgid "Search Bookmarks"
 msgstr "Recherche de signets"
 
-#: www/search.php:87
+#: www/search.php:89
 msgid "Search Results"
 msgstr "Résultats de recherche"
 
-#: www/search.php:135
+#: www/search.php:137
 msgid "Unsatisfied? You can also try our "
 msgstr "Insatisfait ? Vous pouvez aussi essayer notre "
 
-#: www/tag2tagadd.php:50
+#: www/tag2tagadd.php:54
 msgid "Tag link created"
 msgstr "Lien entre tags créé."
 
-#: www/tag2tagadd.php:53
+#: www/tag2tagadd.php:57
 msgid "Failed to create the link"
 msgstr "Impossible de créer le lien"
 
-#: www/tag2tagadd.php:65
+#: www/tag2tagadd.php:69
 msgid "Add Tag Link"
 msgstr "Ajout d'un lien entre tags"
 
@@ -1462,6 +1605,16 @@ msgstr "Tag renommé"
 msgid "Failed to rename the tag"
 msgstr "Erreur dans le renommage du tag"
 
+#: www/tags.php:71
+#, php-format
+msgid "%s: tagged with \"%s\""
+msgstr ""
+
+#: www/tags.php:84
+#, php-format
+msgid "%s: tagged with \"%s\" (+private %s)"
+msgstr ""
+
 #: www/users.php:31
 msgid "Users"
 msgstr "Utilisateurs"
@@ -1478,24 +1631,24 @@ msgstr "Utilisateur ajouté à vos contacts"
 msgid "My Watchlist"
 msgstr "Mes Contacts"
 
-#: www/api/httpauth.inc.php:11
+#: www/api/httpauth.inc.php:30
 msgid "Use of the API calls requires authentication."
 msgstr "L'utilisation de l'API requiert une authentification."
 
-#: www/gsearch/index.php:27
+#: www/gsearch/index.php:51
 msgid "Come back to "
 msgstr "Revenir à"
 
-#: www/gsearch/index.php:32
+#: www/gsearch/index.php:56
 msgid "Admin tips: "
 msgstr "Conseil pour admin:"
 
-#: www/gsearch/index.php:33
+#: www/gsearch/index.php:57
 msgid "To refresh manually Google Custom Search Engine, goes to: "
 msgstr ""
 "Pour rafraîchir manuellement le moteur de Google Custom Search, allez à :"
 
-#: www/gsearch/index.php:35
+#: www/gsearch/index.php:61
 msgid ""
 "If no result appears, check that all the urls are valid in the admin section."
 msgstr ""
diff --git a/data/locales/hi_IN/LC_MESSAGES/messages.mo b/data/locales/hi_IN/LC_MESSAGES/messages.mo
index a6e91ed..d8972bd 100644
--- a/data/locales/hi_IN/LC_MESSAGES/messages.mo
+++ b/data/locales/hi_IN/LC_MESSAGES/messages.mo
diff --git a/data/locales/hi_IN/LC_MESSAGES/messages.po b/data/locales/hi_IN/LC_MESSAGES/messages.po
index ba4e542..e12e5f0 100644
--- a/data/locales/hi_IN/LC_MESSAGES/messages.po
+++ b/data/locales/hi_IN/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Scuttle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-29 11:17+0200\n"
+"POT-Creation-Date: 2012-01-20 13:58+0100\n"
 "PO-Revision-Date: 2006-04-16 21:56-0800\n"
 "Last-Translator: Marcus Campbell <marcus.campbell@gmail.com>\n"
 "Language-Team: hi-IN Debashish Chakrabarty <debashish @ gmail.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,794 +20,1687 @@ msgstr ""
 "X-Poedit-Country: India\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ..\..\..\about.php:25
-#: ..\..\..\templates\toolbar.inc.php:24
-msgid "About"
-msgstr "के बारे में"
-
-#: ..\..\..\ajaxDelete.php:29
-msgid "You are not allowed to delete this bookmark"
-msgstr "आपको इस पृष्ठ-स्मृति को मिटाने की अनुमति नहीं है."
-
-#: ..\..\..\ajaxDelete.php:33
-msgid "Failed to delete bookmark"
-msgstr "पृष्ठ-स्मृति मिटाने में असफल"
-
-#: ..\..\..\alltags.php:50
-msgid "All Tags"
-msgstr "सभी टैग"
-
-#: ..\..\..\alltags.php:59
-#: ..\..\..\populartags.php:63
-#: ..\..\..\profile.php:46
-#: ..\..\..\rss.php:55
-#: ..\..\..\search.php:61
-#: ..\..\..\watch.php:35
-#: ..\..\..\watched.php:62
-#, php-format
-msgid "User with username %s not was not found"
-msgstr "%s नाम का कोई भी उपयोक्ता नहीं मिला"
-
-#: ..\..\..\bookmarks.php:71
-#, fuzzy, php-format
-msgid "User with username %s was not found"
-msgstr "%s नाम का कोई भी उपयोक्ता नहीं मिला"
-
-#: ..\..\..\bookmarks.php:94
-#: ..\..\..\edit.php:44
-msgid "Your bookmark must have a title and an address"
-msgstr "आपकी पृष्ठ-स्मृति के लिए एक शीर्षक तथा एक पता होना आवश्यक है"
-
-#: ..\..\..\bookmarks.php:114
-#: ..\..\..\edit.php:58
-msgid "Bookmark saved"
-msgstr "पृष्ठ-स्मृति सहेजी गई"
-
-#: ..\..\..\bookmarks.php:122
-#: ..\..\..\import.php:99
-#: ..\..\..\importNetscape.php:74
-msgid "There was an error saving your bookmark. Please try again or contact the administrator."
-msgstr "आपकी पृष्ठ-स्मृति को सहेजने के दौरान एक त्रुटि हुई. कृपया फिर से कोशिश करें या प्रशासक से सम्पर्क साधें."
-
-#: ..\..\..\bookmarks.php:160
-#: ..\..\..\templates\toolbar.inc.php:13
-msgid "Add a Bookmark"
-msgstr "एक पृष्ठ-स्मृति जोड़ें"
-
-#: ..\..\..\bookmarks.php:163
-msgid "Add Bookmark"
-msgstr "पृष्ठ-स्मृति जोड़ें"
-
-#: ..\..\..\bookmarks.php:166
-msgid "You must be logged in before you can add bookmarks."
-msgstr "पृष्ठ-स्मृति जोड़ने से पहले आपका लॉगइन होना आवश्यक है."
-
-#: ..\..\..\bookmarks.php:213
-msgid "My Bookmarks"
-msgstr "मेरी पृष्ठ-स्मृतियाँ"
-
-#: ..\..\..\edit.php:29
-msgid "Edit Bookmark"
-msgstr "पृष्ठ-स्मृति संपादन"
-
-#: ..\..\..\edit.php:34
-#, php-format
-msgid "Bookmark with id %s not was not found"
-msgstr "पहचान चिह्न %s युक्त पृष्ठ-स्मृति नहीं मिला"
-
-#: ..\..\..\edit.php:39
-msgid "You are not allowed to edit this bookmark"
-msgstr "आप इस पृष्ठ-स्मृति को संपादित नही कर सकते"
-
-#: ..\..\..\edit.php:55
-msgid "Error while saving your bookmark"
-msgstr "पृष्ठ-स्मृति सहेजने के दौरान त्रुटि हुई"
-
-#: ..\..\..\edit.php:78
-msgid "Failed to delete the bookmark"
-msgstr "पृष्ठ-स्मृति मिटाने में असफल"
-
-#: ..\..\..\edit.php:88
-#: ..\..\..\templates\editprofile.tpl.php:52
-msgid "Save Changes"
-msgstr "परिवर्तन सहेजें"
-
-#: ..\..\..\functions.inc.php:92
+#: src/SemanticScuttle/functions.php:189
 msgid "message_die() was called multiple times."
 msgstr "message_die() को कई मर्तबा काल किया गया."
 
-#: ..\..\..\functions.inc.php:104
+#: src/SemanticScuttle/functions.php:201
 msgid "SQL Error"
 msgstr "एसक्यूएल त्रुटि"
 
-#: ..\..\..\functions.inc.php:110
+#: src/SemanticScuttle/functions.php:207
 msgid "Line"
 msgstr "पंक्ति"
 
-#: ..\..\..\functions.inc.php:110
-#: ..\..\..\templates\importDelicious.tpl.php:8
-#: ..\..\..\templates\importNetscape.tpl.php:9
+#: src/SemanticScuttle/functions.php:207
+#: data/templates/default/importDelicious.tpl.php:8
+#: data/templates/default/importNetscape.tpl.php:9
+#: data/templates/default/importStructure.tpl.php:10
 msgid "File"
 msgstr "फ़ाइल"
 
-#: ..\..\..\functions.inc.php:116
+#: src/SemanticScuttle/functions.php:215
 msgid "Information"
 msgstr "जानकारी"
 
-#: ..\..\..\functions.inc.php:121
+#: src/SemanticScuttle/functions.php:220
 msgid "Critical Information"
 msgstr "जरूरी जानकारी"
 
-#: ..\..\..\functions.inc.php:126
+#: src/SemanticScuttle/functions.php:225
 msgid "An error occured"
 msgstr "एक त्रुटि हुई"
 
-#: ..\..\..\functions.inc.php:129
+#: src/SemanticScuttle/functions.php:228
 msgid "General Error"
 msgstr "सामान्य त्रुटि"
 
-#: ..\..\..\functions.inc.php:137
+#: src/SemanticScuttle/functions.php:236
 msgid "An critical error occured"
 msgstr "एक गंभीर त्रुटि हुई"
 
-#: ..\..\..\functions.inc.php:140
+#: src/SemanticScuttle/functions.php:239
 msgid "Critical Error"
 msgstr "गंभीर त्रुटि"
 
-#: ..\..\..\functions.inc.php:149
+#: src/SemanticScuttle/functions.php:248
 msgid "DEBUG MODE"
 msgstr "डिबग मोड"
 
-#: ..\..\..\history.php:65
-msgid "History"
-msgstr "इतिहास"
+#: data/templates/default/about.tpl.php:6
+msgid ""
+"<strong>Store</strong> all your favourite links in one place, accessible "
+"from anywhere."
+msgstr ""
+"अपनी पसंद की कड़ियों को कहीं से भी पहुँच योग्य बनाने के लिए  एक ही स्थल पर<strong>संचित</"
+"strong>करें."
 
-#: ..\..\..\history.php:66
-#, php-format
-msgid "History for %s"
-msgstr "%s का इतिहास"
+#: data/templates/default/about.tpl.php:7
+msgid ""
+"<strong>Share</strong> your bookmarks with everyone, with friends on your "
+"watchlist or just keep them private."
+msgstr ""
+"अपने पृष्ठ-स्मृति कड़ियों को सबके साथ, अपने निगरानी सूची के मित्रों के साथ <strong>साझा</"
+"strong> करें या निजी इस्तेमाल करें"
 
-#: ..\..\..\history.php:81
-msgid "Address was not found"
-msgstr "पता नहीं मिला"
+#: data/templates/default/about.tpl.php:8
+msgid ""
+"<strong>Tag</strong> your bookmarks with as many labels as you want, instead "
+"of wrestling with folders."
+msgstr ""
+"अपनी पृष्ठ-स्मृति कड़ियों को किसी फोल्डर में ठूंसने के बजाए चाहे जितने लेबलों के "
+"साथ<strong>टैग</strong> कर सकते हैं."
 
-#: ..\..\..\import.php:41
-msgid "Could not open XML input"
-msgstr "एक्सएमएल इनपुट खोल नहीं सकता"
+#: data/templates/default/about.tpl.php:9
+#, fuzzy
+msgid "Register now"
+msgstr "पंजीकरण"
 
-#: ..\..\..\import.php:45
+#: data/templates/default/about.tpl.php:9
 #, php-format
-msgid "XML error: %s at line %d"
-msgstr "एक्सएमएल त्रुटि: %s में पंक्ति %d पर"
+msgid " to start using %s!"
+msgstr ""
 
-#: ..\..\..\import.php:54
-msgid "Import Bookmarks from del.icio.us"
-msgstr "del.icio.us से पृष्ठ-स्मृति आयात करें"
+#: data/templates/default/about.tpl.php:12
+msgid "Geek Stuff"
+msgstr "विद्वानों का खजाना"
 
-#: ..\..\..\import.php:86
-#: ..\..\..\importNetscape.php:64
-msgid "You have already submitted this bookmark."
-msgstr "आप इस पृष्ठ-स्मृति को पहले ही पेश कर चुके हैं"
+#: data/templates/default/about.tpl.php:14
+msgid "is licensed under the "
+msgstr ""
 
-#: ..\..\..\import.php:97
-#: ..\..\..\importNetscape.php:72
-msgid "Bookmark imported."
-msgstr "पृष्ठ-स्मृति आयातित."
+#: data/templates/default/about.tpl.php:14
+msgid "you can freely host it on your own web server."
+msgstr ""
 
-#: ..\..\..\importNetscape.php:81
-msgid "Import Bookmarks from Browser File"
-msgstr "ब्राउज़र फ़ाइल से पृष्ठ-स्मृति को आयात करें"
+#: data/templates/default/about.tpl.php:15
+#, php-format
+msgid ""
+"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 में प्रायः सभी <a href=\"http://www.delicious.com/help/api\">del.icio.us "
+"<abbr title=\"Application Programming Interface\">एपीआई</abbr></a> का समर्थन "
+"मिलता है. उस तंत्र के लिए बनाए गए प्रायः सभी औजारों को %1$s के लिए कार्य करने लायक "
+"परिवर्धित किया जा सकता है. यदि आपको कोई औजार ऐसा मिलता है जो आपको एपीआई पता "
+"बदलने नहीं देता है तो उसके सृजक को इस विन्यास को जोड़ने के लिए कहें. कौन जाने वे ऐसा भी कर "
+"लें."
+
+#: data/templates/default/about.tpl.php:24
+msgid "Tips"
+msgstr ""
 
-#: ..\..\..\index.php:32
-msgid "You have now logged out"
-msgstr "अब आप लॉग आउट हैं"
+#: data/templates/default/about.tpl.php:26
+msgid "Add search plugin into your browser:"
+msgstr ""
 
-#: ..\..\..\index.php:39
-#, php-format
-msgid "%s: Recent bookmarks"
-msgstr "%s: हालिया पृष्ठ-स्मृति"
+#: data/templates/default/about.tpl.php:27
+msgid ""
+"The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
+msgstr ""
 
-#: ..\..\..\index.php:72
-msgid "Store, share and tag your favourite links"
-msgstr "अपनी मनपसंद पृष्ठ-स्मृतियाँ सहेजें, साझा करें और टैग करें"
+#: data/templates/default/about.tpl.php:28
+msgid ""
+"The secret tag \"system:imported\" allows you to find imported bookmarks."
+msgstr ""
+
+#: data/templates/default/admin.tpl.php:5
+#, fuzzy
+msgid "Users management"
+msgstr "उपयोक्ता नाम"
 
-#: ..\..\..\index.php:73
-msgid "Recent Bookmarks"
-msgstr "हालिया पृष्ठ-स्मृतियाँ"
+#: data/templates/default/admin.tpl.php:14
+msgid "Public/Shared/Private"
+msgstr ""
 
-#: ..\..\..\jsScuttle.php:22
+#: data/templates/default/admin.tpl.php:14
+#: data/templates/default/bookmarks.tpl.php:115
+#, fuzzy
+msgid "bookmark(s)"
+msgstr "पृष्ठ-स्मृति"
+
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/tag2tagadd.tpl.php:21
+#: data/templates/default/tag2tagdelete.tpl.php:13
+#: data/templates/default/tag2tagedit.tpl.php:14
+#: data/templates/default/tag2tagedit.tpl.php:35
+#: data/templates/default/tagdelete.tpl.php:6 www/jsScuttle.php:24
 msgid "Are you sure?"
 msgstr "पक्की बात ना?"
 
-#: ..\..\..\jsScuttle.php:22
-msgid "Yes"
-msgstr "हाँ"
-
-#: ..\..\..\jsScuttle.php:22
-msgid "No"
-msgstr "नहीं"
-
-#: ..\..\..\jsScuttle.php:68
-msgid "Available"
-msgstr "उपलब्ध"
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/bookmarks.tpl.php:305
+msgid "Delete"
+msgstr "मिटाएँ"
 
-#: ..\..\..\jsScuttle.php:71
-msgid "Not Available"
-msgstr "उपलब्ध नहीं"
+#: data/templates/default/admin.tpl.php:27
+#, fuzzy
+msgid "Other actions"
+msgstr "निर्देश"
 
-#: ..\..\..\login.php:38
-msgid "The details you have entered are incorrect. Please try again."
-msgstr "आपने जो विवरण भरे हैं वे गलत हैं. कृपया पुनः प्रयास करें."
+#: data/templates/default/admin.tpl.php:29
+msgid "Check all URLs (May take some time)"
+msgstr ""
 
-#: ..\..\..\login.php:48
-#: ..\..\..\templates\login.tpl.php:26
-#: ..\..\..\templates\toolbar.inc.php:28
-msgid "Log In"
-msgstr "लॉग इन"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:16
+msgid ""
+"Collaborative description: these fields can be viewed and modified by every "
+"users"
+msgstr ""
 
-#: ..\..\..\password.php:31
-msgid "You must enter your username."
-msgstr "आपका उपयोक्ता नाम प्रविष्ट करना ज़रूरी है."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:18
+#: data/templates/default/bookmarks.tpl.php:159
+#: data/templates/default/editbookmark.tpl.php:51
+msgid "Title"
+msgstr "शीर्षक"
 
-#: ..\..\..\password.php:35
-msgid "You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "<abbr title=\"electronic mail\">ईमेल</abbr> पता भरना आवश्यक है."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:23
+#: data/templates/default/editbookmark.tpl.php:57
+#: data/templates/default/editprofile.tpl.php:53
+#: data/templates/default/profile.tpl.php:33
+#: data/templates/default/tagcommondescriptionedit.tpl.php:13
+#: data/templates/default/tagedit.tpl.php:12
+msgid "Description"
+msgstr "वर्णन"
 
-#: ..\..\..\password.php:42
-msgid "No matches found for that username."
-msgstr "इस से मेल खाता कोई उपयोक्ता नाम नहीं मिला."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:31
+#: data/templates/default/tagcommondescriptionedit.tpl.php:21
+msgid "Last modification:"
+msgstr ""
 
-#: ..\..\..\password.php:45
-msgid "No matches found for that combination of username and <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "इस उपयोक्ता तथा <abbr title=\"electronic mail\">ईमेल</abbr> पते से मेल खाता कोई जोड़ नहीं मिला."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:43
+#: data/templates/default/tagcommondescriptionedit.tpl.php:33
+#: data/templates/default/tagedit.tpl.php:18
+msgid "Update"
+msgstr ""
 
-#: ..\..\..\password.php:53
-msgid "There was an error while generating your new password. Please try again."
-msgstr "आपका नया कूटशब्द बनाने समय कोई त्रुटि हुई है। कृपया पुनः प्रयास करें।"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:44
+#: data/templates/default/editbookmark.tpl.php:111
+#: data/templates/default/tag2tagadd.tpl.php:24
+#: data/templates/default/tag2tagedit.tpl.php:38
+#: data/templates/default/tagcommondescriptionedit.tpl.php:34
+#: data/templates/default/tagedit.tpl.php:19
+#: data/templates/default/tagrename.tpl.php:25
+msgid "Cancel"
+msgstr ""
 
-#: ..\..\..\password.php:57
-msgid "Your new password is:"
-msgstr "आपका नया कूटशब्द हैः"
+#: data/templates/default/bookmarklet.inc.php:1
+msgid "Bookmarklet"
+msgstr "पृष्ठ-स्मृति चिह्नक"
 
-#: ..\..\..\password.php:57
-msgid "To keep your bookmarks secure, you should change this password in your profile the next time you log in."
-msgstr "अपनी पृष्ठ-स्मृतियाँ सुरक्षित रखने के लिये, जब आप अगली बार लॉगिन करें तो अपने प्रोफाईल में जाकर अपना कूटशब्द अवश्य बदल लें."
+#: data/templates/default/bookmarklet.inc.php:11
+#, 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 ""
+"निम्न पृष्ठ-स्मृति चिह्नकों में से किसी एक को अपने ब्राउज़र के पृष्ठ-स्मृति में खींच लाएँ व जब भी "
+"आप %s पर हों व कोई पृष्ठ जोड़ना चाहेँ तो उस पर क्लिक करें"
 
-#: ..\..\..\password.php:60
+#: data/templates/default/bookmarklet.inc.php:20
 #, php-format
-msgid "%s Account Information"
-msgstr "%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 ""
+"निम्न पृष्ठ-स्मृति चिह्नकों में से किसी एक को अपने ब्राउज़र के पृष्ठ-स्मृति में खींच लाएँ व जब भी "
+"आप %s पर हों व कोई पृष्ठ जोड़ना चाहेँ तो उस पर क्लिक करें"
 
-#: ..\..\..\password.php:62
+#: data/templates/default/bookmarklet.inc.php:67
+#: data/templates/default/bookmarklet.inc.php:100
 #, php-format
-msgid "New password generated and sent to %s"
-msgstr "नया कूटशब्द बना कर %s को भेज दिया गया है."
-
-#: ..\..\..\password.php:69
-msgid "Forgotten Password"
-msgstr "भूला कूटशब्द"
-
-#: ..\..\..\populartags.php:54
-#: ..\..\..\templates\dynamictags.inc.php:101
-#: ..\..\..\templates\sidebar.block.common.php:9
-#: ..\..\..\templates\sidebar.block.popular.php:15
-#: ..\..\..\templates\sidebar.block.recent.php:25
-msgid "Popular Tags"
-msgstr "लोकप्रिय टैग"
-
-#: ..\..\..\profile.php:54
-#: ..\..\..\watched.php:114
-msgid "Username was not specified"
-msgstr "उपयोक्ता नाम निर्दिष्ट नहीं है"
-
-#: ..\..\..\profile.php:60
-msgid "My Profile"
-msgstr "मेरा प्रोफ़ाइल"
-
-#: ..\..\..\profile.php:62
-#: ..\..\..\templates\sidebar.block.profile.php:12
-msgid "Profile"
-msgstr "प्रोफ़ाइल"
-
-#: ..\..\..\profile.php:80
-msgid "Password and confirmation do not match."
-msgstr "कूटशब्द तथा उसका पुष्टिकरण मेल नहीं खाते"
-
-#: ..\..\..\profile.php:84
-msgid "Password must be at least 6 characters long."
-msgstr "कूटशब्द को कम से कम 6 अक्षर लंबा होना चाहिए"
-
-#: ..\..\..\profile.php:88
-msgid "E-mail address is not valid."
-msgstr "ईमेल पता वैध नहीं है."
+msgid "Post to %s"
+msgstr "%s को पोस्ट करें"
 
-#: ..\..\..\profile.php:92
-msgid "An error occurred while saving your changes."
-msgstr "आपके द्वारा किए गए परिवर्तनों को सहेजने के दौरान त्रुटि हुई."
+#: data/templates/default/bookmarklet.inc.php:93
+#: data/templates/default/bookmarklet.inc.php:110
+#, php-format
+msgid "Post to %s (Pop-up)"
+msgstr "%s को पोस्ट करें (पॉप-अप)"
 
-#: ..\..\..\profile.php:94
-msgid "Changes saved."
-msgstr "परिवर्तनों को सहेजा गया."
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:24
+#, php-format
+msgid "Voting <span class=\"voting\">%d</span>"
+msgstr ""
 
-#: ..\..\..\register.php:33
-msgid "You <em>must</em> enter a username, password and e-mail address."
-msgstr "आपको उपयोक्ता नाम, कूटशब्द तथा <abbr title=\"electronic mail\">ईमेल</abbr> पता भरना <em>आवश्यक</em> है"
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:32
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:35
+msgid "Vote for"
+msgstr ""
 
-#: ..\..\..\register.php:37
-msgid "This username already exists, please make another choice."
-msgstr "यह उपयोक्ता नाम पहले ही मौजूद है, कृपया कोई दूसरा चुनें."
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:43
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:46
+msgid "Vote against"
+msgstr ""
 
-#: ..\..\..\register.php:41
-msgid "E-mail address is not valid. Please try again."
-msgstr "<abbr title=\"electronic mail\">ईमेल</abbr> पता वैध नहीं है."
+#: data/templates/default/bookmarks.tpl.php:43
+msgid "Bookmarks on this page are managed by an admin user."
+msgstr ""
 
-#: ..\..\..\register.php:50
-msgid "You have successfully registered. Enjoy!"
-msgstr "आप सफलता पूर्वक पंजीकृत हो गए हैं. बधाई!"
+#: data/templates/default/bookmarks.tpl.php:73
+#: data/templates/default/bookmarks.tpl.php:74
+msgid "Edit the common description of this tag"
+msgstr ""
 
-#: ..\..\..\register.php:52
-msgid "Registration failed. Please try again."
-msgstr "पंजीकरण असफल. कृपया फिर से कोशिश करें."
+#: data/templates/default/bookmarks.tpl.php:77
+#: data/templates/default/bookmarks.tpl.php:78
+msgid "Edit the common description of this bookmark"
+msgstr ""
 
-#: ..\..\..\register.php:57
-#: ..\..\..\templates\register.tpl.php:32
-#: ..\..\..\templates\toolbar.inc.php:27
-msgid "Register"
-msgstr "पंजीकरण"
+#: data/templates/default/bookmarks.tpl.php:98
+#: data/templates/default/bookmarks.tpl.php:99
+msgid "Edit your personal description of this tag"
+msgstr ""
 
-#: ..\..\..\search.inc.php:29
-#: ..\..\..\search.inc.php:57
-msgid "Search"
-msgstr "ढूंढें"
+#: data/templates/default/bookmarks.tpl.php:115
+#: data/templates/default/tags.tpl.php:10
+#: data/templates/default/users.tpl.php:8
+msgid "Sort by:"
+msgstr "इस आधार पर छांटें:"
 
-#: ..\..\..\search.inc.php:35
-msgid "this user's bookmarks"
-msgstr "इस उपयोक्ता की पृष्ठ-स्मृतियाँ"
+#: data/templates/default/bookmarks.tpl.php:157
+msgid "Date"
+msgstr "तारीख़"
 
-#: ..\..\..\search.inc.php:40
-msgid "my bookmarks"
-msgstr "मेरी पृष्ठ-स्मृतियाँ"
+#: data/templates/default/bookmarks.tpl.php:162
+msgid "Voting"
+msgstr ""
 
-#: ..\..\..\search.inc.php:41
-msgid "my watchlist"
-msgstr "मेरी निगरानी सूची"
+#: data/templates/default/bookmarks.tpl.php:171
+msgid "Bookmarks from other users for this tag"
+msgstr ""
 
-#: ..\..\..\search.inc.php:45
-msgid "all bookmarks"
-msgstr "सभी पृष्ठ-स्मृतियाँ"
+#: data/templates/default/bookmarks.tpl.php:176
+msgid "Only your bookmarks for this tag"
+msgstr ""
 
-#: ..\..\..\search.inc.php:48
-msgid "for"
-msgstr "के लिए"
+#: data/templates/default/bookmarks.tpl.php:199
+#: data/templates/default/bookmarks.tpl.php:205
+msgid "First"
+msgstr "प्रथम"
 
-#: ..\..\..\search.php:91
-#: ..\..\..\search.php:128
-msgid "Search Bookmarks"
-msgstr "पृष्ठ-स्मृतियाँ ढूंढें"
+#: data/templates/default/bookmarks.tpl.php:200
+#: data/templates/default/bookmarks.tpl.php:206
+msgid "Previous"
+msgstr "पिछला"
 
-#: ..\..\..\search.php:97
-msgid "Search Results"
-msgstr "खोज परिणाम"
+#: data/templates/default/bookmarks.tpl.php:213
+#: data/templates/default/bookmarks.tpl.php:216
+msgid "Next"
+msgstr "अगला"
 
-#: ..\..\..\tags.php:38
-#: ..\..\..\templates\editbookmark.tpl.php:44
-#: ..\..\..\templates\sidebar.block.profile.php:13
-msgid "Tags"
-msgstr "टैग"
+#: data/templates/default/bookmarks.tpl.php:214
+#: data/templates/default/bookmarks.tpl.php:217
+msgid "Last"
+msgstr "अंतिम"
 
-#: ..\..\..\watch.php:79
+#: data/templates/default/bookmarks.tpl.php:233
 #, php-format
-msgid "%s Bookmarks"
-msgstr "%s पृष्ठ-स्मृतियाँ"
-
-#: ..\..\..\watch.php:84
-msgid "User removed from your watchlist"
-msgstr "आपकी निगरानी सूची से उपयोक्ता को मिटाया गया"
-
-#: ..\..\..\watch.php:86
-msgid "User added to your watchlist"
-msgstr "उपयोक्ता को आपकी निगरानी सूची में जोड़ा"
-
-#: ..\..\..\watched.php:105
-msgid "My Watchlist"
-msgstr "मेरी निगरानी सूची"
+msgid "Page %d of %d"
+msgstr "%d में से पृष्ठ %d"
 
-#: ..\..\..\watched.php:107
-#: ..\..\..\templates\sidebar.block.profile.php:14
-#: ..\..\..\templates\toolbar.inc.php:12
+#: data/templates/default/bookmarks.tpl.php:295
 #, fuzzy
-msgid "Watchlist"
-msgstr "निगरानी सूची"
-
-#: ..\..\..\templates\about.tpl.php:6
-msgid "<strong>Store</strong> all your favourite links in one place, accessible from anywhere."
-msgstr "अपनी पसंद की कड़ियों को कहीं से भी पहुँच योग्य बनाने के लिए  एक ही स्थल पर<strong>संचित</strong>करें."
-
-#: ..\..\..\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>साझा</strong> करें या निजी इस्तेमाल करें"
-
-#: ..\..\..\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>टैग</strong> कर सकते हैं."
-
-#: ..\..\..\templates\about.tpl.php:9
-#, php-format
-msgid "<strong><a href=\"register.php\">Register now</a></strong> to start using %s!"
-msgstr "<strong><a href=\"register.php\">तुरंत पंजीकृत हों</a></strong> %s का इस्तेमाल करने के लिए!"
-
-#: ..\..\..\templates\about.tpl.php:12
-msgid "Geek Stuff"
-msgstr "विद्वानों का खजाना"
-
-#: ..\..\..\templates\about.tpl.php:14
-#, php-format
-msgid "%s is based on <a href=\"http://sourceforge.net/projects/scuttle/\">an open-source project</a> licensed under the <a href=\"http://www.gnu.org/copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> General Public License</a>. This means you can host it on your own web server for free, whether it is on the Internet, a private network or just your own computer."
-msgstr "%s एक <a href=\"http://sourceforge.net/projects/scuttle/\">मुक्त स्रोत परियोजना</a> पर आधारित है तथा इसे<a href=\"http://www.gnu.org/copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">ग्नू</acronym> जनरल पब्लिक लाइसेंस</a> के तहत जारी किया गया है. इसका अर्थ है कि आप इसे अपने स्वयं के वेब सर्वर पर चाहे इंटरनेट पर हो या निजी नेटवर्क पर या आपके व्यक्तिगत कम्प्यूटर पर, होस्ट कर सकते हैं."
-
-#: ..\..\..\templates\about.tpl.php:15
-#, php-format
-msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 में प्रायः सभी <a href=\"http://www.delicious.com/help/api\">del.icio.us <abbr title=\"Application Programming Interface\">एपीआई</abbr></a> का समर्थन मिलता है. उस तंत्र के लिए बनाए गए प्रायः सभी औजारों को %1$s के लिए कार्य करने लायक परिवर्धित किया जा सकता है. यदि आपको कोई औजार ऐसा मिलता है जो आपको एपीआई पता बदलने नहीं देता है तो उसके सृजक को इस विन्यास को जोड़ने के लिए कहें. कौन जाने वे ऐसा भी कर लें."
-
-#: ..\..\..\templates\bookmarks.tpl.php:17
-#: ..\..\..\templates\tags.tpl.php:7
-msgid "Sort by:"
-msgstr "इस आधार पर छांटें:"
-
-#: ..\..\..\templates\bookmarks.tpl.php:18
-msgid "Date"
-msgstr "तारीख़"
-
-#: ..\..\..\templates\bookmarks.tpl.php:19
-#: ..\..\..\templates\editbookmark.tpl.php:34
-msgid "Title"
-msgstr "शीर्षक"
-
-#: ..\..\..\templates\bookmarks.tpl.php:23
-msgid "URL"
-msgstr "यूआरएल"
+msgid "Tags:"
+msgstr "टैग"
 
-#: ..\..\..\templates\bookmarks.tpl.php:60
+#: data/templates/default/bookmarks.tpl.php:302
 msgid "Edit"
 msgstr "संपादन"
 
-#: ..\..\..\templates\bookmarks.tpl.php:60
-msgid "Delete"
-msgstr "मिटाएँ"
+#: data/templates/default/bookmarks.tpl.php:310
+msgid "Last update"
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:66
+#: data/templates/default/bookmarks.tpl.php:313
 msgid "by"
 msgstr "द्वारा"
 
-#: ..\..\..\templates\bookmarks.tpl.php:78
+#: data/templates/default/bookmarks.tpl.php:317
+msgid "you"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:333
 #, php-format
 msgid " and %s1 other%s"
 msgstr " तथा %s1 अन्य%s"
 
-#: ..\..\..\templates\bookmarks.tpl.php:81
+#: data/templates/default/bookmarks.tpl.php:336
 #, php-format
 msgid " and %2$s%1$s others%3$s"
 msgstr " तथा %2$s%1$s अन्य%3$s"
 
-#: ..\..\..\templates\bookmarks.tpl.php:90
+#: data/templates/default/bookmarks.tpl.php:350
+#, fuzzy
+msgid "Copy this bookmark to YOUR bookmarks."
+msgstr "पृष्ठ-स्मृति को पृष्ठ-स्मृति फ़ाइल से आयात करें"
+
+#: data/templates/default/bookmarks.tpl.php:351
 msgid "Copy"
 msgstr "नक़ल करें"
 
-#: ..\..\..\templates\bookmarks.tpl.php:136
-#: ..\..\..\templates\bookmarks.tpl.php:142
-msgid "First"
-msgstr "प्रथम"
-
-#: ..\..\..\templates\bookmarks.tpl.php:137
-#: ..\..\..\templates\bookmarks.tpl.php:143
-msgid "Previous"
-msgstr "पिछला"
+#: data/templates/default/bookmarks.tpl.php:376
+msgid "This bookmark is certified by an admin user."
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:150
-#: ..\..\..\templates\bookmarks.tpl.php:153
-msgid "Next"
-msgstr "अगला"
+#: data/templates/default/bookmarks.tpl.php:430
+#, fuzzy
+msgid "Private Note on this bookmark"
+msgstr "आप इस पृष्ठ-स्मृति को संपादित नही कर सकते"
 
-#: ..\..\..\templates\bookmarks.tpl.php:151
-#: ..\..\..\templates\bookmarks.tpl.php:154
-msgid "Last"
-msgstr "अंतिम"
+#: data/templates/default/bookmarks.tpl.php:444
+msgid "Come back to the top of this page."
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:156
-#, php-format
-msgid "Page %d of %d"
-msgstr "%d में से पृष्ठ %d"
+#: data/templates/default/bookmarks.tpl.php:444
+msgid "Top of the page"
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:160
+#: data/templates/default/bookmarks.tpl.php:450
 msgid "No bookmarks available"
 msgstr "कोई पृष्ठ-स्मृति उपलब्ध नहीं"
 
-#: ..\..\..\templates\dynamictags.inc.php:108
-#: ..\..\..\templates\sidebar.block.common.php:15
-#: ..\..\..\templates\sidebar.block.popular.php:21
-#: ..\..\..\templates\sidebar.block.recent.php:20
-#: ..\..\..\templates\tags.tpl.php:16
+#: data/templates/default/bottom.inc.php:5
+#: data/templates/default/toolbar.inc.php:15
+#: data/templates/default/toolbar.inc.php:28 www/about.php:23 www/about.php:24
+msgid "About"
+msgstr "के बारे में"
+
+#: data/templates/default/bottom.inc.php:7
+msgid "Propulsed by "
+msgstr ""
+
+#: data/templates/default/dynamictags.inc.php:56
+#: data/templates/default/sidebar.block.common.php:19
+#: data/templates/default/sidebar.block.popular.php:34
+#: data/templates/default/sidebar.block.recent.php:29
+#: data/templates/default/tags.tpl.php:19
 msgid "bookmark"
 msgid_plural "bookmarks"
 msgstr[0] "पृष्ठ-स्मृति"
 msgstr[1] "पृष्ठ-स्मृतियाँ"
 
-#: ..\..\..\templates\editbookmark.tpl.php:29
+#: data/templates/default/dynamictags.inc.php:105
+#: data/templates/default/sidebar.block.common.php:9
+#: data/templates/default/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.popular.php:23
+#: data/templates/default/sidebar.block.recent.php:34
+#: data/templates/default/toolbar.inc.php:27 www/populartags.php:46
+msgid "Popular Tags"
+msgstr "लोकप्रिय टैग"
+
+#: data/templates/default/dynamictags.inc.php:108
+#, fuzzy
+msgid "Popular Tags From All Users"
+msgstr "लोकप्रिय टैग"
+
+#: data/templates/default/editbookmark.tpl.php:46
 msgid "Address"
 msgstr "पता"
 
-#: ..\..\..\templates\editbookmark.tpl.php:31
-#: ..\..\..\templates\editbookmark.tpl.php:36
-#: ..\..\..\templates\editprofile.tpl.php:31
+#: data/templates/default/editbookmark.tpl.php:48
+#: data/templates/default/editbookmark.tpl.php:53
+#: data/templates/default/editprofile.tpl.php:29
+#: data/templates/default/tagrename.tpl.php:14
+#: data/templates/default/tagrename.tpl.php:19
 msgid "Required"
 msgstr "आवश्यक"
 
-#: ..\..\..\templates\editbookmark.tpl.php:39
-#: ..\..\..\templates\editprofile.tpl.php:47
-#: ..\..\..\templates\profile.tpl.php:28
-msgid "Description"
-msgstr "वर्णन"
+#: data/templates/default/editbookmark.tpl.php:58
+msgid "Add Note"
+msgstr ""
 
-#: ..\..\..\templates\editbookmark.tpl.php:46
+#: data/templates/default/editbookmark.tpl.php:61
+msgid ""
+"You can use anchors to delimite attributes. for example: [publisher]blah[/"
+"publisher] "
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:64
+msgid "Suggested anchors: "
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:76
+#, fuzzy
+msgid "Private Note"
+msgstr "निजी"
+
+#: data/templates/default/editbookmark.tpl.php:78
+msgid "Just visible by you and your contacts."
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:82
+#: data/templates/default/toolbar.inc.php:10 www/tags.php:45 www/tags.php:67
+msgid "Tags"
+msgstr "टैग"
+
+#: data/templates/default/editbookmark.tpl.php:86
 msgid "Comma-separated"
 msgstr "अल्पविराम से अलग की गई"
 
-#: ..\..\..\templates\editbookmark.tpl.php:49
-#: ..\..\..\templates\importDelicious.tpl.php:15
-#: ..\..\..\templates\importNetscape.tpl.php:16
+#: data/templates/default/editbookmark.tpl.php:90
+#: data/templates/default/tag2tagadd.tpl.php:9
+msgid ""
+"Note: use \">\" to include one tag in another. e.g.: europe>france>paris"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:94
+#: data/templates/default/tag2tagadd.tpl.php:8
+msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:97
+#: data/templates/default/importDelicious.tpl.php:15
+#: data/templates/default/importNetscape.tpl.php:16
 msgid "Privacy"
 msgstr "गोपनीयता"
 
-#: ..\..\..\templates\editbookmark.tpl.php:52
-#: ..\..\..\templates\importDelicious.tpl.php:18
-#: ..\..\..\templates\importNetscape.tpl.php:19
+#: data/templates/default/editbookmark.tpl.php:100
+#: data/templates/default/importDelicious.tpl.php:18
+#: data/templates/default/importNetscape.tpl.php:19
 msgid "Public"
 msgstr "सार्वजनिक"
 
-#: ..\..\..\templates\editbookmark.tpl.php:53
-#: ..\..\..\templates\importDelicious.tpl.php:19
-#: ..\..\..\templates\importNetscape.tpl.php:20
+#: data/templates/default/editbookmark.tpl.php:101
 msgid "Shared with Watch List"
 msgstr "निगरानी सूची के साथ साझा"
 
-#: ..\..\..\templates\editbookmark.tpl.php:54
-#: ..\..\..\templates\importDelicious.tpl.php:20
-#: ..\..\..\templates\importNetscape.tpl.php:21
+#: data/templates/default/editbookmark.tpl.php:102
+#: data/templates/default/importDelicious.tpl.php:20
+#: data/templates/default/importNetscape.tpl.php:21
 msgid "Private"
 msgstr "निजी"
 
-#: ..\..\..\templates\editbookmark.tpl.php:66
+#: data/templates/default/editbookmark.tpl.php:115
 msgid "Delete Bookmark"
 msgstr "पृष्ठ-स्मृति मिटाएँ"
 
-#: ..\..\..\templates\editbookmark.tpl.php:93
-msgid "Bookmarklet"
-msgstr "पृष्ठ-स्मृति चिह्नक"
-
-#: ..\..\..\templates\editbookmark.tpl.php:94
-#, 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 "निम्न पृष्ठ-स्मृति चिह्नकों में से किसी एक को अपने ब्राउज़र के पृष्ठ-स्मृति में खींच लाएँ व जब भी आप %s पर हों व कोई पृष्ठ जोड़ना चाहेँ तो उस पर क्लिक करें"
-
-#: ..\..\..\templates\editbookmark.tpl.php:106
-#, php-format
-msgid "Post to %s"
-msgstr "%s को पोस्ट करें"
-
-#: ..\..\..\templates\editbookmark.tpl.php:107
-#, php-format
-msgid "Post to %s (Pop-up)"
-msgstr "%s को पोस्ट करें (पॉप-अप)"
+#: data/templates/default/editbookmark.tpl.php:120
+msgid "edit common description"
+msgstr ""
 
-#: ..\..\..\templates\editbookmark.tpl.php:111
-#: ..\..\..\templates\importDelicious.tpl.php:26
-#: ..\..\..\templates\importNetscape.tpl.php:27
+#: data/templates/default/editbookmark.tpl.php:212
+#: data/templates/default/importDelicious.tpl.php:26
+#: data/templates/default/importNetscape.tpl.php:27
+#: data/templates/default/importStructure.tpl.php:16
 msgid "Import"
 msgstr "आयात"
 
-#: ..\..\..\templates\editbookmark.tpl.php:113
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Import bookmarks from bookmark file"
 msgstr "पृष्ठ-स्मृति को पृष्ठ-स्मृति फ़ाइल से आयात करें"
 
-#: ..\..\..\templates\editbookmark.tpl.php:113
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Internet Explorer, Mozilla Firefox and Netscape"
 msgstr "इंटरनेट एक्सप्लोरर, मॉज़िल्ला फ़ॉयरफ़ॉक्स तथा नेटस्केप"
 
-#: ..\..\..\templates\editbookmark.tpl.php:114
+#: data/templates/default/editbookmark.tpl.php:215
 msgid "Import bookmarks from del.icio.us"
 msgstr "del.icio.us से पृष्ठ-स्मृति आयात करें"
 
-#: ..\..\..\templates\editprofile.tpl.php:10
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:11
+msgid "SSL client certificates"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:17
+msgid "Serial"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:45
+#: data/templates/default/profile.tpl.php:17
+msgid "Name"
+msgstr "नाम"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:19
+#: data/templates/default/profile.tpl.php:11
+#, fuzzy
+msgid "Email"
+msgstr "ईमेल"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:20
+msgid "Issuer"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:30
+#, fuzzy
+msgid "delete"
+msgstr "मिटाएँ"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:43
+msgid "No certificates registered"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:48
+msgid "Your current certificate is already registered with your account."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:53
+msgid "Register current certificate to automatically login."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:59
+msgid "Your browser does not provide a certificate."
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:8
 msgid "Account Details"
 msgstr "खाते की जानकारी"
 
-#: ..\..\..\templates\editprofile.tpl.php:14
-#: ..\..\..\templates\login.tpl.php:15
-#: ..\..\..\templates\password.tpl.php:10
-#: ..\..\..\templates\profile.tpl.php:7
-#: ..\..\..\templates\register.tpl.php:16
+#: data/templates/default/editprofile.tpl.php:12
+#: data/templates/default/login.tpl.php:21
+#: data/templates/default/password.tpl.php:10
+#: data/templates/default/profile.tpl.php:6
+#: data/templates/default/register.tpl.php:16
 msgid "Username"
 msgstr "उपयोक्ता नाम"
 
-#: ..\..\..\templates\editprofile.tpl.php:19
+#: data/templates/default/editprofile.tpl.php:17
 msgid "New Password"
 msgstr "नया कूटशब्द"
 
-#: ..\..\..\templates\editprofile.tpl.php:24
+#: data/templates/default/editprofile.tpl.php:22
 #, fuzzy
 msgid "Confirm Password"
 msgstr "नया कूटशब्द सत्यापित करें"
 
-#: ..\..\..\templates\editprofile.tpl.php:29
-#: ..\..\..\templates\register.tpl.php:26
+#: data/templates/default/editprofile.tpl.php:27
+#: data/templates/default/password.tpl.php:14
+#: data/templates/default/register.tpl.php:26
 msgid "E-mail"
 msgstr "ईमेल"
 
-#: ..\..\..\templates\editprofile.tpl.php:35
+#: data/templates/default/editprofile.tpl.php:32
+#, fuzzy
+msgid "Private RSS Feed"
+msgstr "निजी"
+
+#: data/templates/default/editprofile.tpl.php:34
+msgid "Enable"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:36
+#, fuzzy
+msgid "Generate New Key"
+msgstr "नया कूटशब्द बनायें"
+
+#: data/templates/default/editprofile.tpl.php:41
 msgid "Personal Details"
 msgstr "व्यक्तिगत जानकारी"
 
-#: ..\..\..\templates\editprofile.tpl.php:39
-#: ..\..\..\templates\profile.tpl.php:12
-msgid "Name"
-msgstr "नाम"
-
-#: ..\..\..\templates\editprofile.tpl.php:43
-#: ..\..\..\templates\profile.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:49
+#: data/templates/default/profile.tpl.php:23
 msgid "Homepage"
 msgstr "गृहपृष्ठ"
 
-#: ..\..\..\templates\error.404.tpl.php:5
+#: data/templates/default/editprofile.tpl.php:58 www/edit.php:113
+msgid "Save Changes"
+msgstr "परिवर्तन सहेजें"
+
+#: data/templates/default/editprofile.tpl.php:63
+#: data/templates/default/sidebar.block.tagactions.php:17
+#: data/templates/default/sidebar.block.watchstatus.php:18
+#, fuzzy
+msgid "Actions"
+msgstr "निर्देश"
+
+#: data/templates/default/editprofile.tpl.php:66
+#, fuzzy
+msgid "Export bookmarks"
+msgstr "मेरी पृष्ठ-स्मृतियाँ"
+
+#: data/templates/default/editprofile.tpl.php:68
+msgid "HTML file (for browsers)"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:69
+msgid "XML file (like del.icio.us)"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:70
+msgid "CSV file (for spreadsheet tools)"
+msgstr ""
+
+#: data/templates/default/error.404.tpl.php:5
 msgid "Not Found"
 msgstr "नहीं मिला"
 
-#: ..\..\..\templates\error.404.tpl.php:6
+#: data/templates/default/error.404.tpl.php:6
 msgid "The requested URL was not found on this server"
 msgstr "इस सर्वर पर निवेदित यूआरएल नहीं मिला"
 
-#: ..\..\..\templates\error.500.tpl.php:5
+#: data/templates/default/error.500.tpl.php:5
 msgid "General server error"
 msgstr "सामान्य सर्वर त्रुटि"
 
-#: ..\..\..\templates\error.500.tpl.php:6
+#: data/templates/default/error.500.tpl.php:6
 msgid "The requested URL could not be processed"
 msgstr "निवेदित यूआरएल को प्रोसेस नहीं किया जा सका"
 
-#: ..\..\..\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 "<a href=\"http://del.icio.us/api/posts/all\">del.icio.us के निर्यात पृष्ठ पर</a> लॉगइन करें"
+#: data/templates/default/importDelicious.tpl.php:19
+#: data/templates/default/importNetscape.tpl.php:20
+#, fuzzy
+msgid "Shared with Watchlist"
+msgstr "निगरानी सूची के साथ साझा"
+
+#: data/templates/default/importDelicious.tpl.php:31
+#: data/templates/default/importNetscape.tpl.php:32
+#: data/templates/default/importStructure.tpl.php:21
+msgid "Instructions"
+msgstr "निर्देश"
+
+#: data/templates/default/importDelicious.tpl.php:33
+#, fuzzy
+msgid ""
+"Log in to the <a href=\"https://api.del.icio.us/v1/posts/all\">export page "
+"at del.icio.us</a>"
+msgstr ""
+"<a href=\"http://del.icio.us/api/posts/all\">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 "परिणाम <abbr title=\"Extensible Markup Language\">एक्सएमएल</abbr> को अपने कम्प्यूटर पर सहेजें"
+#: data/templates/default/importDelicious.tpl.php:34
+msgid ""
+"Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> "
+"file to your computer"
+msgstr ""
+"परिणाम <abbr title=\"Extensible Markup Language\">एक्सएमएल</abbr> को अपने "
+"कम्प्यूटर पर सहेजें"
 
-#: ..\..\..\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 "इस फ़ाइल को अपने कम्प्यूटर पर ढूंढने के लिए <kbd>ब्राउज़...</kbd> पर क्लिक करें. फ़ाइल का अधिकतम आकार 1 मे.बा. तक हो सकता है"
+#: data/templates/default/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 ""
+"इस फ़ाइल को अपने कम्प्यूटर पर ढूंढने के लिए <kbd>ब्राउज़...</kbd> पर क्लिक करें. फ़ाइल का "
+"अधिकतम आकार 1 मे.बा. तक हो सकता है"
 
-#: ..\..\..\templates\importDelicious.tpl.php:36
-#: ..\..\..\templates\importNetscape.tpl.php:43
+#: data/templates/default/importDelicious.tpl.php:36
+#: data/templates/default/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
-msgid "Click <kbd>Import</kbd> to start importing the bookmarks; it may take a minute"
-msgstr "पृष्ठ-स्मृति आयात चालू करने के लिए <kbd>आयात</kbd> पर क्लिक करें, इसमें कुछ समय लग सकता है"
-
-#: ..\..\..\templates\importNetscape.tpl.php:32
-msgid "Instructions"
-msgstr "निर्देश"
+#: data/templates/default/importDelicious.tpl.php:37
+#: data/templates/default/importNetscape.tpl.php:44
+msgid ""
+"Click <kbd>Import</kbd> to start importing the bookmarks; it may take a "
+"minute"
+msgstr ""
+"पृष्ठ-स्मृति आयात चालू करने के लिए <kbd>आयात</kbd> पर क्लिक करें, इसमें कुछ समय लग सकता है"
 
-#: ..\..\..\templates\importNetscape.tpl.php:35
+#: data/templates/default/importNetscape.tpl.php:35
 msgid "Export your bookmarks from your browser to a file"
 msgstr "अपने ब्राउज़र से अपने पृष्ठ-स्मृति को एक फ़ाइल में निर्यात करें"
 
-#: ..\..\..\templates\importNetscape.tpl.php:37
-msgid "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
-msgstr "इंटरनेट एक्सप्लोरर: <kbd>फ़ाइल &gt; आयात व निर्यात... &gt; पृष्ठ-स्मृतियाँ निर्यात करें"
+#: data/templates/default/importNetscape.tpl.php:37
+msgid ""
+"Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
+msgstr ""
+"इंटरनेट एक्सप्लोरर: <kbd>फ़ाइल &gt; आयात व निर्यात... &gt; पृष्ठ-स्मृतियाँ निर्यात करें"
 
-#: ..\..\..\templates\importNetscape.tpl.php:38
-msgid "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; Export..."
-msgstr "मॉज़िल्ला फ़ॉयरफ़ॉक्स: <kbd>पृष्ठ-स्मृतियाँ &gt; पृष्ठ-स्मृति प्रबंधन... &gt; फ़ाइल &gt; निर्यात..."
+#: data/templates/default/importNetscape.tpl.php:38
+msgid ""
+"Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
+"Export..."
+msgstr ""
+"मॉज़िल्ला फ़ॉयरफ़ॉक्स: <kbd>पृष्ठ-स्मृतियाँ &gt; पृष्ठ-स्मृति प्रबंधन... &gt; फ़ाइल &gt; "
+"निर्यात..."
 
-#: ..\..\..\templates\importNetscape.tpl.php:39
-msgid "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
+#: data/templates/default/importNetscape.tpl.php:39
+msgid ""
+"Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
 msgstr "नेटस्केप: <kbd>पृष्ठ-स्मृतियाँ &gt; पृष्ठ-स्मृति प्रबंधन... &gt; औजार &gt; निर्यात..."
 
-#: ..\..\..\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 "अपने कम्प्यूटर में सहेजे गए पृष्ठ-स्मृति फ़ाइलों को ढूंढने के लिए <kbd>ब्राउज़...</kbd> पर क्लिक करें. फ़ाइल का अधिकतम आकार 1मे.बा. तक हो सकता है."
+#: data/templates/default/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 ""
+"अपने कम्प्यूटर में सहेजे गए पृष्ठ-स्मृति फ़ाइलों को ढूंढने के लिए <kbd>ब्राउज़...</kbd> पर क्लिक "
+"करें. फ़ाइल का अधिकतम आकार 1मे.बा. तक हो सकता है."
+
+#: data/templates/default/importStructure.tpl.php:24
+msgid "Create your structure into a simple text file and following this model:"
+msgstr ""
+
+#: data/templates/default/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/default/login.tpl.php:13
+msgid "Please activate cookies"
+msgstr ""
+
+#: data/templates/default/login.tpl.php:26
+#: data/templates/default/register.tpl.php:21
 msgid "Password"
 msgstr "कूटशब्द"
 
-#: ..\..\..\templates\login.tpl.php:22
+#: data/templates/default/login.tpl.php:28
 msgid "Don't ask for my password for 2 weeks"
 msgstr "कूटशब्द के लिए मुझसे 2 सप्ताह तक नहीं पूछें"
 
-#: ..\..\..\templates\login.tpl.php:30
+#: data/templates/default/login.tpl.php:32
+#: data/templates/default/toolbar.inc.php:29 www/login.php:57
+msgid "Log In"
+msgstr "लॉग इन"
+
+#: data/templates/default/login.tpl.php:36
 msgid "Forgotten your password?"
 msgstr "अपना कूटशब्द भूल गये हैं?"
 
-#: ..\..\..\templates\password.tpl.php:5
+#: data/templates/default/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 "अगर आप अपना कूटशब्द भूल गये हों तो %s आपके एक नया कूटशब्द बना सकता है। खाते से संबद्ध अपना उपयोक्ता नाम और ईमेल पता नीचे प्रविष्ट करें और हम आपको एक नया कूटशब्द ईमेल कर देंगे."
-
-#: ..\..\..\templates\password.tpl.php:14
-msgid "<abbr title=\"Electronic mail\">E-mail</abbr>"
-msgstr "<abbr title=\"इलेक्ट्रानिक मेल\">ईमेल</abbr>"
+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 ""
+"अगर आप अपना कूटशब्द भूल गये हों तो %s आपके एक नया कूटशब्द बना सकता है। खाते से संबद्ध "
+"अपना उपयोक्ता नाम और ईमेल पता नीचे प्रविष्ट करें और हम आपको एक नया कूटशब्द ईमेल कर देंगे."
 
-#: ..\..\..\templates\password.tpl.php:19
+#: data/templates/default/password.tpl.php:19
 msgid "Generate Password"
 msgstr "नया कूटशब्द बनायें"
 
-#: ..\..\..\templates\profile.tpl.php:23
+#: data/templates/default/profile.tpl.php:28
 msgid "Member Since"
 msgstr "सदस्यता अवधि"
 
-#: ..\..\..\templates\profile.tpl.php:35
-#: ..\..\..\templates\sidebar.block.watchlist.php:8
+#: data/templates/default/profile.tpl.php:40
+#: data/templates/default/sidebar.block.watchlist.php:30
 msgid "Watching"
 msgstr "निगरानी में"
 
-#: ..\..\..\templates\profile.tpl.php:50
+#: data/templates/default/profile.tpl.php:55
+#: data/templates/default/sidebar.block.watchlist.php:52
 msgid "Watched By"
 msgstr "द्वारा देखा गया"
 
-#: ..\..\..\templates\register.tpl.php:11
+#: data/templates/default/profile.tpl.php:68
+#: data/templates/default/toolbar.inc.php:9
+msgid "Bookmarks"
+msgstr "पृष्ठ-स्मृतियाँ"
+
+#: data/templates/default/profile.tpl.php:69
+#, fuzzy
+msgid "Go to bookmarks"
+msgstr "मेरी पृष्ठ-स्मृतियाँ"
+
+#: data/templates/default/register.tpl.php:11
 #, php-format
-msgid "Sign up here to create a free %s account. All the information requested below is required"
+msgid ""
+"Sign up here to create a free %s account. All the information requested "
+"below is required"
 msgstr "मुफ़्त %s खाता बनाने के लिए यहाँ साइन करें. नीचे निवेदित सभी जानकारियाँ आवश्यक हैं"
 
-#: ..\..\..\templates\rss.tpl.php:9
+#: data/templates/default/register.tpl.php:18
+msgid ""
+" at least 5 characters, alphanumeric (no spaces, no dots or other special "
+"ones)"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:28
+msgid " to send you your password if you forget it"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:33
+msgid "Antispam question"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:41
+#: data/templates/default/toolbar.inc.php:31 www/register.php:99
+msgid "Register"
+msgstr "पंजीकरण"
+
+#: data/templates/default/search.menu.php:27
+#, fuzzy
+msgid "Search..."
+msgstr "ढूंढें"
+
+#: data/templates/default/search.menu.php:28
+#, fuzzy
+msgid "in"
+msgstr "पंक्ति"
+
+#: data/templates/default/search.menu.php:34
+msgid "this user's bookmarks"
+msgstr "इस उपयोक्ता की पृष्ठ-स्मृतियाँ"
+
+#: data/templates/default/search.menu.php:39
+msgid "my bookmarks"
+msgstr "मेरी पृष्ठ-स्मृतियाँ"
+
+#: data/templates/default/search.menu.php:40
+msgid "my watchlist"
+msgstr "मेरी निगरानी सूची"
+
+#: data/templates/default/search.menu.php:44
+msgid "all bookmarks"
+msgstr "सभी पृष्ठ-स्मृतियाँ"
+
+#: data/templates/default/search.menu.php:54
+msgid "Search"
+msgstr "ढूंढें"
+
+#: data/templates/default/sidebar.block.linked.php:23
+#, fuzzy
+msgid "Linked Tags"
+msgstr "सम्बंधित टैग"
+
+#: data/templates/default/sidebar.block.linked.php:28
+#: data/templates/default/sidebar.block.menu.php:46
+msgid "Add new link"
+msgstr ""
+
+#: data/templates/default/sidebar.block.linked.php:29
+#: data/templates/default/sidebar.block.menu.php:47
+#, fuzzy
+msgid "Delete link"
+msgstr "मिटाएँ"
+
+#: data/templates/default/sidebar.block.menu.php:35
 #, php-format
-msgid "Recent bookmarks posted to %s"
-msgstr "%s को पोस्ट की गईं हालिया पृष्ठ-स्मृतियाँ  "
+msgid "Tags included into the tag '%s'"
+msgstr ""
 
-#: ..\..\..\templates\rss.tpl.php:17
-#: ..\..\..\templates\rss.tpl.php:19
-msgid "No bookmarks found"
-msgstr "कोई पृष्ठ-स्मृति नहीं मिली"
+#: data/templates/default/sidebar.block.menu.php:35
+#, fuzzy
+msgid "Menu Tags"
+msgstr "हालिया टैग"
 
-#: ..\..\..\templates\sidebar.block.recent.php:15
+#: data/templates/default/sidebar.block.menu.php:68
+msgid "See all your tags"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:68
+msgid "all your tags"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:70
+msgid "See all tags from this user"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:70
+msgid "all tags from this user"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:74
+#, fuzzy
+msgid "See popular tags"
+msgstr "लोकप्रिय टैग"
+
+#: data/templates/default/sidebar.block.menu2.php:21
+#, fuzzy
+msgid "Featured Menu Tags"
+msgstr "सम्बंधित टैग"
+
+#: data/templates/default/sidebar.block.menu2.php:25
+msgid "This menu is composed of keywords (tags) organized by admins."
+msgstr ""
+
+#: data/templates/default/sidebar.block.recent.php:18
 msgid "Recent Tags"
 msgstr "हालिया टैग"
 
-#: ..\..\..\templates\sidebar.block.related.php:15
+#: data/templates/default/sidebar.block.related.php:26
 msgid "Related Tags"
 msgstr "सम्बंधित टैग"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:10
+#: data/templates/default/sidebar.block.search.php:28
+#, fuzzy
+msgid "Last Searches"
+msgstr "ढूंढें"
+
+#: data/templates/default/sidebar.block.search.php:40
+#, fuzzy
+msgid "Number of bookmarks for this query"
+msgstr "कोई पृष्ठ-स्मृति नहीं मिली"
+
+#: data/templates/default/sidebar.block.tagactions.php:9 www/tagrename.php:72
+#, fuzzy
+msgid "Rename Tag"
+msgid_plural "Rename Tags"
+msgstr[0] "सम्बंधित टैग"
+msgstr[1] "सम्बंधित टैग"
+
+#: data/templates/default/sidebar.block.tagactions.php:22 www/tagdelete.php:54
+#, fuzzy
+msgid "Delete Tag"
+msgstr "मिटाएँ"
+
+#: data/templates/default/sidebar.block.tagactions.php:24 www/tagedit.php:61
+#, fuzzy
+msgid "Edit Tag Description"
+msgstr "वर्णन"
+
+#: data/templates/default/sidebar.block.tagactions.php:26
+#: www/tagcommondescriptionedit.php:76
+msgid "Edit Tag Common Description"
+msgstr ""
+
+#: data/templates/default/sidebar.block.tagactions.php:28
+msgid "Create a link to another tag"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:14
+msgid "New Users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:23
+#: data/templates/default/users.tpl.php:24
+#, fuzzy
+msgid "bookmarks"
+msgstr "पृष्ठ-स्मृति"
+
+#: data/templates/default/sidebar.block.users.php:30
+msgid "See all users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:30
+msgid "All users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:19
+msgid "Close contacts are mutual contacts"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:19
+msgid "Close contacts"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:36
+msgid "Add a contact..."
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:36
+msgid "Type a username to add it to your contacts."
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:44
+#, fuzzy
+msgid "Remove this contact"
+msgstr "निगरानी सूची से मिटाएँ"
+
+#: data/templates/default/sidebar.block.watchstatus.php:11
 msgid "Remove from Watchlist"
 msgstr "निगरानी सूची से मिटाएँ"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:12
+#: data/templates/default/sidebar.block.watchstatus.php:13
 msgid "Add to Watchlist"
 msgstr "निगरानी सूची में जोड़ें"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:17
+#: data/templates/default/sidebar.linkedtags.inc.php:18
 #, fuzzy
-msgid "Actions"
-msgstr "निर्देश"
+msgid "Edit link"
+msgstr "संपादन"
+
+#: data/templates/default/sidebar.linkedtags.inc.php:47
+msgid "Synonyms:"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:12
+msgid "Create new link:"
+msgstr ""
+
+#: data/templates/default/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 ""
+
+#: data/templates/default/tag2tagadd.tpl.php:23
+#: data/templates/default/tag2tagedit.tpl.php:37
+msgid "Create"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:35
+#: data/templates/default/tag2tagdelete.tpl.php:27
+#: data/templates/default/tag2tagedit.tpl.php:51
+msgid "Existing links:"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:53
+#: data/templates/default/tag2tagdelete.tpl.php:45
+#: data/templates/default/tag2tagedit.tpl.php:69
+msgid "No links"
+msgstr ""
+
+#: data/templates/default/tag2tagdelete.tpl.php:15
+#: data/templates/default/tag2tagedit.tpl.php:16
+#: data/templates/default/tagdelete.tpl.php:8 www/jsScuttle.php:24
+msgid "Yes"
+msgstr "हाँ"
+
+#: data/templates/default/tag2tagdelete.tpl.php:16
+#: data/templates/default/tag2tagedit.tpl.php:17
+#: data/templates/default/tagdelete.tpl.php:9 www/jsScuttle.php:24
+msgid "No"
+msgstr "नहीं"
+
+#: data/templates/default/tag2tagedit.tpl.php:6
+msgid "Delete the link"
+msgstr ""
+
+#: data/templates/default/tag2tagedit.tpl.php:29
+msgid "Create new link"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:12
+msgid "Old"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:17
+msgid "New"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:24
+#, fuzzy
+msgid "Rename"
+msgstr "उपयोक्ता नाम"
 
-#: ..\..\..\templates\tags.tpl.php:8
+#: data/templates/default/tags.tpl.php:11
+#: data/templates/default/users.tpl.php:9
 msgid "Alphabet"
 msgstr "वर्ण"
 
-#: ..\..\..\templates\tags.tpl.php:9
+#: data/templates/default/tags.tpl.php:12
+#: data/templates/default/users.tpl.php:10
 msgid "Popularity"
 msgstr "लोकप्रियता"
 
-#: ..\..\..\templates\toolbar.inc.php:11
-msgid "Bookmarks"
-msgstr "पृष्ठ-स्मृतियाँ"
+#: data/templates/default/toolbar.inc.php:8
+#: data/templates/default/toolbar.inc.php:26
+#, fuzzy
+msgid "Home"
+msgstr "गृहपृष्ठ"
 
-#: ..\..\..\templates\toolbar.inc.php:16
+#: data/templates/default/toolbar.inc.php:11 www/watchlist.php:106
+#, fuzzy
+msgid "Watchlist"
+msgstr "निगरानी सूची"
+
+#: data/templates/default/toolbar.inc.php:12 www/profile.php:79
+msgid "Profile"
+msgstr "प्रोफ़ाइल"
+
+#: data/templates/default/toolbar.inc.php:13 www/bookmarks.php:215
+msgid "Add a Bookmark"
+msgstr "एक पृष्ठ-स्मृति जोड़ें"
+
+#: data/templates/default/toolbar.inc.php:14
 msgid "Log Out"
 msgstr "लॉग आउट"
 
+#: data/templates/default/toolbar.inc.php:17
+msgid "Admin"
+msgstr ""
+
+#: data/templates/default/top.inc.php:57
+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/default/users.tpl.php:20
+#, fuzzy
+msgid "profile"
+msgstr "प्रोफ़ाइल"
+
+#: data/templates/default/users.tpl.php:21
+msgid "created in"
+msgstr ""
+
+#: www/admin.php:32
+msgid "Manage users"
+msgstr ""
+
+#: www/admin.php:69
+#, php-format
+msgid "%s and all his bookmarks and tags were deleted."
+msgstr ""
+
+#: www/admin.php:76
+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:50
+msgid "All Tags"
+msgstr "सभी टैग"
+
+#: www/alltags.php:56 www/bookmarks.php:99 www/populartags.php:52
+#: www/profile.php:55 www/rss.php:100 www/search.php:111 www/watch.php:45
+#: www/watchlist.php:61
+#, fuzzy, php-format
+msgid "User with username %s was not found"
+msgstr "%s नाम का कोई भी उपयोक्ता नहीं मिला"
+
+#: 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 ""
+
+#: www/bookmarkcommondescriptionedit.php:60
+msgid "Bookmark common description updated"
+msgstr ""
+
+#: www/bookmarkcommondescriptionedit.php:63
+#, fuzzy
+msgid "Failed to update the bookmark common description"
+msgstr "पृष्ठ-स्मृति मिटाने में असफल"
+
+#: www/bookmarkcommondescriptionedit.php:71
+msgid "Edit Bookmark Common Description"
+msgstr ""
+
+#: www/bookmarks.php:114 www/tags.php:47
+msgid "Remove the tag from the selection"
+msgstr ""
+
+#: www/bookmarks.php:134 www/edit.php:65
+msgid "Your bookmark must have a title and an address"
+msgstr "आपकी पृष्ठ-स्मृति के लिए एक शीर्षक तथा एक पता होना आवश्यक है"
+
+#: www/bookmarks.php:139
+msgid "This bookmark URL may not be added"
+msgstr ""
+
+#: www/bookmarks.php:158 www/edit.php:83 www/edit.php:86
+msgid "Bookmark saved"
+msgstr "पृष्ठ-स्मृति सहेजी गई"
+
+#: www/bookmarks.php:158
+msgid "(Come back to previous page.)"
+msgstr ""
+
+#: www/bookmarks.php:165 www/import.php:106 www/importNetscape.php:108
+msgid ""
+"There was an error saving your bookmark. Please try again or contact the "
+"administrator."
+msgstr ""
+"आपकी पृष्ठ-स्मृति को सहेजने के दौरान एक त्रुटि हुई. कृपया फिर से कोशिश करें या प्रशासक से "
+"सम्पर्क साधें."
+
+#: www/bookmarks.php:222
+msgid "Add Bookmark"
+msgstr "पृष्ठ-स्मृति जोड़ें"
+
+#: www/bookmarks.php:225
+msgid "You must be logged in before you can add bookmarks."
+msgstr "पृष्ठ-स्मृति जोड़ने से पहले आपका लॉगइन होना आवश्यक है."
+
+#: www/bookmarks.php:270
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: www/bookmarks.php:283
+#, php-format
+msgid "%s: %s (+private %s)"
+msgstr ""
+
+#: www/bookmarks.php:305 www/bookmarks.php:306
+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 "पहचान चिह्न %s युक्त पृष्ठ-स्मृति नहीं मिला"
+
+#: 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 "%s का इतिहास"
+
+#: www/history.php:84
+msgid "Address was not found"
+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 "एक्सएमएल त्रुटि: %s में पंक्ति %d पर"
+
+#: www/import.php:60
+msgid "Import Bookmarks from del.icio.us"
+msgstr "del.icio.us से पृष्ठ-स्मृति आयात करें"
+
+#: www/import.php:93
+msgid "You have already submitted this bookmark."
+msgstr "आप इस पृष्ठ-स्मृति को पहले ही पेश कर चुके हैं"
+
+#: www/import.php:104
+msgid "Bookmark imported."
+msgstr "पृष्ठ-स्मृति आयातित."
+
+#: www/importNetscape.php:95
+#, fuzzy
+msgid "You have already submitted some of these bookmarks."
+msgstr "आप इस पृष्ठ-स्मृति को पहले ही पेश कर चुके हैं"
+
+#: www/importNetscape.php:115
+#, fuzzy
+msgid "Bookmarks found: "
+msgstr "कोई पृष्ठ-स्मृति नहीं मिली"
+
+#: www/importNetscape.php:116
+#, fuzzy
+msgid "Bookmarks imported: "
+msgstr "पृष्ठ-स्मृति आयातित."
+
+#: www/importNetscape.php:117 www/importNetscape.php:122
+msgid "Import Bookmarks from Browser File"
+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:46
+#, php-format
+msgid "%s: Recent bookmarks"
+msgstr "%s: हालिया पृष्ठ-स्मृति"
+
+#: www/index.php:58
+#, fuzzy, php-format
+msgid "%s: Recent bookmarks (+private %s)"
+msgstr "%s: हालिया पृष्ठ-स्मृति"
+
+#: www/index.php:96
+msgid "Store, share and tag your favourite links"
+msgstr "अपनी मनपसंद पृष्ठ-स्मृतियाँ सहेजें, साझा करें और टैग करें"
+
+#: www/index.php:97
+#, fuzzy
+msgid "All Bookmarks"
+msgstr "सभी पृष्ठ-स्मृतियाँ"
+
+#: www/jsScuttle.php:71
+msgid "Available"
+msgstr "उपलब्ध"
+
+#: www/jsScuttle.php:74
+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 "<abbr title=\"electronic mail\">ईमेल</abbr> पता भरना आवश्यक है."
+
+#: 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 ""
+"इस उपयोक्ता तथा <abbr title=\"electronic mail\">ईमेल</abbr> पते से मेल खाता कोई "
+"जोड़ नहीं मिला."
+
+#: 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 "%s खाते की जानकारी"
+
+#: www/password.php:68
+#, php-format
+msgid "New password generated and sent to %s"
+msgstr "नया कूटशब्द बना कर %s को भेज दिया गया है."
+
+#: www/password.php:75
+msgid "Forgotten Password"
+msgstr "भूला कूटशब्द"
+
+#: www/profile.php:63 www/watchlist.php:119
+msgid "Username was not specified"
+msgstr "उपयोक्ता नाम निर्दिष्ट नहीं है"
+
+#: www/profile.php:70
+msgid "My Profile"
+msgstr "मेरा प्रोफ़ाइल"
+
+#: www/profile.php:110
+msgid "Invalid Token"
+msgstr ""
+
+#: www/profile.php:115
+msgid "Password and confirmation do not match."
+msgstr "कूटशब्द तथा उसका पुष्टिकरण मेल नहीं खाते"
+
+#: www/profile.php:119
+msgid "Password must be at least 6 characters long."
+msgstr "कूटशब्द को कम से कम 6 अक्षर लंबा होना चाहिए"
+
+#: www/profile.php:123
+msgid "E-mail address is not valid."
+msgstr "ईमेल पता वैध नहीं है."
+
+#: www/profile.php:127
+msgid "An error occurred while saving your changes."
+msgstr "आपके द्वारा किए गए परिवर्तनों को सहेजने के दौरान त्रुटि हुई."
+
+#: www/profile.php:129
+msgid "Changes saved."
+msgstr "परिवर्तनों को सहेजा गया."
+
+#: www/profile.php:148
+msgid "You do not have a valid SSL client certificate"
+msgstr ""
+
+#: www/profile.php:150
+msgid "This certificate is already registered"
+msgstr ""
+
+#: www/profile.php:152
+msgid "Failed to register SSL client certificate."
+msgstr ""
+
+#: www/profile.php:154
+msgid "SSL client certificate registered."
+msgstr ""
+
+#: www/profile.php:163
+msgid "Certificate not found."
+msgstr ""
+
+#: www/profile.php:165
+msgid "The certificate does not belong to you."
+msgstr ""
+
+#: www/profile.php:167
+msgid "Failed to delete SSL client certificate."
+msgstr ""
+
+#: www/profile.php:169
+msgid "SSL client certificate deleted."
+msgstr ""
+
+#: www/register.php:52
+msgid "You <em>must</em> enter a username, password and e-mail address."
+msgstr ""
+"आपको उपयोक्ता नाम, कूटशब्द तथा <abbr title=\"electronic mail\">ईमेल</abbr> पता "
+"भरना <em>आवश्यक</em> है"
+
+#: www/register.php:56
+#, fuzzy
+msgid "This username has been reserved, please make another choice."
+msgstr "यह उपयोक्ता नाम पहले ही मौजूद है, कृपया कोई दूसरा चुनें."
+
+#: www/register.php:60
+msgid "This username already exists, please make another choice."
+msgstr "यह उपयोक्ता नाम पहले ही मौजूद है, कृपया कोई दूसरा चुनें."
+
+#: www/register.php:64
+#, fuzzy
+msgid ""
+"This username is not valid (too short, too long, forbidden characters...), "
+"please make another choice."
+msgstr "यह उपयोक्ता नाम पहले ही मौजूद है, कृपया कोई दूसरा चुनें."
+
+#: www/register.php:68
+msgid "E-mail address is not valid. Please try again."
+msgstr "<abbr title=\"electronic mail\">ईमेल</abbr> पता वैध नहीं है."
+
+#: www/register.php:72
+#, fuzzy
+msgid "Antispam answer is not valid. Please try again."
+msgstr "<abbr title=\"electronic mail\">ईमेल</abbr> पता वैध नहीं है."
+
+#: www/register.php:90
+msgid "You have successfully registered. Enjoy!"
+msgstr "आप सफलता पूर्वक पंजीकृत हो गए हैं. बधाई!"
+
+#: www/register.php:92
+msgid "Registration failed. Please try again."
+msgstr "पंजीकरण असफल. कृपया फिर से कोशिश करें."
+
+#: www/rss.php:90 www/rss.php:111
+#, php-format
+msgid "Failed to Autenticate User with username %s using private key"
+msgstr ""
+
+#: www/rss.php:128
+#, php-format
+msgid "Recent bookmarks posted to %s"
+msgstr "%s को पोस्ट की गईं हालिया पृष्ठ-स्मृतियाँ  "
+
+#: www/search.php:83 www/search.php:147
+msgid "Search Bookmarks"
+msgstr "पृष्ठ-स्मृतियाँ ढूंढें"
+
+#: www/search.php:89
+msgid "Search Results"
+msgstr "खोज परिणाम"
+
+#: www/search.php:137
+msgid "Unsatisfied? You can also try our "
+msgstr ""
+
+#: www/tag2tagadd.php:54
+msgid "Tag link created"
+msgstr ""
+
+#: www/tag2tagadd.php:57
+#, fuzzy
+msgid "Failed to create the link"
+msgstr "पृष्ठ-स्मृति मिटाने में असफल"
+
+#: www/tag2tagadd.php:69
+msgid "Add Tag Link"
+msgstr ""
+
+#: www/tag2tagdelete.php:66
+msgid "Tag link deleted"
+msgstr ""
+
+#: www/tag2tagdelete.php:69
+#, fuzzy
+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:62
+msgid "Tag common description updated"
+msgstr ""
+
+#: www/tagcommondescriptionedit.php:67
+msgid "Failed to update the tag common description"
+msgstr ""
+
+#: www/tagdelete.php:43
+msgid "Tag deleted"
+msgstr ""
+
+#: www/tagdelete.php:46
+#, fuzzy
+msgid "Failed to delete the tag"
+msgstr "पृष्ठ-स्मृति मिटाने में असफल"
+
+#: www/tagedit.php:52
+msgid "Tag description updated"
+msgstr ""
+
+#: www/tagedit.php:55
+#, fuzzy
+msgid "Failed to update the tag description"
+msgstr "पृष्ठ-स्मृति मिटाने में असफल"
+
+#: www/tagrename.php:63
+msgid "Tag renamed"
+msgstr ""
+
+#: www/tagrename.php:66
+#, fuzzy
+msgid "Failed to rename the tag"
+msgstr "पृष्ठ-स्मृति मिटाने में असफल"
+
+#: www/tags.php:71
+#, php-format
+msgid "%s: tagged with \"%s\""
+msgstr ""
+
+#: www/tags.php:84
+#, php-format
+msgid "%s: tagged with \"%s\" (+private %s)"
+msgstr ""
+
+#: www/users.php:31
+#, fuzzy
+msgid "Users"
+msgstr "उपयोक्ता नाम"
+
+#: www/watch.php:54
+msgid "User removed from your watchlist"
+msgstr "आपकी निगरानी सूची से उपयोक्ता को मिटाया गया"
+
+#: www/watch.php:56
+msgid "User added to your watchlist"
+msgstr "उपयोक्ता को आपकी निगरानी सूची में जोड़ा"
+
+#: www/watchlist.php:104
+msgid "My Watchlist"
+msgstr "मेरी निगरानी सूची"
+
+#: www/api/httpauth.inc.php:30
+msgid "Use of the API calls requires authentication."
+msgstr ""
+
+#: www/gsearch/index.php:51
+msgid "Come back to "
+msgstr ""
+
+#: www/gsearch/index.php:56
+msgid "Admin tips: "
+msgstr ""
+
+#: www/gsearch/index.php:57
+msgid "To refresh manually Google Custom Search Engine, goes to: "
+msgstr ""
+
+#: www/gsearch/index.php:61
+msgid ""
+"If no result appears, check that all the urls are valid in the admin section."
+msgstr ""
+
+#~ msgid "User with username %s not was not found"
+#~ msgstr "%s नाम का कोई भी उपयोक्ता नहीं मिला"
+
+#~ msgid "Recent Bookmarks"
+#~ msgstr "हालिया पृष्ठ-स्मृतियाँ"
+
+#~ msgid "for"
+#~ msgstr "के लिए"
+
+#~ msgid "%s Bookmarks"
+#~ msgstr "%s पृष्ठ-स्मृतियाँ"
+
+#~ msgid ""
+#~ "<strong><a href=\"register.php\">Register now</a></strong> to start using "
+#~ "%s!"
+#~ msgstr ""
+#~ "<strong><a href=\"register.php\">तुरंत पंजीकृत हों</a></strong> %s का इस्तेमाल "
+#~ "करने के लिए!"
+
+#~ msgid ""
+#~ "%s is based on <a href=\"http://sourceforge.net/projects/scuttle/\">an "
+#~ "open-source project</a> licensed under the <a href=\"http://www.gnu.org/"
+#~ "copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> "
+#~ "General Public License</a>. This means you can host it on your own web "
+#~ "server for free, whether it is on the Internet, a private network or just "
+#~ "your own computer."
+#~ msgstr ""
+#~ "%s एक <a href=\"http://sourceforge.net/projects/scuttle/\">मुक्त स्रोत "
+#~ "परियोजना</a> पर आधारित है तथा इसे<a href=\"http://www.gnu.org/copyleft/gpl."
+#~ "html\"><acronym title=\"GNU's Not Unix\">ग्नू</acronym> जनरल पब्लिक लाइसेंस</"
+#~ "a> के तहत जारी किया गया है. इसका अर्थ है कि आप इसे अपने स्वयं के वेब सर्वर पर चाहे "
+#~ "इंटरनेट पर हो या निजी नेटवर्क पर या आपके व्यक्तिगत कम्प्यूटर पर, होस्ट कर सकते हैं."
+
+#~ msgid "URL"
+#~ msgstr "यूआरएल"
+
+#~ msgid "<abbr title=\"Electronic mail\">E-mail</abbr>"
+#~ msgstr "<abbr title=\"इलेक्ट्रानिक मेल\">ईमेल</abbr>"
diff --git a/data/locales/it_IT/LC_MESSAGES/messages.mo b/data/locales/it_IT/LC_MESSAGES/messages.mo
index cca9902..9d4baa0 100644
--- a/data/locales/it_IT/LC_MESSAGES/messages.mo
+++ b/data/locales/it_IT/LC_MESSAGES/messages.mo
diff --git a/data/locales/it_IT/LC_MESSAGES/messages.po b/data/locales/it_IT/LC_MESSAGES/messages.po
index 7db0fed..8a43739 100644
--- a/data/locales/it_IT/LC_MESSAGES/messages.po
+++ b/data/locales/it_IT/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Scuttle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-10 16:58+0100\n"
+"POT-Creation-Date: 2012-01-20 13:58+0100\n"
 "PO-Revision-Date: 2006-03-18 21:51-0800\n"
 "Last-Translator: Marcus Campbell <marcus.campbell@gmail.com>\n"
 "Language-Team: it-IT <upcome@gmail.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,836 +19,1731 @@ msgstr ""
 "X-Poedit-Country: ITALY\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ..\..\..\about.php:25
-#: ..\..\..\templates\toolbar.inc.php:24
-msgid "About"
-msgstr "Informazioni"
-
-#: ..\..\..\ajaxDelete.php:29
-#, fuzzy
-msgid "You are not allowed to delete this bookmark"
-msgstr "Non hai il permesso di eliminare questo preferito"
-
-#: ..\..\..\ajaxDelete.php:33
-#, fuzzy
-msgid "Failed to delete bookmark"
-msgstr "Eliminazione del preferito fallita"
-
-#: ..\..\..\alltags.php:50
-msgid "All Tags"
-msgstr "Tutti i Tags"
-
-#: ..\..\..\alltags.php:59
-#: ..\..\..\populartags.php:63
-#: ..\..\..\profile.php:46
-#: ..\..\..\rss.php:55
-#: ..\..\..\search.php:61
-#: ..\..\..\watch.php:35
-#: ..\..\..\watched.php:62
-#, php-format
-msgid "User with username %s not was not found"
-msgstr "L'utente %s non è stato trovato"
-
-#: ..\..\..\bookmarks.php:71
-#, fuzzy, php-format
-msgid "User with username %s was not found"
-msgstr "L'utente %s non è stato trovato"
-
-#: ..\..\..\bookmarks.php:94
-#: ..\..\..\edit.php:44
-msgid "Your bookmark must have a title and an address"
-msgstr "Il preferito deve avere un titolo ed un indirizzo"
-
-#: ..\..\..\bookmarks.php:114
-#: ..\..\..\edit.php:58
-msgid "Bookmark saved"
-msgstr "Preferito salvato"
-
-#: ..\..\..\bookmarks.php:122
-#: ..\..\..\import.php:99
-#: ..\..\..\importNetscape.php:74
-msgid "There was an error saving your bookmark. Please try again or contact the administrator."
-msgstr "Si è verificato un errore salvando il tuo preferito. Riprova o contatta l'amministratore"
-
-#: ..\..\..\bookmarks.php:160
-#: ..\..\..\templates\toolbar.inc.php:13
-msgid "Add a Bookmark"
-msgstr "Aggiungi un preferito"
-
-#: ..\..\..\bookmarks.php:163
-msgid "Add Bookmark"
-msgstr "Aggiungi preferito"
-
-#: ..\..\..\bookmarks.php:166
-msgid "You must be logged in before you can add bookmarks."
-msgstr "Devi essere loggato per poter aggiungere dei preferiti"
-
-#: ..\..\..\bookmarks.php:213
-#, fuzzy
-msgid "My Bookmarks"
-msgstr "I Miei Preferiti"
-
-#: ..\..\..\edit.php:29
-msgid "Edit Bookmark"
-msgstr "Modifica Preferito"
-
-#: ..\..\..\edit.php:34
-#, fuzzy, php-format
-msgid "Bookmark with id %s not was not found"
-msgstr "Il preferito con id %s non è stato trovato"
-
-#: ..\..\..\edit.php:39
-#, fuzzy
-msgid "You are not allowed to edit this bookmark"
-msgstr "Non hai il permesso per modificare questo preferito"
-
-#: ..\..\..\edit.php:55
-msgid "Error while saving your bookmark"
-msgstr "Errore salvando il preferito"
-
-#: ..\..\..\edit.php:78
-#, fuzzy
-msgid "Failed to delete the bookmark"
-msgstr "Eliminazione preferito fallita"
-
-#: ..\..\..\edit.php:88
-#: ..\..\..\templates\editprofile.tpl.php:52
-msgid "Save Changes"
-msgstr "Salva Modifiche"
-
-#: ..\..\..\functions.inc.php:92
+#: src/SemanticScuttle/functions.php:189
 msgid "message_die() was called multiple times."
 msgstr "message_die() è stato richiamato più volte."
 
-#: ..\..\..\functions.inc.php:104
+#: src/SemanticScuttle/functions.php:201
 msgid "SQL Error"
 msgstr "Errore SQL"
 
-#: ..\..\..\functions.inc.php:110
+#: src/SemanticScuttle/functions.php:207
 msgid "Line"
 msgstr "Linea"
 
-#: ..\..\..\functions.inc.php:110
-#: ..\..\..\templates\importDelicious.tpl.php:8
-#: ..\..\..\templates\importNetscape.tpl.php:9
+#: src/SemanticScuttle/functions.php:207
+#: data/templates/default/importDelicious.tpl.php:8
+#: data/templates/default/importNetscape.tpl.php:9
+#: data/templates/default/importStructure.tpl.php:10
 msgid "File"
 msgstr "File"
 
-#: ..\..\..\functions.inc.php:116
+#: src/SemanticScuttle/functions.php:215
 #, fuzzy
 msgid "Information"
 msgstr "Informazioni"
 
-#: ..\..\..\functions.inc.php:121
+#: src/SemanticScuttle/functions.php:220
 msgid "Critical Information"
 msgstr "Informazioni Importanti"
 
-#: ..\..\..\functions.inc.php:126
+#: src/SemanticScuttle/functions.php:225
 msgid "An error occured"
 msgstr "Si è verificato un errore"
 
-#: ..\..\..\functions.inc.php:129
+#: src/SemanticScuttle/functions.php:228
 msgid "General Error"
 msgstr "Errore Generale"
 
-#: ..\..\..\functions.inc.php:137
+#: src/SemanticScuttle/functions.php:236
 msgid "An critical error occured"
 msgstr "Si è verificato un errore critico"
 
-#: ..\..\..\functions.inc.php:140
+#: src/SemanticScuttle/functions.php:239
 msgid "Critical Error"
 msgstr "Errore Critico"
 
-#: ..\..\..\functions.inc.php:149
+#: src/SemanticScuttle/functions.php:248
 msgid "DEBUG MODE"
 msgstr "MODO DEBUG"
 
-#: ..\..\..\history.php:65
-msgid "History"
+#: data/templates/default/about.tpl.php:6
+msgid ""
+"<strong>Store</strong> all your favourite links in one place, accessible "
+"from anywhere."
 msgstr ""
+"<strong>Archivia</strong> i tuoi Preferiti in un unico luogo, accessibile "
+"ovunque tu sia. "
 
-#: ..\..\..\history.php:66
-#, php-format
-msgid "History for %s"
+#: data/templates/default/about.tpl.php:7
+#, fuzzy
+msgid ""
+"<strong>Share</strong> your bookmarks with everyone, with friends on your "
+"watchlist or just keep them private."
 msgstr ""
+"<strong>Condividi</strong> i tuoi Preferiti con gli altri o mantinili "
+"privati. Potrai restare aggiornato sui Preferiti aggiunti da altri utenti."
 
-#: ..\..\..\history.php:81
-msgid "Address was not found"
+#: data/templates/default/about.tpl.php:8
+msgid ""
+"<strong>Tag</strong> your bookmarks with as many labels as you want, instead "
+"of wrestling with folders."
 msgstr ""
+"<strong>Tagga</strong> i tuoi Preferiti con quante etichette vuoi, anziché "
+"perdere tempo con le cartelle."
 
-#: ..\..\..\import.php:41
-msgid "Could not open XML input"
-msgstr "Non posso aprire la fonte XML"
-
-#: ..\..\..\import.php:45
-#, php-format
-msgid "XML error: %s at line %d"
-msgstr "Errore XML: %s alla linea %d"
-
-#: ..\..\..\import.php:54
-msgid "Import Bookmarks from del.icio.us"
-msgstr "Importa Preferiti da del.icio.us"
-
-#: ..\..\..\import.php:86
-#: ..\..\..\importNetscape.php:64
-#, fuzzy
-msgid "You have already submitted this bookmark."
-msgstr "Hai già inserito questo preferito"
-
-#: ..\..\..\import.php:97
-#: ..\..\..\importNetscape.php:72
+#: data/templates/default/about.tpl.php:9
 #, fuzzy
-msgid "Bookmark imported."
-msgstr "Preferito importato"
-
-#: ..\..\..\importNetscape.php:81
-#, fuzzy
-msgid "Import Bookmarks from Browser File"
-msgstr "Importa Preferiti da un File del Browser"
-
-#: ..\..\..\index.php:32
-msgid "You have now logged out"
-msgstr "Sei uscito dal sistema"
+msgid "Register now"
+msgstr "Registrati"
 
-#: ..\..\..\index.php:39
+#: data/templates/default/about.tpl.php:9
 #, php-format
-msgid "%s: Recent bookmarks"
-msgstr "%s: Preferiti recenti"
-
-#: ..\..\..\index.php:72
-msgid "Store, share and tag your favourite links"
+msgid " to start using %s!"
 msgstr ""
 
-#: ..\..\..\index.php:73
-msgid "Recent Bookmarks"
-msgstr "Preferiti Recenti"
+#: data/templates/default/about.tpl.php:12
+msgid "Geek Stuff"
+msgstr "(Geek Stuff)"
 
-#: ..\..\..\jsScuttle.php:22
-msgid "Are you sure?"
+#: data/templates/default/about.tpl.php:14
+msgid "is licensed under the "
 msgstr ""
 
-#: ..\..\..\jsScuttle.php:22
-msgid "Yes"
+#: data/templates/default/about.tpl.php:14
+msgid "you can freely host it on your own web server."
 msgstr ""
 
-#: ..\..\..\jsScuttle.php:22
-msgid "No"
+#: data/templates/default/about.tpl.php:15
+#, php-format
+msgid ""
+"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 ""
-
-#: ..\..\..\jsScuttle.php:68
-msgid "Available"
+"%1$s supporta la maggioranza delle <a href=\"http://www.delicious.com/help/"
+"api\">del.icio.us <abbr title=\"Application Programming Interface\">API</"
+"abbr></a>. Praticamente tutti i tools progettati per de.icio.us possono "
+"essere modificati per funzionare con %1$s. Se trovi un tool che non lascia "
+"variare indirizzo API, chiedi a chiedi a chi lo ha realizzato di aggiungere "
+"questo settaggio."
+
+#: data/templates/default/about.tpl.php:24
+msgid "Tips"
 msgstr ""
 
-#: ..\..\..\jsScuttle.php:71
-#, fuzzy
-msgid "Not Available"
-msgstr "Nessun preferito disponibile"
-
-#: ..\..\..\login.php:38
-#, fuzzy
-msgid "The details you have entered are incorrect. Please try again."
-msgstr "Le informazioni che hai fornito non sono corrette. Riprova."
+#: data/templates/default/about.tpl.php:26
+msgid "Add search plugin into your browser:"
+msgstr ""
 
-#: ..\..\..\login.php:48
-#: ..\..\..\templates\login.tpl.php:26
-#: ..\..\..\templates\toolbar.inc.php:28
-msgid "Log In"
-msgstr "Entra"
+#: data/templates/default/about.tpl.php:27
+msgid ""
+"The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
+msgstr ""
 
-#: ..\..\..\password.php:31
-msgid "You must enter your username."
+#: data/templates/default/about.tpl.php:28
+msgid ""
+"The secret tag \"system:imported\" allows you to find imported bookmarks."
 msgstr ""
 
-#: ..\..\..\password.php:35
+#: data/templates/default/admin.tpl.php:5
 #, fuzzy
-msgid "You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "<em>Devi</em> inserire un nome utente, una password, un nome ed un indirizzo <abbr title=\"posta elettronica\">e-mail</abbr>."
+msgid "Users management"
+msgstr "Username"
 
-#: ..\..\..\password.php:42
-msgid "No matches found for that username."
+#: data/templates/default/admin.tpl.php:14
+msgid "Public/Shared/Private"
 msgstr ""
 
-#: ..\..\..\password.php:45
+#: data/templates/default/admin.tpl.php:14
+#: data/templates/default/bookmarks.tpl.php:115
 #, fuzzy
-msgid "No matches found for that combination of username and <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "<em>Devi</em> inserire un nome utente, una password, un nome ed un indirizzo <abbr title=\"posta elettronica\">e-mail</abbr>."
+msgid "bookmark(s)"
+msgstr "preferito"
+
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/tag2tagadd.tpl.php:21
+#: data/templates/default/tag2tagdelete.tpl.php:13
+#: data/templates/default/tag2tagedit.tpl.php:14
+#: data/templates/default/tag2tagedit.tpl.php:35
+#: data/templates/default/tagdelete.tpl.php:6 www/jsScuttle.php:24
+msgid "Are you sure?"
+msgstr ""
 
-#: ..\..\..\password.php:53
-#, fuzzy
-msgid "There was an error while generating your new password. Please try again."
-msgstr "Si è verificato un errore salvando il tuo preferito. Riprova o contatta l'amministratore"
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/bookmarks.tpl.php:305
+msgid "Delete"
+msgstr "Elimina"
 
-#: ..\..\..\password.php:57
+#: data/templates/default/admin.tpl.php:27
 #, fuzzy
-msgid "Your new password is:"
-msgstr "Conferma Nuova Password"
+msgid "Other actions"
+msgstr "Istruzioni"
 
-#: ..\..\..\password.php:57
-msgid "To keep your bookmarks secure, you should change this password in your profile the next time you log in."
+#: data/templates/default/admin.tpl.php:29
+msgid "Check all URLs (May take some time)"
 msgstr ""
 
-#: ..\..\..\password.php:60
-#, fuzzy, php-format
-msgid "%s Account Information"
-msgstr "Informazioni"
-
-#: ..\..\..\password.php:62
-#, php-format
-msgid "New password generated and sent to %s"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:16
+msgid ""
+"Collaborative description: these fields can be viewed and modified by every "
+"users"
 msgstr ""
 
-#: ..\..\..\password.php:69
-#, fuzzy
-msgid "Forgotten Password"
-msgstr "Nuova Password"
-
-#: ..\..\..\populartags.php:54
-#: ..\..\..\templates\dynamictags.inc.php:101
-#: ..\..\..\templates\sidebar.block.common.php:9
-#: ..\..\..\templates\sidebar.block.popular.php:15
-#: ..\..\..\templates\sidebar.block.recent.php:25
-msgid "Popular Tags"
-msgstr "Tags Più Utilizzati"
-
-#: ..\..\..\profile.php:54
-#: ..\..\..\watched.php:114
-msgid "Username was not specified"
-msgstr "Nome utente non specificato"
-
-#: ..\..\..\profile.php:60
-#, fuzzy
-msgid "My Profile"
-msgstr "Profilo"
-
-#: ..\..\..\profile.php:62
-#: ..\..\..\templates\sidebar.block.profile.php:12
-msgid "Profile"
-msgstr "Profilo"
-
-#: ..\..\..\profile.php:80
-#, fuzzy
-msgid "Password and confirmation do not match."
-msgstr "La password e la sua conferma non coincidono."
-
-#: ..\..\..\profile.php:84
-#, fuzzy
-msgid "Password must be at least 6 characters long."
-msgstr "La password deve essere lunga almeno 6 caratteri."
-
-#: ..\..\..\profile.php:88
-#, fuzzy
-msgid "E-mail address is not valid."
-msgstr "Indirizzo e-mail non valido."
-
-#: ..\..\..\profile.php:92
-msgid "An error occurred while saving your changes."
-msgstr "Si è verificato un errore salvando le tue modifiche."
-
-#: ..\..\..\profile.php:94
-#, fuzzy
-msgid "Changes saved."
-msgstr "Modifiche salvate."
-
-#: ..\..\..\register.php:33
-#, fuzzy
-msgid "You <em>must</em> enter a username, password and e-mail address."
-msgstr "<em>Devi</em> inserire un nome utente, una password, un nome ed un indirizzo <abbr title=\"posta elettronica\">e-mail</abbr>."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:18
+#: data/templates/default/bookmarks.tpl.php:159
+#: data/templates/default/editbookmark.tpl.php:51
+msgid "Title"
+msgstr "Titolo"
 
-#: ..\..\..\register.php:37
-msgid "This username already exists, please make another choice."
-msgstr "Questo nome utente esiste già, scegline un altro."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:23
+#: data/templates/default/editbookmark.tpl.php:57
+#: data/templates/default/editprofile.tpl.php:53
+#: data/templates/default/profile.tpl.php:33
+#: data/templates/default/tagcommondescriptionedit.tpl.php:13
+#: data/templates/default/tagedit.tpl.php:12
+msgid "Description"
+msgstr "Descrizione"
 
-#: ..\..\..\register.php:41
-#, fuzzy
-msgid "E-mail address is not valid. Please try again."
-msgstr "Indirizzo e-mail non valido."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:31
+#: data/templates/default/tagcommondescriptionedit.tpl.php:21
+msgid "Last modification:"
+msgstr ""
 
-#: ..\..\..\register.php:50
-#, fuzzy
-msgid "You have successfully registered. Enjoy!"
-msgstr "Ti sei registrato con successo. Buon divertimento!"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:43
+#: data/templates/default/tagcommondescriptionedit.tpl.php:33
+#: data/templates/default/tagedit.tpl.php:18
+msgid "Update"
+msgstr ""
 
-#: ..\..\..\register.php:52
-msgid "Registration failed. Please try again."
-msgstr "Registrazione fallita. Riprova."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:44
+#: data/templates/default/editbookmark.tpl.php:111
+#: data/templates/default/tag2tagadd.tpl.php:24
+#: data/templates/default/tag2tagedit.tpl.php:38
+#: data/templates/default/tagcommondescriptionedit.tpl.php:34
+#: data/templates/default/tagedit.tpl.php:19
+#: data/templates/default/tagrename.tpl.php:25
+msgid "Cancel"
+msgstr ""
 
-#: ..\..\..\register.php:57
-#: ..\..\..\templates\register.tpl.php:32
-#: ..\..\..\templates\toolbar.inc.php:27
-msgid "Register"
-msgstr "Registrati"
+#: data/templates/default/bookmarklet.inc.php:1
+msgid "Bookmarklet"
+msgstr "Bookmarklet"
 
-#: ..\..\..\search.inc.php:29
-#: ..\..\..\search.inc.php:57
-msgid "Search"
-msgstr "Cerca"
+#: data/templates/default/bookmarklet.inc.php:11
+#, 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 ""
+"Trascina uno dei seguenti bookmarklets tra i collegamenti del tuo browser e "
+"cliccalo ogni volta che vuoi aggiungere la pagina in cui ti trovi al tuo "
+"account %s "
 
-#: ..\..\..\search.inc.php:35
-#, fuzzy
-msgid "this user's bookmarks"
-msgstr "%s preferiti"
+#: data/templates/default/bookmarklet.inc.php:20
+#, 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 ""
+"Trascina uno dei seguenti bookmarklets tra i collegamenti del tuo browser e "
+"cliccalo ogni volta che vuoi aggiungere la pagina in cui ti trovi al tuo "
+"account %s "
 
-#: ..\..\..\search.inc.php:40
-msgid "my bookmarks"
-msgstr "i miei preferiti"
+#: data/templates/default/bookmarklet.inc.php:67
+#: data/templates/default/bookmarklet.inc.php:100
+#, php-format
+msgid "Post to %s"
+msgstr "Aggiungi a %s"
 
-#: ..\..\..\search.inc.php:41
-#, fuzzy
-msgid "my watchlist"
-msgstr "Metti Sotto Osservazione"
+#: data/templates/default/bookmarklet.inc.php:93
+#: data/templates/default/bookmarklet.inc.php:110
+#, php-format
+msgid "Post to %s (Pop-up)"
+msgstr "Aggiungi a %s (Pop-up)"
 
-#: ..\..\..\search.inc.php:45
-msgid "all bookmarks"
-msgstr "tutti i preferiti"
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:24
+#, php-format
+msgid "Voting <span class=\"voting\">%d</span>"
+msgstr ""
 
-#: ..\..\..\search.inc.php:48
-msgid "for"
-msgstr "per"
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:32
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:35
+msgid "Vote for"
+msgstr ""
 
-#: ..\..\..\search.php:91
-#: ..\..\..\search.php:128
-msgid "Search Bookmarks"
-msgstr "Cerca Preferiti"
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:43
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:46
+msgid "Vote against"
+msgstr ""
 
-#: ..\..\..\search.php:97
-#, fuzzy
-msgid "Search Results"
-msgstr "Risultati della Ricerca"
+#: data/templates/default/bookmarks.tpl.php:43
+msgid "Bookmarks on this page are managed by an admin user."
+msgstr ""
 
-#: ..\..\..\tags.php:38
-#: ..\..\..\templates\editbookmark.tpl.php:44
-#: ..\..\..\templates\sidebar.block.profile.php:13
-msgid "Tags"
-msgstr "Etichette"
+#: data/templates/default/bookmarks.tpl.php:73
+#: data/templates/default/bookmarks.tpl.php:74
+msgid "Edit the common description of this tag"
+msgstr ""
 
-#: ..\..\..\watch.php:79
-#, php-format
-msgid "%s Bookmarks"
-msgstr "%s Preferiti"
+#: data/templates/default/bookmarks.tpl.php:77
+#: data/templates/default/bookmarks.tpl.php:78
+msgid "Edit the common description of this bookmark"
+msgstr ""
 
-#: ..\..\..\watch.php:84
-#, fuzzy
-msgid "User removed from your watchlist"
-msgstr "Utente rimosso dalla tua watchlist"
+#: data/templates/default/bookmarks.tpl.php:98
+#: data/templates/default/bookmarks.tpl.php:99
+msgid "Edit your personal description of this tag"
+msgstr ""
 
-#: ..\..\..\watch.php:86
-#, fuzzy
-msgid "User added to your watchlist"
-msgstr "Utente aggiunto alla tua watchlist"
+#: data/templates/default/bookmarks.tpl.php:115
+#: data/templates/default/tags.tpl.php:10
+#: data/templates/default/users.tpl.php:8
+msgid "Sort by:"
+msgstr "Ordinato per:"
 
-#: ..\..\..\watched.php:105
-#, fuzzy
-msgid "My Watchlist"
-msgstr "Lista Sotto Osservazione"
+#: data/templates/default/bookmarks.tpl.php:157
+msgid "Date"
+msgstr "Data"
 
-#: ..\..\..\watched.php:107
-#: ..\..\..\templates\sidebar.block.profile.php:14
-#: ..\..\..\templates\toolbar.inc.php:12
-#, fuzzy
-msgid "Watchlist"
-msgstr "Lista Sotto Osservazione"
+#: data/templates/default/bookmarks.tpl.php:162
+msgid "Voting"
+msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:6
-msgid "<strong>Store</strong> all your favourite links in one place, accessible from anywhere."
-msgstr "<strong>Archivia</strong> i tuoi Preferiti in un unico luogo, accessibile ovunque tu sia. "
+#: data/templates/default/bookmarks.tpl.php:171
+msgid "Bookmarks from other users for this tag"
+msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:7
-#, fuzzy
-msgid "<strong>Share</strong> your bookmarks with everyone, with friends on your watchlist or just keep them private."
-msgstr "<strong>Condividi</strong> i tuoi Preferiti con gli altri o mantinili privati. Potrai restare aggiornato sui Preferiti aggiunti da altri utenti."
+#: data/templates/default/bookmarks.tpl.php:176
+msgid "Only your bookmarks for this tag"
+msgstr ""
 
-#: ..\..\..\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>Tagga</strong> i tuoi Preferiti con quante etichette vuoi, anziché perdere tempo con le cartelle."
+#: data/templates/default/bookmarks.tpl.php:199
+#: data/templates/default/bookmarks.tpl.php:205
+msgid "First"
+msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:9
-#, fuzzy, php-format
-msgid "<strong><a href=\"register.php\">Register now</a></strong> to start using %s!"
-msgstr "<strong><a href=\"register.php\">Registrati ora</a></strong> per iniziare ad utilizzare %s!"
+#: data/templates/default/bookmarks.tpl.php:200
+#: data/templates/default/bookmarks.tpl.php:206
+msgid "Previous"
+msgstr "Precedente"
 
-#: ..\..\..\templates\about.tpl.php:12
-msgid "Geek Stuff"
-msgstr "(Geek Stuff)"
+#: data/templates/default/bookmarks.tpl.php:213
+#: data/templates/default/bookmarks.tpl.php:216
+msgid "Next"
+msgstr "Seguente"
 
-#: ..\..\..\templates\about.tpl.php:14
-#, php-format
-msgid "%s is based on <a href=\"http://sourceforge.net/projects/scuttle/\">an open-source project</a> licensed under the <a href=\"http://www.gnu.org/copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> General Public License</a>. This means you can host it on your own web server for free, whether it is on the Internet, a private network or just your own computer."
-msgstr "%s è basato su <a href=\"http://sourceforge.net/projects/scuttle/\">un progetto open-source</a>."
+#: data/templates/default/bookmarks.tpl.php:214
+#: data/templates/default/bookmarks.tpl.php:217
+msgid "Last"
+msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:15
+#: data/templates/default/bookmarks.tpl.php:233
 #, php-format
-msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 supporta la maggioranza delle <a href=\"http://www.delicious.com/help/api\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></a>. Praticamente tutti i tools progettati per de.icio.us possono essere modificati per funzionare con %1$s. Se trovi un tool che non lascia variare indirizzo API, chiedi a chiedi a chi lo ha realizzato di aggiungere questo settaggio."
-
-#: ..\..\..\templates\bookmarks.tpl.php:17
-#: ..\..\..\templates\tags.tpl.php:7
-msgid "Sort by:"
-msgstr "Ordinato per:"
-
-#: ..\..\..\templates\bookmarks.tpl.php:18
-msgid "Date"
-msgstr "Data"
-
-#: ..\..\..\templates\bookmarks.tpl.php:19
-#: ..\..\..\templates\editbookmark.tpl.php:34
-msgid "Title"
-msgstr "Titolo"
+msgid "Page %d of %d"
+msgstr "Pagina %d di %d"
 
-#: ..\..\..\templates\bookmarks.tpl.php:23
-msgid "URL"
-msgstr "URL"
+#: data/templates/default/bookmarks.tpl.php:295
+#, fuzzy
+msgid "Tags:"
+msgstr "Etichette"
 
-#: ..\..\..\templates\bookmarks.tpl.php:60
+#: data/templates/default/bookmarks.tpl.php:302
 msgid "Edit"
 msgstr "Modifica"
 
-#: ..\..\..\templates\bookmarks.tpl.php:60
-msgid "Delete"
-msgstr "Elimina"
+#: data/templates/default/bookmarks.tpl.php:310
+msgid "Last update"
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:66
+#: data/templates/default/bookmarks.tpl.php:313
 msgid "by"
 msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:78
+#: data/templates/default/bookmarks.tpl.php:317
+msgid "you"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:333
 #, fuzzy, php-format
 msgid " and %s1 other%s"
 msgstr " e %s altri"
 
-#: ..\..\..\templates\bookmarks.tpl.php:81
+#: data/templates/default/bookmarks.tpl.php:336
 #, fuzzy, php-format
 msgid " and %2$s%1$s others%3$s"
 msgstr " e %s altri"
 
-#: ..\..\..\templates\bookmarks.tpl.php:90
+#: data/templates/default/bookmarks.tpl.php:350
+#, fuzzy
+msgid "Copy this bookmark to YOUR bookmarks."
+msgstr "Importa preferiti da un file"
+
+#: data/templates/default/bookmarks.tpl.php:351
 msgid "Copy"
 msgstr "Copia"
 
-#: ..\..\..\templates\bookmarks.tpl.php:136
-#: ..\..\..\templates\bookmarks.tpl.php:142
-msgid "First"
+#: data/templates/default/bookmarks.tpl.php:376
+msgid "This bookmark is certified by an admin user."
 msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:137
-#: ..\..\..\templates\bookmarks.tpl.php:143
-msgid "Previous"
-msgstr "Precedente"
-
-#: ..\..\..\templates\bookmarks.tpl.php:150
-#: ..\..\..\templates\bookmarks.tpl.php:153
-msgid "Next"
-msgstr "Seguente"
+#: data/templates/default/bookmarks.tpl.php:430
+#, fuzzy
+msgid "Private Note on this bookmark"
+msgstr "Non hai il permesso per modificare questo preferito"
 
-#: ..\..\..\templates\bookmarks.tpl.php:151
-#: ..\..\..\templates\bookmarks.tpl.php:154
-msgid "Last"
+#: data/templates/default/bookmarks.tpl.php:444
+msgid "Come back to the top of this page."
 msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:156
-#, php-format
-msgid "Page %d of %d"
-msgstr "Pagina %d di %d"
+#: data/templates/default/bookmarks.tpl.php:444
+msgid "Top of the page"
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:160
+#: data/templates/default/bookmarks.tpl.php:450
 msgid "No bookmarks available"
 msgstr "Nessun preferito disponibile"
 
-#: ..\..\..\templates\dynamictags.inc.php:108
-#: ..\..\..\templates\sidebar.block.common.php:15
-#: ..\..\..\templates\sidebar.block.popular.php:21
-#: ..\..\..\templates\sidebar.block.recent.php:20
-#: ..\..\..\templates\tags.tpl.php:16
+#: data/templates/default/bottom.inc.php:5
+#: data/templates/default/toolbar.inc.php:15
+#: data/templates/default/toolbar.inc.php:28 www/about.php:23 www/about.php:24
+msgid "About"
+msgstr "Informazioni"
+
+#: data/templates/default/bottom.inc.php:7
+msgid "Propulsed by "
+msgstr ""
+
+#: data/templates/default/dynamictags.inc.php:56
+#: data/templates/default/sidebar.block.common.php:19
+#: data/templates/default/sidebar.block.popular.php:34
+#: data/templates/default/sidebar.block.recent.php:29
+#: data/templates/default/tags.tpl.php:19
 #, fuzzy
 msgid "bookmark"
 msgid_plural "bookmarks"
 msgstr[0] "preferito"
 msgstr[1] "preferiti"
 
-#: ..\..\..\templates\editbookmark.tpl.php:29
+#: data/templates/default/dynamictags.inc.php:105
+#: data/templates/default/sidebar.block.common.php:9
+#: data/templates/default/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.popular.php:23
+#: data/templates/default/sidebar.block.recent.php:34
+#: data/templates/default/toolbar.inc.php:27 www/populartags.php:46
+msgid "Popular Tags"
+msgstr "Tags Più Utilizzati"
+
+#: data/templates/default/dynamictags.inc.php:108
+#, fuzzy
+msgid "Popular Tags From All Users"
+msgstr "Tags Più Utilizzati"
+
+#: data/templates/default/editbookmark.tpl.php:46
 msgid "Address"
 msgstr "Indirizzo"
 
-#: ..\..\..\templates\editbookmark.tpl.php:31
-#: ..\..\..\templates\editbookmark.tpl.php:36
-#: ..\..\..\templates\editprofile.tpl.php:31
+#: data/templates/default/editbookmark.tpl.php:48
+#: data/templates/default/editbookmark.tpl.php:53
+#: data/templates/default/editprofile.tpl.php:29
+#: data/templates/default/tagrename.tpl.php:14
+#: data/templates/default/tagrename.tpl.php:19
 msgid "Required"
 msgstr "Obbligatorio"
 
-#: ..\..\..\templates\editbookmark.tpl.php:39
-#: ..\..\..\templates\editprofile.tpl.php:47
-#: ..\..\..\templates\profile.tpl.php:28
-msgid "Description"
-msgstr "Descrizione"
+#: data/templates/default/editbookmark.tpl.php:58
+msgid "Add Note"
+msgstr ""
 
-#: ..\..\..\templates\editbookmark.tpl.php:46
+#: data/templates/default/editbookmark.tpl.php:61
+msgid ""
+"You can use anchors to delimite attributes. for example: [publisher]blah[/"
+"publisher] "
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:64
+msgid "Suggested anchors: "
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:76
+#, fuzzy
+msgid "Private Note"
+msgstr "Privato"
+
+#: data/templates/default/editbookmark.tpl.php:78
+msgid "Just visible by you and your contacts."
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:82
+#: data/templates/default/toolbar.inc.php:10 www/tags.php:45 www/tags.php:67
+msgid "Tags"
+msgstr "Etichette"
+
+#: data/templates/default/editbookmark.tpl.php:86
 msgid "Comma-separated"
 msgstr "Saparati da virgola"
 
-#: ..\..\..\templates\editbookmark.tpl.php:49
-#: ..\..\..\templates\importDelicious.tpl.php:15
-#: ..\..\..\templates\importNetscape.tpl.php:16
+#: data/templates/default/editbookmark.tpl.php:90
+#: data/templates/default/tag2tagadd.tpl.php:9
+msgid ""
+"Note: use \">\" to include one tag in another. e.g.: europe>france>paris"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:94
+#: data/templates/default/tag2tagadd.tpl.php:8
+msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:97
+#: data/templates/default/importDelicious.tpl.php:15
+#: data/templates/default/importNetscape.tpl.php:16
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ..\..\..\templates\editbookmark.tpl.php:52
-#: ..\..\..\templates\importDelicious.tpl.php:18
-#: ..\..\..\templates\importNetscape.tpl.php:19
+#: data/templates/default/editbookmark.tpl.php:100
+#: data/templates/default/importDelicious.tpl.php:18
+#: data/templates/default/importNetscape.tpl.php:19
 msgid "Public"
 msgstr "Pubblico"
 
-#: ..\..\..\templates\editbookmark.tpl.php:53
-#: ..\..\..\templates\importDelicious.tpl.php:19
-#: ..\..\..\templates\importNetscape.tpl.php:20
+#: data/templates/default/editbookmark.tpl.php:101
 msgid "Shared with Watch List"
 msgstr "Condiviso con chi tieni sotto osservazione"
 
-#: ..\..\..\templates\editbookmark.tpl.php:54
-#: ..\..\..\templates\importDelicious.tpl.php:20
-#: ..\..\..\templates\importNetscape.tpl.php:21
+#: data/templates/default/editbookmark.tpl.php:102
+#: data/templates/default/importDelicious.tpl.php:20
+#: data/templates/default/importNetscape.tpl.php:21
 msgid "Private"
 msgstr "Privato"
 
-#: ..\..\..\templates\editbookmark.tpl.php:66
+#: data/templates/default/editbookmark.tpl.php:115
 msgid "Delete Bookmark"
 msgstr "Elimina Preferito"
 
-#: ..\..\..\templates\editbookmark.tpl.php:93
-msgid "Bookmarklet"
-msgstr "Bookmarklet"
-
-#: ..\..\..\templates\editbookmark.tpl.php:94
-#, 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 "Trascina uno dei seguenti bookmarklets tra i collegamenti del tuo browser e cliccalo ogni volta che vuoi aggiungere la pagina in cui ti trovi al tuo account %s "
-
-#: ..\..\..\templates\editbookmark.tpl.php:106
-#, php-format
-msgid "Post to %s"
-msgstr "Aggiungi a %s"
-
-#: ..\..\..\templates\editbookmark.tpl.php:107
-#, php-format
-msgid "Post to %s (Pop-up)"
-msgstr "Aggiungi a %s (Pop-up)"
+#: data/templates/default/editbookmark.tpl.php:120
+msgid "edit common description"
+msgstr ""
 
-#: ..\..\..\templates\editbookmark.tpl.php:111
-#: ..\..\..\templates\importDelicious.tpl.php:26
-#: ..\..\..\templates\importNetscape.tpl.php:27
+#: data/templates/default/editbookmark.tpl.php:212
+#: data/templates/default/importDelicious.tpl.php:26
+#: data/templates/default/importNetscape.tpl.php:27
+#: data/templates/default/importStructure.tpl.php:16
 msgid "Import"
 msgstr "Importa"
 
-#: ..\..\..\templates\editbookmark.tpl.php:113
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Import bookmarks from bookmark file"
 msgstr "Importa preferiti da un file"
 
-#: ..\..\..\templates\editbookmark.tpl.php:113
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Internet Explorer, Mozilla Firefox and Netscape"
 msgstr "Internet Explorer, Mozilla Firefox e Netscape"
 
-#: ..\..\..\templates\editbookmark.tpl.php:114
+#: data/templates/default/editbookmark.tpl.php:215
 msgid "Import bookmarks from del.icio.us"
 msgstr "Importa preferiti da del.icio.us"
 
-#: ..\..\..\templates\editprofile.tpl.php:10
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:11
+msgid "SSL client certificates"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:17
+msgid "Serial"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:45
+#: data/templates/default/profile.tpl.php:17
+msgid "Name"
+msgstr "Nome"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:19
+#: data/templates/default/profile.tpl.php:11
+#, fuzzy
+msgid "Email"
+msgstr "E-mail"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:20
+msgid "Issuer"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:30
+#, fuzzy
+msgid "delete"
+msgstr "Elimina"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:43
+msgid "No certificates registered"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:48
+msgid "Your current certificate is already registered with your account."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:53
+msgid "Register current certificate to automatically login."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:59
+msgid "Your browser does not provide a certificate."
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:8
 msgid "Account Details"
 msgstr ""
 
-#: ..\..\..\templates\editprofile.tpl.php:14
-#: ..\..\..\templates\login.tpl.php:15
-#: ..\..\..\templates\password.tpl.php:10
-#: ..\..\..\templates\profile.tpl.php:7
-#: ..\..\..\templates\register.tpl.php:16
+#: data/templates/default/editprofile.tpl.php:12
+#: data/templates/default/login.tpl.php:21
+#: data/templates/default/password.tpl.php:10
+#: data/templates/default/profile.tpl.php:6
+#: data/templates/default/register.tpl.php:16
 msgid "Username"
 msgstr "Username"
 
-#: ..\..\..\templates\editprofile.tpl.php:19
+#: data/templates/default/editprofile.tpl.php:17
 msgid "New Password"
 msgstr "Nuova Password"
 
-#: ..\..\..\templates\editprofile.tpl.php:24
+#: data/templates/default/editprofile.tpl.php:22
 #, fuzzy
 msgid "Confirm Password"
 msgstr "Conferma Nuova Password"
 
-#: ..\..\..\templates\editprofile.tpl.php:29
-#: ..\..\..\templates\register.tpl.php:26
+#: data/templates/default/editprofile.tpl.php:27
+#: data/templates/default/password.tpl.php:14
+#: data/templates/default/register.tpl.php:26
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ..\..\..\templates\editprofile.tpl.php:35
-msgid "Personal Details"
+#: data/templates/default/editprofile.tpl.php:32
+#, fuzzy
+msgid "Private RSS Feed"
+msgstr "Privato"
+
+#: data/templates/default/editprofile.tpl.php:34
+msgid "Enable"
 msgstr ""
 
-#: ..\..\..\templates\editprofile.tpl.php:39
-#: ..\..\..\templates\profile.tpl.php:12
-msgid "Name"
-msgstr "Nome"
+#: data/templates/default/editprofile.tpl.php:36
+#, fuzzy
+msgid "Generate New Key"
+msgstr "Nuova Password"
 
-#: ..\..\..\templates\editprofile.tpl.php:43
-#: ..\..\..\templates\profile.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:41
+msgid "Personal Details"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:49
+#: data/templates/default/profile.tpl.php:23
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ..\..\..\templates\error.404.tpl.php:5
+#: data/templates/default/editprofile.tpl.php:58 www/edit.php:113
+msgid "Save Changes"
+msgstr "Salva Modifiche"
+
+#: data/templates/default/editprofile.tpl.php:63
+#: data/templates/default/sidebar.block.tagactions.php:17
+#: data/templates/default/sidebar.block.watchstatus.php:18
+#, fuzzy
+msgid "Actions"
+msgstr "Istruzioni"
+
+#: data/templates/default/editprofile.tpl.php:66
+#, fuzzy
+msgid "Export bookmarks"
+msgstr "i miei preferiti"
+
+#: data/templates/default/editprofile.tpl.php:68
+msgid "HTML file (for browsers)"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:69
+msgid "XML file (like del.icio.us)"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:70
+msgid "CSV file (for spreadsheet tools)"
+msgstr ""
+
+#: data/templates/default/error.404.tpl.php:5
 #, fuzzy
 msgid "Not Found"
 msgstr "Non Trovato"
 
-#: ..\..\..\templates\error.404.tpl.php:6
+#: data/templates/default/error.404.tpl.php:6
 msgid "The requested URL was not found on this server"
 msgstr "URL non trovata"
 
-#: ..\..\..\templates\error.500.tpl.php:5
+#: data/templates/default/error.500.tpl.php:5
 msgid "General server error"
 msgstr "Errore generale del server"
 
-#: ..\..\..\templates\error.500.tpl.php:6
+#: data/templates/default/error.500.tpl.php:6
 msgid "The requested URL could not be processed"
 msgstr "URL non eseguibile"
 
-#: ..\..\..\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 "Fai il Log-in e vai alla <a href=\"http://del.icio.us/api/posts/all\">export page di del.icio.us</a>"
+#: data/templates/default/importDelicious.tpl.php:19
+#: data/templates/default/importNetscape.tpl.php:20
+#, fuzzy
+msgid "Shared with Watchlist"
+msgstr "Condiviso con chi tieni sotto osservazione"
+
+#: data/templates/default/importDelicious.tpl.php:31
+#: data/templates/default/importNetscape.tpl.php:32
+#: data/templates/default/importStructure.tpl.php:21
+msgid "Instructions"
+msgstr "Istruzioni"
+
+#: data/templates/default/importDelicious.tpl.php:33
+#, fuzzy
+msgid ""
+"Log in to the <a href=\"https://api.del.icio.us/v1/posts/all\">export page "
+"at del.icio.us</a>"
+msgstr ""
+"Fai il Log-in e vai alla <a href=\"http://del.icio.us/api/posts/all\">export "
+"page di 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 "Salva il file <abbr title=\"Extensible Markup Language\">XML</abbr> nel tuo computer"
+#: data/templates/default/importDelicious.tpl.php:34
+msgid ""
+"Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> "
+"file to your computer"
+msgstr ""
+"Salva il file <abbr title=\"Extensible Markup Language\">XML</abbr> nel tuo "
+"computer"
 
-#: ..\..\..\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 "Clicca <kbd>Sfoglia...</kbd> per trovare il file nel tuo computer. La dimensione massima accettata è 1MB"
+#: data/templates/default/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 ""
+"Clicca <kbd>Sfoglia...</kbd> per trovare il file nel tuo computer. La "
+"dimensione massima accettata è 1MB"
 
-#: ..\..\..\templates\importDelicious.tpl.php:36
-#: ..\..\..\templates\importNetscape.tpl.php:43
+#: data/templates/default/importDelicious.tpl.php:36
+#: data/templates/default/importNetscape.tpl.php:43
 msgid "Select the default privacy setting for your imported bookmarks"
 msgstr "Seleziona il livello di privacy predefinito per i preferiti importati"
 
-#: ..\..\..\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 "Clicca <kbd>Importa</kbd> per cominciare ad importare i preferiti; questa operazione può richiedere qualche minuto"
-
-#: ..\..\..\templates\importNetscape.tpl.php:32
-msgid "Instructions"
-msgstr "Istruzioni"
+#: data/templates/default/importDelicious.tpl.php:37
+#: data/templates/default/importNetscape.tpl.php:44
+msgid ""
+"Click <kbd>Import</kbd> to start importing the bookmarks; it may take a "
+"minute"
+msgstr ""
+"Clicca <kbd>Importa</kbd> per cominciare ad importare i preferiti; questa "
+"operazione può richiedere qualche minuto"
 
-#: ..\..\..\templates\importNetscape.tpl.php:35
+#: data/templates/default/importNetscape.tpl.php:35
 msgid "Export your bookmarks from your browser to a file"
 msgstr "Esporta i tuoi preferiti dal tuo browser ad un file"
 
-#: ..\..\..\templates\importNetscape.tpl.php:37
+#: data/templates/default/importNetscape.tpl.php:37
 #, fuzzy
-msgid "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
-msgstr "Internet Explorer: <kbd>File > Importa ed Esporta... > Esporta Preferiti"
+msgid ""
+"Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
+msgstr ""
+"Internet Explorer: <kbd>File > Importa ed Esporta... > Esporta Preferiti"
 
-#: ..\..\..\templates\importNetscape.tpl.php:38
+#: data/templates/default/importNetscape.tpl.php:38
 #, fuzzy
-msgid "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; Export..."
-msgstr "Mozilla Firefox: <kbd>Segnalibri > Gestione Segnalibri... > File > Esporta..."
+msgid ""
+"Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
+"Export..."
+msgstr ""
+"Mozilla Firefox: <kbd>Segnalibri > Gestione Segnalibri... > File > Esporta..."
 
-#: ..\..\..\templates\importNetscape.tpl.php:39
+#: data/templates/default/importNetscape.tpl.php:39
 #, fuzzy
-msgid "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
-msgstr "Netscape: <kbd>Bookmarks > Gestione Bookmarks... > Strumenti > Esporta..."
+msgid ""
+"Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
+msgstr ""
+"Netscape: <kbd>Bookmarks > Gestione Bookmarks... > Strumenti > Esporta..."
 
-#: ..\..\..\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 "Clicca <kbd>Sfoglia...</kbd> per trovare il file salvato sul tuo computer. La dimensione massima consentita è 1MB"
+#: data/templates/default/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 ""
+"Clicca <kbd>Sfoglia...</kbd> per trovare il file salvato sul tuo computer. "
+"La dimensione massima consentita è 1MB"
 
-#: ..\..\..\templates\login.tpl.php:20
-#: ..\..\..\templates\register.tpl.php:21
+#: data/templates/default/importStructure.tpl.php:24
+msgid "Create your structure into a simple text file and following this model:"
+msgstr ""
+
+#: data/templates/default/importStructure.tpl.php:35
+msgid ""
+"Then import the file. The tags and their relations will be added to your "
+"profile."
+msgstr ""
+
+#: data/templates/default/login.tpl.php:13
+msgid "Please activate cookies"
+msgstr ""
+
+#: data/templates/default/login.tpl.php:26
+#: data/templates/default/register.tpl.php:21
 msgid "Password"
 msgstr "Password"
 
-#: ..\..\..\templates\login.tpl.php:22
+#: data/templates/default/login.tpl.php:28
 msgid "Don't ask for my password for 2 weeks"
 msgstr "Non chiedermi la password per 2 settimane"
 
-#: ..\..\..\templates\login.tpl.php:30
+#: data/templates/default/login.tpl.php:32
+#: data/templates/default/toolbar.inc.php:29 www/login.php:57
+msgid "Log In"
+msgstr "Entra"
+
+#: data/templates/default/login.tpl.php:36
 msgid "Forgotten your password?"
 msgstr ""
 
-#: ..\..\..\templates\password.tpl.php:5
+#: data/templates/default/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."
+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 ""
 
-#: ..\..\..\templates\password.tpl.php:14
-msgid "<abbr title=\"Electronic mail\">E-mail</abbr>"
-msgstr "<abbr title=\"Posta elettronica\">E-mail</abbr>"
-
-#: ..\..\..\templates\password.tpl.php:19
+#: data/templates/default/password.tpl.php:19
 #, fuzzy
 msgid "Generate Password"
 msgstr "Nuova Password"
 
-#: ..\..\..\templates\profile.tpl.php:23
+#: data/templates/default/profile.tpl.php:28
 msgid "Member Since"
 msgstr "Iscritto  Dal"
 
-#: ..\..\..\templates\profile.tpl.php:35
-#: ..\..\..\templates\sidebar.block.watchlist.php:8
+#: data/templates/default/profile.tpl.php:40
+#: data/templates/default/sidebar.block.watchlist.php:30
 #, fuzzy
 msgid "Watching"
 msgstr "Lista Sotto Osservazione"
 
-#: ..\..\..\templates\profile.tpl.php:50
+#: data/templates/default/profile.tpl.php:55
+#: data/templates/default/sidebar.block.watchlist.php:52
 #, fuzzy
 msgid "Watched By"
 msgstr "Sotto Osservazione Di"
 
-#: ..\..\..\templates\register.tpl.php:11
-#, fuzzy, php-format
-msgid "Sign up here to create a free %s account. All the information requested below is required"
-msgstr "Registrati per creare un account gratuito con %s. Tutte le informazioni richieste sono obbligatorie."
+#: data/templates/default/profile.tpl.php:68
+#: data/templates/default/toolbar.inc.php:9
+#, fuzzy
+msgid "Bookmarks"
+msgstr "%s Preferiti"
 
-#: ..\..\..\templates\rss.tpl.php:9
+#: data/templates/default/profile.tpl.php:69
+#, fuzzy
+msgid "Go to bookmarks"
+msgstr "i miei preferiti"
+
+#: data/templates/default/register.tpl.php:11
 #, fuzzy, php-format
-msgid "Recent bookmarks posted to %s"
-msgstr "Preferiti inseriti di recente"
+msgid ""
+"Sign up here to create a free %s account. All the information requested "
+"below is required"
+msgstr ""
+"Registrati per creare un account gratuito con %s. Tutte le informazioni "
+"richieste sono obbligatorie."
 
-#: ..\..\..\templates\rss.tpl.php:17
-#: ..\..\..\templates\rss.tpl.php:19
-msgid "No bookmarks found"
-msgstr "Nessun preferito trovato"
+#: data/templates/default/register.tpl.php:18
+msgid ""
+" at least 5 characters, alphanumeric (no spaces, no dots or other special "
+"ones)"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:28
+msgid " to send you your password if you forget it"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:33
+msgid "Antispam question"
+msgstr ""
 
-#: ..\..\..\templates\sidebar.block.recent.php:15
+#: data/templates/default/register.tpl.php:41
+#: data/templates/default/toolbar.inc.php:31 www/register.php:99
+msgid "Register"
+msgstr "Registrati"
+
+#: data/templates/default/search.menu.php:27
+#, fuzzy
+msgid "Search..."
+msgstr "Cerca"
+
+#: data/templates/default/search.menu.php:28
+#, fuzzy
+msgid "in"
+msgstr "Linea"
+
+#: data/templates/default/search.menu.php:34
+#, fuzzy
+msgid "this user's bookmarks"
+msgstr "%s preferiti"
+
+#: data/templates/default/search.menu.php:39
+msgid "my bookmarks"
+msgstr "i miei preferiti"
+
+#: data/templates/default/search.menu.php:40
+#, fuzzy
+msgid "my watchlist"
+msgstr "Metti Sotto Osservazione"
+
+#: data/templates/default/search.menu.php:44
+msgid "all bookmarks"
+msgstr "tutti i preferiti"
+
+#: data/templates/default/search.menu.php:54
+msgid "Search"
+msgstr "Cerca"
+
+#: data/templates/default/sidebar.block.linked.php:23
+#, fuzzy
+msgid "Linked Tags"
+msgstr "Tags Correlati"
+
+#: data/templates/default/sidebar.block.linked.php:28
+#: data/templates/default/sidebar.block.menu.php:46
+msgid "Add new link"
+msgstr ""
+
+#: data/templates/default/sidebar.block.linked.php:29
+#: data/templates/default/sidebar.block.menu.php:47
+#, fuzzy
+msgid "Delete link"
+msgstr "Elimina"
+
+#: data/templates/default/sidebar.block.menu.php:35
+#, php-format
+msgid "Tags included into the tag '%s'"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:35
+#, fuzzy
+msgid "Menu Tags"
+msgstr "Tags Recenti"
+
+#: data/templates/default/sidebar.block.menu.php:68
+msgid "See all your tags"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:68
+msgid "all your tags"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:70
+msgid "See all tags from this user"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:70
+msgid "all tags from this user"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:74
+#, fuzzy
+msgid "See popular tags"
+msgstr "Tags Più Utilizzati"
+
+#: data/templates/default/sidebar.block.menu2.php:21
+#, fuzzy
+msgid "Featured Menu Tags"
+msgstr "Tags Correlati"
+
+#: data/templates/default/sidebar.block.menu2.php:25
+msgid "This menu is composed of keywords (tags) organized by admins."
+msgstr ""
+
+#: data/templates/default/sidebar.block.recent.php:18
 #, fuzzy
 msgid "Recent Tags"
 msgstr "Tags Recenti"
 
-#: ..\..\..\templates\sidebar.block.related.php:15
+#: data/templates/default/sidebar.block.related.php:26
 msgid "Related Tags"
 msgstr "Tags Correlati"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:10
+#: data/templates/default/sidebar.block.search.php:28
+#, fuzzy
+msgid "Last Searches"
+msgstr "Cerca"
+
+#: data/templates/default/sidebar.block.search.php:40
+#, fuzzy
+msgid "Number of bookmarks for this query"
+msgstr "Nessun preferito trovato"
+
+#: data/templates/default/sidebar.block.tagactions.php:9 www/tagrename.php:72
+#, fuzzy
+msgid "Rename Tag"
+msgid_plural "Rename Tags"
+msgstr[0] "Tags Correlati"
+msgstr[1] "Tags Correlati"
+
+#: data/templates/default/sidebar.block.tagactions.php:22 www/tagdelete.php:54
+#, fuzzy
+msgid "Delete Tag"
+msgstr "Elimina"
+
+#: data/templates/default/sidebar.block.tagactions.php:24 www/tagedit.php:61
+#, fuzzy
+msgid "Edit Tag Description"
+msgstr "Descrizione"
+
+#: data/templates/default/sidebar.block.tagactions.php:26
+#: www/tagcommondescriptionedit.php:76
+msgid "Edit Tag Common Description"
+msgstr ""
+
+#: data/templates/default/sidebar.block.tagactions.php:28
+msgid "Create a link to another tag"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:14
+msgid "New Users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:23
+#: data/templates/default/users.tpl.php:24
+#, fuzzy
+msgid "bookmarks"
+msgstr "preferito"
+
+#: data/templates/default/sidebar.block.users.php:30
+msgid "See all users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:30
+msgid "All users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:19
+msgid "Close contacts are mutual contacts"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:19
+msgid "Close contacts"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:36
+msgid "Add a contact..."
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:36
+msgid "Type a username to add it to your contacts."
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:44
+#, fuzzy
+msgid "Remove this contact"
+msgstr "Rimuovi da Sotto Osservazione"
+
+#: data/templates/default/sidebar.block.watchstatus.php:11
 msgid "Remove from Watchlist"
 msgstr "Rimuovi da Sotto Osservazione"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:12
+#: data/templates/default/sidebar.block.watchstatus.php:13
 msgid "Add to Watchlist"
 msgstr "Metti Sotto Osservazione"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:17
+#: data/templates/default/sidebar.linkedtags.inc.php:18
 #, fuzzy
-msgid "Actions"
-msgstr "Istruzioni"
+msgid "Edit link"
+msgstr "Modifica"
+
+#: data/templates/default/sidebar.linkedtags.inc.php:47
+msgid "Synonyms:"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:12
+msgid "Create new link:"
+msgstr ""
+
+#: data/templates/default/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\tags.tpl.php:8
+#: data/templates/default/tag2tagadd.tpl.php:23
+#: data/templates/default/tag2tagedit.tpl.php:37
+msgid "Create"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:35
+#: data/templates/default/tag2tagdelete.tpl.php:27
+#: data/templates/default/tag2tagedit.tpl.php:51
+msgid "Existing links:"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:53
+#: data/templates/default/tag2tagdelete.tpl.php:45
+#: data/templates/default/tag2tagedit.tpl.php:69
+msgid "No links"
+msgstr ""
+
+#: data/templates/default/tag2tagdelete.tpl.php:15
+#: data/templates/default/tag2tagedit.tpl.php:16
+#: data/templates/default/tagdelete.tpl.php:8 www/jsScuttle.php:24
+msgid "Yes"
+msgstr ""
+
+#: data/templates/default/tag2tagdelete.tpl.php:16
+#: data/templates/default/tag2tagedit.tpl.php:17
+#: data/templates/default/tagdelete.tpl.php:9 www/jsScuttle.php:24
+msgid "No"
+msgstr ""
+
+#: data/templates/default/tag2tagedit.tpl.php:6
+msgid "Delete the link"
+msgstr ""
+
+#: data/templates/default/tag2tagedit.tpl.php:29
+msgid "Create new link"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:12
+msgid "Old"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:17
+msgid "New"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:24
+#, fuzzy
+msgid "Rename"
+msgstr "Username"
+
+#: data/templates/default/tags.tpl.php:11
+#: data/templates/default/users.tpl.php:9
 msgid "Alphabet"
 msgstr ""
 
-#: ..\..\..\templates\tags.tpl.php:9
+#: data/templates/default/tags.tpl.php:12
+#: data/templates/default/users.tpl.php:10
 #, fuzzy
 msgid "Popularity"
 msgstr "Tags Più Utilizzati"
 
-#: ..\..\..\templates\toolbar.inc.php:11
+#: data/templates/default/toolbar.inc.php:8
+#: data/templates/default/toolbar.inc.php:26
 #, fuzzy
-msgid "Bookmarks"
-msgstr "%s Preferiti"
+msgid "Home"
+msgstr "Homepage"
+
+#: data/templates/default/toolbar.inc.php:11 www/watchlist.php:106
+#, fuzzy
+msgid "Watchlist"
+msgstr "Lista Sotto Osservazione"
 
-#: ..\..\..\templates\toolbar.inc.php:16
+#: data/templates/default/toolbar.inc.php:12 www/profile.php:79
+msgid "Profile"
+msgstr "Profilo"
+
+#: data/templates/default/toolbar.inc.php:13 www/bookmarks.php:215
+msgid "Add a Bookmark"
+msgstr "Aggiungi un preferito"
+
+#: data/templates/default/toolbar.inc.php:14
 msgid "Log Out"
 msgstr "Esci"
 
+#: data/templates/default/toolbar.inc.php:17
+msgid "Admin"
+msgstr ""
+
+#: data/templates/default/top.inc.php:57
+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/default/users.tpl.php:20
+#, fuzzy
+msgid "profile"
+msgstr "Profilo"
+
+#: data/templates/default/users.tpl.php:21
+msgid "created in"
+msgstr ""
+
+#: www/admin.php:32
+msgid "Manage users"
+msgstr ""
+
+#: www/admin.php:69
+#, php-format
+msgid "%s and all his bookmarks and tags were deleted."
+msgstr ""
+
+#: www/admin.php:76
+msgid "Problem with "
+msgstr ""
+
+#: www/ajaxDelete.php:37
+#, fuzzy
+msgid "You are not allowed to delete this bookmark"
+msgstr "Non hai il permesso di eliminare questo preferito"
+
+#: www/ajaxDelete.php:41 www/edit.php:103
+#, fuzzy
+msgid "Failed to delete bookmark"
+msgstr "Eliminazione del preferito fallita"
+
+#: www/alltags.php:50
+msgid "All Tags"
+msgstr "Tutti i Tags"
+
+#: www/alltags.php:56 www/bookmarks.php:99 www/populartags.php:52
+#: www/profile.php:55 www/rss.php:100 www/search.php:111 www/watch.php:45
+#: www/watchlist.php:61
+#, fuzzy, php-format
+msgid "User with username %s was not found"
+msgstr "L'utente %s non è stato trovato"
+
+#: 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 ""
+
+#: www/bookmarkcommondescriptionedit.php:60
+msgid "Bookmark common description updated"
+msgstr ""
+
+#: www/bookmarkcommondescriptionedit.php:63
+#, fuzzy
+msgid "Failed to update the bookmark common description"
+msgstr "Eliminazione preferito fallita"
+
+#: www/bookmarkcommondescriptionedit.php:71
+msgid "Edit Bookmark Common Description"
+msgstr ""
+
+#: www/bookmarks.php:114 www/tags.php:47
+msgid "Remove the tag from the selection"
+msgstr ""
+
+#: www/bookmarks.php:134 www/edit.php:65
+msgid "Your bookmark must have a title and an address"
+msgstr "Il preferito deve avere un titolo ed un indirizzo"
+
+#: www/bookmarks.php:139
+msgid "This bookmark URL may not be added"
+msgstr ""
+
+#: www/bookmarks.php:158 www/edit.php:83 www/edit.php:86
+msgid "Bookmark saved"
+msgstr "Preferito salvato"
+
+#: www/bookmarks.php:158
+msgid "(Come back to previous page.)"
+msgstr ""
+
+#: www/bookmarks.php:165 www/import.php:106 www/importNetscape.php:108
+msgid ""
+"There was an error saving your bookmark. Please try again or contact the "
+"administrator."
+msgstr ""
+"Si è verificato un errore salvando il tuo preferito. Riprova o contatta "
+"l'amministratore"
+
+#: www/bookmarks.php:222
+msgid "Add Bookmark"
+msgstr "Aggiungi preferito"
+
+#: www/bookmarks.php:225
+msgid "You must be logged in before you can add bookmarks."
+msgstr "Devi essere loggato per poter aggiungere dei preferiti"
+
+#: www/bookmarks.php:270
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: www/bookmarks.php:283
+#, php-format
+msgid "%s: %s (+private %s)"
+msgstr ""
+
+#: www/bookmarks.php:305 www/bookmarks.php:306
+#, fuzzy
+msgid "My Bookmarks"
+msgstr "I Miei Preferiti"
+
+#: www/edit.php:44 www/edit.php:45
+msgid "Edit Bookmark"
+msgstr "Modifica Preferito"
+
+#: www/edit.php:51
+#, fuzzy, php-format
+msgid "Bookmark with id %s not was not found"
+msgstr "Il preferito con id %s non è stato trovato"
+
+#: www/edit.php:57
+#, fuzzy
+msgid "You are not allowed to edit this bookmark"
+msgstr "Non hai il permesso per modificare questo preferito"
+
+#: www/edit.php:77
+msgid "Error while saving your bookmark"
+msgstr "Errore salvando il preferito"
+
+#: 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/import.php:47
+msgid "Could not open XML input"
+msgstr "Non posso aprire la fonte XML"
+
+#: www/import.php:51
+#, php-format
+msgid "XML error: %s at line %d"
+msgstr "Errore XML: %s alla linea %d"
+
+#: www/import.php:60
+msgid "Import Bookmarks from del.icio.us"
+msgstr "Importa Preferiti da del.icio.us"
+
+#: www/import.php:93
+#, fuzzy
+msgid "You have already submitted this bookmark."
+msgstr "Hai già inserito questo preferito"
+
+#: www/import.php:104
+#, fuzzy
+msgid "Bookmark imported."
+msgstr "Preferito importato"
+
+#: www/importNetscape.php:95
+#, fuzzy
+msgid "You have already submitted some of these bookmarks."
+msgstr "Hai già inserito questo preferito"
+
+#: www/importNetscape.php:115
+#, fuzzy
+msgid "Bookmarks found: "
+msgstr "Nessun preferito trovato"
+
+#: www/importNetscape.php:116
+#, fuzzy
+msgid "Bookmarks imported: "
+msgstr "Preferito importato"
+
+#: www/importNetscape.php:117 www/importNetscape.php:122
+#, fuzzy
+msgid "Import Bookmarks from Browser File"
+msgstr "Importa Preferiti da un File del Browser"
+
+#: 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 "Sei uscito dal sistema"
+
+#: www/index.php:46
+#, php-format
+msgid "%s: Recent bookmarks"
+msgstr "%s: Preferiti recenti"
+
+#: www/index.php:58
+#, fuzzy, php-format
+msgid "%s: Recent bookmarks (+private %s)"
+msgstr "%s: Preferiti recenti"
+
+#: www/index.php:96
+msgid "Store, share and tag your favourite links"
+msgstr ""
+
+#: www/index.php:97
+#, fuzzy
+msgid "All Bookmarks"
+msgstr "tutti i preferiti"
+
+#: www/jsScuttle.php:71
+msgid "Available"
+msgstr ""
+
+#: www/jsScuttle.php:74
+#, fuzzy
+msgid "Not Available"
+msgstr "Nessun preferito disponibile"
+
+#: www/login.php:48
+#, fuzzy
+msgid "The details you have entered are incorrect. Please try again."
+msgstr "Le informazioni che hai fornito non sono corrette. Riprova."
+
+#: www/password.php:36
+msgid "You must enter your username."
+msgstr ""
+
+#: www/password.php:40
+#, fuzzy
+msgid ""
+"You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"<em>Devi</em> inserire un nome utente, una password, un nome ed un indirizzo "
+"<abbr title=\"posta elettronica\">e-mail</abbr>."
+
+#: www/password.php:48
+msgid "No matches found for that username."
+msgstr ""
+
+#: www/password.php:51
+#, fuzzy
+msgid ""
+"No matches found for that combination of username and <abbr title="
+"\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"<em>Devi</em> inserire un nome utente, una password, un nome ed un indirizzo "
+"<abbr title=\"posta elettronica\">e-mail</abbr>."
+
+#: www/password.php:59
+#, fuzzy
+msgid ""
+"There was an error while generating your new password. Please try again."
+msgstr ""
+"Si è verificato un errore salvando il tuo preferito. Riprova o contatta "
+"l'amministratore"
+
+#: www/password.php:63
+#, fuzzy
+msgid "Your new password is:"
+msgstr "Conferma Nuova Password"
+
+#: 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
+#, fuzzy, php-format
+msgid "%s Account Information"
+msgstr "Informazioni"
+
+#: www/password.php:68
+#, php-format
+msgid "New password generated and sent to %s"
+msgstr ""
+
+#: www/password.php:75
+#, fuzzy
+msgid "Forgotten Password"
+msgstr "Nuova Password"
+
+#: www/profile.php:63 www/watchlist.php:119
+msgid "Username was not specified"
+msgstr "Nome utente non specificato"
+
+#: www/profile.php:70
+#, fuzzy
+msgid "My Profile"
+msgstr "Profilo"
+
+#: www/profile.php:110
+msgid "Invalid Token"
+msgstr ""
+
+#: www/profile.php:115
+#, fuzzy
+msgid "Password and confirmation do not match."
+msgstr "La password e la sua conferma non coincidono."
+
+#: www/profile.php:119
+#, fuzzy
+msgid "Password must be at least 6 characters long."
+msgstr "La password deve essere lunga almeno 6 caratteri."
+
+#: www/profile.php:123
+#, fuzzy
+msgid "E-mail address is not valid."
+msgstr "Indirizzo e-mail non valido."
+
+#: www/profile.php:127
+msgid "An error occurred while saving your changes."
+msgstr "Si è verificato un errore salvando le tue modifiche."
+
+#: www/profile.php:129
+#, fuzzy
+msgid "Changes saved."
+msgstr "Modifiche salvate."
+
+#: www/profile.php:148
+msgid "You do not have a valid SSL client certificate"
+msgstr ""
+
+#: www/profile.php:150
+msgid "This certificate is already registered"
+msgstr ""
+
+#: www/profile.php:152
+msgid "Failed to register SSL client certificate."
+msgstr ""
+
+#: www/profile.php:154
+msgid "SSL client certificate registered."
+msgstr ""
+
+#: www/profile.php:163
+msgid "Certificate not found."
+msgstr ""
+
+#: www/profile.php:165
+msgid "The certificate does not belong to you."
+msgstr ""
+
+#: www/profile.php:167
+msgid "Failed to delete SSL client certificate."
+msgstr ""
+
+#: www/profile.php:169
+msgid "SSL client certificate deleted."
+msgstr ""
+
+#: www/register.php:52
+#, fuzzy
+msgid "You <em>must</em> enter a username, password and e-mail address."
+msgstr ""
+"<em>Devi</em> inserire un nome utente, una password, un nome ed un indirizzo "
+"<abbr title=\"posta elettronica\">e-mail</abbr>."
+
+#: www/register.php:56
+#, fuzzy
+msgid "This username has been reserved, please make another choice."
+msgstr "Questo nome utente esiste già, scegline un altro."
+
+#: www/register.php:60
+msgid "This username already exists, please make another choice."
+msgstr "Questo nome utente esiste già, scegline un altro."
+
+#: www/register.php:64
+#, fuzzy
+msgid ""
+"This username is not valid (too short, too long, forbidden characters...), "
+"please make another choice."
+msgstr "Questo nome utente esiste già, scegline un altro."
+
+#: www/register.php:68
+#, fuzzy
+msgid "E-mail address is not valid. Please try again."
+msgstr "Indirizzo e-mail non valido."
+
+#: www/register.php:72
+#, fuzzy
+msgid "Antispam answer is not valid. Please try again."
+msgstr "Indirizzo e-mail non valido."
+
+#: www/register.php:90
+#, fuzzy
+msgid "You have successfully registered. Enjoy!"
+msgstr "Ti sei registrato con successo. Buon divertimento!"
+
+#: www/register.php:92
+msgid "Registration failed. Please try again."
+msgstr "Registrazione fallita. Riprova."
+
+#: www/rss.php:90 www/rss.php:111
+#, php-format
+msgid "Failed to Autenticate User with username %s using private key"
+msgstr ""
+
+#: www/rss.php:128
+#, fuzzy, php-format
+msgid "Recent bookmarks posted to %s"
+msgstr "Preferiti inseriti di recente"
+
+#: www/search.php:83 www/search.php:147
+msgid "Search Bookmarks"
+msgstr "Cerca Preferiti"
+
+#: www/search.php:89
+#, fuzzy
+msgid "Search Results"
+msgstr "Risultati della Ricerca"
+
+#: www/search.php:137
+msgid "Unsatisfied? You can also try our "
+msgstr ""
+
+#: www/tag2tagadd.php:54
+msgid "Tag link created"
+msgstr ""
+
+#: www/tag2tagadd.php:57
+#, fuzzy
+msgid "Failed to create the link"
+msgstr "Eliminazione preferito fallita"
+
+#: www/tag2tagadd.php:69
+msgid "Add Tag Link"
+msgstr ""
+
+#: www/tag2tagdelete.php:66
+msgid "Tag link deleted"
+msgstr ""
+
+#: www/tag2tagdelete.php:69
+#, fuzzy
+msgid "Failed to delete the link"
+msgstr "Eliminazione preferito fallita"
+
+#: www/tag2tagdelete.php:81
+msgid "Delete Link Between Tags"
+msgstr ""
+
+#: www/tag2tagedit.php:55
+msgid "Edit Link Between Tags"
+msgstr ""
+
+#: www/tagcommondescriptionedit.php:62
+msgid "Tag common description updated"
+msgstr ""
+
+#: www/tagcommondescriptionedit.php:67
+msgid "Failed to update the tag common description"
+msgstr ""
+
+#: www/tagdelete.php:43
+msgid "Tag deleted"
+msgstr ""
+
+#: www/tagdelete.php:46
+#, fuzzy
+msgid "Failed to delete the tag"
+msgstr "Eliminazione preferito fallita"
+
+#: www/tagedit.php:52
+msgid "Tag description updated"
+msgstr ""
+
+#: www/tagedit.php:55
+#, fuzzy
+msgid "Failed to update the tag description"
+msgstr "Eliminazione preferito fallita"
+
+#: www/tagrename.php:63
+msgid "Tag renamed"
+msgstr ""
+
+#: www/tagrename.php:66
+#, fuzzy
+msgid "Failed to rename the tag"
+msgstr "Eliminazione preferito fallita"
+
+#: www/tags.php:71
+#, php-format
+msgid "%s: tagged with \"%s\""
+msgstr ""
+
+#: www/tags.php:84
+#, php-format
+msgid "%s: tagged with \"%s\" (+private %s)"
+msgstr ""
+
+#: www/users.php:31
+#, fuzzy
+msgid "Users"
+msgstr "Username"
+
+#: www/watch.php:54
+#, fuzzy
+msgid "User removed from your watchlist"
+msgstr "Utente rimosso dalla tua watchlist"
+
+#: www/watch.php:56
+#, fuzzy
+msgid "User added to your watchlist"
+msgstr "Utente aggiunto alla tua watchlist"
+
+#: www/watchlist.php:104
+#, fuzzy
+msgid "My Watchlist"
+msgstr "Lista Sotto Osservazione"
+
+#: www/api/httpauth.inc.php:30
+msgid "Use of the API calls requires authentication."
+msgstr ""
+
+#: www/gsearch/index.php:51
+msgid "Come back to "
+msgstr ""
+
+#: www/gsearch/index.php:56
+msgid "Admin tips: "
+msgstr ""
+
+#: www/gsearch/index.php:57
+msgid "To refresh manually Google Custom Search Engine, goes to: "
+msgstr ""
+
+#: www/gsearch/index.php:61
+msgid ""
+"If no result appears, check that all the urls are valid in the admin section."
+msgstr ""
+
+#~ msgid "User with username %s not was not found"
+#~ msgstr "L'utente %s non è stato trovato"
+
+#~ msgid "Recent Bookmarks"
+#~ msgstr "Preferiti Recenti"
+
+#~ msgid "for"
+#~ msgstr "per"
+
+#~ msgid "%s Bookmarks"
+#~ msgstr "%s Preferiti"
+
+#, fuzzy
+#~ msgid ""
+#~ "<strong><a href=\"register.php\">Register now</a></strong> to start using "
+#~ "%s!"
+#~ msgstr ""
+#~ "<strong><a href=\"register.php\">Registrati ora</a></strong> per iniziare "
+#~ "ad utilizzare %s!"
+
+#~ msgid ""
+#~ "%s is based on <a href=\"http://sourceforge.net/projects/scuttle/\">an "
+#~ "open-source project</a> licensed under the <a href=\"http://www.gnu.org/"
+#~ "copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> "
+#~ "General Public License</a>. This means you can host it on your own web "
+#~ "server for free, whether it is on the Internet, a private network or just "
+#~ "your own computer."
+#~ msgstr ""
+#~ "%s è basato su <a href=\"http://sourceforge.net/projects/scuttle/\">un "
+#~ "progetto open-source</a>."
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "<abbr title=\"Electronic mail\">E-mail</abbr>"
+#~ msgstr "<abbr title=\"Posta elettronica\">E-mail</abbr>"
diff --git a/data/locales/ja_JP/LC_MESSAGES/messages.mo b/data/locales/ja_JP/LC_MESSAGES/messages.mo
index f419241..37f3d74 100644
--- a/data/locales/ja_JP/LC_MESSAGES/messages.mo
+++ b/data/locales/ja_JP/LC_MESSAGES/messages.mo
diff --git a/data/locales/ja_JP/LC_MESSAGES/messages.po b/data/locales/ja_JP/LC_MESSAGES/messages.po
index 72790c8..0356a37 100644
--- a/data/locales/ja_JP/LC_MESSAGES/messages.po
+++ b/data/locales/ja_JP/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: semanticscuttle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-04 11:48+0200\n"
+"POT-Creation-Date: 2012-01-20 13:58+0100\n"
 "PO-Revision-Date: 2009-05-30 02:29+0900\n"
 "Last-Translator: Tadashi Jokagi <elf2000@users.sourceforge.net>\n"
 "Language-Team: Japanese <http://oss.poyo.jp/bbs/>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,578 +19,54 @@ msgstr ""
 "X-Poedit-Language: Japanese\n"
 "X-Poedit-Country: JAPAN\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 "%s とすべてのブックマークを削除しました。"
-
-#: ../../../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 "ユーザー名が「%s」のユーザーは見つけられませんでした"
-
-#: ../../../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 "ID「%s」とブックマークは見つかりません"
-
-#: ../../../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:189
 msgid "message_die() was called multiple times."
 msgstr "message_die() は複数回呼ばれました。"
 
-#: ../../../functions.inc.php:156
+#: src/SemanticScuttle/functions.php:201
 msgid "SQL Error"
 msgstr "SQL エラー"
 
-#: ../../../functions.inc.php:162
+#: src/SemanticScuttle/functions.php:207
 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:207
+#: data/templates/default/importDelicious.tpl.php:8
+#: data/templates/default/importNetscape.tpl.php:9
+#: data/templates/default/importStructure.tpl.php:10
 msgid "File"
 msgstr "ファイル"
 
-#: ../../../functions.inc.php:168
+#: src/SemanticScuttle/functions.php:215
 msgid "Information"
 msgstr "情報"
 
-#: ../../../functions.inc.php:173
+#: src/SemanticScuttle/functions.php:220
 msgid "Critical Information"
 msgstr "重要な情報"
 
-#: ../../../functions.inc.php:178
+#: src/SemanticScuttle/functions.php:225
 msgid "An error occured"
 msgstr "エラーが発生しました"
 
-#: ../../../functions.inc.php:181
+#: src/SemanticScuttle/functions.php:228
 msgid "General Error"
 msgstr "一般エラー"
 
-#: ../../../functions.inc.php:189
+#: src/SemanticScuttle/functions.php:236
 msgid "An critical error occured"
 msgstr "重大なエラーが発生しました"
 
-#: ../../../functions.inc.php:192
+#: src/SemanticScuttle/functions.php:239
 msgid "Critical Error"
 msgstr "重大なエラー"
 
-#: ../../../functions.inc.php:201
+#: src/SemanticScuttle/functions.php:248
 msgid "DEBUG MODE"
 msgstr "デバッグモード"
 
-#: ../../../history.php:61
-msgid "History"
-msgstr "履歴"
-
-#: ../../../history.php:62
-#, php-format
-msgid "History for %s"
-msgstr "%s の履歴"
-
-#: ../../../history.php:84
-msgid "Address was not found"
-msgstr "アドレスは見つかりません"
-
-#: ../../../import.php:47
-msgid "Could not open XML input"
-msgstr "入力の XML を開けません"
-
-#: ../../../import.php:51
-#, php-format
-msgid "XML error: %s at line %d"
-msgstr "XML エラー: %s の %d 行目"
-
-#: ../../../import.php:60
-msgid "Import Bookmarks from del.icio.us"
-msgstr "del.icio.us からブックマークをインポートする"
-
-#: ../../../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 "%s: 最近のブックマーク"
-
-#: ../../../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 ""
-"<abbr title=\"電子メール\">電子メール</abbr>アドレスを入力しなければなりませ"
-"ん。"
-
-#: ../../../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 ""
-"一致する<abbr title=\"電子メール\">電子メール</abbr>アドレスとユーザー名の組"
-"み合わせが見つかりませんでした。"
-
-#: ../../../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 "%sアカウント情報"
-
-#: ../../../password.php:68
-#, php-format
-msgid "New password generated and sent to %s"
-msgstr "新規アカウントを生成し、%s に送信しました"
-
-#: ../../../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 "パスワードは少なくとも 6 文字以上です。"
-
-#: ../../../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 "最近のブックマークを %s に投稿しました"
-
-#: ../../../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] "タグを変更する"
-
-#: ../../../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/default/about.tpl.php:6
 msgid ""
 "<strong>Store</strong> all your favourite links in one place, accessible "
 "from anywhere."
@@ -597,7 +74,7 @@ msgstr ""
 "いかなる場所からもアクセス可能な 1 つの場所に、好きなリンクをすべて<strong>保"
 "管</strong>します。"
 
-#: ../../../templates/about.tpl.php:7
+#: data/templates/default/about.tpl.php:7
 msgid ""
 "<strong>Share</strong> your bookmarks with everyone, with friends on your "
 "watchlist or just keep them private."
@@ -605,7 +82,7 @@ msgstr ""
 "ブックマークをプライベートで、注目一覧で友達と、すべての人と<strong>共有</"
 "strong>します。"
 
-#: ../../../templates/about.tpl.php:8
+#: data/templates/default/about.tpl.php:8
 msgid ""
 "<strong>Tag</strong> your bookmarks with as many labels as you want, instead "
 "of wrestling with folders."
@@ -613,492 +90,603 @@ msgstr ""
 "フォルダーと格闘する代わりに、望むならいくつかのラベルととしてブックマークの"
 "<strong>タグ</strong>を付けてください。"
 
-#: ../../../templates/about.tpl.php:9
+#: data/templates/default/about.tpl.php:9
 msgid "Register now"
 msgstr "今すぐ登録する"
 
-#: ../../../templates/about.tpl.php:9
+#: data/templates/default/about.tpl.php:9
 #, php-format
 msgid " to start using %s!"
 msgstr "で %s の利用を始められます!"
 
-#: ../../../templates/about.tpl.php:12
+#: data/templates/default/about.tpl.php:12
 msgid "Geek Stuff"
 msgstr "ギークスタッフ"
 
-#: ../../../templates/about.tpl.php:14
+#: data/templates/default/about.tpl.php:14
 msgid "is licensed under the "
 msgstr "は次のライセンスで利用できます: "
 
-#: ../../../templates/about.tpl.php:14
+#: data/templates/default/about.tpl.php:14
 msgid "you can freely host it on your own web server."
 msgstr "あなたのウェブサーバーで自由に運営できます。"
 
-#: ../../../templates/about.tpl.php:15
+#: data/templates/default/about.tpl.php:15
 #, php-format
 msgid ""
-"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 はほとんどの <a href=\"http://www.delicious.com/help/api\">del.icio.us <abbr "
-"title=\"Application Programming Interface\">API</abbr></a> をサポートします。"
-"そのシステムのために作成された適切なツールのほぼ全ては、代わりにAAAAで動作す"
-"るように修正することができます。あなたが API アドレスを変更することができない"
-"ツールを見つけたら、製作者にこの設定を加えるよう頼んでください。どうなるかわ"
-"かりませんが、彼らは対応するかもしれません。"
-
-#: ../../../templates/about.tpl.php:24
+"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 はほとんどの <a href=\"http://www.delicious.com/help/api\">del.icio.us "
+"<abbr title=\"Application Programming Interface\">API</abbr></a> をサポートし"
+"ます。そのシステムのために作成された適切なツールのほぼ全ては、代わりにAAAAで"
+"動作するように修正することができます。あなたが API アドレスを変更することがで"
+"きないツールを見つけたら、製作者にこの設定を加えるよう頼んでください。どうな"
+"るかわかりませんが、彼らは対応するかもしれません。"
+
+#: data/templates/default/about.tpl.php:24
 msgid "Tips"
 msgstr ""
 
-#: ../../../templates/about.tpl.php:26
+#: data/templates/default/about.tpl.php:26
 msgid "Add search plugin into your browser:"
 msgstr ""
 
-#: ../../../templates/about.tpl.php:27
+#: data/templates/default/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/default/about.tpl.php:28
 msgid ""
 "The secret tag \"system:imported\" allows you to find imported bookmarks."
 msgstr ""
 
-#: ../../../templates/admin.tpl.php:5
+#: data/templates/default/admin.tpl.php:5
 msgid "Users management"
 msgstr "ユーザー管理"
 
-#: ../../../templates/admin.tpl.php:14
+#: data/templates/default/admin.tpl.php:14
 msgid "Public/Shared/Private"
 msgstr "公開/共有/プライベート"
 
-#: ../../../templates/admin.tpl.php:14 ../../../templates/bookmarks.tpl.php:93
+#: data/templates/default/admin.tpl.php:14
+#: data/templates/default/bookmarks.tpl.php:115
 msgid "bookmark(s)"
 msgstr "ブックマーク"
 
-#: ../../../templates/admin.tpl.php:19
-#: ../../../templates/bookmarks.tpl.php:231
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/tag2tagadd.tpl.php:21
+#: data/templates/default/tag2tagdelete.tpl.php:13
+#: data/templates/default/tag2tagedit.tpl.php:14
+#: data/templates/default/tag2tagedit.tpl.php:35
+#: data/templates/default/tagdelete.tpl.php:6 www/jsScuttle.php:24
+msgid "Are you sure?"
+msgstr "本当にしますか?"
+
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/bookmarks.tpl.php:305
 msgid "Delete"
 msgstr "削除する"
 
-#: ../../../templates/admin.tpl.php:27
+#: data/templates/default/admin.tpl.php:27
 msgid "Other actions"
 msgstr "その他の操作"
 
-#: ../../../templates/admin.tpl.php:29
+#: data/templates/default/admin.tpl.php:29
 msgid "Check all URLs (May take some time)"
 msgstr ""
 
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:16
+#: data/templates/default/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/default/bookmarkcommondescriptionedit.tpl.php:18
+#: data/templates/default/bookmarks.tpl.php:159
+#: data/templates/default/editbookmark.tpl.php:51
 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/default/bookmarkcommondescriptionedit.tpl.php:23
+#: data/templates/default/editbookmark.tpl.php:57
+#: data/templates/default/editprofile.tpl.php:53
+#: data/templates/default/profile.tpl.php:33
+#: data/templates/default/tagcommondescriptionedit.tpl.php:13
+#: data/templates/default/tagedit.tpl.php:12
 msgid "Description"
 msgstr "説明"
 
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:31
-#: ../../../templates/tagcommondescriptionedit.tpl.php:21
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:31
+#: data/templates/default/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/default/bookmarkcommondescriptionedit.tpl.php:43
+#: data/templates/default/tagcommondescriptionedit.tpl.php:33
+#: data/templates/default/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/default/bookmarkcommondescriptionedit.tpl.php:44
+#: data/templates/default/editbookmark.tpl.php:111
+#: data/templates/default/tag2tagadd.tpl.php:24
+#: data/templates/default/tag2tagedit.tpl.php:38
+#: data/templates/default/tagcommondescriptionedit.tpl.php:34
+#: data/templates/default/tagedit.tpl.php:19
+#: data/templates/default/tagrename.tpl.php:25
 msgid "Cancel"
 msgstr "取り消し"
 
-#: ../../../templates/bookmarks.tpl.php:26
+#: data/templates/default/bookmarklet.inc.php:1
+msgid "Bookmarklet"
+msgstr "ブックマークレット"
+
+#: data/templates/default/bookmarklet.inc.php:11
+#, 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 ""
+"ブラウザーのブックマークに次のブックマークレットのうちの 1 つをドラッグしま"
+"す。%s にページを追加したい場合、常にそれをクリックしてください。"
+
+#: data/templates/default/bookmarklet.inc.php:20
+#, 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 ""
+"ブラウザーのブックマークに次のブックマークレットのうちの 1 つをドラッグしま"
+"す。%s にページを追加したい場合、常にそれをクリックしてください。"
+
+#: data/templates/default/bookmarklet.inc.php:67
+#: data/templates/default/bookmarklet.inc.php:100
+#, php-format
+msgid "Post to %s"
+msgstr "%s に投稿する"
+
+#: data/templates/default/bookmarklet.inc.php:93
+#: data/templates/default/bookmarklet.inc.php:110
+#, php-format
+msgid "Post to %s (Pop-up)"
+msgstr "%s に投稿する (ポップアップ)"
+
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:24
+#, php-format
+msgid "Voting <span class=\"voting\">%d</span>"
+msgstr ""
+
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:32
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:35
+msgid "Vote for"
+msgstr ""
+
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:43
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:46
+msgid "Vote against"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:43
 msgid "Bookmarks on this page are managed by an admin user."
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:51
-#: ../../../templates/bookmarks.tpl.php:52
+#: data/templates/default/bookmarks.tpl.php:73
+#: data/templates/default/bookmarks.tpl.php:74
 msgid "Edit the common description of this tag"
 msgstr "このタグの共通説明を編集する"
 
-#: ../../../templates/bookmarks.tpl.php:55
-#: ../../../templates/bookmarks.tpl.php:56
+#: data/templates/default/bookmarks.tpl.php:77
+#: data/templates/default/bookmarks.tpl.php:78
 msgid "Edit the common description of this bookmark"
 msgstr "このブックマークの共通説明を編集する"
 
-#: ../../../templates/bookmarks.tpl.php:76
-#: ../../../templates/bookmarks.tpl.php:77
+#: data/templates/default/bookmarks.tpl.php:98
+#: data/templates/default/bookmarks.tpl.php:99
 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/default/bookmarks.tpl.php:115
+#: data/templates/default/tags.tpl.php:10
+#: data/templates/default/users.tpl.php:8
 msgid "Sort by:"
 msgstr "並べ替えの基準:"
 
-#: ../../../templates/bookmarks.tpl.php:122
+#: data/templates/default/bookmarks.tpl.php:157
 msgid "Date"
 msgstr "日付"
 
-#: ../../../templates/bookmarks.tpl.php:129
+#: data/templates/default/bookmarks.tpl.php:162
+msgid "Voting"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:171
 msgid "Bookmarks from other users for this tag"
 msgstr "このタグのその他のユーザーのブックマーク"
 
-#: ../../../templates/bookmarks.tpl.php:134
+#: data/templates/default/bookmarks.tpl.php:176
 msgid "Only your bookmarks for this tag"
 msgstr "このタグはあなたのブックマークのみです"
 
-#: ../../../templates/bookmarks.tpl.php:157
-#: ../../../templates/bookmarks.tpl.php:163
+#: data/templates/default/bookmarks.tpl.php:199
+#: data/templates/default/bookmarks.tpl.php:205
 msgid "First"
 msgstr "最初へ"
 
-#: ../../../templates/bookmarks.tpl.php:158
-#: ../../../templates/bookmarks.tpl.php:164
+#: data/templates/default/bookmarks.tpl.php:200
+#: data/templates/default/bookmarks.tpl.php:206
 msgid "Previous"
 msgstr "前へ"
 
-#: ../../../templates/bookmarks.tpl.php:171
-#: ../../../templates/bookmarks.tpl.php:174
+#: data/templates/default/bookmarks.tpl.php:213
+#: data/templates/default/bookmarks.tpl.php:216
 msgid "Next"
 msgstr "次へ"
 
-#: ../../../templates/bookmarks.tpl.php:172
-#: ../../../templates/bookmarks.tpl.php:175
+#: data/templates/default/bookmarks.tpl.php:214
+#: data/templates/default/bookmarks.tpl.php:217
 msgid "Last"
 msgstr "最後へ"
 
-#: ../../../templates/bookmarks.tpl.php:185
+#: data/templates/default/bookmarks.tpl.php:233
 #, php-format
 msgid "Page %d of %d"
 msgstr "ページ (%d/%d)"
 
-#: ../../../templates/bookmarks.tpl.php:225
+#: data/templates/default/bookmarks.tpl.php:295
 msgid "Tags:"
 msgstr "タグ:"
 
-#: ../../../templates/bookmarks.tpl.php:231
+#: data/templates/default/bookmarks.tpl.php:302
 msgid "Edit"
 msgstr "編集する"
 
-#: ../../../templates/bookmarks.tpl.php:235
+#: data/templates/default/bookmarks.tpl.php:310
 msgid "Last update"
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:238
+#: data/templates/default/bookmarks.tpl.php:313
 msgid "by"
 msgstr "登録者:"
 
-#: ../../../templates/bookmarks.tpl.php:240
+#: data/templates/default/bookmarks.tpl.php:317
 msgid "you"
 msgstr "あなた"
 
-#: ../../../templates/bookmarks.tpl.php:254
+#: data/templates/default/bookmarks.tpl.php:333
 #, php-format
 msgid " and %s1 other%s"
 msgstr "とその他%sひとり%s"
 
-#: ../../../templates/bookmarks.tpl.php:257
+#: data/templates/default/bookmarks.tpl.php:336
 #, php-format
 msgid " and %2$s%1$s others%3$s"
 msgstr "とその他 %2$s%1$s 人%3$s"
 
-#: ../../../templates/bookmarks.tpl.php:265
+#: data/templates/default/bookmarks.tpl.php:350
 msgid "Copy this bookmark to YOUR bookmarks."
 msgstr "あなたのブックマークにこのブックマークをコピーします"
 
-#: ../../../templates/bookmarks.tpl.php:265
+#: data/templates/default/bookmarks.tpl.php:351
 msgid "Copy"
 msgstr "コピーする"
 
-#: ../../../templates/bookmarks.tpl.php:284
+#: data/templates/default/bookmarks.tpl.php:376
 msgid "This bookmark is certified by an admin user."
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:323
+#: data/templates/default/bookmarks.tpl.php:430
 msgid "Private Note on this bookmark"
 msgstr "このブックマークのプライベートノート"
 
-#: ../../../templates/bookmarks.tpl.php:334
+#: data/templates/default/bookmarks.tpl.php:444
 msgid "Come back to the top of this page."
 msgstr ""
 
-#: ../../../templates/bookmarks.tpl.php:334
+#: data/templates/default/bookmarks.tpl.php:444
 msgid "Top of the page"
 msgstr "ページの先頭"
 
-#: ../../../templates/bookmarks.tpl.php:340
+#: data/templates/default/bookmarks.tpl.php:450
 msgid "No bookmarks available"
 msgstr "ブックマークに登録されていません"
 
-#: ../../../templates/bottom.inc.php:7
+#: data/templates/default/bottom.inc.php:5
+#: data/templates/default/toolbar.inc.php:15
+#: data/templates/default/toolbar.inc.php:28 www/about.php:23 www/about.php:24
+msgid "About"
+msgstr "このサイトについて"
+
+#: data/templates/default/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/default/dynamictags.inc.php:56
+#: data/templates/default/sidebar.block.common.php:19
+#: data/templates/default/sidebar.block.popular.php:34
+#: data/templates/default/sidebar.block.recent.php:29
+#: data/templates/default/tags.tpl.php:19
 msgid "bookmark"
 msgid_plural "bookmarks"
 msgstr[0] "ブックマーク"
 
-#: ../../../templates/dynamictags.inc.php:131
+#: data/templates/default/dynamictags.inc.php:105
+#: data/templates/default/sidebar.block.common.php:9
+#: data/templates/default/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.popular.php:23
+#: data/templates/default/sidebar.block.recent.php:34
+#: data/templates/default/toolbar.inc.php:27 www/populartags.php:46
+msgid "Popular Tags"
+msgstr "人気のタグ"
+
+#: data/templates/default/dynamictags.inc.php:108
 msgid "Popular Tags From All Users"
 msgstr "すべてのユーザーで人気のタグ"
 
-#: ../../../templates/editbookmark.tpl.php:33
+#: data/templates/default/editbookmark.tpl.php:46
 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/default/editbookmark.tpl.php:48
+#: data/templates/default/editbookmark.tpl.php:53
+#: data/templates/default/editprofile.tpl.php:29
+#: data/templates/default/tagrename.tpl.php:14
+#: data/templates/default/tagrename.tpl.php:19
 msgid "Required"
 msgstr "必須"
 
-#: ../../../templates/editbookmark.tpl.php:45
+#: data/templates/default/editbookmark.tpl.php:58
 msgid "Add Note"
 msgstr "ノートの追加"
 
-#: ../../../templates/editbookmark.tpl.php:48
+#: data/templates/default/editbookmark.tpl.php:61
 msgid ""
 "You can use anchors to delimite attributes. for example: [publisher]blah[/"
 "publisher] "
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:51
+#: data/templates/default/editbookmark.tpl.php:64
 msgid "Suggested anchors: "
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:63
+#: data/templates/default/editbookmark.tpl.php:76
 msgid "Private Note"
 msgstr "プライベートノート"
 
-#: ../../../templates/editbookmark.tpl.php:65
+#: data/templates/default/editbookmark.tpl.php:78
 msgid "Just visible by you and your contacts."
 msgstr ""
 
-#: ../../../templates/editbookmark.tpl.php:73
+#: data/templates/default/editbookmark.tpl.php:82
+#: data/templates/default/toolbar.inc.php:10 www/tags.php:45 www/tags.php:67
+msgid "Tags"
+msgstr "タグ"
+
+#: data/templates/default/editbookmark.tpl.php:86
 msgid "Comma-separated"
 msgstr "カンマ区切り"
 
-#: ../../../templates/editbookmark.tpl.php:77
-#: ../../../templates/tag2tagadd.tpl.php:9
+#: data/templates/default/editbookmark.tpl.php:90
+#: data/templates/default/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/default/editbookmark.tpl.php:94
+#: data/templates/default/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/default/editbookmark.tpl.php:97
+#: data/templates/default/importDelicious.tpl.php:15
+#: data/templates/default/importNetscape.tpl.php:16
 msgid "Privacy"
 msgstr "プライバシー"
 
-#: ../../../templates/editbookmark.tpl.php:87
-#: ../../../templates/importDelicious.tpl.php:18
-#: ../../../templates/importNetscape.tpl.php:19
+#: data/templates/default/editbookmark.tpl.php:100
+#: data/templates/default/importDelicious.tpl.php:18
+#: data/templates/default/importNetscape.tpl.php:19
 msgid "Public"
 msgstr "公開"
 
-#: ../../../templates/editbookmark.tpl.php:88
+#: data/templates/default/editbookmark.tpl.php:101
 msgid "Shared with Watch List"
 msgstr "注目リストで共有"
 
-#: ../../../templates/editbookmark.tpl.php:89
-#: ../../../templates/importDelicious.tpl.php:20
-#: ../../../templates/importNetscape.tpl.php:21
+#: data/templates/default/editbookmark.tpl.php:102
+#: data/templates/default/importDelicious.tpl.php:20
+#: data/templates/default/importNetscape.tpl.php:21
 msgid "Private"
 msgstr "プライベート"
 
-#: ../../../templates/editbookmark.tpl.php:102
+#: data/templates/default/editbookmark.tpl.php:115
 msgid "Delete Bookmark"
 msgstr "ブックマークを削除する"
 
-#: ../../../templates/editbookmark.tpl.php:107
+#: data/templates/default/editbookmark.tpl.php:120
 msgid "edit common description"
 msgstr "共通説明の編集"
 
-#: ../../../templates/editbookmark.tpl.php:134
-msgid "Bookmarklet"
-msgstr "ブックマークレット"
-
-#: ../../../templates/editbookmark.tpl.php:140
-#, 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 ""
-"ブラウザーのブックマークに次のブックマークレットのうちの 1 つをドラッグしま"
-"す。%s にページを追加したい場合、常にそれをクリックしてください。"
-
-#: ../../../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 ""
-"ブラウザーのブックマークに次のブックマークレットのうちの 1 つをドラッグしま"
-"す。%s にページを追加したい場合、常にそれをクリックしてください。"
-
-#: ../../../templates/editbookmark.tpl.php:157
-#: ../../../templates/editbookmark.tpl.php:162
-#, php-format
-msgid "Post to %s"
-msgstr "%s に投稿する"
-
-#: ../../../templates/editbookmark.tpl.php:158
-#: ../../../templates/editbookmark.tpl.php:163
-#, php-format
-msgid "Post to %s (Pop-up)"
-msgstr "%s に投稿する (ポップアップ)"
-
-#: ../../../templates/editbookmark.tpl.php:168
-#: ../../../templates/importDelicious.tpl.php:26
-#: ../../../templates/importNetscape.tpl.php:27
-#: ../../../templates/importStructure.tpl.php:16
+#: data/templates/default/editbookmark.tpl.php:212
+#: data/templates/default/importDelicious.tpl.php:26
+#: data/templates/default/importNetscape.tpl.php:27
+#: data/templates/default/importStructure.tpl.php:16
 msgid "Import"
 msgstr "インポートする"
 
-#: ../../../templates/editbookmark.tpl.php:170
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Import bookmarks from bookmark file"
 msgstr "ブックマークファイルからブックマークをインポートする"
 
-#: ../../../templates/editbookmark.tpl.php:170
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Internet Explorer, Mozilla Firefox and Netscape"
 msgstr "Internet Explorer、Mozilla Firefox と Netscape"
 
-#: ../../../templates/editbookmark.tpl.php:171
+#: data/templates/default/editbookmark.tpl.php:215
 msgid "Import bookmarks from del.icio.us"
 msgstr "del.icio.us からブックマークをインポートする"
 
-#: ../../../templates/editprofile.tpl.php:10
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:11
+msgid "SSL client certificates"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:17
+msgid "Serial"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:45
+#: data/templates/default/profile.tpl.php:17
+msgid "Name"
+msgstr "名前"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:19
+#: data/templates/default/profile.tpl.php:11
+msgid "Email"
+msgstr "電子メール"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:20
+msgid "Issuer"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:30
+#, fuzzy
+msgid "delete"
+msgstr "削除する"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:43
+msgid "No certificates registered"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:48
+msgid "Your current certificate is already registered with your account."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:53
+msgid "Register current certificate to automatically login."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:59
+msgid "Your browser does not provide a certificate."
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:8
 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/default/editprofile.tpl.php:12
+#: data/templates/default/login.tpl.php:21
+#: data/templates/default/password.tpl.php:10
+#: data/templates/default/profile.tpl.php:6
+#: data/templates/default/register.tpl.php:16
 msgid "Username"
 msgstr "ユーザー名"
 
-#: ../../../templates/editprofile.tpl.php:19
+#: data/templates/default/editprofile.tpl.php:17
 msgid "New Password"
 msgstr "新規パスワード"
 
-#: ../../../templates/editprofile.tpl.php:24
+#: data/templates/default/editprofile.tpl.php:22
 msgid "Confirm Password"
 msgstr "パスワード(確認)"
 
-#: ../../../templates/editprofile.tpl.php:29
-#: ../../../templates/password.tpl.php:14
-#: ../../../templates/register.tpl.php:26
+#: data/templates/default/editprofile.tpl.php:27
+#: data/templates/default/password.tpl.php:14
+#: data/templates/default/register.tpl.php:26
 msgid "E-mail"
 msgstr "電子メール"
 
-#: ../../../templates/editprofile.tpl.php:35
+#: data/templates/default/editprofile.tpl.php:32
+#, fuzzy
+msgid "Private RSS Feed"
+msgstr "プライベートノート"
+
+#: data/templates/default/editprofile.tpl.php:34
+msgid "Enable"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:36
+#, fuzzy
+msgid "Generate New Key"
+msgstr "パスワードを生成する"
+
+#: data/templates/default/editprofile.tpl.php:41
 msgid "Personal Details"
 msgstr "個人の詳細"
 
-#: ../../../templates/editprofile.tpl.php:39
-#: ../../../templates/profile.tpl.php:17
-msgid "Name"
-msgstr "名前"
-
-#: ../../../templates/editprofile.tpl.php:43
-#: ../../../templates/profile.tpl.php:23
+#: data/templates/default/editprofile.tpl.php:49
+#: data/templates/default/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/default/editprofile.tpl.php:58 www/edit.php:113
+msgid "Save Changes"
+msgstr "変更を保存する"
+
+#: data/templates/default/editprofile.tpl.php:63
+#: data/templates/default/sidebar.block.tagactions.php:17
+#: data/templates/default/sidebar.block.watchstatus.php:18
 msgid "Actions"
 msgstr "操作"
 
-#: ../../../templates/editprofile.tpl.php:58
+#: data/templates/default/editprofile.tpl.php:66
 msgid "Export bookmarks"
 msgstr "ブックマークをエクスポートする"
 
-#: ../../../templates/editprofile.tpl.php:60
+#: data/templates/default/editprofile.tpl.php:68
 msgid "HTML file (for browsers)"
 msgstr "HTML ファイル (ブラウザー用)"
 
-#: ../../../templates/editprofile.tpl.php:61
+#: data/templates/default/editprofile.tpl.php:69
 msgid "XML file (like del.icio.us)"
 msgstr "XML ファイル (del.icio.us のような)"
 
-#: ../../../templates/editprofile.tpl.php:62
+#: data/templates/default/editprofile.tpl.php:70
 msgid "CSV file (for spreadsheet tools)"
 msgstr "CSV ファイル (スプレッドシート ツール用)"
 
-#: ../../../templates/error.404.tpl.php:5
+#: data/templates/default/error.404.tpl.php:5
 msgid "Not Found"
 msgstr "見つかりません"
 
-#: ../../../templates/error.404.tpl.php:6
+#: data/templates/default/error.404.tpl.php:6
 msgid "The requested URL was not found on this server"
 msgstr "要求された URL はこのサーバーで見つかりません"
 
-#: ../../../templates/error.500.tpl.php:5
+#: data/templates/default/error.500.tpl.php:5
 msgid "General server error"
 msgstr "サーバー全体のエラー"
 
-#: ../../../templates/error.500.tpl.php:6
+#: data/templates/default/error.500.tpl.php:6
 msgid "The requested URL could not be processed"
 msgstr "要求された URL は処理できません"
 
-#: ../../../templates/importDelicious.tpl.php:19
-#: ../../../templates/importNetscape.tpl.php:20
+#: data/templates/default/importDelicious.tpl.php:19
+#: data/templates/default/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/default/importDelicious.tpl.php:31
+#: data/templates/default/importNetscape.tpl.php:32
+#: data/templates/default/importStructure.tpl.php:21
 msgid "Instructions"
 msgstr "手順"
 
-#: ../../../templates/importDelicious.tpl.php:33
+#: data/templates/default/importDelicious.tpl.php:33
+#, fuzzy
 msgid ""
-"Log in to the <a href=\"http://del.icio.us/api/posts/all\">export page at "
-"del.icio.us</a>"
+"Log in to the <a href=\"https://api.del.icio.us/v1/posts/all\">export page "
+"at del.icio.us</a>"
 msgstr ""
 "<a href=\"http://del.icio.us/api/posts/all\">del.icio.us のエクスポートページ"
 "</a> にログインします。"
 
-#: ../../../templates/importDelicious.tpl.php:34
+#: data/templates/default/importDelicious.tpl.php:34
 msgid ""
 "Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> "
 "file to your computer"
@@ -1106,7 +694,7 @@ msgstr ""
 "結果の <abbr title=\"Extensible Markup Language\">XML</abbr> ファイルをコン"
 "ピューターに保存します。"
 
-#: ../../../templates/importDelicious.tpl.php:35
+#: data/templates/default/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"
@@ -1114,13 +702,13 @@ msgstr ""
 "コンピューター上のこのファイルを見つけるために <kbd>参照...</kbd> をクリック"
 "します。ファイルの最大サイズは 1MB です。"
 
-#: ../../../templates/importDelicious.tpl.php:36
-#: ../../../templates/importNetscape.tpl.php:43
+#: data/templates/default/importDelicious.tpl.php:36
+#: data/templates/default/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/default/importDelicious.tpl.php:37
+#: data/templates/default/importNetscape.tpl.php:44
 msgid ""
 "Click <kbd>Import</kbd> to start importing the bookmarks; it may take a "
 "minute"
@@ -1128,18 +716,18 @@ msgstr ""
 "<kbd>インポートする</kbd> をクリックするとブックマークのインポートを開始しま"
 "す。しばらくかかるかもしれません。"
 
-#: ../../../templates/importNetscape.tpl.php:35
+#: data/templates/default/importNetscape.tpl.php:35
 msgid "Export your bookmarks from your browser to a file"
 msgstr "ブラウザーからファイルにブックマークをエクスポートする"
 
-#: ../../../templates/importNetscape.tpl.php:37
+#: data/templates/default/importNetscape.tpl.php:37
 msgid ""
 "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
 msgstr ""
 "Internet Explorer: <kbd>ファイル &gt; インポートとエクスポート... &gt; お気に"
 "入りのエクスポート"
 
-#: ../../../templates/importNetscape.tpl.php:38
+#: data/templates/default/importNetscape.tpl.php:38
 msgid ""
 "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
 "Export..."
@@ -1147,14 +735,14 @@ msgstr ""
 "Mozilla Firefox: <kbd>ブックマーク &gt; ブックマークの管理... &gt; ファイル "
 "&gt; Export..."
 
-#: ../../../templates/importNetscape.tpl.php:39
+#: data/templates/default/importNetscape.tpl.php:39
 msgid ""
 "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
 msgstr ""
 "Netscape: <kbd>ブックマーク &gt; ブックマークの管理... &gt; ツール &gt; エク"
 "スポート..."
 
-#: ../../../templates/importNetscape.tpl.php:42
+#: data/templates/default/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"
@@ -1162,29 +750,39 @@ msgstr ""
 "コンピューター上に保存されたブックマークを見つけるために <kbd>参照...</kbd> "
 "をクリックします。ファイルの最大サイズは 1MB です。"
 
-#: ../../../templates/importStructure.tpl.php:24
+#: data/templates/default/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/default/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/default/login.tpl.php:13
+msgid "Please activate cookies"
+msgstr ""
+
+#: data/templates/default/login.tpl.php:26
+#: data/templates/default/register.tpl.php:21
 msgid "Password"
 msgstr "パスワード"
 
-#: ../../../templates/login.tpl.php:22
+#: data/templates/default/login.tpl.php:28
 msgid "Don't ask for my password for 2 weeks"
 msgstr "2 週間自分のパスワードを問い合わせません"
 
-#: ../../../templates/login.tpl.php:30
+#: data/templates/default/login.tpl.php:32
+#: data/templates/default/toolbar.inc.php:29 www/login.php:57
+msgid "Log In"
+msgstr "ログイン"
+
+#: data/templates/default/login.tpl.php:36
 msgid "Forgotten your password?"
 msgstr "パスワードを忘れましたか?"
 
-#: ../../../templates/password.tpl.php:5
+#: data/templates/default/password.tpl.php:5
 #, php-format
 msgid ""
 "If you have forgotten your password, %s can generate a new one. Enter the "
@@ -1195,37 +793,34 @@ msgstr ""
 "トのユーザー名と電子メールアドレスを下のフォームに入力してください。そうすれ"
 "ば、新しいパスワードを電子メールで送信するでしょう。"
 
-#: ../../../templates/password.tpl.php:19
+#: data/templates/default/password.tpl.php:19
 msgid "Generate Password"
 msgstr "パスワードを生成する"
 
-#: ../../../templates/profile.tpl.php:11
-msgid "Email"
-msgstr "電子メール"
-
-#: ../../../templates/profile.tpl.php:28
+#: data/templates/default/profile.tpl.php:28
 msgid "Member Since"
 msgstr "メンバー登録日"
 
-#: ../../../templates/profile.tpl.php:40
-#: ../../../templates/sidebar.block.watchlist.php:30
+#: data/templates/default/profile.tpl.php:40
+#: data/templates/default/sidebar.block.watchlist.php:30
 msgid "Watching"
 msgstr "注目一覧"
 
-#: ../../../templates/profile.tpl.php:55
-#: ../../../templates/sidebar.block.watchlist.php:52
+#: data/templates/default/profile.tpl.php:55
+#: data/templates/default/sidebar.block.watchlist.php:52
 msgid "Watched By"
 msgstr "注目している人:"
 
-#: ../../../templates/profile.tpl.php:68 ../../../templates/toolbar.inc.php:9
+#: data/templates/default/profile.tpl.php:68
+#: data/templates/default/toolbar.inc.php:9
 msgid "Bookmarks"
 msgstr "ブックマーク"
 
-#: ../../../templates/profile.tpl.php:69
+#: data/templates/default/profile.tpl.php:69
 msgid "Go to bookmarks"
 msgstr "ブックマークに移動する"
 
-#: ../../../templates/register.tpl.php:11
+#: data/templates/default/register.tpl.php:11
 #, php-format
 msgid ""
 "Sign up here to create a free %s account. All the information requested "
@@ -1234,228 +829,803 @@ msgstr ""
 "ここでサインアップし、%s のアカウントを自由に作成できます。下記で要求された情"
 "報はすべて必須です。"
 
-#: ../../../templates/register.tpl.php:18
+#: data/templates/default/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/default/register.tpl.php:28
 msgid " to send you your password if you forget it"
 msgstr ""
 
-#: ../../../templates/register.tpl.php:33
+#: data/templates/default/register.tpl.php:33
 msgid "Antispam question"
 msgstr "スパム対策の質問"
 
-#: ../../../templates/sidebar.block.linked.php:51
+#: data/templates/default/register.tpl.php:41
+#: data/templates/default/toolbar.inc.php:31 www/register.php:99
+msgid "Register"
+msgstr "登録する"
+
+#: data/templates/default/search.menu.php:27
+msgid "Search..."
+msgstr "検索..."
+
+#: data/templates/default/search.menu.php:28
+msgid "in"
+msgstr ""
+
+#: data/templates/default/search.menu.php:34
+msgid "this user's bookmarks"
+msgstr "このユーザーのブックマーク"
+
+#: data/templates/default/search.menu.php:39
+msgid "my bookmarks"
+msgstr "自分のブックマーク"
+
+#: data/templates/default/search.menu.php:40
+msgid "my watchlist"
+msgstr "自分の注目一覧"
+
+#: data/templates/default/search.menu.php:44
+msgid "all bookmarks"
+msgstr "すべてのブックマーク"
+
+#: data/templates/default/search.menu.php:54
+msgid "Search"
+msgstr "検索"
+
+#: data/templates/default/sidebar.block.linked.php:23
 #, fuzzy
 msgid "Linked Tags"
 msgstr "関連するタグ"
 
-#: ../../../templates/sidebar.block.linked.php:62
-#: ../../../templates/sidebar.block.menu.php:46
+#: data/templates/default/sidebar.block.linked.php:28
+#: data/templates/default/sidebar.block.menu.php:46
 msgid "Add new link"
 msgstr "新規リンクを追加する"
 
-#: ../../../templates/sidebar.block.linked.php:63
-#: ../../../templates/sidebar.block.menu.php:47
+#: data/templates/default/sidebar.block.linked.php:29
+#: data/templates/default/sidebar.block.menu.php:47
 msgid "Delete link"
 msgstr "リンクを削除する"
 
-#: ../../../templates/sidebar.block.menu.php:35
+#: data/templates/default/sidebar.block.menu.php:35
 #, php-format
 msgid "Tags included into the tag '%s'"
 msgstr ""
 
-#: ../../../templates/sidebar.block.menu.php:35
+#: data/templates/default/sidebar.block.menu.php:35
 msgid "Menu Tags"
 msgstr "タグのメニュー"
 
-#: ../../../templates/sidebar.block.menu.php:68
+#: data/templates/default/sidebar.block.menu.php:68
 msgid "See all your tags"
 msgstr "すべてのタグを見る"
 
-#: ../../../templates/sidebar.block.menu.php:68
+#: data/templates/default/sidebar.block.menu.php:68
 msgid "all your tags"
 msgstr "あなたのすべてのタグ"
 
-#: ../../../templates/sidebar.block.menu.php:70
+#: data/templates/default/sidebar.block.menu.php:70
 msgid "See all tags from this user"
 msgstr "このユーザーのすべてのタグを見る"
 
-#: ../../../templates/sidebar.block.menu.php:70
+#: data/templates/default/sidebar.block.menu.php:70
 msgid "all tags from this user"
 msgstr "このユーザーのほかのタグ"
 
-#: ../../../templates/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.menu.php:74
 msgid "See popular tags"
 msgstr "人気のタグを見る"
 
-#: ../../../templates/sidebar.block.menu2.php:25
+#: data/templates/default/sidebar.block.menu2.php:21
 msgid "Featured Menu Tags"
 msgstr ""
 
-#: ../../../templates/sidebar.block.menu2.php:29
+#: data/templates/default/sidebar.block.menu2.php:25
 msgid "This menu is composed of keywords (tags) organized by admins."
 msgstr ""
 
-#: ../../../templates/sidebar.block.recent.php:18
+#: data/templates/default/sidebar.block.recent.php:18
 msgid "Recent Tags"
 msgstr "最近のタグ"
 
-#: ../../../templates/sidebar.block.related.php:26
+#: data/templates/default/sidebar.block.related.php:26
 msgid "Related Tags"
 msgstr "関連するタグ"
 
-#: ../../../templates/sidebar.block.search.php:15
+#: data/templates/default/sidebar.block.search.php:28
 msgid "Last Searches"
 msgstr "最後の検索"
 
-#: ../../../templates/sidebar.block.search.php:24
+#: data/templates/default/sidebar.block.search.php:40
 msgid "Number of bookmarks for this query"
 msgstr "この問い合わせのブックマーク数"
 
-#: ../../../templates/sidebar.block.tagactions.php:28
+#: data/templates/default/sidebar.block.tagactions.php:9 www/tagrename.php:72
+msgid "Rename Tag"
+msgid_plural "Rename Tags"
+msgstr[0] "タグを変更する"
+
+#: data/templates/default/sidebar.block.tagactions.php:22 www/tagdelete.php:54
+msgid "Delete Tag"
+msgstr "タグを削除する"
+
+#: data/templates/default/sidebar.block.tagactions.php:24 www/tagedit.php:61
+msgid "Edit Tag Description"
+msgstr "タグの説明を編集する"
+
+#: data/templates/default/sidebar.block.tagactions.php:26
+#: www/tagcommondescriptionedit.php:76
+msgid "Edit Tag Common Description"
+msgstr ""
+
+#: data/templates/default/sidebar.block.tagactions.php:28
 msgid "Create a link to another tag"
 msgstr "別のタグへのリンクを作成する"
 
-#: ../../../templates/sidebar.block.users.php:14
+#: data/templates/default/sidebar.block.users.php:14
 msgid "New Users"
 msgstr "新規ユーザー"
 
-#: ../../../templates/sidebar.block.users.php:23
-#: ../../../templates/users.tpl.php:17
+#: data/templates/default/sidebar.block.users.php:23
+#: data/templates/default/users.tpl.php:24
 msgid "bookmarks"
 msgstr "ブックマーク"
 
-#: ../../../templates/sidebar.block.users.php:30
+#: data/templates/default/sidebar.block.users.php:30
 msgid "See all users"
 msgstr "すべてのユーザーを見る"
 
-#: ../../../templates/sidebar.block.users.php:30
+#: data/templates/default/sidebar.block.users.php:30
 msgid "All users"
 msgstr "すべてのユーザー"
 
-#: ../../../templates/sidebar.block.watchlist.php:19
+#: data/templates/default/sidebar.block.watchlist.php:19
 msgid "Close contacts are mutual contacts"
 msgstr ""
 
-#: ../../../templates/sidebar.block.watchlist.php:19
+#: data/templates/default/sidebar.block.watchlist.php:19
 msgid "Close contacts"
 msgstr "連絡簿を閉じる"
 
-#: ../../../templates/sidebar.block.watchlist.php:36
+#: data/templates/default/sidebar.block.watchlist.php:36
 msgid "Add a contact..."
 msgstr "連絡簿に追加する..."
 
-#: ../../../templates/sidebar.block.watchlist.php:36
+#: data/templates/default/sidebar.block.watchlist.php:36
 msgid "Type a username to add it to your contacts."
 msgstr "連絡簿に追加するユーザー名を入力します。"
 
-#: ../../../templates/sidebar.block.watchlist.php:44
+#: data/templates/default/sidebar.block.watchlist.php:44
 msgid "Remove this contact"
 msgstr "連絡簿から削除する"
 
-#: ../../../templates/sidebar.block.watchstatus.php:11
+#: data/templates/default/sidebar.block.watchstatus.php:11
 msgid "Remove from Watchlist"
 msgstr "注目一覧から削除する"
 
-#: ../../../templates/sidebar.block.watchstatus.php:13
+#: data/templates/default/sidebar.block.watchstatus.php:13
 msgid "Add to Watchlist"
 msgstr "注目一覧に追加"
 
-#: ../../../templates/sidebar.linkedtags.inc.php:18
+#: data/templates/default/sidebar.linkedtags.inc.php:18
 msgid "Edit link"
 msgstr "リンクを編集する"
 
-#: ../../../templates/sidebar.linkedtags.inc.php:47
+#: data/templates/default/sidebar.linkedtags.inc.php:47
 msgid "Synonyms:"
 msgstr ""
 
-#: ../../../templates/tag2tagadd.tpl.php:12
+#: data/templates/default/tag2tagadd.tpl.php:12
 msgid "Create new link:"
 msgstr "新しいリンクの作成:"
 
-#: ../../../templates/tag2tagadd.tpl.php:19
+#: data/templates/default/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/default/tag2tagadd.tpl.php:23
+#: data/templates/default/tag2tagedit.tpl.php:37
 msgid "Create"
 msgstr "作成"
 
-#: ../../../templates/tag2tagadd.tpl.php:35
-#: ../../../templates/tag2tagdelete.tpl.php:27
-#: ../../../templates/tag2tagedit.tpl.php:51
+#: data/templates/default/tag2tagadd.tpl.php:35
+#: data/templates/default/tag2tagdelete.tpl.php:27
+#: data/templates/default/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/default/tag2tagadd.tpl.php:53
+#: data/templates/default/tag2tagdelete.tpl.php:45
+#: data/templates/default/tag2tagedit.tpl.php:69
 msgid "No links"
 msgstr "リンクなし"
 
-#: ../../../templates/tag2tagedit.tpl.php:6
+#: data/templates/default/tag2tagdelete.tpl.php:15
+#: data/templates/default/tag2tagedit.tpl.php:16
+#: data/templates/default/tagdelete.tpl.php:8 www/jsScuttle.php:24
+msgid "Yes"
+msgstr "はい"
+
+#: data/templates/default/tag2tagdelete.tpl.php:16
+#: data/templates/default/tag2tagedit.tpl.php:17
+#: data/templates/default/tagdelete.tpl.php:9 www/jsScuttle.php:24
+msgid "No"
+msgstr "いいえ"
+
+#: data/templates/default/tag2tagedit.tpl.php:6
 msgid "Delete the link"
 msgstr "リンクを作成する"
 
-#: ../../../templates/tag2tagedit.tpl.php:29
+#: data/templates/default/tag2tagedit.tpl.php:29
 msgid "Create new link"
 msgstr "新規リンクを作成する"
 
-#: ../../../templates/tagrename.tpl.php:12
+#: data/templates/default/tagrename.tpl.php:12
 msgid "Old"
 msgstr "旧"
 
-#: ../../../templates/tagrename.tpl.php:17
+#: data/templates/default/tagrename.tpl.php:17
 msgid "New"
 msgstr "新"
 
-#: ../../../templates/tagrename.tpl.php:24
+#: data/templates/default/tagrename.tpl.php:24
 msgid "Rename"
 msgstr "名前を変更する"
 
-#: ../../../templates/tags.tpl.php:11 ../../../templates/users.tpl.php:9
+#: data/templates/default/tags.tpl.php:11
+#: data/templates/default/users.tpl.php:9
 msgid "Alphabet"
 msgstr "アルファベット"
 
-#: ../../../templates/tags.tpl.php:12 ../../../templates/users.tpl.php:10
+#: data/templates/default/tags.tpl.php:12
+#: data/templates/default/users.tpl.php:10
 msgid "Popularity"
 msgstr "人気"
 
-#: ../../../templates/toolbar.inc.php:8 ../../../templates/toolbar.inc.php:26
+#: data/templates/default/toolbar.inc.php:8
+#: data/templates/default/toolbar.inc.php:26
 msgid "Home"
 msgstr "ホーム"
 
-#: ../../../templates/toolbar.inc.php:14
+#: data/templates/default/toolbar.inc.php:11 www/watchlist.php:106
+msgid "Watchlist"
+msgstr "注目一覧"
+
+#: data/templates/default/toolbar.inc.php:12 www/profile.php:79
+msgid "Profile"
+msgstr "プロフィール"
+
+#: data/templates/default/toolbar.inc.php:13 www/bookmarks.php:215
+msgid "Add a Bookmark"
+msgstr "ブックマーク追加"
+
+#: data/templates/default/toolbar.inc.php:14
 msgid "Log Out"
 msgstr "ログアウト"
 
-#: ../../../templates/toolbar.inc.php:17
+#: data/templates/default/toolbar.inc.php:17
 msgid "Admin"
 msgstr "管理"
 
-#: ../../../templates/top.inc.php:51
+#: data/templates/default/top.inc.php:57
 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/default/users.tpl.php:20
 msgid "profile"
 msgstr "プロフィール"
 
-#: ../../../templates/users.tpl.php:17
+#: data/templates/default/users.tpl.php:21
 msgid "created in"
 msgstr ""
 
+#: www/admin.php:32
+msgid "Manage users"
+msgstr "ユーザー管理"
+
+#: www/admin.php:69
+#, php-format
+msgid "%s and all his bookmarks and tags were deleted."
+msgstr "%s とすべてのブックマークを削除しました。"
+
+#: www/admin.php:76
+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:50
+msgid "All Tags"
+msgstr "すべてのタグ"
+
+#: www/alltags.php:56 www/bookmarks.php:99 www/populartags.php:52
+#: www/profile.php:55 www/rss.php:100 www/search.php:111 www/watch.php:45
+#: www/watchlist.php:61
+#, php-format
+msgid "User with username %s was not found"
+msgstr "ユーザー名が「%s」のユーザーは見つけられませんでした"
+
+#: 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 "権限がありません。"
+
+#: 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:114 www/tags.php:47
+msgid "Remove the tag from the selection"
+msgstr "選択からタグを削除する"
+
+#: www/bookmarks.php:134 www/edit.php:65
+msgid "Your bookmark must have a title and an address"
+msgstr "ブックマークは題名とアドレスがなければなりません"
+
+#: www/bookmarks.php:139
+msgid "This bookmark URL may not be added"
+msgstr ""
+
+#: www/bookmarks.php:158 www/edit.php:83 www/edit.php:86
+msgid "Bookmark saved"
+msgstr "ブックマークを保存しました"
+
+#: www/bookmarks.php:158
+msgid "(Come back to previous page.)"
+msgstr ""
+
+#: www/bookmarks.php:165 www/import.php:106 www/importNetscape.php:108
+msgid ""
+"There was an error saving your bookmark. Please try again or contact the "
+"administrator."
+msgstr ""
+"ブックマークの保存中にエラーです。再度試すか、管理者に連絡してください。"
+
+#: www/bookmarks.php:222
+msgid "Add Bookmark"
+msgstr "ブックマークを追加する"
+
+#: www/bookmarks.php:225
+msgid "You must be logged in before you can add bookmarks."
+msgstr "ブックマークを追加する前にログインしなければなりません。"
+
+#: www/bookmarks.php:270
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: www/bookmarks.php:283
+#, php-format
+msgid "%s: %s (+private %s)"
+msgstr ""
+
+#: www/bookmarks.php:305 www/bookmarks.php:306
+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 "ID「%s」とブックマークは見つかりません"
+
+#: 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 "%s の履歴"
+
+#: www/history.php:84
+msgid "Address was not found"
+msgstr "アドレスは見つかりません"
+
+#: www/import.php:47
+msgid "Could not open XML input"
+msgstr "入力の XML を開けません"
+
+#: www/import.php:51
+#, php-format
+msgid "XML error: %s at line %d"
+msgstr "XML エラー: %s の %d 行目"
+
+#: www/import.php:60
+msgid "Import Bookmarks from del.icio.us"
+msgstr "del.icio.us からブックマークをインポートする"
+
+#: www/import.php:93
+msgid "You have already submitted this bookmark."
+msgstr "このブックマークは既に送信しました。"
+
+#: www/import.php:104
+msgid "Bookmark imported."
+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/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:46
+#, php-format
+msgid "%s: Recent bookmarks"
+msgstr "%s: 最近のブックマーク"
+
+#: www/index.php:58
+#, fuzzy, php-format
+msgid "%s: Recent bookmarks (+private %s)"
+msgstr "%s: 最近のブックマーク"
+
+#: www/index.php:96
+msgid "Store, share and tag your favourite links"
+msgstr "お気に入りのリンクの保存、共有、タグ付けをします。"
+
+#: www/index.php:97
+msgid "All Bookmarks"
+msgstr "すべてのブックマーク"
+
+#: www/jsScuttle.php:71
+msgid "Available"
+msgstr "利用できます"
+
+#: www/jsScuttle.php:74
+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 ""
+"<abbr title=\"電子メール\">電子メール</abbr>アドレスを入力しなければなりませ"
+"ん。"
+
+#: 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 ""
+"一致する<abbr title=\"電子メール\">電子メール</abbr>アドレスとユーザー名の組"
+"み合わせが見つかりませんでした。"
+
+#: 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 "%sアカウント情報"
+
+#: www/password.php:68
+#, php-format
+msgid "New password generated and sent to %s"
+msgstr "新規アカウントを生成し、%s に送信しました"
+
+#: www/password.php:75
+msgid "Forgotten Password"
+msgstr "パスワード忘れ"
+
+#: www/profile.php:63 www/watchlist.php:119
+msgid "Username was not specified"
+msgstr "ユーザー名が指定されていません"
+
+#: www/profile.php:70
+msgid "My Profile"
+msgstr "自分のプロフィール"
+
+#: www/profile.php:110
+msgid "Invalid Token"
+msgstr ""
+
+#: www/profile.php:115
+msgid "Password and confirmation do not match."
+msgstr "パスワードと確認パスワードが一致しません。"
+
+#: www/profile.php:119
+msgid "Password must be at least 6 characters long."
+msgstr "パスワードは少なくとも 6 文字以上です。"
+
+#: www/profile.php:123
+msgid "E-mail address is not valid."
+msgstr "電子メールアドレスが有効ではありません。"
+
+#: www/profile.php:127
+msgid "An error occurred while saving your changes."
+msgstr "変更の保存中にエラーです。"
+
+#: www/profile.php:129
+msgid "Changes saved."
+msgstr "変更を保存しました。"
+
+#: www/profile.php:148
+msgid "You do not have a valid SSL client certificate"
+msgstr ""
+
+#: www/profile.php:150
+msgid "This certificate is already registered"
+msgstr ""
+
+#: www/profile.php:152
+msgid "Failed to register SSL client certificate."
+msgstr ""
+
+#: www/profile.php:154
+msgid "SSL client certificate registered."
+msgstr ""
+
+#: www/profile.php:163
+msgid "Certificate not found."
+msgstr ""
+
+#: www/profile.php:165
+msgid "The certificate does not belong to you."
+msgstr ""
+
+#: www/profile.php:167
+#, fuzzy
+msgid "Failed to delete SSL client certificate."
+msgstr "タグの削除に失敗しました"
+
+#: www/profile.php:169
+msgid "SSL client certificate deleted."
+msgstr ""
+
+#: www/register.php:52
+msgid "You <em>must</em> enter a username, password and e-mail address."
+msgstr ""
+"ユーザー名、パスワード、名前と電子メールアドレスを入力しなければなりません。"
+
+#: www/register.php:56
+msgid "This username has been reserved, please make another choice."
+msgstr "このユーザー名は予約されています。ほかの名前を選んでください。"
+
+#: www/register.php:60
+msgid "This username already exists, please make another choice."
+msgstr "このユーザー名は既に存在します。ほかの名前を選んでください。"
+
+#: www/register.php:64
+msgid ""
+"This username is not valid (too short, too long, forbidden characters...), "
+"please make another choice."
+msgstr ""
+"このユーザー名は正しくありません (短すぎる、長すぎる、禁止文字...)。他を選ん"
+"でください。"
+
+#: www/register.php:68
+msgid "E-mail address is not valid. Please try again."
+msgstr "電子メールアドレスは有効ではありません。再度試してください。"
+
+#: www/register.php:72
+msgid "Antispam answer is not valid. Please try again."
+msgstr "スパム対策の回答が正しくありません。もう一度試してください。"
+
+#: www/register.php:90
+msgid "You have successfully registered. Enjoy!"
+msgstr "登録に成功しました。楽しんでください!"
+
+#: www/register.php:92
+msgid "Registration failed. Please try again."
+msgstr "登録に失敗しました。再度試してください。"
+
+#: www/rss.php:90 www/rss.php:111
+#, php-format
+msgid "Failed to Autenticate User with username %s using private key"
+msgstr ""
+
+#: www/rss.php:128
+#, php-format
+msgid "Recent bookmarks posted to %s"
+msgstr "最近のブックマークを %s に投稿しました"
+
+#: www/search.php:83 www/search.php:147
+msgid "Search Bookmarks"
+msgstr "ブックマークを検索する"
+
+#: www/search.php:89
+msgid "Search Results"
+msgstr "検索結果"
+
+#: www/search.php:137
+msgid "Unsatisfied? You can also try our "
+msgstr ""
+
+#: www/tag2tagadd.php:54
+msgid "Tag link created"
+msgstr ""
+
+#: www/tag2tagadd.php:57
+msgid "Failed to create the link"
+msgstr "リンクの削除に失敗しました"
+
+#: www/tag2tagadd.php:69
+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:62
+msgid "Tag common description updated"
+msgstr ""
+
+#: www/tagcommondescriptionedit.php:67
+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/tags.php:71
+#, php-format
+msgid "%s: tagged with \"%s\""
+msgstr ""
+
+#: www/tags.php:84
+#, php-format
+msgid "%s: tagged with \"%s\" (+private %s)"
+msgstr ""
+
+#: www/users.php:31
+msgid "Users"
+msgstr "ユーザー"
+
+#: www/watch.php:54
+msgid "User removed from your watchlist"
+msgstr "注目一覧からユーザーを削除しました"
+
+#: www/watch.php:56
+msgid "User added to your watchlist"
+msgstr "注目一覧にユーザーを追加しました"
+
+#: www/watchlist.php:104
+msgid "My Watchlist"
+msgstr "自分の注目一覧"
+
+#: www/api/httpauth.inc.php:30
+msgid "Use of the API calls requires authentication."
+msgstr ""
+
+#: www/gsearch/index.php:51
+msgid "Come back to "
+msgstr ""
+
+#: www/gsearch/index.php:56
+msgid "Admin tips: "
+msgstr ""
+
+#: www/gsearch/index.php:57
+msgid "To refresh manually Google Custom Search Engine, goes to: "
+msgstr ""
+
+#: www/gsearch/index.php:61
+msgid ""
+"If no result appears, check that all the urls are valid in the admin section."
+msgstr ""
+
 #~ msgid "Last Users"
 #~ msgstr "最後のユーザー"
 
diff --git a/data/locales/lt_LT/LC_MESSAGES/messages.mo b/data/locales/lt_LT/LC_MESSAGES/messages.mo
index 221eb42..7b351f8 100644
--- a/data/locales/lt_LT/LC_MESSAGES/messages.mo
+++ b/data/locales/lt_LT/LC_MESSAGES/messages.mo
diff --git a/data/locales/lt_LT/LC_MESSAGES/messages.po b/data/locales/lt_LT/LC_MESSAGES/messages.po
index 65c8125..023772f 100644
--- a/data/locales/lt_LT/LC_MESSAGES/messages.po
+++ b/data/locales/lt_LT/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Scuttle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-29 11:17+0200\n"
+"POT-Creation-Date: 2012-01-20 13:58+0100\n"
 "PO-Revision-Date: 2006-03-26 14:26-0800\n"
 "Last-Translator: Marcus Campbell <marcus.campbell@gmail.com>\n"
 "Language-Team: lt-LT <audrius@gmail.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,791 +19,1692 @@ msgstr ""
 "X-Poedit-Country: LITHUANIA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ..\..\..\about.php:25
-#: ..\..\..\templates\toolbar.inc.php:24
-msgid "About"
-msgstr "Apie"
-
-#: ..\..\..\ajaxDelete.php:29
-msgid "You are not allowed to delete this bookmark"
-msgstr "Jums neturite teisės ištrinti šį žymę"
-
-#: ..\..\..\ajaxDelete.php:33
-msgid "Failed to delete bookmark"
-msgstr "Nepavyko ištrinti žymės"
-
-#: ..\..\..\alltags.php:50
-msgid "All Tags"
-msgstr "Visos gairės"
-
-#: ..\..\..\alltags.php:59
-#: ..\..\..\populartags.php:63
-#: ..\..\..\profile.php:46
-#: ..\..\..\rss.php:55
-#: ..\..\..\search.php:61
-#: ..\..\..\watch.php:35
-#: ..\..\..\watched.php:62
-#, php-format
-msgid "User with username %s not was not found"
-msgstr "Nepavyko rasti vartotojo vardu %s"
-
-#: ..\..\..\bookmarks.php:71
-#, php-format
-msgid "User with username %s was not found"
-msgstr "Nepavyko rasti vartotojo vardu %s"
-
-#: ..\..\..\bookmarks.php:94
-#: ..\..\..\edit.php:44
-msgid "Your bookmark must have a title and an address"
-msgstr "Įrašoma žymė privalo turėti pavadinimą ir adresą"
-
-#: ..\..\..\bookmarks.php:114
-#: ..\..\..\edit.php:58
-msgid "Bookmark saved"
-msgstr "Žymė išsaugota"
-
-#: ..\..\..\bookmarks.php:122
-#: ..\..\..\import.php:99
-#: ..\..\..\importNetscape.php:74
-msgid "There was an error saving your bookmark. Please try again or contact the administrator."
-msgstr "Saugant žymę įvyko klaida. Bandykite dar kartą arba kreipkitės į administratorių."
-
-#: ..\..\..\bookmarks.php:160
-#: ..\..\..\templates\toolbar.inc.php:13
-msgid "Add a Bookmark"
-msgstr "Pridėti žymę"
-
-#: ..\..\..\bookmarks.php:163
-msgid "Add Bookmark"
-msgstr "Pridėti žymę"
-
-#: ..\..\..\bookmarks.php:166
-msgid "You must be logged in before you can add bookmarks."
-msgstr "Jei norite pridėti naujas žymes, privalote prisijungti."
-
-#: ..\..\..\bookmarks.php:213
-msgid "My Bookmarks"
-msgstr "Mano žymės"
-
-#: ..\..\..\edit.php:29
-msgid "Edit Bookmark"
-msgstr "Keisti žymę"
-
-#: ..\..\..\edit.php:34
-#, php-format
-msgid "Bookmark with id %s not was not found"
-msgstr "Žymės su  id %s nepavyko rasti"
-
-#: ..\..\..\edit.php:39
-msgid "You are not allowed to edit this bookmark"
-msgstr "Jūs neturite teisės keisti šią žymę"
-
-#: ..\..\..\edit.php:55
-msgid "Error while saving your bookmark"
-msgstr "Saugant žymę įvyko klaida"
-
-#: ..\..\..\edit.php:78
-msgid "Failed to delete the bookmark"
-msgstr "Žymės ištrinti nepavyko"
-
-#: ..\..\..\edit.php:88
-#: ..\..\..\templates\editprofile.tpl.php:52
-msgid "Save Changes"
-msgstr "Išsaugoti pakeitimus"
-
-#: ..\..\..\functions.inc.php:92
+#: src/SemanticScuttle/functions.php:189
 msgid "message_die() was called multiple times."
 msgstr "message_die() buvo iškviesta daug kartų."
 
-#: ..\..\..\functions.inc.php:104
+#: src/SemanticScuttle/functions.php:201
 msgid "SQL Error"
 msgstr "message_die() buvo iškviesta daug kartų."
 
-#: ..\..\..\functions.inc.php:110
+#: src/SemanticScuttle/functions.php:207
 msgid "Line"
 msgstr "Eilutė"
 
-#: ..\..\..\functions.inc.php:110
-#: ..\..\..\templates\importDelicious.tpl.php:8
-#: ..\..\..\templates\importNetscape.tpl.php:9
+#: src/SemanticScuttle/functions.php:207
+#: data/templates/default/importDelicious.tpl.php:8
+#: data/templates/default/importNetscape.tpl.php:9
+#: data/templates/default/importStructure.tpl.php:10
 msgid "File"
 msgstr "Failas"
 
-#: ..\..\..\functions.inc.php:116
+#: src/SemanticScuttle/functions.php:215
 msgid "Information"
 msgstr "Informacija"
 
-#: ..\..\..\functions.inc.php:121
+#: src/SemanticScuttle/functions.php:220
 msgid "Critical Information"
 msgstr "Kritinė informacija"
 
-#: ..\..\..\functions.inc.php:126
+#: src/SemanticScuttle/functions.php:225
 msgid "An error occured"
 msgstr "Įvyko klaida"
 
-#: ..\..\..\functions.inc.php:129
+#: src/SemanticScuttle/functions.php:228
 msgid "General Error"
 msgstr "Bendro pobūdžio klaida"
 
-#: ..\..\..\functions.inc.php:137
+#: src/SemanticScuttle/functions.php:236
 msgid "An critical error occured"
 msgstr "Įvyko kritinė klaida"
 
-#: ..\..\..\functions.inc.php:140
+#: src/SemanticScuttle/functions.php:239
 msgid "Critical Error"
 msgstr "Kritinė klaida"
 
-#: ..\..\..\functions.inc.php:149
+#: src/SemanticScuttle/functions.php:248
 msgid "DEBUG MODE"
 msgstr "Derinimo rėžimas"
 
-#: ..\..\..\history.php:65
-msgid "History"
-msgstr "Istorija"
+#: data/templates/default/about.tpl.php:6
+msgid ""
+"<strong>Store</strong> all your favourite links in one place, accessible "
+"from anywhere."
+msgstr ""
+"<strong>Kaupkite</strong> Jus dominančias žymes vienoje, bet kur "
+"pasiekiamoje vietoje."
 
-#: ..\..\..\history.php:66
-#, php-format
-msgid "History for %s"
-msgstr "%s istorija"
+#: data/templates/default/about.tpl.php:7
+msgid ""
+"<strong>Share</strong> your bookmarks with everyone, with friends on your "
+"watchlist or just keep them private."
+msgstr ""
+"<strong>Dalinkitės</strong> savo žymėmis su visais ar į tik bičiulių sąrašą "
+"įtrauktais draugais arba laikykite jas asmeniniam naudojimui."
 
-#: ..\..\..\history.php:81
-msgid "Address was not found"
-msgstr "Adreso nepavyko rasti"
+#: data/templates/default/about.tpl.php:8
+msgid ""
+"<strong>Tag</strong> your bookmarks with as many labels as you want, instead "
+"of wrestling with folders."
+msgstr ""
+"<strong>Grupuokite</strong> savo žymes gairių pagalba. Jų galite sukurti "
+"tiek, kiek Jums reikia. Pamirškite nelanksčius katalogus!"
 
-#: ..\..\..\import.php:41
-msgid "Could not open XML input"
-msgstr "Nepavyko atidaryti XML įvesties"
+#: data/templates/default/about.tpl.php:9
+#, fuzzy
+msgid "Register now"
+msgstr "Registracija"
 
-#: ..\..\..\import.php:45
+#: data/templates/default/about.tpl.php:9
 #, php-format
-msgid "XML error: %s at line %d"
-msgstr "XML klaida: %s eilutėje %d"
+msgid " to start using %s!"
+msgstr ""
 
-#: ..\..\..\import.php:54
-msgid "Import Bookmarks from del.icio.us"
-msgstr "Importuoti žymes iš del.icio.us"
+#: data/templates/default/about.tpl.php:12
+msgid "Geek Stuff"
+msgstr "Techninė informacija"
 
-#: ..\..\..\import.php:86
-#: ..\..\..\importNetscape.php:64
-msgid "You have already submitted this bookmark."
-msgstr "Jūs jau išsaugojote šią žymę."
+#: data/templates/default/about.tpl.php:14
+msgid "is licensed under the "
+msgstr ""
 
-#: ..\..\..\import.php:97
-#: ..\..\..\importNetscape.php:72
-msgid "Bookmark imported."
-msgstr "Žymė importuota."
+#: data/templates/default/about.tpl.php:14
+msgid "you can freely host it on your own web server."
+msgstr ""
 
-#: ..\..\..\importNetscape.php:81
-msgid "Import Bookmarks from Browser File"
-msgstr "Importuoti žymes iš naryklės failo"
+#: data/templates/default/about.tpl.php:15
+#, php-format
+msgid ""
+"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 ""
+"<strong>%1$s</strong> palaiko <a href=\"http://www.delicious.com/help/api"
+"\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></"
+"a>. Daugumą šiai sistemai skirtų įrankių galiama pakoreguoti taip, kad jie "
+"veiktų su <strong>%1$s</strong>. Jei radote įrankį, kuriame negalima "
+"pakeisti API adreso, paprašykite jo kūrėjų tai padaryti. Jie tikrai "
+"neatsilaikys Jūsų kerams."
+
+#: data/templates/default/about.tpl.php:24
+msgid "Tips"
+msgstr ""
 
-#: ..\..\..\index.php:32
-msgid "You have now logged out"
-msgstr "Jūs dabar atsijungėte"
+#: data/templates/default/about.tpl.php:26
+msgid "Add search plugin into your browser:"
+msgstr ""
 
-#: ..\..\..\index.php:39
-#, php-format
-msgid "%s: Recent bookmarks"
-msgstr "%s: naujos žymės"
+#: data/templates/default/about.tpl.php:27
+msgid ""
+"The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
+msgstr ""
 
-#: ..\..\..\index.php:72
-msgid "Store, share and tag your favourite links"
-msgstr "Kaupkite, dalinkites ir aprašinėkite savo svarbiausias interneto žymes"
+#: data/templates/default/about.tpl.php:28
+msgid ""
+"The secret tag \"system:imported\" allows you to find imported bookmarks."
+msgstr ""
+
+#: data/templates/default/admin.tpl.php:5
+#, fuzzy
+msgid "Users management"
+msgstr "Vartotojas"
 
-#: ..\..\..\index.php:73
-msgid "Recent Bookmarks"
-msgstr "Naujos žymės"
+#: data/templates/default/admin.tpl.php:14
+msgid "Public/Shared/Private"
+msgstr ""
 
-#: ..\..\..\jsScuttle.php:22
+#: data/templates/default/admin.tpl.php:14
+#: data/templates/default/bookmarks.tpl.php:115
+#, fuzzy
+msgid "bookmark(s)"
+msgstr "žymė"
+
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/tag2tagadd.tpl.php:21
+#: data/templates/default/tag2tagdelete.tpl.php:13
+#: data/templates/default/tag2tagedit.tpl.php:14
+#: data/templates/default/tag2tagedit.tpl.php:35
+#: data/templates/default/tagdelete.tpl.php:6 www/jsScuttle.php:24
 msgid "Are you sure?"
 msgstr "Ar tikrai?"
 
-#: ..\..\..\jsScuttle.php:22
-msgid "Yes"
-msgstr "Taip"
-
-#: ..\..\..\jsScuttle.php:22
-msgid "No"
-msgstr "Ne"
-
-#: ..\..\..\jsScuttle.php:68
-msgid "Available"
-msgstr "Yra"
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/bookmarks.tpl.php:305
+msgid "Delete"
+msgstr "Trinti"
 
-#: ..\..\..\jsScuttle.php:71
-msgid "Not Available"
-msgstr "Nėra"
+#: data/templates/default/admin.tpl.php:27
+#, fuzzy
+msgid "Other actions"
+msgstr "Instrukcija"
 
-#: ..\..\..\login.php:38
-msgid "The details you have entered are incorrect. Please try again."
-msgstr "Jūsų įrašyti duomenys neteisingi. Bandykite dar kartą."
+#: data/templates/default/admin.tpl.php:29
+msgid "Check all URLs (May take some time)"
+msgstr ""
 
-#: ..\..\..\login.php:48
-#: ..\..\..\templates\login.tpl.php:26
-#: ..\..\..\templates\toolbar.inc.php:28
-msgid "Log In"
-msgstr "Prisijungti"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:16
+msgid ""
+"Collaborative description: these fields can be viewed and modified by every "
+"users"
+msgstr ""
 
-#: ..\..\..\password.php:31
-msgid "You must enter your username."
-msgstr "Privalote įrašyti vartotojo vardą."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:18
+#: data/templates/default/bookmarks.tpl.php:159
+#: data/templates/default/editbookmark.tpl.php:51
+msgid "Title"
+msgstr "pavadinimą"
 
-#: ..\..\..\password.php:35
-msgid "You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "Privalote įrašyti savo <abbr title=\"elektroninis paštas\">el. pašto</abbr> adresą."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:23
+#: data/templates/default/editbookmark.tpl.php:57
+#: data/templates/default/editprofile.tpl.php:53
+#: data/templates/default/profile.tpl.php:33
+#: data/templates/default/tagcommondescriptionedit.tpl.php:13
+#: data/templates/default/tagedit.tpl.php:12
+msgid "Description"
+msgstr "Aprašas"
 
-#: ..\..\..\password.php:42
-msgid "No matches found for that username."
-msgstr "Nepavyko rasti įrašų, susijusių su šiuo vartotoju."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:31
+#: data/templates/default/tagcommondescriptionedit.tpl.php:21
+msgid "Last modification:"
+msgstr ""
 
-#: ..\..\..\password.php:45
-msgid "No matches found for that combination of username and <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "Nepavyko rasti įrašų, susijusių su šiuo vartotojo vardu ir <abbr title=\"elektroninis paštas\">el. pašto</abbr> adresu."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:43
+#: data/templates/default/tagcommondescriptionedit.tpl.php:33
+#: data/templates/default/tagedit.tpl.php:18
+msgid "Update"
+msgstr ""
 
-#: ..\..\..\password.php:53
-msgid "There was an error while generating your new password. Please try again."
-msgstr "Generuojant naują Jūsų slaptažodį įvyko klaida. Bandykite dar kartą."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:44
+#: data/templates/default/editbookmark.tpl.php:111
+#: data/templates/default/tag2tagadd.tpl.php:24
+#: data/templates/default/tag2tagedit.tpl.php:38
+#: data/templates/default/tagcommondescriptionedit.tpl.php:34
+#: data/templates/default/tagedit.tpl.php:19
+#: data/templates/default/tagrename.tpl.php:25
+msgid "Cancel"
+msgstr ""
 
-#: ..\..\..\password.php:57
-msgid "Your new password is:"
-msgstr "Jūsų naujasis slaptažodis yra:"
+#: data/templates/default/bookmarklet.inc.php:1
+msgid "Bookmarklet"
+msgstr "Žymeklis"
 
-#: ..\..\..\password.php:57
-msgid "To keep your bookmarks secure, you should change this password in your profile the next time you log in."
-msgstr "Vardan Jūsų kaupiamos informacijos saugumo, rekomenduojame pasikeisti slaptažodį, kai kitą kartą prisijungsite prie vartotojo profilio."
+#: data/templates/default/bookmarklet.inc.php:11
+#, 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 ""
+"Perkelkite šį žymeklįį Jūsų naršyklėje esantį žymių katalogą ir naudokite, "
+"kai norėsite pridėti naują puslapį į <strong>%s</strong>"
 
-#: ..\..\..\password.php:60
+#: data/templates/default/bookmarklet.inc.php:20
 #, php-format
-msgid "%s Account Information"
-msgstr "%s paskyros informacija"
+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 ""
+"Perkelkite šį žymeklįį Jūsų naršyklėje esantį žymių katalogą ir naudokite, "
+"kai norėsite pridėti naują puslapį į <strong>%s</strong>"
 
-#: ..\..\..\password.php:62
+#: data/templates/default/bookmarklet.inc.php:67
+#: data/templates/default/bookmarklet.inc.php:100
 #, php-format
-msgid "New password generated and sent to %s"
-msgstr "Naujas slaptažodis sukurtas ir išsiųstas %s"
-
-#: ..\..\..\password.php:69
-msgid "Forgotten Password"
-msgstr "Užmirštas slaptažodis"
-
-#: ..\..\..\populartags.php:54
-#: ..\..\..\templates\dynamictags.inc.php:101
-#: ..\..\..\templates\sidebar.block.common.php:9
-#: ..\..\..\templates\sidebar.block.popular.php:15
-#: ..\..\..\templates\sidebar.block.recent.php:25
-msgid "Popular Tags"
-msgstr "Populiarios gairės"
-
-#: ..\..\..\profile.php:54
-#: ..\..\..\watched.php:114
-msgid "Username was not specified"
-msgstr "Nenurodytas vartotojo vardas"
-
-#: ..\..\..\profile.php:60
-msgid "My Profile"
-msgstr "Mano profilis"
-
-#: ..\..\..\profile.php:62
-#: ..\..\..\templates\sidebar.block.profile.php:12
-msgid "Profile"
-msgstr "Profilis"
-
-#: ..\..\..\profile.php:80
-msgid "Password and confirmation do not match."
-msgstr "Įrašyti slaptažodžio variantai nesutampa."
-
-#: ..\..\..\profile.php:84
-msgid "Password must be at least 6 characters long."
-msgstr "Slaptažodis turi būti bent 6 simbolių ilgio."
-
-#: ..\..\..\profile.php:88
-msgid "E-mail address is not valid."
-msgstr "Neteisingas el. pašto adresas."
-
-#: ..\..\..\profile.php:92
-msgid "An error occurred while saving your changes."
-msgstr "Saugant pakeitimus įvyko klaida."
-
-#: ..\..\..\profile.php:94
-msgid "Changes saved."
-msgstr "Pakeitimai išsaugoti."
-
-#: ..\..\..\register.php:33
-msgid "You <em>must</em> enter a username, password and e-mail address."
-msgstr "<em>Privalote</em> įrašyti vartotojo vardą, slaptažodį, vardą ir <abbr title=\"elektroninis paštas\">el. pašto</abbr> adresą."
-
-#: ..\..\..\register.php:37
-msgid "This username already exists, please make another choice."
-msgstr "Toks vartotojas jau yra, prašom pasirinkti kitą."
-
-#: ..\..\..\register.php:41
-msgid "E-mail address is not valid. Please try again."
-msgstr "El. pašto adresas neteisingas. Bandykite dar kartą."
-
-#: ..\..\..\register.php:50
-msgid "You have successfully registered. Enjoy!"
-msgstr "Sveikiname sėkmingai užsiregistravus!"
-
-#: ..\..\..\register.php:52
-msgid "Registration failed. Please try again."
-msgstr "Registracija nepavyko. Bandykite dar kartą."
-
-#: ..\..\..\register.php:57
-#: ..\..\..\templates\register.tpl.php:32
-#: ..\..\..\templates\toolbar.inc.php:27
-msgid "Register"
-msgstr "Registracija"
-
-#: ..\..\..\search.inc.php:29
-#: ..\..\..\search.inc.php:57
-msgid "Search"
-msgstr "Ieškoti"
-
-#: ..\..\..\search.inc.php:35
-msgid "this user's bookmarks"
-msgstr "šio vartotojo žymėse"
-
-#: ..\..\..\search.inc.php:40
-msgid "my bookmarks"
-msgstr "mano žymėse"
+msgid "Post to %s"
+msgstr "Siųsti į <strong>%s</strong>"
 
-#: ..\..\..\search.inc.php:41
-msgid "my watchlist"
-msgstr "bičiulių žymėse"
+#: data/templates/default/bookmarklet.inc.php:93
+#: data/templates/default/bookmarklet.inc.php:110
+#, php-format
+msgid "Post to %s (Pop-up)"
+msgstr "Siųsti į <strong>%s</strong> (atskirame lange)"
 
-#: ..\..\..\search.inc.php:45
-msgid "all bookmarks"
-msgstr "visose žymėse"
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:24
+#, php-format
+msgid "Voting <span class=\"voting\">%d</span>"
+msgstr ""
 
-#: ..\..\..\search.inc.php:48
-msgid "for"
-msgstr "teksto"
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:32
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:35
+msgid "Vote for"
+msgstr ""
 
-#: ..\..\..\search.php:91
-#: ..\..\..\search.php:128
-msgid "Search Bookmarks"
-msgstr "Ieškoti žymėse"
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:43
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:46
+msgid "Vote against"
+msgstr ""
 
-#: ..\..\..\search.php:97
-msgid "Search Results"
-msgstr "Paieškos rezultatai"
+#: data/templates/default/bookmarks.tpl.php:43
+msgid "Bookmarks on this page are managed by an admin user."
+msgstr ""
 
-#: ..\..\..\tags.php:38
-#: ..\..\..\templates\editbookmark.tpl.php:44
-#: ..\..\..\templates\sidebar.block.profile.php:13
-msgid "Tags"
-msgstr "Gairės"
+#: data/templates/default/bookmarks.tpl.php:73
+#: data/templates/default/bookmarks.tpl.php:74
+msgid "Edit the common description of this tag"
+msgstr ""
 
-#: ..\..\..\watch.php:79
-#, php-format
-msgid "%s Bookmarks"
-msgstr "%s žymės"
+#: data/templates/default/bookmarks.tpl.php:77
+#: data/templates/default/bookmarks.tpl.php:78
+msgid "Edit the common description of this bookmark"
+msgstr ""
 
-#: ..\..\..\watch.php:84
-msgid "User removed from your watchlist"
-msgstr "Vartotojas išbrauktas iš bičiulių sąrašo"
+#: data/templates/default/bookmarks.tpl.php:98
+#: data/templates/default/bookmarks.tpl.php:99
+msgid "Edit your personal description of this tag"
+msgstr ""
 
-#: ..\..\..\watch.php:86
-msgid "User added to your watchlist"
-msgstr "Vartotojas įtrauktas į bičiulių sąrašą"
+#: data/templates/default/bookmarks.tpl.php:115
+#: data/templates/default/tags.tpl.php:10
+#: data/templates/default/users.tpl.php:8
+msgid "Sort by:"
+msgstr "Rūšiuoti pagal:"
 
-#: ..\..\..\watched.php:105
-msgid "My Watchlist"
-msgstr "Mano bičiuliai"
+#: data/templates/default/bookmarks.tpl.php:157
+msgid "Date"
+msgstr "datą"
 
-#: ..\..\..\watched.php:107
-#: ..\..\..\templates\sidebar.block.profile.php:14
-#: ..\..\..\templates\toolbar.inc.php:12
-msgid "Watchlist"
-msgstr "Bičiuliai"
+#: data/templates/default/bookmarks.tpl.php:162
+msgid "Voting"
+msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:6
-msgid "<strong>Store</strong> all your favourite links in one place, accessible from anywhere."
-msgstr "<strong>Kaupkite</strong> Jus dominančias žymes vienoje, bet kur pasiekiamoje vietoje."
+#: data/templates/default/bookmarks.tpl.php:171
+msgid "Bookmarks from other users for this tag"
+msgstr ""
 
-#: ..\..\..\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>Dalinkitės</strong> savo žymėmis su visais ar į tik bičiulių sąrašą įtrauktais draugais arba laikykite jas asmeniniam naudojimui."
+#: data/templates/default/bookmarks.tpl.php:176
+msgid "Only your bookmarks for this tag"
+msgstr ""
 
-#: ..\..\..\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>Grupuokite</strong> savo žymes gairių pagalba. Jų galite sukurti tiek, kiek Jums reikia. Pamirškite nelanksčius katalogus!"
+#: data/templates/default/bookmarks.tpl.php:199
+#: data/templates/default/bookmarks.tpl.php:205
+msgid "First"
+msgstr "Pirmas"
 
-#: ..\..\..\templates\about.tpl.php:9
-#, php-format
-msgid "<strong><a href=\"register.php\">Register now</a></strong> to start using %s!"
-msgstr "<strong><a href=\"register.php\">Registruokitės dabar</a></strong> ir pradėkite darbą su <strong>%s</strong>!"
+#: data/templates/default/bookmarks.tpl.php:200
+#: data/templates/default/bookmarks.tpl.php:206
+msgid "Previous"
+msgstr "Ankstesnis"
 
-#: ..\..\..\templates\about.tpl.php:12
-msgid "Geek Stuff"
-msgstr "Techninė informacija"
+#: data/templates/default/bookmarks.tpl.php:213
+#: data/templates/default/bookmarks.tpl.php:216
+msgid "Next"
+msgstr "Kitas"
 
-#: ..\..\..\templates\about.tpl.php:14
-#, php-format
-msgid "%s is based on <a href=\"http://sourceforge.net/projects/scuttle/\">an open-source project</a> licensed under the <a href=\"http://www.gnu.org/copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> General Public License</a>. This means you can host it on your own web server for free, whether it is on the Internet, a private network or just your own computer."
-msgstr "<strong>%s</strong> veikia pagal <a href=\"http://www.gnu.org/copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> GPL</a> licenciją sukurto <a href=\"http://sourceforge.net/projects/scuttle/\">atvirojo kodo projekto</a> pagrindu. Tai reiškia, kad Jūs galite šią sistemą nemokamai naudoti ir talpinti internete, vidaus tinkle ar savo kompiuteryje."
+#: data/templates/default/bookmarks.tpl.php:214
+#: data/templates/default/bookmarks.tpl.php:217
+msgid "Last"
+msgstr "Paskutinis"
 
-#: ..\..\..\templates\about.tpl.php:15
+#: data/templates/default/bookmarks.tpl.php:233
 #, php-format
-msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 "<strong>%1$s</strong> palaiko <a href=\"http://www.delicious.com/help/api\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></a>. Daugumą šiai sistemai skirtų įrankių galiama pakoreguoti taip, kad jie veiktų su <strong>%1$s</strong>. Jei radote įrankį, kuriame negalima pakeisti API adreso, paprašykite jo kūrėjų tai padaryti. Jie tikrai neatsilaikys Jūsų kerams."
-
-#: ..\..\..\templates\bookmarks.tpl.php:17
-#: ..\..\..\templates\tags.tpl.php:7
-msgid "Sort by:"
-msgstr "Rūšiuoti pagal:"
-
-#: ..\..\..\templates\bookmarks.tpl.php:18
-msgid "Date"
-msgstr "datą"
-
-#: ..\..\..\templates\bookmarks.tpl.php:19
-#: ..\..\..\templates\editbookmark.tpl.php:34
-msgid "Title"
-msgstr "pavadinimą"
+msgid "Page %d of %d"
+msgstr "%d iš %d puslapių"
 
-#: ..\..\..\templates\bookmarks.tpl.php:23
-msgid "URL"
-msgstr "adresą"
+#: data/templates/default/bookmarks.tpl.php:295
+#, fuzzy
+msgid "Tags:"
+msgstr "Gairės"
 
-#: ..\..\..\templates\bookmarks.tpl.php:60
+#: data/templates/default/bookmarks.tpl.php:302
 msgid "Edit"
 msgstr "Keisti"
 
-#: ..\..\..\templates\bookmarks.tpl.php:60
-msgid "Delete"
-msgstr "Trinti"
+#: data/templates/default/bookmarks.tpl.php:310
+msgid "Last update"
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:66
+#: data/templates/default/bookmarks.tpl.php:313
 msgid "by"
 msgstr " įrašė"
 
-#: ..\..\..\templates\bookmarks.tpl.php:78
+#: data/templates/default/bookmarks.tpl.php:317
+msgid "you"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:333
 #, php-format
 msgid " and %s1 other%s"
 msgstr " bei dar %s1 vartotojas%s"
 
-#: ..\..\..\templates\bookmarks.tpl.php:81
+#: data/templates/default/bookmarks.tpl.php:336
 #, php-format
 msgid " and %2$s%1$s others%3$s"
 msgstr " bei dar %2$s%1$s vartotojai%3$s"
 
-#: ..\..\..\templates\bookmarks.tpl.php:90
+#: data/templates/default/bookmarks.tpl.php:350
+#, fuzzy
+msgid "Copy this bookmark to YOUR bookmarks."
+msgstr "Importuoti žymes iš žymių failo"
+
+#: data/templates/default/bookmarks.tpl.php:351
 msgid "Copy"
 msgstr "Kopijuoti"
 
-#: ..\..\..\templates\bookmarks.tpl.php:136
-#: ..\..\..\templates\bookmarks.tpl.php:142
-msgid "First"
-msgstr "Pirmas"
-
-#: ..\..\..\templates\bookmarks.tpl.php:137
-#: ..\..\..\templates\bookmarks.tpl.php:143
-msgid "Previous"
-msgstr "Ankstesnis"
+#: data/templates/default/bookmarks.tpl.php:376
+msgid "This bookmark is certified by an admin user."
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:150
-#: ..\..\..\templates\bookmarks.tpl.php:153
-msgid "Next"
-msgstr "Kitas"
+#: data/templates/default/bookmarks.tpl.php:430
+#, fuzzy
+msgid "Private Note on this bookmark"
+msgstr "Jūs neturite teisės keisti šią žymę"
 
-#: ..\..\..\templates\bookmarks.tpl.php:151
-#: ..\..\..\templates\bookmarks.tpl.php:154
-msgid "Last"
-msgstr "Paskutinis"
+#: data/templates/default/bookmarks.tpl.php:444
+msgid "Come back to the top of this page."
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:156
-#, php-format
-msgid "Page %d of %d"
-msgstr "%d iš %d puslapių"
+#: data/templates/default/bookmarks.tpl.php:444
+msgid "Top of the page"
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:160
+#: data/templates/default/bookmarks.tpl.php:450
 msgid "No bookmarks available"
 msgstr "Žymių nėra"
 
-#: ..\..\..\templates\dynamictags.inc.php:108
-#: ..\..\..\templates\sidebar.block.common.php:15
-#: ..\..\..\templates\sidebar.block.popular.php:21
-#: ..\..\..\templates\sidebar.block.recent.php:20
-#: ..\..\..\templates\tags.tpl.php:16
+#: data/templates/default/bottom.inc.php:5
+#: data/templates/default/toolbar.inc.php:15
+#: data/templates/default/toolbar.inc.php:28 www/about.php:23 www/about.php:24
+msgid "About"
+msgstr "Apie"
+
+#: data/templates/default/bottom.inc.php:7
+msgid "Propulsed by "
+msgstr ""
+
+#: data/templates/default/dynamictags.inc.php:56
+#: data/templates/default/sidebar.block.common.php:19
+#: data/templates/default/sidebar.block.popular.php:34
+#: data/templates/default/sidebar.block.recent.php:29
+#: data/templates/default/tags.tpl.php:19
 msgid "bookmark"
 msgid_plural "bookmarks"
 msgstr[0] "žymė"
 msgstr[1] "žymės"
 
-#: ..\..\..\templates\editbookmark.tpl.php:29
+#: data/templates/default/dynamictags.inc.php:105
+#: data/templates/default/sidebar.block.common.php:9
+#: data/templates/default/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.popular.php:23
+#: data/templates/default/sidebar.block.recent.php:34
+#: data/templates/default/toolbar.inc.php:27 www/populartags.php:46
+msgid "Popular Tags"
+msgstr "Populiarios gairės"
+
+#: data/templates/default/dynamictags.inc.php:108
+#, fuzzy
+msgid "Popular Tags From All Users"
+msgstr "Populiarios gairės"
+
+#: data/templates/default/editbookmark.tpl.php:46
 msgid "Address"
 msgstr "Adresas"
 
-#: ..\..\..\templates\editbookmark.tpl.php:31
-#: ..\..\..\templates\editbookmark.tpl.php:36
-#: ..\..\..\templates\editprofile.tpl.php:31
+#: data/templates/default/editbookmark.tpl.php:48
+#: data/templates/default/editbookmark.tpl.php:53
+#: data/templates/default/editprofile.tpl.php:29
+#: data/templates/default/tagrename.tpl.php:14
+#: data/templates/default/tagrename.tpl.php:19
 msgid "Required"
 msgstr "Privaloma"
 
-#: ..\..\..\templates\editbookmark.tpl.php:39
-#: ..\..\..\templates\editprofile.tpl.php:47
-#: ..\..\..\templates\profile.tpl.php:28
-msgid "Description"
-msgstr "Aprašas"
+#: data/templates/default/editbookmark.tpl.php:58
+msgid "Add Note"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:61
+msgid ""
+"You can use anchors to delimite attributes. for example: [publisher]blah[/"
+"publisher] "
+msgstr ""
 
-#: ..\..\..\templates\editbookmark.tpl.php:46
+#: data/templates/default/editbookmark.tpl.php:64
+msgid "Suggested anchors: "
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:76
+#, fuzzy
+msgid "Private Note"
+msgstr "Privati"
+
+#: data/templates/default/editbookmark.tpl.php:78
+msgid "Just visible by you and your contacts."
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:82
+#: data/templates/default/toolbar.inc.php:10 www/tags.php:45 www/tags.php:67
+msgid "Tags"
+msgstr "Gairės"
+
+#: data/templates/default/editbookmark.tpl.php:86
 msgid "Comma-separated"
 msgstr "Skiriamos kableliais"
 
-#: ..\..\..\templates\editbookmark.tpl.php:49
-#: ..\..\..\templates\importDelicious.tpl.php:15
-#: ..\..\..\templates\importNetscape.tpl.php:16
+#: data/templates/default/editbookmark.tpl.php:90
+#: data/templates/default/tag2tagadd.tpl.php:9
+msgid ""
+"Note: use \">\" to include one tag in another. e.g.: europe>france>paris"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:94
+#: data/templates/default/tag2tagadd.tpl.php:8
+msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:97
+#: data/templates/default/importDelicious.tpl.php:15
+#: data/templates/default/importNetscape.tpl.php:16
 msgid "Privacy"
 msgstr "Privatumas"
 
-#: ..\..\..\templates\editbookmark.tpl.php:52
-#: ..\..\..\templates\importDelicious.tpl.php:18
-#: ..\..\..\templates\importNetscape.tpl.php:19
+#: data/templates/default/editbookmark.tpl.php:100
+#: data/templates/default/importDelicious.tpl.php:18
+#: data/templates/default/importNetscape.tpl.php:19
 msgid "Public"
 msgstr "Vieša"
 
-#: ..\..\..\templates\editbookmark.tpl.php:53
-#: ..\..\..\templates\importDelicious.tpl.php:19
-#: ..\..\..\templates\importNetscape.tpl.php:20
+#: data/templates/default/editbookmark.tpl.php:101
 msgid "Shared with Watch List"
 msgstr "Tik bičiuliams"
 
-#: ..\..\..\templates\editbookmark.tpl.php:54
-#: ..\..\..\templates\importDelicious.tpl.php:20
-#: ..\..\..\templates\importNetscape.tpl.php:21
+#: data/templates/default/editbookmark.tpl.php:102
+#: data/templates/default/importDelicious.tpl.php:20
+#: data/templates/default/importNetscape.tpl.php:21
 msgid "Private"
 msgstr "Privati"
 
-#: ..\..\..\templates\editbookmark.tpl.php:66
+#: data/templates/default/editbookmark.tpl.php:115
 msgid "Delete Bookmark"
 msgstr "Trinti žymę"
 
-#: ..\..\..\templates\editbookmark.tpl.php:93
-msgid "Bookmarklet"
-msgstr "Žymeklis"
-
-#: ..\..\..\templates\editbookmark.tpl.php:94
-#, 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 "Perkelkite šį žymeklįį Jūsų naršyklėje esantį žymių katalogą ir naudokite, kai norėsite pridėti naują puslapį į <strong>%s</strong>"
-
-#: ..\..\..\templates\editbookmark.tpl.php:106
-#, php-format
-msgid "Post to %s"
-msgstr "Siųsti į <strong>%s</strong>"
-
-#: ..\..\..\templates\editbookmark.tpl.php:107
-#, php-format
-msgid "Post to %s (Pop-up)"
-msgstr "Siųsti į <strong>%s</strong> (atskirame lange)"
+#: data/templates/default/editbookmark.tpl.php:120
+msgid "edit common description"
+msgstr ""
 
-#: ..\..\..\templates\editbookmark.tpl.php:111
-#: ..\..\..\templates\importDelicious.tpl.php:26
-#: ..\..\..\templates\importNetscape.tpl.php:27
+#: data/templates/default/editbookmark.tpl.php:212
+#: data/templates/default/importDelicious.tpl.php:26
+#: data/templates/default/importNetscape.tpl.php:27
+#: data/templates/default/importStructure.tpl.php:16
 msgid "Import"
 msgstr "Importas"
 
-#: ..\..\..\templates\editbookmark.tpl.php:113
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Import bookmarks from bookmark file"
 msgstr "Importuoti žymes iš žymių failo"
 
-#: ..\..\..\templates\editbookmark.tpl.php:113
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Internet Explorer, Mozilla Firefox and Netscape"
 msgstr "Internet Explorer, Mozilla Firefox ir Netscape"
 
-#: ..\..\..\templates\editbookmark.tpl.php:114
+#: data/templates/default/editbookmark.tpl.php:215
 msgid "Import bookmarks from del.icio.us"
 msgstr "Importuoti žymes iš del.icio.us"
 
-#: ..\..\..\templates\editprofile.tpl.php:10
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:11
+msgid "SSL client certificates"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:17
+msgid "Serial"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:45
+#: data/templates/default/profile.tpl.php:17
+msgid "Name"
+msgstr "Vardas"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:19
+#: data/templates/default/profile.tpl.php:11
+#, fuzzy
+msgid "Email"
+msgstr "El. paštas"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:20
+msgid "Issuer"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:30
+#, fuzzy
+msgid "delete"
+msgstr "Trinti"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:43
+msgid "No certificates registered"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:48
+msgid "Your current certificate is already registered with your account."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:53
+msgid "Register current certificate to automatically login."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:59
+msgid "Your browser does not provide a certificate."
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:8
 msgid "Account Details"
 msgstr "Paskyris informacija"
 
-#: ..\..\..\templates\editprofile.tpl.php:14
-#: ..\..\..\templates\login.tpl.php:15
-#: ..\..\..\templates\password.tpl.php:10
-#: ..\..\..\templates\profile.tpl.php:7
-#: ..\..\..\templates\register.tpl.php:16
+#: data/templates/default/editprofile.tpl.php:12
+#: data/templates/default/login.tpl.php:21
+#: data/templates/default/password.tpl.php:10
+#: data/templates/default/profile.tpl.php:6
+#: data/templates/default/register.tpl.php:16
 msgid "Username"
 msgstr "Vartotojas"
 
-#: ..\..\..\templates\editprofile.tpl.php:19
+#: data/templates/default/editprofile.tpl.php:17
 msgid "New Password"
 msgstr "Naujas slaptažodis"
 
-#: ..\..\..\templates\editprofile.tpl.php:24
+#: data/templates/default/editprofile.tpl.php:22
 msgid "Confirm Password"
 msgstr "Pakartoti slaptažodį"
 
-#: ..\..\..\templates\editprofile.tpl.php:29
-#: ..\..\..\templates\register.tpl.php:26
+#: data/templates/default/editprofile.tpl.php:27
+#: data/templates/default/password.tpl.php:14
+#: data/templates/default/register.tpl.php:26
 msgid "E-mail"
 msgstr "El. paštas"
 
-#: ..\..\..\templates\editprofile.tpl.php:35
+#: data/templates/default/editprofile.tpl.php:32
+#, fuzzy
+msgid "Private RSS Feed"
+msgstr "Privati"
+
+#: data/templates/default/editprofile.tpl.php:34
+msgid "Enable"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:36
+#, fuzzy
+msgid "Generate New Key"
+msgstr "Generuoti slaptažodį"
+
+#: data/templates/default/editprofile.tpl.php:41
 msgid "Personal Details"
 msgstr "Asmeniniai duomenys"
 
-#: ..\..\..\templates\editprofile.tpl.php:39
-#: ..\..\..\templates\profile.tpl.php:12
-msgid "Name"
-msgstr "Vardas"
-
-#: ..\..\..\templates\editprofile.tpl.php:43
-#: ..\..\..\templates\profile.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:49
+#: data/templates/default/profile.tpl.php:23
 msgid "Homepage"
 msgstr "Svetainė"
 
-#: ..\..\..\templates\error.404.tpl.php:5
+#: data/templates/default/editprofile.tpl.php:58 www/edit.php:113
+msgid "Save Changes"
+msgstr "Išsaugoti pakeitimus"
+
+#: data/templates/default/editprofile.tpl.php:63
+#: data/templates/default/sidebar.block.tagactions.php:17
+#: data/templates/default/sidebar.block.watchstatus.php:18
+msgid "Actions"
+msgstr "Veiksmai"
+
+#: data/templates/default/editprofile.tpl.php:66
+#, fuzzy
+msgid "Export bookmarks"
+msgstr "mano žymėse"
+
+#: data/templates/default/editprofile.tpl.php:68
+msgid "HTML file (for browsers)"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:69
+msgid "XML file (like del.icio.us)"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:70
+msgid "CSV file (for spreadsheet tools)"
+msgstr ""
+
+#: data/templates/default/error.404.tpl.php:5
 msgid "Not Found"
 msgstr "Nėra"
 
-#: ..\..\..\templates\error.404.tpl.php:6
+#: data/templates/default/error.404.tpl.php:6
 msgid "The requested URL was not found on this server"
 msgstr "Užklausto saito darbo stotyje nėra"
 
-#: ..\..\..\templates\error.500.tpl.php:5
+#: data/templates/default/error.500.tpl.php:5
 msgid "General server error"
 msgstr "Bendro pobūdžio darbo stoties klaida"
 
-#: ..\..\..\templates\error.500.tpl.php:6
+#: data/templates/default/error.500.tpl.php:6
 msgid "The requested URL could not be processed"
 msgstr "Užklausa negali būti įvykdyta"
 
-#: ..\..\..\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 "Prisijunkite prie <a href=\"http://del.icio.us/api/posts/all\">del.icio.us eksporto puslapio</a>"
+#: data/templates/default/importDelicious.tpl.php:19
+#: data/templates/default/importNetscape.tpl.php:20
+#, fuzzy
+msgid "Shared with Watchlist"
+msgstr "Tik bičiuliams"
+
+#: data/templates/default/importDelicious.tpl.php:31
+#: data/templates/default/importNetscape.tpl.php:32
+#: data/templates/default/importStructure.tpl.php:21
+msgid "Instructions"
+msgstr "Instrukcija"
+
+#: data/templates/default/importDelicious.tpl.php:33
+#, fuzzy
+msgid ""
+"Log in to the <a href=\"https://api.del.icio.us/v1/posts/all\">export page "
+"at del.icio.us</a>"
+msgstr ""
+"Prisijunkite prie <a href=\"http://del.icio.us/api/posts/all\">del.icio.us "
+"eksporto puslapio</a>"
 
-#: ..\..\..\templates\importDelicious.tpl.php:34
-msgid "Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> file to your computer"
-msgstr "Išsaugoti <abbr title=\"Extensible Markup Language\">XML</abbr> failą Jūsų kompiuteryje"
+#: data/templates/default/importDelicious.tpl.php:34
+msgid ""
+"Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> "
+"file to your computer"
+msgstr ""
+"Išsaugoti <abbr title=\"Extensible Markup Language\">XML</abbr> failą Jūsų "
+"kompiuteryje"
 
-#: ..\..\..\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 "Paspauskite <kbd>Browse...</kbd> ir raskite šį failą kompiuteryje. Maksimalus failo dydis - 1 MB"
+#: data/templates/default/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 ""
+"Paspauskite <kbd>Browse...</kbd> ir raskite šį failą kompiuteryje. "
+"Maksimalus failo dydis - 1 MB"
 
-#: ..\..\..\templates\importDelicious.tpl.php:36
-#: ..\..\..\templates\importNetscape.tpl.php:43
+#: data/templates/default/importDelicious.tpl.php:36
+#: data/templates/default/importNetscape.tpl.php:43
 msgid "Select the default privacy setting for your imported bookmarks"
 msgstr "Pasirinkite bazines privatumo nuostatas importuojamoms žymėms"
 
-#: ..\..\..\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 "Norėdami importuoti žymes, spauskite <kbd>Importuoti</kbd>; tai gali šiek tiek užtrukti"
-
-#: ..\..\..\templates\importNetscape.tpl.php:32
-msgid "Instructions"
-msgstr "Instrukcija"
+#: data/templates/default/importDelicious.tpl.php:37
+#: data/templates/default/importNetscape.tpl.php:44
+msgid ""
+"Click <kbd>Import</kbd> to start importing the bookmarks; it may take a "
+"minute"
+msgstr ""
+"Norėdami importuoti žymes, spauskite <kbd>Importuoti</kbd>; tai gali šiek "
+"tiek užtrukti"
 
-#: ..\..\..\templates\importNetscape.tpl.php:35
+#: data/templates/default/importNetscape.tpl.php:35
 msgid "Export your bookmarks from your browser to a file"
 msgstr "Eksportuokite savo žymes iš naršyklės į failą"
 
-#: ..\..\..\templates\importNetscape.tpl.php:37
-msgid "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
-msgstr "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
+#: data/templates/default/importNetscape.tpl.php:37
+msgid ""
+"Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
+msgstr ""
+"Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
 
-#: ..\..\..\templates\importNetscape.tpl.php:38
-msgid "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; Export..."
-msgstr "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; Export..."
+#: data/templates/default/importNetscape.tpl.php:38
+msgid ""
+"Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
+"Export..."
+msgstr ""
+"Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
+"Export..."
 
-#: ..\..\..\templates\importNetscape.tpl.php:39
-msgid "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
-msgstr "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
+#: data/templates/default/importNetscape.tpl.php:39
+msgid ""
+"Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
+msgstr ""
+"Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
+
+#: data/templates/default/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 ""
+"Paspauskite <kbd>Browse...</kbd> ir raskite žymes savo kompiuteryje. "
+"Maksimalus failo dydis - 1MB."
 
-#: ..\..\..\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 "Paspauskite <kbd>Browse...</kbd> ir raskite žymes savo kompiuteryje. Maksimalus failo dydis - 1MB."
+#: data/templates/default/importStructure.tpl.php:24
+msgid "Create your structure into a simple text file and following this model:"
+msgstr ""
 
-#: ..\..\..\templates\login.tpl.php:20
-#: ..\..\..\templates\register.tpl.php:21
+#: data/templates/default/importStructure.tpl.php:35
+msgid ""
+"Then import the file. The tags and their relations will be added to your "
+"profile."
+msgstr ""
+
+#: data/templates/default/login.tpl.php:13
+msgid "Please activate cookies"
+msgstr ""
+
+#: data/templates/default/login.tpl.php:26
+#: data/templates/default/register.tpl.php:21
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: ..\..\..\templates\login.tpl.php:22
+#: data/templates/default/login.tpl.php:28
 msgid "Don't ask for my password for 2 weeks"
 msgstr "Neklausti slaptažodžio dvi savaites"
 
-#: ..\..\..\templates\login.tpl.php:30
+#: data/templates/default/login.tpl.php:32
+#: data/templates/default/toolbar.inc.php:29 www/login.php:57
+msgid "Log In"
+msgstr "Prisijungti"
+
+#: data/templates/default/login.tpl.php:36
 msgid "Forgotten your password?"
 msgstr "Pamiršote slaptažodį?"
 
-#: ..\..\..\templates\password.tpl.php:5
+#: data/templates/default/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 "Jei pamiršote savo slaptažodį, <strong>%s</strong> gali sukurti Jums naują. Įrašykite savo paskyros vartotojo vardą ir mums pateikto el. pašto adresą ir mes Jums persiųsime naująjį slaptažodį."
-
-#: ..\..\..\templates\password.tpl.php:14
-msgid "<abbr title=\"Electronic mail\">E-mail</abbr>"
-msgstr "<abbr title=\"Elektroninis paštas\">El. paštas</abbr>"
+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 ""
+"Jei pamiršote savo slaptažodį, <strong>%s</strong> gali sukurti Jums naują. "
+"Įrašykite savo paskyros vartotojo vardą ir mums pateikto el. pašto adresą ir "
+"mes Jums persiųsime naująjį slaptažodį."
 
-#: ..\..\..\templates\password.tpl.php:19
+#: data/templates/default/password.tpl.php:19
 msgid "Generate Password"
 msgstr "Generuoti slaptažodį"
 
-#: ..\..\..\templates\profile.tpl.php:23
+#: data/templates/default/profile.tpl.php:28
 msgid "Member Since"
 msgstr "Dalyvauja nuo"
 
-#: ..\..\..\templates\profile.tpl.php:35
-#: ..\..\..\templates\sidebar.block.watchlist.php:8
+#: data/templates/default/profile.tpl.php:40
+#: data/templates/default/sidebar.block.watchlist.php:30
 msgid "Watching"
 msgstr "Stebi"
 
-#: ..\..\..\templates\profile.tpl.php:50
+#: data/templates/default/profile.tpl.php:55
+#: data/templates/default/sidebar.block.watchlist.php:52
 msgid "Watched By"
 msgstr "Yra stebimas"
 
-#: ..\..\..\templates\register.tpl.php:11
+#: data/templates/default/profile.tpl.php:68
+#: data/templates/default/toolbar.inc.php:9
+msgid "Bookmarks"
+msgstr "Žymės"
+
+#: data/templates/default/profile.tpl.php:69
+#, fuzzy
+msgid "Go to bookmarks"
+msgstr "mano žymėse"
+
+#: data/templates/default/register.tpl.php:11
 #, php-format
-msgid "Sign up here to create a free %s account. All the information requested below is required"
-msgstr "Norėdami prisiregistruoti <strong>%s</strong> užlipdykite žemiau esančią anketą"
+msgid ""
+"Sign up here to create a free %s account. All the information requested "
+"below is required"
+msgstr ""
+"Norėdami prisiregistruoti <strong>%s</strong> užlipdykite žemiau esančią "
+"anketą"
+
+#: data/templates/default/register.tpl.php:18
+msgid ""
+" at least 5 characters, alphanumeric (no spaces, no dots or other special "
+"ones)"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:28
+msgid " to send you your password if you forget it"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:33
+msgid "Antispam question"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:41
+#: data/templates/default/toolbar.inc.php:31 www/register.php:99
+msgid "Register"
+msgstr "Registracija"
+
+#: data/templates/default/search.menu.php:27
+#, fuzzy
+msgid "Search..."
+msgstr "Ieškoti"
+
+#: data/templates/default/search.menu.php:28
+#, fuzzy
+msgid "in"
+msgstr "Eilutė"
+
+#: data/templates/default/search.menu.php:34
+msgid "this user's bookmarks"
+msgstr "šio vartotojo žymėse"
+
+#: data/templates/default/search.menu.php:39
+msgid "my bookmarks"
+msgstr "mano žymėse"
+
+#: data/templates/default/search.menu.php:40
+msgid "my watchlist"
+msgstr "bičiulių žymėse"
+
+#: data/templates/default/search.menu.php:44
+msgid "all bookmarks"
+msgstr "visose žymėse"
+
+#: data/templates/default/search.menu.php:54
+msgid "Search"
+msgstr "Ieškoti"
+
+#: data/templates/default/sidebar.block.linked.php:23
+#, fuzzy
+msgid "Linked Tags"
+msgstr "Susiję gairės"
+
+#: data/templates/default/sidebar.block.linked.php:28
+#: data/templates/default/sidebar.block.menu.php:46
+msgid "Add new link"
+msgstr ""
+
+#: data/templates/default/sidebar.block.linked.php:29
+#: data/templates/default/sidebar.block.menu.php:47
+#, fuzzy
+msgid "Delete link"
+msgstr "Trinti"
 
-#: ..\..\..\templates\rss.tpl.php:9
+#: data/templates/default/sidebar.block.menu.php:35
 #, php-format
-msgid "Recent bookmarks posted to %s"
-msgstr "Naujos, %s išsiųstos gairės"
+msgid "Tags included into the tag '%s'"
+msgstr ""
 
-#: ..\..\..\templates\rss.tpl.php:17
-#: ..\..\..\templates\rss.tpl.php:19
-msgid "No bookmarks found"
-msgstr "Žymių nėra"
+#: data/templates/default/sidebar.block.menu.php:35
+#, fuzzy
+msgid "Menu Tags"
+msgstr "Naujos gairės"
+
+#: data/templates/default/sidebar.block.menu.php:68
+msgid "See all your tags"
+msgstr ""
 
-#: ..\..\..\templates\sidebar.block.recent.php:15
+#: data/templates/default/sidebar.block.menu.php:68
+msgid "all your tags"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:70
+msgid "See all tags from this user"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:70
+msgid "all tags from this user"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:74
+#, fuzzy
+msgid "See popular tags"
+msgstr "Populiarios gairės"
+
+#: data/templates/default/sidebar.block.menu2.php:21
+#, fuzzy
+msgid "Featured Menu Tags"
+msgstr "Susiję gairės"
+
+#: data/templates/default/sidebar.block.menu2.php:25
+msgid "This menu is composed of keywords (tags) organized by admins."
+msgstr ""
+
+#: data/templates/default/sidebar.block.recent.php:18
 msgid "Recent Tags"
 msgstr "Naujos gairės"
 
-#: ..\..\..\templates\sidebar.block.related.php:15
+#: data/templates/default/sidebar.block.related.php:26
 msgid "Related Tags"
 msgstr "Susiję gairės"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:10
+#: data/templates/default/sidebar.block.search.php:28
+#, fuzzy
+msgid "Last Searches"
+msgstr "Ieškoti"
+
+#: data/templates/default/sidebar.block.search.php:40
+#, fuzzy
+msgid "Number of bookmarks for this query"
+msgstr "Žymių nėra"
+
+#: data/templates/default/sidebar.block.tagactions.php:9 www/tagrename.php:72
+#, fuzzy
+msgid "Rename Tag"
+msgid_plural "Rename Tags"
+msgstr[0] "Susiję gairės"
+msgstr[1] "Susiję gairės"
+
+#: data/templates/default/sidebar.block.tagactions.php:22 www/tagdelete.php:54
+#, fuzzy
+msgid "Delete Tag"
+msgstr "Trinti"
+
+#: data/templates/default/sidebar.block.tagactions.php:24 www/tagedit.php:61
+#, fuzzy
+msgid "Edit Tag Description"
+msgstr "Aprašas"
+
+#: data/templates/default/sidebar.block.tagactions.php:26
+#: www/tagcommondescriptionedit.php:76
+msgid "Edit Tag Common Description"
+msgstr ""
+
+#: data/templates/default/sidebar.block.tagactions.php:28
+msgid "Create a link to another tag"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:14
+msgid "New Users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:23
+#: data/templates/default/users.tpl.php:24
+#, fuzzy
+msgid "bookmarks"
+msgstr "žymė"
+
+#: data/templates/default/sidebar.block.users.php:30
+msgid "See all users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:30
+msgid "All users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:19
+msgid "Close contacts are mutual contacts"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:19
+msgid "Close contacts"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:36
+msgid "Add a contact..."
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:36
+msgid "Type a username to add it to your contacts."
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:44
+#, fuzzy
+msgid "Remove this contact"
+msgstr "Pašalinti iš bičiulių sąrašo"
+
+#: data/templates/default/sidebar.block.watchstatus.php:11
 msgid "Remove from Watchlist"
 msgstr "Pašalinti iš bičiulių sąrašo"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:12
+#: data/templates/default/sidebar.block.watchstatus.php:13
 msgid "Add to Watchlist"
 msgstr "Įtraukti į bičiulių sąrašą"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:17
-msgid "Actions"
-msgstr "Veiksmai"
+#: data/templates/default/sidebar.linkedtags.inc.php:18
+#, fuzzy
+msgid "Edit link"
+msgstr "Keisti"
+
+#: data/templates/default/sidebar.linkedtags.inc.php:47
+msgid "Synonyms:"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:12
+msgid "Create new link:"
+msgstr ""
+
+#: data/templates/default/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 ""
+
+#: data/templates/default/tag2tagadd.tpl.php:23
+#: data/templates/default/tag2tagedit.tpl.php:37
+msgid "Create"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:35
+#: data/templates/default/tag2tagdelete.tpl.php:27
+#: data/templates/default/tag2tagedit.tpl.php:51
+msgid "Existing links:"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:53
+#: data/templates/default/tag2tagdelete.tpl.php:45
+#: data/templates/default/tag2tagedit.tpl.php:69
+msgid "No links"
+msgstr ""
+
+#: data/templates/default/tag2tagdelete.tpl.php:15
+#: data/templates/default/tag2tagedit.tpl.php:16
+#: data/templates/default/tagdelete.tpl.php:8 www/jsScuttle.php:24
+msgid "Yes"
+msgstr "Taip"
+
+#: data/templates/default/tag2tagdelete.tpl.php:16
+#: data/templates/default/tag2tagedit.tpl.php:17
+#: data/templates/default/tagdelete.tpl.php:9 www/jsScuttle.php:24
+msgid "No"
+msgstr "Ne"
+
+#: data/templates/default/tag2tagedit.tpl.php:6
+msgid "Delete the link"
+msgstr ""
+
+#: data/templates/default/tag2tagedit.tpl.php:29
+msgid "Create new link"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:12
+msgid "Old"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:17
+msgid "New"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:24
+#, fuzzy
+msgid "Rename"
+msgstr "Vartotojas"
 
-#: ..\..\..\templates\tags.tpl.php:8
+#: data/templates/default/tags.tpl.php:11
+#: data/templates/default/users.tpl.php:9
 msgid "Alphabet"
 msgstr "Abėcėlė"
 
-#: ..\..\..\templates\tags.tpl.php:9
+#: data/templates/default/tags.tpl.php:12
+#: data/templates/default/users.tpl.php:10
 msgid "Popularity"
 msgstr "Populiarumas"
 
-#: ..\..\..\templates\toolbar.inc.php:11
-msgid "Bookmarks"
-msgstr "Žymės"
+#: data/templates/default/toolbar.inc.php:8
+#: data/templates/default/toolbar.inc.php:26
+#, fuzzy
+msgid "Home"
+msgstr "Svetainė"
+
+#: data/templates/default/toolbar.inc.php:11 www/watchlist.php:106
+msgid "Watchlist"
+msgstr "Bičiuliai"
 
-#: ..\..\..\templates\toolbar.inc.php:16
+#: data/templates/default/toolbar.inc.php:12 www/profile.php:79
+msgid "Profile"
+msgstr "Profilis"
+
+#: data/templates/default/toolbar.inc.php:13 www/bookmarks.php:215
+msgid "Add a Bookmark"
+msgstr "Pridėti žymę"
+
+#: data/templates/default/toolbar.inc.php:14
 msgid "Log Out"
 msgstr "Atsijungti"
 
+#: data/templates/default/toolbar.inc.php:17
+msgid "Admin"
+msgstr ""
+
+#: data/templates/default/top.inc.php:57
+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/default/users.tpl.php:20
+#, fuzzy
+msgid "profile"
+msgstr "Profilis"
+
+#: data/templates/default/users.tpl.php:21
+msgid "created in"
+msgstr ""
+
+#: www/admin.php:32
+msgid "Manage users"
+msgstr ""
+
+#: www/admin.php:69
+#, php-format
+msgid "%s and all his bookmarks and tags were deleted."
+msgstr ""
+
+#: www/admin.php:76
+msgid "Problem with "
+msgstr ""
+
+#: www/ajaxDelete.php:37
+msgid "You are not allowed to delete this bookmark"
+msgstr "Jums neturite teisės ištrinti šį žymę"
+
+#: www/ajaxDelete.php:41 www/edit.php:103
+msgid "Failed to delete bookmark"
+msgstr "Nepavyko ištrinti žymės"
+
+#: www/alltags.php:50
+msgid "All Tags"
+msgstr "Visos gairės"
+
+#: www/alltags.php:56 www/bookmarks.php:99 www/populartags.php:52
+#: www/profile.php:55 www/rss.php:100 www/search.php:111 www/watch.php:45
+#: www/watchlist.php:61
+#, php-format
+msgid "User with username %s was not found"
+msgstr "Nepavyko rasti vartotojo vardu %s"
+
+#: 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 ""
+
+#: www/bookmarkcommondescriptionedit.php:60
+msgid "Bookmark common description updated"
+msgstr ""
+
+#: www/bookmarkcommondescriptionedit.php:63
+#, fuzzy
+msgid "Failed to update the bookmark common description"
+msgstr "Žymės ištrinti nepavyko"
+
+#: www/bookmarkcommondescriptionedit.php:71
+msgid "Edit Bookmark Common Description"
+msgstr ""
+
+#: www/bookmarks.php:114 www/tags.php:47
+msgid "Remove the tag from the selection"
+msgstr ""
+
+#: www/bookmarks.php:134 www/edit.php:65
+msgid "Your bookmark must have a title and an address"
+msgstr "Įrašoma žymė privalo turėti pavadinimą ir adresą"
+
+#: www/bookmarks.php:139
+msgid "This bookmark URL may not be added"
+msgstr ""
+
+#: www/bookmarks.php:158 www/edit.php:83 www/edit.php:86
+msgid "Bookmark saved"
+msgstr "Žymė išsaugota"
+
+#: www/bookmarks.php:158
+msgid "(Come back to previous page.)"
+msgstr ""
+
+#: www/bookmarks.php:165 www/import.php:106 www/importNetscape.php:108
+msgid ""
+"There was an error saving your bookmark. Please try again or contact the "
+"administrator."
+msgstr ""
+"Saugant žymę įvyko klaida. Bandykite dar kartą arba kreipkitės į "
+"administratorių."
+
+#: www/bookmarks.php:222
+msgid "Add Bookmark"
+msgstr "Pridėti žymę"
+
+#: www/bookmarks.php:225
+msgid "You must be logged in before you can add bookmarks."
+msgstr "Jei norite pridėti naujas žymes, privalote prisijungti."
+
+#: www/bookmarks.php:270
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: www/bookmarks.php:283
+#, php-format
+msgid "%s: %s (+private %s)"
+msgstr ""
+
+#: www/bookmarks.php:305 www/bookmarks.php:306
+msgid "My Bookmarks"
+msgstr "Mano žymės"
+
+#: www/edit.php:44 www/edit.php:45
+msgid "Edit Bookmark"
+msgstr "Keisti žymę"
+
+#: www/edit.php:51
+#, php-format
+msgid "Bookmark with id %s not was not found"
+msgstr "Žymės su  id %s nepavyko rasti"
+
+#: www/edit.php:57
+msgid "You are not allowed to edit this bookmark"
+msgstr "Jūs neturite teisės keisti šią žymę"
+
+#: www/edit.php:77
+msgid "Error while saving your bookmark"
+msgstr "Saugant žymę įvyko klaida"
+
+#: www/history.php:61
+msgid "History"
+msgstr "Istorija"
+
+#: www/history.php:62
+#, php-format
+msgid "History for %s"
+msgstr "%s istorija"
+
+#: www/history.php:84
+msgid "Address was not found"
+msgstr "Adreso nepavyko rasti"
+
+#: www/import.php:47
+msgid "Could not open XML input"
+msgstr "Nepavyko atidaryti XML įvesties"
+
+#: www/import.php:51
+#, php-format
+msgid "XML error: %s at line %d"
+msgstr "XML klaida: %s eilutėje %d"
+
+#: www/import.php:60
+msgid "Import Bookmarks from del.icio.us"
+msgstr "Importuoti žymes iš del.icio.us"
+
+#: www/import.php:93
+msgid "You have already submitted this bookmark."
+msgstr "Jūs jau išsaugojote šią žymę."
+
+#: www/import.php:104
+msgid "Bookmark imported."
+msgstr "Žymė importuota."
+
+#: www/importNetscape.php:95
+#, fuzzy
+msgid "You have already submitted some of these bookmarks."
+msgstr "Jūs jau išsaugojote šią žymę."
+
+#: www/importNetscape.php:115
+#, fuzzy
+msgid "Bookmarks found: "
+msgstr "Žymių nėra"
+
+#: www/importNetscape.php:116
+#, fuzzy
+msgid "Bookmarks imported: "
+msgstr "Žymė importuota."
+
+#: www/importNetscape.php:117 www/importNetscape.php:122
+msgid "Import Bookmarks from Browser File"
+msgstr "Importuoti žymes iš naryklės failo"
+
+#: 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 "Jūs dabar atsijungėte"
+
+#: www/index.php:46
+#, php-format
+msgid "%s: Recent bookmarks"
+msgstr "%s: naujos žymės"
+
+#: www/index.php:58
+#, fuzzy, php-format
+msgid "%s: Recent bookmarks (+private %s)"
+msgstr "%s: naujos žymės"
+
+#: www/index.php:96
+msgid "Store, share and tag your favourite links"
+msgstr "Kaupkite, dalinkites ir aprašinėkite savo svarbiausias interneto žymes"
+
+#: www/index.php:97
+#, fuzzy
+msgid "All Bookmarks"
+msgstr "visose žymėse"
+
+#: www/jsScuttle.php:71
+msgid "Available"
+msgstr "Yra"
+
+#: www/jsScuttle.php:74
+msgid "Not Available"
+msgstr "Nėra"
+
+#: www/login.php:48
+msgid "The details you have entered are incorrect. Please try again."
+msgstr "Jūsų įrašyti duomenys neteisingi. Bandykite dar kartą."
+
+#: www/password.php:36
+msgid "You must enter your username."
+msgstr "Privalote įrašyti vartotojo vardą."
+
+#: www/password.php:40
+msgid ""
+"You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"Privalote įrašyti savo <abbr title=\"elektroninis paštas\">el. pašto</abbr> "
+"adresą."
+
+#: www/password.php:48
+msgid "No matches found for that username."
+msgstr "Nepavyko rasti įrašų, susijusių su šiuo vartotoju."
+
+#: www/password.php:51
+msgid ""
+"No matches found for that combination of username and <abbr title="
+"\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"Nepavyko rasti įrašų, susijusių su šiuo vartotojo vardu ir <abbr title="
+"\"elektroninis paštas\">el. pašto</abbr> adresu."
+
+#: www/password.php:59
+msgid ""
+"There was an error while generating your new password. Please try again."
+msgstr "Generuojant naują Jūsų slaptažodį įvyko klaida. Bandykite dar kartą."
+
+#: www/password.php:63
+msgid "Your new password is:"
+msgstr "Jūsų naujasis slaptažodis yra:"
+
+#: 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 ""
+"Vardan Jūsų kaupiamos informacijos saugumo, rekomenduojame pasikeisti "
+"slaptažodį, kai kitą kartą prisijungsite prie vartotojo profilio."
+
+#: www/password.php:66
+#, php-format
+msgid "%s Account Information"
+msgstr "%s paskyros informacija"
+
+#: www/password.php:68
+#, php-format
+msgid "New password generated and sent to %s"
+msgstr "Naujas slaptažodis sukurtas ir išsiųstas %s"
+
+#: www/password.php:75
+msgid "Forgotten Password"
+msgstr "Užmirštas slaptažodis"
+
+#: www/profile.php:63 www/watchlist.php:119
+msgid "Username was not specified"
+msgstr "Nenurodytas vartotojo vardas"
+
+#: www/profile.php:70
+msgid "My Profile"
+msgstr "Mano profilis"
+
+#: www/profile.php:110
+msgid "Invalid Token"
+msgstr ""
+
+#: www/profile.php:115
+msgid "Password and confirmation do not match."
+msgstr "Įrašyti slaptažodžio variantai nesutampa."
+
+#: www/profile.php:119
+msgid "Password must be at least 6 characters long."
+msgstr "Slaptažodis turi būti bent 6 simbolių ilgio."
+
+#: www/profile.php:123
+msgid "E-mail address is not valid."
+msgstr "Neteisingas el. pašto adresas."
+
+#: www/profile.php:127
+msgid "An error occurred while saving your changes."
+msgstr "Saugant pakeitimus įvyko klaida."
+
+#: www/profile.php:129
+msgid "Changes saved."
+msgstr "Pakeitimai išsaugoti."
+
+#: www/profile.php:148
+msgid "You do not have a valid SSL client certificate"
+msgstr ""
+
+#: www/profile.php:150
+msgid "This certificate is already registered"
+msgstr ""
+
+#: www/profile.php:152
+msgid "Failed to register SSL client certificate."
+msgstr ""
+
+#: www/profile.php:154
+msgid "SSL client certificate registered."
+msgstr ""
+
+#: www/profile.php:163
+msgid "Certificate not found."
+msgstr ""
+
+#: www/profile.php:165
+msgid "The certificate does not belong to you."
+msgstr ""
+
+#: www/profile.php:167
+msgid "Failed to delete SSL client certificate."
+msgstr ""
+
+#: www/profile.php:169
+msgid "SSL client certificate deleted."
+msgstr ""
+
+#: www/register.php:52
+msgid "You <em>must</em> enter a username, password and e-mail address."
+msgstr ""
+"<em>Privalote</em> įrašyti vartotojo vardą, slaptažodį, vardą ir <abbr title="
+"\"elektroninis paštas\">el. pašto</abbr> adresą."
+
+#: www/register.php:56
+#, fuzzy
+msgid "This username has been reserved, please make another choice."
+msgstr "Toks vartotojas jau yra, prašom pasirinkti kitą."
+
+#: www/register.php:60
+msgid "This username already exists, please make another choice."
+msgstr "Toks vartotojas jau yra, prašom pasirinkti kitą."
+
+#: www/register.php:64
+#, fuzzy
+msgid ""
+"This username is not valid (too short, too long, forbidden characters...), "
+"please make another choice."
+msgstr "Toks vartotojas jau yra, prašom pasirinkti kitą."
+
+#: www/register.php:68
+msgid "E-mail address is not valid. Please try again."
+msgstr "El. pašto adresas neteisingas. Bandykite dar kartą."
+
+#: www/register.php:72
+#, fuzzy
+msgid "Antispam answer is not valid. Please try again."
+msgstr "El. pašto adresas neteisingas. Bandykite dar kartą."
+
+#: www/register.php:90
+msgid "You have successfully registered. Enjoy!"
+msgstr "Sveikiname sėkmingai užsiregistravus!"
+
+#: www/register.php:92
+msgid "Registration failed. Please try again."
+msgstr "Registracija nepavyko. Bandykite dar kartą."
+
+#: www/rss.php:90 www/rss.php:111
+#, php-format
+msgid "Failed to Autenticate User with username %s using private key"
+msgstr ""
+
+#: www/rss.php:128
+#, php-format
+msgid "Recent bookmarks posted to %s"
+msgstr "Naujos, %s išsiųstos gairės"
+
+#: www/search.php:83 www/search.php:147
+msgid "Search Bookmarks"
+msgstr "Ieškoti žymėse"
+
+#: www/search.php:89
+msgid "Search Results"
+msgstr "Paieškos rezultatai"
+
+#: www/search.php:137
+msgid "Unsatisfied? You can also try our "
+msgstr ""
+
+#: www/tag2tagadd.php:54
+msgid "Tag link created"
+msgstr ""
+
+#: www/tag2tagadd.php:57
+#, fuzzy
+msgid "Failed to create the link"
+msgstr "Žymės ištrinti nepavyko"
+
+#: www/tag2tagadd.php:69
+msgid "Add Tag Link"
+msgstr ""
+
+#: www/tag2tagdelete.php:66
+msgid "Tag link deleted"
+msgstr ""
+
+#: www/tag2tagdelete.php:69
+#, fuzzy
+msgid "Failed to delete the link"
+msgstr "Žymės ištrinti nepavyko"
+
+#: www/tag2tagdelete.php:81
+msgid "Delete Link Between Tags"
+msgstr ""
+
+#: www/tag2tagedit.php:55
+msgid "Edit Link Between Tags"
+msgstr ""
+
+#: www/tagcommondescriptionedit.php:62
+msgid "Tag common description updated"
+msgstr ""
+
+#: www/tagcommondescriptionedit.php:67
+msgid "Failed to update the tag common description"
+msgstr ""
+
+#: www/tagdelete.php:43
+msgid "Tag deleted"
+msgstr ""
+
+#: www/tagdelete.php:46
+#, fuzzy
+msgid "Failed to delete the tag"
+msgstr "Žymės ištrinti nepavyko"
+
+#: www/tagedit.php:52
+msgid "Tag description updated"
+msgstr ""
+
+#: www/tagedit.php:55
+#, fuzzy
+msgid "Failed to update the tag description"
+msgstr "Žymės ištrinti nepavyko"
+
+#: www/tagrename.php:63
+msgid "Tag renamed"
+msgstr ""
+
+#: www/tagrename.php:66
+#, fuzzy
+msgid "Failed to rename the tag"
+msgstr "Žymės ištrinti nepavyko"
+
+#: www/tags.php:71
+#, php-format
+msgid "%s: tagged with \"%s\""
+msgstr ""
+
+#: www/tags.php:84
+#, php-format
+msgid "%s: tagged with \"%s\" (+private %s)"
+msgstr ""
+
+#: www/users.php:31
+#, fuzzy
+msgid "Users"
+msgstr "Vartotojas"
+
+#: www/watch.php:54
+msgid "User removed from your watchlist"
+msgstr "Vartotojas išbrauktas iš bičiulių sąrašo"
+
+#: www/watch.php:56
+msgid "User added to your watchlist"
+msgstr "Vartotojas įtrauktas į bičiulių sąrašą"
+
+#: www/watchlist.php:104
+msgid "My Watchlist"
+msgstr "Mano bičiuliai"
+
+#: www/api/httpauth.inc.php:30
+msgid "Use of the API calls requires authentication."
+msgstr ""
+
+#: www/gsearch/index.php:51
+msgid "Come back to "
+msgstr ""
+
+#: www/gsearch/index.php:56
+msgid "Admin tips: "
+msgstr ""
+
+#: www/gsearch/index.php:57
+msgid "To refresh manually Google Custom Search Engine, goes to: "
+msgstr ""
+
+#: www/gsearch/index.php:61
+msgid ""
+"If no result appears, check that all the urls are valid in the admin section."
+msgstr ""
+
+#~ msgid "User with username %s not was not found"
+#~ msgstr "Nepavyko rasti vartotojo vardu %s"
+
+#~ msgid "Recent Bookmarks"
+#~ msgstr "Naujos žymės"
+
+#~ msgid "for"
+#~ msgstr "teksto"
+
+#~ msgid "%s Bookmarks"
+#~ msgstr "%s žymės"
+
+#~ msgid ""
+#~ "<strong><a href=\"register.php\">Register now</a></strong> to start using "
+#~ "%s!"
+#~ msgstr ""
+#~ "<strong><a href=\"register.php\">Registruokitės dabar</a></strong> ir "
+#~ "pradėkite darbą su <strong>%s</strong>!"
+
+#~ msgid ""
+#~ "%s is based on <a href=\"http://sourceforge.net/projects/scuttle/\">an "
+#~ "open-source project</a> licensed under the <a href=\"http://www.gnu.org/"
+#~ "copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> "
+#~ "General Public License</a>. This means you can host it on your own web "
+#~ "server for free, whether it is on the Internet, a private network or just "
+#~ "your own computer."
+#~ msgstr ""
+#~ "<strong>%s</strong> veikia pagal <a href=\"http://www.gnu.org/copyleft/"
+#~ "gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> GPL</a> "
+#~ "licenciją sukurto <a href=\"http://sourceforge.net/projects/scuttle/"
+#~ "\">atvirojo kodo projekto</a> pagrindu. Tai reiškia, kad Jūs galite šią "
+#~ "sistemą nemokamai naudoti ir talpinti internete, vidaus tinkle ar savo "
+#~ "kompiuteryje."
+
+#~ msgid "URL"
+#~ msgstr "adresą"
+
+#~ msgid "<abbr title=\"Electronic mail\">E-mail</abbr>"
+#~ msgstr "<abbr title=\"Elektroninis paštas\">El. paštas</abbr>"
diff --git a/data/locales/messages.po b/data/locales/messages.po
index 56646cf..6276a8b 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: 2011-11-01 17:15+0100\n"
+"POT-Creation-Date: 2012-01-20 13:58+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"
@@ -660,8 +660,8 @@ msgstr ""
 
 #: data/templates/default/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>"
+"Log in to the <a href=\"https://api.del.icio.us/v1/posts/all\">export page "
+"at del.icio.us</a>"
 msgstr ""
 
 #: data/templates/default/importDelicious.tpl.php:34
diff --git a/data/locales/nl_NL/LC_MESSAGES/messages.mo b/data/locales/nl_NL/LC_MESSAGES/messages.mo
index b4b617c..34b8e34 100644
--- a/data/locales/nl_NL/LC_MESSAGES/messages.mo
+++ b/data/locales/nl_NL/LC_MESSAGES/messages.mo
diff --git a/data/locales/nl_NL/LC_MESSAGES/messages.po b/data/locales/nl_NL/LC_MESSAGES/messages.po
index 95431a4..d84bfbc 100644
--- a/data/locales/nl_NL/LC_MESSAGES/messages.po
+++ b/data/locales/nl_NL/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: scuttle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-29 11:17+0200\n"
+"POT-Creation-Date: 2012-01-20 13:58+0100\n"
 "PO-Revision-Date: 2006-03-18 21:46-0800\n"
 "Last-Translator: Marcus Campbell <marcus.campbell@gmail.com>\n"
 "Language-Team: nl-NL <alley@ilikeu2.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,834 +19,1691 @@ msgstr ""
 "X-Poedit-Country: NETHERLANDS\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ..\..\..\about.php:25
-#: ..\..\..\templates\toolbar.inc.php:24
-msgid "About"
-msgstr "Over ons"
-
-#: ..\..\..\ajaxDelete.php:29
-#, fuzzy
-msgid "You are not allowed to delete this bookmark"
-msgstr "De bookmark kon niet worden verwijderd"
-
-#: ..\..\..\ajaxDelete.php:33
-#, fuzzy
-msgid "Failed to delete bookmark"
-msgstr "Bookmark Verwijderen"
-
-#: ..\..\..\alltags.php:50
-msgid "All Tags"
-msgstr "Alle tags"
-
-#: ..\..\..\alltags.php:59
-#: ..\..\..\populartags.php:63
-#: ..\..\..\profile.php:46
-#: ..\..\..\rss.php:55
-#: ..\..\..\search.php:61
-#: ..\..\..\watch.php:35
-#: ..\..\..\watched.php:62
-#, php-format
-msgid "User with username %s not was not found"
-msgstr ""
-
-#: ..\..\..\bookmarks.php:71
-#, fuzzy, php-format
-msgid "User with username %s was not found"
-msgstr "Bookmark werd niet gevonden"
-
-#: ..\..\..\bookmarks.php:94
-#: ..\..\..\edit.php:44
-msgid "Your bookmark must have a title and an address"
-msgstr "Je bookmarks moeten een titel en adres hebben"
-
-#: ..\..\..\bookmarks.php:114
-#: ..\..\..\edit.php:58
-msgid "Bookmark saved"
-msgstr "Bookmark opgeslagen"
-
-#: ..\..\..\bookmarks.php:122
-#: ..\..\..\import.php:99
-#: ..\..\..\importNetscape.php:74
-msgid "There was an error saving your bookmark. Please try again or contact the administrator."
-msgstr ""
-
-#: ..\..\..\bookmarks.php:160
-#: ..\..\..\templates\toolbar.inc.php:13
-msgid "Add a Bookmark"
-msgstr "Voeg een bookmark toe"
-
-#: ..\..\..\bookmarks.php:163
-msgid "Add Bookmark"
-msgstr "Bookmark toevoegen"
-
-#: ..\..\..\bookmarks.php:166
-msgid "You must be logged in before you can add bookmarks."
-msgstr "Je moet ingelogd zijn om bookmarks toe te kunnen voegen"
-
-#: ..\..\..\bookmarks.php:213
-#, fuzzy
-msgid "My Bookmarks"
-msgstr "%s Bookmarks"
-
-#: ..\..\..\edit.php:29
-msgid "Edit Bookmark"
-msgstr "Bookmark Bewerken"
-
-#: ..\..\..\edit.php:34
-#, fuzzy, php-format
-msgid "Bookmark with id %s not was not found"
-msgstr "Bookmark werd niet gevonden"
-
-#: ..\..\..\edit.php:39
-#, fuzzy
-msgid "You are not allowed to edit this bookmark"
-msgstr "De bookmark kon niet worden verwijderd"
-
-#: ..\..\..\edit.php:55
-msgid "Error while saving your bookmark"
-msgstr ""
-
-#: ..\..\..\edit.php:78
-#, fuzzy
-msgid "Failed to delete the bookmark"
-msgstr "De bookmark kon niet worden verwijderd"
-
-#: ..\..\..\edit.php:88
-#: ..\..\..\templates\editprofile.tpl.php:52
-msgid "Save Changes"
-msgstr "Veranderingen opslaan"
-
-#: ..\..\..\functions.inc.php:92
+#: src/SemanticScuttle/functions.php:189
 msgid "message_die() was called multiple times."
 msgstr ""
 
-#: ..\..\..\functions.inc.php:104
+#: src/SemanticScuttle/functions.php:201
 msgid "SQL Error"
 msgstr ""
 
-#: ..\..\..\functions.inc.php:110
+#: src/SemanticScuttle/functions.php:207
 msgid "Line"
 msgstr ""
 
-#: ..\..\..\functions.inc.php:110
-#: ..\..\..\templates\importDelicious.tpl.php:8
-#: ..\..\..\templates\importNetscape.tpl.php:9
+#: src/SemanticScuttle/functions.php:207
+#: data/templates/default/importDelicious.tpl.php:8
+#: data/templates/default/importNetscape.tpl.php:9
+#: data/templates/default/importStructure.tpl.php:10
 msgid "File"
 msgstr "Bestand"
 
-#: ..\..\..\functions.inc.php:116
+#: src/SemanticScuttle/functions.php:215
 #, fuzzy
 msgid "Information"
 msgstr "Instructies"
 
-#: ..\..\..\functions.inc.php:121
+#: src/SemanticScuttle/functions.php:220
 msgid "Critical Information"
 msgstr ""
 
-#: ..\..\..\functions.inc.php:126
+#: src/SemanticScuttle/functions.php:225
 msgid "An error occured"
 msgstr ""
 
-#: ..\..\..\functions.inc.php:129
+#: src/SemanticScuttle/functions.php:228
 msgid "General Error"
 msgstr ""
 
-#: ..\..\..\functions.inc.php:137
+#: src/SemanticScuttle/functions.php:236
 msgid "An critical error occured"
 msgstr ""
 
-#: ..\..\..\functions.inc.php:140
+#: src/SemanticScuttle/functions.php:239
 msgid "Critical Error"
 msgstr ""
 
-#: ..\..\..\functions.inc.php:149
+#: src/SemanticScuttle/functions.php:248
 msgid "DEBUG MODE"
 msgstr ""
 
-#: ..\..\..\history.php:65
-msgid "History"
+#: data/templates/default/about.tpl.php:6
+msgid ""
+"<strong>Store</strong> all your favourite links in one place, accessible "
+"from anywhere."
 msgstr ""
 
-#: ..\..\..\history.php:66
-#, php-format
-msgid "History for %s"
+#: data/templates/default/about.tpl.php:7
+#, fuzzy
+msgid ""
+"<strong>Share</strong> your bookmarks with everyone, with friends on your "
+"watchlist or just keep them private."
 msgstr ""
+"Deel je bookmarks met iedereen, met gebruikers op jouw 'watch-list' of hou "
+"ze gewoon voor jezelf"
 
-#: ..\..\..\history.php:81
-msgid "Address was not found"
+#: data/templates/default/about.tpl.php:8
+msgid ""
+"<strong>Tag</strong> your bookmarks with as many labels as you want, instead "
+"of wrestling with folders."
 msgstr ""
 
-#: ..\..\..\import.php:41
-msgid "Could not open XML input"
-msgstr "XML bestand kon niet geopend worden"
+#: data/templates/default/about.tpl.php:9
+msgid "Register now"
+msgstr ""
 
-#: ..\..\..\import.php:45
+#: data/templates/default/about.tpl.php:9
 #, php-format
-msgid "XML error: %s at line %d"
-msgstr "XML fout: %s op regel %d"
-
-#: ..\..\..\import.php:54
-#, fuzzy
-msgid "Import Bookmarks from del.icio.us"
-msgstr "Importeer van del.icio.us"
-
-#: ..\..\..\import.php:86
-#: ..\..\..\importNetscape.php:64
-#, fuzzy
-msgid "You have already submitted this bookmark."
-msgstr "Je hebt deze bookmark al opgenomen"
+msgid " to start using %s!"
+msgstr ""
 
-#: ..\..\..\import.php:97
-#: ..\..\..\importNetscape.php:72
-#, fuzzy
-msgid "Bookmark imported."
-msgstr "Bookmark opgeslagen"
+#: data/templates/default/about.tpl.php:12
+msgid "Geek Stuff"
+msgstr ""
 
-#: ..\..\..\importNetscape.php:81
-#, fuzzy
-msgid "Import Bookmarks from Browser File"
-msgstr "Importeer bookmarks uit een bookmark bestand"
+#: data/templates/default/about.tpl.php:14
+msgid "is licensed under the "
+msgstr ""
 
-#: ..\..\..\index.php:32
-msgid "You have now logged out"
-msgstr "Je bent uitgelogd"
+#: data/templates/default/about.tpl.php:14
+msgid "you can freely host it on your own web server."
+msgstr ""
 
-#: ..\..\..\index.php:39
+#: data/templates/default/about.tpl.php:15
 #, php-format
-msgid "%s: Recent bookmarks"
-msgstr "%s: Recente bookmarks"
-
-#: ..\..\..\index.php:72
-msgid "Store, share and tag your favourite links"
+msgid ""
+"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 ""
 
-#: ..\..\..\index.php:73
-msgid "Recent Bookmarks"
-msgstr "Recente bookmarks"
-
-#: ..\..\..\jsScuttle.php:22
-msgid "Are you sure?"
+#: data/templates/default/about.tpl.php:24
+msgid "Tips"
 msgstr ""
 
-#: ..\..\..\jsScuttle.php:22
-msgid "Yes"
+#: data/templates/default/about.tpl.php:26
+msgid "Add search plugin into your browser:"
 msgstr ""
 
-#: ..\..\..\jsScuttle.php:22
-msgid "No"
+#: data/templates/default/about.tpl.php:27
+msgid ""
+"The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
 msgstr ""
 
-#: ..\..\..\jsScuttle.php:68
-msgid "Available"
+#: data/templates/default/about.tpl.php:28
+msgid ""
+"The secret tag \"system:imported\" allows you to find imported bookmarks."
 msgstr ""
 
-#: ..\..\..\jsScuttle.php:71
+#: data/templates/default/admin.tpl.php:5
 #, fuzzy
-msgid "Not Available"
-msgstr "Geen bookmarks beschikbaar"
-
-#: ..\..\..\login.php:38
-#, fuzzy
-msgid "The details you have entered are incorrect. Please try again."
-msgstr "De ingevoerde details zijn niet correct. Probeer het nog eens."
-
-#: ..\..\..\login.php:48
-#: ..\..\..\templates\login.tpl.php:26
-#: ..\..\..\templates\toolbar.inc.php:28
-msgid "Log In"
-msgstr "Inloggen"
+msgid "Users management"
+msgstr "Gebruikersnaam"
 
-#: ..\..\..\password.php:31
-msgid "You must enter your username."
+#: data/templates/default/admin.tpl.php:14
+msgid "Public/Shared/Private"
 msgstr ""
 
-#: ..\..\..\password.php:35
+#: data/templates/default/admin.tpl.php:14
+#: data/templates/default/bookmarks.tpl.php:115
 #, fuzzy
-msgid "You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "Een gebruikersnaam, wachtwoord, naam en  <abbr title=\"Electronic mail\">email</abbr> adres <em>moeten</em> worden opgegeven"
+msgid "bookmark(s)"
+msgstr "%s Bookmarks"
 
-#: ..\..\..\password.php:42
-msgid "No matches found for that username."
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/tag2tagadd.tpl.php:21
+#: data/templates/default/tag2tagdelete.tpl.php:13
+#: data/templates/default/tag2tagedit.tpl.php:14
+#: data/templates/default/tag2tagedit.tpl.php:35
+#: data/templates/default/tagdelete.tpl.php:6 www/jsScuttle.php:24
+msgid "Are you sure?"
 msgstr ""
 
-#: ..\..\..\password.php:45
-#, fuzzy
-msgid "No matches found for that combination of username and <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "Een gebruikersnaam, wachtwoord, naam en  <abbr title=\"Electronic mail\">email</abbr> adres <em>moeten</em> worden opgegeven"
-
-#: ..\..\..\password.php:53
-#, fuzzy
-msgid "There was an error while generating your new password. Please try again."
-msgstr "De ingevoerde details zijn niet correct. Probeer het nog eens."
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/bookmarks.tpl.php:305
+msgid "Delete"
+msgstr "Verwijderen"
 
-#: ..\..\..\password.php:57
+#: data/templates/default/admin.tpl.php:27
 #, fuzzy
-msgid "Your new password is:"
-msgstr "Bevestiging nieuw wachtwoord"
-
-#: ..\..\..\password.php:57
-msgid "To keep your bookmarks secure, you should change this password in your profile the next time you log in."
-msgstr ""
-
-#: ..\..\..\password.php:60
-#, fuzzy, php-format
-msgid "%s Account Information"
+msgid "Other actions"
 msgstr "Instructies"
 
-#: ..\..\..\password.php:62
-#, php-format
-msgid "New password generated and sent to %s"
+#: data/templates/default/admin.tpl.php:29
+msgid "Check all URLs (May take some time)"
 msgstr ""
 
-#: ..\..\..\password.php:69
-#, fuzzy
-msgid "Forgotten Password"
-msgstr "Nieuw wachtwoord"
-
-#: ..\..\..\populartags.php:54
-#: ..\..\..\templates\dynamictags.inc.php:101
-#: ..\..\..\templates\sidebar.block.common.php:9
-#: ..\..\..\templates\sidebar.block.popular.php:15
-#: ..\..\..\templates\sidebar.block.recent.php:25
-msgid "Popular Tags"
-msgstr "Populaire Tags"
-
-#: ..\..\..\profile.php:54
-#: ..\..\..\watched.php:114
-msgid "Username was not specified"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:16
+msgid ""
+"Collaborative description: these fields can be viewed and modified by every "
+"users"
 msgstr ""
 
-#: ..\..\..\profile.php:60
-#, fuzzy
-msgid "My Profile"
-msgstr "Profiel"
-
-#: ..\..\..\profile.php:62
-#: ..\..\..\templates\sidebar.block.profile.php:12
-msgid "Profile"
-msgstr "Profiel"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:18
+#: data/templates/default/bookmarks.tpl.php:159
+#: data/templates/default/editbookmark.tpl.php:51
+msgid "Title"
+msgstr "Titel"
 
-#: ..\..\..\profile.php:80
-#, fuzzy
-msgid "Password and confirmation do not match."
-msgstr "Wachtwoord en wachtwoordbevestiging komen niet overen"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:23
+#: data/templates/default/editbookmark.tpl.php:57
+#: data/templates/default/editprofile.tpl.php:53
+#: data/templates/default/profile.tpl.php:33
+#: data/templates/default/tagcommondescriptionedit.tpl.php:13
+#: data/templates/default/tagedit.tpl.php:12
+msgid "Description"
+msgstr "Omschrijving"
 
-#: ..\..\..\profile.php:84
-#, fuzzy
-msgid "Password must be at least 6 characters long."
-msgstr "Wachtwoord dient minimaal 6 karakters lang te zijn"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:31
+#: data/templates/default/tagcommondescriptionedit.tpl.php:21
+msgid "Last modification:"
+msgstr ""
 
-#: ..\..\..\profile.php:88
-#, fuzzy
-msgid "E-mail address is not valid."
-msgstr "Email adres is ongeldig"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:43
+#: data/templates/default/tagcommondescriptionedit.tpl.php:33
+#: data/templates/default/tagedit.tpl.php:18
+msgid "Update"
+msgstr ""
 
-#: ..\..\..\profile.php:92
-msgid "An error occurred while saving your changes."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:44
+#: data/templates/default/editbookmark.tpl.php:111
+#: data/templates/default/tag2tagadd.tpl.php:24
+#: data/templates/default/tag2tagedit.tpl.php:38
+#: data/templates/default/tagcommondescriptionedit.tpl.php:34
+#: data/templates/default/tagedit.tpl.php:19
+#: data/templates/default/tagrename.tpl.php:25
+msgid "Cancel"
 msgstr ""
 
-#: ..\..\..\profile.php:94
-#, fuzzy
-msgid "Changes saved."
-msgstr "Wijzigingen opgeslagen"
+#: data/templates/default/bookmarklet.inc.php:1
+msgid "Bookmarklet"
+msgstr "Bookmarklet"
 
-#: ..\..\..\register.php:33
-#, fuzzy
-msgid "You <em>must</em> enter a username, password and e-mail address."
-msgstr "Een gebruikersnaam, wachtwoord, naam en  <abbr title=\"Electronic mail\">email</abbr> adres <em>moeten</em> worden opgegeven"
+#: data/templates/default/bookmarklet.inc.php:11
+#, 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 ""
+"Sleep een van de volgende 'bookmarklets' naar de link-balk van je browser, "
+"en klik er vervolgens op als je je op een pagina bevind die je aan %s wilt "
+"toevoegen"
 
-#: ..\..\..\register.php:37
-msgid "This username already exists, please make another choice."
+#: data/templates/default/bookmarklet.inc.php:20
+#, 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 ""
+"Sleep een van de volgende 'bookmarklets' naar de link-balk van je browser, "
+"en klik er vervolgens op als je je op een pagina bevind die je aan %s wilt "
+"toevoegen"
 
-#: ..\..\..\register.php:41
-#, fuzzy
-msgid "E-mail address is not valid. Please try again."
-msgstr "Email adres is ongeldig"
+#: data/templates/default/bookmarklet.inc.php:67
+#: data/templates/default/bookmarklet.inc.php:100
+#, php-format
+msgid "Post to %s"
+msgstr "Plaats op %s"
 
-#: ..\..\..\register.php:50
-#, fuzzy
-msgid "You have successfully registered. Enjoy!"
-msgstr "De bookmark is succesvol verwijderd"
+#: data/templates/default/bookmarklet.inc.php:93
+#: data/templates/default/bookmarklet.inc.php:110
+#, php-format
+msgid "Post to %s (Pop-up)"
+msgstr "Plaats op %s (pop-up)"
 
-#: ..\..\..\register.php:52
-msgid "Registration failed. Please try again."
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:24
+#, php-format
+msgid "Voting <span class=\"voting\">%d</span>"
 msgstr ""
 
-#: ..\..\..\register.php:57
-#: ..\..\..\templates\register.tpl.php:32
-#: ..\..\..\templates\toolbar.inc.php:27
-msgid "Register"
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:32
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:35
+msgid "Vote for"
 msgstr ""
 
-#: ..\..\..\search.inc.php:29
-#: ..\..\..\search.inc.php:57
-msgid "Search"
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:43
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:46
+msgid "Vote against"
 msgstr ""
 
-#: ..\..\..\search.inc.php:35
-#, fuzzy
-msgid "this user's bookmarks"
-msgstr "%s Bookmarks"
-
-#: ..\..\..\search.inc.php:40
-msgid "my bookmarks"
-msgstr "Mijn bookmarks"
-
-#: ..\..\..\search.inc.php:41
-#, fuzzy
-msgid "my watchlist"
-msgstr "Voeg toe aan 'watch-list'"
-
-#: ..\..\..\search.inc.php:45
-msgid "all bookmarks"
-msgstr "Alle bookmarks"
-
-#: ..\..\..\search.inc.php:48
-msgid "for"
-msgstr "voor"
-
-#: ..\..\..\search.php:91
-#: ..\..\..\search.php:128
-msgid "Search Bookmarks"
-msgstr "Bookmarks zoeken"
-
-#: ..\..\..\search.php:97
-msgid "Search Results"
+#: data/templates/default/bookmarks.tpl.php:43
+msgid "Bookmarks on this page are managed by an admin user."
 msgstr ""
 
-#: ..\..\..\tags.php:38
-#: ..\..\..\templates\editbookmark.tpl.php:44
-#: ..\..\..\templates\sidebar.block.profile.php:13
-msgid "Tags"
-msgstr "Tags"
-
-#: ..\..\..\watch.php:79
-#, php-format
-msgid "%s Bookmarks"
-msgstr "%s Bookmarks"
-
-#: ..\..\..\watch.php:84
-#, fuzzy
-msgid "User removed from your watchlist"
-msgstr "Van 'watch-list' verwijderen"
-
-#: ..\..\..\watch.php:86
-#, fuzzy
-msgid "User added to your watchlist"
-msgstr "Voeg toe aan 'watch-list'"
+#: data/templates/default/bookmarks.tpl.php:73
+#: data/templates/default/bookmarks.tpl.php:74
+msgid "Edit the common description of this tag"
+msgstr ""
 
-#: ..\..\..\watched.php:105
-#, fuzzy
-msgid "My Watchlist"
-msgstr "Watch List"
+#: data/templates/default/bookmarks.tpl.php:77
+#: data/templates/default/bookmarks.tpl.php:78
+msgid "Edit the common description of this bookmark"
+msgstr ""
 
-#: ..\..\..\watched.php:107
-#: ..\..\..\templates\sidebar.block.profile.php:14
-#: ..\..\..\templates\toolbar.inc.php:12
-#, fuzzy
-msgid "Watchlist"
-msgstr "Watch List"
+#: data/templates/default/bookmarks.tpl.php:98
+#: data/templates/default/bookmarks.tpl.php:99
+msgid "Edit your personal description of this tag"
+msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:6
-msgid "<strong>Store</strong> all your favourite links in one place, accessible from anywhere."
+#: data/templates/default/bookmarks.tpl.php:115
+#: data/templates/default/tags.tpl.php:10
+#: data/templates/default/users.tpl.php:8
+msgid "Sort by:"
 msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:7
-#, fuzzy
-msgid "<strong>Share</strong> your bookmarks with everyone, with friends on your watchlist or just keep them private."
-msgstr "Deel je bookmarks met iedereen, met gebruikers op jouw 'watch-list' of hou ze gewoon voor jezelf"
+#: data/templates/default/bookmarks.tpl.php:157
+msgid "Date"
+msgstr "Datum"
 
-#: ..\..\..\templates\about.tpl.php:8
-msgid "<strong>Tag</strong> your bookmarks with as many labels as you want, instead of wrestling with folders."
+#: data/templates/default/bookmarks.tpl.php:162
+msgid "Voting"
 msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:9
-#, fuzzy, php-format
-msgid "<strong><a href=\"register.php\">Register now</a></strong> to start using %s!"
-msgstr "<a href=\"register.php\">Registreer nu</a> om je eigen bookmarks op te slaan"
+#: data/templates/default/bookmarks.tpl.php:171
+msgid "Bookmarks from other users for this tag"
+msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:12
-msgid "Geek Stuff"
+#: data/templates/default/bookmarks.tpl.php:176
+msgid "Only your bookmarks for this tag"
 msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:14
-#, php-format
-msgid "%s is based on <a href=\"http://sourceforge.net/projects/scuttle/\">an open-source project</a> licensed under the <a href=\"http://www.gnu.org/copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> General Public License</a>. This means you can host it on your own web server for free, whether it is on the Internet, a private network or just your own computer."
+#: data/templates/default/bookmarks.tpl.php:199
+#: data/templates/default/bookmarks.tpl.php:205
+msgid "First"
 msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:15
-#, php-format
-msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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."
+#: data/templates/default/bookmarks.tpl.php:200
+#: data/templates/default/bookmarks.tpl.php:206
+msgid "Previous"
 msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:17
-#: ..\..\..\templates\tags.tpl.php:7
-msgid "Sort by:"
+#: data/templates/default/bookmarks.tpl.php:213
+#: data/templates/default/bookmarks.tpl.php:216
+msgid "Next"
 msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:18
-msgid "Date"
-msgstr "Datum"
+#: data/templates/default/bookmarks.tpl.php:214
+#: data/templates/default/bookmarks.tpl.php:217
+msgid "Last"
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:19
-#: ..\..\..\templates\editbookmark.tpl.php:34
-msgid "Title"
-msgstr "Titel"
+#: data/templates/default/bookmarks.tpl.php:233
+#, php-format
+msgid "Page %d of %d"
+msgstr "Pagina %d van %d"
 
-#: ..\..\..\templates\bookmarks.tpl.php:23
-msgid "URL"
-msgstr ""
+#: data/templates/default/bookmarks.tpl.php:295
+#, fuzzy
+msgid "Tags:"
+msgstr "Tags"
 
-#: ..\..\..\templates\bookmarks.tpl.php:60
+#: data/templates/default/bookmarks.tpl.php:302
 msgid "Edit"
 msgstr "Bewerken"
 
-#: ..\..\..\templates\bookmarks.tpl.php:60
-msgid "Delete"
-msgstr "Verwijderen"
+#: data/templates/default/bookmarks.tpl.php:310
+msgid "Last update"
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:66
+#: data/templates/default/bookmarks.tpl.php:313
 msgid "by"
 msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:78
+#: data/templates/default/bookmarks.tpl.php:317
+msgid "you"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:333
 #, php-format
 msgid " and %s1 other%s"
 msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:81
+#: data/templates/default/bookmarks.tpl.php:336
 #, php-format
 msgid " and %2$s%1$s others%3$s"
 msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:90
+#: data/templates/default/bookmarks.tpl.php:350
+#, fuzzy
+msgid "Copy this bookmark to YOUR bookmarks."
+msgstr "Importeer bookmarks uit een bookmark bestand"
+
+#: data/templates/default/bookmarks.tpl.php:351
 msgid "Copy"
 msgstr "Kopi&euml;ren"
 
-#: ..\..\..\templates\bookmarks.tpl.php:136
-#: ..\..\..\templates\bookmarks.tpl.php:142
-msgid "First"
+#: data/templates/default/bookmarks.tpl.php:376
+msgid "This bookmark is certified by an admin user."
 msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:137
-#: ..\..\..\templates\bookmarks.tpl.php:143
-msgid "Previous"
-msgstr ""
+#: data/templates/default/bookmarks.tpl.php:430
+#, fuzzy
+msgid "Private Note on this bookmark"
+msgstr "De bookmark kon niet worden verwijderd"
 
-#: ..\..\..\templates\bookmarks.tpl.php:150
-#: ..\..\..\templates\bookmarks.tpl.php:153
-msgid "Next"
+#: data/templates/default/bookmarks.tpl.php:444
+msgid "Come back to the top of this page."
 msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:151
-#: ..\..\..\templates\bookmarks.tpl.php:154
-msgid "Last"
+#: data/templates/default/bookmarks.tpl.php:444
+msgid "Top of the page"
 msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:156
-#, php-format
-msgid "Page %d of %d"
-msgstr "Pagina %d van %d"
-
-#: ..\..\..\templates\bookmarks.tpl.php:160
+#: data/templates/default/bookmarks.tpl.php:450
 msgid "No bookmarks available"
 msgstr "Geen bookmarks beschikbaar"
 
-#: ..\..\..\templates\dynamictags.inc.php:108
-#: ..\..\..\templates\sidebar.block.common.php:15
-#: ..\..\..\templates\sidebar.block.popular.php:21
-#: ..\..\..\templates\sidebar.block.recent.php:20
-#: ..\..\..\templates\tags.tpl.php:16
+#: data/templates/default/bottom.inc.php:5
+#: data/templates/default/toolbar.inc.php:15
+#: data/templates/default/toolbar.inc.php:28 www/about.php:23 www/about.php:24
+msgid "About"
+msgstr "Over ons"
+
+#: data/templates/default/bottom.inc.php:7
+msgid "Propulsed by "
+msgstr ""
+
+#: data/templates/default/dynamictags.inc.php:56
+#: data/templates/default/sidebar.block.common.php:19
+#: data/templates/default/sidebar.block.popular.php:34
+#: data/templates/default/sidebar.block.recent.php:29
+#: data/templates/default/tags.tpl.php:19
 #, fuzzy
 msgid "bookmark"
 msgid_plural "bookmarks"
 msgstr[0] "%s Bookmarks"
 msgstr[1] "%s Bookmarks"
 
-#: ..\..\..\templates\editbookmark.tpl.php:29
+#: data/templates/default/dynamictags.inc.php:105
+#: data/templates/default/sidebar.block.common.php:9
+#: data/templates/default/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.popular.php:23
+#: data/templates/default/sidebar.block.recent.php:34
+#: data/templates/default/toolbar.inc.php:27 www/populartags.php:46
+msgid "Popular Tags"
+msgstr "Populaire Tags"
+
+#: data/templates/default/dynamictags.inc.php:108
+#, fuzzy
+msgid "Popular Tags From All Users"
+msgstr "Populaire Tags"
+
+#: data/templates/default/editbookmark.tpl.php:46
 msgid "Address"
 msgstr "Adres"
 
-#: ..\..\..\templates\editbookmark.tpl.php:31
-#: ..\..\..\templates\editbookmark.tpl.php:36
-#: ..\..\..\templates\editprofile.tpl.php:31
+#: data/templates/default/editbookmark.tpl.php:48
+#: data/templates/default/editbookmark.tpl.php:53
+#: data/templates/default/editprofile.tpl.php:29
+#: data/templates/default/tagrename.tpl.php:14
+#: data/templates/default/tagrename.tpl.php:19
 msgid "Required"
 msgstr "Verplicht"
 
-#: ..\..\..\templates\editbookmark.tpl.php:39
-#: ..\..\..\templates\editprofile.tpl.php:47
-#: ..\..\..\templates\profile.tpl.php:28
-msgid "Description"
-msgstr "Omschrijving"
+#: data/templates/default/editbookmark.tpl.php:58
+msgid "Add Note"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:61
+msgid ""
+"You can use anchors to delimite attributes. for example: [publisher]blah[/"
+"publisher] "
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:64
+msgid "Suggested anchors: "
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:76
+#, fuzzy
+msgid "Private Note"
+msgstr "Priv&egrav;"
 
-#: ..\..\..\templates\editbookmark.tpl.php:46
+#: data/templates/default/editbookmark.tpl.php:78
+msgid "Just visible by you and your contacts."
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:82
+#: data/templates/default/toolbar.inc.php:10 www/tags.php:45 www/tags.php:67
+msgid "Tags"
+msgstr "Tags"
+
+#: data/templates/default/editbookmark.tpl.php:86
 msgid "Comma-separated"
 msgstr "Door comma's gescheiden"
 
-#: ..\..\..\templates\editbookmark.tpl.php:49
-#: ..\..\..\templates\importDelicious.tpl.php:15
-#: ..\..\..\templates\importNetscape.tpl.php:16
+#: data/templates/default/editbookmark.tpl.php:90
+#: data/templates/default/tag2tagadd.tpl.php:9
+msgid ""
+"Note: use \">\" to include one tag in another. e.g.: europe>france>paris"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:94
+#: data/templates/default/tag2tagadd.tpl.php:8
+msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:97
+#: data/templates/default/importDelicious.tpl.php:15
+#: data/templates/default/importNetscape.tpl.php:16
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ..\..\..\templates\editbookmark.tpl.php:52
-#: ..\..\..\templates\importDelicious.tpl.php:18
-#: ..\..\..\templates\importNetscape.tpl.php:19
+#: data/templates/default/editbookmark.tpl.php:100
+#: data/templates/default/importDelicious.tpl.php:18
+#: data/templates/default/importNetscape.tpl.php:19
 msgid "Public"
 msgstr "Publiekelijk"
 
-#: ..\..\..\templates\editbookmark.tpl.php:53
-#: ..\..\..\templates\importDelicious.tpl.php:19
-#: ..\..\..\templates\importNetscape.tpl.php:20
+#: data/templates/default/editbookmark.tpl.php:101
 msgid "Shared with Watch List"
 msgstr "Gedeeld met 'watch list'"
 
-#: ..\..\..\templates\editbookmark.tpl.php:54
-#: ..\..\..\templates\importDelicious.tpl.php:20
-#: ..\..\..\templates\importNetscape.tpl.php:21
+#: data/templates/default/editbookmark.tpl.php:102
+#: data/templates/default/importDelicious.tpl.php:20
+#: data/templates/default/importNetscape.tpl.php:21
 msgid "Private"
 msgstr "Priv&egrav;"
 
-#: ..\..\..\templates\editbookmark.tpl.php:66
+#: data/templates/default/editbookmark.tpl.php:115
 msgid "Delete Bookmark"
 msgstr "Bookmark Verwijderen"
 
-#: ..\..\..\templates\editbookmark.tpl.php:93
-msgid "Bookmarklet"
-msgstr "Bookmarklet"
-
-#: ..\..\..\templates\editbookmark.tpl.php:94
-#, 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 "Sleep een van de volgende 'bookmarklets' naar de link-balk van je browser, en klik er vervolgens op als je je op een pagina bevind die je aan %s wilt toevoegen"
-
-#: ..\..\..\templates\editbookmark.tpl.php:106
-#, php-format
-msgid "Post to %s"
-msgstr "Plaats op %s"
-
-#: ..\..\..\templates\editbookmark.tpl.php:107
-#, php-format
-msgid "Post to %s (Pop-up)"
-msgstr "Plaats op %s (pop-up)"
+#: data/templates/default/editbookmark.tpl.php:120
+msgid "edit common description"
+msgstr ""
 
-#: ..\..\..\templates\editbookmark.tpl.php:111
-#: ..\..\..\templates\importDelicious.tpl.php:26
-#: ..\..\..\templates\importNetscape.tpl.php:27
+#: data/templates/default/editbookmark.tpl.php:212
+#: data/templates/default/importDelicious.tpl.php:26
+#: data/templates/default/importNetscape.tpl.php:27
+#: data/templates/default/importStructure.tpl.php:16
 msgid "Import"
 msgstr "Importeren"
 
-#: ..\..\..\templates\editbookmark.tpl.php:113
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Import bookmarks from bookmark file"
 msgstr "Importeer bookmarks uit een bookmark bestand"
 
-#: ..\..\..\templates\editbookmark.tpl.php:113
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Internet Explorer, Mozilla Firefox and Netscape"
 msgstr "Internet Explorer, Mozilla Firefox en Netscape"
 
-#: ..\..\..\templates\editbookmark.tpl.php:114
+#: data/templates/default/editbookmark.tpl.php:215
 msgid "Import bookmarks from del.icio.us"
 msgstr "Importeer van del.icio.us"
 
-#: ..\..\..\templates\editprofile.tpl.php:10
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:11
+msgid "SSL client certificates"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:17
+msgid "Serial"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:45
+#: data/templates/default/profile.tpl.php:17
+msgid "Name"
+msgstr "Naam"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:19
+#: data/templates/default/profile.tpl.php:11
+#, fuzzy
+msgid "Email"
+msgstr "Email"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:20
+msgid "Issuer"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:30
+#, fuzzy
+msgid "delete"
+msgstr "Verwijderen"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:43
+msgid "No certificates registered"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:48
+msgid "Your current certificate is already registered with your account."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:53
+msgid "Register current certificate to automatically login."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:59
+msgid "Your browser does not provide a certificate."
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:8
 msgid "Account Details"
 msgstr ""
 
-#: ..\..\..\templates\editprofile.tpl.php:14
-#: ..\..\..\templates\login.tpl.php:15
-#: ..\..\..\templates\password.tpl.php:10
-#: ..\..\..\templates\profile.tpl.php:7
-#: ..\..\..\templates\register.tpl.php:16
+#: data/templates/default/editprofile.tpl.php:12
+#: data/templates/default/login.tpl.php:21
+#: data/templates/default/password.tpl.php:10
+#: data/templates/default/profile.tpl.php:6
+#: data/templates/default/register.tpl.php:16
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: ..\..\..\templates\editprofile.tpl.php:19
+#: data/templates/default/editprofile.tpl.php:17
 msgid "New Password"
 msgstr "Nieuw wachtwoord"
 
-#: ..\..\..\templates\editprofile.tpl.php:24
+#: data/templates/default/editprofile.tpl.php:22
 #, fuzzy
 msgid "Confirm Password"
 msgstr "Bevestiging nieuw wachtwoord"
 
-#: ..\..\..\templates\editprofile.tpl.php:29
-#: ..\..\..\templates\register.tpl.php:26
+#: data/templates/default/editprofile.tpl.php:27
+#: data/templates/default/password.tpl.php:14
+#: data/templates/default/register.tpl.php:26
 msgid "E-mail"
 msgstr "Email"
 
-#: ..\..\..\templates\editprofile.tpl.php:35
-msgid "Personal Details"
+#: data/templates/default/editprofile.tpl.php:32
+#, fuzzy
+msgid "Private RSS Feed"
+msgstr "Priv&egrav;"
+
+#: data/templates/default/editprofile.tpl.php:34
+msgid "Enable"
 msgstr ""
 
-#: ..\..\..\templates\editprofile.tpl.php:39
-#: ..\..\..\templates\profile.tpl.php:12
-msgid "Name"
-msgstr "Naam"
+#: data/templates/default/editprofile.tpl.php:36
+#, fuzzy
+msgid "Generate New Key"
+msgstr "Nieuw wachtwoord"
 
-#: ..\..\..\templates\editprofile.tpl.php:43
-#: ..\..\..\templates\profile.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:41
+msgid "Personal Details"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:49
+#: data/templates/default/profile.tpl.php:23
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ..\..\..\templates\error.404.tpl.php:5
+#: data/templates/default/editprofile.tpl.php:58 www/edit.php:113
+msgid "Save Changes"
+msgstr "Veranderingen opslaan"
+
+#: data/templates/default/editprofile.tpl.php:63
+#: data/templates/default/sidebar.block.tagactions.php:17
+#: data/templates/default/sidebar.block.watchstatus.php:18
+#, fuzzy
+msgid "Actions"
+msgstr "Instructies"
+
+#: data/templates/default/editprofile.tpl.php:66
+#, fuzzy
+msgid "Export bookmarks"
+msgstr "Mijn bookmarks"
+
+#: data/templates/default/editprofile.tpl.php:68
+msgid "HTML file (for browsers)"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:69
+msgid "XML file (like del.icio.us)"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:70
+msgid "CSV file (for spreadsheet tools)"
+msgstr ""
+
+#: data/templates/default/error.404.tpl.php:5
 #, fuzzy
 msgid "Not Found"
 msgstr "Gebruiker werd niet gevonden"
 
-#: ..\..\..\templates\error.404.tpl.php:6
+#: data/templates/default/error.404.tpl.php:6
 msgid "The requested URL was not found on this server"
 msgstr ""
 
-#: ..\..\..\templates\error.500.tpl.php:5
+#: data/templates/default/error.500.tpl.php:5
 msgid "General server error"
 msgstr ""
 
-#: ..\..\..\templates\error.500.tpl.php:6
+#: data/templates/default/error.500.tpl.php:6
 msgid "The requested URL could not be processed"
 msgstr ""
 
-#: ..\..\..\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 "Log in op de <a href=\"http://del.icio.us/api/posts/all\">export pagina op del.icio.us</a>"
+#: data/templates/default/importDelicious.tpl.php:19
+#: data/templates/default/importNetscape.tpl.php:20
+#, fuzzy
+msgid "Shared with Watchlist"
+msgstr "Gedeeld met 'watch list'"
 
-#: ..\..\..\templates\importDelicious.tpl.php:34
-msgid "Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> file to your computer"
-msgstr "Sla het resulterende <abbr title=\"Extensible Markup Language\">XML</abbr> bestand op, op de locale computer"
+#: data/templates/default/importDelicious.tpl.php:31
+#: data/templates/default/importNetscape.tpl.php:32
+#: data/templates/default/importStructure.tpl.php:21
+msgid "Instructions"
+msgstr "Instructies"
 
-#: ..\..\..\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 "Klik vervolgens op <kbd>Bladeren...</kbd> om dit opgeslagen bestand op de computer te vinden. De maximum toegelaten bestandsgrootte op onze server is 1MB"
+#: data/templates/default/importDelicious.tpl.php:33
+#, fuzzy
+msgid ""
+"Log in to the <a href=\"https://api.del.icio.us/v1/posts/all\">export page "
+"at del.icio.us</a>"
+msgstr ""
+"Log in op de <a href=\"http://del.icio.us/api/posts/all\">export pagina op "
+"del.icio.us</a>"
 
-#: ..\..\..\templates\importDelicious.tpl.php:36
-#: ..\..\..\templates\importNetscape.tpl.php:43
-msgid "Select the default privacy setting for your imported bookmarks"
-msgstr "Selecteer welke privacy instelling moet worden toegepast op de ge&iuml;mporteerde bookmarks"
+#: data/templates/default/importDelicious.tpl.php:34
+msgid ""
+"Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> "
+"file to your computer"
+msgstr ""
+"Sla het resulterende <abbr title=\"Extensible Markup Language\">XML</abbr> "
+"bestand op, op de locale computer"
 
-#: ..\..\..\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 "Klik op <kbd>Importeren</kbd> om het importeren te starten. Dit kan enkele minuten duren."
+#: data/templates/default/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 ""
+"Klik vervolgens op <kbd>Bladeren...</kbd> om dit opgeslagen bestand op de "
+"computer te vinden. De maximum toegelaten bestandsgrootte op onze server is "
+"1MB"
 
-#: ..\..\..\templates\importNetscape.tpl.php:32
-msgid "Instructions"
-msgstr "Instructies"
+#: data/templates/default/importDelicious.tpl.php:36
+#: data/templates/default/importNetscape.tpl.php:43
+msgid "Select the default privacy setting for your imported bookmarks"
+msgstr ""
+"Selecteer welke privacy instelling moet worden toegepast op de ge&iuml;"
+"mporteerde bookmarks"
 
-#: ..\..\..\templates\importNetscape.tpl.php:35
+#: data/templates/default/importDelicious.tpl.php:37
+#: data/templates/default/importNetscape.tpl.php:44
+msgid ""
+"Click <kbd>Import</kbd> to start importing the bookmarks; it may take a "
+"minute"
+msgstr ""
+"Klik op <kbd>Importeren</kbd> om het importeren te starten. Dit kan enkele "
+"minuten duren."
+
+#: data/templates/default/importNetscape.tpl.php:35
 msgid "Export your bookmarks from your browser to a file"
 msgstr "Bookmarks exporteren vanuit een browser"
 
-#: ..\..\..\templates\importNetscape.tpl.php:37
-msgid "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
-msgstr "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
+#: data/templates/default/importNetscape.tpl.php:37
+msgid ""
+"Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
+msgstr ""
+"Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
 
-#: ..\..\..\templates\importNetscape.tpl.php:38
-msgid "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; Export..."
-msgstr "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; Export..."
+#: data/templates/default/importNetscape.tpl.php:38
+msgid ""
+"Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
+"Export..."
+msgstr ""
+"Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
+"Export..."
 
-#: ..\..\..\templates\importNetscape.tpl.php:39
-msgid "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
-msgstr "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
+#: data/templates/default/importNetscape.tpl.php:39
+msgid ""
+"Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
+msgstr ""
+"Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
 
-#: ..\..\..\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 "Klik vervolgens op <kbd>Bladeren...</kbd> om het opgeslagen bookmark bestand op de computer te vinden. De maximum toegelaten bestandsgrootte op onze server is 1MB"
+#: data/templates/default/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 ""
+"Klik vervolgens op <kbd>Bladeren...</kbd> om het opgeslagen bookmark bestand "
+"op de computer te vinden. De maximum toegelaten bestandsgrootte op onze "
+"server is 1MB"
 
-#: ..\..\..\templates\login.tpl.php:20
-#: ..\..\..\templates\register.tpl.php:21
+#: data/templates/default/importStructure.tpl.php:24
+msgid "Create your structure into a simple text file and following this model:"
+msgstr ""
+
+#: data/templates/default/importStructure.tpl.php:35
+msgid ""
+"Then import the file. The tags and their relations will be added to your "
+"profile."
+msgstr ""
+
+#: data/templates/default/login.tpl.php:13
+msgid "Please activate cookies"
+msgstr ""
+
+#: data/templates/default/login.tpl.php:26
+#: data/templates/default/register.tpl.php:21
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ..\..\..\templates\login.tpl.php:22
+#: data/templates/default/login.tpl.php:28
 msgid "Don't ask for my password for 2 weeks"
 msgstr "Wachtwoord de komende 2 weken niet nog een keer vragen"
 
-#: ..\..\..\templates\login.tpl.php:30
+#: data/templates/default/login.tpl.php:32
+#: data/templates/default/toolbar.inc.php:29 www/login.php:57
+msgid "Log In"
+msgstr "Inloggen"
+
+#: data/templates/default/login.tpl.php:36
 msgid "Forgotten your password?"
 msgstr ""
 
-#: ..\..\..\templates\password.tpl.php:5
+#: data/templates/default/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 ""
-
-#: ..\..\..\templates\password.tpl.php:14
-msgid "<abbr title=\"Electronic mail\">E-mail</abbr>"
+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 ""
 
-#: ..\..\..\templates\password.tpl.php:19
+#: data/templates/default/password.tpl.php:19
 #, fuzzy
 msgid "Generate Password"
 msgstr "Nieuw wachtwoord"
 
-#: ..\..\..\templates\profile.tpl.php:23
+#: data/templates/default/profile.tpl.php:28
 msgid "Member Since"
 msgstr "Lid sinds"
 
-#: ..\..\..\templates\profile.tpl.php:35
-#: ..\..\..\templates\sidebar.block.watchlist.php:8
+#: data/templates/default/profile.tpl.php:40
+#: data/templates/default/sidebar.block.watchlist.php:30
 #, fuzzy
 msgid "Watching"
 msgstr "Watch List"
 
-#: ..\..\..\templates\profile.tpl.php:50
+#: data/templates/default/profile.tpl.php:55
+#: data/templates/default/sidebar.block.watchlist.php:52
 #, fuzzy
 msgid "Watched By"
 msgstr "Watched"
 
-#: ..\..\..\templates\register.tpl.php:11
+#: data/templates/default/profile.tpl.php:68
+#: data/templates/default/toolbar.inc.php:9
+#, fuzzy
+msgid "Bookmarks"
+msgstr "%s Bookmarks"
+
+#: data/templates/default/profile.tpl.php:69
+#, fuzzy
+msgid "Go to bookmarks"
+msgstr "Mijn bookmarks"
+
+#: data/templates/default/register.tpl.php:11
 #, php-format
-msgid "Sign up here to create a free %s account. All the information requested below is required"
+msgid ""
+"Sign up here to create a free %s account. All the information requested "
+"below is required"
 msgstr ""
 
-#: ..\..\..\templates\rss.tpl.php:9
-#, fuzzy, php-format
-msgid "Recent bookmarks posted to %s"
-msgstr "Recente bookmarks"
+#: data/templates/default/register.tpl.php:18
+msgid ""
+" at least 5 characters, alphanumeric (no spaces, no dots or other special "
+"ones)"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:28
+msgid " to send you your password if you forget it"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:33
+msgid "Antispam question"
+msgstr ""
 
-#: ..\..\..\templates\rss.tpl.php:17
-#: ..\..\..\templates\rss.tpl.php:19
+#: data/templates/default/register.tpl.php:41
+#: data/templates/default/toolbar.inc.php:31 www/register.php:99
+msgid "Register"
+msgstr ""
+
+#: data/templates/default/search.menu.php:27
+msgid "Search..."
+msgstr ""
+
+#: data/templates/default/search.menu.php:28
+msgid "in"
+msgstr ""
+
+#: data/templates/default/search.menu.php:34
 #, fuzzy
-msgid "No bookmarks found"
-msgstr "Geen bookmarks beschikbaar"
+msgid "this user's bookmarks"
+msgstr "%s Bookmarks"
+
+#: data/templates/default/search.menu.php:39
+msgid "my bookmarks"
+msgstr "Mijn bookmarks"
+
+#: data/templates/default/search.menu.php:40
+#, fuzzy
+msgid "my watchlist"
+msgstr "Voeg toe aan 'watch-list'"
+
+#: data/templates/default/search.menu.php:44
+msgid "all bookmarks"
+msgstr "Alle bookmarks"
+
+#: data/templates/default/search.menu.php:54
+msgid "Search"
+msgstr ""
+
+#: data/templates/default/sidebar.block.linked.php:23
+#, fuzzy
+msgid "Linked Tags"
+msgstr "Gerelateerde Tags"
+
+#: data/templates/default/sidebar.block.linked.php:28
+#: data/templates/default/sidebar.block.menu.php:46
+msgid "Add new link"
+msgstr ""
 
-#: ..\..\..\templates\sidebar.block.recent.php:15
+#: data/templates/default/sidebar.block.linked.php:29
+#: data/templates/default/sidebar.block.menu.php:47
+#, fuzzy
+msgid "Delete link"
+msgstr "Verwijderen"
+
+#: data/templates/default/sidebar.block.menu.php:35
+#, php-format
+msgid "Tags included into the tag '%s'"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:35
+#, fuzzy
+msgid "Menu Tags"
+msgstr "Gerelateerde Tags"
+
+#: data/templates/default/sidebar.block.menu.php:68
+msgid "See all your tags"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:68
+msgid "all your tags"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:70
+msgid "See all tags from this user"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:70
+msgid "all tags from this user"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:74
+#, fuzzy
+msgid "See popular tags"
+msgstr "Populaire Tags"
+
+#: data/templates/default/sidebar.block.menu2.php:21
+#, fuzzy
+msgid "Featured Menu Tags"
+msgstr "Gerelateerde Tags"
+
+#: data/templates/default/sidebar.block.menu2.php:25
+msgid "This menu is composed of keywords (tags) organized by admins."
+msgstr ""
+
+#: data/templates/default/sidebar.block.recent.php:18
 #, fuzzy
 msgid "Recent Tags"
 msgstr "Gerelateerde Tags"
 
-#: ..\..\..\templates\sidebar.block.related.php:15
+#: data/templates/default/sidebar.block.related.php:26
 msgid "Related Tags"
 msgstr "Gerelateerde Tags"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:10
+#: data/templates/default/sidebar.block.search.php:28
+msgid "Last Searches"
+msgstr ""
+
+#: data/templates/default/sidebar.block.search.php:40
+#, fuzzy
+msgid "Number of bookmarks for this query"
+msgstr "Geen bookmarks beschikbaar"
+
+#: data/templates/default/sidebar.block.tagactions.php:9 www/tagrename.php:72
+#, fuzzy
+msgid "Rename Tag"
+msgid_plural "Rename Tags"
+msgstr[0] "Gerelateerde Tags"
+msgstr[1] "Gerelateerde Tags"
+
+#: data/templates/default/sidebar.block.tagactions.php:22 www/tagdelete.php:54
+#, fuzzy
+msgid "Delete Tag"
+msgstr "Verwijderen"
+
+#: data/templates/default/sidebar.block.tagactions.php:24 www/tagedit.php:61
+#, fuzzy
+msgid "Edit Tag Description"
+msgstr "Omschrijving"
+
+#: data/templates/default/sidebar.block.tagactions.php:26
+#: www/tagcommondescriptionedit.php:76
+msgid "Edit Tag Common Description"
+msgstr ""
+
+#: data/templates/default/sidebar.block.tagactions.php:28
+msgid "Create a link to another tag"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:14
+msgid "New Users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:23
+#: data/templates/default/users.tpl.php:24
+#, fuzzy
+msgid "bookmarks"
+msgstr "%s Bookmarks"
+
+#: data/templates/default/sidebar.block.users.php:30
+msgid "See all users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:30
+msgid "All users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:19
+msgid "Close contacts are mutual contacts"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:19
+msgid "Close contacts"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:36
+msgid "Add a contact..."
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:36
+msgid "Type a username to add it to your contacts."
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:44
+#, fuzzy
+msgid "Remove this contact"
+msgstr "Van 'watch-list' verwijderen"
+
+#: data/templates/default/sidebar.block.watchstatus.php:11
 msgid "Remove from Watchlist"
 msgstr "Van 'watch-list' verwijderen"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:12
+#: data/templates/default/sidebar.block.watchstatus.php:13
 msgid "Add to Watchlist"
 msgstr "Voeg toe aan 'watch-list'"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:17
+#: data/templates/default/sidebar.linkedtags.inc.php:18
 #, fuzzy
-msgid "Actions"
-msgstr "Instructies"
+msgid "Edit link"
+msgstr "Bewerken"
+
+#: data/templates/default/sidebar.linkedtags.inc.php:47
+msgid "Synonyms:"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:12
+msgid "Create new link:"
+msgstr ""
+
+#: data/templates/default/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 ""
+
+#: data/templates/default/tag2tagadd.tpl.php:23
+#: data/templates/default/tag2tagedit.tpl.php:37
+msgid "Create"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:35
+#: data/templates/default/tag2tagdelete.tpl.php:27
+#: data/templates/default/tag2tagedit.tpl.php:51
+msgid "Existing links:"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:53
+#: data/templates/default/tag2tagdelete.tpl.php:45
+#: data/templates/default/tag2tagedit.tpl.php:69
+msgid "No links"
+msgstr ""
+
+#: data/templates/default/tag2tagdelete.tpl.php:15
+#: data/templates/default/tag2tagedit.tpl.php:16
+#: data/templates/default/tagdelete.tpl.php:8 www/jsScuttle.php:24
+msgid "Yes"
+msgstr ""
+
+#: data/templates/default/tag2tagdelete.tpl.php:16
+#: data/templates/default/tag2tagedit.tpl.php:17
+#: data/templates/default/tagdelete.tpl.php:9 www/jsScuttle.php:24
+msgid "No"
+msgstr ""
+
+#: data/templates/default/tag2tagedit.tpl.php:6
+msgid "Delete the link"
+msgstr ""
 
-#: ..\..\..\templates\tags.tpl.php:8
+#: data/templates/default/tag2tagedit.tpl.php:29
+msgid "Create new link"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:12
+msgid "Old"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:17
+msgid "New"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:24
+#, fuzzy
+msgid "Rename"
+msgstr "Gebruikersnaam"
+
+#: data/templates/default/tags.tpl.php:11
+#: data/templates/default/users.tpl.php:9
 msgid "Alphabet"
 msgstr ""
 
-#: ..\..\..\templates\tags.tpl.php:9
+#: data/templates/default/tags.tpl.php:12
+#: data/templates/default/users.tpl.php:10
 #, fuzzy
 msgid "Popularity"
 msgstr "Populaire Tags"
 
-#: ..\..\..\templates\toolbar.inc.php:11
+#: data/templates/default/toolbar.inc.php:8
+#: data/templates/default/toolbar.inc.php:26
 #, fuzzy
-msgid "Bookmarks"
-msgstr "%s Bookmarks"
+msgid "Home"
+msgstr "Homepage"
 
-#: ..\..\..\templates\toolbar.inc.php:16
+#: data/templates/default/toolbar.inc.php:11 www/watchlist.php:106
+#, fuzzy
+msgid "Watchlist"
+msgstr "Watch List"
+
+#: data/templates/default/toolbar.inc.php:12 www/profile.php:79
+msgid "Profile"
+msgstr "Profiel"
+
+#: data/templates/default/toolbar.inc.php:13 www/bookmarks.php:215
+msgid "Add a Bookmark"
+msgstr "Voeg een bookmark toe"
+
+#: data/templates/default/toolbar.inc.php:14
 msgid "Log Out"
 msgstr ""
 
+#: data/templates/default/toolbar.inc.php:17
+msgid "Admin"
+msgstr ""
+
+#: data/templates/default/top.inc.php:57
+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/default/users.tpl.php:20
+#, fuzzy
+msgid "profile"
+msgstr "Profiel"
+
+#: data/templates/default/users.tpl.php:21
+msgid "created in"
+msgstr ""
+
+#: www/admin.php:32
+msgid "Manage users"
+msgstr ""
+
+#: www/admin.php:69
+#, php-format
+msgid "%s and all his bookmarks and tags were deleted."
+msgstr ""
+
+#: www/admin.php:76
+msgid "Problem with "
+msgstr ""
+
+#: www/ajaxDelete.php:37
+#, fuzzy
+msgid "You are not allowed to delete this bookmark"
+msgstr "De bookmark kon niet worden verwijderd"
+
+#: www/ajaxDelete.php:41 www/edit.php:103
+#, fuzzy
+msgid "Failed to delete bookmark"
+msgstr "Bookmark Verwijderen"
+
+#: www/alltags.php:50
+msgid "All Tags"
+msgstr "Alle tags"
+
+#: www/alltags.php:56 www/bookmarks.php:99 www/populartags.php:52
+#: www/profile.php:55 www/rss.php:100 www/search.php:111 www/watch.php:45
+#: www/watchlist.php:61
+#, fuzzy, php-format
+msgid "User with username %s was not found"
+msgstr "Bookmark werd niet gevonden"
+
+#: 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 ""
+
+#: www/bookmarkcommondescriptionedit.php:60
+msgid "Bookmark common description updated"
+msgstr ""
+
+#: www/bookmarkcommondescriptionedit.php:63
+#, fuzzy
+msgid "Failed to update the bookmark common description"
+msgstr "De bookmark kon niet worden verwijderd"
+
+#: www/bookmarkcommondescriptionedit.php:71
+msgid "Edit Bookmark Common Description"
+msgstr ""
+
+#: www/bookmarks.php:114 www/tags.php:47
+msgid "Remove the tag from the selection"
+msgstr ""
+
+#: www/bookmarks.php:134 www/edit.php:65
+msgid "Your bookmark must have a title and an address"
+msgstr "Je bookmarks moeten een titel en adres hebben"
+
+#: www/bookmarks.php:139
+msgid "This bookmark URL may not be added"
+msgstr ""
+
+#: www/bookmarks.php:158 www/edit.php:83 www/edit.php:86
+msgid "Bookmark saved"
+msgstr "Bookmark opgeslagen"
+
+#: www/bookmarks.php:158
+msgid "(Come back to previous page.)"
+msgstr ""
+
+#: www/bookmarks.php:165 www/import.php:106 www/importNetscape.php:108
+msgid ""
+"There was an error saving your bookmark. Please try again or contact the "
+"administrator."
+msgstr ""
+
+#: www/bookmarks.php:222
+msgid "Add Bookmark"
+msgstr "Bookmark toevoegen"
+
+#: www/bookmarks.php:225
+msgid "You must be logged in before you can add bookmarks."
+msgstr "Je moet ingelogd zijn om bookmarks toe te kunnen voegen"
+
+#: www/bookmarks.php:270
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: www/bookmarks.php:283
+#, php-format
+msgid "%s: %s (+private %s)"
+msgstr ""
+
+#: www/bookmarks.php:305 www/bookmarks.php:306
+#, fuzzy
+msgid "My Bookmarks"
+msgstr "%s Bookmarks"
+
+#: www/edit.php:44 www/edit.php:45
+msgid "Edit Bookmark"
+msgstr "Bookmark Bewerken"
+
+#: www/edit.php:51
+#, fuzzy, php-format
+msgid "Bookmark with id %s not was not found"
+msgstr "Bookmark werd niet gevonden"
+
+#: www/edit.php:57
+#, fuzzy
+msgid "You are not allowed to edit this bookmark"
+msgstr "De bookmark kon niet worden verwijderd"
+
+#: 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/import.php:47
+msgid "Could not open XML input"
+msgstr "XML bestand kon niet geopend worden"
+
+#: www/import.php:51
+#, php-format
+msgid "XML error: %s at line %d"
+msgstr "XML fout: %s op regel %d"
+
+#: www/import.php:60
+#, fuzzy
+msgid "Import Bookmarks from del.icio.us"
+msgstr "Importeer van del.icio.us"
+
+#: www/import.php:93
+#, fuzzy
+msgid "You have already submitted this bookmark."
+msgstr "Je hebt deze bookmark al opgenomen"
+
+#: www/import.php:104
+#, fuzzy
+msgid "Bookmark imported."
+msgstr "Bookmark opgeslagen"
+
+#: www/importNetscape.php:95
+#, fuzzy
+msgid "You have already submitted some of these bookmarks."
+msgstr "Je hebt deze bookmark al opgenomen"
+
+#: www/importNetscape.php:115
+#, fuzzy
+msgid "Bookmarks found: "
+msgstr "Geen bookmarks beschikbaar"
+
+#: www/importNetscape.php:116
+#, fuzzy
+msgid "Bookmarks imported: "
+msgstr "Bookmark opgeslagen"
+
+#: www/importNetscape.php:117 www/importNetscape.php:122
+#, fuzzy
+msgid "Import Bookmarks from Browser File"
+msgstr "Importeer bookmarks uit een bookmark bestand"
+
+#: 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 "Je bent uitgelogd"
+
+#: www/index.php:46
+#, php-format
+msgid "%s: Recent bookmarks"
+msgstr "%s: Recente bookmarks"
+
+#: www/index.php:58
+#, fuzzy, php-format
+msgid "%s: Recent bookmarks (+private %s)"
+msgstr "%s: Recente bookmarks"
+
+#: www/index.php:96
+msgid "Store, share and tag your favourite links"
+msgstr ""
+
+#: www/index.php:97
+#, fuzzy
+msgid "All Bookmarks"
+msgstr "Alle bookmarks"
+
+#: www/jsScuttle.php:71
+msgid "Available"
+msgstr ""
+
+#: www/jsScuttle.php:74
+#, fuzzy
+msgid "Not Available"
+msgstr "Geen bookmarks beschikbaar"
+
+#: www/login.php:48
+#, fuzzy
+msgid "The details you have entered are incorrect. Please try again."
+msgstr "De ingevoerde details zijn niet correct. Probeer het nog eens."
+
+#: www/password.php:36
+msgid "You must enter your username."
+msgstr ""
+
+#: www/password.php:40
+#, fuzzy
+msgid ""
+"You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"Een gebruikersnaam, wachtwoord, naam en  <abbr title=\"Electronic mail"
+"\">email</abbr> adres <em>moeten</em> worden opgegeven"
+
+#: www/password.php:48
+msgid "No matches found for that username."
+msgstr ""
+
+#: www/password.php:51
+#, fuzzy
+msgid ""
+"No matches found for that combination of username and <abbr title="
+"\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"Een gebruikersnaam, wachtwoord, naam en  <abbr title=\"Electronic mail"
+"\">email</abbr> adres <em>moeten</em> worden opgegeven"
+
+#: www/password.php:59
+#, fuzzy
+msgid ""
+"There was an error while generating your new password. Please try again."
+msgstr "De ingevoerde details zijn niet correct. Probeer het nog eens."
+
+#: www/password.php:63
+#, fuzzy
+msgid "Your new password is:"
+msgstr "Bevestiging nieuw wachtwoord"
+
+#: 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
+#, fuzzy, php-format
+msgid "%s Account Information"
+msgstr "Instructies"
+
+#: www/password.php:68
+#, php-format
+msgid "New password generated and sent to %s"
+msgstr ""
+
+#: www/password.php:75
+#, fuzzy
+msgid "Forgotten Password"
+msgstr "Nieuw wachtwoord"
+
+#: www/profile.php:63 www/watchlist.php:119
+msgid "Username was not specified"
+msgstr ""
+
+#: www/profile.php:70
+#, fuzzy
+msgid "My Profile"
+msgstr "Profiel"
+
+#: www/profile.php:110
+msgid "Invalid Token"
+msgstr ""
+
+#: www/profile.php:115
+#, fuzzy
+msgid "Password and confirmation do not match."
+msgstr "Wachtwoord en wachtwoordbevestiging komen niet overen"
+
+#: www/profile.php:119
+#, fuzzy
+msgid "Password must be at least 6 characters long."
+msgstr "Wachtwoord dient minimaal 6 karakters lang te zijn"
+
+#: www/profile.php:123
+#, fuzzy
+msgid "E-mail address is not valid."
+msgstr "Email adres is ongeldig"
+
+#: www/profile.php:127
+msgid "An error occurred while saving your changes."
+msgstr ""
+
+#: www/profile.php:129
+#, fuzzy
+msgid "Changes saved."
+msgstr "Wijzigingen opgeslagen"
+
+#: www/profile.php:148
+msgid "You do not have a valid SSL client certificate"
+msgstr ""
+
+#: www/profile.php:150
+msgid "This certificate is already registered"
+msgstr ""
+
+#: www/profile.php:152
+msgid "Failed to register SSL client certificate."
+msgstr ""
+
+#: www/profile.php:154
+msgid "SSL client certificate registered."
+msgstr ""
+
+#: www/profile.php:163
+msgid "Certificate not found."
+msgstr ""
+
+#: www/profile.php:165
+msgid "The certificate does not belong to you."
+msgstr ""
+
+#: www/profile.php:167
+msgid "Failed to delete SSL client certificate."
+msgstr ""
+
+#: www/profile.php:169
+msgid "SSL client certificate deleted."
+msgstr ""
+
+#: www/register.php:52
+#, fuzzy
+msgid "You <em>must</em> enter a username, password and e-mail address."
+msgstr ""
+"Een gebruikersnaam, wachtwoord, naam en  <abbr title=\"Electronic mail"
+"\">email</abbr> adres <em>moeten</em> worden opgegeven"
+
+#: www/register.php:56
+msgid "This username has been reserved, please make another choice."
+msgstr ""
+
+#: www/register.php:60
+msgid "This username already exists, please make another choice."
+msgstr ""
+
+#: www/register.php:64
+msgid ""
+"This username is not valid (too short, too long, forbidden characters...), "
+"please make another choice."
+msgstr ""
+
+#: www/register.php:68
+#, fuzzy
+msgid "E-mail address is not valid. Please try again."
+msgstr "Email adres is ongeldig"
+
+#: www/register.php:72
+#, fuzzy
+msgid "Antispam answer is not valid. Please try again."
+msgstr "Email adres is ongeldig"
+
+#: www/register.php:90
+#, fuzzy
+msgid "You have successfully registered. Enjoy!"
+msgstr "De bookmark is succesvol verwijderd"
+
+#: www/register.php:92
+msgid "Registration failed. Please try again."
+msgstr ""
+
+#: www/rss.php:90 www/rss.php:111
+#, php-format
+msgid "Failed to Autenticate User with username %s using private key"
+msgstr ""
+
+#: www/rss.php:128
+#, fuzzy, php-format
+msgid "Recent bookmarks posted to %s"
+msgstr "Recente bookmarks"
+
+#: www/search.php:83 www/search.php:147
+msgid "Search Bookmarks"
+msgstr "Bookmarks zoeken"
+
+#: www/search.php:89
+msgid "Search Results"
+msgstr ""
+
+#: www/search.php:137
+msgid "Unsatisfied? You can also try our "
+msgstr ""
+
+#: www/tag2tagadd.php:54
+msgid "Tag link created"
+msgstr ""
+
+#: www/tag2tagadd.php:57
+#, fuzzy
+msgid "Failed to create the link"
+msgstr "De bookmark kon niet worden verwijderd"
+
+#: www/tag2tagadd.php:69
+msgid "Add Tag Link"
+msgstr ""
+
+#: www/tag2tagdelete.php:66
+msgid "Tag link deleted"
+msgstr ""
+
+#: www/tag2tagdelete.php:69
+#, fuzzy
+msgid "Failed to delete the link"
+msgstr "De bookmark kon niet worden verwijderd"
+
+#: www/tag2tagdelete.php:81
+msgid "Delete Link Between Tags"
+msgstr ""
+
+#: www/tag2tagedit.php:55
+msgid "Edit Link Between Tags"
+msgstr ""
+
+#: www/tagcommondescriptionedit.php:62
+msgid "Tag common description updated"
+msgstr ""
+
+#: www/tagcommondescriptionedit.php:67
+msgid "Failed to update the tag common description"
+msgstr ""
+
+#: www/tagdelete.php:43
+msgid "Tag deleted"
+msgstr ""
+
+#: www/tagdelete.php:46
+#, fuzzy
+msgid "Failed to delete the tag"
+msgstr "De bookmark kon niet worden verwijderd"
+
+#: www/tagedit.php:52
+msgid "Tag description updated"
+msgstr ""
+
+#: www/tagedit.php:55
+#, fuzzy
+msgid "Failed to update the tag description"
+msgstr "De bookmark kon niet worden verwijderd"
+
+#: www/tagrename.php:63
+msgid "Tag renamed"
+msgstr ""
+
+#: www/tagrename.php:66
+#, fuzzy
+msgid "Failed to rename the tag"
+msgstr "De bookmark kon niet worden verwijderd"
+
+#: www/tags.php:71
+#, php-format
+msgid "%s: tagged with \"%s\""
+msgstr ""
+
+#: www/tags.php:84
+#, php-format
+msgid "%s: tagged with \"%s\" (+private %s)"
+msgstr ""
+
+#: www/users.php:31
+#, fuzzy
+msgid "Users"
+msgstr "Gebruikersnaam"
+
+#: www/watch.php:54
+#, fuzzy
+msgid "User removed from your watchlist"
+msgstr "Van 'watch-list' verwijderen"
+
+#: www/watch.php:56
+#, fuzzy
+msgid "User added to your watchlist"
+msgstr "Voeg toe aan 'watch-list'"
+
+#: www/watchlist.php:104
+#, fuzzy
+msgid "My Watchlist"
+msgstr "Watch List"
+
+#: www/api/httpauth.inc.php:30
+msgid "Use of the API calls requires authentication."
+msgstr ""
+
+#: www/gsearch/index.php:51
+msgid "Come back to "
+msgstr ""
+
+#: www/gsearch/index.php:56
+msgid "Admin tips: "
+msgstr ""
+
+#: www/gsearch/index.php:57
+msgid "To refresh manually Google Custom Search Engine, goes to: "
+msgstr ""
+
+#: www/gsearch/index.php:61
+msgid ""
+"If no result appears, check that all the urls are valid in the admin section."
+msgstr ""
+
+#~ msgid "Recent Bookmarks"
+#~ msgstr "Recente bookmarks"
+
+#~ msgid "for"
+#~ msgstr "voor"
+
+#~ msgid "%s Bookmarks"
+#~ msgstr "%s Bookmarks"
+
+#, fuzzy
+#~ msgid ""
+#~ "<strong><a href=\"register.php\">Register now</a></strong> to start using "
+#~ "%s!"
+#~ msgstr ""
+#~ "<a href=\"register.php\">Registreer nu</a> om je eigen bookmarks op te "
+#~ "slaan"
diff --git a/data/locales/pt_BR/LC_MESSAGES/messages.mo b/data/locales/pt_BR/LC_MESSAGES/messages.mo
index 4afb1d3..5a380cf 100644
--- a/data/locales/pt_BR/LC_MESSAGES/messages.mo
+++ b/data/locales/pt_BR/LC_MESSAGES/messages.mo
diff --git a/data/locales/pt_BR/LC_MESSAGES/messages.po b/data/locales/pt_BR/LC_MESSAGES/messages.po
index abace6c..7962ccb 100644
--- a/data/locales/pt_BR/LC_MESSAGES/messages.po
+++ b/data/locales/pt_BR/LC_MESSAGES/messages.po
@@ -8,807 +8,1766 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Scuttle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-29 11:17+0200\n"
+"POT-Creation-Date: 2012-01-20 13:58+0100\n"
 "PO-Revision-Date: 2006-04-06 17:26-0300\n"
 "Last-Translator: Daniel duende Carvalho <daniel.carvalho@gmail.com>\n"
 "Language-Team: Portuguese/Brazil\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ..\..\..\about.php:25
-#: ..\..\..\toolbar.inc.php:14
-#: ..\..\..\templates\toolbar.inc.php:24
-msgid "About"
-msgstr "Sobre"
-
-#: ..\..\..\ajaxDelete.php:28
-msgid "You are not allowed to delete this bookmark"
-msgstr "Você não tem permissão para apagar este bookmark"
-
-#: ..\..\..\ajaxDelete.php:32
-msgid "Failed to delete bookmark"
-msgstr "Falha ao apagar bookmark"
-
-#: ..\..\..\alltags.php:48
-msgid "All Tags"
-msgstr "Todos os Tags"
-
-#: ..\..\..\alltags.php:57
-#: ..\..\..\bookmarks.php:64
-#: ..\..\..\populartags.php:63
-#: ..\..\..\profile.php:39
-#: ..\..\..\rss.php:55
-#: ..\..\..\search.php:55
-#: ..\..\..\watch.php:35
-#: ..\..\..\watched.php:56
-#, php-format
-msgid "User with username %s not was not found"
-msgstr "O Nome de Usuário %s não foi encontrado"
-
-#: ..\..\..\bookmarks.php:87
-#: ..\..\..\edit.php:44
-msgid "Your bookmark must have a title and an address"
-msgstr "O seu bookmark deve possuir um título e um endereço"
-
-#: ..\..\..\bookmarks.php:104
-msgid "Bookmark saved"
-msgstr "Bookmark gravado"
-
-#: ..\..\..\bookmarks.php:106
-#: ..\..\..\import.php:99
-#: ..\..\..\importNetscape.php:71
-msgid "There was an error saving your bookmark. Please try again or contact the administrator."
-msgstr "Ocorreu um erro na gravação do seu bookmark. Por favor tente novamente ou entre em contato com o administrador."
-
-#: ..\..\..\bookmarks.php:143
-#: ..\..\..\toolbar.inc.php:9
-#: ..\..\..\templates\toolbar.inc.php:13
-msgid "Add a Bookmark"
-msgstr "Adicione um Bookmark"
-
-#: ..\..\..\bookmarks.php:144
-msgid "Add Bookmark"
-msgstr "Adicionar Bookmark"
-
-#: ..\..\..\bookmarks.php:147
-msgid "You must be logged in before you can add bookmarks."
-msgstr "Você deve dar entrada no sistema para poder adicionar bookmarks"
-
-#: ..\..\..\bookmarks.php:196
-#: ..\..\..\watch.php:79
-#, php-format
-msgid "%s Bookmarks"
-msgstr "%s Bookmarks"
-
-#: ..\..\..\edit.php:29
-msgid "Edit Bookmark"
-msgstr "Editar Bookmark"
-
-#: ..\..\..\edit.php:34
-#, php-format
-msgid "Bookmark with id %s not was not found"
-msgstr "O Bookmark com a identificação %s não foi encontrado"
-
-#: ..\..\..\edit.php:39
-msgid "You are not allowed to edit this bookmark"
-msgstr "Você não tem permissão para editar este bookmark"
-
-#: ..\..\..\edit.php:55
-msgid "Error while saving your bookmark"
-msgstr "Erro durante a gravação do seu bookmark"
-
-#: ..\..\..\edit.php:73
-msgid "Failed to delete the bookmark"
-msgstr "Falha ao apagar o bookmark"
-
-#: ..\..\..\edit.php:80
-#: ..\..\..\templates\editprofile.tpl.php:59
-msgid "Save Changes"
-msgstr "Salva Alterações"
-
-#: ..\..\..\functions.inc.php:98
+#: src/SemanticScuttle/functions.php:189
 msgid "message_die() was called multiple times."
 msgstr "message_die() foi chamada múltiplas vezes"
 
-#: ..\..\..\functions.inc.php:110
+#: src/SemanticScuttle/functions.php:201
 msgid "SQL Error"
 msgstr "Erro de SQL"
 
-#: ..\..\..\functions.inc.php:116
+#: src/SemanticScuttle/functions.php:207
 msgid "Line"
 msgstr "Linha"
 
-#: ..\..\..\functions.inc.php:116
-#: ..\..\..\templates\importDelicious.tpl.php:8
-#: ..\..\..\templates\importNetscape.tpl.php:9
+#: src/SemanticScuttle/functions.php:207
+#: data/templates/default/importDelicious.tpl.php:8
+#: data/templates/default/importNetscape.tpl.php:9
+#: data/templates/default/importStructure.tpl.php:10
 msgid "File"
 msgstr "Arquivo"
 
-#: ..\..\..\functions.inc.php:122
+#: src/SemanticScuttle/functions.php:215
 msgid "Information"
 msgstr "Informações"
 
-#: ..\..\..\functions.inc.php:127
+#: src/SemanticScuttle/functions.php:220
 msgid "Critical Information"
 msgstr "Informações Importantes"
 
-#: ..\..\..\functions.inc.php:132
+#: src/SemanticScuttle/functions.php:225
 msgid "An error occured"
 msgstr "Um erro ocorreu"
 
-#: ..\..\..\functions.inc.php:135
+#: src/SemanticScuttle/functions.php:228
 msgid "General Error"
 msgstr "Erro Geral"
 
-#: ..\..\..\functions.inc.php:143
+#: src/SemanticScuttle/functions.php:236
 msgid "An critical error occured"
 msgstr "Um erro crítico ocorreu"
 
-#: ..\..\..\functions.inc.php:146
+#: src/SemanticScuttle/functions.php:239
 msgid "Critical Error"
 msgstr "Erro Crítico"
 
-#: ..\..\..\functions.inc.php:155
+#: src/SemanticScuttle/functions.php:248
 msgid "DEBUG MODE"
 msgstr "MODO DEBUG"
 
-#: ..\..\..\import.php:39
-msgid "Could not open XML input"
-msgstr "Não foi possível abrir a entrada XML"
-
-#: ..\..\..\import.php:43
-#, php-format
-msgid "XML error: %s at line %d"
-msgstr "Erro de XML: %s na linha %d"
-
-#: ..\..\..\import.php:52
-msgid "Import Bookmarks from del.icio.us"
-msgstr "Importar Bookmarks do del.icio.us"
-
-#: ..\..\..\import.php:84
-#: ..\..\..\importNetscape.php:62
-msgid "You have already submitted this bookmark."
-msgstr "Você já submeteu este Bookmark."
+#: data/templates/default/about.tpl.php:6
+msgid ""
+"<strong>Store</strong> all your favourite links in one place, accessible "
+"from anywhere."
+msgstr ""
+"<strong>Agregue</strong> todos os seus links favoritos em um só local, "
+"acessível de qualquer lugar."
 
-#: ..\..\..\import.php:97
-#: ..\..\..\importNetscape.php:69
-msgid "Bookmark imported."
-msgstr "Bookmark importado."
+#: data/templates/default/about.tpl.php:7
+msgid ""
+"<strong>Share</strong> your bookmarks with everyone, with friends on your "
+"watchlist or just keep them private."
+msgstr ""
+"<strong>Compartilhe</strong> seus bookmarks com todo o mundo, com amigos em "
+"sua lista de observação ou guarde-os apenas para você."
 
-#: ..\..\..\importNetscape.php:77
-msgid "Import Bookmarks from Browser File"
-msgstr "Importar Bookmarks (Favoritos) do Arquivo do Navegador"
+#: data/templates/default/about.tpl.php:8
+msgid ""
+"<strong>Tag</strong> your bookmarks with as many labels as you want, instead "
+"of wrestling with folders."
+msgstr ""
+"<strong>Identifique</strong> seus bookmarks com tantos tags quanto quiser, "
+"em vez de lutar contra pastas e diretórios."
 
-#: ..\..\..\index.php:31
-msgid "You have now logged out"
-msgstr "Você saiu do sistema"
+#: data/templates/default/about.tpl.php:9
+#, fuzzy
+msgid "Register now"
+msgstr "Registre-se"
 
-#: ..\..\..\index.php:38
+#: data/templates/default/about.tpl.php:9
 #, php-format
-msgid "%s: Recent bookmarks"
-msgstr "%s: Bookmarks recentes"
-
-#: ..\..\..\index.php:71
-msgid "Online Bookmarks Manager"
-msgstr "Gerenciador Online de Bookmarks"
-
-#: ..\..\..\index.php:72
-msgid "Recent Bookmarks"
-msgstr "Bookmarks Recentes"
-
-#: ..\..\..\jsScuttle.php:42
-msgid "Are you sure?"
-msgstr "Você tem certeza disso!?"
-
-#: ..\..\..\jsScuttle.php:42
-msgid "Yes"
-msgstr "Sim"
-
-#: ..\..\..\jsScuttle.php:42
-msgid "No"
-msgstr "Não"
-
-#: ..\..\..\login.php:36
-msgid "The details you have entered are incorrect. Please try again."
-msgstr "Os detalhes submetidos por você estão incorretos. Por favor tente novamente."
-
-#: ..\..\..\login.php:53
-msgid "You are already logged in."
-msgstr "Você já entrou no sistema."
-
-#: ..\..\..\login.php:55
-#: ..\..\..\toolbar.inc.php:14
-#: ..\..\..\templates\login.tpl.php:20
-#: ..\..\..\templates\toolbar.inc.php:28
-msgid "Log In"
-msgstr "Entrar no sistema"
-
-#: ..\..\..\password.php:31
-msgid "You must enter your username."
-msgstr "Você tem que digitar o seu nome de usuário"
-
-#: ..\..\..\password.php:35
-msgid "You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "Você tem que digitar o seu endereço de <abbr title=\"electronic mail\">e-mail</abbr>."
-
-#: ..\..\..\password.php:42
-msgid "No matches found for that username."
-msgstr "Nenhum resultado encontrado pra este nome de usuário"
-
-#: ..\..\..\password.php:45
-msgid "No matches found for that combination of username and <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "Nenhum resultado encontrado para esta combinação de nome de usuário e endereço de <abbr title=\"electronic mail\">e-mail</abbr> "
-
-#: ..\..\..\password.php:53
-msgid "There was an error while generating your new password. Please try again."
-msgstr "Ocorreu um erro durante a geração de sua nova senha. Por favor tente novamente."
+msgid " to start using %s!"
+msgstr ""
 
-#: ..\..\..\password.php:57
-msgid "Your new password is:"
-msgstr "A sua nova senha é:"
+#: data/templates/default/about.tpl.php:12
+msgid "Geek Stuff"
+msgstr "Coisas de Geek"
 
-#: ..\..\..\password.php:57
-msgid "To keep your bookmarks secure, you should change this password in your profile the next time you log in."
-msgstr "Para manter seguros os seus bookmarks, você deveria alterar esta senha (em seu perfil) na próxima vez que entrar no sistema."
+#: data/templates/default/about.tpl.php:14
+msgid "is licensed under the "
+msgstr ""
 
-#: ..\..\..\password.php:60
-#, php-format
-msgid "%s Account Information"
-msgstr "Informações da Conta de %s"
+#: data/templates/default/about.tpl.php:14
+msgid "you can freely host it on your own web server."
+msgstr ""
 
-#: ..\..\..\password.php:62
+#: data/templates/default/about.tpl.php:15
 #, php-format
-msgid "New password generated and sent to %s"
-msgstr "Nova senha gerada e enviada para %s"
+msgid ""
+"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 ""
+"O %1$s suporta a maior parte do <a href=\"http://www.delicious.com/help/api"
+"\"><abbr title=\"Application Programming Interface\">API</abbr> do del.icio."
+"us</a>. Quase todas as adoráveis ferramentas desenvolvidas para aquele "
+"sistema podem ser modificadas para funcionar com o %1$s. Se você encontrar "
+"uma ferramenta que não permita a mudança de seu endereço de API, solicite a "
+"seu criador para que adicione esta configuração. Nunca se sabe. Ele pode "
+"simplesmente atender a seu pedido."
+
+#: data/templates/default/about.tpl.php:24
+msgid "Tips"
+msgstr ""
 
-#: ..\..\..\password.php:69
-msgid "Forgotten Password"
-msgstr "Esquecí a Senha"
+#: data/templates/default/about.tpl.php:26
+msgid "Add search plugin into your browser:"
+msgstr ""
 
-#: ..\..\..\populartags.php:54
-#: ..\..\..\templates\sidebar.block.popular.php:13
-msgid "Popular Tags"
-msgstr "Tags populares"
+#: data/templates/default/about.tpl.php:27
+msgid ""
+"The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
+msgstr ""
 
-#: ..\..\..\profile.php:47
-#: ..\..\..\templates\sidebar.block.profile.php:11
-msgid "Profile"
-msgstr "Perfil"
+#: data/templates/default/about.tpl.php:28
+msgid ""
+"The secret tag \"system:imported\" allows you to find imported bookmarks."
+msgstr ""
 
-#: ..\..\..\profile.php:49
-msgid "Username was not specified"
-msgstr "O nome de usuário não foi especificado"
+#: data/templates/default/admin.tpl.php:5
+#, fuzzy
+msgid "Users management"
+msgstr "Nome de Usuário"
 
-#: ..\..\..\profile.php:57
-#, php-format
-msgid "%s Profile"
-msgstr "Perfil de %s"
+#: data/templates/default/admin.tpl.php:14
+msgid "Public/Shared/Private"
+msgstr ""
 
-#: ..\..\..\profile.php:71
-msgid "Your name and e-mail address are required and must be completed."
-msgstr "Seu nome e endereço de email são requeridos e devem ser preenchidos."
+#: data/templates/default/admin.tpl.php:14
+#: data/templates/default/bookmarks.tpl.php:115
+#, fuzzy
+msgid "bookmark(s)"
+msgstr "bookmark"
 
-#: ..\..\..\profile.php:75
-msgid "Password and confirmation do not match."
-msgstr "A senha digitada não é idêntica àquela digitada no campo de confirmação de senha."
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/tag2tagadd.tpl.php:21
+#: data/templates/default/tag2tagdelete.tpl.php:13
+#: data/templates/default/tag2tagedit.tpl.php:14
+#: data/templates/default/tag2tagedit.tpl.php:35
+#: data/templates/default/tagdelete.tpl.php:6 www/jsScuttle.php:24
+msgid "Are you sure?"
+msgstr "Você tem certeza disso!?"
 
-#: ..\..\..\profile.php:79
-msgid "Password must be at least 6 characters long."
-msgstr "A senha deve ter um mínimo de 6 caracteres."
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/bookmarks.tpl.php:305
+msgid "Delete"
+msgstr "Apagar"
 
-#: ..\..\..\profile.php:87
-msgid "E-mail address is not valid."
-msgstr "O endereço de e-mail fornecido não é válido."
+#: data/templates/default/admin.tpl.php:27
+#, fuzzy
+msgid "Other actions"
+msgstr "Instruções"
 
-#: ..\..\..\profile.php:91
-msgid "An error occurred while saving your changes."
-msgstr "Um erro ocorreu durante a gravação das suas alterações."
+#: data/templates/default/admin.tpl.php:29
+msgid "Check all URLs (May take some time)"
+msgstr ""
 
-#: ..\..\..\profile.php:93
-msgid "Changes saved."
-msgstr "Alterações gravadas."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:16
+msgid ""
+"Collaborative description: these fields can be viewed and modified by every "
+"users"
+msgstr ""
 
-#: ..\..\..\register.php:30
-msgid "You <em>must</em> enter a username, password, name and <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "Você <em>deve</em> digitar um nome de usuário, uma senha, seu nome e endereço de <abbr title=\"electronic mail\">e-mail</abbr>."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:18
+#: data/templates/default/bookmarks.tpl.php:159
+#: data/templates/default/editbookmark.tpl.php:51
+msgid "Title"
+msgstr "Título"
 
-#: ..\..\..\register.php:34
-msgid "This username already exists, please make another choice."
-msgstr "Este nome de usuário já existe. Por favor, escolha outro nome de usuário."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:23
+#: data/templates/default/editbookmark.tpl.php:57
+#: data/templates/default/editprofile.tpl.php:53
+#: data/templates/default/profile.tpl.php:33
+#: data/templates/default/tagcommondescriptionedit.tpl.php:13
+#: data/templates/default/tagedit.tpl.php:12
+msgid "Description"
+msgstr "Descrição"
 
-#: ..\..\..\register.php:38
-msgid "E-mail address is not valid. Please try again."
-msgstr "Endereço de email inválido. Por favor tente novamente."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:31
+#: data/templates/default/tagcommondescriptionedit.tpl.php:21
+msgid "Last modification:"
+msgstr ""
 
-#: ..\..\..\register.php:46
-msgid "You have successfully registered. Enjoy!"
-msgstr "Você completou o seu registro. Agora divirta-se!"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:43
+#: data/templates/default/tagcommondescriptionedit.tpl.php:33
+#: data/templates/default/tagedit.tpl.php:18
+msgid "Update"
+msgstr ""
 
-#: ..\..\..\register.php:48
-msgid "Registration failed. Please try again."
-msgstr "Falha ao registrar-se. Por favor tente novamente."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:44
+#: data/templates/default/editbookmark.tpl.php:111
+#: data/templates/default/tag2tagadd.tpl.php:24
+#: data/templates/default/tag2tagedit.tpl.php:38
+#: data/templates/default/tagcommondescriptionedit.tpl.php:34
+#: data/templates/default/tagedit.tpl.php:19
+#: data/templates/default/tagrename.tpl.php:25
+msgid "Cancel"
+msgstr ""
 
-#: ..\..\..\register.php:52
-#: ..\..\..\toolbar.inc.php:14
-#: ..\..\..\templates\register.tpl.php:27
-#: ..\..\..\templates\toolbar.inc.php:27
-msgid "Register"
-msgstr "Registre-se"
+#: data/templates/default/bookmarklet.inc.php:1
+msgid "Bookmarklet"
+msgstr "Gerador de Bookmarks"
 
-#: ..\..\..\search.inc.php:29
-#: ..\..\..\search.inc.php:58
-msgid "Search"
-msgstr "Busca"
+#: data/templates/default/bookmarklet.inc.php:11
+#, 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 ""
+"Arraste um dos seguintes Geradores de Bookmark para a área de favoridos de "
+"seu navegador. Clique nele toda vez que quiser adicionar a página na qual "
+"você se encontra ao %s"
 
-#: ..\..\..\search.inc.php:36
+#: data/templates/default/bookmarklet.inc.php:20
 #, php-format
-msgid "%s bookmarks"
-msgstr "%s bookmarks"
-
-#: ..\..\..\search.inc.php:41
-msgid "my bookmarks"
-msgstr "meus bookmarks"
-
-#: ..\..\..\search.inc.php:42
-msgid "my watched bookmarks"
-msgstr "meus bookmarks observados"
-
-#: ..\..\..\search.inc.php:46
-msgid "all bookmarks"
-msgstr "todos os bookmarks"
+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 ""
+"Arraste um dos seguintes Geradores de Bookmark para a área de favoridos de "
+"seu navegador. Clique nele toda vez que quiser adicionar a página na qual "
+"você se encontra ao %s"
 
-#: ..\..\..\search.inc.php:49
-msgid "for"
-msgstr "por"
+#: data/templates/default/bookmarklet.inc.php:67
+#: data/templates/default/bookmarklet.inc.php:100
+#, php-format
+msgid "Post to %s"
+msgstr "Postar para %s"
 
-#: ..\..\..\search.php:110
-#: ..\..\..\search.php:114
-msgid "Search Bookmarks"
-msgstr "Busca Bookmarks"
+#: data/templates/default/bookmarklet.inc.php:93
+#: data/templates/default/bookmarklet.inc.php:110
+#, php-format
+msgid "Post to %s (Pop-up)"
+msgstr "Postar para %s (versão Pop-Up)"
 
-#: ..\..\..\search.php:112
-msgid "Search Results"
-msgstr "Resultados da Busca"
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:24
+#, php-format
+msgid "Voting <span class=\"voting\">%d</span>"
+msgstr ""
 
-#: ..\..\..\toolbar.inc.php:9
-msgid "Your Bookmarks"
-msgstr "Seus Bookmarks"
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:32
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:35
+msgid "Vote for"
+msgstr ""
 
-#: ..\..\..\toolbar.inc.php:9
-msgid "Watched Bookmarks"
-msgstr "Bookmarks Observados"
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:43
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:46
+msgid "Vote against"
+msgstr ""
 
-#: ..\..\..\toolbar.inc.php:9
-msgid "All Bookmarks"
-msgstr "Todos os Bookmarks"
+#: data/templates/default/bookmarks.tpl.php:43
+msgid "Bookmarks on this page are managed by an admin user."
+msgstr ""
 
-#: ..\..\..\toolbar.inc.php:9
-#: ..\..\..\templates\toolbar.inc.php:16
-msgid "Log Out"
-msgstr "Sair do Sistema"
+#: data/templates/default/bookmarks.tpl.php:73
+#: data/templates/default/bookmarks.tpl.php:74
+msgid "Edit the common description of this tag"
+msgstr ""
 
-#: ..\..\..\watch.php:84
-msgid "User removed from your watchlist"
-msgstr "Usuário removido da sua lista de observação"
+#: data/templates/default/bookmarks.tpl.php:77
+#: data/templates/default/bookmarks.tpl.php:78
+msgid "Edit the common description of this bookmark"
+msgstr ""
 
-#: ..\..\..\watch.php:86
-msgid "User added to your watchlist"
-msgstr "Usuário adicionado à sua lista de observação"
+#: data/templates/default/bookmarks.tpl.php:98
+#: data/templates/default/bookmarks.tpl.php:99
+msgid "Edit your personal description of this tag"
+msgstr ""
 
-#: ..\..\..\watched.php:64
-#: ..\..\..\watched.php:101
-#, php-format
-msgid "%s Watched Bookmarks"
-msgstr "%s Bookmarks Observados"
+#: data/templates/default/bookmarks.tpl.php:115
+#: data/templates/default/tags.tpl.php:10
+#: data/templates/default/users.tpl.php:8
+msgid "Sort by:"
+msgstr "Ordenar por:"
 
-#: ..\..\..\services\userservice.php:93
-msgid "Your"
-msgstr "Seu"
+#: data/templates/default/bookmarks.tpl.php:157
+msgid "Date"
+msgstr "Data"
 
-#: ..\..\..\services\userservice.php:101
-#, php-format
-msgid "%s'"
+#: data/templates/default/bookmarks.tpl.php:162
+msgid "Voting"
 msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:6
-msgid "<strong>Store</strong> all your favourite links in one place, accessible from anywhere."
-msgstr "<strong>Agregue</strong> todos os seus links favoritos em um só local, acessível de qualquer lugar."
+#: data/templates/default/bookmarks.tpl.php:171
+msgid "Bookmarks from other users for this tag"
+msgstr ""
 
-#: ..\..\..\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>Compartilhe</strong> seus bookmarks com todo o mundo, com amigos em sua lista de observação ou guarde-os apenas para você."
+#: data/templates/default/bookmarks.tpl.php:176
+msgid "Only your bookmarks for this tag"
+msgstr ""
 
-#: ..\..\..\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>Identifique</strong> seus bookmarks com tantos tags quanto quiser, em vez de lutar contra pastas e diretórios."
+#: data/templates/default/bookmarks.tpl.php:199
+#: data/templates/default/bookmarks.tpl.php:205
+msgid "First"
+msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:9
-#, php-format
-msgid "<strong><a href=\"register.php\">Register now</a></strong> to start using %s!"
-msgstr "<strong><a href=\"register.php\">Registre-se agora</a></strong> para começar a usar o %s!"
+#: data/templates/default/bookmarks.tpl.php:200
+#: data/templates/default/bookmarks.tpl.php:206
+msgid "Previous"
+msgstr "Anterior"
 
-#: ..\..\..\templates\about.tpl.php:12
-msgid "Geek Stuff"
-msgstr "Coisas de Geek"
+#: data/templates/default/bookmarks.tpl.php:213
+#: data/templates/default/bookmarks.tpl.php:216
+msgid "Next"
+msgstr "Próximo"
 
-#: ..\..\..\templates\about.tpl.php:14
-#, php-format
-msgid "%s is based on <a href=\"http://sourceforge.net/projects/scuttle/\">an open-source project</a> licensed under the <a href=\"http://www.gnu.org/copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> General Public License</a>. This means you can host it on your own web server for free, whether it is on the Internet, a private network or just your own computer."
-msgstr "O %s é baseado em <a href=\"http://sourceforge.net/projects/scuttle/\">um projeto open source</a> licenciado sob a <a href=\"http://www.gnu.org/copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> General Public Licence</a>. Isso significa que você pode hospedá-lo em seu próprio servidor de rede gratuitamente, esteja ele na Internet, em uma rede privada ou apenas em seu computador."
+#: data/templates/default/bookmarks.tpl.php:214
+#: data/templates/default/bookmarks.tpl.php:217
+msgid "Last"
+msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:15
+#: data/templates/default/bookmarks.tpl.php:233
 #, php-format
-msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 "O %1$s suporta a maior parte do <a href=\"http://www.delicious.com/help/api\"><abbr title=\"Application Programming Interface\">API</abbr> do del.icio.us</a>. Quase todas as adoráveis ferramentas desenvolvidas para aquele sistema podem ser modificadas para funcionar com o %1$s. Se você encontrar uma ferramenta que não permita a mudança de seu endereço de API, solicite a seu criador para que adicione esta configuração. Nunca se sabe. Ele pode simplesmente atender a seu pedido."
-
-#: ..\..\..\templates\bookmarks.tpl.php:10
-#: ..\..\..\templates\tags.tpl.php:6
-msgid "Sort by:"
-msgstr "Ordenar por:"
-
-#: ..\..\..\templates\bookmarks.tpl.php:11
-msgid "Date"
-msgstr "Data"
-
-#: ..\..\..\templates\bookmarks.tpl.php:12
-#: ..\..\..\templates\editbookmark.tpl.php:28
-msgid "Title"
-msgstr "Título"
+msgid "Page %d of %d"
+msgstr "Página %d de %d"
 
-#: ..\..\..\templates\bookmarks.tpl.php:13
-msgid "URL"
-msgstr "URL"
+#: data/templates/default/bookmarks.tpl.php:295
+#, fuzzy
+msgid "Tags:"
+msgstr "Tags (Rótulos)"
 
-#: ..\..\..\templates\bookmarks.tpl.php:52
+#: data/templates/default/bookmarks.tpl.php:302
 msgid "Edit"
 msgstr "Editar"
 
-#: ..\..\..\templates\bookmarks.tpl.php:52
-msgid "Delete"
-msgstr "Apagar"
+#: data/templates/default/bookmarks.tpl.php:310
+msgid "Last update"
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:67
-msgid " and 1 other"
-msgstr "e 1 outro"
+#: data/templates/default/bookmarks.tpl.php:313
+msgid "by"
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:70
-#, php-format
-msgid " and %s others"
+#: data/templates/default/bookmarks.tpl.php:317
+msgid "you"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:333
+#, fuzzy, php-format
+msgid " and %s1 other%s"
 msgstr "e %s outros"
 
-#: ..\..\..\templates\bookmarks.tpl.php:73
+#: data/templates/default/bookmarks.tpl.php:336
+#, fuzzy, php-format
+msgid " and %2$s%1$s others%3$s"
+msgstr "e %s outros"
+
+#: data/templates/default/bookmarks.tpl.php:350
+#, fuzzy
+msgid "Copy this bookmark to YOUR bookmarks."
+msgstr "Importar bookmarks do arquivo de bookmarks"
+
+#: data/templates/default/bookmarks.tpl.php:351
 msgid "Copy"
 msgstr "Copiar"
 
-#: ..\..\..\templates\bookmarks.tpl.php:121
-#: ..\..\..\templates\bookmarks.tpl.php:125
-msgid "Previous"
-msgstr "Anterior"
+#: data/templates/default/bookmarks.tpl.php:376
+msgid "This bookmark is certified by an admin user."
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:132
-#: ..\..\..\templates\bookmarks.tpl.php:134
-msgid "Next"
-msgstr "Próximo"
+#: data/templates/default/bookmarks.tpl.php:430
+#, fuzzy
+msgid "Private Note on this bookmark"
+msgstr "Você não tem permissão para editar este bookmark"
 
-#: ..\..\..\templates\bookmarks.tpl.php:135
-#, php-format
-msgid "Page %d of %d"
-msgstr "Página %d de %d"
+#: data/templates/default/bookmarks.tpl.php:444
+msgid "Come back to the top of this page."
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:444
+msgid "Top of the page"
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:145
+#: data/templates/default/bookmarks.tpl.php:450
 msgid "No bookmarks available"
 msgstr "Nenhum bookmark disponível"
 
-#: ..\..\..\templates\editbookmark.tpl.php:23
+#: data/templates/default/bottom.inc.php:5
+#: data/templates/default/toolbar.inc.php:15
+#: data/templates/default/toolbar.inc.php:28 www/about.php:23 www/about.php:24
+msgid "About"
+msgstr "Sobre"
+
+#: data/templates/default/bottom.inc.php:7
+msgid "Propulsed by "
+msgstr ""
+
+#: data/templates/default/dynamictags.inc.php:56
+#: data/templates/default/sidebar.block.common.php:19
+#: data/templates/default/sidebar.block.popular.php:34
+#: data/templates/default/sidebar.block.recent.php:29
+#: data/templates/default/tags.tpl.php:19
+#, fuzzy
+msgid "bookmark"
+msgid_plural "bookmarks"
+msgstr[0] "bookmark"
+msgstr[1] "bookmark"
+
+#: data/templates/default/dynamictags.inc.php:105
+#: data/templates/default/sidebar.block.common.php:9
+#: data/templates/default/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.popular.php:23
+#: data/templates/default/sidebar.block.recent.php:34
+#: data/templates/default/toolbar.inc.php:27 www/populartags.php:46
+msgid "Popular Tags"
+msgstr "Tags populares"
+
+#: data/templates/default/dynamictags.inc.php:108
+#, fuzzy
+msgid "Popular Tags From All Users"
+msgstr "Tags populares"
+
+#: data/templates/default/editbookmark.tpl.php:46
 msgid "Address"
 msgstr "Endereço"
 
-#: ..\..\..\templates\editbookmark.tpl.php:25
-#: ..\..\..\templates\editbookmark.tpl.php:30
-#: ..\..\..\templates\editprofile.tpl.php:17
-#: ..\..\..\templates\editprofile.tpl.php:19
+#: data/templates/default/editbookmark.tpl.php:48
+#: data/templates/default/editbookmark.tpl.php:53
+#: data/templates/default/editprofile.tpl.php:29
+#: data/templates/default/tagrename.tpl.php:14
+#: data/templates/default/tagrename.tpl.php:19
 msgid "Required"
 msgstr "Requerido"
 
-#: ..\..\..\templates\editbookmark.tpl.php:33
-#: ..\..\..\templates\editprofile.tpl.php:24
-#: ..\..\..\templates\profile.tpl.php:28
-msgid "Description"
-msgstr "Descrição"
+#: data/templates/default/editbookmark.tpl.php:58
+msgid "Add Note"
+msgstr ""
 
-#: ..\..\..\templates\editbookmark.tpl.php:38
-#: ..\..\..\templates\importDelicious.tpl.php:15
-#: ..\..\..\templates\importNetscape.tpl.php:16
-#: ..\..\..\templates\sidebar.block.profile.php:12
+#: data/templates/default/editbookmark.tpl.php:61
+msgid ""
+"You can use anchors to delimite attributes. for example: [publisher]blah[/"
+"publisher] "
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:64
+msgid "Suggested anchors: "
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:76
+#, fuzzy
+msgid "Private Note"
+msgstr "Privado"
+
+#: data/templates/default/editbookmark.tpl.php:78
+msgid "Just visible by you and your contacts."
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:82
+#: data/templates/default/toolbar.inc.php:10 www/tags.php:45 www/tags.php:67
 msgid "Tags"
 msgstr "Tags (Rótulos)"
 
-#: ..\..\..\templates\editbookmark.tpl.php:40
-#: ..\..\..\templates\importDelicious.tpl.php:17
-#: ..\..\..\templates\importNetscape.tpl.php:18
+#: data/templates/default/editbookmark.tpl.php:86
 msgid "Comma-separated"
 msgstr "Separados por vírgula"
 
-#: ..\..\..\templates\editbookmark.tpl.php:43
-#: ..\..\..\templates\importDelicious.tpl.php:20
-#: ..\..\..\templates\importNetscape.tpl.php:21
+#: data/templates/default/editbookmark.tpl.php:90
+#: data/templates/default/tag2tagadd.tpl.php:9
+msgid ""
+"Note: use \">\" to include one tag in another. e.g.: europe>france>paris"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:94
+#: data/templates/default/tag2tagadd.tpl.php:8
+msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:97
+#: data/templates/default/importDelicious.tpl.php:15
+#: data/templates/default/importNetscape.tpl.php:16
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: ..\..\..\templates\editbookmark.tpl.php:46
-#: ..\..\..\templates\importDelicious.tpl.php:23
-#: ..\..\..\templates\importNetscape.tpl.php:24
+#: data/templates/default/editbookmark.tpl.php:100
+#: data/templates/default/importDelicious.tpl.php:18
+#: data/templates/default/importNetscape.tpl.php:19
 msgid "Public"
 msgstr "Público"
 
-#: ..\..\..\templates\editbookmark.tpl.php:47
-#: ..\..\..\templates\importDelicious.tpl.php:24
-#: ..\..\..\templates\importNetscape.tpl.php:25
+#: data/templates/default/editbookmark.tpl.php:101
 msgid "Shared with Watch List"
 msgstr "Partilhado com a sua Lista de Observação"
 
-#: ..\..\..\templates\editbookmark.tpl.php:48
-#: ..\..\..\templates\importDelicious.tpl.php:25
-#: ..\..\..\templates\importNetscape.tpl.php:26
+#: data/templates/default/editbookmark.tpl.php:102
+#: data/templates/default/importDelicious.tpl.php:20
+#: data/templates/default/importNetscape.tpl.php:21
 msgid "Private"
 msgstr "Privado"
 
-#: ..\..\..\templates\editbookmark.tpl.php:60
+#: data/templates/default/editbookmark.tpl.php:115
 msgid "Delete Bookmark"
 msgstr "Apagar Bookmark"
 
-#: ..\..\..\templates\editbookmark.tpl.php:74
-msgid "Bookmarklet"
-msgstr "Gerador de Bookmarks"
-
-#: ..\..\..\templates\editbookmark.tpl.php:75
-#, 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 "Arraste um dos seguintes Geradores de Bookmark para a área de favoridos de seu navegador. Clique nele toda vez que quiser adicionar a página na qual você se encontra ao %s"
-
-#: ..\..\..\templates\editbookmark.tpl.php:77
-#, php-format
-msgid "Post to %s"
-msgstr "Postar para %s"
-
-#: ..\..\..\templates\editbookmark.tpl.php:78
-#, php-format
-msgid "Post to %s (Pop-up)"
-msgstr "Postar para %s (versão Pop-Up)"
+#: data/templates/default/editbookmark.tpl.php:120
+msgid "edit common description"
+msgstr ""
 
-#: ..\..\..\templates\editbookmark.tpl.php:81
-#: ..\..\..\templates\importDelicious.tpl.php:31
-#: ..\..\..\templates\importNetscape.tpl.php:32
+#: data/templates/default/editbookmark.tpl.php:212
+#: data/templates/default/importDelicious.tpl.php:26
+#: data/templates/default/importNetscape.tpl.php:27
+#: data/templates/default/importStructure.tpl.php:16
 msgid "Import"
 msgstr "Importar"
 
-#: ..\..\..\templates\editbookmark.tpl.php:83
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Import bookmarks from bookmark file"
 msgstr "Importar bookmarks do arquivo de bookmarks"
 
-#: ..\..\..\templates\editbookmark.tpl.php:83
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Internet Explorer, Mozilla Firefox and Netscape"
 msgstr "Internet Explorer, Mozilla Firefox and Netscape"
 
-#: ..\..\..\templates\editbookmark.tpl.php:84
+#: data/templates/default/editbookmark.tpl.php:215
 msgid "Import bookmarks from del.icio.us"
 msgstr "Importar bookmarks do del.icio.us"
 
-#: ..\..\..\templates\editprofile.tpl.php:10
-#: ..\..\..\templates\login.tpl.php:9
-#: ..\..\..\templates\password.tpl.php:10
-#: ..\..\..\templates\profile.tpl.php:7
-#: ..\..\..\templates\register.tpl.php:10
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:11
+msgid "SSL client certificates"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:17
+msgid "Serial"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:45
+#: data/templates/default/profile.tpl.php:17
+msgid "Name"
+msgstr "Nome"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:19
+#: data/templates/default/profile.tpl.php:11
+#, fuzzy
+msgid "Email"
+msgstr "E-mail"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:20
+msgid "Issuer"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:30
+#, fuzzy
+msgid "delete"
+msgstr "Apagar"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:43
+msgid "No certificates registered"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:48
+msgid "Your current certificate is already registered with your account."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:53
+msgid "Register current certificate to automatically login."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:59
+msgid "Your browser does not provide a certificate."
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:8
+msgid "Account Details"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:12
+#: data/templates/default/login.tpl.php:21
+#: data/templates/default/password.tpl.php:10
+#: data/templates/default/profile.tpl.php:6
+#: data/templates/default/register.tpl.php:16
 msgid "Username"
 msgstr "Nome de Usuário"
 
-#: ..\..\..\templates\editprofile.tpl.php:12
+#: data/templates/default/editprofile.tpl.php:17
 msgid "New Password"
 msgstr "Nova Senha"
 
-#: ..\..\..\templates\editprofile.tpl.php:14
-msgid "Confirm New Password"
+#: data/templates/default/editprofile.tpl.php:22
+#, fuzzy
+msgid "Confirm Password"
 msgstr "Confirme a Nova Senha"
 
-#: ..\..\..\templates\editprofile.tpl.php:16
-#: ..\..\..\templates\profile.tpl.php:12
-#: ..\..\..\templates\register.tpl.php:18
-msgid "Name"
-msgstr "Nome"
-
-#: ..\..\..\templates\editprofile.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:27
+#: data/templates/default/password.tpl.php:14
+#: data/templates/default/register.tpl.php:26
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ..\..\..\templates\editprofile.tpl.php:20
-#: ..\..\..\templates\profile.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:32
+#, fuzzy
+msgid "Private RSS Feed"
+msgstr "Privado"
+
+#: data/templates/default/editprofile.tpl.php:34
+msgid "Enable"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:36
+#, fuzzy
+msgid "Generate New Key"
+msgstr "Gerar Senha"
+
+#: data/templates/default/editprofile.tpl.php:41
+msgid "Personal Details"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:49
+#: data/templates/default/profile.tpl.php:23
 msgid "Homepage"
 msgstr "Página na Web"
 
-#: ..\..\..\templates\editprofile.tpl.php:22
-#: ..\..\..\templates\profile.tpl.php:23
-msgid "Member Since"
-msgstr "Membro Desde"
+#: data/templates/default/editprofile.tpl.php:58 www/edit.php:113
+msgid "Save Changes"
+msgstr "Salva Alterações"
 
-#: ..\..\..\templates\editprofile.tpl.php:30
-#: ..\..\..\templates\profile.tpl.php:35
-msgid "Watch List"
-msgstr "Lista de Observação"
+#: data/templates/default/editprofile.tpl.php:63
+#: data/templates/default/sidebar.block.tagactions.php:17
+#: data/templates/default/sidebar.block.watchstatus.php:18
+#, fuzzy
+msgid "Actions"
+msgstr "Instruções"
 
-#: ..\..\..\templates\editprofile.tpl.php:45
-#: ..\..\..\templates\profile.tpl.php:50
-msgid "Watched By"
-msgstr "Observado Por"
+#: data/templates/default/editprofile.tpl.php:66
+#, fuzzy
+msgid "Export bookmarks"
+msgstr "Seus Bookmarks"
 
-#: ..\..\..\templates\error.404.tpl.php:5
+#: data/templates/default/editprofile.tpl.php:68
+msgid "HTML file (for browsers)"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:69
+msgid "XML file (like del.icio.us)"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:70
+msgid "CSV file (for spreadsheet tools)"
+msgstr ""
+
+#: data/templates/default/error.404.tpl.php:5
 msgid "Not Found"
 msgstr "Não Encontrado"
 
-#: ..\..\..\templates\error.404.tpl.php:6
+#: data/templates/default/error.404.tpl.php:6
 msgid "The requested URL was not found on this server"
 msgstr "A URL requisitada não foi encontrada neste servidor"
 
-#: ..\..\..\templates\error.500.tpl.php:5
+#: data/templates/default/error.500.tpl.php:5
 msgid "General server error"
 msgstr "Erro Geral de servidor"
 
-#: ..\..\..\templates\error.500.tpl.php:6
+#: data/templates/default/error.500.tpl.php:6
 msgid "The requested URL could not be processed"
 msgstr "A URL requisitada não pôde ser processada"
 
-#: ..\..\..\templates\importDelicious.tpl.php:38
-msgid "Log in to the <a href=\"http://del.icio.us/api/posts/all\">export page at del.icio.us</a>"
-msgstr "Entrar na <a href=\"http://del.icio.us/api/posts/all\">página de exportação do del.icio.us</a>"
+#: data/templates/default/importDelicious.tpl.php:19
+#: data/templates/default/importNetscape.tpl.php:20
+#, fuzzy
+msgid "Shared with Watchlist"
+msgstr "Partilhado com a sua Lista de Observação"
+
+#: data/templates/default/importDelicious.tpl.php:31
+#: data/templates/default/importNetscape.tpl.php:32
+#: data/templates/default/importStructure.tpl.php:21
+msgid "Instructions"
+msgstr "Instruções"
 
-#: ..\..\..\templates\importDelicious.tpl.php:39
-msgid "Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> file to your computer"
-msgstr "Salvar o arquivo <abbr title=\"Extensible Markup Language\">XML</abbr> resultante em seu computador."
+#: data/templates/default/importDelicious.tpl.php:33
+#, fuzzy
+msgid ""
+"Log in to the <a href=\"https://api.del.icio.us/v1/posts/all\">export page "
+"at del.icio.us</a>"
+msgstr ""
+"Entrar na <a href=\"http://del.icio.us/api/posts/all\">página de exportação "
+"do del.icio.us</a>"
 
-#: ..\..\..\templates\importDelicious.tpl.php:40
-msgid "Click <kbd>Browse...</kbd> to find this file on your computer. The maximum size the file can be is 1MB"
-msgstr "Clique em <kbd>Navegar...</kbd>para encontrar este arquivo no seu computador. O tamanho máximo que o arquivo pode ter é 1MB"
+#: data/templates/default/importDelicious.tpl.php:34
+msgid ""
+"Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> "
+"file to your computer"
+msgstr ""
+"Salvar o arquivo <abbr title=\"Extensible Markup Language\">XML</abbr> "
+"resultante em seu computador."
 
-#: ..\..\..\templates\importDelicious.tpl.php:41
-#: ..\..\..\templates\importNetscape.tpl.php:48
-msgid "Input the default tags you want added to your imported bookmarks"
-msgstr "Digite as tags padrão que você deseja que sejam adicionadas aos bookmarks importados"
+#: data/templates/default/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 ""
+"Clique em <kbd>Navegar...</kbd>para encontrar este arquivo no seu "
+"computador. O tamanho máximo que o arquivo pode ter é 1MB"
 
-#: ..\..\..\templates\importDelicious.tpl.php:42
-#: ..\..\..\templates\importNetscape.tpl.php:49
+#: data/templates/default/importDelicious.tpl.php:36
+#: data/templates/default/importNetscape.tpl.php:43
 msgid "Select the default privacy setting for your imported bookmarks"
-msgstr "Selecione o status de privacidade padrão para os seus bookmarks importados"
-
-#: ..\..\..\templates\importDelicious.tpl.php:43
-#: ..\..\..\templates\importNetscape.tpl.php:50
-msgid "Click <kbd>Import</kbd> to start importing the bookmarks; it may take a minute"
-msgstr "Clique em <kbd>Importar</kbd> para começar a importar os bookmarks. Isso pode levar um minutinho..."
+msgstr ""
+"Selecione o status de privacidade padrão para os seus bookmarks importados"
 
-#: ..\..\..\templates\importNetscape.tpl.php:37
-msgid "Instructions"
-msgstr "Instruções"
+#: data/templates/default/importDelicious.tpl.php:37
+#: data/templates/default/importNetscape.tpl.php:44
+msgid ""
+"Click <kbd>Import</kbd> to start importing the bookmarks; it may take a "
+"minute"
+msgstr ""
+"Clique em <kbd>Importar</kbd> para começar a importar os bookmarks. Isso "
+"pode levar um minutinho..."
 
-#: ..\..\..\templates\importNetscape.tpl.php:40
+#: data/templates/default/importNetscape.tpl.php:35
 msgid "Export your bookmarks from your browser to a file"
 msgstr "Exporte seus bookmarks de seu navegador para um arquivo"
 
-#: ..\..\..\templates\importNetscape.tpl.php:42
-msgid "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
-msgstr "Internet Explorer: <kbd>Arquivo &gt; Importar e Exportar... &gt; Exportar Favoritos"
+#: data/templates/default/importNetscape.tpl.php:37
+msgid ""
+"Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
+msgstr ""
+"Internet Explorer: <kbd>Arquivo &gt; Importar e Exportar... &gt; Exportar "
+"Favoritos"
+
+#: data/templates/default/importNetscape.tpl.php:38
+msgid ""
+"Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
+"Export..."
+msgstr ""
+"Mozilla Firefox: <kbd>Bookmarks &gt; Gerenciar Bookmarks... &gt; Arquivo "
+"&gt; Exportar..."
+
+#: data/templates/default/importNetscape.tpl.php:39
+msgid ""
+"Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
+msgstr ""
+"Netscape: <kbd>Bookmarks &gt; Gerenciar Bookmarks... &gt; Ferramentas &gt; "
+"Exportar..."
 
-#: ..\..\..\templates\importNetscape.tpl.php:43
-msgid "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; Export..."
-msgstr "Mozilla Firefox: <kbd>Bookmarks &gt; Gerenciar Bookmarks... &gt; Arquivo &gt; Exportar..."
+#: data/templates/default/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 ""
+"Clique <kbd>Procurar...</kbd> para encontrar o arquivo de bookmarks gravado "
+"em seu computador. O tamanho máximo permitido para o arquivo é 1MB"
 
-#: ..\..\..\templates\importNetscape.tpl.php:44
-msgid "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
-msgstr "Netscape: <kbd>Bookmarks &gt; Gerenciar Bookmarks... &gt; Ferramentas &gt; Exportar..."
+#: data/templates/default/importStructure.tpl.php:24
+msgid "Create your structure into a simple text file and following this model:"
+msgstr ""
 
-#: ..\..\..\templates\importNetscape.tpl.php:47
-msgid "Click <kbd>Browse...</kbd> to find the saved bookmark file on your computer. The maximum size the file can be is 1MB"
-msgstr "Clique <kbd>Procurar...</kbd> para encontrar o arquivo de bookmarks gravado em seu computador. O tamanho máximo permitido para o arquivo é 1MB"
+#: data/templates/default/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:14
-#: ..\..\..\templates\register.tpl.php:14
+#: data/templates/default/login.tpl.php:13
+msgid "Please activate cookies"
+msgstr ""
+
+#: data/templates/default/login.tpl.php:26
+#: data/templates/default/register.tpl.php:21
 msgid "Password"
 msgstr "Senha"
 
-#: ..\..\..\templates\login.tpl.php:16
+#: data/templates/default/login.tpl.php:28
 msgid "Don't ask for my password for 2 weeks"
 msgstr "Não pergunte minha senha por duas semanas"
 
-#: ..\..\..\templates\login.tpl.php:24
+#: data/templates/default/login.tpl.php:32
+#: data/templates/default/toolbar.inc.php:29 www/login.php:57
+msgid "Log In"
+msgstr "Entrar no sistema"
+
+#: data/templates/default/login.tpl.php:36
 msgid "Forgotten your password?"
 msgstr "Esqueceu a sua senha?"
 
-#: ..\..\..\templates\myTagsDynamicInsert.inc.php:34
-#: ..\..\..\templates\myTagsDynamicInsert.inc.php:65
-msgid "My Tags"
-msgstr "Minhas Tags"
+#: data/templates/default/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 ""
+"Se você esqueceu a sua senha, o %s pode gerar uma nova para você. Digite o "
+"seu nome de usuário e o seu endereço de e-mail no formulário abaixo e nós "
+"enviaremos a nova senha para seu e-mail."
 
-#: ..\..\..\templates\myTagsDynamicInsert.inc.php:44
-msgid "Show"
-msgstr "Mostrar"
+#: data/templates/default/password.tpl.php:19
+msgid "Generate Password"
+msgstr "Gerar Senha"
 
-#: ..\..\..\templates\myTagsDynamicInsert.inc.php:57
-msgid "System Popular Tags"
-msgstr "Tags Populares Gerais"
+#: data/templates/default/profile.tpl.php:28
+msgid "Member Since"
+msgstr "Membro Desde"
 
-#: ..\..\..\templates\myTagsDynamicInsert.inc.php:70
-msgid "My Popular Tags"
-msgstr "Minhas Tags Populares"
+#: data/templates/default/profile.tpl.php:40
+#: data/templates/default/sidebar.block.watchlist.php:30
+#, fuzzy
+msgid "Watching"
+msgstr "Lista de Observação"
 
-#: ..\..\..\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 "Se você esqueceu a sua senha, o %s pode gerar uma nova para você. Digite o seu nome de usuário e o seu endereço de e-mail no formulário abaixo e nós enviaremos a nova senha para seu e-mail."
+#: data/templates/default/profile.tpl.php:55
+#: data/templates/default/sidebar.block.watchlist.php:52
+msgid "Watched By"
+msgstr "Observado Por"
 
-#: ..\..\..\templates\password.tpl.php:14
-#: ..\..\..\templates\register.tpl.php:22
-msgid "<abbr title=\"Electronic mail\">E-mail</abbr>"
-msgstr "<abbr title=\"Correio Eletrônico\">E-mail</abbr>"
+#: data/templates/default/profile.tpl.php:68
+#: data/templates/default/toolbar.inc.php:9
+#, fuzzy
+msgid "Bookmarks"
+msgstr "%s Bookmarks"
 
-#: ..\..\..\templates\password.tpl.php:19
-msgid "Generate Password"
-msgstr "Gerar Senha"
+#: data/templates/default/profile.tpl.php:69
+#, fuzzy
+msgid "Go to bookmarks"
+msgstr "%s bookmarks"
 
-#: ..\..\..\templates\register.tpl.php:5
+#: data/templates/default/register.tpl.php:11
 #, php-format
-msgid "Sign up here to create a free %s account. All the information requested below is required"
-msgstr "Cadastre-se aqui para criar uma conta gratuita no %s. Todas as informações solicitadas abaixo são necessárias."
+msgid ""
+"Sign up here to create a free %s account. All the information requested "
+"below is required"
+msgstr ""
+"Cadastre-se aqui para criar uma conta gratuita no %s. Todas as informações "
+"solicitadas abaixo são necessárias."
+
+#: data/templates/default/register.tpl.php:18
+msgid ""
+" at least 5 characters, alphanumeric (no spaces, no dots or other special "
+"ones)"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:28
+msgid " to send you your password if you forget it"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:33
+msgid "Antispam question"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:41
+#: data/templates/default/toolbar.inc.php:31 www/register.php:99
+msgid "Register"
+msgstr "Registre-se"
+
+#: data/templates/default/search.menu.php:27
+#, fuzzy
+msgid "Search..."
+msgstr "Busca"
+
+#: data/templates/default/search.menu.php:28
+#, fuzzy
+msgid "in"
+msgstr "Linha"
+
+#: data/templates/default/search.menu.php:34
+#, fuzzy
+msgid "this user's bookmarks"
+msgstr "%s bookmarks"
 
-#: ..\..\..\templates\rss.tpl.php:9
+#: data/templates/default/search.menu.php:39
+msgid "my bookmarks"
+msgstr "meus bookmarks"
+
+#: data/templates/default/search.menu.php:40
+#, fuzzy
+msgid "my watchlist"
+msgstr "Adicionar à Lista de Observação"
+
+#: data/templates/default/search.menu.php:44
+msgid "all bookmarks"
+msgstr "todos os bookmarks"
+
+#: data/templates/default/search.menu.php:54
+msgid "Search"
+msgstr "Busca"
+
+#: data/templates/default/sidebar.block.linked.php:23
+#, fuzzy
+msgid "Linked Tags"
+msgstr "Tags Relacionadas"
+
+#: data/templates/default/sidebar.block.linked.php:28
+#: data/templates/default/sidebar.block.menu.php:46
+msgid "Add new link"
+msgstr ""
+
+#: data/templates/default/sidebar.block.linked.php:29
+#: data/templates/default/sidebar.block.menu.php:47
+#, fuzzy
+msgid "Delete link"
+msgstr "Apagar"
+
+#: data/templates/default/sidebar.block.menu.php:35
 #, php-format
-msgid "Recent bookmarks posted to %s"
-msgstr "Bookmarks recentemente postados para %s"
+msgid "Tags included into the tag '%s'"
+msgstr ""
 
-#: ..\..\..\templates\rss.tpl.php:17
-#: ..\..\..\templates\rss.tpl.php:19
-msgid "No bookmarks found"
-msgstr "Nenhum bookmark encontrado"
+#: data/templates/default/sidebar.block.menu.php:35
+#, fuzzy
+msgid "Menu Tags"
+msgstr "Minhas Tags"
+
+#: data/templates/default/sidebar.block.menu.php:68
+msgid "See all your tags"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:68
+msgid "all your tags"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:70
+msgid "See all tags from this user"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:70
+msgid "all tags from this user"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:74
+#, fuzzy
+msgid "See popular tags"
+msgstr "Tags Populares Gerais"
+
+#: data/templates/default/sidebar.block.menu2.php:21
+#, fuzzy
+msgid "Featured Menu Tags"
+msgstr "Tags Relacionadas"
 
-#: ..\..\..\templates\sidebar.block.profile.php:13
-msgid "Watched"
-msgstr "Observado"
+#: data/templates/default/sidebar.block.menu2.php:25
+msgid "This menu is composed of keywords (tags) organized by admins."
+msgstr ""
 
-#: ..\..\..\templates\sidebar.block.recent.php:13
+#: data/templates/default/sidebar.block.recent.php:18
 msgid "Recent Tags"
 msgstr "Tags Recentes"
 
-#: ..\..\..\templates\sidebar.block.related.php:14
+#: data/templates/default/sidebar.block.related.php:26
 msgid "Related Tags"
 msgstr "Tags Relacionadas"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:10
+#: data/templates/default/sidebar.block.search.php:28
+#, fuzzy
+msgid "Last Searches"
+msgstr "Busca"
+
+#: data/templates/default/sidebar.block.search.php:40
+#, fuzzy
+msgid "Number of bookmarks for this query"
+msgstr "Nenhum bookmark encontrado"
+
+#: data/templates/default/sidebar.block.tagactions.php:9 www/tagrename.php:72
+#, fuzzy
+msgid "Rename Tag"
+msgid_plural "Rename Tags"
+msgstr[0] "Tags Relacionadas"
+msgstr[1] "Tags Relacionadas"
+
+#: data/templates/default/sidebar.block.tagactions.php:22 www/tagdelete.php:54
+#, fuzzy
+msgid "Delete Tag"
+msgstr "Apagar"
+
+#: data/templates/default/sidebar.block.tagactions.php:24 www/tagedit.php:61
+#, fuzzy
+msgid "Edit Tag Description"
+msgstr "Descrição"
+
+#: data/templates/default/sidebar.block.tagactions.php:26
+#: www/tagcommondescriptionedit.php:76
+msgid "Edit Tag Common Description"
+msgstr ""
+
+#: data/templates/default/sidebar.block.tagactions.php:28
+msgid "Create a link to another tag"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:14
+msgid "New Users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:23
+#: data/templates/default/users.tpl.php:24
+#, fuzzy
+msgid "bookmarks"
+msgstr "bookmark"
+
+#: data/templates/default/sidebar.block.users.php:30
+msgid "See all users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:30
+msgid "All users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:19
+msgid "Close contacts are mutual contacts"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:19
+msgid "Close contacts"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:36
+msgid "Add a contact..."
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:36
+msgid "Type a username to add it to your contacts."
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:44
+#, fuzzy
+msgid "Remove this contact"
+msgstr "Remover da Lista de Observação"
+
+#: data/templates/default/sidebar.block.watchstatus.php:11
 msgid "Remove from Watchlist"
 msgstr "Remover da Lista de Observação"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:12
+#: data/templates/default/sidebar.block.watchstatus.php:13
 msgid "Add to Watchlist"
 msgstr "Adicionar à Lista de Observação"
 
-#: ..\..\..\templates\tags.tpl.php:7
+#: data/templates/default/sidebar.linkedtags.inc.php:18
+#, fuzzy
+msgid "Edit link"
+msgstr "Editar"
+
+#: data/templates/default/sidebar.linkedtags.inc.php:47
+msgid "Synonyms:"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:12
+msgid "Create new link:"
+msgstr ""
+
+#: data/templates/default/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 ""
+
+#: data/templates/default/tag2tagadd.tpl.php:23
+#: data/templates/default/tag2tagedit.tpl.php:37
+msgid "Create"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:35
+#: data/templates/default/tag2tagdelete.tpl.php:27
+#: data/templates/default/tag2tagedit.tpl.php:51
+msgid "Existing links:"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:53
+#: data/templates/default/tag2tagdelete.tpl.php:45
+#: data/templates/default/tag2tagedit.tpl.php:69
+msgid "No links"
+msgstr ""
+
+#: data/templates/default/tag2tagdelete.tpl.php:15
+#: data/templates/default/tag2tagedit.tpl.php:16
+#: data/templates/default/tagdelete.tpl.php:8 www/jsScuttle.php:24
+msgid "Yes"
+msgstr "Sim"
+
+#: data/templates/default/tag2tagdelete.tpl.php:16
+#: data/templates/default/tag2tagedit.tpl.php:17
+#: data/templates/default/tagdelete.tpl.php:9 www/jsScuttle.php:24
+msgid "No"
+msgstr "Não"
+
+#: data/templates/default/tag2tagedit.tpl.php:6
+msgid "Delete the link"
+msgstr ""
+
+#: data/templates/default/tag2tagedit.tpl.php:29
+msgid "Create new link"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:12
+msgid "Old"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:17
+msgid "New"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:24
+#, fuzzy
+msgid "Rename"
+msgstr "Nome de Usuário"
+
+#: data/templates/default/tags.tpl.php:11
+#: data/templates/default/users.tpl.php:9
 msgid "Alphabet"
 msgstr "Alfabeto"
 
-#: ..\..\..\templates\tags.tpl.php:8
+#: data/templates/default/tags.tpl.php:12
+#: data/templates/default/users.tpl.php:10
 msgid "Popularity"
 msgstr "Popularidade"
 
-#: ..\..\..\templates\tags.tpl.php:15
-msgid "bookmark"
-msgstr "bookmark"
+#: data/templates/default/toolbar.inc.php:8
+#: data/templates/default/toolbar.inc.php:26
+#, fuzzy
+msgid "Home"
+msgstr "Página na Web"
 
-#: ..\..\..\templates\toolbar.inc.php:10
+#: data/templates/default/toolbar.inc.php:11 www/watchlist.php:106
+#, fuzzy
+msgid "Watchlist"
+msgstr "Lista de Observação"
+
+#: data/templates/default/toolbar.inc.php:12 www/profile.php:79
+msgid "Profile"
+msgstr "Perfil"
+
+#: data/templates/default/toolbar.inc.php:13 www/bookmarks.php:215
+msgid "Add a Bookmark"
+msgstr "Adicione um Bookmark"
+
+#: data/templates/default/toolbar.inc.php:14
+msgid "Log Out"
+msgstr "Sair do Sistema"
+
+#: data/templates/default/toolbar.inc.php:17
+msgid "Admin"
+msgstr ""
+
+#: data/templates/default/top.inc.php:57
+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/default/users.tpl.php:20
+#, fuzzy
+msgid "profile"
+msgstr "Perfil"
+
+#: data/templates/default/users.tpl.php:21
+msgid "created in"
+msgstr ""
+
+#: www/admin.php:32
+msgid "Manage users"
+msgstr ""
+
+#: www/admin.php:69
+#, php-format
+msgid "%s and all his bookmarks and tags were deleted."
+msgstr ""
+
+#: www/admin.php:76
+msgid "Problem with "
+msgstr ""
+
+#: www/ajaxDelete.php:37
+msgid "You are not allowed to delete this bookmark"
+msgstr "Você não tem permissão para apagar este bookmark"
+
+#: www/ajaxDelete.php:41 www/edit.php:103
+msgid "Failed to delete bookmark"
+msgstr "Falha ao apagar bookmark"
+
+#: www/alltags.php:50
+msgid "All Tags"
+msgstr "Todos os Tags"
+
+#: www/alltags.php:56 www/bookmarks.php:99 www/populartags.php:52
+#: www/profile.php:55 www/rss.php:100 www/search.php:111 www/watch.php:45
+#: www/watchlist.php:61
+#, fuzzy, php-format
+msgid "User with username %s was not found"
+msgstr "O Nome de Usuário %s não foi encontrado"
+
+#: 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 ""
+
+#: www/bookmarkcommondescriptionedit.php:60
+msgid "Bookmark common description updated"
+msgstr ""
+
+#: www/bookmarkcommondescriptionedit.php:63
+#, fuzzy
+msgid "Failed to update the bookmark common description"
+msgstr "Falha ao apagar o bookmark"
+
+#: www/bookmarkcommondescriptionedit.php:71
+msgid "Edit Bookmark Common Description"
+msgstr ""
+
+#: www/bookmarks.php:114 www/tags.php:47
+msgid "Remove the tag from the selection"
+msgstr ""
+
+#: www/bookmarks.php:134 www/edit.php:65
+msgid "Your bookmark must have a title and an address"
+msgstr "O seu bookmark deve possuir um título e um endereço"
+
+#: www/bookmarks.php:139
+msgid "This bookmark URL may not be added"
+msgstr ""
+
+#: www/bookmarks.php:158 www/edit.php:83 www/edit.php:86
+msgid "Bookmark saved"
+msgstr "Bookmark gravado"
+
+#: www/bookmarks.php:158
+msgid "(Come back to previous page.)"
+msgstr ""
+
+#: www/bookmarks.php:165 www/import.php:106 www/importNetscape.php:108
+msgid ""
+"There was an error saving your bookmark. Please try again or contact the "
+"administrator."
+msgstr ""
+"Ocorreu um erro na gravação do seu bookmark. Por favor tente novamente ou "
+"entre em contato com o administrador."
+
+#: www/bookmarks.php:222
+msgid "Add Bookmark"
+msgstr "Adicionar Bookmark"
+
+#: www/bookmarks.php:225
+msgid "You must be logged in before you can add bookmarks."
+msgstr "Você deve dar entrada no sistema para poder adicionar bookmarks"
+
+#: www/bookmarks.php:270
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: www/bookmarks.php:283
+#, php-format
+msgid "%s: %s (+private %s)"
+msgstr ""
+
+#: www/bookmarks.php:305 www/bookmarks.php:306
 msgid "My Bookmarks"
 msgstr "Meus Bookmarks"
 
-#: ..\..\..\templates\toolbar.inc.php:11
-msgid "My Watched"
+#: www/edit.php:44 www/edit.php:45
+msgid "Edit Bookmark"
+msgstr "Editar Bookmark"
+
+#: www/edit.php:51
+#, php-format
+msgid "Bookmark with id %s not was not found"
+msgstr "O Bookmark com a identificação %s não foi encontrado"
+
+#: www/edit.php:57
+msgid "You are not allowed to edit this bookmark"
+msgstr "Você não tem permissão para editar este bookmark"
+
+#: www/edit.php:77
+msgid "Error while saving your bookmark"
+msgstr "Erro durante a gravação do seu bookmark"
+
+#: 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/import.php:47
+msgid "Could not open XML input"
+msgstr "Não foi possível abrir a entrada XML"
+
+#: www/import.php:51
+#, php-format
+msgid "XML error: %s at line %d"
+msgstr "Erro de XML: %s na linha %d"
+
+#: www/import.php:60
+msgid "Import Bookmarks from del.icio.us"
+msgstr "Importar Bookmarks do del.icio.us"
+
+#: www/import.php:93
+msgid "You have already submitted this bookmark."
+msgstr "Você já submeteu este Bookmark."
+
+#: www/import.php:104
+msgid "Bookmark imported."
+msgstr "Bookmark importado."
+
+#: www/importNetscape.php:95
+#, fuzzy
+msgid "You have already submitted some of these bookmarks."
+msgstr "Você já submeteu este Bookmark."
+
+#: www/importNetscape.php:115
+#, fuzzy
+msgid "Bookmarks found: "
+msgstr "Nenhum bookmark encontrado"
+
+#: www/importNetscape.php:116
+#, fuzzy
+msgid "Bookmarks imported: "
+msgstr "Bookmark importado."
+
+#: www/importNetscape.php:117 www/importNetscape.php:122
+msgid "Import Bookmarks from Browser File"
+msgstr "Importar Bookmarks (Favoritos) do Arquivo do Navegador"
+
+#: 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 "Você saiu do sistema"
+
+#: www/index.php:46
+#, php-format
+msgid "%s: Recent bookmarks"
+msgstr "%s: Bookmarks recentes"
+
+#: www/index.php:58
+#, fuzzy, php-format
+msgid "%s: Recent bookmarks (+private %s)"
+msgstr "%s: Bookmarks recentes"
+
+#: www/index.php:96
+msgid "Store, share and tag your favourite links"
+msgstr ""
+
+#: www/index.php:97
+msgid "All Bookmarks"
+msgstr "Todos os Bookmarks"
+
+#: www/jsScuttle.php:71
+msgid "Available"
+msgstr ""
+
+#: www/jsScuttle.php:74
+#, fuzzy
+msgid "Not Available"
+msgstr "Nenhum bookmark disponível"
+
+#: www/login.php:48
+msgid "The details you have entered are incorrect. Please try again."
+msgstr ""
+"Os detalhes submetidos por você estão incorretos. Por favor tente novamente."
+
+#: www/password.php:36
+msgid "You must enter your username."
+msgstr "Você tem que digitar o seu nome de usuário"
+
+#: www/password.php:40
+msgid ""
+"You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"Você tem que digitar o seu endereço de <abbr title=\"electronic mail\">e-"
+"mail</abbr>."
+
+#: www/password.php:48
+msgid "No matches found for that username."
+msgstr "Nenhum resultado encontrado pra este nome de usuário"
+
+#: www/password.php:51
+msgid ""
+"No matches found for that combination of username and <abbr title="
+"\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"Nenhum resultado encontrado para esta combinação de nome de usuário e "
+"endereço de <abbr title=\"electronic mail\">e-mail</abbr> "
+
+#: www/password.php:59
+msgid ""
+"There was an error while generating your new password. Please try again."
+msgstr ""
+"Ocorreu um erro durante a geração de sua nova senha. Por favor tente "
+"novamente."
+
+#: www/password.php:63
+msgid "Your new password is:"
+msgstr "A sua nova senha é:"
+
+#: 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 ""
+"Para manter seguros os seus bookmarks, você deveria alterar esta senha (em "
+"seu perfil) na próxima vez que entrar no sistema."
+
+#: www/password.php:66
+#, php-format
+msgid "%s Account Information"
+msgstr "Informações da Conta de %s"
+
+#: www/password.php:68
+#, php-format
+msgid "New password generated and sent to %s"
+msgstr "Nova senha gerada e enviada para %s"
+
+#: www/password.php:75
+msgid "Forgotten Password"
+msgstr "Esquecí a Senha"
+
+#: www/profile.php:63 www/watchlist.php:119
+msgid "Username was not specified"
+msgstr "O nome de usuário não foi especificado"
+
+#: www/profile.php:70
+#, fuzzy
+msgid "My Profile"
+msgstr "Perfil"
+
+#: www/profile.php:110
+msgid "Invalid Token"
+msgstr ""
+
+#: www/profile.php:115
+msgid "Password and confirmation do not match."
+msgstr ""
+"A senha digitada não é idêntica àquela digitada no campo de confirmação de "
+"senha."
+
+#: www/profile.php:119
+msgid "Password must be at least 6 characters long."
+msgstr "A senha deve ter um mínimo de 6 caracteres."
+
+#: www/profile.php:123
+msgid "E-mail address is not valid."
+msgstr "O endereço de e-mail fornecido não é válido."
+
+#: www/profile.php:127
+msgid "An error occurred while saving your changes."
+msgstr "Um erro ocorreu durante a gravação das suas alterações."
+
+#: www/profile.php:129
+msgid "Changes saved."
+msgstr "Alterações gravadas."
+
+#: www/profile.php:148
+msgid "You do not have a valid SSL client certificate"
+msgstr ""
+
+#: www/profile.php:150
+msgid "This certificate is already registered"
+msgstr ""
+
+#: www/profile.php:152
+msgid "Failed to register SSL client certificate."
+msgstr ""
+
+#: www/profile.php:154
+msgid "SSL client certificate registered."
+msgstr ""
+
+#: www/profile.php:163
+msgid "Certificate not found."
+msgstr ""
+
+#: www/profile.php:165
+msgid "The certificate does not belong to you."
+msgstr ""
+
+#: www/profile.php:167
+msgid "Failed to delete SSL client certificate."
+msgstr ""
+
+#: www/profile.php:169
+msgid "SSL client certificate deleted."
+msgstr ""
+
+#: www/register.php:52
+#, fuzzy
+msgid "You <em>must</em> enter a username, password and e-mail address."
+msgstr ""
+"Você <em>deve</em> digitar um nome de usuário, uma senha, seu nome e "
+"endereço de <abbr title=\"electronic mail\">e-mail</abbr>."
+
+#: www/register.php:56
+#, fuzzy
+msgid "This username has been reserved, please make another choice."
+msgstr ""
+"Este nome de usuário já existe. Por favor, escolha outro nome de usuário."
+
+#: www/register.php:60
+msgid "This username already exists, please make another choice."
+msgstr ""
+"Este nome de usuário já existe. Por favor, escolha outro nome de usuário."
+
+#: www/register.php:64
+#, fuzzy
+msgid ""
+"This username is not valid (too short, too long, forbidden characters...), "
+"please make another choice."
+msgstr ""
+"Este nome de usuário já existe. Por favor, escolha outro nome de usuário."
+
+#: www/register.php:68
+msgid "E-mail address is not valid. Please try again."
+msgstr "Endereço de email inválido. Por favor tente novamente."
+
+#: www/register.php:72
+#, fuzzy
+msgid "Antispam answer is not valid. Please try again."
+msgstr "Endereço de email inválido. Por favor tente novamente."
+
+#: www/register.php:90
+msgid "You have successfully registered. Enjoy!"
+msgstr "Você completou o seu registro. Agora divirta-se!"
+
+#: www/register.php:92
+msgid "Registration failed. Please try again."
+msgstr "Falha ao registrar-se. Por favor tente novamente."
+
+#: www/rss.php:90 www/rss.php:111
+#, php-format
+msgid "Failed to Autenticate User with username %s using private key"
+msgstr ""
+
+#: www/rss.php:128
+#, php-format
+msgid "Recent bookmarks posted to %s"
+msgstr "Bookmarks recentemente postados para %s"
+
+#: www/search.php:83 www/search.php:147
+msgid "Search Bookmarks"
+msgstr "Busca Bookmarks"
+
+#: www/search.php:89
+msgid "Search Results"
+msgstr "Resultados da Busca"
+
+#: www/search.php:137
+msgid "Unsatisfied? You can also try our "
+msgstr ""
+
+#: www/tag2tagadd.php:54
+msgid "Tag link created"
+msgstr ""
+
+#: www/tag2tagadd.php:57
+#, fuzzy
+msgid "Failed to create the link"
+msgstr "Falha ao apagar o bookmark"
+
+#: www/tag2tagadd.php:69
+msgid "Add Tag Link"
+msgstr ""
+
+#: www/tag2tagdelete.php:66
+msgid "Tag link deleted"
+msgstr ""
+
+#: www/tag2tagdelete.php:69
+#, fuzzy
+msgid "Failed to delete the link"
+msgstr "Falha ao apagar o bookmark"
+
+#: www/tag2tagdelete.php:81
+msgid "Delete Link Between Tags"
+msgstr ""
+
+#: www/tag2tagedit.php:55
+msgid "Edit Link Between Tags"
+msgstr ""
+
+#: www/tagcommondescriptionedit.php:62
+msgid "Tag common description updated"
+msgstr ""
+
+#: www/tagcommondescriptionedit.php:67
+msgid "Failed to update the tag common description"
+msgstr ""
+
+#: www/tagdelete.php:43
+msgid "Tag deleted"
+msgstr ""
+
+#: www/tagdelete.php:46
+#, fuzzy
+msgid "Failed to delete the tag"
+msgstr "Falha ao apagar o bookmark"
+
+#: www/tagedit.php:52
+msgid "Tag description updated"
+msgstr ""
+
+#: www/tagedit.php:55
+#, fuzzy
+msgid "Failed to update the tag description"
+msgstr "Falha ao apagar o bookmark"
+
+#: www/tagrename.php:63
+msgid "Tag renamed"
+msgstr ""
+
+#: www/tagrename.php:66
+#, fuzzy
+msgid "Failed to rename the tag"
+msgstr "Falha ao apagar o bookmark"
+
+#: www/tags.php:71
+#, php-format
+msgid "%s: tagged with \"%s\""
+msgstr ""
+
+#: www/tags.php:84
+#, php-format
+msgid "%s: tagged with \"%s\" (+private %s)"
+msgstr ""
+
+#: www/users.php:31
+#, fuzzy
+msgid "Users"
+msgstr "Nome de Usuário"
+
+#: www/watch.php:54
+msgid "User removed from your watchlist"
+msgstr "Usuário removido da sua lista de observação"
+
+#: www/watch.php:56
+msgid "User added to your watchlist"
+msgstr "Usuário adicionado à sua lista de observação"
+
+#: www/watchlist.php:104
+#, fuzzy
+msgid "My Watchlist"
 msgstr "Meus Observados"
 
-#: ..\..\..\templates\toolbar.inc.php:12
-msgid "All Recent"
-msgstr "Todos os Recentes"
+#: www/api/httpauth.inc.php:30
+msgid "Use of the API calls requires authentication."
+msgstr ""
+
+#: www/gsearch/index.php:51
+msgid "Come back to "
+msgstr ""
+
+#: www/gsearch/index.php:56
+msgid "Admin tips: "
+msgstr ""
+
+#: www/gsearch/index.php:57
+msgid "To refresh manually Google Custom Search Engine, goes to: "
+msgstr ""
+
+#: www/gsearch/index.php:61
+msgid ""
+"If no result appears, check that all the urls are valid in the admin section."
+msgstr ""
+
+#~ msgid "Online Bookmarks Manager"
+#~ msgstr "Gerenciador Online de Bookmarks"
+
+#~ msgid "Recent Bookmarks"
+#~ msgstr "Bookmarks Recentes"
+
+#~ msgid "You are already logged in."
+#~ msgstr "Você já entrou no sistema."
+
+#~ msgid "%s Profile"
+#~ msgstr "Perfil de %s"
+
+#~ msgid "Your name and e-mail address are required and must be completed."
+#~ msgstr ""
+#~ "Seu nome e endereço de email são requeridos e devem ser preenchidos."
+
+#~ msgid "my watched bookmarks"
+#~ msgstr "meus bookmarks observados"
+
+#~ msgid "for"
+#~ msgstr "por"
+
+#~ msgid "Watched Bookmarks"
+#~ msgstr "Bookmarks Observados"
+
+#~ msgid "%s Watched Bookmarks"
+#~ msgstr "%s Bookmarks Observados"
+
+#~ msgid "Your"
+#~ msgstr "Seu"
+
+#~ msgid ""
+#~ "<strong><a href=\"register.php\">Register now</a></strong> to start using "
+#~ "%s!"
+#~ msgstr ""
+#~ "<strong><a href=\"register.php\">Registre-se agora</a></strong> para "
+#~ "começar a usar o %s!"
+
+#~ msgid ""
+#~ "%s is based on <a href=\"http://sourceforge.net/projects/scuttle/\">an "
+#~ "open-source project</a> licensed under the <a href=\"http://www.gnu.org/"
+#~ "copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> "
+#~ "General Public License</a>. This means you can host it on your own web "
+#~ "server for free, whether it is on the Internet, a private network or just "
+#~ "your own computer."
+#~ msgstr ""
+#~ "O %s é baseado em <a href=\"http://sourceforge.net/projects/scuttle/\">um "
+#~ "projeto open source</a> licenciado sob a <a href=\"http://www.gnu.org/"
+#~ "copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> "
+#~ "General Public Licence</a>. Isso significa que você pode hospedá-lo em "
+#~ "seu próprio servidor de rede gratuitamente, esteja ele na Internet, em "
+#~ "uma rede privada ou apenas em seu computador."
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid " and 1 other"
+#~ msgstr "e 1 outro"
+
+#~ msgid "Input the default tags you want added to your imported bookmarks"
+#~ msgstr ""
+#~ "Digite as tags padrão que você deseja que sejam adicionadas aos bookmarks "
+#~ "importados"
+
+#~ msgid "Show"
+#~ msgstr "Mostrar"
+
+#~ msgid "My Popular Tags"
+#~ msgstr "Minhas Tags Populares"
+
+#~ msgid "<abbr title=\"Electronic mail\">E-mail</abbr>"
+#~ msgstr "<abbr title=\"Correio Eletrônico\">E-mail</abbr>"
+
+#~ msgid "Watched"
+#~ msgstr "Observado"
 
+#~ msgid "All Recent"
+#~ msgstr "Todos os Recentes"
diff --git a/data/locales/ru_RU/LC_MESSAGES/messages.mo b/data/locales/ru_RU/LC_MESSAGES/messages.mo
index 12839c5..8a76aa0 100644
--- a/data/locales/ru_RU/LC_MESSAGES/messages.mo
+++ b/data/locales/ru_RU/LC_MESSAGES/messages.mo
diff --git a/data/locales/ru_RU/LC_MESSAGES/messages.po b/data/locales/ru_RU/LC_MESSAGES/messages.po
index f52669f..d3f47af 100644
--- a/data/locales/ru_RU/LC_MESSAGES/messages.po
+++ b/data/locales/ru_RU/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Semantic Scuttle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-04 11:33+0200\n"
+"POT-Creation-Date: 2012-01-20 13:58+0100\n"
 "PO-Revision-Date: 2010-04-30 02:35+0400\n"
 "Last-Translator: Sergey Ulitin <serge.ulitin@gmail.com>\n"
 "Language-Team: Sergey Ulitin <serge.ulitin@gmail.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,1398 +20,1645 @@ msgstr ""
 "X-Poedit-Country: Russia\n"
 "X-Poedit-SourceCharset: utf-8\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 "%s и всего закладки и тэги удалены."
-
-#: ../../../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 "Пользователь с именем %s не найден"
-
-#: ../../../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 "Remove the tag from the selection"
-
-#: ../../../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 "Закладка # %s не найдена"
-
-#: ../../../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:189
 msgid "message_die() was called multiple times."
 msgstr "message_die() было вызвано несколько раз."
 
-#: ../../../functions.inc.php:156
+#: src/SemanticScuttle/functions.php:201
 msgid "SQL Error"
 msgstr "Ошибка SQL"
 
-#: ../../../functions.inc.php:162
+#: src/SemanticScuttle/functions.php:207
 msgid "Line"
 msgstr "Line"
 
-#: ../../../functions.inc.php:162
-#: ../../../templates/importDelicious.tpl.php:8
-#: ../../../templates/importNetscape.tpl.php:9
-#: ../../../templates/importStructure.tpl.php:10
+#: src/SemanticScuttle/functions.php:207
+#: data/templates/default/importDelicious.tpl.php:8
+#: data/templates/default/importNetscape.tpl.php:9
+#: data/templates/default/importStructure.tpl.php:10
 msgid "File"
 msgstr "Файл"
 
-#: ../../../functions.inc.php:168
+#: src/SemanticScuttle/functions.php:215
 msgid "Information"
 msgstr "Информация"
 
-#: ../../../functions.inc.php:173
+#: src/SemanticScuttle/functions.php:220
 msgid "Critical Information"
 msgstr "Важная информация"
 
-#: ../../../functions.inc.php:178
+#: src/SemanticScuttle/functions.php:225
 msgid "An error occured"
 msgstr "Произошла ошибка"
 
-#: ../../../functions.inc.php:181
+#: src/SemanticScuttle/functions.php:228
 msgid "General Error"
 msgstr "Общая ошибка"
 
-#: ../../../functions.inc.php:189
+#: src/SemanticScuttle/functions.php:236
 msgid "An critical error occured"
 msgstr "Произошла критическая ошибка"
 
-#: ../../../functions.inc.php:192
+#: src/SemanticScuttle/functions.php:239
 msgid "Critical Error"
 msgstr "Критическая ошибка"
 
-#: ../../../functions.inc.php:201
+#: src/SemanticScuttle/functions.php:248
 msgid "DEBUG MODE"
 msgstr "Режим DEBUG"
 
-#: ../../../history.php:61
-msgid "History"
-msgstr "История"
-
-#: ../../../history.php:62
-#, php-format
-msgid "History for %s"
-msgstr "История для %s"
-
-#: ../../../history.php:84
-msgid "Address was not found"
-msgstr "Адрес не найден"
-
-#: ../../../import.php:47
-msgid "Could not open XML input"
-msgstr "Невозможно открыть XML"
-
-#: ../../../import.php:51
-#, php-format
-msgid "XML error: %s at line %d"
-msgstr "Ошибка XML: %s в строке %d"
-
-#: ../../../import.php:60
-msgid "Import Bookmarks from del.icio.us"
-msgstr "Импортировать закладки из del.icio.us"
-
-#: ../../../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 "%s: Недавно добавленные закладки"
-
-#: ../../../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 "Вы должны ввести <abbr title=\"electronic mail\">e-mail</abbr>."
-
-#: ../../../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 "Ничего не найдено для этого имени пользователя и адреса <abbr title=\"electronic mail\">e-mail</abbr>."
-
-#: ../../../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 "%s просмотр информации об аккаунте"
-
-#: ../../../password.php:68
-#, php-format
-msgid "New password generated and sent to %s"
-msgstr "Новый пароль отправлен по адресу %s"
-
-#: ../../../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 "Пароль должен быть минимум 6 символов длиной."
-
-#: ../../../profile.php:102
-msgid "E-mail address is not valid."
-msgstr "Некорректный адрес E-mail."
-
-#: ../../../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 "Вы <em>должны</em> ввести имя пользователя, пароль и адрес e-mail."
-
-#: ../../../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 "Некорректный адрес e-mail. Попробуйте еще раз."
-
-#: ../../../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 "Последние закладки добавленные в %s"
-
-#: ../../../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 "Tag link created"
-
-#: ../../../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 "Delete Link between Tags"
-
-#: ../../../tag2tagedit.php:55
-msgid "Edit Link Between Tags"
-msgstr "Edit Link between Tags"
-
-#: ../../../tagcommondescriptionedit.php:55
-msgid "Tag common description updated"
-msgstr "Tag common description updated"
-
-#: ../../../tagcommondescriptionedit.php:58
-msgid "Failed to update the tag common description"
-msgstr "Failed to update the tag common description"
-
-#: ../../../tagcommondescriptionedit.php:64
-#: ../../../templates/sidebar.block.tagactions.php:26
-msgid "Edit Tag Common Description"
-msgstr "Edit Tag common description"
-
-#: ../../../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
-msgid "<strong>Store</strong> all your favourite links in one place, accessible from anywhere."
-msgstr "<strong>Храните</strong> Ваши любимые ссылки в одной месте, доступном отовсюду."
+#: data/templates/default/about.tpl.php:6
+msgid ""
+"<strong>Store</strong> all your favourite links in one place, accessible "
+"from anywhere."
+msgstr ""
+"<strong>Храните</strong> Ваши любимые ссылки в одной месте, доступном "
+"отовсюду."
 
-#: ../../../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>Делитесь</strong> ссылками со всем миром, с Вашими друзьями или оставьте их приватными."
+#: data/templates/default/about.tpl.php:7
+msgid ""
+"<strong>Share</strong> your bookmarks with everyone, with friends on your "
+"watchlist or just keep them private."
+msgstr ""
+"<strong>Делитесь</strong> ссылками со всем миром, с Вашими друзьями или "
+"оставьте их приватными."
 
-#: ../../../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>Помечайте тэгами</strong> Ваши ссылки с таким количеством меток сколько хотите, вместо того чтобы бороться со свалкой ссылок."
+#: data/templates/default/about.tpl.php:8
+msgid ""
+"<strong>Tag</strong> your bookmarks with as many labels as you want, instead "
+"of wrestling with folders."
+msgstr ""
+"<strong>Помечайте тэгами</strong> Ваши ссылки с таким количеством меток "
+"сколько хотите, вместо того чтобы бороться со свалкой ссылок."
 
-#: ../../../templates/about.tpl.php:9
+#: data/templates/default/about.tpl.php:9
 msgid "Register now"
 msgstr "Зарегистрируйтесь сейчас"
 
-#: ../../../templates/about.tpl.php:9
+#: data/templates/default/about.tpl.php:9
 #, php-format
 msgid " to start using %s!"
 msgstr " чтобы начать пользоваться %s!"
 
-#: ../../../templates/about.tpl.php:12
+#: data/templates/default/about.tpl.php:12
 msgid "Geek Stuff"
 msgstr "Geek Stuff"
 
-#: ../../../templates/about.tpl.php:14
+#: data/templates/default/about.tpl.php:14
 msgid "is licensed under the "
 msgstr "лицензировано по"
 
-#: ../../../templates/about.tpl.php:14
+#: data/templates/default/about.tpl.php:14
 msgid "you can freely host it on your own web server."
 msgstr "Вы можете свободно устанавливать его на свой веб-сервер."
 
-#: ../../../templates/about.tpl.php:15
+#: data/templates/default/about.tpl.php:15
 #, php-format
-msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 поддерживает большинство <a href=\"http://www.delicious.com/help/api\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></a>. Большинство инструментов сделаных для этой системы, могут быть изменены  для работы с %1$s. Если Вы нашли инструмент, который не позволяет изменить адрес API, попросите авторов добавить эту настройку. Возможно они это сделают."
-
-#: ../../../templates/about.tpl.php:24
+msgid ""
+"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 поддерживает большинство <a href=\"http://www.delicious.com/help/api"
+"\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></"
+"a>. Большинство инструментов сделаных для этой системы, могут быть изменены  "
+"для работы с %1$s. Если Вы нашли инструмент, который не позволяет изменить "
+"адрес API, попросите авторов добавить эту настройку. Возможно они это "
+"сделают."
+
+#: data/templates/default/about.tpl.php:24
 msgid "Tips"
 msgstr "Подсказки"
 
-#: ../../../templates/about.tpl.php:26
+#: data/templates/default/about.tpl.php:26
 msgid "Add search plugin into your browser:"
 msgstr "Добавить плагин поиска в браузер:"
 
-#: ../../../templates/about.tpl.php:27
-msgid "The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
-msgstr "Секретный тэг \"system:unfiled\" позволяет Вам находить закладки без тэгов."
+#: data/templates/default/about.tpl.php:27
+msgid ""
+"The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
+msgstr ""
+"Секретный тэг \"system:unfiled\" позволяет Вам находить закладки без тэгов."
 
-#: ../../../templates/about.tpl.php:28
-msgid "The secret tag \"system:imported\" allows you to find imported bookmarks."
-msgstr "Секретный тэг \"system:imported\" позволяет Вам находить импортированные закладки."
+#: data/templates/default/about.tpl.php:28
+msgid ""
+"The secret tag \"system:imported\" allows you to find imported bookmarks."
+msgstr ""
+"Секретный тэг \"system:imported\" позволяет Вам находить импортированные "
+"закладки."
 
-#: ../../../templates/admin.tpl.php:5
+#: data/templates/default/admin.tpl.php:5
 msgid "Users management"
 msgstr "Управление пользователем"
 
-#: ../../../templates/admin.tpl.php:14
+#: data/templates/default/admin.tpl.php:14
 #, fuzzy
 msgid "Public/Shared/Private"
 msgstr "Публичный/Общий/Приватный"
 
-#: ../../../templates/admin.tpl.php:14
-#: ../../../templates/bookmarks.tpl.php:93
+#: data/templates/default/admin.tpl.php:14
+#: data/templates/default/bookmarks.tpl.php:115
 msgid "bookmark(s)"
 msgstr "закладка(и)"
 
-#: ../../../templates/admin.tpl.php:19
-#: ../../../templates/bookmarks.tpl.php:231
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/tag2tagadd.tpl.php:21
+#: data/templates/default/tag2tagdelete.tpl.php:13
+#: data/templates/default/tag2tagedit.tpl.php:14
+#: data/templates/default/tag2tagedit.tpl.php:35
+#: data/templates/default/tagdelete.tpl.php:6 www/jsScuttle.php:24
+msgid "Are you sure?"
+msgstr "Вы уверены?"
+
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/bookmarks.tpl.php:305
 msgid "Delete"
 msgstr "Удалить"
 
-#: ../../../templates/admin.tpl.php:27
+#: data/templates/default/admin.tpl.php:27
 msgid "Other actions"
 msgstr "Другие действия"
 
-#: ../../../templates/admin.tpl.php:29
+#: data/templates/default/admin.tpl.php:29
 msgid "Check all URLs (May take some time)"
 msgstr "Проверить все ссылки (может занять некоторое время)"
 
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:16
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:16
 #, fuzzy
-msgid "Collaborative description: these fields can be viewed and modified by every users"
-msgstr "Совместное описание: эти поля могут быть просмотрены и изменены любым пользователем"
+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/default/bookmarkcommondescriptionedit.tpl.php:18
+#: data/templates/default/bookmarks.tpl.php:159
+#: data/templates/default/editbookmark.tpl.php:51
 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/default/bookmarkcommondescriptionedit.tpl.php:23
+#: data/templates/default/editbookmark.tpl.php:57
+#: data/templates/default/editprofile.tpl.php:53
+#: data/templates/default/profile.tpl.php:33
+#: data/templates/default/tagcommondescriptionedit.tpl.php:13
+#: data/templates/default/tagedit.tpl.php:12
 msgid "Description"
 msgstr "Описание"
 
-#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:31
-#: ../../../templates/tagcommondescriptionedit.tpl.php:21
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:31
+#: data/templates/default/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/default/bookmarkcommondescriptionedit.tpl.php:43
+#: data/templates/default/tagcommondescriptionedit.tpl.php:33
+#: data/templates/default/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/default/bookmarkcommondescriptionedit.tpl.php:44
+#: data/templates/default/editbookmark.tpl.php:111
+#: data/templates/default/tag2tagadd.tpl.php:24
+#: data/templates/default/tag2tagedit.tpl.php:38
+#: data/templates/default/tagcommondescriptionedit.tpl.php:34
+#: data/templates/default/tagedit.tpl.php:19
+#: data/templates/default/tagrename.tpl.php:25
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ../../../templates/bookmarks.tpl.php:26
+#: data/templates/default/bookmarklet.inc.php:1
+#, fuzzy
+msgid "Bookmarklet"
+msgstr "Закладочник"
+
+#: data/templates/default/bookmarklet.inc.php:11
+#, 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 ""
+"Кликните на один из букмарклетов чтобы добавить кнопку, на которую Вы можете "
+"нажать в любой момент когда захотите  добавить страницу на которой "
+"находитесь в %s"
+
+#: data/templates/default/bookmarklet.inc.php:20
+#, fuzzy, 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 ""
+"Перетяните мышкой bookmarklets в закладки Вашего браузера и нажмите на него, "
+"в любой момент когда захотите добавить страницу на которой находитесь в %s"
+
+#: data/templates/default/bookmarklet.inc.php:67
+#: data/templates/default/bookmarklet.inc.php:100
+#, php-format
+msgid "Post to %s"
+msgstr "Добавить в %s"
+
+#: data/templates/default/bookmarklet.inc.php:93
+#: data/templates/default/bookmarklet.inc.php:110
+#, php-format
+msgid "Post to %s (Pop-up)"
+msgstr "Добавить в %s (pop-up)"
+
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:24
+#, php-format
+msgid "Voting <span class=\"voting\">%d</span>"
+msgstr ""
+
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:32
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:35
+msgid "Vote for"
+msgstr ""
+
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:43
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:46
+msgid "Vote against"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:43
 #, fuzzy
 msgid "Bookmarks on this page are managed by an admin user."
 msgstr "Закладки на этой странице управляются администратором."
 
-#: ../../../templates/bookmarks.tpl.php:51
-#: ../../../templates/bookmarks.tpl.php:52
+#: data/templates/default/bookmarks.tpl.php:73
+#: data/templates/default/bookmarks.tpl.php:74
 #, fuzzy
 msgid "Edit the common description of this tag"
 msgstr "Изменить описание этого тэга"
 
-#: ../../../templates/bookmarks.tpl.php:55
-#: ../../../templates/bookmarks.tpl.php:56
+#: data/templates/default/bookmarks.tpl.php:77
+#: data/templates/default/bookmarks.tpl.php:78
 msgid "Edit the common description of this bookmark"
 msgstr "Изменить описание этой закладки"
 
-#: ../../../templates/bookmarks.tpl.php:76
-#: ../../../templates/bookmarks.tpl.php:77
+#: data/templates/default/bookmarks.tpl.php:98
+#: data/templates/default/bookmarks.tpl.php:99
 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/default/bookmarks.tpl.php:115
+#: data/templates/default/tags.tpl.php:10
+#: data/templates/default/users.tpl.php:8
 msgid "Sort by:"
 msgstr "Сортировать по:"
 
-#: ../../../templates/bookmarks.tpl.php:122
+#: data/templates/default/bookmarks.tpl.php:157
 msgid "Date"
 msgstr "Дате"
 
-#: ../../../templates/bookmarks.tpl.php:129
+#: data/templates/default/bookmarks.tpl.php:162
+msgid "Voting"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:171
 msgid "Bookmarks from other users for this tag"
 msgstr "Ссылки других пользователей с этим тэгом"
 
-#: ../../../templates/bookmarks.tpl.php:134
+#: data/templates/default/bookmarks.tpl.php:176
 msgid "Only your bookmarks for this tag"
 msgstr "Только Ваши ссылки с этим тэгом"
 
-#: ../../../templates/bookmarks.tpl.php:157
-#: ../../../templates/bookmarks.tpl.php:163
+#: data/templates/default/bookmarks.tpl.php:199
+#: data/templates/default/bookmarks.tpl.php:205
 msgid "First"
 msgstr "Первая"
 
-#: ../../../templates/bookmarks.tpl.php:158
-#: ../../../templates/bookmarks.tpl.php:164
+#: data/templates/default/bookmarks.tpl.php:200
+#: data/templates/default/bookmarks.tpl.php:206
 msgid "Previous"
 msgstr "Предыдущая"
 
-#: ../../../templates/bookmarks.tpl.php:171
-#: ../../../templates/bookmarks.tpl.php:174
+#: data/templates/default/bookmarks.tpl.php:213
+#: data/templates/default/bookmarks.tpl.php:216
 msgid "Next"
 msgstr "Следующая"
 
-#: ../../../templates/bookmarks.tpl.php:172
-#: ../../../templates/bookmarks.tpl.php:175
+#: data/templates/default/bookmarks.tpl.php:214
+#: data/templates/default/bookmarks.tpl.php:217
 msgid "Last"
 msgstr "Последняя"
 
-#: ../../../templates/bookmarks.tpl.php:185
+#: data/templates/default/bookmarks.tpl.php:233
 #, php-format
 msgid "Page %d of %d"
 msgstr "Страница%d из %d"
 
-#: ../../../templates/bookmarks.tpl.php:225
+#: data/templates/default/bookmarks.tpl.php:295
 msgid "Tags:"
 msgstr "Тэги:"
 
-#: ../../../templates/bookmarks.tpl.php:231
+#: data/templates/default/bookmarks.tpl.php:302
 msgid "Edit"
 msgstr "Изменить"
 
-#: ../../../templates/bookmarks.tpl.php:235
+#: data/templates/default/bookmarks.tpl.php:310
 msgid "Last update"
 msgstr "Последнее изменение"
 
-#: ../../../templates/bookmarks.tpl.php:238
+#: data/templates/default/bookmarks.tpl.php:313
 msgid "by"
 msgstr " добавлено"
 
-#: ../../../templates/bookmarks.tpl.php:240
+#: data/templates/default/bookmarks.tpl.php:317
 msgid "you"
 msgstr "Вами"
 
-#: ../../../templates/bookmarks.tpl.php:254
+#: data/templates/default/bookmarks.tpl.php:333
 #, fuzzy, php-format
 msgid " and %s1 other%s"
 msgstr " и %s1 другие%s"
 
-#: ../../../templates/bookmarks.tpl.php:257
+#: data/templates/default/bookmarks.tpl.php:336
 #, fuzzy, php-format
 msgid " and %2$s%1$s others%3$s"
 msgstr " и %2$s%1$s другими%3$s"
 
-#: ../../../templates/bookmarks.tpl.php:265
+#: data/templates/default/bookmarks.tpl.php:350
 msgid "Copy this bookmark to YOUR bookmarks."
 msgstr "Скопировать эту ссылку закладку в ВАШИ закладки"
 
-#: ../../../templates/bookmarks.tpl.php:265
+#: data/templates/default/bookmarks.tpl.php:351
 msgid "Copy"
 msgstr "Копировать"
 
-#: ../../../templates/bookmarks.tpl.php:284
+#: data/templates/default/bookmarks.tpl.php:376
 msgid "This bookmark is certified by an admin user."
 msgstr "Эта закладка заверена администрацией."
 
-#: ../../../templates/bookmarks.tpl.php:323
+#: data/templates/default/bookmarks.tpl.php:430
 msgid "Private Note on this bookmark"
 msgstr "Личная заметка к этой закладке"
 
-#: ../../../templates/bookmarks.tpl.php:334
+#: data/templates/default/bookmarks.tpl.php:444
 #, fuzzy
 msgid "Come back to the top of this page."
 msgstr "Вернуться наверх этой страницы."
 
-#: ../../../templates/bookmarks.tpl.php:334
+#: data/templates/default/bookmarks.tpl.php:444
 #, fuzzy
 msgid "Top of the page"
 msgstr "Верх страницы"
 
-#: ../../../templates/bookmarks.tpl.php:340
+#: data/templates/default/bookmarks.tpl.php:450
 msgid "No bookmarks available"
 msgstr "Ни одной закладки недоступно"
 
-#: ../../../templates/bottom.inc.php:7
+#: data/templates/default/bottom.inc.php:5
+#: data/templates/default/toolbar.inc.php:15
+#: data/templates/default/toolbar.inc.php:28 www/about.php:23 www/about.php:24
+msgid "About"
+msgstr "О сайте"
+
+#: data/templates/default/bottom.inc.php:7
 msgid "Propulsed by "
 msgstr "Propulsed by "
 
-#: ../../../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/default/dynamictags.inc.php:56
+#: data/templates/default/sidebar.block.common.php:19
+#: data/templates/default/sidebar.block.popular.php:34
+#: data/templates/default/sidebar.block.recent.php:29
+#: data/templates/default/tags.tpl.php:19
 msgid "bookmark"
 msgid_plural "bookmarks"
 msgstr[0] "закладка"
 msgstr[1] "закладки"
 
-#: ../../../templates/dynamictags.inc.php:131
+#: data/templates/default/dynamictags.inc.php:105
+#: data/templates/default/sidebar.block.common.php:9
+#: data/templates/default/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.popular.php:23
+#: data/templates/default/sidebar.block.recent.php:34
+#: data/templates/default/toolbar.inc.php:27 www/populartags.php:46
+msgid "Popular Tags"
+msgstr "Популярные тэги"
+
+#: data/templates/default/dynamictags.inc.php:108
 msgid "Popular Tags From All Users"
 msgstr "Популярные тэги всех пользователей"
 
-#: ../../../templates/editbookmark.tpl.php:33
+#: data/templates/default/editbookmark.tpl.php:46
 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/default/editbookmark.tpl.php:48
+#: data/templates/default/editbookmark.tpl.php:53
+#: data/templates/default/editprofile.tpl.php:29
+#: data/templates/default/tagrename.tpl.php:14
+#: data/templates/default/tagrename.tpl.php:19
 #, fuzzy
 msgid "Required"
 msgstr "Обязательно"
 
-#: ../../../templates/editbookmark.tpl.php:45
+#: data/templates/default/editbookmark.tpl.php:58
 msgid "Add Note"
 msgstr "Добавить заметку"
 
-#: ../../../templates/editbookmark.tpl.php:48
+#: data/templates/default/editbookmark.tpl.php:61
 #, fuzzy
-msgid "You can use anchors to delimite attributes. for example: [publisher]blah[/publisher] "
-msgstr "Вы можете использовать \"анкоры\" чтобы разделать атрибуты, например: [publisher]blah[/publisher] "
+msgid ""
+"You can use anchors to delimite attributes. for example: [publisher]blah[/"
+"publisher] "
+msgstr ""
+"Вы можете использовать \"анкоры\" чтобы разделать атрибуты, например: "
+"[publisher]blah[/publisher] "
 
-#: ../../../templates/editbookmark.tpl.php:51
+#: data/templates/default/editbookmark.tpl.php:64
 #, fuzzy
 msgid "Suggested anchors: "
 msgstr "Предлагаемые анкоры: "
 
-#: ../../../templates/editbookmark.tpl.php:63
+#: data/templates/default/editbookmark.tpl.php:76
 msgid "Private Note"
 msgstr "Личная заметка"
 
-#: ../../../templates/editbookmark.tpl.php:65
+#: data/templates/default/editbookmark.tpl.php:78
 msgid "Just visible by you and your contacts."
 msgstr "Видимо только для Вас и Ваших контактов."
 
-#: ../../../templates/editbookmark.tpl.php:73
+#: data/templates/default/editbookmark.tpl.php:82
+#: data/templates/default/toolbar.inc.php:10 www/tags.php:45 www/tags.php:67
+msgid "Tags"
+msgstr "Тэги"
+
+#: data/templates/default/editbookmark.tpl.php:86
 msgid "Comma-separated"
 msgstr "Разделенный запятыми"
 
-#: ../../../templates/editbookmark.tpl.php:77
-#: ../../../templates/tag2tagadd.tpl.php:9
-msgid "Note: use \">\" to include one tag in another. e.g.: europe>france>paris"
-msgstr "Внимание: используйте \">\" чтобы включить один тэг в другой. например: европа>россия>москва"
+#: data/templates/default/editbookmark.tpl.php:90
+#: data/templates/default/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/default/editbookmark.tpl.php:94
+#: data/templates/default/tag2tagadd.tpl.php:8
 msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry"
-msgstr "Внимание: используйте \"=\" чтобы сделать два тэга синонимами. например: россия=рф"
+msgstr ""
+"Внимание: используйте \"=\" чтобы сделать два тэга синонимами. например: "
+"россия=рф"
 
-#: ../../../templates/editbookmark.tpl.php:84
-#: ../../../templates/importDelicious.tpl.php:15
-#: ../../../templates/importNetscape.tpl.php:16
+#: data/templates/default/editbookmark.tpl.php:97
+#: data/templates/default/importDelicious.tpl.php:15
+#: data/templates/default/importNetscape.tpl.php:16
 msgid "Privacy"
 msgstr "Конфиденциальность"
 
-#: ../../../templates/editbookmark.tpl.php:87
-#: ../../../templates/importDelicious.tpl.php:18
-#: ../../../templates/importNetscape.tpl.php:19
+#: data/templates/default/editbookmark.tpl.php:100
+#: data/templates/default/importDelicious.tpl.php:18
+#: data/templates/default/importNetscape.tpl.php:19
 msgid "Public"
 msgstr "Публичный"
 
-#: ../../../templates/editbookmark.tpl.php:88
+#: data/templates/default/editbookmark.tpl.php:101
 msgid "Shared with Watch List"
 msgstr "Shared with Watchlist"
 
-#: ../../../templates/editbookmark.tpl.php:89
-#: ../../../templates/importDelicious.tpl.php:20
-#: ../../../templates/importNetscape.tpl.php:21
+#: data/templates/default/editbookmark.tpl.php:102
+#: data/templates/default/importDelicious.tpl.php:20
+#: data/templates/default/importNetscape.tpl.php:21
 msgid "Private"
 msgstr "Личный"
 
-#: ../../../templates/editbookmark.tpl.php:102
+#: data/templates/default/editbookmark.tpl.php:115
 msgid "Delete Bookmark"
 msgstr "Удалить закладку"
 
-#: ../../../templates/editbookmark.tpl.php:107
+#: data/templates/default/editbookmark.tpl.php:120
 msgid "edit common description"
 msgstr "изменит описание"
 
-#: ../../../templates/editbookmark.tpl.php:134
-#, fuzzy
-msgid "Bookmarklet"
-msgstr "Закладочник"
-
-#: ../../../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 "Кликните на один из букмарклетов чтобы добавить кнопку, на которую Вы можете нажать в любой момент когда захотите  добавить страницу на которой находитесь в %s"
-
-#: ../../../templates/editbookmark.tpl.php:144
-#, fuzzy, 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 "Перетяните мышкой bookmarklets в закладки Вашего браузера и нажмите на него, в любой момент когда захотите добавить страницу на которой находитесь в %s"
-
-#: ../../../templates/editbookmark.tpl.php:157
-#: ../../../templates/editbookmark.tpl.php:162
-#, php-format
-msgid "Post to %s"
-msgstr "Добавить в %s"
-
-#: ../../../templates/editbookmark.tpl.php:158
-#: ../../../templates/editbookmark.tpl.php:163
-#, php-format
-msgid "Post to %s (Pop-up)"
-msgstr "Добавить в %s (pop-up)"
-
-#: ../../../templates/editbookmark.tpl.php:168
-#: ../../../templates/importDelicious.tpl.php:26
-#: ../../../templates/importNetscape.tpl.php:27
-#: ../../../templates/importStructure.tpl.php:16
+#: data/templates/default/editbookmark.tpl.php:212
+#: data/templates/default/importDelicious.tpl.php:26
+#: data/templates/default/importNetscape.tpl.php:27
+#: data/templates/default/importStructure.tpl.php:16
 msgid "Import"
 msgstr "Импорт"
 
-#: ../../../templates/editbookmark.tpl.php:170
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Import bookmarks from bookmark file"
 msgstr "Импортировать закладки из файла закладок"
 
-#: ../../../templates/editbookmark.tpl.php:170
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Internet Explorer, Mozilla Firefox and Netscape"
 msgstr "Internet Explorer, Mozilla Firefox и Netscape"
 
-#: ../../../templates/editbookmark.tpl.php:171
+#: data/templates/default/editbookmark.tpl.php:215
 msgid "Import bookmarks from del.icio.us"
 msgstr "Импортировать закладки из del.icio.us"
 
-#: ../../../templates/editprofile.tpl.php:10
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:11
+msgid "SSL client certificates"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:17
+msgid "Serial"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:45
+#: data/templates/default/profile.tpl.php:17
+msgid "Name"
+msgstr "Имя"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:19
+#: data/templates/default/profile.tpl.php:11
+msgid "Email"
+msgstr "Email"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:20
+msgid "Issuer"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:30
+#, fuzzy
+msgid "delete"
+msgstr "Удалить"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:43
+msgid "No certificates registered"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:48
+msgid "Your current certificate is already registered with your account."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:53
+msgid "Register current certificate to automatically login."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:59
+msgid "Your browser does not provide a certificate."
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:8
 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/default/editprofile.tpl.php:12
+#: data/templates/default/login.tpl.php:21
+#: data/templates/default/password.tpl.php:10
+#: data/templates/default/profile.tpl.php:6
+#: data/templates/default/register.tpl.php:16
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: ../../../templates/editprofile.tpl.php:19
+#: data/templates/default/editprofile.tpl.php:17
 msgid "New Password"
 msgstr "Новый пароль"
 
-#: ../../../templates/editprofile.tpl.php:24
+#: data/templates/default/editprofile.tpl.php:22
 msgid "Confirm Password"
 msgstr "Подтвердите пароль"
 
-#: ../../../templates/editprofile.tpl.php:29
-#: ../../../templates/password.tpl.php:14
-#: ../../../templates/register.tpl.php:26
+#: data/templates/default/editprofile.tpl.php:27
+#: data/templates/default/password.tpl.php:14
+#: data/templates/default/register.tpl.php:26
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ../../../templates/editprofile.tpl.php:35
+#: data/templates/default/editprofile.tpl.php:32
+#, fuzzy
+msgid "Private RSS Feed"
+msgstr "Личная заметка"
+
+#: data/templates/default/editprofile.tpl.php:34
+msgid "Enable"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:36
+#, fuzzy
+msgid "Generate New Key"
+msgstr "Сгенерировать пароль"
+
+#: data/templates/default/editprofile.tpl.php:41
 msgid "Personal Details"
 msgstr "Личные данные"
 
-#: ../../../templates/editprofile.tpl.php:39
-#: ../../../templates/profile.tpl.php:17
-msgid "Name"
-msgstr "Имя"
-
-#: ../../../templates/editprofile.tpl.php:43
-#: ../../../templates/profile.tpl.php:23
+#: data/templates/default/editprofile.tpl.php:49
+#: data/templates/default/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/default/editprofile.tpl.php:58 www/edit.php:113
+msgid "Save Changes"
+msgstr "Сохранить изменения"
+
+#: data/templates/default/editprofile.tpl.php:63
+#: data/templates/default/sidebar.block.tagactions.php:17
+#: data/templates/default/sidebar.block.watchstatus.php:18
 msgid "Actions"
 msgstr "Действия"
 
-#: ../../../templates/editprofile.tpl.php:58
+#: data/templates/default/editprofile.tpl.php:66
 msgid "Export bookmarks"
 msgstr "Экспорт закладок"
 
-#: ../../../templates/editprofile.tpl.php:60
+#: data/templates/default/editprofile.tpl.php:68
 msgid "HTML file (for browsers)"
 msgstr "HTML файл (для браузеров)"
 
-#: ../../../templates/editprofile.tpl.php:61
+#: data/templates/default/editprofile.tpl.php:69
 msgid "XML file (like del.icio.us)"
 msgstr "XML файл (как del.icio.us)"
 
-#: ../../../templates/editprofile.tpl.php:62
+#: data/templates/default/editprofile.tpl.php:70
 #, fuzzy
 msgid "CSV file (for spreadsheet tools)"
 msgstr "CSV файл (для табличных процессоров)"
 
-#: ../../../templates/error.404.tpl.php:5
+#: data/templates/default/error.404.tpl.php:5
 msgid "Not Found"
 msgstr "Не найдено"
 
-#: ../../../templates/error.404.tpl.php:6
+#: data/templates/default/error.404.tpl.php:6
 msgid "The requested URL was not found on this server"
 msgstr "Запрашиваемый адрес не найден на сервере"
 
-#: ../../../templates/error.500.tpl.php:5
+#: data/templates/default/error.500.tpl.php:5
 msgid "General server error"
 msgstr "Ошибка сервера"
 
-#: ../../../templates/error.500.tpl.php:6
+#: data/templates/default/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/default/importDelicious.tpl.php:19
+#: data/templates/default/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/default/importDelicious.tpl.php:31
+#: data/templates/default/importNetscape.tpl.php:32
+#: data/templates/default/importStructure.tpl.php:21
 msgid "Instructions"
 msgstr "Инструкции"
 
-#: ../../../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 "Войдите на <a href=\"http://del.icio.us/api/posts/all\">страницу экспорта на del.icio.us</a>"
+#: data/templates/default/importDelicious.tpl.php:33
+#, fuzzy
+msgid ""
+"Log in to the <a href=\"https://api.del.icio.us/v1/posts/all\">export page "
+"at del.icio.us</a>"
+msgstr ""
+"Войдите на <a href=\"http://del.icio.us/api/posts/all\">страницу экспорта на "
+"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 "Сохраните полученный<abbr title=\"Extensible Markup Language\">XML</abbr> файл на Ваш компьютер"
+#: data/templates/default/importDelicious.tpl.php:34
+msgid ""
+"Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> "
+"file to your computer"
+msgstr ""
+"Сохраните полученный<abbr title=\"Extensible Markup Language\">XML</abbr> "
+"файл на Ваш компьютер"
 
-#: ../../../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 "Yf;vbnt <kbd>Просмотр...</kbd> чтобы выбрать файл на Вашем компьютере. Максимальный размер файла -  1MB"
+#: data/templates/default/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 ""
+"Yf;vbnt <kbd>Просмотр...</kbd> чтобы выбрать файл на Вашем компьютере. "
+"Максимальный размер файла -  1MB"
 
-#: ../../../templates/importDelicious.tpl.php:36
-#: ../../../templates/importNetscape.tpl.php:43
+#: data/templates/default/importDelicious.tpl.php:36
+#: data/templates/default/importNetscape.tpl.php:43
 msgid "Select the default privacy setting for your imported bookmarks"
-msgstr "Выберете уровень доступа, который будет применяться по умолчанию к импортируемый закладкам"
+msgstr ""
+"Выберете уровень доступа, который будет применяться по умолчанию к "
+"импортируемый закладкам"
 
-#: ../../../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 "Нажмите <kbd>Импорт</kbd> для начала импорта закладок; это может занять минуту"
+#: data/templates/default/importDelicious.tpl.php:37
+#: data/templates/default/importNetscape.tpl.php:44
+msgid ""
+"Click <kbd>Import</kbd> to start importing the bookmarks; it may take a "
+"minute"
+msgstr ""
+"Нажмите <kbd>Импорт</kbd> для начала импорта закладок; это может занять "
+"минуту"
 
-#: ../../../templates/importNetscape.tpl.php:35
+#: data/templates/default/importNetscape.tpl.php:35
 msgid "Export your bookmarks from your browser to a file"
 msgstr "Экспортировать Ваши закладки из браузера в файл"
 
-#: ../../../templates/importNetscape.tpl.php:37
-msgid "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
-msgstr "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
+#: data/templates/default/importNetscape.tpl.php:37
+msgid ""
+"Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
+msgstr ""
+"Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
 
-#: ../../../templates/importNetscape.tpl.php:38
-msgid "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; Export..."
-msgstr "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; Export..."
+#: data/templates/default/importNetscape.tpl.php:38
+msgid ""
+"Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
+"Export..."
+msgstr ""
+"Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
+"Export..."
 
-#: ../../../templates/importNetscape.tpl.php:39
-msgid "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
-msgstr "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
+#: data/templates/default/importNetscape.tpl.php:39
+msgid ""
+"Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
+msgstr ""
+"Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
 
-#: ../../../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 "Нажмите <kbd>Просмотр...</kbd> чтобы выбрать сохраненный файл закладок на Вашем компьютере. Максимальный размер файла -  1MB"
+#: data/templates/default/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 ""
+"Нажмите <kbd>Просмотр...</kbd> чтобы выбрать сохраненный файл закладок на "
+"Вашем компьютере. Максимальный размер файла -  1MB"
 
-#: ../../../templates/importStructure.tpl.php:24
+#: data/templates/default/importStructure.tpl.php:24
 #, fuzzy
 msgid "Create your structure into a simple text file and following this model:"
 msgstr "Создайте структуру в простом текстовом файле используя эту модель:"
 
-#: ../../../templates/importStructure.tpl.php:35
+#: data/templates/default/importStructure.tpl.php:35
 #, fuzzy
-msgid "Then import the file. The tags and their relations will be added to your profile."
-msgstr "Затем импортируйте файл. Тэги и их отношения будут добавлены в Ваш профиль."
+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/default/login.tpl.php:13
+msgid "Please activate cookies"
+msgstr ""
+
+#: data/templates/default/login.tpl.php:26
+#: data/templates/default/register.tpl.php:21
 msgid "Password"
 msgstr "Пароль"
 
-#: ../../../templates/login.tpl.php:22
+#: data/templates/default/login.tpl.php:28
 msgid "Don't ask for my password for 2 weeks"
 msgstr "Не запрашивать мой пароль 2 недели"
 
-#: ../../../templates/login.tpl.php:30
+#: data/templates/default/login.tpl.php:32
+#: data/templates/default/toolbar.inc.php:29 www/login.php:57
+msgid "Log In"
+msgstr "Вход"
+
+#: data/templates/default/login.tpl.php:36
 msgid "Forgotten your password?"
 msgstr "Забыли пароль?"
 
-#: ../../../templates/password.tpl.php:5
+#: data/templates/default/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 "Если Вы забыли пароль, %s может создать новый. Введите имя пользователя и адрес e-mail Вашего аккаунта в форме ниже и мы вышлем Вам новый пароль."
+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 ""
+"Если Вы забыли пароль, %s может создать новый. Введите имя пользователя и "
+"адрес e-mail Вашего аккаунта в форме ниже и мы вышлем Вам новый пароль."
 
-#: ../../../templates/password.tpl.php:19
+#: data/templates/default/password.tpl.php:19
 msgid "Generate Password"
 msgstr "Сгенерировать пароль"
 
-#: ../../../templates/profile.tpl.php:11
-msgid "Email"
-msgstr "Email"
-
-#: ../../../templates/profile.tpl.php:28
+#: data/templates/default/profile.tpl.php:28
 msgid "Member Since"
 msgstr "Участник с"
 
-#: ../../../templates/profile.tpl.php:40
-#: ../../../templates/sidebar.block.watchlist.php:30
+#: data/templates/default/profile.tpl.php:40
+#: data/templates/default/sidebar.block.watchlist.php:30
 msgid "Watching"
 msgstr "Watching"
 
-#: ../../../templates/profile.tpl.php:55
-#: ../../../templates/sidebar.block.watchlist.php:52
+#: data/templates/default/profile.tpl.php:55
+#: data/templates/default/sidebar.block.watchlist.php:52
 msgid "Watched By"
 msgstr "Наблюдается"
 
-#: ../../../templates/profile.tpl.php:68
-#: ../../../templates/toolbar.inc.php:9
+#: data/templates/default/profile.tpl.php:68
+#: data/templates/default/toolbar.inc.php:9
 msgid "Bookmarks"
 msgstr "Закладки"
 
-#: ../../../templates/profile.tpl.php:69
+#: data/templates/default/profile.tpl.php:69
 msgid "Go to bookmarks"
 msgstr "Перейти к закладкам"
 
-#: ../../../templates/register.tpl.php:11
+#: data/templates/default/register.tpl.php:11
 #, fuzzy, php-format
-msgid "Sign up here to create a free %s account. All the information requested below is required"
-msgstr "Зарегистрируйтесь здесь, чтобы создать бесплатный  %s аккаунт. Вся поля обязательны для заполнения"
+msgid ""
+"Sign up here to create a free %s account. All the information requested "
+"below is required"
+msgstr ""
+"Зарегистрируйтесь здесь, чтобы создать бесплатный  %s аккаунт. Вся поля "
+"обязательны для заполнения"
 
-#: ../../../templates/register.tpl.php:18
-msgid " at least 5 characters, alphanumeric (no spaces, no dots or other special ones)"
-msgstr " как минимум 5 символов, буквенно-цифровой (без пробелов, без точек или других спецсимволов)"
+#: data/templates/default/register.tpl.php:18
+msgid ""
+" at least 5 characters, alphanumeric (no spaces, no dots or other special "
+"ones)"
+msgstr ""
+" как минимум 5 символов, буквенно-цифровой (без пробелов, без точек или "
+"других спецсимволов)"
 
-#: ../../../templates/register.tpl.php:28
+#: data/templates/default/register.tpl.php:28
 msgid " to send you your password if you forget it"
 msgstr " чтобы выслать Вам Вамш пароль, если Вы его забудете"
 
-#: ../../../templates/register.tpl.php:33
+#: data/templates/default/register.tpl.php:33
 #, fuzzy
 msgid "Antispam question"
 msgstr "Антиспам вопрос"
 
-#: ../../../templates/sidebar.block.linked.php:51
+#: data/templates/default/register.tpl.php:41
+#: data/templates/default/toolbar.inc.php:31 www/register.php:99
+msgid "Register"
+msgstr "Регистрация"
+
+#: data/templates/default/search.menu.php:27
+msgid "Search..."
+msgstr "Поиск..."
+
+#: data/templates/default/search.menu.php:28
+msgid "in"
+msgstr "в"
+
+#: data/templates/default/search.menu.php:34
+msgid "this user's bookmarks"
+msgstr "закладки этого пользователя"
+
+#: data/templates/default/search.menu.php:39
+msgid "my bookmarks"
+msgstr "мои закладки"
+
+#: data/templates/default/search.menu.php:40
+msgid "my watchlist"
+msgstr "мой лист наблюдения"
+
+#: data/templates/default/search.menu.php:44
+msgid "all bookmarks"
+msgstr "все закладки"
+
+#: data/templates/default/search.menu.php:54
+msgid "Search"
+msgstr "Поиск"
+
+#: data/templates/default/sidebar.block.linked.php:23
 #, fuzzy
 msgid "Linked Tags"
 msgstr "Связанные тэги"
 
-#: ../../../templates/sidebar.block.linked.php:62
-#: ../../../templates/sidebar.block.menu.php:46
+#: data/templates/default/sidebar.block.linked.php:28
+#: data/templates/default/sidebar.block.menu.php:46
 msgid "Add new link"
 msgstr "Добавить новую ссылку"
 
-#: ../../../templates/sidebar.block.linked.php:63
-#: ../../../templates/sidebar.block.menu.php:47
+#: data/templates/default/sidebar.block.linked.php:29
+#: data/templates/default/sidebar.block.menu.php:47
 msgid "Delete link"
 msgstr "Удалить ссылку"
 
-#: ../../../templates/sidebar.block.menu.php:35
+#: data/templates/default/sidebar.block.menu.php:35
 #, php-format
 msgid "Tags included into the tag '%s'"
 msgstr "Тэги включенные в тэг '%s'"
 
-#: ../../../templates/sidebar.block.menu.php:35
+#: data/templates/default/sidebar.block.menu.php:35
 msgid "Menu Tags"
 msgstr "Меню тэгов"
 
-#: ../../../templates/sidebar.block.menu.php:68
+#: data/templates/default/sidebar.block.menu.php:68
 msgid "See all your tags"
 msgstr "Просмотреть все свои тэги"
 
-#: ../../../templates/sidebar.block.menu.php:68
+#: data/templates/default/sidebar.block.menu.php:68
 msgid "all your tags"
 msgstr "все Ваши тэги"
 
-#: ../../../templates/sidebar.block.menu.php:70
+#: data/templates/default/sidebar.block.menu.php:70
 msgid "See all tags from this user"
 msgstr "Просмотреть все тэги этого пользователя"
 
-#: ../../../templates/sidebar.block.menu.php:70
+#: data/templates/default/sidebar.block.menu.php:70
 msgid "all tags from this user"
 msgstr "все тэги этого пользователя"
 
-#: ../../../templates/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.menu.php:74
 msgid "See popular tags"
 msgstr "Просмотреть популярные тэги"
 
-#: ../../../templates/sidebar.block.menu2.php:25
+#: data/templates/default/sidebar.block.menu2.php:21
 #, fuzzy
 msgid "Featured Menu Tags"
 msgstr "Рекомендуемые Тэги"
 
-#: ../../../templates/sidebar.block.menu2.php:29
+#: data/templates/default/sidebar.block.menu2.php:25
 #, fuzzy
 msgid "This menu is composed of keywords (tags) organized by admins."
 msgstr "Это меню состоит из ключевых слов (тэгов) управляемых администраицей."
 
-#: ../../../templates/sidebar.block.recent.php:18
+#: data/templates/default/sidebar.block.recent.php:18
 msgid "Recent Tags"
 msgstr "Последние Тэги"
 
-#: ../../../templates/sidebar.block.related.php:26
+#: data/templates/default/sidebar.block.related.php:26
 msgid "Related Tags"
 msgstr "Связанные Тэги"
 
-#: ../../../templates/sidebar.block.search.php:15
+#: data/templates/default/sidebar.block.search.php:28
 #, fuzzy
 msgid "Last Searches"
 msgstr "Что искали недавно"
 
-#: ../../../templates/sidebar.block.search.php:24
+#: data/templates/default/sidebar.block.search.php:40
 msgid "Number of bookmarks for this query"
 msgstr "Количество закладок для этого запроса"
 
-#: ../../../templates/sidebar.block.tagactions.php:28
+#: data/templates/default/sidebar.block.tagactions.php:9 www/tagrename.php:72
+msgid "Rename Tag"
+msgid_plural "Rename Tags"
+msgstr[0] "Переименовать тэг"
+msgstr[1] "Переименовать тэги"
+
+#: data/templates/default/sidebar.block.tagactions.php:22 www/tagdelete.php:54
+msgid "Delete Tag"
+msgstr "Удалить тэг"
+
+#: data/templates/default/sidebar.block.tagactions.php:24 www/tagedit.php:61
+msgid "Edit Tag Description"
+msgstr "Изменить описание тэга"
+
+#: data/templates/default/sidebar.block.tagactions.php:26
+#: www/tagcommondescriptionedit.php:76
+msgid "Edit Tag Common Description"
+msgstr "Edit Tag common description"
+
+#: data/templates/default/sidebar.block.tagactions.php:28
 msgid "Create a link to another tag"
 msgstr "Создать ссылку на другой тэг"
 
-#: ../../../templates/sidebar.block.users.php:14
+#: data/templates/default/sidebar.block.users.php:14
 msgid "New Users"
 msgstr "Новые Пользователи"
 
-#: ../../../templates/sidebar.block.users.php:23
-#: ../../../templates/users.tpl.php:17
+#: data/templates/default/sidebar.block.users.php:23
+#: data/templates/default/users.tpl.php:24
 msgid "bookmarks"
 msgstr "закладки"
 
-#: ../../../templates/sidebar.block.users.php:30
+#: data/templates/default/sidebar.block.users.php:30
 msgid "See all users"
 msgstr "Просмотреть всех пользователей"
 
-#: ../../../templates/sidebar.block.users.php:30
+#: data/templates/default/sidebar.block.users.php:30
 msgid "All users"
 msgstr "Все пользователи"
 
-#: ../../../templates/sidebar.block.watchlist.php:19
+#: data/templates/default/sidebar.block.watchlist.php:19
 #, fuzzy
 msgid "Close contacts are mutual contacts"
 msgstr "Близкие контакты взаимных контактов"
 
-#: ../../../templates/sidebar.block.watchlist.php:19
+#: data/templates/default/sidebar.block.watchlist.php:19
 msgid "Close contacts"
 msgstr "Близкие контакты"
 
-#: ../../../templates/sidebar.block.watchlist.php:36
+#: data/templates/default/sidebar.block.watchlist.php:36
 msgid "Add a contact..."
 msgstr "Добавить контакт..."
 
-#: ../../../templates/sidebar.block.watchlist.php:36
+#: data/templates/default/sidebar.block.watchlist.php:36
 msgid "Type a username to add it to your contacts."
 msgstr "Введите имя пользователя чтобы добавить его в контакты."
 
-#: ../../../templates/sidebar.block.watchlist.php:44
+#: data/templates/default/sidebar.block.watchlist.php:44
 msgid "Remove this contact"
 msgstr "Удалить этот контакт"
 
-#: ../../../templates/sidebar.block.watchstatus.php:11
+#: data/templates/default/sidebar.block.watchstatus.php:11
 msgid "Remove from Watchlist"
 msgstr "Удалить из списка наблюдения"
 
-#: ../../../templates/sidebar.block.watchstatus.php:13
+#: data/templates/default/sidebar.block.watchstatus.php:13
 msgid "Add to Watchlist"
 msgstr "Добавить в список наблюдения"
 
-#: ../../../templates/sidebar.linkedtags.inc.php:18
+#: data/templates/default/sidebar.linkedtags.inc.php:18
 msgid "Edit link"
 msgstr "Изменить ссылку"
 
-#: ../../../templates/sidebar.linkedtags.inc.php:47
+#: data/templates/default/sidebar.linkedtags.inc.php:47
 msgid "Synonyms:"
 msgstr "Синонимы:"
 
-#: ../../../templates/tag2tagadd.tpl.php:12
+#: data/templates/default/tag2tagadd.tpl.php:12
 msgid "Create new link:"
 msgstr "Создать новую ссылку:"
 
-#: ../../../templates/tag2tagadd.tpl.php:19
+#: data/templates/default/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 "Внимание: включение тэга в '%s' тэг (например: %s>страны) выведет тэг в списке меню"
+msgid ""
+"Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into "
+"the menu box"
+msgstr ""
+"Внимание: включение тэга в '%s' тэг (например: %s>страны) выведет тэг в "
+"списке меню"
 
-#: ../../../templates/tag2tagadd.tpl.php:23
-#: ../../../templates/tag2tagedit.tpl.php:37
+#: data/templates/default/tag2tagadd.tpl.php:23
+#: data/templates/default/tag2tagedit.tpl.php:37
 msgid "Create"
 msgstr "Создать"
 
-#: ../../../templates/tag2tagadd.tpl.php:35
-#: ../../../templates/tag2tagdelete.tpl.php:27
-#: ../../../templates/tag2tagedit.tpl.php:51
+#: data/templates/default/tag2tagadd.tpl.php:35
+#: data/templates/default/tag2tagdelete.tpl.php:27
+#: data/templates/default/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/default/tag2tagadd.tpl.php:53
+#: data/templates/default/tag2tagdelete.tpl.php:45
+#: data/templates/default/tag2tagedit.tpl.php:69
 msgid "No links"
 msgstr "Ссылок нет"
 
-#: ../../../templates/tag2tagedit.tpl.php:6
+#: data/templates/default/tag2tagdelete.tpl.php:15
+#: data/templates/default/tag2tagedit.tpl.php:16
+#: data/templates/default/tagdelete.tpl.php:8 www/jsScuttle.php:24
+msgid "Yes"
+msgstr "Да"
+
+#: data/templates/default/tag2tagdelete.tpl.php:16
+#: data/templates/default/tag2tagedit.tpl.php:17
+#: data/templates/default/tagdelete.tpl.php:9 www/jsScuttle.php:24
+msgid "No"
+msgstr "Нет"
+
+#: data/templates/default/tag2tagedit.tpl.php:6
 msgid "Delete the link"
 msgstr "Удалить ссылку"
 
-#: ../../../templates/tag2tagedit.tpl.php:29
+#: data/templates/default/tag2tagedit.tpl.php:29
 msgid "Create new link"
 msgstr "Создать новую ссылку"
 
-#: ../../../templates/tagrename.tpl.php:12
+#: data/templates/default/tagrename.tpl.php:12
 msgid "Old"
 msgstr "Старый"
 
-#: ../../../templates/tagrename.tpl.php:17
+#: data/templates/default/tagrename.tpl.php:17
 msgid "New"
 msgstr "Новый"
 
-#: ../../../templates/tagrename.tpl.php:24
+#: data/templates/default/tagrename.tpl.php:24
 msgid "Rename"
 msgstr "Переименовать"
 
-#: ../../../templates/tags.tpl.php:11
-#: ../../../templates/users.tpl.php:9
+#: data/templates/default/tags.tpl.php:11
+#: data/templates/default/users.tpl.php:9
 msgid "Alphabet"
 msgstr "Алфавиту"
 
-#: ../../../templates/tags.tpl.php:12
-#: ../../../templates/users.tpl.php:10
+#: data/templates/default/tags.tpl.php:12
+#: data/templates/default/users.tpl.php:10
 msgid "Popularity"
 msgstr "Популярности"
 
-#: ../../../templates/toolbar.inc.php:8
-#: ../../../templates/toolbar.inc.php:26
+#: data/templates/default/toolbar.inc.php:8
+#: data/templates/default/toolbar.inc.php:26
 msgid "Home"
 msgstr "Домой"
 
-#: ../../../templates/toolbar.inc.php:14
+#: data/templates/default/toolbar.inc.php:11 www/watchlist.php:106
+msgid "Watchlist"
+msgstr "Список наблюдения"
+
+#: data/templates/default/toolbar.inc.php:12 www/profile.php:79
+msgid "Profile"
+msgstr "Профиль"
+
+#: data/templates/default/toolbar.inc.php:13 www/bookmarks.php:215
+msgid "Add a Bookmark"
+msgstr "Добавить закладку"
+
+#: data/templates/default/toolbar.inc.php:14
 msgid "Log Out"
 msgstr "Выйти"
 
-#: ../../../templates/toolbar.inc.php:17
+#: data/templates/default/toolbar.inc.php:17
 msgid "Admin"
 msgstr "Админ"
 
-#: ../../../templates/top.inc.php:51
-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."
+#: data/templates/default/top.inc.php:57
+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 ""
 
-#: ../../../templates/users.tpl.php:17
+#: data/templates/default/users.tpl.php:20
 msgid "profile"
 msgstr "Профиль"
 
-#: ../../../templates/users.tpl.php:17
+#: data/templates/default/users.tpl.php:21
 msgid "created in"
 msgstr "создано в"
 
+#: www/admin.php:32
+msgid "Manage users"
+msgstr "Управление пользователями"
+
+#: www/admin.php:69
+#, php-format
+msgid "%s and all his bookmarks and tags were deleted."
+msgstr "%s и всего закладки и тэги удалены."
+
+#: www/admin.php:76
+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:50
+msgid "All Tags"
+msgstr "Все тэги"
+
+#: www/alltags.php:56 www/bookmarks.php:99 www/populartags.php:52
+#: www/profile.php:55 www/rss.php:100 www/search.php:111 www/watch.php:45
+#: www/watchlist.php:61
+#, php-format
+msgid "User with username %s was not found"
+msgstr "Пользователь с именем %s не найден"
+
+#: 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 "Доступ запрещен."
+
+#: 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:114 www/tags.php:47
+msgid "Remove the tag from the selection"
+msgstr "Remove the tag from the selection"
+
+#: www/bookmarks.php:134 www/edit.php:65
+msgid "Your bookmark must have a title and an address"
+msgstr "Закладка должна иметь название и адрес"
+
+#: www/bookmarks.php:139
+msgid "This bookmark URL may not be added"
+msgstr ""
+
+#: www/bookmarks.php:158 www/edit.php:83 www/edit.php:86
+msgid "Bookmark saved"
+msgstr "Закладка сохранена"
+
+#: www/bookmarks.php:158
+msgid "(Come back to previous page.)"
+msgstr "(Вернуться на предыдущую страницу.)"
+
+#: www/bookmarks.php:165 www/import.php:106 www/importNetscape.php:108
+msgid ""
+"There was an error saving your bookmark. Please try again or contact the "
+"administrator."
+msgstr ""
+"Произошла ошибка при сохранении закладки. Попробуйте еще раз или свяжитесь с "
+"администрацией."
+
+#: www/bookmarks.php:222
+msgid "Add Bookmark"
+msgstr "Добавить закладку"
+
+#: www/bookmarks.php:225
+msgid "You must be logged in before you can add bookmarks."
+msgstr "Вы должны войти в систему, прежде чем добавлять закладки."
+
+#: www/bookmarks.php:270
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: www/bookmarks.php:283
+#, php-format
+msgid "%s: %s (+private %s)"
+msgstr ""
+
+#: www/bookmarks.php:305 www/bookmarks.php:306
+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 "Закладка # %s не найдена"
+
+#: 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 "История для %s"
+
+#: www/history.php:84
+msgid "Address was not found"
+msgstr "Адрес не найден"
+
+#: www/import.php:47
+msgid "Could not open XML input"
+msgstr "Невозможно открыть XML"
+
+#: www/import.php:51
+#, php-format
+msgid "XML error: %s at line %d"
+msgstr "Ошибка XML: %s в строке %d"
+
+#: www/import.php:60
+msgid "Import Bookmarks from del.icio.us"
+msgstr "Импортировать закладки из del.icio.us"
+
+#: www/import.php:93
+msgid "You have already submitted this bookmark."
+msgstr "Вы уже добавили эту закладку."
+
+#: www/import.php:104
+msgid "Bookmark imported."
+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/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:46
+#, php-format
+msgid "%s: Recent bookmarks"
+msgstr "%s: Недавно добавленные закладки"
+
+#: www/index.php:58
+#, fuzzy, php-format
+msgid "%s: Recent bookmarks (+private %s)"
+msgstr "%s: Недавно добавленные закладки"
+
+#: www/index.php:96
+msgid "Store, share and tag your favourite links"
+msgstr "Сохраняйте, делитесь и отмечайте Ваши любимые ссылки"
+
+#: www/index.php:97
+msgid "All Bookmarks"
+msgstr "Все закладки"
+
+#: www/jsScuttle.php:71
+msgid "Available"
+msgstr "Доступно"
+
+#: www/jsScuttle.php:74
+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 "Вы должны ввести <abbr title=\"electronic mail\">e-mail</abbr>."
+
+#: 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 ""
+"Ничего не найдено для этого имени пользователя и адреса <abbr title="
+"\"electronic mail\">e-mail</abbr>."
+
+#: 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 "%s просмотр информации об аккаунте"
+
+#: www/password.php:68
+#, php-format
+msgid "New password generated and sent to %s"
+msgstr "Новый пароль отправлен по адресу %s"
+
+#: www/password.php:75
+msgid "Forgotten Password"
+msgstr "Забытый пароль"
+
+#: www/profile.php:63 www/watchlist.php:119
+msgid "Username was not specified"
+msgstr "Имя пользователя не введено"
+
+#: www/profile.php:70
+msgid "My Profile"
+msgstr "Мой профиль"
+
+#: www/profile.php:110
+msgid "Invalid Token"
+msgstr "Неверный символ"
+
+#: www/profile.php:115
+msgid "Password and confirmation do not match."
+msgstr "Пароль и подтверждение пароля не совпадают."
+
+#: www/profile.php:119
+msgid "Password must be at least 6 characters long."
+msgstr "Пароль должен быть минимум 6 символов длиной."
+
+#: www/profile.php:123
+msgid "E-mail address is not valid."
+msgstr "Некорректный адрес E-mail."
+
+#: www/profile.php:127
+msgid "An error occurred while saving your changes."
+msgstr "Ошибка при сохранении изменений."
+
+#: www/profile.php:129
+msgid "Changes saved."
+msgstr "Изменения сохранены."
+
+#: www/profile.php:148
+msgid "You do not have a valid SSL client certificate"
+msgstr ""
+
+#: www/profile.php:150
+msgid "This certificate is already registered"
+msgstr ""
+
+#: www/profile.php:152
+msgid "Failed to register SSL client certificate."
+msgstr ""
+
+#: www/profile.php:154
+msgid "SSL client certificate registered."
+msgstr ""
+
+#: www/profile.php:163
+msgid "Certificate not found."
+msgstr ""
+
+#: www/profile.php:165
+msgid "The certificate does not belong to you."
+msgstr ""
+
+#: www/profile.php:167
+#, fuzzy
+msgid "Failed to delete SSL client certificate."
+msgstr "Ошибка удаления тэга"
+
+#: www/profile.php:169
+msgid "SSL client certificate deleted."
+msgstr ""
+
+#: www/register.php:52
+msgid "You <em>must</em> enter a username, password and e-mail address."
+msgstr "Вы <em>должны</em> ввести имя пользователя, пароль и адрес e-mail."
+
+#: www/register.php:56
+msgid "This username has been reserved, please make another choice."
+msgstr "Это имя пользователя занято, пожалуйста выберете другое."
+
+#: www/register.php:60
+msgid "This username already exists, please make another choice."
+msgstr "Это имя пользоватея уже существует, пожалуйста выберете другое."
+
+#: www/register.php:64
+msgid ""
+"This username is not valid (too short, too long, forbidden characters...), "
+"please make another choice."
+msgstr ""
+"Некорректное имя пользователя (слишком короткое, слишком длинное или "
+"запрещенные символы...), пожалуйста выберете другое."
+
+#: www/register.php:68
+msgid "E-mail address is not valid. Please try again."
+msgstr "Некорректный адрес e-mail. Попробуйте еще раз."
+
+#: www/register.php:72
+msgid "Antispam answer is not valid. Please try again."
+msgstr "Ответ на вопрос спам-фильтра не верен. Попробуйте еще раз."
+
+#: www/register.php:90
+msgid "You have successfully registered. Enjoy!"
+msgstr "Поздравляем! Вы успешно зарегистрировались!"
+
+#: www/register.php:92
+msgid "Registration failed. Please try again."
+msgstr "Ошибка регистрации. Пожалуйста попробуйте еще раз."
+
+#: www/rss.php:90 www/rss.php:111
+#, php-format
+msgid "Failed to Autenticate User with username %s using private key"
+msgstr ""
+
+#: www/rss.php:128
+#, php-format
+msgid "Recent bookmarks posted to %s"
+msgstr "Последние закладки добавленные в %s"
+
+#: www/search.php:83 www/search.php:147
+msgid "Search Bookmarks"
+msgstr "Поиск закладок"
+
+#: www/search.php:89
+msgid "Search Results"
+msgstr "Результаты поиска"
+
+#: www/search.php:137
+msgid "Unsatisfied? You can also try our "
+msgstr "Неудовлетворены? Вы еще можете поробовать наш "
+
+#: www/tag2tagadd.php:54
+msgid "Tag link created"
+msgstr "Tag link created"
+
+#: www/tag2tagadd.php:57
+msgid "Failed to create the link"
+msgstr "Ошибка создания ссылки"
+
+#: www/tag2tagadd.php:69
+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 "Delete Link between Tags"
+
+#: www/tag2tagedit.php:55
+msgid "Edit Link Between Tags"
+msgstr "Edit Link between Tags"
+
+#: www/tagcommondescriptionedit.php:62
+msgid "Tag common description updated"
+msgstr "Tag common description updated"
+
+#: www/tagcommondescriptionedit.php:67
+msgid "Failed to update the tag common description"
+msgstr "Failed to update the tag common description"
+
+#: 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/tags.php:71
+#, php-format
+msgid "%s: tagged with \"%s\""
+msgstr ""
+
+#: www/tags.php:84
+#, php-format
+msgid "%s: tagged with \"%s\" (+private %s)"
+msgstr ""
+
+#: www/users.php:31
+msgid "Users"
+msgstr "Пользователи"
+
+#: www/watch.php:54
+msgid "User removed from your watchlist"
+msgstr "Пользователь удален из списка наблюдения"
+
+#: www/watch.php:56
+msgid "User added to your watchlist"
+msgstr "Пользователь добавлен в список наблюдения"
+
+#: www/watchlist.php:104
+msgid "My Watchlist"
+msgstr "Мой список наблюдения"
+
+#: www/api/httpauth.inc.php:30
+msgid "Use of the API calls requires authentication."
+msgstr ""
+
+#: www/gsearch/index.php:51
+#, fuzzy
+msgid "Come back to "
+msgstr "(Вернуться на предыдущую страницу.)"
+
+#: www/gsearch/index.php:56
+msgid "Admin tips: "
+msgstr ""
+
+#: www/gsearch/index.php:57
+msgid "To refresh manually Google Custom Search Engine, goes to: "
+msgstr ""
+
+#: www/gsearch/index.php:61
+msgid ""
+"If no result appears, check that all the urls are valid in the admin section."
+msgstr ""
diff --git a/data/locales/vn_VN/LC_MESSAGES/messages.mo b/data/locales/vn_VN/LC_MESSAGES/messages.mo
index 113c6d6..e0d5cfb 100644
--- a/data/locales/vn_VN/LC_MESSAGES/messages.mo
+++ b/data/locales/vn_VN/LC_MESSAGES/messages.mo
diff --git a/data/locales/vn_VN/LC_MESSAGES/messages.po b/data/locales/vn_VN/LC_MESSAGES/messages.po
index 9f43dd1..1279c9c 100644
--- a/data/locales/vn_VN/LC_MESSAGES/messages.po
+++ b/data/locales/vn_VN/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ 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: 2012-01-20 13:58+0100\n"
 "PO-Revision-Date: 2009-11-18 15:42+0100\n"
 "Last-Translator: Nguyen Thi Hong Thai <thaichv@yahoo.com>\n"
 "Language-Team: fr-FR <toony.sf@chezouam.net>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,993 +20,1135 @@ 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() bị gọi nhiều lần."
 
-#: src/SemanticScuttle/functions.php:175
+#: src/SemanticScuttle/functions.php:201
 msgid "SQL Error"
 msgstr "Lỗi cấu trúc truy vấn"
 
-#: src/SemanticScuttle/functions.php:181
+#: src/SemanticScuttle/functions.php:207
 msgid "Line"
 msgstr "mạng"
 
-#: src/SemanticScuttle/functions.php:181
-#: data/templates/importDelicious.tpl.php:8
-#: data/templates/importNetscape.tpl.php:9
-#: data/templates/importStructure.tpl.php:10
+#: src/SemanticScuttle/functions.php:207
+#: data/templates/default/importDelicious.tpl.php:8
+#: data/templates/default/importNetscape.tpl.php:9
+#: data/templates/default/importStructure.tpl.php:10
 msgid "File"
 msgstr "File"
 
-#: src/SemanticScuttle/functions.php:189
+#: src/SemanticScuttle/functions.php:215
 msgid "Information"
 msgstr "Thông tin"
 
-#: src/SemanticScuttle/functions.php:194
+#: src/SemanticScuttle/functions.php:220
 msgid "Critical Information"
 msgstr "Thông tin nguy cấp"
 
-#: src/SemanticScuttle/functions.php:199
+#: src/SemanticScuttle/functions.php:225
 msgid "An error occured"
 msgstr "Một lỗi đã xảy ra"
 
-#: src/SemanticScuttle/functions.php:202
+#: src/SemanticScuttle/functions.php:228
 msgid "General Error"
 msgstr "Lỗi thông thường"
 
-#: src/SemanticScuttle/functions.php:210
+#: src/SemanticScuttle/functions.php:236
 msgid "An critical error occured"
 msgstr "Một lỗi nguy cấp đã xảy ra"
 
-#: src/SemanticScuttle/functions.php:213
+#: src/SemanticScuttle/functions.php:239
 msgid "Critical Error"
 msgstr "Lỗi nguy cấp"
 
-#: src/SemanticScuttle/functions.php:222
+#: src/SemanticScuttle/functions.php:248
 msgid "DEBUG MODE"
 msgstr "Chế độ gỡ rối"
 
-#: data/templates/about.tpl.php:6
-msgid "<strong>Store</strong> all your favourite links in one place, accessible from anywhere."
-msgstr "<strong>Lưu trữ</strong>tất cả các đường links ở một nơi, có thể truy cập tại mọi nơi"
+#: data/templates/default/about.tpl.php:6
+msgid ""
+"<strong>Store</strong> all your favourite links in one place, accessible "
+"from anywhere."
+msgstr ""
+"<strong>Lưu trữ</strong>tất cả các đường links ở một nơi, có thể truy cập "
+"tại mọi nơi"
 
-#: 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>Chia xẻ</strong> các trang ghi nhớ của bạn với tất cả mọi ngườii, bạn có thể chia xẻ với bạn bè trong danh sách hoặc giữ cá nhân."
+#: data/templates/default/about.tpl.php:7
+msgid ""
+"<strong>Share</strong> your bookmarks with everyone, with friends on your "
+"watchlist or just keep them private."
+msgstr ""
+"<strong>Chia xẻ</strong> các trang ghi nhớ của bạn với tất cả mọi ngườii, "
+"bạn có thể chia xẻ với bạn bè trong danh sách hoặc giữ cá nhân."
 
-#: 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>Gắn từ khoá/strong> những trang ghi nhớ của bạn với  bất kì tên nào mà bạn muốn mà không phải làm việc với các thư mục"
+#: data/templates/default/about.tpl.php:8
+msgid ""
+"<strong>Tag</strong> your bookmarks with as many labels as you want, instead "
+"of wrestling with folders."
+msgstr ""
+"<strong>Gắn từ khoá/strong> những trang ghi nhớ của bạn với  bất kì tên nào "
+"mà bạn muốn mà không phải làm việc với các thư mục"
 
-#: data/templates/about.tpl.php:9
+#: data/templates/default/about.tpl.php:9
 msgid "Register now"
 msgstr "Đăng kí ngay bây giờ"
 
-#: data/templates/about.tpl.php:9
+#: data/templates/default/about.tpl.php:9
 #, php-format
 msgid " to start using %s!"
 msgstr "Bắt đầu sử dụng %s !"
 
-#: data/templates/about.tpl.php:12
+#: data/templates/default/about.tpl.php:12
 msgid "Geek Stuff"
 msgstr "Pour les Geeks"
 
-#: data/templates/about.tpl.php:14
+#: data/templates/default/about.tpl.php:14
 msgid "is licensed under the "
 msgstr "phân dưới quyền"
 
-#: data/templates/about.tpl.php:14
+#: data/templates/default/about.tpl.php:14
 msgid "you can freely host it on your own web server."
 msgstr "Bạn có thể thoải mái cài đặt nó trên Web server của bạn"
 
-#: data/templates/about.tpl.php:15
+#: data/templates/default/about.tpl.php:15
 #, php-format
-msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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 hỗ trợ phần lớn từ'<a href=\"http://www.delicious.com/help/api\"><abbr title=\"Ứng dụng lập trình giao diện\">API</abbr> del.icio.us</a>."
+msgid ""
+"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 hỗ trợ phần lớn từ'<a href=\"http://www.delicious.com/help/api\"><abbr "
+"title=\"Ứng dụng lập trình giao diện\">API</abbr> del.icio.us</a>."
 
-#: data/templates/about.tpl.php:24
+#: data/templates/default/about.tpl.php:24
 msgid "Tips"
 msgstr "Mẹo"
 
-#: data/templates/about.tpl.php:26
+#: data/templates/default/about.tpl.php:26
 msgid "Add search plugin into your browser:"
 msgstr "Thêm một nút tìm kiếm vào trong trình duyệt của bạn:"
 
-#: data/templates/about.tpl.php:27
-msgid "The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
-msgstr "Thẻ bí mật \"system:unfiled\" cho phép bạn tìm thấy những trang ghi nhớ không có thẻ."
+#: data/templates/default/about.tpl.php:27
+msgid ""
+"The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
+msgstr ""
+"Thẻ bí mật \"system:unfiled\" cho phép bạn tìm thấy những trang ghi nhớ "
+"không có thẻ."
 
-#: data/templates/about.tpl.php:28
-msgid "The secret tag \"system:imported\" allows you to find imported bookmarks."
-msgstr "Từ khoá bí mật \"system:imported\" cho phép bạn tìm thấy những trang ghi nhớ quan trọng."
+#: data/templates/default/about.tpl.php:28
+msgid ""
+"The secret tag \"system:imported\" allows you to find imported bookmarks."
+msgstr ""
+"Từ khoá bí mật \"system:imported\" cho phép bạn tìm thấy những trang ghi nhớ "
+"quan trọng."
 
-#: data/templates/admin.tpl.php:5
+#: data/templates/default/admin.tpl.php:5
 msgid "Users management"
 msgstr "Quản lí những người dùng"
 
-#: data/templates/admin.tpl.php:14
+#: data/templates/default/admin.tpl.php:14
 msgid "Public/Shared/Private"
 msgstr "Công cộng/Chia xẻ/Cá nhân"
 
-#: data/templates/admin.tpl.php:14
-#: data/templates/bookmarks.tpl.php:93
+#: data/templates/default/admin.tpl.php:14
+#: data/templates/default/bookmarks.tpl.php:115
 msgid "bookmark(s)"
 msgstr "Những trang ghi nhớ"
 
-#: 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/default/admin.tpl.php:19
+#: data/templates/default/tag2tagadd.tpl.php:21
+#: data/templates/default/tag2tagdelete.tpl.php:13
+#: data/templates/default/tag2tagedit.tpl.php:14
+#: data/templates/default/tag2tagedit.tpl.php:35
+#: data/templates/default/tagdelete.tpl.php:6 www/jsScuttle.php:24
 msgid "Are you sure?"
 msgstr "Bạn có chắc chắn không ?"
 
-#: data/templates/admin.tpl.php:19
-#: data/templates/bookmarks.tpl.php:251
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/bookmarks.tpl.php:305
 msgid "Delete"
 msgstr "Xoá"
 
-#: data/templates/admin.tpl.php:27
+#: data/templates/default/admin.tpl.php:27
 msgid "Other actions"
 msgstr "Những hành động khác"
 
-#: data/templates/admin.tpl.php:29
+#: data/templates/default/admin.tpl.php:29
 msgid "Check all URLs (May take some time)"
 msgstr "Kiểm tra tất cả đường link (Có thể mất ít thời gian)"
 
-#: data/templates/bookmarkcommondescriptionedit.tpl.php:16
-msgid "Collaborative description: these fields can be viewed and modified by every users"
-msgstr "Sự mô tả cộng tác : những trường này có thể được nhìn thấy và được sửa đổi bởi tất cả những người dùng."
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:16
+msgid ""
+"Collaborative description: these fields can be viewed and modified by every "
+"users"
+msgstr ""
+"Sự mô tả cộng tác : những trường này có thể được nhìn thấy và được sửa đổi "
+"bởi tất cả những người dùng."
 
-#: data/templates/bookmarkcommondescriptionedit.tpl.php:18
-#: data/templates/bookmarks.tpl.php:137
-#: data/templates/editbookmark.tpl.php:38
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:18
+#: data/templates/default/bookmarks.tpl.php:159
+#: data/templates/default/editbookmark.tpl.php:51
 msgid "Title"
 msgstr "Tiêu đề"
 
-#: 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
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:23
+#: data/templates/default/editbookmark.tpl.php:57
+#: data/templates/default/editprofile.tpl.php:53
+#: data/templates/default/profile.tpl.php:33
+#: data/templates/default/tagcommondescriptionedit.tpl.php:13
+#: data/templates/default/tagedit.tpl.php:12
 msgid "Description"
 msgstr "Mô tả"
 
-#: data/templates/bookmarkcommondescriptionedit.tpl.php:31
-#: data/templates/tagcommondescriptionedit.tpl.php:21
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:31
+#: data/templates/default/tagcommondescriptionedit.tpl.php:21
 msgid "Last modification:"
 msgstr "Những thay đổi cuối:"
 
-#: data/templates/bookmarkcommondescriptionedit.tpl.php:42
-#: data/templates/tagcommondescriptionedit.tpl.php:32
-#: data/templates/tagedit.tpl.php:18
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:43
+#: data/templates/default/tagcommondescriptionedit.tpl.php:33
+#: data/templates/default/tagedit.tpl.php:18
 msgid "Update"
 msgstr "Cập nhật"
 
-#: 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
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:44
+#: data/templates/default/editbookmark.tpl.php:111
+#: data/templates/default/tag2tagadd.tpl.php:24
+#: data/templates/default/tag2tagedit.tpl.php:38
+#: data/templates/default/tagcommondescriptionedit.tpl.php:34
+#: data/templates/default/tagedit.tpl.php:19
+#: data/templates/default/tagrename.tpl.php:25
 msgid "Cancel"
 msgstr "Huỷ bỏ"
 
-#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:24
+#: data/templates/default/bookmarklet.inc.php:1
+msgid "Bookmarklet"
+msgstr "Bookmarklet"
+
+#: data/templates/default/bookmarklet.inc.php:11
+#, 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 ""
+"Click theo một trong những bookmarklets để thêm một nút, bạn có thể click "
+"bất cứ khi nào bạn muốn thêm một trang cho trang hiện tại %s "
+
+#: data/templates/default/bookmarklet.inc.php:20
+#, 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 ""
+"Click theo một trong những bookmarklets vào trình duyệt bookmark của bạn và "
+"click nó bất cứ khi nào bạn muốn thêm một trang cho trang hiện tại %s "
+
+#: data/templates/default/bookmarklet.inc.php:67
+#: data/templates/default/bookmarklet.inc.php:100
+#, php-format
+msgid "Post to %s"
+msgstr "Thêm vào %s"
+
+#: data/templates/default/bookmarklet.inc.php:93
+#: data/templates/default/bookmarklet.inc.php:110
+#, php-format
+msgid "Post to %s (Pop-up)"
+msgstr "Thêm vào %s (Pop-up)"
+
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:24
 #, php-format
 msgid "Voting <span class=\"voting\">%d</span>"
 msgstr "Sự ủng hộ <span class=\"voting\">%d</span>"
 
-#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:32
-#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:35
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:32
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:35
 msgid "Vote for"
 msgstr "Ủng hộ cho"
 
-#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:43
-#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:46
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:43
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:46
 msgid "Vote against"
 msgstr "Không ủng hộ"
 
-#: data/templates/bookmarks.tpl.php:26
+#: data/templates/default/bookmarks.tpl.php:43
 msgid "Bookmarks on this page are managed by an admin user."
-msgstr "Những trang ghi nhớ trên trang này được quản lí bởi một người quản trị."
+msgstr ""
+"Những trang ghi nhớ trên trang này được quản lí bởi một người quản trị."
 
-#: data/templates/bookmarks.tpl.php:51
-#: data/templates/bookmarks.tpl.php:52
+#: data/templates/default/bookmarks.tpl.php:73
+#: data/templates/default/bookmarks.tpl.php:74
 msgid "Edit the common description of this tag"
 msgstr "Sửa mô tả chung của từ khoá này"
 
-#: data/templates/bookmarks.tpl.php:55
-#: data/templates/bookmarks.tpl.php:56
+#: data/templates/default/bookmarks.tpl.php:77
+#: data/templates/default/bookmarks.tpl.php:78
 msgid "Edit the common description of this bookmark"
 msgstr "Sửa mô tả chung của trang ghi nhớ này"
 
-#: data/templates/bookmarks.tpl.php:76
-#: data/templates/bookmarks.tpl.php:77
+#: data/templates/default/bookmarks.tpl.php:98
+#: data/templates/default/bookmarks.tpl.php:99
 msgid "Edit your personal description of this tag"
 msgstr "Sửa mô tả cá nhân của bạn của thẻ này"
 
-#: data/templates/bookmarks.tpl.php:93
-#: data/templates/tags.tpl.php:10
-#: data/templates/users.tpl.php:8
+#: data/templates/default/bookmarks.tpl.php:115
+#: data/templates/default/tags.tpl.php:10
+#: data/templates/default/users.tpl.php:8
 msgid "Sort by:"
 msgstr "Sắp xếp bởi :"
 
-#: data/templates/bookmarks.tpl.php:135
+#: data/templates/default/bookmarks.tpl.php:157
 msgid "Date"
 msgstr "Ngày"
 
-#: data/templates/bookmarks.tpl.php:140
+#: data/templates/default/bookmarks.tpl.php:162
 msgid "Voting"
 msgstr "Sự bầu cử"
 
-#: data/templates/bookmarks.tpl.php:149
+#: data/templates/default/bookmarks.tpl.php:171
 msgid "Bookmarks from other users for this tag"
 msgstr "Ghi nhớ trang từ những người dùng khác cho thẻ này"
 
-#: data/templates/bookmarks.tpl.php:154
+#: data/templates/default/bookmarks.tpl.php:176
 msgid "Only your bookmarks for this tag"
 msgstr "Chỉ có những trang ghi nhớ của bạn"
 
-#: data/templates/bookmarks.tpl.php:177
-#: data/templates/bookmarks.tpl.php:183
+#: data/templates/default/bookmarks.tpl.php:199
+#: data/templates/default/bookmarks.tpl.php:205
 msgid "First"
 msgstr "Đầu tiên"
 
-#: data/templates/bookmarks.tpl.php:178
-#: data/templates/bookmarks.tpl.php:184
+#: data/templates/default/bookmarks.tpl.php:200
+#: data/templates/default/bookmarks.tpl.php:206
 msgid "Previous"
 msgstr "Trước"
 
-#: data/templates/bookmarks.tpl.php:191
-#: data/templates/bookmarks.tpl.php:194
+#: data/templates/default/bookmarks.tpl.php:213
+#: data/templates/default/bookmarks.tpl.php:216
 msgid "Next"
 msgstr "Sau"
 
-#: data/templates/bookmarks.tpl.php:192
-#: data/templates/bookmarks.tpl.php:195
+#: data/templates/default/bookmarks.tpl.php:214
+#: data/templates/default/bookmarks.tpl.php:217
 msgid "Last"
 msgstr "Cuối cùng"
 
-#: data/templates/bookmarks.tpl.php:205
+#: data/templates/default/bookmarks.tpl.php:233
 #, php-format
 msgid "Page %d of %d"
 msgstr "Trang %d của %d"
 
-#: data/templates/bookmarks.tpl.php:245
+#: data/templates/default/bookmarks.tpl.php:295
 msgid "Tags:"
 msgstr "Những từ khoá:"
 
-#: data/templates/bookmarks.tpl.php:251
+#: data/templates/default/bookmarks.tpl.php:302
 msgid "Edit"
 msgstr "Sửa"
 
-#: data/templates/bookmarks.tpl.php:255
+#: data/templates/default/bookmarks.tpl.php:310
 msgid "Last update"
 msgstr "Lần cập nhật cuối"
 
-#: data/templates/bookmarks.tpl.php:258
+#: data/templates/default/bookmarks.tpl.php:313
 msgid "by"
 msgstr "bởi"
 
-#: data/templates/bookmarks.tpl.php:260
+#: data/templates/default/bookmarks.tpl.php:317
 msgid "you"
 msgstr "bạn"
 
-#: data/templates/bookmarks.tpl.php:274
+#: data/templates/default/bookmarks.tpl.php:333
 #, php-format
 msgid " and %s1 other%s"
 msgstr "và %s1 khác%s"
 
-#: data/templates/bookmarks.tpl.php:277
+#: data/templates/default/bookmarks.tpl.php:336
 #, php-format
 msgid " and %2$s%1$s others%3$s"
 msgstr " và %2$s%1$s những cái khác%3$s"
 
-#: data/templates/bookmarks.tpl.php:288
+#: data/templates/default/bookmarks.tpl.php:350
 msgid "Copy this bookmark to YOUR bookmarks."
 msgstr "Copy trang ghi nhớ này vào những trang ghi nhớ của bạn."
 
-#: data/templates/bookmarks.tpl.php:289
+#: data/templates/default/bookmarks.tpl.php:351
 msgid "Copy"
 msgstr "Copy"
 
-#: data/templates/bookmarks.tpl.php:309
+#: data/templates/default/bookmarks.tpl.php:376
 msgid "This bookmark is certified by an admin user."
 msgstr "Trang ghi nhớ này được bảo đảm bởi một người quản trị."
 
-#: data/templates/bookmarks.tpl.php:351
+#: data/templates/default/bookmarks.tpl.php:430
 msgid "Private Note on this bookmark"
 msgstr "Ghi chú cá nhân trên trang ghi nhớ này"
 
-#: data/templates/bookmarks.tpl.php:363
+#: data/templates/default/bookmarks.tpl.php:444
 msgid "Come back to the top of this page."
 msgstr "Quay trở lại đầu trang này."
 
-#: data/templates/bookmarks.tpl.php:363
+#: data/templates/default/bookmarks.tpl.php:444
 msgid "Top of the page"
 msgstr "Đầu trang"
 
-#: data/templates/bookmarks.tpl.php:369
+#: data/templates/default/bookmarks.tpl.php:450
 msgid "No bookmarks available"
 msgstr "Không có trang ghi nhớ nào có sẵn."
 
-#: 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/default/bottom.inc.php:5
+#: data/templates/default/toolbar.inc.php:15
+#: data/templates/default/toolbar.inc.php:28 www/about.php:23 www/about.php:24
 msgid "About"
 msgstr "Về"
 
-#: data/templates/bottom.inc.php:7
+#: data/templates/default/bottom.inc.php:7
 msgid "Propulsed by "
 msgstr "Đã đẩy bởi"
 
-#: 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/default/dynamictags.inc.php:56
+#: data/templates/default/sidebar.block.common.php:19
+#: data/templates/default/sidebar.block.popular.php:34
+#: data/templates/default/sidebar.block.recent.php:29
+#: data/templates/default/tags.tpl.php:19
 msgid "bookmark"
 msgid_plural "bookmarks"
 msgstr[0] "Trang ghi nhớ"
 msgstr[1] "Signets"
 
-#: 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
+#: data/templates/default/dynamictags.inc.php:105
+#: data/templates/default/sidebar.block.common.php:9
+#: data/templates/default/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.popular.php:23
+#: data/templates/default/sidebar.block.recent.php:34
+#: data/templates/default/toolbar.inc.php:27 www/populartags.php:46
 msgid "Popular Tags"
 msgstr "Những thẻ phổ biến"
 
-#: data/templates/dynamictags.inc.php:131
+#: data/templates/default/dynamictags.inc.php:108
 msgid "Popular Tags From All Users"
 msgstr "Những thẻ phổ biến cho tất cả những người dùng"
 
-#: data/templates/editbookmark.tpl.php:33
+#: data/templates/default/editbookmark.tpl.php:46
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: 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
+#: data/templates/default/editbookmark.tpl.php:48
+#: data/templates/default/editbookmark.tpl.php:53
+#: data/templates/default/editprofile.tpl.php:29
+#: data/templates/default/tagrename.tpl.php:14
+#: data/templates/default/tagrename.tpl.php:19
 msgid "Required"
 msgstr "Yêu cầu"
 
-#: data/templates/editbookmark.tpl.php:45
+#: data/templates/default/editbookmark.tpl.php:58
 msgid "Add Note"
 msgstr "Thêm vào ghi chú"
 
-#: data/templates/editbookmark.tpl.php:48
-msgid "You can use anchors to delimite attributes. for example: [publisher]blah[/publisher] "
-msgstr "Bạn có thể sử dụng những nguồn tin cậy để xác định phạm vi những thuộc tính. Ví dụ : [publisher]blah[/publisher]"
+#: data/templates/default/editbookmark.tpl.php:61
+msgid ""
+"You can use anchors to delimite attributes. for example: [publisher]blah[/"
+"publisher] "
+msgstr ""
+"Bạn có thể sử dụng những nguồn tin cậy để xác định phạm vi những thuộc tính. "
+"Ví dụ : [publisher]blah[/publisher]"
 
-#: data/templates/editbookmark.tpl.php:51
+#: data/templates/default/editbookmark.tpl.php:64
 msgid "Suggested anchors: "
 msgstr "Những gợi ý tin cậy : "
 
-#: data/templates/editbookmark.tpl.php:63
+#: data/templates/default/editbookmark.tpl.php:76
 msgid "Private Note"
 msgstr "Ghi chú cá nhân"
 
-#: data/templates/editbookmark.tpl.php:65
+#: data/templates/default/editbookmark.tpl.php:78
 msgid "Just visible by you and your contacts."
 msgstr "Chỉ được xem bới bạn và danh sách liên lạc của bạn"
 
-#: data/templates/editbookmark.tpl.php:69
-#: data/templates/toolbar.inc.php:10
-#: www/tags.php:45
-#: www/tags.php:67
+#: data/templates/default/editbookmark.tpl.php:82
+#: data/templates/default/toolbar.inc.php:10 www/tags.php:45 www/tags.php:67
 msgid "Tags"
 msgstr "Thẻ"
 
-#: data/templates/editbookmark.tpl.php:73
+#: data/templates/default/editbookmark.tpl.php:86
 msgid "Comma-separated"
 msgstr "Phân tách bởi những dấu phẩy"
 
-#: 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 "Chú ý: sử dụng \">\" để cho một mô tả mối liên hệ giữa các thẻ. Ví dụ: Chau_Au>Phap>paris"
+#: data/templates/default/editbookmark.tpl.php:90
+#: data/templates/default/tag2tagadd.tpl.php:9
+msgid ""
+"Note: use \">\" to include one tag in another. e.g.: europe>france>paris"
+msgstr ""
+"Chú ý: sử dụng \">\" để cho một mô tả mối liên hệ giữa các thẻ. Ví dụ: "
+"Chau_Au>Phap>paris"
 
-#: data/templates/editbookmark.tpl.php:81
-#: data/templates/tag2tagadd.tpl.php:8
+#: data/templates/default/editbookmark.tpl.php:94
+#: data/templates/default/tag2tagadd.tpl.php:8
 msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry"
-msgstr "Chú ý : sử dụng \"=\" để diễn tả hai thẻ tương đương nhau. Ví dụ: europe=eu"
+msgstr ""
+"Chú ý : sử dụng \"=\" để diễn tả hai thẻ tương đương nhau. Ví dụ: europe=eu"
 
-#: data/templates/editbookmark.tpl.php:84
-#: data/templates/importDelicious.tpl.php:15
-#: data/templates/importNetscape.tpl.php:16
+#: data/templates/default/editbookmark.tpl.php:97
+#: data/templates/default/importDelicious.tpl.php:15
+#: data/templates/default/importNetscape.tpl.php:16
 msgid "Privacy"
 msgstr "Riêng tư"
 
-#: data/templates/editbookmark.tpl.php:87
-#: data/templates/importDelicious.tpl.php:18
-#: data/templates/importNetscape.tpl.php:19
+#: data/templates/default/editbookmark.tpl.php:100
+#: data/templates/default/importDelicious.tpl.php:18
+#: data/templates/default/importNetscape.tpl.php:19
 msgid "Public"
 msgstr "Công cộng"
 
-#: data/templates/editbookmark.tpl.php:88
+#: data/templates/default/editbookmark.tpl.php:101
 msgid "Shared with Watch List"
 msgstr "Chia xẻ với danh sách liên hệ của tôi"
 
-#: data/templates/editbookmark.tpl.php:89
-#: data/templates/importDelicious.tpl.php:20
-#: data/templates/importNetscape.tpl.php:21
+#: data/templates/default/editbookmark.tpl.php:102
+#: data/templates/default/importDelicious.tpl.php:20
+#: data/templates/default/importNetscape.tpl.php:21
 msgid "Private"
 msgstr "cá nhân"
 
-#: data/templates/editbookmark.tpl.php:102
+#: data/templates/default/editbookmark.tpl.php:115
 msgid "Delete Bookmark"
 msgstr "Xoá trang ghi nhớ này"
 
-#: data/templates/editbookmark.tpl.php:107
+#: data/templates/default/editbookmark.tpl.php:120
 msgid "edit common description"
 msgstr "Sửa mô tả chung"
 
-#: data/templates/editbookmark.tpl.php:134
-msgid "Bookmarklet"
-msgstr "Bookmarklet"
-
-#: 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 "Click theo một trong những bookmarklets để thêm một nút, bạn có thể click bất cứ khi nào bạn muốn thêm một trang cho trang hiện tại %s "
-
-#: 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 "Click theo một trong những bookmarklets vào trình duyệt bookmark của bạn và click nó bất cứ khi nào bạn muốn thêm một trang cho trang hiện tại %s "
-
-#: data/templates/editbookmark.tpl.php:157
-#: data/templates/editbookmark.tpl.php:162
-#, php-format
-msgid "Post to %s"
-msgstr "Thêm vào %s"
-
-#: data/templates/editbookmark.tpl.php:158
-#: data/templates/editbookmark.tpl.php:163
-#, php-format
-msgid "Post to %s (Pop-up)"
-msgstr "Thêm vào %s (Pop-up)"
-
-#: data/templates/editbookmark.tpl.php:168
-#: data/templates/importDelicious.tpl.php:26
-#: data/templates/importNetscape.tpl.php:27
-#: data/templates/importStructure.tpl.php:16
+#: data/templates/default/editbookmark.tpl.php:212
+#: data/templates/default/importDelicious.tpl.php:26
+#: data/templates/default/importNetscape.tpl.php:27
+#: data/templates/default/importStructure.tpl.php:16
 msgid "Import"
 msgstr "Nhập "
 
-#: data/templates/editbookmark.tpl.php:170
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Import bookmarks from bookmark file"
 msgstr "Nạp những trang ghi nhớ từ một file "
 
-#: data/templates/editbookmark.tpl.php:170
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Internet Explorer, Mozilla Firefox and Netscape"
 msgstr "Internet Explorer, Mozilla Firefox et Netscape"
 
-#: data/templates/editbookmark.tpl.php:171
+#: data/templates/default/editbookmark.tpl.php:215
 msgid "Import bookmarks from del.icio.us"
 msgstr "Nạp những trang ghi nhớ từ del.icio.us"
 
-#: data/templates/editprofile.tpl.php:10
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:11
+msgid "SSL client certificates"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:17
+msgid "Serial"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:45
+#: data/templates/default/profile.tpl.php:17
+msgid "Name"
+msgstr "Tên"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:19
+#: data/templates/default/profile.tpl.php:11
+msgid "Email"
+msgstr "E-mail"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:20
+msgid "Issuer"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:30
+#, fuzzy
+msgid "delete"
+msgstr "Xoá"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:43
+msgid "No certificates registered"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:48
+msgid "Your current certificate is already registered with your account."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:53
+msgid "Register current certificate to automatically login."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:59
+msgid "Your browser does not provide a certificate."
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:8
 msgid "Account Details"
 msgstr "Tài khoản cụ thể"
 
-#: 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
+#: data/templates/default/editprofile.tpl.php:12
+#: data/templates/default/login.tpl.php:21
+#: data/templates/default/password.tpl.php:10
+#: data/templates/default/profile.tpl.php:6
+#: data/templates/default/register.tpl.php:16
 msgid "Username"
 msgstr "Tên người dùng"
 
-#: data/templates/editprofile.tpl.php:19
+#: data/templates/default/editprofile.tpl.php:17
 msgid "New Password"
 msgstr "Mật khẩu mới"
 
-#: data/templates/editprofile.tpl.php:24
+#: data/templates/default/editprofile.tpl.php:22
 msgid "Confirm Password"
 msgstr "Xác nhận mật khẩu"
 
-#: data/templates/editprofile.tpl.php:29
-#: data/templates/password.tpl.php:14
-#: data/templates/register.tpl.php:26
+#: data/templates/default/editprofile.tpl.php:27
+#: data/templates/default/password.tpl.php:14
+#: data/templates/default/register.tpl.php:26
 msgid "E-mail"
 msgstr "E-mail"
 
-#: data/templates/editprofile.tpl.php:35
+#: data/templates/default/editprofile.tpl.php:32
+#, fuzzy
+msgid "Private RSS Feed"
+msgstr "Ghi chú cá nhân"
+
+#: data/templates/default/editprofile.tpl.php:34
+msgid "Enable"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:36
+#, fuzzy
+msgid "Generate New Key"
+msgstr "Phát sinh một mật khẩu"
+
+#: data/templates/default/editprofile.tpl.php:41
 msgid "Personal Details"
 msgstr "Chi tiết cá nhân"
 
-#: data/templates/editprofile.tpl.php:39
-#: data/templates/profile.tpl.php:17
-msgid "Name"
-msgstr "Tên"
-
-#: data/templates/editprofile.tpl.php:43
-#: data/templates/profile.tpl.php:23
+#: data/templates/default/editprofile.tpl.php:49
+#: data/templates/default/profile.tpl.php:23
 msgid "Homepage"
 msgstr "Trang chủ"
 
-#: data/templates/editprofile.tpl.php:52
-#: www/edit.php:113
+#: data/templates/default/editprofile.tpl.php:58 www/edit.php:113
 msgid "Save Changes"
 msgstr "Lưu lại sự thay đổi"
 
-#: data/templates/editprofile.tpl.php:55
-#: data/templates/sidebar.block.tagactions.php:17
-#: data/templates/sidebar.block.watchstatus.php:18
+#: data/templates/default/editprofile.tpl.php:63
+#: data/templates/default/sidebar.block.tagactions.php:17
+#: data/templates/default/sidebar.block.watchstatus.php:18
 msgid "Actions"
 msgstr "Những thao tác"
 
-#: data/templates/editprofile.tpl.php:58
+#: data/templates/default/editprofile.tpl.php:66
 msgid "Export bookmarks"
 msgstr "Xuất những trang ghi nhớ"
 
-#: data/templates/editprofile.tpl.php:60
+#: data/templates/default/editprofile.tpl.php:68
 msgid "HTML file (for browsers)"
 msgstr "file HTML (để duyệt)"
 
-#: data/templates/editprofile.tpl.php:61
+#: data/templates/default/editprofile.tpl.php:69
 msgid "XML file (like del.icio.us)"
 msgstr "file XML (như del.icio.us)"
 
-#: data/templates/editprofile.tpl.php:62
+#: data/templates/default/editprofile.tpl.php:70
 msgid "CSV file (for spreadsheet tools)"
 msgstr "file CSV (cho những công cụ lan truyền)"
 
-#: data/templates/error.404.tpl.php:5
+#: data/templates/default/error.404.tpl.php:5
 msgid "Not Found"
 msgstr "Không tìm thấy"
 
-#: data/templates/error.404.tpl.php:6
+#: data/templates/default/error.404.tpl.php:6
 msgid "The requested URL was not found on this server"
 msgstr "Yêu cầu đường link đã không được tìm thấy trên server này."
 
-#: data/templates/error.500.tpl.php:5
+#: data/templates/default/error.500.tpl.php:5
 msgid "General server error"
 msgstr "Lỗi tác độgn từ serveur."
 
-#: data/templates/error.500.tpl.php:6
+#: data/templates/default/error.500.tpl.php:6
 msgid "The requested URL could not be processed"
 msgstr "Yêu cầu đường link không thể  tìm thấy trên server này"
 
-#: data/templates/importDelicious.tpl.php:19
-#: data/templates/importNetscape.tpl.php:20
+#: data/templates/default/importDelicious.tpl.php:19
+#: data/templates/default/importNetscape.tpl.php:20
 msgid "Shared with Watchlist"
 msgstr "Chia xẻ với danh sách liên lạc"
 
-#: data/templates/importDelicious.tpl.php:31
-#: data/templates/importNetscape.tpl.php:32
-#: data/templates/importStructure.tpl.php:21
+#: data/templates/default/importDelicious.tpl.php:31
+#: data/templates/default/importNetscape.tpl.php:32
+#: data/templates/default/importStructure.tpl.php:21
 msgid "Instructions"
 msgstr "Giới thiệu"
 
-#: 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 "Đăng nhập vào <a href=\"http://del.icio.us/api/posts/all\">trang trích xuất từ del.icio.us</a>"
+#: data/templates/default/importDelicious.tpl.php:33
+#, fuzzy
+msgid ""
+"Log in to the <a href=\"https://api.del.icio.us/v1/posts/all\">export page "
+"at del.icio.us</a>"
+msgstr ""
+"Đăng nhập vào <a href=\"http://del.icio.us/api/posts/all\">trang trích xuất "
+"từ 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 "Lưu file kết quả <abbr title=\"Extensible Markup Language\">XML</abbr> trên máy tính của bạn"
+#: data/templates/default/importDelicious.tpl.php:34
+msgid ""
+"Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> "
+"file to your computer"
+msgstr ""
+"Lưu file kết quả <abbr title=\"Extensible Markup Language\">XML</abbr> trên "
+"máy tính của bạn"
 
-#: 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 "Click <kbd>Browse...</kbd> để tìm thấy file trên máy tính của bạn. Kích cỡ tối đa của file không được vượt quá 1 MB"
+#: data/templates/default/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 ""
+"Click <kbd>Browse...</kbd> để tìm thấy file trên máy tính của bạn. Kích cỡ "
+"tối đa của file không được vượt quá 1 MB"
 
-#: data/templates/importDelicious.tpl.php:36
-#: data/templates/importNetscape.tpl.php:43
+#: data/templates/default/importDelicious.tpl.php:36
+#: data/templates/default/importNetscape.tpl.php:43
 msgid "Select the default privacy setting for your imported bookmarks"
 msgstr "Lựa chọn cài đặt mặc định cho những trang ghi nhớ được nạp vào"
 
-#: 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 "Click vào <kbd>Importer</kbd> để bắt đầu nạp những trang ghi nhớ; thao tác này có thể mất vài phút"
+#: data/templates/default/importDelicious.tpl.php:37
+#: data/templates/default/importNetscape.tpl.php:44
+msgid ""
+"Click <kbd>Import</kbd> to start importing the bookmarks; it may take a "
+"minute"
+msgstr ""
+"Click vào <kbd>Importer</kbd> để bắt đầu nạp những trang ghi nhớ; thao tác "
+"này có thể mất vài phút"
 
-#: data/templates/importNetscape.tpl.php:35
+#: data/templates/default/importNetscape.tpl.php:35
 msgid "Export your bookmarks from your browser to a file"
 msgstr "Xuất những trang ghi nhớ ra một file từ danh sách duyệt của bạn"
 
-#: data/templates/importNetscape.tpl.php:37
-msgid "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
-msgstr "Internet Explorer: <kbd>File &gt; Nạp và Đưa ra... &gt; Đưa ra những cái được ưa chuộng"
+#: data/templates/default/importNetscape.tpl.php:37
+msgid ""
+"Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
+msgstr ""
+"Internet Explorer: <kbd>File &gt; Nạp và Đưa ra... &gt; Đưa ra những cái "
+"được ưa chuộng"
 
-#: data/templates/importNetscape.tpl.php:38
-msgid "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; Export..."
-msgstr "Mozilla Firefox: <kbd>Những trang đánh dấu &gt;Quản lí những trang được đánh dấu... &gt;File &gt; Đưa rar..."
+#: data/templates/default/importNetscape.tpl.php:38
+msgid ""
+"Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
+"Export..."
+msgstr ""
+"Mozilla Firefox: <kbd>Những trang đánh dấu &gt;Quản lí những trang được đánh "
+"dấu... &gt;File &gt; Đưa rar..."
 
-#: data/templates/importNetscape.tpl.php:39
-msgid "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
-msgstr "Netscape: <kbd>Những trang đánh dấu &gt; Quản lí những trang đánh dấu... &gt; Những công cụ &gt; Đưa ra..."
+#: data/templates/default/importNetscape.tpl.php:39
+msgid ""
+"Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
+msgstr ""
+"Netscape: <kbd>Những trang đánh dấu &gt; Quản lí những trang đánh dấu... "
+"&gt; Những công cụ &gt; Đưa ra..."
 
-#: 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 "Click <kbd>Browse...</kbd> để tìm thấy file chứa những trang ghi nhớ đã được lưu trên máy tính của bạn. Kích thước tối đa của file không vượt quá 1MB"
+#: data/templates/default/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 ""
+"Click <kbd>Browse...</kbd> để tìm thấy file chứa những trang ghi nhớ đã được "
+"lưu trên máy tính của bạn. Kích thước tối đa của file không vượt quá 1MB"
 
-#: data/templates/importStructure.tpl.php:24
+#: data/templates/default/importStructure.tpl.php:24
 msgid "Create your structure into a simple text file and following this model:"
 msgstr "Tạo cấu trúc của bạn vào một file văn bản đơn giản theo mô hình sau"
 
-#: data/templates/importStructure.tpl.php:35
-msgid "Then import the file. The tags and their relations will be added to your profile."
-msgstr "Sau khi nạp vào file này. Những thẻ này và mối liên hệ giữa chúng sẽ được thêm vào thông tin của bạn"
+#: data/templates/default/importStructure.tpl.php:35
+msgid ""
+"Then import the file. The tags and their relations will be added to your "
+"profile."
+msgstr ""
+"Sau khi nạp vào file này. Những thẻ này và mối liên hệ giữa chúng sẽ được "
+"thêm vào thông tin của bạn"
 
-#: data/templates/login.tpl.php:13
+#: data/templates/default/login.tpl.php:13
 msgid "Please activate cookies"
 msgstr "Hãy kích hoạt việc xác nhận sử dụng dịch vụ"
 
-#: data/templates/login.tpl.php:26
-#: data/templates/register.tpl.php:21
+#: data/templates/default/login.tpl.php:26
+#: data/templates/default/register.tpl.php:21
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: data/templates/login.tpl.php:28
+#: data/templates/default/login.tpl.php:28
 msgid "Don't ask for my password for 2 weeks"
 msgstr "Đừng hỏi mật khẩu của tôi trong 2 tuần"
 
-#: data/templates/login.tpl.php:32
-#: data/templates/toolbar.inc.php:29
-#: www/login.php:57
+#: data/templates/default/login.tpl.php:32
+#: data/templates/default/toolbar.inc.php:29 www/login.php:57
 msgid "Log In"
 msgstr "Đăng nhập"
 
-#: data/templates/login.tpl.php:36
+#: data/templates/default/login.tpl.php:36
 msgid "Forgotten your password?"
 msgstr "Có phải bạn đã quên mật khẩu ?"
 
-#: data/templates/password.tpl.php:5
+#: data/templates/default/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 "Nếu bạn đã  quên mật khẩu, %s có thể tạo ra một mật khẩu mới. Nhập vào tên đăng nhập và địa chỉ email của bạn trong mẫu dưới đây và chúng tôi sẽ gửi cho bạn một mật khẩu mới."
+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 ""
+"Nếu bạn đã  quên mật khẩu, %s có thể tạo ra một mật khẩu mới. Nhập vào tên "
+"đăng nhập và địa chỉ email của bạn trong mẫu dưới đây và chúng tôi sẽ gửi "
+"cho bạn một mật khẩu mới."
 
-#: data/templates/password.tpl.php:19
+#: data/templates/default/password.tpl.php:19
 msgid "Generate Password"
 msgstr "Phát sinh một mật khẩu"
 
-#: data/templates/profile.tpl.php:11
-msgid "Email"
-msgstr "E-mail"
-
-#: data/templates/profile.tpl.php:28
+#: data/templates/default/profile.tpl.php:28
 msgid "Member Since"
 msgstr "Thành viên trước đây"
 
-#: data/templates/profile.tpl.php:40
-#: data/templates/sidebar.block.watchlist.php:30
+#: data/templates/default/profile.tpl.php:40
+#: data/templates/default/sidebar.block.watchlist.php:30
 msgid "Watching"
 msgstr "Những danh sách liên lạc của tôi"
 
-#: data/templates/profile.tpl.php:55
-#: data/templates/sidebar.block.watchlist.php:52
+#: data/templates/default/profile.tpl.php:55
+#: data/templates/default/sidebar.block.watchlist.php:52
 msgid "Watched By"
 msgstr "Được xem bởi"
 
-#: data/templates/profile.tpl.php:68
-#: data/templates/toolbar.inc.php:9
+#: data/templates/default/profile.tpl.php:68
+#: data/templates/default/toolbar.inc.php:9
 msgid "Bookmarks"
 msgstr "Những trang ghi nhớ"
 
-#: data/templates/profile.tpl.php:69
+#: data/templates/default/profile.tpl.php:69
 msgid "Go to bookmarks"
 msgstr "Vào những trang ghi nhớ"
 
-#: data/templates/register.tpl.php:11
+#: data/templates/default/register.tpl.php:11
 #, php-format
-msgid "Sign up here to create a free %s account. All the information requested below is required"
-msgstr "Bạn đăng kí ở đây để tạo ra một tài khoản miến phí %s. Tất cả những thông tin yêu cầu dưới đây là cần thiết."
+msgid ""
+"Sign up here to create a free %s account. All the information requested "
+"below is required"
+msgstr ""
+"Bạn đăng kí ở đây để tạo ra một tài khoản miến phí %s. Tất cả những thông "
+"tin yêu cầu dưới đây là cần thiết."
 
-#: data/templates/register.tpl.php:18
-msgid " at least 5 characters, alphanumeric (no spaces, no dots or other special ones)"
-msgstr " ít nhất  5 kí tự, chứa chữ và số  (không khoảng trống, không dấu chấm hoặc kí tự đặc biệt khác)"
+#: data/templates/default/register.tpl.php:18
+msgid ""
+" at least 5 characters, alphanumeric (no spaces, no dots or other special "
+"ones)"
+msgstr ""
+" ít nhất  5 kí tự, chứa chữ và số  (không khoảng trống, không dấu chấm hoặc "
+"kí tự đặc biệt khác)"
 
-#: data/templates/register.tpl.php:28
+#: data/templates/default/register.tpl.php:28
 msgid " to send you your password if you forget it"
 msgstr "để gửi cho bạn mật khẩu của bạn nếu bạn quên nó"
 
-#: data/templates/register.tpl.php:33
+#: data/templates/default/register.tpl.php:33
 msgid "Antispam question"
 msgstr "Câu hỏi chống thư rác"
 
-#: data/templates/register.tpl.php:41
-#: data/templates/toolbar.inc.php:31
-#: www/register.php:83
+#: data/templates/default/register.tpl.php:41
+#: data/templates/default/toolbar.inc.php:31 www/register.php:99
 msgid "Register"
 msgstr "Đăng kí"
 
-#: data/templates/search.menu.php:27
+#: data/templates/default/search.menu.php:27
 msgid "Search..."
 msgstr "Tìm kiếm..."
 
-#: data/templates/search.menu.php:28
+#: data/templates/default/search.menu.php:28
 msgid "in"
 msgstr "trong"
 
-#: data/templates/search.menu.php:34
+#: data/templates/default/search.menu.php:34
 msgid "this user's bookmarks"
 msgstr "những trang ghi nhớ của người dùng"
 
-#: data/templates/search.menu.php:39
+#: data/templates/default/search.menu.php:39
 msgid "my bookmarks"
 msgstr "những trang ghi nhớ của tôi"
 
-#: data/templates/search.menu.php:40
+#: data/templates/default/search.menu.php:40
 msgid "my watchlist"
 msgstr "danh sách liên lạc của tôi"
 
-#: data/templates/search.menu.php:44
+#: data/templates/default/search.menu.php:44
 msgid "all bookmarks"
 msgstr "tất cả những trang được ghi nhớ "
 
-#: data/templates/search.menu.php:54
+#: data/templates/default/search.menu.php:54
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#: data/templates/sidebar.block.linked.php:51
+#: data/templates/default/sidebar.block.linked.php:23
 msgid "Linked Tags"
 msgstr "Liên kết những từ khoá"
 
-#: data/templates/sidebar.block.linked.php:62
-#: data/templates/sidebar.block.menu.php:46
+#: data/templates/default/sidebar.block.linked.php:28
+#: data/templates/default/sidebar.block.menu.php:46
 msgid "Add new link"
 msgstr "Tạo một liên kết"
 
-#: data/templates/sidebar.block.linked.php:63
-#: data/templates/sidebar.block.menu.php:47
+#: data/templates/default/sidebar.block.linked.php:29
+#: data/templates/default/sidebar.block.menu.php:47
 msgid "Delete link"
 msgstr "Xoá một liên kết"
 
-#: data/templates/sidebar.block.menu.php:35
+#: data/templates/default/sidebar.block.menu.php:35
 #, php-format
 msgid "Tags included into the tag '%s'"
 msgstr "Những từ khoá chứa trong từ khoá '%s'"
 
-#: data/templates/sidebar.block.menu.php:35
+#: data/templates/default/sidebar.block.menu.php:35
 msgid "Menu Tags"
 msgstr "Danh sách từ khoá"
 
-#: data/templates/sidebar.block.menu.php:68
+#: data/templates/default/sidebar.block.menu.php:68
 msgid "See all your tags"
 msgstr "Nhìn thấy tất cả thẻ của bạn"
 
-#: data/templates/sidebar.block.menu.php:68
+#: data/templates/default/sidebar.block.menu.php:68
 msgid "all your tags"
 msgstr "Tất cả thẻ của bạn"
 
-#: data/templates/sidebar.block.menu.php:70
+#: data/templates/default/sidebar.block.menu.php:70
 msgid "See all tags from this user"
 msgstr "Nhìn thấy tất cả từ khoá của người dùng này"
 
-#: data/templates/sidebar.block.menu.php:70
+#: data/templates/default/sidebar.block.menu.php:70
 msgid "all tags from this user"
 msgstr "tất cả từ khoá  từ người dùng này"
 
-#: data/templates/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.menu.php:74
 msgid "See popular tags"
 msgstr "Nhìn thấy những từ khoá thông thường"
 
-#: data/templates/sidebar.block.menu2.php:25
+#: data/templates/default/sidebar.block.menu2.php:21
 msgid "Featured Menu Tags"
 msgstr "Danh sách những từ khoá chính"
 
-#: data/templates/sidebar.block.menu2.php:29
+#: data/templates/default/sidebar.block.menu2.php:25
 msgid "This menu is composed of keywords (tags) organized by admins."
-msgstr "Danh mục này đã được tạo từ các từ khoá (thẻ) và được sắp xếp bởi những người quản trị."
+msgstr ""
+"Danh mục này đã được tạo từ các từ khoá (thẻ) và được sắp xếp bởi những "
+"người quản trị."
 
-#: data/templates/sidebar.block.recent.php:18
+#: data/templates/default/sidebar.block.recent.php:18
 msgid "Recent Tags"
 msgstr "Những từ khoá gần đây"
 
-#: data/templates/sidebar.block.related.php:26
+#: data/templates/default/sidebar.block.related.php:26
 msgid "Related Tags"
 msgstr "Quan hệ các từ khoá"
 
-#: data/templates/sidebar.block.search.php:15
+#: data/templates/default/sidebar.block.search.php:28
 msgid "Last Searches"
 msgstr "Những tìm kiếm trước"
 
-#: data/templates/sidebar.block.search.php:24
+#: data/templates/default/sidebar.block.search.php:40
 msgid "Number of bookmarks for this query"
 msgstr "Tổng số trang ghi nhớ tìm thấy cho truy vấn này"
 
-#: data/templates/sidebar.block.tagactions.php:9
-#: www/tagrename.php:72
+#: data/templates/default/sidebar.block.tagactions.php:9 www/tagrename.php:72
 msgid "Rename Tag"
 msgid_plural "Rename Tags"
 msgstr[0] "Thay đổi tên từ khoá"
 msgstr[1] "Renommer les tags"
 
-#: data/templates/sidebar.block.tagactions.php:22
-#: www/tagdelete.php:54
+#: data/templates/default/sidebar.block.tagactions.php:22 www/tagdelete.php:54
 msgid "Delete Tag"
 msgstr "Xoá từ khoá"
 
-#: data/templates/sidebar.block.tagactions.php:24
-#: www/tagedit.php:61
+#: data/templates/default/sidebar.block.tagactions.php:24 www/tagedit.php:61
 msgid "Edit Tag Description"
 msgstr "Sửa mô tả của từ khoá"
 
-#: data/templates/sidebar.block.tagactions.php:26
-#: www/tagcommondescriptionedit.php:64
+#: data/templates/default/sidebar.block.tagactions.php:26
+#: www/tagcommondescriptionedit.php:76
 msgid "Edit Tag Common Description"
 msgstr "Sửa mô tả chung của từ khoá"
 
-#: data/templates/sidebar.block.tagactions.php:28
+#: data/templates/default/sidebar.block.tagactions.php:28
 msgid "Create a link to another tag"
 msgstr "Tạo một liên kết với một từ khoá khác"
 
-#: data/templates/sidebar.block.users.php:14
+#: data/templates/default/sidebar.block.users.php:14
 msgid "New Users"
 msgstr "Những người dùng mới"
 
-#: data/templates/sidebar.block.users.php:23
-#: data/templates/users.tpl.php:17
+#: data/templates/default/sidebar.block.users.php:23
+#: data/templates/default/users.tpl.php:24
 msgid "bookmarks"
 msgstr "Danh mục những trang ghi nhớ"
 
-#: data/templates/sidebar.block.users.php:30
+#: data/templates/default/sidebar.block.users.php:30
 msgid "See all users"
 msgstr "Nhìn thấy tất cả người dùng"
 
-#: data/templates/sidebar.block.users.php:30
+#: data/templates/default/sidebar.block.users.php:30
 msgid "All users"
 msgstr "Tất cả người dùng"
 
-#: data/templates/sidebar.block.watchlist.php:19
+#: data/templates/default/sidebar.block.watchlist.php:19
 msgid "Close contacts are mutual contacts"
-msgstr "Những danh sách liên lạc gần nhau là những danh sách liên lạc tương hỗ với nhau"
+msgstr ""
+"Những danh sách liên lạc gần nhau là những danh sách liên lạc tương hỗ với "
+"nhau"
 
-#: data/templates/sidebar.block.watchlist.php:19
+#: data/templates/default/sidebar.block.watchlist.php:19
 msgid "Close contacts"
 msgstr "Danh sách liên lạc gần nhau"
 
-#: data/templates/sidebar.block.watchlist.php:36
+#: data/templates/default/sidebar.block.watchlist.php:36
 msgid "Add a contact..."
 msgstr "Thêm một liên lạc..."
 
-#: data/templates/sidebar.block.watchlist.php:36
+#: data/templates/default/sidebar.block.watchlist.php:36
 msgid "Type a username to add it to your contacts."
 msgstr "Nhập vào tên truy cập để thêm vào danh sách liên lạc của bạn."
 
-#: data/templates/sidebar.block.watchlist.php:44
+#: data/templates/default/sidebar.block.watchlist.php:44
 msgid "Remove this contact"
 msgstr "Bỏ liên lạc này"
 
-#: data/templates/sidebar.block.watchstatus.php:11
+#: data/templates/default/sidebar.block.watchstatus.php:11
 msgid "Remove from Watchlist"
 msgstr "Rời bỏ từ danh sách liên lạc"
 
-#: data/templates/sidebar.block.watchstatus.php:13
+#: data/templates/default/sidebar.block.watchstatus.php:13
 msgid "Add to Watchlist"
 msgstr "Thêm vào danh sách liên lạc"
 
-#: data/templates/sidebar.linkedtags.inc.php:18
+#: data/templates/default/sidebar.linkedtags.inc.php:18
 msgid "Edit link"
 msgstr "Sửa một liên kết"
 
-#: data/templates/sidebar.linkedtags.inc.php:47
+#: data/templates/default/sidebar.linkedtags.inc.php:47
 msgid "Synonyms:"
 msgstr "Đồng nghĩa :"
 
-#: data/templates/tag2tagadd.tpl.php:12
+#: data/templates/default/tag2tagadd.tpl.php:12
 msgid "Create new link:"
 msgstr "Tạo một mối liên kết mới"
 
-#: data/templates/tag2tagadd.tpl.php:19
+#: data/templates/default/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 "Chú ý : gồm có một từ khoá chứa trong trong từ khoá'%s' (e.g. %s>Những lĩnh vực) để hiển thị từ khoá này trong hộp danh mục"
+msgid ""
+"Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into "
+"the menu box"
+msgstr ""
+"Chú ý : gồm có một từ khoá chứa trong trong từ khoá'%s' (e.g. %s>Những lĩnh "
+"vực) để hiển thị từ khoá này trong hộp danh mục"
 
-#: data/templates/tag2tagadd.tpl.php:23
-#: data/templates/tag2tagedit.tpl.php:37
+#: data/templates/default/tag2tagadd.tpl.php:23
+#: data/templates/default/tag2tagedit.tpl.php:37
 msgid "Create"
 msgstr "Tạo "
 
-#: data/templates/tag2tagadd.tpl.php:35
-#: data/templates/tag2tagdelete.tpl.php:27
-#: data/templates/tag2tagedit.tpl.php:51
+#: data/templates/default/tag2tagadd.tpl.php:35
+#: data/templates/default/tag2tagdelete.tpl.php:27
+#: data/templates/default/tag2tagedit.tpl.php:51
 msgid "Existing links:"
 msgstr "Những liên kết hiện có :"
 
-#: data/templates/tag2tagadd.tpl.php:53
-#: data/templates/tag2tagdelete.tpl.php:45
-#: data/templates/tag2tagedit.tpl.php:69
+#: data/templates/default/tag2tagadd.tpl.php:53
+#: data/templates/default/tag2tagdelete.tpl.php:45
+#: data/templates/default/tag2tagedit.tpl.php:69
 msgid "No links"
 msgstr "Không có liên kết nào"
 
-#: data/templates/tag2tagdelete.tpl.php:15
-#: data/templates/tag2tagedit.tpl.php:16
-#: data/templates/tagdelete.tpl.php:8
-#: www/jsScuttle.php:23
+#: data/templates/default/tag2tagdelete.tpl.php:15
+#: data/templates/default/tag2tagedit.tpl.php:16
+#: data/templates/default/tagdelete.tpl.php:8 www/jsScuttle.php:24
 msgid "Yes"
 msgstr "Đúng"
 
-#: data/templates/tag2tagdelete.tpl.php:16
-#: data/templates/tag2tagedit.tpl.php:17
-#: data/templates/tagdelete.tpl.php:9
-#: www/jsScuttle.php:23
+#: data/templates/default/tag2tagdelete.tpl.php:16
+#: data/templates/default/tag2tagedit.tpl.php:17
+#: data/templates/default/tagdelete.tpl.php:9 www/jsScuttle.php:24
 msgid "No"
 msgstr "Không"
 
-#: data/templates/tag2tagedit.tpl.php:6
+#: data/templates/default/tag2tagedit.tpl.php:6
 msgid "Delete the link"
 msgstr "Xoá liên kết này"
 
-#: data/templates/tag2tagedit.tpl.php:29
+#: data/templates/default/tag2tagedit.tpl.php:29
 msgid "Create new link"
 msgstr "Tạo một liên kết mới"
 
-#: data/templates/tagrename.tpl.php:12
+#: data/templates/default/tagrename.tpl.php:12
 msgid "Old"
 msgstr "Cũ"
 
-#: data/templates/tagrename.tpl.php:17
+#: data/templates/default/tagrename.tpl.php:17
 msgid "New"
 msgstr "Mới"
 
-#: data/templates/tagrename.tpl.php:24
+#: data/templates/default/tagrename.tpl.php:24
 msgid "Rename"
 msgstr "Đổi tên"
 
-#: data/templates/tags.tpl.php:11
-#: data/templates/users.tpl.php:9
+#: data/templates/default/tags.tpl.php:11
+#: data/templates/default/users.tpl.php:9
 msgid "Alphabet"
 msgstr "Bảng chữ cái"
 
-#: data/templates/tags.tpl.php:12
-#: data/templates/users.tpl.php:10
+#: data/templates/default/tags.tpl.php:12
+#: data/templates/default/users.tpl.php:10
 msgid "Popularity"
 msgstr "Phổ biến"
 
-#: data/templates/toolbar.inc.php:8
-#: data/templates/toolbar.inc.php:26
+#: data/templates/default/toolbar.inc.php:8
+#: data/templates/default/toolbar.inc.php:26
 msgid "Home"
 msgstr "Chủ"
 
-#: data/templates/toolbar.inc.php:11
-#: www/watchlist.php:106
+#: data/templates/default/toolbar.inc.php:11 www/watchlist.php:106
 msgid "Watchlist"
 msgstr "Danh mục liên lạc"
 
-#: data/templates/toolbar.inc.php:12
-#: www/profile.php:67
+#: data/templates/default/toolbar.inc.php:12 www/profile.php:79
 msgid "Profile"
 msgstr "Mô tả cá nhân"
 
-#: data/templates/toolbar.inc.php:13
-#: www/bookmarks.php:209
+#: data/templates/default/toolbar.inc.php:13 www/bookmarks.php:215
 msgid "Add a Bookmark"
 msgstr "Thêm một trang ghi nhớ"
 
-#: data/templates/toolbar.inc.php:14
+#: data/templates/default/toolbar.inc.php:14
 msgid "Log Out"
 msgstr "Thoát"
 
-#: data/templates/toolbar.inc.php:17
+#: data/templates/default/toolbar.inc.php:17
 msgid "Admin"
 msgstr "Quản trị"
 
-#: 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 "Quản trị, sự cài đặt của bạn o trong \"Mode Debug\" ($debugMode = true). Để đến  \"Mode Normal\"  và  ẩn những thông báo gỡ rối, thay đổi $debugMode thành false ở trong config.inc.php."
+#: data/templates/default/top.inc.php:57
+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 ""
+"Quản trị, sự cài đặt của bạn o trong \"Mode Debug\" ($debugMode = true). Để "
+"đến  \"Mode Normal\"  và  ẩn những thông báo gỡ rối, thay đổi $debugMode "
+"thành false ở trong config.inc.php."
 
-#: data/templates/users.tpl.php:17
+#: data/templates/default/users.tpl.php:20
 msgid "profile"
 msgstr "thông tin cá nhân"
 
-#: data/templates/users.tpl.php:17
+#: data/templates/default/users.tpl.php:21
 msgid "created in"
 msgstr "Tạo trong"
 
@@ -1013,12 +1156,12 @@ msgstr "Tạo trong"
 msgid "Manage users"
 msgstr "Quản lí những người dùng"
 
-#: www/admin.php:68
+#: www/admin.php:69
 #, php-format
 msgid "%s and all his bookmarks and tags were deleted."
 msgstr "%s, tất cả những trang ghi nhớ và những thẻ bị xoá."
 
-#: www/admin.php:75
+#: www/admin.php:76
 msgid "Problem with "
 msgstr "Có vấn đề với "
 
@@ -1026,33 +1169,24 @@ msgstr "Có vấn đề với "
 msgid "You are not allowed to delete this bookmark"
 msgstr "Bạn đã không cho phép xoá trang ghi nhớ này"
 
-#: www/ajaxDelete.php:41
-#: www/edit.php:103
+#: www/ajaxDelete.php:41 www/edit.php:103
 msgid "Failed to delete bookmark"
 msgstr "Có lỗi trong việc xoá trang ghi nhớ này"
 
-#: www/alltags.php:49
+#: www/alltags.php:50
 msgid "All Tags"
 msgstr "Tất cả từ khoá"
 
-#: 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:99 www/populartags.php:52
+#: www/profile.php:55 www/rss.php:100 www/search.php:111 www/watch.php:45
 #: www/watchlist.php:61
 #, php-format
 msgid "User with username %s was not found"
 msgstr "Tên đăng nhập %s đã không tìm thấy."
 
-#: 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 "Cho phép từ chối."
 
@@ -1068,47 +1202,59 @@ msgstr "Có lỗi trong việc cập nhật mô tả trang ghi nhớ"
 msgid "Edit Bookmark Common Description"
 msgstr "Sửa mô tả trang ghi nhớ"
 
-#: www/bookmarks.php:111
-#: www/tags.php:47
+#: www/bookmarks.php:114 www/tags.php:47
 msgid "Remove the tag from the selection"
 msgstr "Huỷ bỏ từ khoá đã chọn"
 
-#: www/bookmarks.php:131
-#: www/edit.php:65
+#: www/bookmarks.php:134 www/edit.php:65
 msgid "Your bookmark must have a title and an address"
-msgstr "Trang ghi nhớ của bạn phải có một tiêu đề tóm tắt và một địa chỉ của trang đó."
+msgstr ""
+"Trang ghi nhớ của bạn phải có một tiêu đề tóm tắt và một địa chỉ của trang "
+"đó."
+
+#: www/bookmarks.php:139
+msgid "This bookmark URL may not be added"
+msgstr ""
 
-#: www/bookmarks.php:152
-#: www/edit.php:83
-#: www/edit.php:86
+#: www/bookmarks.php:158 www/edit.php:83 www/edit.php:86
 msgid "Bookmark saved"
 msgstr "Lưu lại trang ghi nhớ này."
 
-#: www/bookmarks.php:152
+#: www/bookmarks.php:158
 msgid "(Come back to previous page.)"
 msgstr "(Quay lại trang trước đó.)"
 
-#: 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 "Có lỗi trong việc lưu lại trang ghi nhớ này. Hãy thử lại hoặc liên lạc với người quản trị."
+#: www/bookmarks.php:165 www/import.php:106 www/importNetscape.php:108
+msgid ""
+"There was an error saving your bookmark. Please try again or contact the "
+"administrator."
+msgstr ""
+"Có lỗi trong việc lưu lại trang ghi nhớ này. Hãy thử lại hoặc liên lạc với "
+"người quản trị."
 
-#: www/bookmarks.php:216
+#: www/bookmarks.php:222
 msgid "Add Bookmark"
 msgstr "Thêm một trang ghi nhớ"
 
-#: www/bookmarks.php:219
+#: www/bookmarks.php:225
 msgid "You must be logged in before you can add bookmarks."
 msgstr "Để thêm một trang ghi nhớ bạn phải đăng nhập."
 
-#: www/bookmarks.php:274
-#: www/bookmarks.php:275
+#: www/bookmarks.php:270
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: www/bookmarks.php:283
+#, php-format
+msgid "%s: %s (+private %s)"
+msgstr ""
+
+#: www/bookmarks.php:305 www/bookmarks.php:306
 msgid "My Bookmarks"
 msgstr "Những trang ghi nhớ của tôi"
 
-#: www/edit.php:44
-#: www/edit.php:45
+#: www/edit.php:44 www/edit.php:45
 msgid "Edit Bookmark"
 msgstr "Sửa trang ghi nhớ"
 
@@ -1171,8 +1317,7 @@ msgstr "Trang ghi nhớ này đã được tìm thấy :"
 msgid "Bookmarks imported: "
 msgstr "Những trang ghi nhớ đã nạp :"
 
-#: www/importNetscape.php:117
-#: www/importNetscape.php:122
+#: www/importNetscape.php:117 www/importNetscape.php:122
 msgid "Import Bookmarks from Browser File"
 msgstr "Nạp những trang ghi nhớ này từ một  file trong danh sách duyệt"
 
@@ -1192,24 +1337,29 @@ msgstr "Nạp một cấu trúc"
 msgid "You have now logged out"
 msgstr "Bạn vừa thoátt khỏi"
 
-#: www/index.php:45
+#: www/index.php:46
 #, php-format
 msgid "%s: Recent bookmarks"
 msgstr "%s: Những trang ghi nhớ gần đây"
 
-#: www/index.php:78
+#: www/index.php:58
+#, fuzzy, php-format
+msgid "%s: Recent bookmarks (+private %s)"
+msgstr "%s: Những trang ghi nhớ gần đây"
+
+#: www/index.php:96
 msgid "Store, share and tag your favourite links"
 msgstr "Lưu trữ, chia xẻ và  gán từ khoá cho những liên kết yêu thích của bạn"
 
-#: www/index.php:79
+#: www/index.php:97
 msgid "All Bookmarks"
 msgstr "Tất cả các trang ghi nhớ"
 
-#: www/jsScuttle.php:70
+#: www/jsScuttle.php:71
 msgid "Available"
 msgstr "Có giá trị"
 
-#: www/jsScuttle.php:73
+#: www/jsScuttle.php:74
 msgid "Not Available"
 msgstr "Không có giá trị"
 
@@ -1222,7 +1372,8 @@ msgid "You must enter your username."
 msgstr "Bạn phải nhập vào tên truy cập."
 
 #: www/password.php:40
-msgid "You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
+msgid ""
+"You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
 msgstr "Bạn <em>phải</em> đưa ra một <abbr title=\"địa chỉ \">E-mail</abbr>."
 
 #: www/password.php:48
@@ -1230,20 +1381,31 @@ msgid "No matches found for that username."
 msgstr "Không có tên truy cập này."
 
 #: www/password.php:51
-msgid "No matches found for that combination of username and <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "Không phù hợp giữa tên người dùng này và  <abbr title=\"địachỉ email nàyl\">e-mail</abbr>."
+msgid ""
+"No matches found for that combination of username and <abbr title="
+"\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"Không phù hợp giữa tên người dùng này và  <abbr title=\"địachỉ email nàyl"
+"\">e-mail</abbr>."
 
 #: www/password.php:59
-msgid "There was an error while generating your new password. Please try again."
-msgstr "Đã có lỗi trong khi nhập trang ghi nhớ này. Hãy thử lại hoặc liên lạc với người quản trị."
+msgid ""
+"There was an error while generating your new password. Please try again."
+msgstr ""
+"Đã có lỗi trong khi nhập trang ghi nhớ này. Hãy thử lại hoặc liên lạc với "
+"người quản trị."
 
 #: www/password.php:63
 msgid "Your new password is:"
 msgstr "Mật khẩu mới của bạn là:"
 
 #: 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 "Để giữ an toàn và bảo mật cho những trang ghi nhớ của bạn, bạn nên thay đổi mật khẩu trong mô tả cá nhân cho lần đăng nhập sau."
+msgid ""
+"To keep your bookmarks secure, you should change this password in your "
+"profile the next time you log in."
+msgstr ""
+"Để giữ an toàn và bảo mật cho những trang ghi nhớ của bạn, bạn nên thay đổi "
+"mật khẩu trong mô tả cá nhân cho lần đăng nhập sau."
 
 #: www/password.php:66
 #, php-format
@@ -1259,98 +1421,140 @@ msgstr "Mật khẩu mới sẽ được gửi đến địa chỉ email  %s"
 msgid "Forgotten Password"
 msgstr "Quên mật khẩu"
 
-#: www/profile.php:59
-#: www/watchlist.php:119
+#: www/profile.php:63 www/watchlist.php:119
 msgid "Username was not specified"
 msgstr "Tên truy cập đã không chỉ rõ ."
 
-#: www/profile.php:65
+#: www/profile.php:70
 msgid "My Profile"
 msgstr "Hồ sơ cá nhân"
 
-#: www/profile.php:89
+#: www/profile.php:110
 msgid "Invalid Token"
 msgstr "Token không có hiệu lực"
 
-#: www/profile.php:94
+#: www/profile.php:115
 msgid "Password and confirmation do not match."
 msgstr "Mật khẩu không tương thích với tên truy cập."
 
-#: www/profile.php:98
+#: www/profile.php:119
 msgid "Password must be at least 6 characters long."
 msgstr "Mật khẩu phải chứa ít nhất 6 kí tự."
 
-#: www/profile.php:102
+#: www/profile.php:123
 msgid "E-mail address is not valid."
 msgstr "Địa chỉ email không có giá trị."
 
-#: www/profile.php:106
+#: www/profile.php:127
 msgid "An error occurred while saving your changes."
 msgstr "Có một lỗi xuất hiện trong khi lưu lại những sửa đổi của bạn."
 
-#: www/profile.php:108
+#: www/profile.php:129
 msgid "Changes saved."
 msgstr "Lưu lại những thay đổi."
 
-#: www/register.php:46
+#: www/profile.php:148
+msgid "You do not have a valid SSL client certificate"
+msgstr ""
+
+#: www/profile.php:150
+msgid "This certificate is already registered"
+msgstr ""
+
+#: www/profile.php:152
+msgid "Failed to register SSL client certificate."
+msgstr ""
+
+#: www/profile.php:154
+msgid "SSL client certificate registered."
+msgstr ""
+
+#: www/profile.php:163
+msgid "Certificate not found."
+msgstr ""
+
+#: www/profile.php:165
+msgid "The certificate does not belong to you."
+msgstr ""
+
+#: www/profile.php:167
+#, fuzzy
+msgid "Failed to delete SSL client certificate."
+msgstr "Không thể xoá từ khoá này"
+
+#: www/profile.php:169
+msgid "SSL client certificate deleted."
+msgstr ""
+
+#: www/register.php:52
 msgid "You <em>must</em> enter a username, password and e-mail address."
-msgstr "Bạn <em>phải</em> đưa ra một tên truy cập, một mật khẩu, một <abbr title=\"điạ chỉ email\">e-mail</abbr>"
+msgstr ""
+"Bạn <em>phải</em> đưa ra một tên truy cập, một mật khẩu, một <abbr title="
+"\"điạ chỉ email\">e-mail</abbr>"
 
-#: www/register.php:50
+#: www/register.php:56
 msgid "This username has been reserved, please make another choice."
 msgstr "Tên truy cập này đã được đăng kí, hãy chọn tên khác."
 
-#: www/register.php:54
+#: www/register.php:60
 msgid "This username already exists, please make another choice."
 msgstr "Tên truy cập này đã tồn tại, hãy chọn một tên khác."
 
-#: www/register.php:58
-msgid "This username is not valid (too short, too long, forbidden characters...), please make another choice."
-msgstr "Tên truy cập này không được xác nhận (quá ngắn, quá dài, kí tự cấm...), hãy tạo tên khác."
+#: www/register.php:64
+msgid ""
+"This username is not valid (too short, too long, forbidden characters...), "
+"please make another choice."
+msgstr ""
+"Tên truy cập này không được xác nhận (quá ngắn, quá dài, kí tự cấm...), hãy "
+"tạo tên khác."
 
-#: www/register.php:62
+#: www/register.php:68
 msgid "E-mail address is not valid. Please try again."
 msgstr "Địa chỉ email không được xác nhận. Hãy thử lại."
 
-#: www/register.php:66
+#: www/register.php:72
 msgid "Antispam answer is not valid. Please try again."
 msgstr "Câu trả lời chống thư rác không được xác nhận. hãy thử lại."
 
-#: www/register.php:75
+#: www/register.php:90
 msgid "You have successfully registered. Enjoy!"
 msgstr "Bạn đã đăng kí thành công!"
 
-#: www/register.php:77
+#: www/register.php:92
 msgid "Registration failed. Please try again."
 msgstr "Đăng kí thất bại. hãy thử làm lại."
 
-#: www/rss.php:84
+#: www/rss.php:90 www/rss.php:111
+#, php-format
+msgid "Failed to Autenticate User with username %s using private key"
+msgstr ""
+
+#: www/rss.php:128
 #, php-format
 msgid "Recent bookmarks posted to %s"
 msgstr "Những trang ghi nhớ gần đây %s"
 
-#: www/search.php:81
-#: www/search.php:145
+#: www/search.php:83 www/search.php:147
 msgid "Search Bookmarks"
 msgstr "Tìm kiếm trang ghi nhớ"
 
-#: www/search.php:87
+#: www/search.php:89
 msgid "Search Results"
 msgstr "Kêt quả tìm kiếm"
 
-#: www/search.php:135
+#: www/search.php:137
 msgid "Unsatisfied? You can also try our "
 msgstr "Có phải bạn không vừa lòng? Bạn có thể thử của chúng tôi "
 
-#: www/tag2tagadd.php:50
+#: www/tag2tagadd.php:54
 msgid "Tag link created"
 msgstr "Liên kết giữa các từ khoá được tạo."
 
-#: www/tag2tagadd.php:53
+#: www/tag2tagadd.php:57
 msgid "Failed to create the link"
 msgstr "Không thể tạo liên kết này"
 
-#: www/tag2tagadd.php:65
+#: www/tag2tagadd.php:69
 msgid "Add Tag Link"
 msgstr "Thêm một liên kết giữa các từ khoá"
 
@@ -1370,11 +1574,11 @@ msgstr "Xoá một liên kết giữa các từ khoá"
 msgid "Edit Link Between Tags"
 msgstr "Sửa một liên kết giữa các từ khoá"
 
-#: www/tagcommondescriptionedit.php:55
+#: www/tagcommondescriptionedit.php:62
 msgid "Tag common description updated"
 msgstr "Sửa mô tả chung của từ khoá"
 
-#: www/tagcommondescriptionedit.php:58
+#: www/tagcommondescriptionedit.php:67
 msgid "Failed to update the tag common description"
 msgstr "Không thể cập nhật mô tả chung của từ khoá"
 
@@ -1402,6 +1606,16 @@ msgstr "Từ khoá đã được đổi tên"
 msgid "Failed to rename the tag"
 msgstr "Lỗi trong việc đổi tên từ khoá"
 
+#: www/tags.php:71
+#, php-format
+msgid "%s: tagged with \"%s\""
+msgstr ""
+
+#: www/tags.php:84
+#, php-format
+msgid "%s: tagged with \"%s\" (+private %s)"
+msgstr ""
+
 #: www/users.php:31
 msgid "Users"
 msgstr "Những người tham gia"
@@ -1418,48 +1632,59 @@ msgstr "Tên truy cập đã được thêm vào danh sách liên lạc của b�
 msgid "My Watchlist"
 msgstr "Danh sách liên lạc của tôi"
 
-#: www/api/httpauth.inc.php:11
+#: www/api/httpauth.inc.php:30
 msgid "Use of the API calls requires authentication."
 msgstr "Sử dụng API để gọi yêu cầu chính thức."
 
-#: www/gsearch/index.php:27
+#: www/gsearch/index.php:51
 msgid "Come back to "
 msgstr "Quay lại"
 
-#: www/gsearch/index.php:32
+#: www/gsearch/index.php:56
 msgid "Admin tips: "
 msgstr "Lời khuyên của quản trị:"
 
-#: www/gsearch/index.php:33
+#: www/gsearch/index.php:57
 msgid "To refresh manually Google Custom Search Engine, goes to: "
-msgstr "Để khởi động lại điều khiển bằng tay của máy tìm kiếm Google, hãy đến :"
+msgstr ""
+"Để khởi động lại điều khiển bằng tay của máy tìm kiếm Google, hãy đến :"
 
-#: www/gsearch/index.php:35
-msgid "If no result appears, check that all the urls are valid in the admin section."
-msgstr "Nếu không có kết quả nào xuất hiệnt, hãy kiểm tra lại tất cả các đường link được xác nhận trong phần quản lí."
+#: www/gsearch/index.php:61
+msgid ""
+"If no result appears, check that all the urls are valid in the admin section."
+msgstr ""
+"Nếu không có kết quả nào xuất hiệnt, hãy kiểm tra lại tất cả các đường link "
+"được xác nhận trong phần quản lí."
 
 #~ 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 +1695,15 @@ msgstr "Nếu không có kết quả nào xuất hiệnt, hãy kiểm tra lại
 #~ "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/zh_CN/LC_MESSAGES/messages.mo b/data/locales/zh_CN/LC_MESSAGES/messages.mo
index 2bdc82e..7c38205 100644
--- a/data/locales/zh_CN/LC_MESSAGES/messages.mo
+++ b/data/locales/zh_CN/LC_MESSAGES/messages.mo
diff --git a/data/locales/zh_CN/LC_MESSAGES/messages.po b/data/locales/zh_CN/LC_MESSAGES/messages.po
index 2ee0b11..9906096 100644
--- a/data/locales/zh_CN/LC_MESSAGES/messages.po
+++ b/data/locales/zh_CN/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Scuttle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-29 11:17+0200\n"
+"POT-Creation-Date: 2012-01-20 13:58+0100\n"
 "PO-Revision-Date: 2006-03-18 21:45-0800\n"
 "Last-Translator: Marcus Campbell <marcus.campbell@gmail.com>\n"
 "Language-Team: zh-CN <ynzheng@gmail.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,810 +19,1672 @@ msgstr ""
 "X-Poedit-Country: CHINA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ..\..\..\about.php:25
-#: ..\..\..\templates\toolbar.inc.php:24
-msgid "About"
-msgstr "关于"
-
-#: ..\..\..\ajaxDelete.php:29
-msgid "You are not allowed to delete this bookmark"
-msgstr "您没有权限删除此条书签"
-
-#: ..\..\..\ajaxDelete.php:33
-msgid "Failed to delete bookmark"
-msgstr "删除书签失败"
-
-#: ..\..\..\alltags.php:50
-msgid "All Tags"
-msgstr "所有标签"
-
-#: ..\..\..\alltags.php:59
-#: ..\..\..\populartags.php:63
-#: ..\..\..\profile.php:46
-#: ..\..\..\rss.php:55
-#: ..\..\..\search.php:61
-#: ..\..\..\watch.php:35
-#: ..\..\..\watched.php:62
-#, php-format
-msgid "User with username %s not was not found"
-msgstr "未发现以 %s 为用户名的用户"
-
-#: ..\..\..\bookmarks.php:71
-#, fuzzy, php-format
-msgid "User with username %s was not found"
-msgstr "未发现以 %s 为用户名的用户"
-
-#: ..\..\..\bookmarks.php:94
-#: ..\..\..\edit.php:44
-msgid "Your bookmark must have a title and an address"
-msgstr "每条书签必须包含标题和网址"
-
-#: ..\..\..\bookmarks.php:114
-#: ..\..\..\edit.php:58
-msgid "Bookmark saved"
-msgstr "录入书签已被成功保存"
-
-#: ..\..\..\bookmarks.php:122
-#: ..\..\..\import.php:99
-#: ..\..\..\importNetscape.php:74
-msgid "There was an error saving your bookmark. Please try again or contact the administrator."
-msgstr "保存书签时出错，请再保存重试一次或者联系管理员"
-
-#: ..\..\..\bookmarks.php:160
-#: ..\..\..\templates\toolbar.inc.php:13
-msgid "Add a Bookmark"
-msgstr "添加书签"
-
-#: ..\..\..\bookmarks.php:163
-msgid "Add Bookmark"
-msgstr "添加书签"
-
-#: ..\..\..\bookmarks.php:166
-msgid "You must be logged in before you can add bookmarks."
-msgstr "您必须登陆后才能添加书签"
-
-#: ..\..\..\bookmarks.php:213
-msgid "My Bookmarks"
-msgstr "您的书签"
-
-#: ..\..\..\edit.php:29
-msgid "Edit Bookmark"
-msgstr "编辑书签"
-
-#: ..\..\..\edit.php:34
-#, php-format
-msgid "Bookmark with id %s not was not found"
-msgstr "id为 %s 的书签不存在"
-
-#: ..\..\..\edit.php:39
-msgid "You are not allowed to edit this bookmark"
-msgstr "您没有权限编辑此条书签"
-
-#: ..\..\..\edit.php:55
-msgid "Error while saving your bookmark"
-msgstr "在保存书签时出错"
-
-#: ..\..\..\edit.php:78
-msgid "Failed to delete the bookmark"
-msgstr "删除书签失败"
-
-#: ..\..\..\edit.php:88
-#: ..\..\..\templates\editprofile.tpl.php:52
-msgid "Save Changes"
-msgstr "保存修改"
-
-#: ..\..\..\functions.inc.php:92
+#: src/SemanticScuttle/functions.php:189
 msgid "message_die() was called multiple times."
 msgstr "message_die()被调用了多次"
 
-#: ..\..\..\functions.inc.php:104
+#: src/SemanticScuttle/functions.php:201
 msgid "SQL Error"
 msgstr "SQL出错"
 
-#: ..\..\..\functions.inc.php:110
+#: src/SemanticScuttle/functions.php:207
 msgid "Line"
 msgstr "行"
 
-#: ..\..\..\functions.inc.php:110
-#: ..\..\..\templates\importDelicious.tpl.php:8
-#: ..\..\..\templates\importNetscape.tpl.php:9
+#: src/SemanticScuttle/functions.php:207
+#: data/templates/default/importDelicious.tpl.php:8
+#: data/templates/default/importNetscape.tpl.php:9
+#: data/templates/default/importStructure.tpl.php:10
 msgid "File"
 msgstr "文件"
 
-#: ..\..\..\functions.inc.php:116
+#: src/SemanticScuttle/functions.php:215
 msgid "Information"
 msgstr "信息"
 
-#: ..\..\..\functions.inc.php:121
+#: src/SemanticScuttle/functions.php:220
 msgid "Critical Information"
 msgstr "关键性信息"
 
-#: ..\..\..\functions.inc.php:126
+#: src/SemanticScuttle/functions.php:225
 msgid "An error occured"
 msgstr "有错误发生"
 
-#: ..\..\..\functions.inc.php:129
+#: src/SemanticScuttle/functions.php:228
 msgid "General Error"
 msgstr "一般性错误"
 
-#: ..\..\..\functions.inc.php:137
+#: src/SemanticScuttle/functions.php:236
 msgid "An critical error occured"
 msgstr "有严重错误发生"
 
-#: ..\..\..\functions.inc.php:140
+#: src/SemanticScuttle/functions.php:239
 msgid "Critical Error"
 msgstr "严重错误"
 
-#: ..\..\..\functions.inc.php:149
+#: src/SemanticScuttle/functions.php:248
 msgid "DEBUG MODE"
 msgstr "调试模式"
 
-#: ..\..\..\history.php:65
-msgid "History"
+#: data/templates/default/about.tpl.php:6
+msgid ""
+"<strong>Store</strong> all your favourite links in one place, accessible "
+"from anywhere."
 msgstr ""
 
-#: ..\..\..\history.php:66
-#, php-format
-msgid "History for %s"
+#: data/templates/default/about.tpl.php:7
+msgid ""
+"<strong>Share</strong> your bookmarks with everyone, with friends on your "
+"watchlist or just keep them private."
 msgstr ""
+"您可以将您收藏的书签资源与所有朋友分享，也许因此发现与您志同道合的朋友。或者"
+"保存为只能您自己查看的私有状态"
 
-#: ..\..\..\history.php:81
-msgid "Address was not found"
+#: data/templates/default/about.tpl.php:8
+msgid ""
+"<strong>Tag</strong> your bookmarks with as many labels as you want, instead "
+"of wrestling with folders."
 msgstr ""
+"您可以将您认为优秀的站点用标签（Tag）定义，这是一种更为灵活的分类形式，方便您"
+"的发散记忆和管理。"
 
-#: ..\..\..\import.php:41
-msgid "Could not open XML input"
-msgstr "无法打开XML输入"
+#: data/templates/default/about.tpl.php:9
+#, fuzzy
+msgid "Register now"
+msgstr "注册"
 
-#: ..\..\..\import.php:45
+#: data/templates/default/about.tpl.php:9
 #, php-format
-msgid "XML error: %s at line %d"
-msgstr "XML错误: %s 发生在 %d 行"
-
-#: ..\..\..\import.php:54
-msgid "Import Bookmarks from del.icio.us"
-msgstr "将del.icio.us的书签文件导入 "
-
-#: ..\..\..\import.php:86
-#: ..\..\..\importNetscape.php:64
-msgid "You have already submitted this bookmark."
-msgstr "您过去已经录入过这条书签"
+msgid " to start using %s!"
+msgstr ""
 
-#: ..\..\..\import.php:97
-#: ..\..\..\importNetscape.php:72
-msgid "Bookmark imported."
-msgstr "书签导入完毕."
+#: data/templates/default/about.tpl.php:12
+msgid "Geek Stuff"
+msgstr "致谢"
 
-#: ..\..\..\importNetscape.php:81
-msgid "Import Bookmarks from Browser File"
-msgstr "将浏览器的书签文件导入（Internet Explorer, Mozilla Firefox and Netscape）"
+#: data/templates/default/about.tpl.php:14
+msgid "is licensed under the "
+msgstr ""
 
-#: ..\..\..\index.php:32
-msgid "You have now logged out"
-msgstr "您已经成功登出"
+#: data/templates/default/about.tpl.php:14
+msgid "you can freely host it on your own web server."
+msgstr ""
 
-#: ..\..\..\index.php:39
+#: data/templates/default/about.tpl.php:15
 #, php-format
-msgid "%s: Recent bookmarks"
-msgstr "%s: 最近书签"
-
-#: ..\..\..\index.php:72
-msgid "Store, share and tag your favourite links"
+msgid ""
+"%1$s supports most of the <a href=\"http://www.delicious.com/help/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 ""
 
-#: ..\..\..\index.php:73
-msgid "Recent Bookmarks"
-msgstr "最近书签"
-
-#: ..\..\..\jsScuttle.php:22
-msgid "Are you sure?"
+#: data/templates/default/about.tpl.php:24
+msgid "Tips"
 msgstr ""
 
-#: ..\..\..\jsScuttle.php:22
-msgid "Yes"
+#: data/templates/default/about.tpl.php:26
+msgid "Add search plugin into your browser:"
 msgstr ""
 
-#: ..\..\..\jsScuttle.php:22
-msgid "No"
+#: data/templates/default/about.tpl.php:27
+msgid ""
+"The secret tag \"system:unfiled\" allows you to find bookmarks without tags."
 msgstr ""
 
-#: ..\..\..\jsScuttle.php:68
-msgid "Available"
+#: data/templates/default/about.tpl.php:28
+msgid ""
+"The secret tag \"system:imported\" allows you to find imported bookmarks."
 msgstr ""
 
-#: ..\..\..\jsScuttle.php:71
+#: data/templates/default/admin.tpl.php:5
 #, fuzzy
-msgid "Not Available"
-msgstr "尚未有书签列入"
-
-#: ..\..\..\login.php:38
-msgid "The details you have entered are incorrect. Please try again."
-msgstr "您输入的详细信息不正确，请重试."
-
-#: ..\..\..\login.php:48
-#: ..\..\..\templates\login.tpl.php:26
-#: ..\..\..\templates\toolbar.inc.php:28
-msgid "Log In"
-msgstr "登陆"
+msgid "Users management"
+msgstr "用户帐号"
 
-#: ..\..\..\password.php:31
-msgid "You must enter your username."
+#: data/templates/default/admin.tpl.php:14
+msgid "Public/Shared/Private"
 msgstr ""
 
-#: ..\..\..\password.php:35
+#: data/templates/default/admin.tpl.php:14
+#: data/templates/default/bookmarks.tpl.php:115
 #, fuzzy
-msgid "You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "您 <em>必须</em> 输入用户名,密码,姓名和 <abbr title=\"电子邮件\">e-mail</abbr> 地址."
-
-#: ..\..\..\password.php:42
-msgid "No matches found for that username."
+msgid "bookmark(s)"
+msgstr "书签"
+
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/tag2tagadd.tpl.php:21
+#: data/templates/default/tag2tagdelete.tpl.php:13
+#: data/templates/default/tag2tagedit.tpl.php:14
+#: data/templates/default/tag2tagedit.tpl.php:35
+#: data/templates/default/tagdelete.tpl.php:6 www/jsScuttle.php:24
+msgid "Are you sure?"
 msgstr ""
 
-#: ..\..\..\password.php:45
-#, fuzzy
-msgid "No matches found for that combination of username and <abbr title=\"electronic mail\">e-mail</abbr> address."
-msgstr "您 <em>必须</em> 输入用户名,密码,姓名和 <abbr title=\"电子邮件\">e-mail</abbr> 地址."
-
-#: ..\..\..\password.php:53
-#, fuzzy
-msgid "There was an error while generating your new password. Please try again."
-msgstr "保存书签时出错，请再保存重试一次或者联系管理员"
+#: data/templates/default/admin.tpl.php:19
+#: data/templates/default/bookmarks.tpl.php:305
+msgid "Delete"
+msgstr "删除"
 
-#: ..\..\..\password.php:57
+#: data/templates/default/admin.tpl.php:27
 #, fuzzy
-msgid "Your new password is:"
-msgstr "确认密码"
+msgid "Other actions"
+msgstr "步骤和导入方法"
 
-#: ..\..\..\password.php:57
-msgid "To keep your bookmarks secure, you should change this password in your profile the next time you log in."
+#: data/templates/default/admin.tpl.php:29
+msgid "Check all URLs (May take some time)"
 msgstr ""
 
-#: ..\..\..\password.php:60
-#, fuzzy, php-format
-msgid "%s Account Information"
-msgstr "信息"
-
-#: ..\..\..\password.php:62
-#, php-format
-msgid "New password generated and sent to %s"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:16
+msgid ""
+"Collaborative description: these fields can be viewed and modified by every "
+"users"
 msgstr ""
 
-#: ..\..\..\password.php:69
-#, fuzzy
-msgid "Forgotten Password"
-msgstr "新的密码"
-
-#: ..\..\..\populartags.php:54
-#: ..\..\..\templates\dynamictags.inc.php:101
-#: ..\..\..\templates\sidebar.block.common.php:9
-#: ..\..\..\templates\sidebar.block.popular.php:15
-#: ..\..\..\templates\sidebar.block.recent.php:25
-msgid "Popular Tags"
-msgstr "热门标签"
-
-#: ..\..\..\profile.php:54
-#: ..\..\..\watched.php:114
-msgid "Username was not specified"
-msgstr "没有提供用户名"
-
-#: ..\..\..\profile.php:60
-#, fuzzy
-msgid "My Profile"
-msgstr "个人资料"
-
-#: ..\..\..\profile.php:62
-#: ..\..\..\templates\sidebar.block.profile.php:12
-msgid "Profile"
-msgstr "个人资料"
-
-#: ..\..\..\profile.php:80
-msgid "Password and confirmation do not match."
-msgstr "密码和确认密码不一致."
-
-#: ..\..\..\profile.php:84
-msgid "Password must be at least 6 characters long."
-msgstr "密码至少6位."
-
-#: ..\..\..\profile.php:88
-msgid "E-mail address is not valid."
-msgstr "Email地址不合法."
-
-#: ..\..\..\profile.php:92
-msgid "An error occurred while saving your changes."
-msgstr "保存修改时出错."
-
-#: ..\..\..\profile.php:94
-msgid "Changes saved."
-msgstr "保存修改成功."
-
-#: ..\..\..\register.php:33
-#, fuzzy
-msgid "You <em>must</em> enter a username, password and e-mail address."
-msgstr "您 <em>必须</em> 输入用户名,密码,姓名和 <abbr title=\"电子邮件\">e-mail</abbr> 地址."
-
-#: ..\..\..\register.php:37
-msgid "This username already exists, please make another choice."
-msgstr "用户名已经存在，请选择其他用户名."
-
-#: ..\..\..\register.php:41
-#, fuzzy
-msgid "E-mail address is not valid. Please try again."
-msgstr "Email地址不合法."
-
-#: ..\..\..\register.php:50
-msgid "You have successfully registered. Enjoy!"
-msgstr "您已经注册成功."
-
-#: ..\..\..\register.php:52
-msgid "Registration failed. Please try again."
-msgstr "注册失败，请重试."
-
-#: ..\..\..\register.php:57
-#: ..\..\..\templates\register.tpl.php:32
-#: ..\..\..\templates\toolbar.inc.php:27
-msgid "Register"
-msgstr "注册"
-
-#: ..\..\..\search.inc.php:29
-#: ..\..\..\search.inc.php:57
-msgid "Search"
-msgstr "搜索"
-
-#: ..\..\..\search.inc.php:35
-#, fuzzy
-msgid "this user's bookmarks"
-msgstr "%s 书签"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:18
+#: data/templates/default/bookmarks.tpl.php:159
+#: data/templates/default/editbookmark.tpl.php:51
+msgid "Title"
+msgstr "书签标题"
 
-#: ..\..\..\search.inc.php:40
-msgid "my bookmarks"
-msgstr "您的书签"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:23
+#: data/templates/default/editbookmark.tpl.php:57
+#: data/templates/default/editprofile.tpl.php:53
+#: data/templates/default/profile.tpl.php:33
+#: data/templates/default/tagcommondescriptionedit.tpl.php:13
+#: data/templates/default/tagedit.tpl.php:12
+msgid "Description"
+msgstr "描述"
 
-#: ..\..\..\search.inc.php:41
-#, fuzzy
-msgid "my watchlist"
-msgstr "将用户加入到您的关注列表"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:31
+#: data/templates/default/tagcommondescriptionedit.tpl.php:21
+msgid "Last modification:"
+msgstr ""
 
-#: ..\..\..\search.inc.php:45
-msgid "all bookmarks"
-msgstr "所有书签"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:43
+#: data/templates/default/tagcommondescriptionedit.tpl.php:33
+#: data/templates/default/tagedit.tpl.php:18
+msgid "Update"
+msgstr ""
 
-#: ..\..\..\search.inc.php:48
-msgid "for"
-msgstr "关于"
+#: data/templates/default/bookmarkcommondescriptionedit.tpl.php:44
+#: data/templates/default/editbookmark.tpl.php:111
+#: data/templates/default/tag2tagadd.tpl.php:24
+#: data/templates/default/tag2tagedit.tpl.php:38
+#: data/templates/default/tagcommondescriptionedit.tpl.php:34
+#: data/templates/default/tagedit.tpl.php:19
+#: data/templates/default/tagrename.tpl.php:25
+msgid "Cancel"
+msgstr ""
 
-#: ..\..\..\search.php:91
-#: ..\..\..\search.php:128
-msgid "Search Bookmarks"
-msgstr "搜索书签"
+#: data/templates/default/bookmarklet.inc.php:1
+msgid "Bookmarklet"
+msgstr "Bookmarklet"
 
-#: ..\..\..\search.php:97
-msgid "Search Results"
-msgstr "搜索结果"
+#: data/templates/default/bookmarklet.inc.php:11
+#, 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 ""
+"Bookmarklet是一个内含简单JavaScript代码的书签，使用的方法和您的浏览器中的书签"
+"一样，不同的地方是：书签是用来记录浏览的位置，而Bookmarklet则是记录某些对您正"
+"在浏览的页面进行处理的程序和方法。<br>使用Bookmarklet之前，您无需另外安装或下"
+"载程式，只要简单的将如下链接加入您的浏览器书签或是收藏夹之中。 <br>选择如下"
+"Bookmarklet之一,并将其加入到您的浏览器书签中,当您浏览并希望收藏其他网站页面"
+"时,只需点击您的浏览器中 Bookmarklet 书签,就会将您希望收藏的页面发布到 %s"
+
+#: data/templates/default/bookmarklet.inc.php:20
+#, 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 ""
+"Bookmarklet是一个内含简单JavaScript代码的书签，使用的方法和您的浏览器中的书签"
+"一样，不同的地方是：书签是用来记录浏览的位置，而Bookmarklet则是记录某些对您正"
+"在浏览的页面进行处理的程序和方法。<br>使用Bookmarklet之前，您无需另外安装或下"
+"载程式，只要简单的将如下链接加入您的浏览器书签或是收藏夹之中。 <br>选择如下"
+"Bookmarklet之一,并将其加入到您的浏览器书签中,当您浏览并希望收藏其他网站页面"
+"时,只需点击您的浏览器中 Bookmarklet 书签,就会将您希望收藏的页面发布到 %s"
+
+#: data/templates/default/bookmarklet.inc.php:67
+#: data/templates/default/bookmarklet.inc.php:100
+#, php-format
+msgid "Post to %s"
+msgstr "收藏到 %s"
 
-#: ..\..\..\tags.php:38
-#: ..\..\..\templates\editbookmark.tpl.php:44
-#: ..\..\..\templates\sidebar.block.profile.php:13
-msgid "Tags"
-msgstr "标签"
+#: data/templates/default/bookmarklet.inc.php:93
+#: data/templates/default/bookmarklet.inc.php:110
+#, php-format
+msgid "Post to %s (Pop-up)"
+msgstr "收藏到 %s（弹出窗口） "
 
-#: ..\..\..\watch.php:79
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:24
 #, php-format
-msgid "%s Bookmarks"
-msgstr "%s 书签"
+msgid "Voting <span class=\"voting\">%d</span>"
+msgstr ""
 
-#: ..\..\..\watch.php:84
-msgid "User removed from your watchlist"
-msgstr "已将用户从您的关注列表中删除"
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:32
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:35
+msgid "Vote for"
+msgstr ""
 
-#: ..\..\..\watch.php:86
-msgid "User added to your watchlist"
-msgstr "已将用户加入到您的关注列表中"
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:43
+#: data/templates/default/bookmarks-vote-horizontal.inc.tpl.php:46
+msgid "Vote against"
+msgstr ""
 
-#: ..\..\..\watched.php:105
-#, fuzzy
-msgid "My Watchlist"
-msgstr "我关注的其他用户"
+#: data/templates/default/bookmarks.tpl.php:43
+msgid "Bookmarks on this page are managed by an admin user."
+msgstr ""
 
-#: ..\..\..\watched.php:107
-#: ..\..\..\templates\sidebar.block.profile.php:14
-#: ..\..\..\templates\toolbar.inc.php:12
-#, fuzzy
-msgid "Watchlist"
-msgstr "我关注的其他用户"
+#: data/templates/default/bookmarks.tpl.php:73
+#: data/templates/default/bookmarks.tpl.php:74
+msgid "Edit the common description of this tag"
+msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:6
-msgid "<strong>Store</strong> all your favourite links in one place, accessible from anywhere."
+#: data/templates/default/bookmarks.tpl.php:77
+#: data/templates/default/bookmarks.tpl.php:78
+msgid "Edit the common description of this bookmark"
 msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:7
-msgid "<strong>Share</strong> your bookmarks with everyone, with friends on your watchlist or just keep them private."
-msgstr "您可以将您收藏的书签资源与所有朋友分享，也许因此发现与您志同道合的朋友。或者保存为只能您自己查看的私有状态"
+#: data/templates/default/bookmarks.tpl.php:98
+#: data/templates/default/bookmarks.tpl.php:99
+msgid "Edit your personal description of this tag"
+msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:8
-msgid "<strong>Tag</strong> your bookmarks with as many labels as you want, instead of wrestling with folders."
-msgstr "您可以将您认为优秀的站点用标签（Tag）定义，这是一种更为灵活的分类形式，方便您的发散记忆和管理。"
+#: data/templates/default/bookmarks.tpl.php:115
+#: data/templates/default/tags.tpl.php:10
+#: data/templates/default/users.tpl.php:8
+msgid "Sort by:"
+msgstr "排序方式:"
 
-#: ..\..\..\templates\about.tpl.php:9
-#, php-format
-msgid "<strong><a href=\"register.php\">Register now</a></strong> to start using %s!"
+#: data/templates/default/bookmarks.tpl.php:157
+msgid "Date"
+msgstr "发布时间"
+
+#: data/templates/default/bookmarks.tpl.php:162
+msgid "Voting"
 msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:12
-msgid "Geek Stuff"
-msgstr "致谢"
+#: data/templates/default/bookmarks.tpl.php:171
+msgid "Bookmarks from other users for this tag"
+msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:14
-#, php-format
-msgid "%s is based on <a href=\"http://sourceforge.net/projects/scuttle/\">an open-source project</a> licensed under the <a href=\"http://www.gnu.org/copyleft/gpl.html\"><acronym title=\"GNU's Not Unix\">GNU</acronym> General Public License</a>. This means you can host it on your own web server for free, whether it is on the Internet, a private network or just your own computer."
+#: data/templates/default/bookmarks.tpl.php:176
+msgid "Only your bookmarks for this tag"
 msgstr ""
 
-#: ..\..\..\templates\about.tpl.php:15
-#, php-format
-msgid "%1$s supports most of the <a href=\"http://www.delicious.com/help/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."
+#: data/templates/default/bookmarks.tpl.php:199
+#: data/templates/default/bookmarks.tpl.php:205
+msgid "First"
 msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:17
-#: ..\..\..\templates\tags.tpl.php:7
-msgid "Sort by:"
-msgstr "排序方式:"
+#: data/templates/default/bookmarks.tpl.php:200
+#: data/templates/default/bookmarks.tpl.php:206
+msgid "Previous"
+msgstr "上一页"
 
-#: ..\..\..\templates\bookmarks.tpl.php:18
-msgid "Date"
-msgstr "发布时间"
+#: data/templates/default/bookmarks.tpl.php:213
+#: data/templates/default/bookmarks.tpl.php:216
+msgid "Next"
+msgstr "下一页"
 
-#: ..\..\..\templates\bookmarks.tpl.php:19
-#: ..\..\..\templates\editbookmark.tpl.php:34
-msgid "Title"
-msgstr "书签标题"
+#: data/templates/default/bookmarks.tpl.php:214
+#: data/templates/default/bookmarks.tpl.php:217
+msgid "Last"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:233
+#, php-format
+msgid "Page %d of %d"
+msgstr "第 %d 页 / 共 %d 页"
 
-#: ..\..\..\templates\bookmarks.tpl.php:23
-msgid "URL"
-msgstr "URL网址"
+#: data/templates/default/bookmarks.tpl.php:295
+#, fuzzy
+msgid "Tags:"
+msgstr "标签"
 
-#: ..\..\..\templates\bookmarks.tpl.php:60
+#: data/templates/default/bookmarks.tpl.php:302
 msgid "Edit"
 msgstr "编辑"
 
-#: ..\..\..\templates\bookmarks.tpl.php:60
-msgid "Delete"
-msgstr "删除"
+#: data/templates/default/bookmarks.tpl.php:310
+msgid "Last update"
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:66
+#: data/templates/default/bookmarks.tpl.php:313
 msgid "by"
 msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:78
+#: data/templates/default/bookmarks.tpl.php:317
+msgid "you"
+msgstr ""
+
+#: data/templates/default/bookmarks.tpl.php:333
 #, fuzzy, php-format
 msgid " and %s1 other%s"
 msgstr "同时被其他 %s 个用户收藏"
 
-#: ..\..\..\templates\bookmarks.tpl.php:81
+#: data/templates/default/bookmarks.tpl.php:336
 #, fuzzy, php-format
 msgid " and %2$s%1$s others%3$s"
 msgstr "同时被其他 %s 个用户收藏"
 
-#: ..\..\..\templates\bookmarks.tpl.php:90
+#: data/templates/default/bookmarks.tpl.php:350
+#, fuzzy
+msgid "Copy this bookmark to YOUR bookmarks."
+msgstr ""
+"导入（Internet Explorer, Mozilla Firefox and Netscape）浏览器的书签文件"
+
+#: data/templates/default/bookmarks.tpl.php:351
 msgid "Copy"
 msgstr "复制"
 
-#: ..\..\..\templates\bookmarks.tpl.php:136
-#: ..\..\..\templates\bookmarks.tpl.php:142
-msgid "First"
+#: data/templates/default/bookmarks.tpl.php:376
+msgid "This bookmark is certified by an admin user."
 msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:137
-#: ..\..\..\templates\bookmarks.tpl.php:143
-msgid "Previous"
-msgstr "上一页"
-
-#: ..\..\..\templates\bookmarks.tpl.php:150
-#: ..\..\..\templates\bookmarks.tpl.php:153
-msgid "Next"
-msgstr "下一页"
+#: data/templates/default/bookmarks.tpl.php:430
+#, fuzzy
+msgid "Private Note on this bookmark"
+msgstr "您没有权限编辑此条书签"
 
-#: ..\..\..\templates\bookmarks.tpl.php:151
-#: ..\..\..\templates\bookmarks.tpl.php:154
-msgid "Last"
+#: data/templates/default/bookmarks.tpl.php:444
+msgid "Come back to the top of this page."
 msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:156
-#, php-format
-msgid "Page %d of %d"
-msgstr "第 %d 页 / 共 %d 页"
+#: data/templates/default/bookmarks.tpl.php:444
+msgid "Top of the page"
+msgstr ""
 
-#: ..\..\..\templates\bookmarks.tpl.php:160
+#: data/templates/default/bookmarks.tpl.php:450
 msgid "No bookmarks available"
 msgstr "尚未有书签列入"
 
-#: ..\..\..\templates\dynamictags.inc.php:108
-#: ..\..\..\templates\sidebar.block.common.php:15
-#: ..\..\..\templates\sidebar.block.popular.php:21
-#: ..\..\..\templates\sidebar.block.recent.php:20
-#: ..\..\..\templates\tags.tpl.php:16
+#: data/templates/default/bottom.inc.php:5
+#: data/templates/default/toolbar.inc.php:15
+#: data/templates/default/toolbar.inc.php:28 www/about.php:23 www/about.php:24
+msgid "About"
+msgstr "关于"
+
+#: data/templates/default/bottom.inc.php:7
+msgid "Propulsed by "
+msgstr ""
+
+#: data/templates/default/dynamictags.inc.php:56
+#: data/templates/default/sidebar.block.common.php:19
+#: data/templates/default/sidebar.block.popular.php:34
+#: data/templates/default/sidebar.block.recent.php:29
+#: data/templates/default/tags.tpl.php:19
 msgid "bookmark"
 msgid_plural "bookmarks"
 msgstr[0] "书签"
 msgstr[1] "书签"
 
-#: ..\..\..\templates\editbookmark.tpl.php:29
+#: data/templates/default/dynamictags.inc.php:105
+#: data/templates/default/sidebar.block.common.php:9
+#: data/templates/default/sidebar.block.menu.php:74
+#: data/templates/default/sidebar.block.popular.php:23
+#: data/templates/default/sidebar.block.recent.php:34
+#: data/templates/default/toolbar.inc.php:27 www/populartags.php:46
+msgid "Popular Tags"
+msgstr "热门标签"
+
+#: data/templates/default/dynamictags.inc.php:108
+#, fuzzy
+msgid "Popular Tags From All Users"
+msgstr "热门标签"
+
+#: data/templates/default/editbookmark.tpl.php:46
 msgid "Address"
 msgstr "网址"
 
-#: ..\..\..\templates\editbookmark.tpl.php:31
-#: ..\..\..\templates\editbookmark.tpl.php:36
-#: ..\..\..\templates\editprofile.tpl.php:31
+#: data/templates/default/editbookmark.tpl.php:48
+#: data/templates/default/editbookmark.tpl.php:53
+#: data/templates/default/editprofile.tpl.php:29
+#: data/templates/default/tagrename.tpl.php:14
+#: data/templates/default/tagrename.tpl.php:19
 msgid "Required"
 msgstr "必填项目"
 
-#: ..\..\..\templates\editbookmark.tpl.php:39
-#: ..\..\..\templates\editprofile.tpl.php:47
-#: ..\..\..\templates\profile.tpl.php:28
-msgid "Description"
-msgstr "描述"
+#: data/templates/default/editbookmark.tpl.php:58
+msgid "Add Note"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:61
+msgid ""
+"You can use anchors to delimite attributes. for example: [publisher]blah[/"
+"publisher] "
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:64
+msgid "Suggested anchors: "
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:76
+#, fuzzy
+msgid "Private Note"
+msgstr "仅本用户"
+
+#: data/templates/default/editbookmark.tpl.php:78
+msgid "Just visible by you and your contacts."
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:82
+#: data/templates/default/toolbar.inc.php:10 www/tags.php:45 www/tags.php:67
+msgid "Tags"
+msgstr "标签"
 
-#: ..\..\..\templates\editbookmark.tpl.php:46
+#: data/templates/default/editbookmark.tpl.php:86
 msgid "Comma-separated"
 msgstr "以单字节逗号分开"
 
-#: ..\..\..\templates\editbookmark.tpl.php:49
-#: ..\..\..\templates\importDelicious.tpl.php:15
-#: ..\..\..\templates\importNetscape.tpl.php:16
+#: data/templates/default/editbookmark.tpl.php:90
+#: data/templates/default/tag2tagadd.tpl.php:9
+msgid ""
+"Note: use \">\" to include one tag in another. e.g.: europe>france>paris"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:94
+#: data/templates/default/tag2tagadd.tpl.php:8
+msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry"
+msgstr ""
+
+#: data/templates/default/editbookmark.tpl.php:97
+#: data/templates/default/importDelicious.tpl.php:15
+#: data/templates/default/importNetscape.tpl.php:16
 msgid "Privacy"
 msgstr "私密"
 
-#: ..\..\..\templates\editbookmark.tpl.php:52
-#: ..\..\..\templates\importDelicious.tpl.php:18
-#: ..\..\..\templates\importNetscape.tpl.php:19
+#: data/templates/default/editbookmark.tpl.php:100
+#: data/templates/default/importDelicious.tpl.php:18
+#: data/templates/default/importNetscape.tpl.php:19
 msgid "Public"
 msgstr "公开发布"
 
-#: ..\..\..\templates\editbookmark.tpl.php:53
-#: ..\..\..\templates\importDelicious.tpl.php:19
-#: ..\..\..\templates\importNetscape.tpl.php:20
+#: data/templates/default/editbookmark.tpl.php:101
 msgid "Shared with Watch List"
 msgstr "仅关注者"
 
-#: ..\..\..\templates\editbookmark.tpl.php:54
-#: ..\..\..\templates\importDelicious.tpl.php:20
-#: ..\..\..\templates\importNetscape.tpl.php:21
+#: data/templates/default/editbookmark.tpl.php:102
+#: data/templates/default/importDelicious.tpl.php:20
+#: data/templates/default/importNetscape.tpl.php:21
 msgid "Private"
 msgstr "仅本用户"
 
-#: ..\..\..\templates\editbookmark.tpl.php:66
+#: data/templates/default/editbookmark.tpl.php:115
 msgid "Delete Bookmark"
 msgstr "删除书签"
 
-#: ..\..\..\templates\editbookmark.tpl.php:93
-msgid "Bookmarklet"
-msgstr "Bookmarklet"
-
-#: ..\..\..\templates\editbookmark.tpl.php:94
-#, 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 "Bookmarklet是一个内含简单JavaScript代码的书签，使用的方法和您的浏览器中的书签一样，不同的地方是：书签是用来记录浏览的位置，而Bookmarklet则是记录某些对您正在浏览的页面进行处理的程序和方法。<br>使用Bookmarklet之前，您无需另外安装或下载程式，只要简单的将如下链接加入您的浏览器书签或是收藏夹之中。 <br>选择如下Bookmarklet之一,并将其加入到您的浏览器书签中,当您浏览并希望收藏其他网站页面时,只需点击您的浏览器中 Bookmarklet 书签,就会将您希望收藏的页面发布到 %s"
-
-#: ..\..\..\templates\editbookmark.tpl.php:106
-#, php-format
-msgid "Post to %s"
-msgstr "收藏到 %s"
-
-#: ..\..\..\templates\editbookmark.tpl.php:107
-#, php-format
-msgid "Post to %s (Pop-up)"
-msgstr "收藏到 %s（弹出窗口） "
+#: data/templates/default/editbookmark.tpl.php:120
+msgid "edit common description"
+msgstr ""
 
-#: ..\..\..\templates\editbookmark.tpl.php:111
-#: ..\..\..\templates\importDelicious.tpl.php:26
-#: ..\..\..\templates\importNetscape.tpl.php:27
+#: data/templates/default/editbookmark.tpl.php:212
+#: data/templates/default/importDelicious.tpl.php:26
+#: data/templates/default/importNetscape.tpl.php:27
+#: data/templates/default/importStructure.tpl.php:16
 msgid "Import"
 msgstr "导入书签"
 
-#: ..\..\..\templates\editbookmark.tpl.php:113
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Import bookmarks from bookmark file"
-msgstr "导入（Internet Explorer, Mozilla Firefox and Netscape）浏览器的书签文件"
+msgstr ""
+"导入（Internet Explorer, Mozilla Firefox and Netscape）浏览器的书签文件"
 
-#: ..\..\..\templates\editbookmark.tpl.php:113
+#: data/templates/default/editbookmark.tpl.php:214
 msgid "Internet Explorer, Mozilla Firefox and Netscape"
 msgstr "Internet Explorer, Mozilla Firefox and Netscape"
 
-#: ..\..\..\templates\editbookmark.tpl.php:114
+#: data/templates/default/editbookmark.tpl.php:215
 msgid "Import bookmarks from del.icio.us"
 msgstr "导入del.icio.us的书签文件"
 
-#: ..\..\..\templates\editprofile.tpl.php:10
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:11
+msgid "SSL client certificates"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:17
+msgid "Serial"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:45
+#: data/templates/default/profile.tpl.php:17
+msgid "Name"
+msgstr "用户全名"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:19
+#: data/templates/default/profile.tpl.php:11
+#, fuzzy
+msgid "Email"
+msgstr "用户Email"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:20
+msgid "Issuer"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:30
+#, fuzzy
+msgid "delete"
+msgstr "删除"
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:43
+msgid "No certificates registered"
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:48
+msgid "Your current certificate is already registered with your account."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:53
+msgid "Register current certificate to automatically login."
+msgstr ""
+
+#: data/templates/default/editprofile-sslclientcerts.tpl.php:59
+msgid "Your browser does not provide a certificate."
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:8
 msgid "Account Details"
 msgstr ""
 
-#: ..\..\..\templates\editprofile.tpl.php:14
-#: ..\..\..\templates\login.tpl.php:15
-#: ..\..\..\templates\password.tpl.php:10
-#: ..\..\..\templates\profile.tpl.php:7
-#: ..\..\..\templates\register.tpl.php:16
+#: data/templates/default/editprofile.tpl.php:12
+#: data/templates/default/login.tpl.php:21
+#: data/templates/default/password.tpl.php:10
+#: data/templates/default/profile.tpl.php:6
+#: data/templates/default/register.tpl.php:16
 msgid "Username"
 msgstr "用户帐号"
 
-#: ..\..\..\templates\editprofile.tpl.php:19
+#: data/templates/default/editprofile.tpl.php:17
 msgid "New Password"
 msgstr "新的密码"
 
-#: ..\..\..\templates\editprofile.tpl.php:24
+#: data/templates/default/editprofile.tpl.php:22
 #, fuzzy
 msgid "Confirm Password"
 msgstr "确认密码"
 
-#: ..\..\..\templates\editprofile.tpl.php:29
-#: ..\..\..\templates\register.tpl.php:26
+#: data/templates/default/editprofile.tpl.php:27
+#: data/templates/default/password.tpl.php:14
+#: data/templates/default/register.tpl.php:26
 msgid "E-mail"
 msgstr "用户Email"
 
-#: ..\..\..\templates\editprofile.tpl.php:35
-msgid "Personal Details"
+#: data/templates/default/editprofile.tpl.php:32
+#, fuzzy
+msgid "Private RSS Feed"
+msgstr "仅本用户"
+
+#: data/templates/default/editprofile.tpl.php:34
+msgid "Enable"
 msgstr ""
 
-#: ..\..\..\templates\editprofile.tpl.php:39
-#: ..\..\..\templates\profile.tpl.php:12
-msgid "Name"
-msgstr "用户全名"
+#: data/templates/default/editprofile.tpl.php:36
+#, fuzzy
+msgid "Generate New Key"
+msgstr "新的密码"
 
-#: ..\..\..\templates\editprofile.tpl.php:43
-#: ..\..\..\templates\profile.tpl.php:18
+#: data/templates/default/editprofile.tpl.php:41
+msgid "Personal Details"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:49
+#: data/templates/default/profile.tpl.php:23
 msgid "Homepage"
 msgstr "用户网站"
 
-#: ..\..\..\templates\error.404.tpl.php:5
+#: data/templates/default/editprofile.tpl.php:58 www/edit.php:113
+msgid "Save Changes"
+msgstr "保存修改"
+
+#: data/templates/default/editprofile.tpl.php:63
+#: data/templates/default/sidebar.block.tagactions.php:17
+#: data/templates/default/sidebar.block.watchstatus.php:18
+#, fuzzy
+msgid "Actions"
+msgstr "步骤和导入方法"
+
+#: data/templates/default/editprofile.tpl.php:66
+#, fuzzy
+msgid "Export bookmarks"
+msgstr "您的书签"
+
+#: data/templates/default/editprofile.tpl.php:68
+msgid "HTML file (for browsers)"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:69
+msgid "XML file (like del.icio.us)"
+msgstr ""
+
+#: data/templates/default/editprofile.tpl.php:70
+msgid "CSV file (for spreadsheet tools)"
+msgstr ""
+
+#: data/templates/default/error.404.tpl.php:5
 msgid "Not Found"
 msgstr "文件不存在"
 
-#: ..\..\..\templates\error.404.tpl.php:6
+#: data/templates/default/error.404.tpl.php:6
 msgid "The requested URL was not found on this server"
 msgstr "您指定的文件不存在。"
 
-#: ..\..\..\templates\error.500.tpl.php:5
+#: data/templates/default/error.500.tpl.php:5
 msgid "General server error"
 msgstr "一般性服务器错误"
 
-#: ..\..\..\templates\error.500.tpl.php:6
+#: data/templates/default/error.500.tpl.php:6
 msgid "The requested URL could not be processed"
 msgstr "无法对您指定的文件进行导入操作。"
 
-#: ..\..\..\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 "登录<a href=\"http://del.icio.us/api/posts/all\">del.icio.us</a>导出书签数据"
+#: data/templates/default/importDelicious.tpl.php:19
+#: data/templates/default/importNetscape.tpl.php:20
+#, fuzzy
+msgid "Shared with Watchlist"
+msgstr "仅关注者"
+
+#: data/templates/default/importDelicious.tpl.php:31
+#: data/templates/default/importNetscape.tpl.php:32
+#: data/templates/default/importStructure.tpl.php:21
+msgid "Instructions"
+msgstr "步骤和导入方法"
+
+#: data/templates/default/importDelicious.tpl.php:33
+#, fuzzy
+msgid ""
+"Log in to the <a href=\"https://api.del.icio.us/v1/posts/all\">export page "
+"at del.icio.us</a>"
+msgstr ""
+"登录<a href=\"http://del.icio.us/api/posts/all\">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 "保存<abbr title=\"Extensible Markup Language\">XML</abbr>文件到您的电脑中。"
+#: data/templates/default/importDelicious.tpl.php:34
+msgid ""
+"Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> "
+"file to your computer"
+msgstr ""
+"保存<abbr title=\"Extensible Markup Language\">XML</abbr>文件到您的电脑中。"
 
-#: ..\..\..\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"
+#: data/templates/default/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 "点击<kbd>浏览...</kbd>在您的电脑中找到书签文件,最大允许导入1Mb数据"
 
-#: ..\..\..\templates\importDelicious.tpl.php:36
-#: ..\..\..\templates\importNetscape.tpl.php:43
+#: data/templates/default/importDelicious.tpl.php:36
+#: data/templates/default/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
-msgid "Click <kbd>Import</kbd> to start importing the bookmarks; it may take a minute"
+#: data/templates/default/importDelicious.tpl.php:37
+#: data/templates/default/importNetscape.tpl.php:44
+msgid ""
+"Click <kbd>Import</kbd> to start importing the bookmarks; it may take a "
+"minute"
 msgstr "点击<kbd>导入</kbd>书签开始导入,耗时1分钟左右。"
 
-#: ..\..\..\templates\importNetscape.tpl.php:32
-msgid "Instructions"
-msgstr "步骤和导入方法"
-
-#: ..\..\..\templates\importNetscape.tpl.php:35
+#: data/templates/default/importNetscape.tpl.php:35
 msgid "Export your bookmarks from your browser to a file"
 msgstr "将您的浏览器书签数据导出为一个文件"
 
-#: ..\..\..\templates\importNetscape.tpl.php:37
-msgid "Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
+#: data/templates/default/importNetscape.tpl.php:37
+msgid ""
+"Internet Explorer: <kbd>File &gt; Import and Export... &gt; Export Favorites"
 msgstr "Internet Explorer: <kbd>文件 &gt; 导入和导出... &gt; 导出收藏夹 "
 
-#: ..\..\..\templates\importNetscape.tpl.php:38
-msgid "Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; Export..."
-msgstr "Mozilla Firefox: <kbd>书签 &gt; 管理书签... &gt; 文件 &gt; 导出书签... "
+#: data/templates/default/importNetscape.tpl.php:38
+msgid ""
+"Mozilla Firefox: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; File &gt; "
+"Export..."
+msgstr ""
+"Mozilla Firefox: <kbd>书签 &gt; 管理书签... &gt; 文件 &gt; 导出书签... "
 
-#: ..\..\..\templates\importNetscape.tpl.php:39
-msgid "Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
+#: data/templates/default/importNetscape.tpl.php:39
+msgid ""
+"Netscape: <kbd>Bookmarks &gt; Manage Bookmarks... &gt; Tools &gt; Export..."
 msgstr "Netscape: <kbd>书签 &gt; 管理书签... &gt; 工具 &gt;> 导出书签... "
 
-#: ..\..\..\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"
+#: data/templates/default/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 "点击<kbd>浏览...</kbd> 在您的电脑中找到书签文件,最大允许导入1Mb数据"
 
-#: ..\..\..\templates\login.tpl.php:20
-#: ..\..\..\templates\register.tpl.php:21
+#: data/templates/default/importStructure.tpl.php:24
+msgid "Create your structure into a simple text file and following this model:"
+msgstr ""
+
+#: data/templates/default/importStructure.tpl.php:35
+msgid ""
+"Then import the file. The tags and their relations will be added to your "
+"profile."
+msgstr ""
+
+#: data/templates/default/login.tpl.php:13
+msgid "Please activate cookies"
+msgstr ""
+
+#: data/templates/default/login.tpl.php:26
+#: data/templates/default/register.tpl.php:21
 msgid "Password"
 msgstr "密码"
 
-#: ..\..\..\templates\login.tpl.php:22
+#: data/templates/default/login.tpl.php:28
 msgid "Don't ask for my password for 2 weeks"
 msgstr "存储帐号密码信息2周"
 
-#: ..\..\..\templates\login.tpl.php:30
+#: data/templates/default/login.tpl.php:32
+#: data/templates/default/toolbar.inc.php:29 www/login.php:57
+msgid "Log In"
+msgstr "登陆"
+
+#: data/templates/default/login.tpl.php:36
 msgid "Forgotten your password?"
 msgstr ""
 
-#: ..\..\..\templates\password.tpl.php:5
+#: data/templates/default/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."
+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 ""
 
-#: ..\..\..\templates\password.tpl.php:14
-msgid "<abbr title=\"Electronic mail\">E-mail</abbr>"
-msgstr "<abbr title=\"电子邮件l\">E-mail</abbr>"
-
-#: ..\..\..\templates\password.tpl.php:19
+#: data/templates/default/password.tpl.php:19
 #, fuzzy
 msgid "Generate Password"
 msgstr "新的密码"
 
-#: ..\..\..\templates\profile.tpl.php:23
+#: data/templates/default/profile.tpl.php:28
 msgid "Member Since"
 msgstr "注册时间"
 
-#: ..\..\..\templates\profile.tpl.php:35
-#: ..\..\..\templates\sidebar.block.watchlist.php:8
+#: data/templates/default/profile.tpl.php:40
+#: data/templates/default/sidebar.block.watchlist.php:30
 #, fuzzy
 msgid "Watching"
 msgstr "我关注的其他用户"
 
-#: ..\..\..\templates\profile.tpl.php:50
+#: data/templates/default/profile.tpl.php:55
+#: data/templates/default/sidebar.block.watchlist.php:52
 msgid "Watched By"
 msgstr "关注该用户的其他用户"
 
-#: ..\..\..\templates\register.tpl.php:11
+#: data/templates/default/profile.tpl.php:68
+#: data/templates/default/toolbar.inc.php:9
+#, fuzzy
+msgid "Bookmarks"
+msgstr "%s 书签"
+
+#: data/templates/default/profile.tpl.php:69
+#, fuzzy
+msgid "Go to bookmarks"
+msgstr "您的书签"
+
+#: data/templates/default/register.tpl.php:11
 #, php-format
-msgid "Sign up here to create a free %s account. All the information requested below is required"
+msgid ""
+"Sign up here to create a free %s account. All the information requested "
+"below is required"
 msgstr "您可以免费注册成为 %s 的用户，请填写如下表单:"
 
-#: ..\..\..\templates\rss.tpl.php:9
+#: data/templates/default/register.tpl.php:18
+msgid ""
+" at least 5 characters, alphanumeric (no spaces, no dots or other special "
+"ones)"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:28
+msgid " to send you your password if you forget it"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:33
+msgid "Antispam question"
+msgstr ""
+
+#: data/templates/default/register.tpl.php:41
+#: data/templates/default/toolbar.inc.php:31 www/register.php:99
+msgid "Register"
+msgstr "注册"
+
+#: data/templates/default/search.menu.php:27
+#, fuzzy
+msgid "Search..."
+msgstr "搜索"
+
+#: data/templates/default/search.menu.php:28
+#, fuzzy
+msgid "in"
+msgstr "行"
+
+#: data/templates/default/search.menu.php:34
+#, fuzzy
+msgid "this user's bookmarks"
+msgstr "%s 书签"
+
+#: data/templates/default/search.menu.php:39
+msgid "my bookmarks"
+msgstr "您的书签"
+
+#: data/templates/default/search.menu.php:40
+#, fuzzy
+msgid "my watchlist"
+msgstr "将用户加入到您的关注列表"
+
+#: data/templates/default/search.menu.php:44
+msgid "all bookmarks"
+msgstr "所有书签"
+
+#: data/templates/default/search.menu.php:54
+msgid "Search"
+msgstr "搜索"
+
+#: data/templates/default/sidebar.block.linked.php:23
+#, fuzzy
+msgid "Linked Tags"
+msgstr "关联标签"
+
+#: data/templates/default/sidebar.block.linked.php:28
+#: data/templates/default/sidebar.block.menu.php:46
+msgid "Add new link"
+msgstr ""
+
+#: data/templates/default/sidebar.block.linked.php:29
+#: data/templates/default/sidebar.block.menu.php:47
+#, fuzzy
+msgid "Delete link"
+msgstr "删除"
+
+#: data/templates/default/sidebar.block.menu.php:35
 #, php-format
-msgid "Recent bookmarks posted to %s"
-msgstr "最新发布到%s的书签"
+msgid "Tags included into the tag '%s'"
+msgstr ""
 
-#: ..\..\..\templates\rss.tpl.php:17
-#: ..\..\..\templates\rss.tpl.php:19
-msgid "No bookmarks found"
-msgstr "尚无书签"
+#: data/templates/default/sidebar.block.menu.php:35
+#, fuzzy
+msgid "Menu Tags"
+msgstr "最新标签"
+
+#: data/templates/default/sidebar.block.menu.php:68
+msgid "See all your tags"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:68
+msgid "all your tags"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:70
+msgid "See all tags from this user"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:70
+msgid "all tags from this user"
+msgstr ""
+
+#: data/templates/default/sidebar.block.menu.php:74
+#, fuzzy
+msgid "See popular tags"
+msgstr "热门标签"
+
+#: data/templates/default/sidebar.block.menu2.php:21
+#, fuzzy
+msgid "Featured Menu Tags"
+msgstr "关联标签"
 
-#: ..\..\..\templates\sidebar.block.recent.php:15
+#: data/templates/default/sidebar.block.menu2.php:25
+msgid "This menu is composed of keywords (tags) organized by admins."
+msgstr ""
+
+#: data/templates/default/sidebar.block.recent.php:18
 msgid "Recent Tags"
 msgstr "最新标签"
 
-#: ..\..\..\templates\sidebar.block.related.php:15
+#: data/templates/default/sidebar.block.related.php:26
 msgid "Related Tags"
 msgstr "关联标签"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:10
+#: data/templates/default/sidebar.block.search.php:28
+#, fuzzy
+msgid "Last Searches"
+msgstr "搜索"
+
+#: data/templates/default/sidebar.block.search.php:40
+#, fuzzy
+msgid "Number of bookmarks for this query"
+msgstr "尚无书签"
+
+#: data/templates/default/sidebar.block.tagactions.php:9 www/tagrename.php:72
+#, fuzzy
+msgid "Rename Tag"
+msgid_plural "Rename Tags"
+msgstr[0] "关联标签"
+msgstr[1] "关联标签"
+
+#: data/templates/default/sidebar.block.tagactions.php:22 www/tagdelete.php:54
+#, fuzzy
+msgid "Delete Tag"
+msgstr "删除"
+
+#: data/templates/default/sidebar.block.tagactions.php:24 www/tagedit.php:61
+#, fuzzy
+msgid "Edit Tag Description"
+msgstr "描述"
+
+#: data/templates/default/sidebar.block.tagactions.php:26
+#: www/tagcommondescriptionedit.php:76
+msgid "Edit Tag Common Description"
+msgstr ""
+
+#: data/templates/default/sidebar.block.tagactions.php:28
+msgid "Create a link to another tag"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:14
+msgid "New Users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:23
+#: data/templates/default/users.tpl.php:24
+#, fuzzy
+msgid "bookmarks"
+msgstr "书签"
+
+#: data/templates/default/sidebar.block.users.php:30
+msgid "See all users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.users.php:30
+msgid "All users"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:19
+msgid "Close contacts are mutual contacts"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:19
+msgid "Close contacts"
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:36
+msgid "Add a contact..."
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:36
+msgid "Type a username to add it to your contacts."
+msgstr ""
+
+#: data/templates/default/sidebar.block.watchlist.php:44
+#, fuzzy
+msgid "Remove this contact"
+msgstr "将用户从您的关注列表中删除"
+
+#: data/templates/default/sidebar.block.watchstatus.php:11
 msgid "Remove from Watchlist"
 msgstr "将用户从您的关注列表中删除"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:12
+#: data/templates/default/sidebar.block.watchstatus.php:13
 msgid "Add to Watchlist"
 msgstr "将用户加入到您的关注列表"
 
-#: ..\..\..\templates\sidebar.block.watchstatus.php:17
+#: data/templates/default/sidebar.linkedtags.inc.php:18
 #, fuzzy
-msgid "Actions"
-msgstr "步骤和导入方法"
+msgid "Edit link"
+msgstr "编辑"
 
-#: ..\..\..\templates\tags.tpl.php:8
+#: data/templates/default/sidebar.linkedtags.inc.php:47
+msgid "Synonyms:"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:12
+msgid "Create new link:"
+msgstr ""
+
+#: data/templates/default/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 ""
+
+#: data/templates/default/tag2tagadd.tpl.php:23
+#: data/templates/default/tag2tagedit.tpl.php:37
+msgid "Create"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:35
+#: data/templates/default/tag2tagdelete.tpl.php:27
+#: data/templates/default/tag2tagedit.tpl.php:51
+msgid "Existing links:"
+msgstr ""
+
+#: data/templates/default/tag2tagadd.tpl.php:53
+#: data/templates/default/tag2tagdelete.tpl.php:45
+#: data/templates/default/tag2tagedit.tpl.php:69
+msgid "No links"
+msgstr ""
+
+#: data/templates/default/tag2tagdelete.tpl.php:15
+#: data/templates/default/tag2tagedit.tpl.php:16
+#: data/templates/default/tagdelete.tpl.php:8 www/jsScuttle.php:24
+msgid "Yes"
+msgstr ""
+
+#: data/templates/default/tag2tagdelete.tpl.php:16
+#: data/templates/default/tag2tagedit.tpl.php:17
+#: data/templates/default/tagdelete.tpl.php:9 www/jsScuttle.php:24
+msgid "No"
+msgstr ""
+
+#: data/templates/default/tag2tagedit.tpl.php:6
+msgid "Delete the link"
+msgstr ""
+
+#: data/templates/default/tag2tagedit.tpl.php:29
+msgid "Create new link"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:12
+msgid "Old"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:17
+msgid "New"
+msgstr ""
+
+#: data/templates/default/tagrename.tpl.php:24
+#, fuzzy
+msgid "Rename"
+msgstr "用户帐号"
+
+#: data/templates/default/tags.tpl.php:11
+#: data/templates/default/users.tpl.php:9
 msgid "Alphabet"
 msgstr ""
 
-#: ..\..\..\templates\tags.tpl.php:9
+#: data/templates/default/tags.tpl.php:12
+#: data/templates/default/users.tpl.php:10
 #, fuzzy
 msgid "Popularity"
 msgstr "热门标签"
 
-#: ..\..\..\templates\toolbar.inc.php:11
+#: data/templates/default/toolbar.inc.php:8
+#: data/templates/default/toolbar.inc.php:26
 #, fuzzy
-msgid "Bookmarks"
-msgstr "%s 书签"
+msgid "Home"
+msgstr "用户网站"
+
+#: data/templates/default/toolbar.inc.php:11 www/watchlist.php:106
+#, fuzzy
+msgid "Watchlist"
+msgstr "我关注的其他用户"
+
+#: data/templates/default/toolbar.inc.php:12 www/profile.php:79
+msgid "Profile"
+msgstr "个人资料"
+
+#: data/templates/default/toolbar.inc.php:13 www/bookmarks.php:215
+msgid "Add a Bookmark"
+msgstr "添加书签"
 
-#: ..\..\..\templates\toolbar.inc.php:16
+#: data/templates/default/toolbar.inc.php:14
 msgid "Log Out"
 msgstr "登出"
 
+#: data/templates/default/toolbar.inc.php:17
+msgid "Admin"
+msgstr ""
+
+#: data/templates/default/top.inc.php:57
+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/default/users.tpl.php:20
+#, fuzzy
+msgid "profile"
+msgstr "个人资料"
+
+#: data/templates/default/users.tpl.php:21
+msgid "created in"
+msgstr ""
+
+#: www/admin.php:32
+msgid "Manage users"
+msgstr ""
+
+#: www/admin.php:69
+#, php-format
+msgid "%s and all his bookmarks and tags were deleted."
+msgstr ""
+
+#: www/admin.php:76
+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:50
+msgid "All Tags"
+msgstr "所有标签"
+
+#: www/alltags.php:56 www/bookmarks.php:99 www/populartags.php:52
+#: www/profile.php:55 www/rss.php:100 www/search.php:111 www/watch.php:45
+#: www/watchlist.php:61
+#, fuzzy, php-format
+msgid "User with username %s was not found"
+msgstr "未发现以 %s 为用户名的用户"
+
+#: 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 ""
+
+#: www/bookmarkcommondescriptionedit.php:60
+msgid "Bookmark common description updated"
+msgstr ""
+
+#: www/bookmarkcommondescriptionedit.php:63
+#, fuzzy
+msgid "Failed to update the bookmark common description"
+msgstr "删除书签失败"
+
+#: www/bookmarkcommondescriptionedit.php:71
+msgid "Edit Bookmark Common Description"
+msgstr ""
+
+#: www/bookmarks.php:114 www/tags.php:47
+msgid "Remove the tag from the selection"
+msgstr ""
+
+#: www/bookmarks.php:134 www/edit.php:65
+msgid "Your bookmark must have a title and an address"
+msgstr "每条书签必须包含标题和网址"
+
+#: www/bookmarks.php:139
+msgid "This bookmark URL may not be added"
+msgstr ""
+
+#: www/bookmarks.php:158 www/edit.php:83 www/edit.php:86
+msgid "Bookmark saved"
+msgstr "录入书签已被成功保存"
+
+#: www/bookmarks.php:158
+msgid "(Come back to previous page.)"
+msgstr ""
+
+#: www/bookmarks.php:165 www/import.php:106 www/importNetscape.php:108
+msgid ""
+"There was an error saving your bookmark. Please try again or contact the "
+"administrator."
+msgstr "保存书签时出错，请再保存重试一次或者联系管理员"
+
+#: www/bookmarks.php:222
+msgid "Add Bookmark"
+msgstr "添加书签"
+
+#: www/bookmarks.php:225
+msgid "You must be logged in before you can add bookmarks."
+msgstr "您必须登陆后才能添加书签"
+
+#: www/bookmarks.php:270
+#, php-format
+msgid "%s: %s"
+msgstr ""
+
+#: www/bookmarks.php:283
+#, php-format
+msgid "%s: %s (+private %s)"
+msgstr ""
+
+#: www/bookmarks.php:305 www/bookmarks.php:306
+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 "id为 %s 的书签不存在"
+
+#: 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/import.php:47
+msgid "Could not open XML input"
+msgstr "无法打开XML输入"
+
+#: www/import.php:51
+#, php-format
+msgid "XML error: %s at line %d"
+msgstr "XML错误: %s 发生在 %d 行"
+
+#: www/import.php:60
+msgid "Import Bookmarks from del.icio.us"
+msgstr "将del.icio.us的书签文件导入 "
+
+#: www/import.php:93
+msgid "You have already submitted this bookmark."
+msgstr "您过去已经录入过这条书签"
+
+#: www/import.php:104
+msgid "Bookmark imported."
+msgstr "书签导入完毕."
+
+#: www/importNetscape.php:95
+#, fuzzy
+msgid "You have already submitted some of these bookmarks."
+msgstr "您过去已经录入过这条书签"
+
+#: www/importNetscape.php:115
+#, fuzzy
+msgid "Bookmarks found: "
+msgstr "尚无书签"
+
+#: www/importNetscape.php:116
+#, fuzzy
+msgid "Bookmarks imported: "
+msgstr "书签导入完毕."
+
+#: www/importNetscape.php:117 www/importNetscape.php:122
+msgid "Import Bookmarks from Browser File"
+msgstr ""
+"将浏览器的书签文件导入（Internet Explorer, Mozilla Firefox and Netscape）"
+
+#: 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:46
+#, php-format
+msgid "%s: Recent bookmarks"
+msgstr "%s: 最近书签"
+
+#: www/index.php:58
+#, fuzzy, php-format
+msgid "%s: Recent bookmarks (+private %s)"
+msgstr "%s: 最近书签"
+
+#: www/index.php:96
+msgid "Store, share and tag your favourite links"
+msgstr ""
+
+#: www/index.php:97
+#, fuzzy
+msgid "All Bookmarks"
+msgstr "所有书签"
+
+#: www/jsScuttle.php:71
+msgid "Available"
+msgstr ""
+
+#: www/jsScuttle.php:74
+#, fuzzy
+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
+#, fuzzy
+msgid ""
+"You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"您 <em>必须</em> 输入用户名,密码,姓名和 <abbr title=\"电子邮件\">e-mail</"
+"abbr> 地址."
+
+#: www/password.php:48
+msgid "No matches found for that username."
+msgstr ""
+
+#: www/password.php:51
+#, fuzzy
+msgid ""
+"No matches found for that combination of username and <abbr title="
+"\"electronic mail\">e-mail</abbr> address."
+msgstr ""
+"您 <em>必须</em> 输入用户名,密码,姓名和 <abbr title=\"电子邮件\">e-mail</"
+"abbr> 地址."
+
+#: www/password.php:59
+#, fuzzy
+msgid ""
+"There was an error while generating your new password. Please try again."
+msgstr "保存书签时出错，请再保存重试一次或者联系管理员"
+
+#: www/password.php:63
+#, fuzzy
+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
+#, fuzzy, 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
+#, fuzzy
+msgid "Forgotten Password"
+msgstr "新的密码"
+
+#: www/profile.php:63 www/watchlist.php:119
+msgid "Username was not specified"
+msgstr "没有提供用户名"
+
+#: www/profile.php:70
+#, fuzzy
+msgid "My Profile"
+msgstr "个人资料"
+
+#: www/profile.php:110
+msgid "Invalid Token"
+msgstr ""
+
+#: www/profile.php:115
+msgid "Password and confirmation do not match."
+msgstr "密码和确认密码不一致."
+
+#: www/profile.php:119
+msgid "Password must be at least 6 characters long."
+msgstr "密码至少6位."
+
+#: www/profile.php:123
+msgid "E-mail address is not valid."
+msgstr "Email地址不合法."
+
+#: www/profile.php:127
+msgid "An error occurred while saving your changes."
+msgstr "保存修改时出错."
+
+#: www/profile.php:129
+msgid "Changes saved."
+msgstr "保存修改成功."
+
+#: www/profile.php:148
+msgid "You do not have a valid SSL client certificate"
+msgstr ""
+
+#: www/profile.php:150
+msgid "This certificate is already registered"
+msgstr ""
+
+#: www/profile.php:152
+msgid "Failed to register SSL client certificate."
+msgstr ""
+
+#: www/profile.php:154
+msgid "SSL client certificate registered."
+msgstr ""
+
+#: www/profile.php:163
+msgid "Certificate not found."
+msgstr ""
+
+#: www/profile.php:165
+msgid "The certificate does not belong to you."
+msgstr ""
+
+#: www/profile.php:167
+msgid "Failed to delete SSL client certificate."
+msgstr ""
+
+#: www/profile.php:169
+msgid "SSL client certificate deleted."
+msgstr ""
+
+#: www/register.php:52
+#, fuzzy
+msgid "You <em>must</em> enter a username, password and e-mail address."
+msgstr ""
+"您 <em>必须</em> 输入用户名,密码,姓名和 <abbr title=\"电子邮件\">e-mail</"
+"abbr> 地址."
+
+#: www/register.php:56
+#, fuzzy
+msgid "This username has been reserved, please make another choice."
+msgstr "用户名已经存在，请选择其他用户名."
+
+#: www/register.php:60
+msgid "This username already exists, please make another choice."
+msgstr "用户名已经存在，请选择其他用户名."
+
+#: www/register.php:64
+#, fuzzy
+msgid ""
+"This username is not valid (too short, too long, forbidden characters...), "
+"please make another choice."
+msgstr "用户名已经存在，请选择其他用户名."
+
+#: www/register.php:68
+#, fuzzy
+msgid "E-mail address is not valid. Please try again."
+msgstr "Email地址不合法."
+
+#: www/register.php:72
+#, fuzzy
+msgid "Antispam answer is not valid. Please try again."
+msgstr "Email地址不合法."
+
+#: www/register.php:90
+msgid "You have successfully registered. Enjoy!"
+msgstr "您已经注册成功."
+
+#: www/register.php:92
+msgid "Registration failed. Please try again."
+msgstr "注册失败，请重试."
+
+#: www/rss.php:90 www/rss.php:111
+#, php-format
+msgid "Failed to Autenticate User with username %s using private key"
+msgstr ""
+
+#: www/rss.php:128
+#, php-format
+msgid "Recent bookmarks posted to %s"
+msgstr "最新发布到%s的书签"
+
+#: www/search.php:83 www/search.php:147
+msgid "Search Bookmarks"
+msgstr "搜索书签"
+
+#: www/search.php:89
+msgid "Search Results"
+msgstr "搜索结果"
+
+#: www/search.php:137
+msgid "Unsatisfied? You can also try our "
+msgstr ""
+
+#: www/tag2tagadd.php:54
+msgid "Tag link created"
+msgstr ""
+
+#: www/tag2tagadd.php:57
+#, fuzzy
+msgid "Failed to create the link"
+msgstr "删除书签失败"
+
+#: www/tag2tagadd.php:69
+msgid "Add Tag Link"
+msgstr ""
+
+#: www/tag2tagdelete.php:66
+msgid "Tag link deleted"
+msgstr ""
+
+#: www/tag2tagdelete.php:69
+#, fuzzy
+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:62
+msgid "Tag common description updated"
+msgstr ""
+
+#: www/tagcommondescriptionedit.php:67
+msgid "Failed to update the tag common description"
+msgstr ""
+
+#: www/tagdelete.php:43
+msgid "Tag deleted"
+msgstr ""
+
+#: www/tagdelete.php:46
+#, fuzzy
+msgid "Failed to delete the tag"
+msgstr "删除书签失败"
+
+#: www/tagedit.php:52
+msgid "Tag description updated"
+msgstr ""
+
+#: www/tagedit.php:55
+#, fuzzy
+msgid "Failed to update the tag description"
+msgstr "删除书签失败"
+
+#: www/tagrename.php:63
+msgid "Tag renamed"
+msgstr ""
+
+#: www/tagrename.php:66
+#, fuzzy
+msgid "Failed to rename the tag"
+msgstr "删除书签失败"
+
+#: www/tags.php:71
+#, php-format
+msgid "%s: tagged with \"%s\""
+msgstr ""
+
+#: www/tags.php:84
+#, php-format
+msgid "%s: tagged with \"%s\" (+private %s)"
+msgstr ""
+
+#: www/users.php:31
+#, fuzzy
+msgid "Users"
+msgstr "用户帐号"
+
+#: www/watch.php:54
+msgid "User removed from your watchlist"
+msgstr "已将用户从您的关注列表中删除"
+
+#: www/watch.php:56
+msgid "User added to your watchlist"
+msgstr "已将用户加入到您的关注列表中"
+
+#: www/watchlist.php:104
+#, fuzzy
+msgid "My Watchlist"
+msgstr "我关注的其他用户"
+
+#: www/api/httpauth.inc.php:30
+msgid "Use of the API calls requires authentication."
+msgstr ""
+
+#: www/gsearch/index.php:51
+msgid "Come back to "
+msgstr ""
+
+#: www/gsearch/index.php:56
+msgid "Admin tips: "
+msgstr ""
+
+#: www/gsearch/index.php:57
+msgid "To refresh manually Google Custom Search Engine, goes to: "
+msgstr ""
+
+#: www/gsearch/index.php:61
+msgid ""
+"If no result appears, check that all the urls are valid in the admin section."
+msgstr ""
+
+#~ msgid "User with username %s not was not found"
+#~ msgstr "未发现以 %s 为用户名的用户"
+
+#~ msgid "Recent Bookmarks"
+#~ msgstr "最近书签"
+
+#~ msgid "for"
+#~ msgstr "关于"
+
+#~ msgid "%s Bookmarks"
+#~ msgstr "%s 书签"
+
+#~ msgid "URL"
+#~ msgstr "URL网址"
+
+#~ msgid "<abbr title=\"Electronic mail\">E-mail</abbr>"
+#~ msgstr "<abbr title=\"电子邮件l\">E-mail</abbr>"
author	Christian Weiske <cweiske@cweiske.de>	2012-01-20 22:10:30 +0100
committer	Christian Weiske <cweiske@cweiske.de>	2012-01-20 22:10:30 +0100
commit	6ff4370a20e7da8d02239b387cc0db296d7bf466 (patch)
tree	0166e5a7b78779675507086326efd67b4fef9eb3 /data/locales
parent	d16ca9235157042604f23949f2fa6e479e882d7d (diff)
parent	d6d44c6cfa7e3e5cdb36d9e4abd3a62edad74eb9 (diff)
download	semanticscuttle-6ff4370a20e7da8d02239b387cc0db296d7bf466.tar.gz semanticscuttle-6ff4370a20e7da8d02239b387cc0db296d7bf466.tar.bz2