2 files changed, 451 insertions, 117 deletions

diff --git a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo
index 375e923f..3f704d11 100644
--- a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo
+++ b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo
diff --git a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po
index 5b30d3d7..4b1d0dee 100644
--- a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po
+++ b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po
@@ -1,51 +1,130 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
+"Project-Id-Version: Wallabag\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-04 11:48+0100\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Square252\n"
+"Last-Translator: Kevin Meyer <wallabag@kevin-meyer.de>\n"
 "Language-Team: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.6.4\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: /Users/kevinmeyer/Dropbox/dev_web/wallabag-dev\n"
 
 msgid "config"
 msgstr "Konfiguration"
 
-msgid "Poching a link"
-msgstr "Poche einen Link"
+msgid "Saving articles"
+msgstr "Artikel speichern"
+
+msgid "There are several ways to save an article:"
+msgstr "Es gibt viele Methoden um Artikel zu speichern:"
 
 msgid "read the documentation"
 msgstr "Die Dokumentation lesen"
 
-msgid "by filling this field"
-msgstr "durch das ausfüllen dieses Feldes:"
+msgid "download the extension"
+msgstr "installiere die Erweiterung"
+
+msgid "via F-Droid"
+msgstr "via F-Droid"
+
+msgid " or "
+msgstr " oder "
+
+msgid "via Google Play"
+msgstr "via Google Play"
+
+msgid "download the application"
+msgstr "lade die App"
+
+msgid "By filling this field"
+msgstr "Durch Ausfüllen dieses Feldes"
 
-msgid "poche it!"
-msgstr "Poche es!"
+msgid "bag it!"
+msgstr "bag it!"
 
-msgid "Updating poche"
-msgstr "Poche aktualisieren"
+msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr "Bookmarklet: Ziehe diesen Link in deine Lesezeichen-Leiste"
 
-msgid "your version"
-msgstr "Deine Version"
+msgid "Upgrading wallabag"
+msgstr "Upgrade wallabag"
 
-msgid "latest stable version"
+msgid "Installed version"
+msgstr "Installierte Version"
+
+msgid "Latest stable version"
 msgstr "Neuste stabile Version"
 
-msgid "a more recent stable version is available."
+msgid "A more recent stable version is available."
 msgstr "Eine neuere stabile Version ist verfügbar."
 
-msgid "you are up to date."
+msgid "You are up to date."
 msgstr "Du bist auf den neuesten Stand."
 
-msgid "latest dev version"
+msgid "Last check:"
+msgstr "Zuletzt geprüft:"
+
+msgid "Latest dev version"
 msgstr "Neuste Entwicklungsversion"
 
-msgid "a more recent development version is available."
+msgid "A more recent development version is available."
 msgstr "Eine neuere Entwicklungsversion ist verfügbar."
 
+msgid "You can clear cache to check the latest release."
+msgstr "Leere den Cache um die neueste Version zu prüfen."
+
+msgid "Feeds"
+msgstr "Feeds"
+
+msgid ""
+"Your feed token is currently empty and must first be generated to enable "
+"feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>."
+msgstr ""
+"Dein Feed Token ist noch nicht vorhanden und muss zunächst generiert werden, "
+"um deine Feeds zu aktivieren. Klicke <a href='?feed&amp;"
+"action=generate'>hier um ihn zu generieren</a>."
+
+msgid "Unread feed"
+msgstr "Ungelesen Feed"
+
+msgid "Favorites feed"
+msgstr "Favoriten Feed"
+
+msgid "Archive feed"
+msgstr "Archiv Feed"
+
+msgid "Your token:"
+msgstr "Dein Token:"
+
+msgid "Your user id:"
+msgstr "Deine User ID:"
+
+msgid ""
+"You can regenerate your token: <a href='?feed&amp;action=generate'>generate!"
+"</a>."
+msgstr ""
+"Hier kannst du dein Token erzeugen: <a href='?feed&amp;"
+"action=generate'>Generieren!</a>."
+
+msgid "Change your theme"
+msgstr "Theme ändern"
+
+msgid "Theme:"
+msgstr "Theme:"
+
+msgid "Update"
+msgstr "Aktualisieren"
+
+msgid "Change your language"
+msgstr "Sprache ändern"
+
+msgid "Language:"
+msgstr "Sprache:"
+
 msgid "Change your password"
 msgstr "Passwort ändern"
 
