Merge pull request #495 from mariroz/dev

fix of global $http visibility, issues #493, #494

1 files changed, 413 insertions, 79 deletions

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..9abc5983 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,136 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-25 15:28+0300\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Square252\n"
+"Last-Translator: Maryana <mariroz@mr.lviv.ua>\n"
 "Language-Team: \n"
+"Language: \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-Poedit-Language: German\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n"
+
+msgid "wallabag, a read it later open source system"
+msgstr ""
+
+msgid "login failed: user doesn't exist"
+msgstr ""
+
+msgid "return home"
+msgstr ""
 
 msgid "config"
 msgstr "Konfiguration"
 
-msgid "Poching a link"
-msgstr "Poche einen Link"
+msgid "Saving articles"
+msgstr ""
+
+msgid "There are several ways to save an article:"
+msgstr ""
 
 msgid "read the documentation"
 msgstr "Die Dokumentation lesen"
 
-msgid "by filling this field"
+msgid "download the extension"
+msgstr ""
+
+msgid "via F-Droid"
+msgstr ""
+
+msgid " or "
+msgstr ""
+
+msgid "via Google Play"
+msgstr ""
+
+msgid "download the application"
+msgstr ""
+
+#, fuzzy
+msgid "By filling this field"
 msgstr "durch das ausfüllen dieses Feldes:"
 
-msgid "poche it!"
-msgstr "Poche es!"
+msgid "bag it!"
+msgstr ""
 
-msgid "Updating poche"
-msgstr "Poche aktualisieren"
+msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
+msgstr ""
 
-msgid "your version"
-msgstr "Deine Version"
+msgid "Upgrading wallabag"
+msgstr ""
 
-msgid "latest stable version"
+#, fuzzy
+msgid "Installed version"
 msgstr "Neuste stabile Version"
 
-msgid "a more recent stable version is available."
+#, fuzzy
+msgid "Latest stable version"
+msgstr "Neuste stabile Version"
+
+#, fuzzy
+msgid "A more recent stable version is available."
 msgstr "Eine neuere stabile Version ist verfügbar."
 
-msgid "you are up to date."
+#, fuzzy
+msgid "You are up to date."
 msgstr "Du bist auf den neuesten Stand."
 
-msgid "latest dev version"
+#, fuzzy
+msgid "Latest dev version"
 msgstr "Neuste Entwicklungsversion"
 
-msgid "a more recent development version is available."
+#, fuzzy
+msgid "A more recent development version is available."
 msgstr "Eine neuere Entwicklungsversion ist verfügbar."
 
+msgid "Feeds"
+msgstr ""
+
+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 ""
+
+msgid "Unread feed"
+msgstr ""
+
+#, fuzzy
+msgid "Favorites feed"
+msgstr "Favoriten"
+
+#, fuzzy
+msgid "Archive feed"
+msgstr "Archiv"
+
+msgid "Your token:"
+msgstr ""
+
+msgid "Your user id:"
+msgstr ""
+
+msgid "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>."
+msgstr ""
+
+#, fuzzy
+msgid "Change your theme"
+msgstr "Passwort ändern"
+
+msgid "Theme:"
+msgstr ""
+
+msgid "Update"
+msgstr "Aktualisieren"
+
+#, fuzzy
+msgid "Change your language"
+msgstr "Passwort ändern"
+
+msgid "Language:"
+msgstr ""
+
 msgid "Change your password"
 msgstr "Passwort ändern"
 
@@ -58,66 +143,68 @@ 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."
+#, fuzzy
+msgid "Please execute the import script locally as it can take a very long time."
 msgstr "Bitte führe das Import Script lokal aus, dies kann eine Weile dauern."
 
-msgid "More info in the official doc:"
+#, fuzzy
+msgid "More info in the official documentation:"
 msgstr "Mehr Informationen in der offiziellen Dokumentation:"
 
-msgid "import from Pocket"
+#, fuzzy
+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 ""
+
+#, fuzzy
+msgid "Import from Readability"
 msgstr "Import aus Readability"
 
-msgid "import from Instapaper"
+#, fuzzy
+msgid "Import from Instapaper"
 msgstr "Import aus Instapaper"
 
-msgid "Export your poche data"
+#, fuzzy
+msgid "Import from wallabag"
+msgstr "Import aus Readability"
+
+#, fuzzy
+msgid "Export your wallabag data"
 msgstr "Exportieren Sie Ihre Poche Daten."
 
 msgid "Click here"
 msgstr "Klicke hier"
 
