Merge pull request #532 from wallabag/upload-file

New import system

diff --git a/.gitignore b/.gitignore
index 2abed7edb59fe5fb8a62f70d06ceff7fbb4ba428..aec2e3ef5bb3f144d0b6864493901c7675c1e665 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ cache/*
 vendor
 composer.phar
 db/poche.sqlite
-inc/poche/config.inc.php
\ No newline at end of file
+inc/poche/config.inc.php
+inc/3rdparty/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer/
\ No newline at end of file

diff --git a/inc/3rdparty/Session.class.php b/inc/3rdparty/Session.class.php
index b30a31f3a8fef4757349dd6be1e4445f056a8a7a..599b68cdb0e173b63d36759bba470e5a00516d72 100644 (file)
--- a/inc/3rdparty/Session.class.php
+++ b/inc/3rdparty/Session.class.php
@@ -33,7 +33,7 @@ class Session
     // his/her session is considered expired (3600 sec. = 1 hour)
     public static $inactivityTimeout = 86400;
     // Extra timeout for long sessions (if enabled) (82800 sec. = 23 hours)
-    public static $longSessionTimeout = 31536000;
+    public static $longSessionTimeout = 604800; // 604800 = a week
     // If you get disconnected often or if your IP address changes often.
     // Let you disable session cookie hijacking protection
     public static $disableSessionProtection = false;
@@ -61,7 +61,7 @@ class Session
         if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {
             $ssl = true;
         }
-        session_set_cookie_params($cookie['lifetime'], $cookiedir, $_SERVER['HTTP_HOST'], $ssl);
+        session_set_cookie_params(self::$longSessionTimeout, $cookiedir, $_SERVER['HTTP_HOST'], $ssl);
         // Use cookies to store session.
         ini_set('session.use_cookies', 1);
         // Force cookies for session  (phpsessionID forbidden in URL)
@@ -143,7 +143,14 @@ class Session
      */
     public static function logout()
     {
-        unset($_SESSION['uid'],$_SESSION['ip'],$_SESSION['expires_on'],$_SESSION['tokens'], $_SESSION['login'], $_SESSION['pass'], $_SESSION['longlastingsession'], $_SESSION['poche_user']);
+        // unset($_SESSION['uid'],$_SESSION['ip'],$_SESSION['expires_on'],$_SESSION['tokens'], $_SESSION['login'], $_SESSION['pass'], $_SESSION['longlastingsession'], $_SESSION['poche_user']);
+        
+        // Destruction du cookie (le code peut paraître complexe mais c'est pour être certain de reprendre les mêmes paramètres)
+        $args = array_merge(array(session_name(), ''), array_values(session_get_cookie_params()));
+        $args[2] = time() - 3600;
+        call_user_func_array('setcookie', $args);
+        // Suppression physique de la session
+        session_destroy();
     }
 
     /**

diff --git a/inc/3rdparty/libraries/feedwriter/FeedItem.php b/inc/3rdparty/libraries/feedwriter/FeedItem.php
index 9373deeb3e914f0279c6fd851ef7aeddb6ec82c4..0eae5e086b9bbfc3709822a72b29d209b92fc22a 100644 (file)
--- a/inc/3rdparty/libraries/feedwriter/FeedItem.php
+++ b/inc/3rdparty/libraries/feedwriter/FeedItem.php
@@ -156,6 +156,7 @@
                if($this->version == RSS2 || $this->version == RSS1)\r
                {\r
                        $this->setElement('link', $link);\r
+                       $this->setElement('guid', $link);\r
                }\r
                else\r
                {\r

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 5a89a8d27fa0657a2aecbef5073e0cd52d9e0d23..fb4e1a7fed98114d8b9004538c5f52ad658a6b24 100755 (executable)
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -534,8 +534,12 @@ class Poche
         switch ($view)
         {
             case 'config':
-                $dev = trim($this->getPocheVersion('dev'));
-                $prod = trim($this->getPocheVersion('prod'));
+                $dev_infos = $this->getPocheVersion('dev');
+                $dev = trim($dev_infos[0]);
+                $check_time_dev = date('d-M-Y H:i', $dev_infos[1]);
+                $prod_infos = $this->getPocheVersion('prod');
+                $prod = trim($prod_infos[0]);
+                $check_time_prod = date('d-M-Y H:i', $prod_infos[1]);
                 $compare_dev = version_compare(POCHE, $dev);
                 $compare_prod = version_compare(POCHE, $prod);
                 $themes = $this->getInstalledThemes();
@@ -547,6 +551,8 @@ class Poche
                     'languages' => $languages,
                     'dev' => $dev,
                     'prod' => $prod,
+                    'check_time_dev' => $check_time_dev,
+                    'check_time_prod' => $check_time_prod,
                     'compare_dev' => $compare_dev,
                     'compare_prod' => $compare_prod,
                     'token' => $token,
@@ -1067,15 +1073,17 @@ class Poche
     private function getPocheVersion($which = 'prod')
     {
         $cache_file = CACHE . '/' . $which;
+        $check_time = time();
 
         # checks if the cached version file exists
         if (file_exists($cache_file) && (filemtime($cache_file) > (time() - 86400 ))) {
            $version = file_get_contents($cache_file);
+           $check_time = filemtime($cache_file);
         } else {
            $version = file_get_contents('http://static.wallabag.org/versions/' . $which);
            file_put_contents($cache_file, $version, LOCK_EX);
         }
-        return $version;
+        return array($version, $check_time);
     }
 
     public function generateToken()
@@ -1109,8 +1117,9 @@ class Poche
         $feed = new FeedWriter(RSS2);
         $feed->setTitle('wallabag — ' . $type . ' feed');
         $feed->setLink(Tools::getPocheUrl());
-        $feed->setChannelElement('updated', date(DATE_RSS , time()));
-        $feed->setChannelElement('author', 'wallabag');
+        $feed->setChannelElement('pubDate', date(DATE_RSS , time()));
+        $feed->setChannelElement('generator', 'wallabag');
+        $feed->setDescription('wallabag ' . $type . ' elements');
 
         if ($type == 'tag') {
             $entries = $this->store->retrieveEntriesByTag($tag_id, $user_id);

diff --git a/index.php b/index.php
index ecae911983ef77f92312a149037b0fae5e4f69fe..5ca8bef5b3de0af9c49a2737cd8859efd034c5c2 100644 (file)
--- a/index.php
+++ b/index.php
@@ -11,7 +11,6 @@
 define ('POCHE', '1.5.3');
 require 'check_setup.php';
 require_once 'inc/poche/global.inc.php';
-session_start(); 
 
 # Start Poche
 $poche = new Poche();

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 375e923f98912ccd7228ea06fc5ae27c965fa13d..3f704d115d5c5cfd99482dc99a54eebe7ddaebd8 100644 (file)
Binary files a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo and b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo differ

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 9abc59838ca0794696438de3de9d27c36b7ac3d5..4b1d0dee57a56990c3ef1a2b43416a61caf601e4 100644 (file)
--- a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po
+++ b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po
@@ -1,135 +1,129 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: Wallabag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-25 15:28+0300\n"
+"POT-Creation-Date: 2014-03-04 11:48+0100\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Maryana <mariroz@mr.lviv.ua>\n"
+"Last-Translator: Kevin Meyer <wallabag@kevin-meyer.de>\n"
 "Language-Team: \n"
-"Language: \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-Poedit-Language: German\n"
+"X-Generator: Poedit 1.6.4\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 ""
+"X-Poedit-SearchPath-0: /Users/kevinmeyer/Dropbox/dev_web/wallabag-dev\n"
 
 msgid "config"
 msgstr "Konfiguration"
 
 msgid "Saving articles"
-msgstr ""
+msgstr "Artikel speichern"
 
 msgid "There are several ways to save an article:"
-msgstr ""
+msgstr "Es gibt viele Methoden um Artikel zu speichern:"
 
 msgid "read the documentation"
 msgstr "Die Dokumentation lesen"
 
 msgid "download the extension"
-msgstr ""
+msgstr "installiere die Erweiterung"
 
 msgid "via F-Droid"
-msgstr ""
+msgstr "via F-Droid"
 
 msgid " or "
-msgstr ""
+msgstr " oder "
 
 msgid "via Google Play"
-msgstr ""
+msgstr "via Google Play"
 
 msgid "download the application"
-msgstr ""
+msgstr "lade die App"
 
-#, fuzzy
 msgid "By filling this field"
-msgstr "durch das ausfüllen dieses Feldes:"
+msgstr "Durch Ausfüllen dieses Feldes"
 
 msgid "bag it!"
-msgstr ""
+msgstr "bag it!"
 
 msgid "Bookmarklet: drag & drop this link to your bookmarks bar"
-msgstr ""
+msgstr "Bookmarklet: Ziehe diesen Link in deine Lesezeichen-Leiste"
 
 msgid "Upgrading wallabag"
-msgstr ""
+msgstr "Upgrade wallabag"
 
-#, fuzzy
 msgid "Installed version"
-msgstr "Neuste stabile Version"
+msgstr "Installierte Version"
 
-#, 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."
 
-#, fuzzy
 msgid "You are up to date."
 msgstr "Du bist auf den neuesten Stand."
 
-#, fuzzy
+msgid "Last check:"
+msgstr "Zuletzt geprüft:"
+
 msgid "Latest dev version"
 msgstr "Neuste Entwicklungsversion"
 
-#, fuzzy
 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 ""
+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>."
+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 ""
+msgstr "Ungelesen Feed"
 
-#, fuzzy
 msgid "Favorites feed"
-msgstr "Favoriten"
+msgstr "Favoriten Feed"
 
-#, fuzzy
 msgid "Archive feed"
-msgstr "Archiv"
+msgstr "Archiv Feed"
 
 msgid "Your token:"
-msgstr ""
+msgstr "Dein Token:"
 
 msgid "Your user id:"
-msgstr ""
+msgstr "Deine User ID:"
 
-msgid "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>."
+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>."
 
-#, fuzzy
 msgid "Change your theme"
-msgstr "Passwort ändern"
+msgstr "Theme ändern"
 
 msgid "Theme:"
-msgstr ""
+msgstr "Theme:"
 
 msgid "Update"
 msgstr "Aktualisieren"
 
-#, fuzzy
 msgid "Change your language"
-msgstr "Passwort ändern"
+msgstr "Sprache ändern"
 
 msgid "Language:"
-msgstr ""
+msgstr "Sprache:"
 
 msgid "Change your password"
 msgstr "Passwort ändern"
@@ -146,74 +140,47 @@ msgstr "Neues Passwort wiederholen:"
 msgid "Import"
 msgstr "Import"
 
-#, 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 ""
+"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."
 
-#, fuzzy
 msgid "More info in the official documentation:"
 msgstr "Mehr Informationen in der offiziellen Dokumentation:"
 
-#, fuzzy
 msgid "Import from Pocket"
 msgstr "Import aus Pocket"
 
 #, php-format
 msgid "(you must have a %s file on your server)"
-msgstr ""
+msgstr "(du brauchst eine %s Datei auf deinem Server)"
 
-#, fuzzy
 msgid "Import from Readability"
 msgstr "Import aus Readability"
 
-#, fuzzy
 msgid "Import from Instapaper"
 msgstr "Import aus Instapaper"
 
-#, fuzzy
 msgid "Import from wallabag"
 msgstr "Import aus Readability"
 
-#, fuzzy
 msgid "Export your wallabag data"
-msgstr "Exportieren Sie Ihre Poche Daten."
+msgstr "Exportieren Sie Ihre wallabag Daten."
 
 msgid "Click here"
 msgstr "Klicke hier"
 
 msgid "to download your database."
-msgstr ""
+msgstr "um deine Datenbank herunterzuladen"
 
-#, fuzzy
 msgid "to export your wallabag data."
-msgstr "um deine Daten aus Poche zu exportieren."
+msgstr "um deine Daten aus wallabag zu exportieren."
 
 msgid "Cache"
-msgstr ""
+msgstr "Cache"
 
 msgid "to delete cache."
-msgstr ""
-
-msgid "You can enter multiple tags, separated by commas."
-msgstr ""
-
-msgid "return to article"
-msgstr ""
-
-msgid "plop"
-msgstr "plop"
-
-msgid "You can <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
-msgstr ""
-
-msgid "favoris"
-msgstr ""
-
-msgid "archive"
-msgstr "Archiv"
-
-msgid "unread"
-msgstr "ungelesen"
+msgstr "um den Cache zu löschen."
 
 msgid "by date asc"
 msgstr "nach Datum aufsteigend"
@@ -233,115 +200,78 @@ msgstr "nach Titel"
 msgid "by title desc"
 msgstr "nach Titel absteigend"
 
-msgid "Tag"
-msgstr ""
-
-msgid "No articles found."
-msgstr ""
-
 #, fuzzy
-msgid "Toggle mark as read"
-msgstr "Als gelesen markieren"
-
-msgid "toggle favorite"
+msgid "toggle view mode"
 msgstr "Favorit"
 
-msgid "delete"
-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 "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 "home"
+msgstr "Start"
 
-msgid "Repeat your password"
-msgstr "Wiederhole dein Passwort"
+msgid "favorites"
+msgstr "Favoriten"
 
-msgid "Install"
-msgstr "Installieren"
+msgid "archive"
+msgstr "Archiv"
 
-#, fuzzy
-msgid "login to your wallabag"
-msgstr "Bei Poche anmelden"
+msgid "tags"
+msgstr "Tags"
 
-msgid "Login to wallabag"
-msgstr ""
+msgid "save a link"
+msgstr "Speichere einen Link"
 
-msgid "you are in demo mode, some features may be disabled."
-msgstr "Du befindest dich im Demomodus, einige Funktionen könnten deaktiviert sein."
+msgid "logout"
+msgstr "Logout"
 
-msgid "Username"
-msgstr ""
+msgid "return home"
+msgstr "Zurück zum Start"
 
-msgid "Stay signed in"
-msgstr "Angemeldet bleiben"
+msgid "You can enter multiple tags, separated by commas."
+msgstr "Du kannst mehrere Tags, durch Kommata getrennt, eingeben."
 
-msgid "(Do not check on public computers)"
-msgstr "(nicht auf einem öffentlichen Computer anhaken)"
+msgid "return to article"
+msgstr "zurück zum Artikel"
 
-msgid "Sign in"
-msgstr "Einloggen"
+msgid "save link!"
+msgstr "Link speichern!"
 
-msgid "favorites"
-msgstr "Favoriten"
+msgid "powered by"
+msgstr "bereitgestellt von"
 
-msgid "estimated reading time :"
-msgstr ""
+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 ""
+msgid "your wallabag version:"
+msgstr "Deine wallabag Version"
 
-msgid "Return home"
-msgstr ""
+msgid "storage:"
+msgstr "Speicher:"
 
-#, fuzzy
 msgid "Back to top"
 msgstr "Nach Oben"
 
-#, fuzzy
+msgid "original"
+msgstr "Original"
+
 msgid "Mark as read"
 msgstr "Als gelesen markieren"
 
-#, fuzzy
+msgid "Toggle mark as read"
+msgstr "Als gelesen markieren"
+
 msgid "Favorite"
 msgstr "Favoriten"
 
-#, fuzzy
 msgid "Toggle favorite"
 msgstr "Favorit"
 
-#, fuzzy
 msgid "Delete"
 msgstr "Löschen"
 
-#, fuzzy
 msgid "Tweet"
 msgstr "Twittern"
 
-#, fuzzy
 msgid "Email"
-msgstr "senden per E-Mail"
+msgstr "per E-Mail senden"
 
 msgid "shaarli"
 msgstr "Shaarli"
@@ -349,200 +279,270 @@ msgstr "Shaarli"
 msgid "flattr"
 msgstr "flattr"
 
-#, fuzzy
 msgid "Does this article appear wrong?"
-msgstr "dieser Artikel erscheint falsch?"
-
-msgid "tags:"
-msgstr ""
+msgstr "Erscheint dieser Artikel falsch?"
 
 msgid "Edit tags"
-msgstr ""
-
-msgid "save link!"
-msgstr ""
-
-msgid "home"
-msgstr "Start"
-
-msgid "tags"
-msgstr ""
-
-msgid "logout"
-msgstr "Logout"
-
-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"
-
-#, fuzzy
-msgid "your wallabag version:"
-msgstr "Deine Version"
-
-msgid "storage:"
-msgstr "Speicher:"
-
-msgid "save a link"
-msgstr ""
-
-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?"
+msgstr "Tags bearbeiten"
 
-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 ""
-
-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 "unread"
+msgstr "ungelesen"
 
-msgid "latest dev version"
-msgstr "Neuste Entwicklungsversion"
+msgid "Tag"
+msgstr "Tag"
 
-msgid "a more recent development version is available."
-msgstr "Eine neuere Entwicklungsversion ist verfügbar."
+msgid "No articles found."
+msgstr "Keine Artikel gefunden."
 
-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 "estimated reading time:"
+msgstr "geschätzte Lesezeit:"
 
-#, fuzzy
-msgid "More infos in the official doc:"
-msgstr "Mehr Informationen in der offiziellen Dokumentation:"
+msgid "estimated reading time :"
+msgstr "geschätzte Lesezeit:"
 
-msgid "import from Pocket"
-msgstr "Import aus Pocket"
+msgid "toggle favorite"
+msgstr "Favorit"
 
-msgid "import from Readability"
-msgstr "Import aus Readability"
+msgid "delete"
+msgstr "Löschen"
 
-msgid "import from Instapaper"
-msgstr "Import aus Instapaper"
+msgid "Mark all the entries as read"
+msgstr "Markiere alle als gelesen"
 
-msgid "Tags"
-msgstr ""
+msgid "results"
+msgstr "Ergebnisse"
 
 #, fuzzy
 msgid "Untitled"
 msgstr "nach Titel"
 
 msgid "the link has been added successfully"
-msgstr ""
+msgstr "Speichern des Links erfolgreich"
 
 msgid "error during insertion : the link wasn't added"
-msgstr ""
+msgstr "Fehler beim Einfügen: Der Link wurde nicht hinzugefügt"
 
 msgid "the link has been deleted successfully"
-msgstr ""
+msgstr "Löschen des Links erfolgreich"
 
 msgid "the link wasn't deleted"
-msgstr ""
+msgstr "Der Link wurde nicht entfernt"
 
 msgid "Article not found!"
-msgstr ""
+msgstr "Artikel nicht gefunden!"
 
 msgid "previous"
-msgstr ""
+msgstr "vorherige"
 
 msgid "next"
-msgstr ""
+msgstr "nächste"
 
 msgid "in demo mode, you can't update your password"
-msgstr ""
+msgstr "im Demo-Modus kann das Passwort nicht geändert werden"
 
 msgid "your password has been updated"
-msgstr ""
+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 ""
+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 ""
+msgstr "nutze immernoch die \""
 
 msgid "that theme does not seem to be installed"
-msgstr ""
+msgstr "dieses Theme scheint nicht installiert zu sein"
 
 msgid "you have changed your theme preferences"
-msgstr ""
+msgstr "Du hast deine Theme Einstellungen geändert"
 
 msgid "that language does not seem to be installed"
-msgstr ""
+msgstr "Diese Sprache scheint nicht installiert zu sein"
 
 msgid "you have changed your language preferences"
-msgstr ""
+msgstr "Du hast deine Spracheinstellungen geändert"
 
 msgid "login failed: you have to fill all fields"
-msgstr ""
+msgstr "Anmeldung fehlgeschlagen: Alle Felder müssen ausgefüllt werden"
 
 msgid "welcome to your wallabag"
-msgstr ""
+msgstr "Willkommen bei deiner wallabag"
 
 msgid "login failed: bad login or password"
-msgstr ""
+msgstr "Anmeldung fehlgeschlagen: Falscher Benutzername oder Passwort"
 
-#, fuzzy
 msgid "import from instapaper completed"
-msgstr "Import aus Instapaper"
+msgstr "Import aus Instapaper erfolgreich"
 
-#, fuzzy
 msgid "import from pocket completed"
-msgstr "Import aus Pocket"
+msgstr "Import aus Pocket erfolgreich"
 
-#, fuzzy
 msgid "import from Readability completed. "
-msgstr "Import aus Readability"
+msgstr "Import aus Readability erfolgreich"
 
-#, fuzzy
 msgid "import from Poche completed. "
-msgstr "Import aus Pocket"
+msgstr "Import aus Poche erfolgreich"
 
 msgid "Unknown import provider."
-msgstr ""
+msgstr "Unbekannter Import Anbieter."
 
 msgid "Incomplete inc/poche/define.inc.php file, please define \""
-msgstr ""
+msgstr "Unvollständige inc/poche/define.inc.php Datei, bitte setze \""
 
 msgid "Could not find required \""
-msgstr ""
+msgstr "Nicht gefunden: \""
 
 msgid "Uh, there is a problem while generating feeds."
-msgstr ""
+msgstr "Oh, es gab ein Problem beim Erstellen des Feeds."
 
-#, fuzzy
 msgid "Cache deleted."
-msgstr "Löschen"
+msgstr "Cache gelöscht"
 
 msgid "Oops, it seems you don't have PHP 5."
-msgstr ""
+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!"

diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 8f35d797832d11c5d5cc6cebb7870e0164db662a..95db92fe6825b7afc90a99abb6213210ef1ad68d 100644 (file)
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -8,9 +8,10 @@
             <h2>{% trans "Saving articles" %}</h2>
             <p>{% trans "There are several ways to save an article:" %} (<a href="http://doc.wallabag.org/" title="{% trans "read the documentation" %}">?</a>)</p>
             <ul>
-                <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/poche/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
+                <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/wallabag/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
                 <li>Chrome: <a href="http://doc.wallabag.org/doku.php?id=users:chrome_extension" title="download the chrome extension">{% trans "download the extension" %}</a></li>
-                <li>Android: <a href="https://f-droid.org/repository/browse/?fdid=fr.gaulupeau.apps.Poche" title="download the application">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li>
+                <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li>
+                <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" title="download the iOS application">{% trans "download the application" %}</a></li>
                 <li>Windows Phone: <a href="https://www.windowsphone.com/en-us/store/app/poche/334de2f0-51b5-4826-8549-a3d805a37e83" title="download the window phone application">{% trans "download the application" %}</a></li>
                 <li>
                     <form method="get" action="index.php">
@@ -25,9 +26,10 @@
             <h2>{% trans "Upgrading wallabag" %}</h2>
             <ul>
                 <li>{% trans "Installed version" %} : <strong>{{ constant('POCHE') }}</strong></li>
-                <li>{% trans "Latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %}</li>
-                {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %}</li>{% endif %}
+                <li>{% trans "Latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent stable version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_prod }})</li>
+                {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "Latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "A more recent development version is available." %}</a></strong>{% else %}{% trans "You are up to date." %}{% endif %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}</li>
             </ul>
+            <p>{% trans "You can clear cache to check the latest release." %}</p>
 
             <h2>{% trans "Feeds" %}</h2>
             {% if token == '' %}

diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig
index c925e91c16533baec75c7ba3fddc71560c9e873f..092be04ec980d2445a29e35b19813fdac19e6220 100644 (file)
--- a/themes/baggy/view.twig
+++ b/themes/baggy/view.twig
@@ -29,4 +29,23 @@
                 {{ content | raw }}
             </article>
         </div>
+        <script src="{{ poche_url }}/themes/{{theme}}/js/restoreScroll.js"></script>
+        <script type="text/javascript">
+        $(document).ready(function() {
+
+            $(window).scroll(function(e){
+                var scrollTop = $(window).scrollTop();
+                var docHeight = $(document).height();
+                var scrollPercent = (scrollTop) / (docHeight);
+                var scrollPercentRounded = Math.round(scrollPercent*100)/100;
+                savePercent({{ entry.id|e }}, scrollPercentRounded);
+            });
+
+            retrievePercent({{ entry.id|e }});
+
+            $(window).resize(function(){
+                retrievePercent({{ entry.id|e }});
+            });
+        });
+        </script>
 {% endblock %}

diff --git a/themes/default/config.twig b/themes/default/config.twig
index cd4d074d53b8b85dcef8c6ffa372ce782c71e9ec..8121da3c8fd6049f6e2a3df4f4ae16ac7daa9df3 100644 (file)
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -8,10 +8,11 @@
             <h2>{% trans "Saving articles" %}</h2>
             <p>{% trans "There are several ways to save an article:" %} (<a href="http://doc.wallabag.org/" title="{% trans "read the documentation" %}">?</a>)</p>
             <ul>
-                <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/poche/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
+                <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/wallabag/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
                 <li>Chrome: <a href="http://doc.wallabag.org/doku.php?id=users:chrome_extension" title="download the chrome extension">{% trans "download the extension" %}</a></li>
-                <li>Android: <a href="https://f-droid.org/repository/browse/?fdid=fr.gaulupeau.apps.Poche" title="download the application">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li>
-                <li>Windows Phone: <a href="https://www.windowsphone.com/en-us/store/app/poche/334de2f0-51b5-4826-8549-a3d805a37e83" title="download the window phone application">{% trans "download the application" %}</a></li>
+                <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li>
+                <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" title="download the iOS application">{% trans "download the application" %}</a></li>
+                <li>Windows Phone: <a href="https://www.windowsphone.com/en-us/store/app/poche/334de2f0-51b5-4826-8549-a3d805a37e83" title="download the window phone application">{% trans "download the application" %}</a></li></a></li>
                 <li>
                     <form method="get" action="index.php">
                         <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label>