@@ -58,75 +137,50 @@ msgstr "Passwort"
 msgid "Repeat your new password:"
 msgstr "Neues Passwort wiederholen:"
 
-msgid "Update"
-msgstr "Aktualisieren"
-
 msgid "Import"
 msgstr "Import"
 
-msgid "Please execute the import script locally, it can take a very long time."
-msgstr "Bitte führe das Import Script lokal aus, dies kann eine Weile dauern."
+msgid ""
+"Please execute the import script locally as it can take a very long time."
+msgstr ""
+"Bitte führe das Import Script lokal aus, da dies eine Weile dauern kann."
 
-msgid "More info in the official doc:"
+msgid "More info in the official documentation:"
 msgstr "Mehr Informationen in der offiziellen Dokumentation:"
 
-msgid "import from Pocket"
+msgid "Import from Pocket"
 msgstr "Import aus Pocket"
 
-msgid "import from Readability"
+#, php-format
+msgid "(you must have a %s file on your server)"
+msgstr "(du brauchst eine %s Datei auf deinem Server)"
+
+msgid "Import from Readability"
 msgstr "Import aus Readability"
 
-msgid "import from Instapaper"
+msgid "Import from Instapaper"
 msgstr "Import aus Instapaper"
 
-msgid "Export your poche data"
-msgstr "Exportieren Sie Ihre Poche Daten."
+msgid "Import from wallabag"
+msgstr "Import aus Readability"
+
+msgid "Export your wallabag data"
+msgstr "Exportieren Sie Ihre wallabag Daten."
 
 msgid "Click here"
 msgstr "Klicke hier"
 
-msgid "to export your poche data."
-msgstr "um deine Daten aus Poche zu exportieren."
+msgid "to download your database."
+msgstr "um deine Datenbank herunterzuladen"
 
-msgid "back to home"
-msgstr "züruck zur Hauptseite"
+msgid "to export your wallabag data."
+msgstr "um deine Daten aus wallabag zu exportieren."
 
-msgid "installation"
-msgstr "Installieren"
+msgid "Cache"
+msgstr "Cache"
 
-msgid "install your poche"
-msgstr "Installiere dein Poche"
-
-msgid ""
-"poche is still not installed. Please fill the below form to install it. "
-"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
-"on poche website</a>."
-msgstr ""
-"Poche ist noch nicht installiert. Bitte fülle die Felder unten aus, um die "
-"Installation durchzuführen. Zögere nicht, <a href='http://inthepoche.com/"
-"doc'>die Dokumentation auf der Website von Poche zu lesen falls du Probleme "
-"haben solltest."
-
-msgid "Login"
-msgstr "Benutzername"
-
-msgid "Repeat your password"
-msgstr "Wiederhole dein Passwort"
-
-msgid "Install"
-msgstr "Installieren"
-
-msgid "back to top"
-msgstr "Nach Oben"
-
-msgid "favoris"
-msgstr ""
-
-msgid "archive"
-msgstr "Archiv"
-
-msgid "unread"
-msgstr "ungelesen"
+msgid "to delete cache."
+msgstr "um den Cache zu löschen."
 
 msgid "by date asc"
 msgstr "nach Datum aufsteigend"
@@ -146,29 +200,78 @@ msgstr "nach Titel"
 msgid "by title desc"
 msgstr "nach Titel absteigend"
 
-msgid "No link available here!"
-msgstr "Kein Link verfügbar!"
+#, fuzzy
+msgid "toggle view mode"
+msgstr "Favorit"
 
-msgid "toggle mark as read"
-msgstr "Als gelesen markieren"
+msgid "home"
+msgstr "Start"
 
-msgid "toggle favorite"
-msgstr "Favorit"
+msgid "favorites"
+msgstr "Favoriten"
 