-msgid "to export your poche data."
-msgstr "um deine Daten aus Poche zu exportieren."
-
-msgid "back to home"
-msgstr "züruck zur Hauptseite"
+msgid "to download your database."
+msgstr ""
 
-msgid "installation"
-msgstr "Installieren"
+#, fuzzy
+msgid "to export your wallabag data."
+msgstr "um deine Daten aus Poche zu exportieren."
 
-msgid "install your poche"
-msgstr "Installiere dein Poche"
+msgid "Cache"
+msgstr ""
 
-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>."
+msgid "to delete cache."
 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 "You can enter multiple tags, separated by commas."
+msgstr ""
 
-msgid "Repeat your password"
-msgstr "Wiederhole dein Passwort"
+msgid "return to article"
+msgstr ""
 
-msgid "Install"
-msgstr "Installieren"
+msgid "plop"
+msgstr "plop"
 
-msgid "back to top"
-msgstr "Nach Oben"
+msgid "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
+msgstr ""
 
 msgid "favoris"
 msgstr ""
@@ -146,10 +233,14 @@ msgstr "nach Titel"
 msgid "by title desc"
 msgstr "nach Titel absteigend"
 
-msgid "No link available here!"
-msgstr "Kein Link verfügbar!"
+msgid "Tag"
+msgstr ""
 
-msgid "toggle mark as read"
+msgid "No articles found."
+msgstr ""
+
+#, fuzzy
+msgid "Toggle mark as read"
 msgstr "Als gelesen markieren"
 
 msgid "toggle favorite"
@@ -161,13 +252,95 @@ msgstr "Löschen"
 msgid "original"
 msgstr "Original"
 
+msgid "estimated reading time:"
+msgstr ""
+
+msgid "mark all the entries as read"
+msgstr ""
+
 msgid "results"
 msgstr "Ergebnisse"
 
-msgid "tweet"
+msgid "installation"
+msgstr "Installieren"
+
+#, fuzzy
+msgid "install your wallabag"
+msgstr "Installiere dein Poche"
+
+#, fuzzy
+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 "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"
+
+#, fuzzy
+msgid "login to your wallabag"
+msgstr "Bei Poche anmelden"
+
+msgid "Login to wallabag"
+msgstr ""
+
+msgid "you are in demo mode, some features may be disabled."
+msgstr "Du befindest dich im Demomodus, einige Funktionen könnten deaktiviert sein."
+
+msgid "Username"
+msgstr ""
+
+msgid "Stay signed in"
+msgstr "Angemeldet bleiben"
+
+msgid "(Do not check on public computers)"
+msgstr "(nicht auf einem öffentlichen Computer anhaken)"
+
+msgid "Sign in"
+msgstr "Einloggen"
+
+msgid "favorites"
+msgstr "Favoriten"
+
+msgid "estimated reading time :"
+msgstr ""
+
+msgid "Mark all the entries as read"
+msgstr ""
+
+msgid "Return home"
+msgstr ""
+
+#, fuzzy
+msgid "Back to top"
+msgstr "Nach Oben"
+
+#, fuzzy
+msgid "Mark as read"
+msgstr "Als gelesen markieren"
+
+#, fuzzy
+msgid "Favorite"
+msgstr "Favoriten"
+
+#, fuzzy
+msgid "Toggle favorite"
+msgstr "Favorit"
+
+#, fuzzy
+msgid "Delete"
+msgstr "Löschen"
+
+#, fuzzy
+msgid "Tweet"
 msgstr "Twittern"
 
-msgid "email"
+#, fuzzy
+msgid "Email"
 msgstr "senden per E-Mail"
 
 msgid "shaarli"
@@ -176,26 +349,24 @@ msgstr "Shaarli"
 msgid "flattr"
 msgstr "flattr"
 
-msgid "this article appears wrong?"
+#, fuzzy
+msgid "Does this article appear wrong?"
 msgstr "dieser Artikel erscheint falsch?"
 
-msgid "create an issue"
-msgstr "ein Ticket erstellen"
-
-msgid "or"
-msgstr "oder"
+msgid "tags:"
+msgstr ""
 
-msgid "contact us by mail"
-msgstr "kontaktieren Sie uns per E-Mail"
+msgid "Edit tags"
+msgstr ""
 
-msgid "plop"
-msgstr "plop"
+msgid "save link!"
+msgstr ""
 
 msgid "home"
 msgstr "Start"
 