-msgid "delete"
-msgstr "Löschen"
+msgid "archive"
+msgstr "Archiv"
+
+msgid "tags"
+msgstr "Tags"
+
+msgid "save a link"
+msgstr "Speichere einen Link"
+
+msgid "logout"
+msgstr "Logout"
+
+msgid "return home"
+msgstr "Zurück zum Start"
+
+msgid "You can enter multiple tags, separated by commas."
+msgstr "Du kannst mehrere Tags, durch Kommata getrennt, eingeben."
+
+msgid "return to article"
+msgstr "zurück zum Artikel"
+
+msgid "save link!"
+msgstr "Link speichern!"
+
+msgid "powered by"
+msgstr "bereitgestellt von"
+
+msgid "debug mode is on so cache is off."
+msgstr "Debug Modus ist aktiviert, das Caching ist somit deaktiviert"
+
+msgid "your wallabag version:"
+msgstr "Deine wallabag Version"
+
+msgid "storage:"
+msgstr "Speicher:"
+
+msgid "Back to top"
+msgstr "Nach Oben"
 
 msgid "original"
 msgstr "Original"
 
-msgid "results"
-msgstr "Ergebnisse"
+msgid "Mark as read"
+msgstr "Als gelesen markieren"
+
+msgid "Toggle mark as read"
+msgstr "Als gelesen markieren"
+
+msgid "Favorite"
+msgstr "Favoriten"
+
+msgid "Toggle favorite"
+msgstr "Favorit"
+
+msgid "Delete"
+msgstr "Löschen"
 
-msgid "tweet"
+msgid "Tweet"
 msgstr "Twittern"
 
-msgid "email"
-msgstr "senden per E-Mail"
+msgid "Email"
+msgstr "per E-Mail senden"
 
 msgid "shaarli"
 msgstr "Shaarli"
@@ -176,54 +279,285 @@ msgstr "Shaarli"
 msgid "flattr"
 msgstr "flattr"
 
-msgid "this article appears wrong?"
-msgstr "dieser Artikel erscheint falsch?"
+msgid "Does this article appear wrong?"
+msgstr "Erscheint dieser Artikel falsch?"
 
-msgid "create an issue"
-msgstr "ein Ticket erstellen"
+msgid "Edit tags"
+msgstr "Tags bearbeiten"
 
-msgid "or"
-msgstr "oder"
+msgid "unread"
+msgstr "ungelesen"
 
-msgid "contact us by mail"
-msgstr "kontaktieren Sie uns per E-Mail"
+msgid "Tag"
+msgstr "Tag"
 
-msgid "plop"
-msgstr "plop"
+msgid "No articles found."
+msgstr "Keine Artikel gefunden."
 
-msgid "home"
-msgstr "Start"
+msgid "estimated reading time:"
+msgstr "geschätzte Lesezeit:"
 
-msgid "favorites"
-msgstr "Favoriten"
+msgid "estimated reading time :"
+msgstr "geschätzte Lesezeit:"
 
-msgid "logout"
-msgstr "Logout"
+msgid "toggle favorite"
+msgstr "Favorit"
 
-msgid "powered by"
-msgstr "bereitgestellt von"
+msgid "delete"
+msgstr "Löschen"
 
-msgid "debug mode is on so cache is off."
-msgstr "Debug Modus ist aktiviert, das Caching ist somit deaktiviert"
+msgid "Mark all the entries as read"
+msgstr "Markiere alle als gelesen"
+
+msgid "results"
+msgstr "Ergebnisse"
 
-msgid "your poche version:"
-msgstr "Deine Poche Version"
+#, fuzzy
+msgid "Untitled"
+msgstr "nach Titel"
 
-msgid "storage:"
-msgstr "Speicher:"
+msgid "the link has been added successfully"
+msgstr "Speichern des Links erfolgreich"
 
-msgid "login to your poche"
-msgstr "Bei Poche anmelden"
+msgid "error during insertion : the link wasn't added"
+msgstr "Fehler beim Einfügen: Der Link wurde nicht hinzugefügt"
 
-msgid "you are in demo mode, some features may be disabled."
-msgstr ""
-"Du befindest dich im Demomodus, einige Funktionen könnten deaktiviert sein."
+msgid "the link has been deleted successfully"
+msgstr "Löschen des Links erfolgreich"
+
+msgid "the link wasn't deleted"
+msgstr "Der Link wurde nicht entfernt"
+
+msgid "Article not found!"
+msgstr "Artikel nicht gefunden!"
+
+msgid "previous"
+msgstr "vorherige"
+
+msgid "next"
+msgstr "nächste"
+
+msgid "in demo mode, you can't update your password"
+msgstr "im Demo-Modus kann das Passwort nicht geändert werden"
+
+msgid "your password has been updated"
+msgstr "Dein Passwort wurde geändert"
+
+msgid ""
+"the two fields have to be filled & the password must be the same in the two "
+"fields"
+msgstr "Beide Felder müssen mit selbem Inhalt ausgefüllt sein"
+
+msgid "still using the \""
+msgstr "nutze immernoch die \""
+
+msgid "that theme does not seem to be installed"
+msgstr "dieses Theme scheint nicht installiert zu sein"
+
+msgid "you have changed your theme preferences"
+msgstr "Du hast deine Theme Einstellungen geändert"
+
+msgid "that language does not seem to be installed"
+msgstr "Diese Sprache scheint nicht installiert zu sein"
+
+msgid "you have changed your language preferences"
+msgstr "Du hast deine Spracheinstellungen geändert"
+
+msgid "login failed: you have to fill all fields"
+msgstr "Anmeldung fehlgeschlagen: Alle Felder müssen ausgefüllt werden"
+
+msgid "welcome to your wallabag"
+msgstr "Willkommen bei deiner wallabag"
+
+msgid "login failed: bad login or password"
+msgstr "Anmeldung fehlgeschlagen: Falscher Benutzername oder Passwort"
+
+msgid "import from instapaper completed"
+msgstr "Import aus Instapaper erfolgreich"
+
+msgid "import from pocket completed"
+msgstr "Import aus Pocket erfolgreich"
+
+msgid "import from Readability completed. "
+msgstr "Import aus Readability erfolgreich"
+
+msgid "import from Poche completed. "
+msgstr "Import aus Poche erfolgreich"
+
+msgid "Unknown import provider."
+msgstr "Unbekannter Import Anbieter."
+
+msgid "Incomplete inc/poche/define.inc.php file, please define \""
+msgstr "Unvollständige inc/poche/define.inc.php Datei, bitte setze \""
+
+msgid "Could not find required \""
+msgstr "Nicht gefunden: \""
+
+msgid "Uh, there is a problem while generating feeds."
+msgstr "Oh, es gab ein Problem beim Erstellen des Feeds."
+
+msgid "Cache deleted."
+msgstr "Cache gelöscht"
+
+msgid "Oops, it seems you don't have PHP 5."
+msgstr "Oops, es scheint als würde PHP 5 fehlen."
+
+msgid "wallabag, a read it later open source system"
+msgstr "wallabag, ein Später-Lesen Open Source System"
+
+msgid "login failed: user doesn't exist"
+msgstr "Anmeldung fehlgeschlagen: Benutzer existiert nicht"
+
+#, fuzzy
+#~ msgid "favoris"
+#~ msgstr "Favoriten"
+
+#~ msgid "mark all the entries as read"
+#~ msgstr "Markiere alle als gelesen"
+
+#~ msgid "Return home"
+#~ msgstr "Zurück zum Start"
+
+#~ msgid "tags:"
+#~ msgstr "Tags:"
+
+#~ msgid "login to your wallabag"
+#~ msgstr "Bei wallabag anmelden"
+
+#~ msgid "you are in demo mode, some features may be disabled."
+#~ msgstr ""
+#~ "Du befindest dich im Demomodus, einige Funktionen könnten deaktiviert "
+#~ "sein."
+
+#~ msgid "Login"
+#~ msgstr "Benutzername"
+
+#~ msgid "Stay signed in"
+#~ msgstr "Angemeldet bleiben"
+
+#~ msgid "(Do not check on public computers)"
+#~ msgstr "(nicht auf einem öffentlichen Computer anhaken)"
+
+#~ msgid "plop"
+#~ msgstr "plop"
+
+#~ msgid "Tags"
+#~ msgstr "Tags"
+
+#~ msgid "Login to wallabag"
+#~ msgstr "Bei wallabag anmelden"
+
+#~ msgid "Username"
+#~ msgstr "Benutzername"
+
+#~ msgid "Sign in"
+#~ msgstr "Einloggen"
+
+#~ msgid "installation"
+#~ msgstr "Installieren"
+
+#~ msgid "install your wallabag"
+#~ msgstr "Installiere deine wallabag"
+
+#~ msgid ""
+#~ "wallabag is still not installed. Please fill the below form to install "
+#~ "it. Don't hesitate to <a href='http://doc.wallabag.org/'>read the "
+#~ "documentation on wallabag website</a>."
+#~ msgstr ""
+#~ "wallabag ist noch nicht installiert. Bitte fülle die Felder unten aus, um "
+#~ "die Installation durchzuführen. Zögere nicht, <a href='http://doc."
+#~ "wallabag.org/'>die Dokumentation auf der Website von wallabag zu lesen, "
+#~ "falls du Probleme haben solltest."
+
+#~ msgid "Repeat your password"
+#~ msgstr "Wiederhole dein Passwort"
+
+#~ msgid "Install"
+#~ msgstr "Installieren"
+
+#~ msgid "No link available here!"
+#~ msgstr "Kein Link verfügbar!"
+
+#~ msgid "toggle mark as read"
+#~ msgstr "Als gelesen markieren"
+
+#~ msgid ""
+#~ "You can <a href='wallabag_compatibility_test.php'>check your "
+#~ "configuration here</a>."
+#~ msgstr ""
+#~ "Du kannst deine Konfiguration <a href='wallabag_compatibility_test."
+#~ "php'>hier testen</a>."
+
+#~ msgid "back to home"
+#~ msgstr "züruck zur Hauptseite"
+
+#~ msgid "tweet"
+#~ msgstr "Twittern"
+
+#~ msgid "email"
+#~ msgstr "senden per E-Mail"
+
+#~ msgid "this article appears wrong?"
+#~ msgstr "dieser Artikel erscheint falsch?"
+
+#~ msgid "Poching a link"
+#~ msgstr "Poche einen Link"
+
+#~ msgid "by filling this field"
+#~ msgstr "durch das ausfüllen dieses Feldes:"
+
+#~ msgid "bookmarklet: drag & drop this link to your bookmarks bar"
+#~ msgstr "Bookmarklet: Ziehe diesen Link in deine Lesezeichen-Leiste"
+
+#~ msgid "your version"
+#~ msgstr "Deine Version"
+
+#~ msgid "latest stable version"
+#~ msgstr "Neuste stabile Version"
+
+#~ msgid "a more recent stable version is available."
+#~ msgstr "Eine neuere stabile Version ist verfügbar."
+
+#~ msgid "you are up to date."
+#~ msgstr "Du bist auf den neuesten Stand."
+
+#~ msgid "latest dev version"
+#~ msgstr "Neuste Entwicklungsversion"
+
+#~ msgid "a more recent development version is available."
+#~ msgstr "Eine neuere Entwicklungsversion ist verfügbar."
+
+#~ msgid ""
+#~ "Please execute the import script locally, it can take a very long time."
+#~ msgstr ""
+#~ "Bitte führe das Import Script lokal aus, dies kann eine Weile dauern."
+
+#~ msgid "More infos in the official doc:"
+#~ msgstr "Mehr Informationen in der offiziellen Dokumentation:"
+
+#~ msgid "import from Pocket"
+#~ msgstr "Import aus Pocket"
+
+#~ msgid "import from Readability"
+#~ msgstr "Import aus Readability"
+
+#~ msgid "import from Instapaper"
+#~ msgstr "Import aus Instapaper"
+
+#~ msgid "poche it!"
+#~ msgstr "Poche es!"
+
+#~ msgid "Updating poche"
+#~ msgstr "Poche aktualisieren"
+
+#~ msgid "create an issue"
+#~ msgstr "ein Ticket erstellen"
 
-msgid "Stay signed in"
-msgstr "Angemeldet bleiben"
+#~ msgid "or"
+#~ msgstr "oder"
 
-msgid "(Do not check on public computers)"
-msgstr "(nicht auf einem öffentlichen Computer anhaken)"
+#~ msgid "contact us by mail"
+#~ msgstr "kontaktieren Sie uns per E-Mail"
 
-msgid "Sign in"
-msgstr "Einloggen"
+#~ msgid "your poche version:"
+#~ msgstr "Deine Poche Version"