-msgid "favorites"
-msgstr "Favoriten"
+msgid "tags"
+msgstr ""
 
 msgid "logout"
 msgstr "Logout"
@@ -206,24 +377,187 @@ msgstr "bereitgestellt von"
 msgid "debug mode is on so cache is off."
 msgstr "Debug Modus ist aktiviert, das Caching ist somit deaktiviert"
 
-msgid "your poche version:"
-msgstr "Deine Poche Version"
+#, fuzzy
+msgid "your wallabag version:"
+msgstr "Deine Version"
 
 msgid "storage:"
 msgstr "Speicher:"
 
-msgid "login to your poche"
-msgstr "Bei Poche anmelden"
+msgid "save a link"
+msgstr ""
 
-msgid "you are in demo mode, some features may be disabled."
+msgid "back to home"
+msgstr "züruck zur Hauptseite"
+
+msgid "toggle mark as read"
+msgstr "Als gelesen markieren"
+
+msgid "tweet"
+msgstr "Twittern"
+
+msgid "email"
+msgstr "senden per E-Mail"
+
+msgid "this article appears wrong?"
+msgstr "dieser Artikel erscheint falsch?"
+
+msgid "No link available here!"
+msgstr "Kein Link verfügbar!"
+
+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 ""
-"Du befindest dich im Demomodus, einige Funktionen könnten deaktiviert sein."
 
-msgid "Stay signed in"
-msgstr "Angemeldet bleiben"
+msgid "your version"
+msgstr "Deine Version"
 
-msgid "(Do not check on public computers)"
-msgstr "(nicht auf einem öffentlichen Computer anhaken)"
+msgid "latest stable version"
+msgstr "Neuste stabile Version"
 
-msgid "Sign in"
-msgstr "Einloggen"
+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."
+
+#, fuzzy
+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 "Tags"
+msgstr ""
+
+#, fuzzy
+msgid "Untitled"
+msgstr "nach Titel"
+
+msgid "the link has been added successfully"
+msgstr ""
+
+msgid "error during insertion : the link wasn't added"
+msgstr ""
+
+msgid "the link has been deleted successfully"
+msgstr ""
+
+msgid "the link wasn't deleted"
+msgstr ""
+
+msgid "Article not found!"
+msgstr ""
+
+msgid "previous"
+msgstr ""
+
+msgid "next"
+msgstr ""
+
+msgid "in demo mode, you can't update your password"
+msgstr ""
+
+msgid "your password has been updated"
+msgstr ""
+
+msgid "the two fields have to be filled & the password must be the same in the two fields"
+msgstr ""
+
+msgid "still using the \""
+msgstr ""
+
+msgid "that theme does not seem to be installed"
+msgstr ""
+
+msgid "you have changed your theme preferences"
+msgstr ""
+
+msgid "that language does not seem to be installed"
+msgstr ""
+
+msgid "you have changed your language preferences"
+msgstr ""
+
+msgid "login failed: you have to fill all fields"
+msgstr ""
+
+msgid "welcome to your wallabag"
+msgstr ""
+
+msgid "login failed: bad login or password"
+msgstr ""
+
+#, fuzzy
+msgid "import from instapaper completed"
+msgstr "Import aus Instapaper"
+
+#, fuzzy
+msgid "import from pocket completed"
+msgstr "Import aus Pocket"
+
+#, fuzzy
+msgid "import from Readability completed. "
+msgstr "Import aus Readability"
+
+#, fuzzy
+msgid "import from Poche completed. "
+msgstr "Import aus Pocket"
+
+msgid "Unknown import provider."
+msgstr ""
+
+msgid "Incomplete inc/poche/define.inc.php file, please define \""
+msgstr ""
+
+msgid "Could not find required \""
+msgstr ""
+
+msgid "Uh, there is a problem while generating feeds."
+msgstr ""
+
+#, fuzzy
+msgid "Cache deleted."
+msgstr "Löschen"
+
+msgid "Oops, it seems you don't have PHP 5."
+msgstr ""
+
+#~ msgid "poche it!"
+#~ msgstr "Poche es!"
+
+#~ msgid "Updating poche"
+#~ msgstr "Poche aktualisieren"
+
+#~ msgid "create an issue"
+#~ msgstr "ein Ticket erstellen"
+
+#~ msgid "or"
+#~ msgstr "oder"
+
+#~ msgid "contact us by mail"
+#~ msgstr "kontaktieren Sie uns per E-Mail"
+
+#~ msgid "your poche version:"
+#~ msgstr "Deine Poche Version"