From 48e063904d70d658b73a1f73dee07df8afb8afe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 23 Feb 2014 09:50:11 +0100 Subject: [PATCH 01/79] [change] remove old logo #484 --- themes/baggy/img/logo-other_themes.png | Bin 0 -> 3922 bytes themes/default/_top.twig | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100755 themes/baggy/img/logo-other_themes.png diff --git a/themes/baggy/img/logo-other_themes.png b/themes/baggy/img/logo-other_themes.png new file mode 100755 index 0000000000000000000000000000000000000000..32543a449079cba30d6b6d673f950a63fbcd06a1 GIT binary patch literal 3922 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 literal 0 HcmV?d00001 diff --git a/themes/default/_top.twig b/themes/default/_top.twig index 083be1527..0711acdce 100644 --- a/themes/default/_top.twig +++ b/themes/default/_top.twig @@ -1,6 +1,6 @@

- {% if view == 'home' %}{% block logo %}logo poche{% endblock %} + {% if view == 'home' %}{% block logo %}logo poche{% endblock %} {% else %}{{ block('logo') }} {% endif %}

From 92fc97eeb3cbda0f7cee9b670c30bbf6b23b9e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 23 Feb 2014 09:56:21 +0100 Subject: [PATCH 02/79] [fix] redirect on config page after token generation #491 --- inc/poche/Poche.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 34f2ff5ae..8a9de488d 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -1124,6 +1124,7 @@ class Poche $currentConfig = $_SESSION['poche_user']->config; $currentConfig['token'] = $token; $_SESSION['poche_user']->setConfig($currentConfig); + Tools::redirect(); } public function generateFeeds($token, $user_id, $tag_id, $type = 'home') From 25e1213d1bcb7f8777fbe664f96b54fb5fe547bf Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Mon, 24 Feb 2014 12:19:46 +0200 Subject: [PATCH 03/79] fix of global $http visibility, issues #493, #494 --- inc/3rdparty/makefulltextfeed.php | 1 + 1 file changed, 1 insertion(+) diff --git a/inc/3rdparty/makefulltextfeed.php b/inc/3rdparty/makefulltextfeed.php index 2852c4c2a..313397d2d 100755 --- a/inc/3rdparty/makefulltextfeed.php +++ b/inc/3rdparty/makefulltextfeed.php @@ -415,6 +415,7 @@ if (!$debug_mode) { ////////////////////////////////// // Set up HTTP agent ////////////////////////////////// +global $http; $http = new HumbleHttpAgent(); $http->debug = $debug_mode; $http->userAgentMap = $options->user_agents; From 49b56f19d88a824fee8de95949d16d92526c32c0 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Mon, 24 Feb 2014 15:38:49 +0200 Subject: [PATCH 04/79] Polish, Russian and Ukrainian locales updated, Franch locale po file uopdated. issue #488 --- locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po | 460 ++++++++++++++++--- locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo | Bin 10557 -> 11248 bytes locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po | 465 ++++++++++++------- locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo | Bin 13000 -> 13856 bytes locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po | 471 ++++++++++++-------- locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo | Bin 13258 -> 14375 bytes locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po | 427 +++++++++++------- 7 files changed, 1265 insertions(+), 558 deletions(-) diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po index f105d1801..133000b43 100644 --- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po +++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po @@ -1,30 +1,76 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-02-24 15:32+0300\n" "PO-Revision-Date: \n" -"Last-Translator: Nicolas Lœuillet \n" +"Last-Translator: Maryana \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.4\n" +"X-Poedit-KeywordsList: _;gettext;gettext_noop\n" +"X-Poedit-Basepath: .\n" +"X-Poedit-Language: Franch\n" +"X-Poedit-Country: FRANCE\n" +"X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n" + +msgid "poche, a read it later open source system" +msgstr "" + +msgid "login failed: user doesn't exist" +msgstr "" + +msgid "home" +msgstr "accueil" + +msgid "favorites" +msgstr "favoris" + +msgid "archive" +msgstr "archive" + +msgid "tags" +msgstr "" msgid "config" msgstr "configuration" +msgid "logout" +msgstr "déconnexion" + +msgid "back to home" +msgstr "retour à l'accueil" + +msgid "Tags" +msgstr "" + msgid "Poching a link" msgstr "Pocher un lien" +msgid "You can poche a link by several methods:" +msgstr "" + msgid "read the documentation" msgstr "lisez la documentation" +msgid "download the extension" +msgstr "" + +msgid "download the application" +msgstr "" + msgid "by filling this field" msgstr "en remplissant ce champ" msgid "poche it!" msgstr "pochez-le !" +msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "" + msgid "Updating poche" msgstr "Mettre à jour poche" @@ -46,6 +92,16 @@ msgstr "dernière version de développement" msgid "a more recent development version is available." msgstr "une version de développement plus récente est disponible." +#, fuzzy +msgid "Change your theme" +msgstr "Modifier votre mot de passe" + +msgid "Theme:" +msgstr "" + +msgid "Update" +msgstr "Mettre à jour" + msgid "Change your password" msgstr "Modifier votre mot de passe" @@ -58,53 +114,53 @@ msgstr "Mot de passe" msgid "Repeat your new password:" msgstr "Répétez votre nouveau mot de passe :" -msgid "Update" -msgstr "Mettre à jour" - msgid "Import" msgstr "Importer" msgid "Please execute the import script locally, it can take a very long time." msgstr "Merci d'exécuter l'import en local, cela peut prendre du temps." -msgid "More info in the official doc:" +#, fuzzy +msgid "More infos in the official doc:" msgstr "Plus d'infos sur la documentation officielle" msgid "import from Pocket" msgstr "import depuis Pocket" +#, php-format +msgid "(you must have a %s file on your server)" +msgstr "" + msgid "import from Readability" msgstr "import depuis Readability" msgid "import from Instapaper" msgstr "import depuis Instapaper" -msgid "Export your poche data" +#, fuzzy +msgid "Export your poche datas" msgstr "Exporter vos données de poche" msgid "Click here" msgstr "Cliquez-ici" -msgid "to export your poche data." +#, fuzzy +msgid "to export your poche datas." msgstr "pour exporter vos données de poche." -msgid "back to home" -msgstr "retour à l'accueil" +msgid "plop" +msgstr "plop" msgid "installation" msgstr "installation" -msgid "install your poche" +#, fuzzy +msgid "install your wallabag" msgstr "installez votre poche" -msgid "" -"poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " -"on poche website." -msgstr "" -"poche n'est pas encore installé. Merci de remplir le formulaire suivant pour " -"l'installer. N'hésitez pas à lire la " -"documentation sur le site de poche." +#, fuzzy +msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." +msgstr "poche n'est pas encore installé. Merci de remplir le formulaire suivant pour l'installer. N'hésitez pas à lire la documentation sur le site de poche." msgid "Login" msgstr "Nom d'utilisateur" @@ -115,15 +171,9 @@ msgstr "Répétez votre mot de passe" msgid "Install" msgstr "Installer" -msgid "back to top" -msgstr "retour en haut de page" - msgid "favoris" msgstr "favoris" -msgid "archive" -msgstr "archive" - msgid "unread" msgstr "non lus" @@ -160,9 +210,151 @@ msgstr "supprimer" msgid "original" msgstr "original" +msgid "estimated reading time:" +msgstr "" + msgid "results" msgstr "résultats" +#, fuzzy +msgid "login to your wallabag" +msgstr "se connecter à votre poche" + +msgid "you are in demo mode, some features may be disabled." +msgstr "vous êtes en mode démo, certaines fonctionnalités peuvent être désactivées." + +msgid "Stay signed in" +msgstr "Rester connecté" + +msgid "(Do not check on public computers)" +msgstr "(ne pas cocher sur un ordinateur public)" + +msgid "Saving articles" +msgstr "" + +msgid "There are several ways to save an article:" +msgstr "" + +msgid "via F-Droid" +msgstr "" + +msgid " or " +msgstr "" + +msgid "via Google Play" +msgstr "" + +#, fuzzy +msgid "By filling this field" +msgstr "en remplissant ce champ" + +msgid "bag it!" +msgstr "" + +msgid "Bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "" + +msgid "Upgrading wallabag" +msgstr "" + +#, fuzzy +msgid "Installed version" +msgstr "dernière version stable" + +#, fuzzy +msgid "Latest stable version" +msgstr "dernière version stable" + +#, fuzzy +msgid "A more recent stable version is available." +msgstr "une version stable plus récente est disponible." + +#, fuzzy +msgid "You are up to date." +msgstr "vous êtes à jour." + +#, fuzzy +msgid "Latest dev version" +msgstr "dernière version de développement" + +#, fuzzy +msgid "A more recent development version is available." +msgstr "une version de développement plus récente est disponible." + +msgid "Feeds" +msgstr "" + +msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." +msgstr "" + +msgid "Unread feed" +msgstr "" + +#, fuzzy +msgid "Favorites feed" +msgstr "favoris" + +#, fuzzy +msgid "Archive feed" +msgstr "archive" + +msgid "Your token:" +msgstr "" + +msgid "Your user id:" +msgstr "" + +msgid "You can regenerate your token: generate!." +msgstr "" + +#, fuzzy +msgid "Change your language" +msgstr "Modifier votre mot de passe" + +msgid "Language:" +msgstr "" + +#, fuzzy +msgid "Please execute the import script locally as it can take a very long time." +msgstr "Merci d'exécuter l'import en local, cela peut prendre du temps." + +#, fuzzy +msgid "More info in the official documentation:" +msgstr "Plus d'infos sur la documentation officielle" + +#, fuzzy +msgid "Import from Pocket" +msgstr "import depuis Pocket" + +#, fuzzy +msgid "Import from Readability" +msgstr "import depuis Readability" + +#, fuzzy +msgid "Import from Instapaper" +msgstr "import depuis Instapaper" + +#, fuzzy +msgid "Import from wallabag" +msgstr "import depuis Readability" + +#, fuzzy +msgid "Export your wallabag data" +msgstr "Exporter vos données de poche" + +msgid "to download your database." +msgstr "" + +#, fuzzy +msgid "to export your wallabag data." +msgstr "pour exporter vos données de poche." + +msgid "Cache" +msgstr "" + +msgid "to delete cache." +msgstr "" + msgid "tweet" msgstr "tweet" @@ -178,26 +370,11 @@ msgstr "flattr" msgid "this article appears wrong?" msgstr "cet article s'affiche mal ?" -msgid "create an issue" -msgstr "créez un ticket" +msgid "You can enter multiple tags, separated by commas." +msgstr "" -msgid "or" -msgstr "ou" - -msgid "contact us by mail" -msgstr "contactez-nous par email" - -msgid "plop" -msgstr "plop" - -msgid "home" -msgstr "accueil" - -msgid "favorites" -msgstr "favoris" - -msgid "logout" -msgstr "déconnexion" +msgid "return to article" +msgstr "" msgid "powered by" msgstr "propulsé par" @@ -205,24 +382,195 @@ msgstr "propulsé par" msgid "debug mode is on so cache is off." msgstr "le mode de debug est actif, le cache est donc désactivé." -msgid "your poche version:" -msgstr "votre version de poche :" +#, fuzzy +msgid "your wallabag version:" +msgstr "votre version" msgid "storage:" msgstr "stockage :" -msgid "login to your poche" -msgstr "se connecter à votre poche" - -msgid "you are in demo mode, some features may be disabled." +msgid "save a link" msgstr "" -"vous êtes en mode démo, certaines fonctionnalités peuvent être désactivées." -msgid "Stay signed in" -msgstr "Rester connecté" +msgid "return home" +msgstr "" -msgid "(Do not check on public computers)" -msgstr "(ne pas cocher sur un ordinateur public)" +msgid "You can check your configuration here." +msgstr "" + +msgid "Tag" +msgstr "" + +msgid "No articles found." +msgstr "" + +#, fuzzy +msgid "Toggle mark as read" +msgstr "marquer comme lu / non lu" + +msgid "mark all the entries as read" +msgstr "" + +msgid "Login to wallabag" +msgstr "" + +msgid "Username" +msgstr "" msgid "Sign in" msgstr "Se connecter" + +msgid "Return home" +msgstr "" + +#, fuzzy +msgid "Back to top" +msgstr "retour en haut de page" + +#, fuzzy +msgid "Mark as read" +msgstr "marquer comme lu / non lu" + +#, fuzzy +msgid "Favorite" +msgstr "favoris" + +#, fuzzy +msgid "Toggle favorite" +msgstr "marquer comme favori" + +#, fuzzy +msgid "Delete" +msgstr "supprimer" + +#, fuzzy +msgid "Tweet" +msgstr "tweet" + +#, fuzzy +msgid "Email" +msgstr "email" + +#, fuzzy +msgid "Does this article appear wrong?" +msgstr "cet article s'affiche mal ?" + +msgid "tags:" +msgstr "" + +msgid "Edit tags" +msgstr "" + +msgid "save link!" +msgstr "" + +msgid "estimated reading time :" +msgstr "" + +msgid "Mark all the entries as read" +msgstr "" + +#, fuzzy +msgid "Untitled" +msgstr "par titre" + +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 depuis Instapaper" + +#, fuzzy +msgid "import from pocket completed" +msgstr "import depuis Pocket" + +#, fuzzy +msgid "import from Readability completed. " +msgstr "import depuis Readability" + +#, fuzzy +msgid "import from Poche completed. " +msgstr "import depuis 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 "supprimer" + +msgid "Oops, it seems you don't have PHP 5." +msgstr "" + +#~ msgid "create an issue" +#~ msgstr "créez un ticket" + +#~ msgid "or" +#~ msgstr "ou" + +#~ msgid "contact us by mail" +#~ msgstr "contactez-nous par email" + +#~ msgid "your poche version:" +#~ msgstr "votre version de poche :" diff --git a/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo b/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo index 3e8b132fa4544fe173fab16f8e3a2380204a4e23..22985970c8722aa3d171c3c79dc2180e2595b92a 100755 GIT binary patch delta 4184 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 EFV(uQ)&Kwi diff --git a/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po b/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po index 0e7cbcf83..c65e1c63c 100755 --- a/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po +++ b/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: wballabag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-07 17:38+0300\n" -"PO-Revision-Date: 2014-02-07 17:43+0300\n" +"POT-Creation-Date: 2014-02-24 15:19+0300\n" +"PO-Revision-Date: 2014-02-24 15:29+0300\n" "Last-Translator: Maryana \n" "Language-Team: \n" "Language: \n" @@ -15,7 +15,7 @@ msgstr "" "X-Poedit-Language: Polish\n" "X-Poedit-Country: POLAND\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag\n" +"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n" msgid "poche, a read it later open source system" msgstr "poche, serwis odrocznego czytania open source" @@ -23,72 +23,163 @@ msgstr "poche, serwis odrocznego czytania open source" msgid "login failed: user doesn't exist" msgstr "logowanie nie udało się: użytkownik nie istnieje" -msgid "Return home" -msgstr "Wrocic do głównej" +msgid "home" +msgstr "główna" -msgid "Back to top" -msgstr "Wrócić na górę" - -msgid "original" -msgstr "oryginal" - -msgid "Mark as read" -msgstr "Zaznacz jako przeczytane" - -msgid "Toggle mark as read" -msgstr "Przełącz jako przeczytane" - -msgid "Favorite" -msgstr "Ulubiony" - -msgid "Toggle favorite" -msgstr "Zaznacz jako ulubione" - -msgid "Delete" -msgstr "Usuń" - -msgid "Tweet" -msgstr "Tweet" - -msgid "Email" -msgstr "Wyslij email" - -msgid "shaarli" -msgstr "shaarli" - -msgid "flattr" -msgstr "flattr" - -msgid "Does this article appear wrong?" -msgstr "Czy ten artykuł wygląda nieprawidłowo?" - -msgid "tags:" -msgstr "tegi:" - -msgid "Edit tags" -msgstr "Redagowac tegi" - -msgid "return home" -msgstr "wrócić do głównej" - -msgid "powered by" -msgstr "zasilany przez" - -msgid "debug mode is on so cache is off." -msgstr "tryb debugowania jest włączony, więc cash jest wyłączony." - -msgid "your poche version:" -msgstr "twoja wersja poche:" - -msgid "storage:" -msgstr "magazyn:" - -msgid "favoris" +msgid "favorites" msgstr "ulubione" msgid "archive" msgstr "archiwum" +msgid "tags" +msgstr "tagi" + +msgid "config" +msgstr "ustawienia" + +msgid "logout" +msgstr "wyloguj" + +msgid "back to home" +msgstr "wrócić do głównej" + +msgid "Tags" +msgstr "Tegi" + +#, fuzzy +msgid "Poching a link" +msgstr "Zapisywanie linków" + +msgid "You can poche a link by several methods:" +msgstr "Istnieje kilka sposobów aby zapisać link:" + +msgid "read the documentation" +msgstr "zapoznać się z dokumentacją" + +msgid "download the extension" +msgstr "pobrać rozszerzenie" + +msgid "download the application" +msgstr "pobrać aplikację" + +#, fuzzy +msgid "by filling this field" +msgstr "Poprzez wypełnienie tego pola" + +msgid "poche it!" +msgstr "zapisać!" + +#, fuzzy +msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "Bookmarklet: przeciągnij i upucs ten link na pasek zakladek" + +msgid "Updating poche" +msgstr "Aktualizacja poche" + +msgid "your version" +msgstr "twoja wersja" + +#, fuzzy +msgid "latest stable version" +msgstr "Najnowsza stabilna wersja" + +#, fuzzy +msgid "a more recent stable version is available." +msgstr "Nowsza stabilna wersja jest dostępna." + +msgid "you are up to date." +msgstr "masz wszystko najnowsze." + +msgid "latest dev version" +msgstr "najnowsza wersja dev" + +msgid "a more recent development version is available." +msgstr "Nowsza wersja rozwojowa jest dostępna." + +msgid "Change your theme" +msgstr "Zmienic motyw" + +msgid "Theme:" +msgstr "Motyw:" + +msgid "Update" +msgstr "Aktualizacja" + +msgid "Change your password" +msgstr "Zmień hasło" + +msgid "New password:" +msgstr "Nowe hasło:" + +msgid "Password" +msgstr "Hasło" + +msgid "Repeat your new password:" +msgstr "Powtórz hasło jeszcze raz:" + +msgid "Import" +msgstr "Import" + +#, fuzzy +msgid "Please execute the import script locally, it can take a very long time." +msgstr "Proszę wykonać skrypt import lokalnie, gdyż moze to trwać bardzo długo." + +#, fuzzy +msgid "More infos in the official doc:" +msgstr "Więcej informacji w oficjalnej dokumentacji:" + +#, fuzzy +msgid "import from Pocket" +msgstr "Іmport z Pocket'a" + +#, php-format +msgid "(you must have a %s file on your server)" +msgstr "(musisz mieć plik %s na serwerze)" + +#, fuzzy +msgid "import from Readability" +msgstr "Import z Readability" + +#, fuzzy +msgid "import from Instapaper" +msgstr "Import z Instapaper" + +#, fuzzy +msgid "Export your poche datas" +msgstr "Eksportowac dane poche" + +msgid "Click here" +msgstr "Kliknij tu" + +#, fuzzy +msgid "to export your poche datas." +msgstr "aby eksportować dane poche." + +msgid "plop" +msgstr "plop" + +msgid "installation" +msgstr "instalacja" + +msgid "install your wallabag" +msgstr "zainstalować wallabag" + +msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." +msgstr "wallabag nie jest jeszcze zainstalowany. Proszę wypełnić poniższy formularz, aby go zainstalowac. Nie wahaj się zapoznac się z dokumentacja na stronie wallabag." + +msgid "Login" +msgstr "Login" + +msgid "Repeat your password" +msgstr "Powtórz hasło" + +msgid "Install" +msgstr "Instalowac" + +msgid "favoris" +msgstr "ulubione" + msgid "unread" msgstr "nieprzeczytane" @@ -110,8 +201,11 @@ msgstr "wg tytułu" msgid "by title desc" msgstr "według tytułu malejąco" -msgid "No articles found." -msgstr "Nie znaleziono artykułów." +msgid "No link available here!" +msgstr "Brak dostępnych linków!" + +msgid "toggle mark as read" +msgstr "przełączyć znak jako przeczytane" msgid "toggle favorite" msgstr "przełączyc ulubione" @@ -119,39 +213,34 @@ msgstr "przełączyc ulubione" msgid "delete" msgstr "usunąć" +msgid "original" +msgstr "oryginal" + msgid "estimated reading time:" msgstr "szacowany czas odczytu:" msgid "results" msgstr "wyniki" -msgid "home" -msgstr "główna" +msgid "login to your wallabag" +msgstr "zalogować się do swojego wallabag" -msgid "favorites" -msgstr "ulubione" +msgid "you are in demo mode, some features may be disabled." +msgstr "jesteś w trybie demo, niektóre funkcje mogą być niedostępne." -msgid "tags" -msgstr "tagi" +msgid "Stay signed in" +msgstr "Pozostań zalogowany" -msgid "config" -msgstr "ustawienia" +msgid "(Do not check on public computers)" +msgstr "(Nie sprawdzaj na publicznych komputerach" -msgid "logout" -msgstr "wyloguj" +msgid "Saving articles" +msgstr "Zapisywanie artykułów" -msgid "Poching links" -msgstr "Zapisywanie linków" - -msgid "There are several ways to poche a link:" +#, fuzzy +msgid "There are several ways to save an article:" msgstr "Istnieje kilka sposobów aby zapisać link:" -msgid "read the documentation" -msgstr "zapoznać się z dokumentacją" - -msgid "download the extension" -msgstr "pobrać rozszerzenie" - msgid "via F-Droid" msgstr "przez F-Droid" @@ -161,20 +250,17 @@ msgstr "albo" msgid "via Google Play" msgstr "przez Google Play" -msgid "download the application" -msgstr "pobrać aplikację" - msgid "By filling this field" msgstr "Poprzez wypełnienie tego pola" -msgid "poche it!" +msgid "bag it!" msgstr "zapisać!" msgid "Bookmarklet: drag & drop this link to your bookmarks bar" msgstr "Bookmarklet: przeciągnij i upucs ten link na pasek zakladek" -msgid "Updating poche" -msgstr "Aktualizacja poche" +msgid "Upgrading wallabag" +msgstr "Aktualizacja wallabag" msgid "Installed version" msgstr "Zainstalowana wersja " @@ -188,15 +274,14 @@ msgstr "Nowsza stabilna wersja jest dostępna." msgid "You are up to date." msgstr "Masz wszystko najnowsze." -msgid "latest dev version" +#, fuzzy +msgid "Latest dev version" msgstr "najnowsza wersja dev" -msgid "a more recent development version is available." +#, fuzzy +msgid "A more recent development version is available." msgstr "Nowsza wersja rozwojowa jest dostępna." -msgid "you are up to date." -msgstr "masz wszystko najnowsze." - msgid "Feeds" msgstr "Kanały (feeds)" @@ -221,78 +306,62 @@ msgstr "Twój id użytkownika (user id):" msgid "You can regenerate your token: generate!." msgstr "Mozna zgenerowac nowy znak: kliknij zgenerowac!." -msgid "Change your theme" -msgstr "Zmienic motyw" - -msgid "Theme:" -msgstr "Motyw:" - -msgid "Update" -msgstr "Aktualizacja" - msgid "Change your language" msgstr "Zmienić język" msgid "Language:" msgstr "Język:" -msgid "Change your password" -msgstr "Zmień hasło" - -msgid "New password:" -msgstr "Nowe hasło:" - -msgid "Password" -msgstr "Hasło" - -msgid "Repeat your new password:" -msgstr "Powtórz hasło jeszcze raz:" - -msgid "Import" -msgstr "Import" - msgid "Please execute the import script locally as it can take a very long time." msgstr "Proszę wykonać skrypt import lokalnie, gdyż moze to trwać bardzo długo." -msgid "More info in the official docs:" +#, fuzzy +msgid "More info in the official documentation:" msgstr "Więcej informacji w oficjalnej dokumentacji:" msgid "Import from Pocket" msgstr "Іmport z Pocket'a" -#, php-format -msgid "(you must have a %s file on your server)" -msgstr "(musisz mieć plik %s na serwerze)" - msgid "Import from Readability" msgstr "Import z Readability" msgid "Import from Instapaper" msgstr "Import z Instapaper" -msgid "Import from poche" -msgstr "Import z poche" +msgid "Import from wallabag" +msgstr "Import z wallabag" -msgid "Export your poche data" -msgstr "Eksportowac dane poche" - -msgid "Click here" -msgstr "Kliknij tu" +msgid "Export your wallabag data" +msgstr "Eksportowac dane wallabag" msgid "to download your database." msgstr "aby pobrac bazę danych." -msgid "to export your poche data." -msgstr "aby eksportować dane poche." +msgid "to export your wallabag data." +msgstr "aby eksportować dane wallabag." -msgid "Tag" -msgstr "Teg" +msgid "Cache" +msgstr "Cache" -msgid "No link available here!" -msgstr "Brak dostępnych linków!" +msgid "to delete cache." +msgstr "aby wyczyścić cache." -msgid "toggle mark as read" -msgstr "przełączyć znak jako przeczytane" +msgid "tweet" +msgstr "tweet" + +#, fuzzy +msgid "email" +msgstr "Wyslij email" + +msgid "shaarli" +msgstr "shaarli" + +msgid "flattr" +msgstr "flattr" + +#, fuzzy +msgid "this article appears wrong?" +msgstr "Czy ten artykuł wygląda nieprawidłowo?" msgid "You can enter multiple tags, separated by commas." msgstr "Mozna wprowadzić wiele tagów rozdzielajac je przecinkami." @@ -300,47 +369,90 @@ msgstr "Mozna wprowadzić wiele tagów rozdzielajac je przecinkami." msgid "return to article" msgstr "wrócić do artykułu" -msgid "plop" -msgstr "plop" +msgid "powered by" +msgstr "zasilany przez" + +msgid "debug mode is on so cache is off." +msgstr "tryb debugowania jest włączony, więc cash jest wyłączony." + +msgid "your wallabag version:" +msgstr "twoja wersja wallabag:" + +msgid "storage:" +msgstr "magazyn:" + +msgid "save a link" +msgstr "zapisać link" + +msgid "return home" +msgstr "wrócić do głównej" msgid "You can check your configuration here." msgstr "Można sprawdzić swoją konfigurację tu." -msgid "installation" -msgstr "instalacja" +msgid "Tag" +msgstr "Teg" -msgid "install your wallabag" -msgstr "zainstalować wallabag" +msgid "No articles found." +msgstr "Nie znaleziono artykułów." -msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." -msgstr "wallabag nie jest jeszcze zainstalowany. Proszę wypełnić poniższy formularz, aby go zainstalowac. Nie wahaj się zapoznac się z dokumentacja na stronie wallabag." +msgid "Toggle mark as read" +msgstr "Przełącz jako przeczytane" -msgid "Login" -msgstr "Login" - -msgid "Repeat your password" -msgstr "Powtórz hasło" - -msgid "Install" -msgstr "Instalowac" - -msgid "login to your wallabag" -msgstr "zalogować się do swojego wallabag" +msgid "mark all the entries as read" +msgstr "zaznaczyć wszystko jako przeczytane" msgid "Login to wallabag" msgstr "Zalogować się do wallabag" -msgid "you are in demo mode, some features may be disabled." -msgstr "jesteś w trybie demo, niektóre funkcje mogą być niedostępne." - msgid "Username" msgstr "Imię użytkownika" -msgid "Stay signed in" -msgstr "Pozostań zalogowany" +msgid "Sign in" +msgstr "Login" -msgid "(Do not check on public computers)" -msgstr "(Nie sprawdzaj na publicznych komputerach" +msgid "Return home" +msgstr "Wrocic do głównej" + +msgid "Back to top" +msgstr "Wrócić na górę" + +msgid "Mark as read" +msgstr "Zaznacz jako przeczytane" + +msgid "Favorite" +msgstr "Ulubiony" + +msgid "Toggle favorite" +msgstr "Zaznacz jako ulubione" + +msgid "Delete" +msgstr "Usuń" + +msgid "Tweet" +msgstr "Tweet" + +msgid "Email" +msgstr "Wyslij email" + +msgid "Does this article appear wrong?" +msgstr "Czy ten artykuł wygląda nieprawidłowo?" + +msgid "tags:" +msgstr "tegi:" + +msgid "Edit tags" +msgstr "Redagowac tegi" + +msgid "save link!" +msgstr "zapisz link!" + +#, fuzzy +msgid "estimated reading time :" +msgstr "szacowany czas odczytu:" + +msgid "Mark all the entries as read" +msgstr "zaznacz wszystko jako przeczytane" msgid "Untitled" msgstr "Bez nazwy" @@ -357,6 +469,9 @@ msgstr "link zostal pomyślnie usunięty" msgid "the link wasn't deleted" msgstr "link nie został usunięty" +msgid "Article not found!" +msgstr "Nie znaleziono artykułu." + msgid "previous" msgstr "poprzednia" @@ -390,15 +505,12 @@ msgstr "ustawienia języka zostałe zmienione" msgid "login failed: you have to fill all fields" msgstr "logowanie nie powiodlo się: musisz wypełnić wszystkie pola" -msgid "welcome to your poche" -msgstr "witamy w poche" +msgid "welcome to your wallabag" +msgstr "Witamy w wallabag" msgid "login failed: bad login or password" msgstr "logowanie nie powiodlo się: zly login lub hasło" -msgid "see you soon!" -msgstr "do zobaczenia wkrótce!" - msgid "import from instapaper completed" msgstr "import з instapaper'a zakończony" @@ -423,6 +535,17 @@ msgstr "Nie znaleziono potrzebnego \"" msgid "Uh, there is a problem while generating feeds." msgstr "Uh, jest problem podczas generowania kanałów (feeds)." +msgid "Cache deleted." +msgstr "Cache wyczyszczony." + msgid "Oops, it seems you don't have PHP 5." msgstr "Oops, wygląda ze u was niema PHP 5." +#~ msgid "Import from poche" +#~ msgstr "Import z poche" + +#~ msgid "welcome to your poche" +#~ msgstr "witamy w poche" + +#~ msgid "see you soon!" +#~ msgstr "do zobaczenia wkrótce!" diff --git a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo index c9cf1a559907a912667bd1153854cb4e9cc8e28e..cf3868be8da627a256f062ab5bb9ca29ed23a29a 100755 GIT binary patch delta 4349 zcmZwJdvKK18OQOnK;#xkNFZE-A?Yp8+#h<))6=3;`-8O}y8?#2tK0iNR_WnvK)VHIj2`%#%XlurJ2<9OnW7Sw~6 z5)H1QCU7Hh{W+?`yQm4@!)$bsHeC-!tuP<8*OO2gScJ;JGSpTyqsD!^H~H7zp5%r) zIEPB<`}inc!NK?sw6HS=Kzp5s1vmwDCIWnDMO%@@n?0!Kj-rLvaX5aBnpj^xG+tqt ziaH#N8h8$B#S0VH%TN>apgQoQ-i|j=?cPHE%yB-nqK{A+ypHUWxtX}WgL>{isCF*W zpzp(7si>n&)C6)-DI1O>un6;TG3MeX9E!(~KNIC+4*nB4Z)O7dAArxIGFXW^l$(*= zGJ8<{A44(_HYcfQ#%ECtKg5&x3G!zec{Rr1K~x7()DO>>I1E!5Z4iz}ZNUO$k)|B4 zx;V_JR8J($WjGxd;5K|x@BbH6w2~~QtHU%N)zJ&M5?7!GjG;QZk8Gpq$f(T0^hZ7a zSmJsnW^(Pp$FKqQR<)qE@FUdO_&4V0{ZGp>W;BjP9iA%W&#X^eA4C>mPM{`o4YdW| zqP8g0if_?0tl_#AIj`n(REEAqouPrOPMI8vJZctWSRJpYG8XruUX$yn)PINkncn>H z>w$4N5f`8`v>)HXBd7^I!?M(FHEOGNp`Jg2Iy=8XW#%p_lU;JjzYbpt-)e^aa1`dC zW;z#jsJ7xvd;?4HHfm*AL*l8QhHAGIwV+yLm&|t5gpQ%wU&DI*2FuYqG#oz+A2a=p z+{mR>ii;T|$HKI5^rzq_I2HS`f!%Ov!j-5qP>1?qYDT>+KSyQcD(Y-}ow!b7|Fne# zd}yl|hN(=VvJ!PjP9WJamlFOBlekV|qxBQp9mnGmR0n$!9!1WRxq#~D&&ZhOU#Klj zFEC~#K8?Cxi_0*4fQt6yJ5+~#X{7=3(TB@%4*m}3VGg}1rS;ei_n{VW81?*DsIB-f zcEWD_@GCQHCVd_|ek)e}GCIH!h%3UpzYgKbQIVEY~}cKFnvRLz&D= zor)7thiwij6V<2%yev6GTafIVy*#uWKSYj|8N#df1kS=z#y77~;Xs=!*az>RR&2)c zJ1r^m<2WnvB4-)l_3B|rdT?bfY8?l|xs#Vs;an3IsX`E7ew5oKy5Wp|UEDbI6{jUPb(f&;r?KCj(`;m{6HRu#I8owbG3pL^H8a7Ze?; zrA{sJb4ⅆ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 diff --git a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po index aa1769cfc..5a6cb829d 100755 --- a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po +++ b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-07 12:40+0300\n" +"POT-Creation-Date: 2014-02-24 15:09+0300\n" "PO-Revision-Date: \n" "Last-Translator: Maryana \n" "Language-Team: \n" @@ -14,7 +14,7 @@ msgstr "" "X-Poedit-Language: Russian\n" "X-Poedit-Country: RUSSIA\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag\n" +"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n" msgid "poche, a read it later open source system" msgstr "poche, сервис отложенного чтения с открытым исходным кодом" @@ -22,72 +22,163 @@ msgstr "poche, сервис отложенного чтения с открыт msgid "login failed: user doesn't exist" msgstr "войти не удалось: пользователь не существует" -msgid "Return home" -msgstr "На главную" +msgid "home" +msgstr "главная" -msgid "Back to top" -msgstr "Наверх" - -msgid "original" -msgstr "источник" - -msgid "Mark as read" -msgstr "Отметить как прочитанное" - -msgid "Toggle mark as read" -msgstr "Изменить отметку 'прочитано'" - -msgid "Favorite" -msgstr "Избранное" - -msgid "Toggle favorite" -msgstr "Изменить метку избранного" - -msgid "Delete" -msgstr "Удалить" - -msgid "Tweet" -msgstr "Твитнуть" - -msgid "Email" -msgstr "Отправить по почте" - -msgid "shaarli" -msgstr "shaarli" - -msgid "flattr" -msgstr "проспонсировать" - -msgid "Does this article appear wrong?" -msgstr "Статья выглядит криво?" - -msgid "tags:" -msgstr "теги:" - -msgid "Edit tags" -msgstr "Редактировать теги" - -msgid "return home" -msgstr "на главную" - -msgid "powered by" -msgstr "при поддержке" - -msgid "debug mode is on so cache is off." -msgstr "включён режим отладки - кеш выключен." - -msgid "your poche version:" -msgstr "ваша версия poche:" - -msgid "storage:" -msgstr "хранилище:" - -msgid "favoris" +msgid "favorites" msgstr "избранное" msgid "archive" msgstr "архив" +msgid "tags" +msgstr "теги" + +msgid "config" +msgstr "настройки" + +msgid "logout" +msgstr "выход" + +msgid "back to home" +msgstr "домой" + +msgid "Tags" +msgstr "Теги" + +#, fuzzy +msgid "Poching a link" +msgstr "Сохранение ссылок" + +msgid "You can poche a link by several methods:" +msgstr "Вы можете сохранить ссылку несколькими путями:" + +msgid "read the documentation" +msgstr "читать инструкцию" + +msgid "download the extension" +msgstr "скачать расширение" + +msgid "download the application" +msgstr "скачать приложение" + +#, fuzzy +msgid "by filling this field" +msgstr "Заполнением этого поля" + +msgid "poche it!" +msgstr "прикарманить!" + +#, fuzzy +msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "Закладка: перетащите и опустите ссылку на панель закладок" + +msgid "Updating poche" +msgstr "Обновления poche" + +msgid "your version" +msgstr "Ваша версия" + +#, fuzzy +msgid "latest stable version" +msgstr "Последняя стабильная версия" + +#, fuzzy +msgid "a more recent stable version is available." +msgstr "Доступна новая стабильная версия." + +msgid "you are up to date." +msgstr "у вас всё самое новое." + +msgid "latest dev version" +msgstr "последняя версия в разработке" + +msgid "a more recent development version is available." +msgstr "есть более свежая версия в разработке." + +msgid "Change your theme" +msgstr "Изменить тему" + +msgid "Theme:" +msgstr "Тема:" + +msgid "Update" +msgstr "Обновить" + +msgid "Change your password" +msgstr "Смена пароля" + +msgid "New password:" +msgstr "Новый пароль:" + +msgid "Password" +msgstr "Пароль" + +msgid "Repeat your new password:" +msgstr "Ещё раз новый пароль:" + +msgid "Import" +msgstr "Импортировать" + +#, fuzzy +msgid "Please execute the import script locally, it can take a very long time." +msgstr "Пожалуйста, выполните сценарий импорта локально - это может занять слишком много времени." + +#, fuzzy +msgid "More infos in the official doc:" +msgstr "Больше сведений в официальной документации:" + +#, fuzzy +msgid "import from Pocket" +msgstr "Импортировать из Pocket" + +#, php-format +msgid "(you must have a %s file on your server)" +msgstr "(файл %s должен присутствовать на вашем сервере)" + +#, fuzzy +msgid "import from Readability" +msgstr "Импортировать из Readability" + +#, fuzzy +msgid "import from Instapaper" +msgstr "Импортировать из Instapaper" + +#, fuzzy +msgid "Export your poche datas" +msgstr "Экспортировать данные poche" + +msgid "Click here" +msgstr "Кликните здесь" + +#, fuzzy +msgid "to export your poche datas." +msgstr "чтобы экспортировать свои записи из poche." + +msgid "plop" +msgstr "plop" + +msgid "installation" +msgstr "установка" + +msgid "install your wallabag" +msgstr "установка wallabag" + +msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." +msgstr "wallabag всё ещё не установлен. Надо заполнить форму ниже, чтобы установить его. Неплохо также прочесть документацию на сайте wallabag." + +msgid "Login" +msgstr "Имя пользователя" + +msgid "Repeat your password" +msgstr "Повторите пароль" + +msgid "Install" +msgstr "Установить" + +msgid "favoris" +msgstr "избранное" + msgid "unread" msgstr "непрочитанное" @@ -109,8 +200,11 @@ msgstr "по заголовку" msgid "by title desc" msgstr "по заголовку (обратный)" -msgid "No articles found." -msgstr "Статей не найдено." +msgid "No link available here!" +msgstr "Здесь нет ссылки!" + +msgid "toggle mark as read" +msgstr "изменить отметку 'прочитано'" msgid "toggle favorite" msgstr "изменить метку избранного" @@ -118,39 +212,34 @@ msgstr "изменить метку избранного" msgid "delete" msgstr "удалить" +msgid "original" +msgstr "источник" + msgid "estimated reading time:" msgstr "ориентировочное время чтения:" msgid "results" msgstr "найдено" -msgid "home" -msgstr "главная" +msgid "login to your wallabag" +msgstr "войти в свой wallabag" -msgid "favorites" -msgstr "избранное" +msgid "you are in demo mode, some features may be disabled." +msgstr "демонстрационный режим - работают не все возможности." -msgid "tags" -msgstr "теги" +msgid "Stay signed in" +msgstr "Запомнить меня" -msgid "config" -msgstr "настройки" +msgid "(Do not check on public computers)" +msgstr "(Не отмечайте на чужих компьютерах)" -msgid "logout" -msgstr "выход" +msgid "Saving articles" +msgstr "Сохранение статей" -msgid "Poching links" -msgstr "Сохранение ссылок" - -msgid "There are several ways to poche a link:" +#, fuzzy +msgid "There are several ways to save an article:" msgstr "Существует несколько способов сохранить ссылку:" -msgid "read the documentation" -msgstr "читать инструкцию" - -msgid "download the extension" -msgstr "скачать расширение" - msgid "via F-Droid" msgstr "с F-Droid" @@ -160,20 +249,17 @@ msgstr "или" msgid "via Google Play" msgstr "с Google Play" -msgid "download the application" -msgstr "скачать приложение" - msgid "By filling this field" msgstr "Заполнением этого поля" -msgid "poche it!" +msgid "bag it!" msgstr "прикарманить!" msgid "Bookmarklet: drag & drop this link to your bookmarks bar" msgstr "Закладка: перетащите и опустите ссылку на панель закладок" -msgid "Updating poche" -msgstr "Обновления poche" +msgid "Upgrading wallabag" +msgstr "Обновление wallabag" msgid "Installed version" msgstr "Установленная версия" @@ -187,15 +273,14 @@ msgstr "Доступна новая стабильная версия." msgid "You are up to date." msgstr "У вас всё самое новое." -msgid "latest dev version" +#, fuzzy +msgid "Latest dev version" msgstr "последняя версия в разработке" -msgid "a more recent development version is available." +#, fuzzy +msgid "A more recent development version is available." msgstr "есть более свежая версия в разработке." -msgid "you are up to date." -msgstr "у вас всё самое новое." - msgid "Feeds" msgstr "Ленты (feeds)" @@ -220,78 +305,61 @@ msgstr "Ваш идентификатор пользователя (user id):" msgid "You can regenerate your token: generate!." msgstr "Вы можете создать новый ​​маркер: сгенерировать!." -msgid "Change your theme" -msgstr "Изменить тему" - -msgid "Theme:" -msgstr "Тема:" - -msgid "Update" -msgstr "Обновить" - msgid "Change your language" msgstr "Изменить язык" msgid "Language:" msgstr "Язык:" -msgid "Change your password" -msgstr "Смена пароля" - -msgid "New password:" -msgstr "Новый пароль:" - -msgid "Password" -msgstr "Пароль" - -msgid "Repeat your new password:" -msgstr "Ещё раз новый пароль:" - -msgid "Import" -msgstr "Импортировать" - msgid "Please execute the import script locally as it can take a very long time." msgstr "Пожалуйста, выполните сценарий импорта локально - это может занять слишком много времени." -msgid "More info in the official docs:" +#, fuzzy +msgid "More info in the official documentation:" msgstr "Больше сведений в официальной документации:" msgid "Import from Pocket" msgstr "Импортировать из Pocket" -#, php-format -msgid "(you must have a %s file on your server)" -msgstr "(файл %s должен присутствовать на вашем сервере)" - msgid "Import from Readability" msgstr "Импортировать из Readability" msgid "Import from Instapaper" msgstr "Импортировать из Instapaper" -msgid "Import from poche" -msgstr "Импортировать из poche" +msgid "Import from wallabag" +msgstr "Импортировать из wallabag" -msgid "Export your poche data" -msgstr "Экспортировать данные poche" - -msgid "Click here" -msgstr "Кликните здесь" +msgid "Export your wallabag data" +msgstr "Экспортировать данные wallabag" msgid "to download your database." msgstr "чтобы скачать вашу базу данных" -msgid "to export your poche data." -msgstr "чтобы экспортировать свои записи из poche." +msgid "to export your wallabag data." +msgstr "чтобы экспортировать свои записи из wallabag." -msgid "Tag" -msgstr "Тег" +msgid "Cache" +msgstr "Кэш" -msgid "No link available here!" -msgstr "Здесь нет ссылки!" +msgid "to delete cache." +msgstr "чтобы сбросить кэш." -msgid "toggle mark as read" -msgstr "изменить отметку 'прочитано'" +msgid "tweet" +msgstr "твитнуть" + +msgid "email" +msgstr "email" + +msgid "shaarli" +msgstr "shaarli" + +msgid "flattr" +msgstr "проспонсировать" + +#, fuzzy +msgid "this article appears wrong?" +msgstr "Статья выглядит криво?" msgid "You can enter multiple tags, separated by commas." msgstr "Вы можете ввести несколько тегов, разделяя их запятой." @@ -299,47 +367,90 @@ msgstr "Вы можете ввести несколько тегов, разде msgid "return to article" msgstr "вернуться к статье" -msgid "plop" -msgstr "plop" +msgid "powered by" +msgstr "при поддержке" + +msgid "debug mode is on so cache is off." +msgstr "включён режим отладки - кеш выключен." + +msgid "your wallabag version:" +msgstr "Ваша версия wallabag:" + +msgid "storage:" +msgstr "хранилище:" + +msgid "save a link" +msgstr "сохранить ссылку" + +msgid "return home" +msgstr "на главную" msgid "You can check your configuration here." msgstr "Вы можете проверить конфигурацию здесь." -msgid "installation" -msgstr "установка" +msgid "Tag" +msgstr "Тег" -msgid "install your wallabag" -msgstr "установка wallabag" +msgid "No articles found." +msgstr "Статей не найдено." -msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." -msgstr "wallabag всё ещё не установлен. Надо заполнить форму ниже, чтобы установить его. Неплохо также прочесть документацию на сайте wallabag." +msgid "Toggle mark as read" +msgstr "Изменить отметку 'прочитано'" -msgid "Login" -msgstr "Имя пользователя" - -msgid "Repeat your password" -msgstr "Повторите пароль" - -msgid "Install" -msgstr "Установить" - -msgid "login to your wallabag" -msgstr "войти в свой wallabag" +msgid "mark all the entries as read" +msgstr "отметить все статьи как прочитанные " msgid "Login to wallabag" msgstr "Войдите в wallabag" -msgid "you are in demo mode, some features may be disabled." -msgstr "демонстрационный режим - работают не все возможности." - msgid "Username" msgstr "Имя пользователя" -msgid "Stay signed in" -msgstr "Запомнить меня" +msgid "Sign in" +msgstr "Зарегистрироваться" -msgid "(Do not check on public computers)" -msgstr "(Не отмечайте на чужих компьютерах)" +msgid "Return home" +msgstr "На главную" + +msgid "Back to top" +msgstr "Наверх" + +msgid "Mark as read" +msgstr "Отметить как прочитанное" + +msgid "Favorite" +msgstr "Избранное" + +msgid "Toggle favorite" +msgstr "Изменить метку избранного" + +msgid "Delete" +msgstr "Удалить" + +msgid "Tweet" +msgstr "Твитнуть" + +msgid "Email" +msgstr "Отправить по почте" + +msgid "Does this article appear wrong?" +msgstr "Статья выглядит криво?" + +msgid "tags:" +msgstr "теги:" + +msgid "Edit tags" +msgstr "Редактировать теги" + +msgid "save link!" +msgstr "сохранить ссылку!" + +#, fuzzy +msgid "estimated reading time :" +msgstr "ориентировочное время чтения:" + +msgid "Mark all the entries as read" +msgstr "Отметить все как прочитанное" msgid "Untitled" msgstr "Без названия" @@ -356,6 +467,9 @@ msgstr "ссылка успешно удалена" msgid "the link wasn't deleted" msgstr "ссылка не удалена" +msgid "Article not found!" +msgstr "Статью не найдено." + msgid "previous" msgstr "предыдущая" @@ -389,15 +503,12 @@ msgstr "вы изменили свои настройки языка" msgid "login failed: you have to fill all fields" msgstr "войти не удалось: вы должны заполнить все поля" -msgid "welcome to your poche" -msgstr "добро пожаловать в ваш poche" +msgid "welcome to your wallabag" +msgstr "добро пожаловать в wallabag" msgid "login failed: bad login or password" msgstr "войти не удалось: неправильное имя пользователя или пароль" -msgid "see you soon!" -msgstr "увидимся!" - msgid "import from instapaper completed" msgstr "импорт из instapaper завершен" @@ -422,14 +533,23 @@ msgstr "Не удалось найти требуемый \"" msgid "Uh, there is a problem while generating feeds." msgstr "Ох, возникла проблема при создании ленты." +msgid "Cache deleted." +msgstr "Кэш очищен. " + msgid "Oops, it seems you don't have PHP 5." msgstr "Упс, кажется у вас не установлен PHP 5." -#~ msgid "your version" -#~ msgstr "Ваша версия" +#~ msgid "your poche version:" +#~ msgstr "ваша версия poche:" -#~ msgid "back to home" -#~ msgstr "домой" +#~ msgid "Import from poche" +#~ msgstr "Импортировать из poche" + +#~ msgid "welcome to your poche" +#~ msgstr "добро пожаловать в ваш poche" + +#~ msgid "see you soon!" +#~ msgstr "увидимся!" #~ msgid "create an issue" #~ msgstr "оповестить об ошибке" @@ -439,6 +559,3 @@ msgstr "Упс, кажется у вас не установлен PHP 5." #~ msgid "contact us by mail" #~ msgstr "связаться по почте" - -#~ msgid "Sign in" -#~ msgstr "Зарегистрироваться" diff --git a/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo b/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo index 80972b65dc5caa2e869eaadf6611bc34bfdbf052..49c3c7d868400be1b9eb28699a8a96744b6bf143 100755 GIT binary patch delta 4455 zcmZwJdvKIj8OQOnNeBT#Za@gvyxD|nAQ0}XP*NzRfM|hmDFS67OIX-knq8pWx)AP4 z!19)~#ZkeU!Kp*JER=Aq%+zXWM|MkV)oIl_#j!{o$NEQ^(ZTO;-#1A|JC^s zz+WJLCeA_E|A2b_F6QHXR7X>@jp@zzO+FQRV#;tb&cM#N1J$9us1Lq~8p%o2i!Zs? zucI<|8gW=j&G*eJDs;-ciW0p6Qc!G&QQ^Zeu?VY`=}RvjQY^0 zsF8f(UQef?7iME67GpU+i&`76;(WY=M{y80>;0{$%)E)C@Vy@7Un5FkxJq4DRJ*rp zA?m>)?)9;#4pzAB*{ByTMs>Ifi*SS6ZbA+41=QT1MrGhlR0eMKB>$S52b|D{bD3bx zbsy9Vi&3c^jstKM7UMj$@EO$HAH@-P2Kh4|anOMNfh55^L_L>BFD#sZ!*EHIih8z- zgFg5Y>V-c*jkKsVPj+%;( zP?`A*b5f|#yL9dUT)OiV?E=>Z98LRO9EATy&0R5X(~D-|A*@9GB7TDEa9W}Bfo`Zw zcwK$23tZRZc&;~MPLxV3l?r?t`IhNwIXxeW6KKyuZNukKQ_zI`nadoMiQgfEGG8Fc zFYLUH#3-Lo#he`(3GJjgk15ueNi&CMp zW-;o9?Wnmq?B39d>ggYGK0ZK=bnXb}x#h?y(})?+>wHPZd4Mbv_t`zxsZeh(kVshnJjdr)iWV^k)-#78id zmumpi9iwI;l{8LNp)wG}<+u&Cjedjr3H>`NQ>o=nMus6-HPcZ)NHwU{-;Db3S?rAO zpfYp^v+*HnO=XYKnqvM7sLbYs*ENI;#=MUFnY$c##uTuUcH$hYz<00^Gx-(z8jf&X zhsxZKQO_kX2UA&*`T^>Rd0478-#3q_!eUy4lW2$7^xLrowHUn zZV~Dwn&X4Seqsw@5n3;8g(M`47PCr?L)5Uok}G>XYK!e6dJmcb88s;1Aihp4CA8@DGu(sdPN+;&>N*jc=PATWLPa}5 ztF@jOM7%&061$1EqQ#~1ZHMG`EOG0(sI}2nSgXmB#c_vQ7t!x2io@4Wv20}Y*AF-NHdEOzK+~aF#bRjl6 zCzHpfuhdnI5UYq6iLJ!5#2!M$OFT`~szC`7bCNaZpxvZ$gwSt8TUo1|`e>CAlL_r( z746@bi6M4Nx2C*D8zR9qp@3Ce7qQmXZLF;-vdc49^zg4)7cet)w5kH3KqOFAW*^FI z$=K`T0W}8NTV{)moz@m)YC$OFQ!U)BMs-ka)|6HL}JZjszM; zMgrkTur}7zH{atunP`lkO*Hb~VJm(;e$k3wg0u0<@eA>b)NT~nC;Pq8|9Jdj;(&=K zvEnxp`{S*NgU$_Qv6cNRJssV^Um`9j4QH)*j61F-KX5&<+i>X|DcH%kV(MT~?3E$UdpZS@3uNrD`Kg1{_Y3iB ziDq3^SQ>VsnJ>0?znL85rzDzVjUyI&#{AbSE&AEax3B!q$J(!)FH24F?6WflOe-Y& zjG%2Q^a=N)S2R;)wr6x*`z+WSNBeWQgD!GpIJ!Ib!RUh>vld%3X0B(_*~9@2{k%r1 Wz9)|O%vW2wq=S_i delta 3517 zcmYk;4NO(%9mnzKUO?~-3Ie`SIies`RIXepGDVA0toB7M+r-irDwh|lTqZiSwO$n0 zVrEOX(@L6{tg9NQHr0A1Q>T)?rLkR_b24qStlP4-$+B*3x2&z(vL*Ze?tL(Q!vB1p z=iGD7^Y%X{9PfU&J@$v3)E5lp08v1+rW!MXuViqb{9?Q@oH8e{2w%lg^zkHIAdbwDwV06xQ1i!3oOL1aV+LdG$suTF&~RjV_Slm zSZ{xCMBTp;bzKYQ;7**3KSp(Y1Q+8lrqjRq(*AG*)!|s4s*z7ZbzFwJaRD+Wa|ddG z_ae8LE>uUmQ5_B9Y&?z{=&$iEypFoQFe^FXd6-N8rh$r(4=0crrHsON-G&#$)U8!)B^t);AfbQ)0n<2LS1(oYNe`B16X0(ccboaLJg=rhxMOHrOTdp4mE=z)E=He z&Fmf2(td;LD3eiZtMX9~a!^S+2XDo4oQ12=!7fyC4`MmKg4*KWPGbEv(l0r|v(0}| zH)fHt4pw3rHlhZ!2i4&Vs16UKX83d4K8YIGY1DlekSsT!psxD@^_&}+m`IFaXvy-C z)igz@B?_Z1sI%u+qaM(V>NtYh`^`8PyRj4xqmu7!EWyuEE0;~L>#+={;cjbehzfaQ z&LWdHZ=h!Q0cv2sx4-`dPt*Q4@=SArr-pF^b>CO0??DFpHwPRJ z{O1@&livTKWX1dgEBIl}bl!2?joO-*@gSZ?eSns*k($xN)?VwN^*Ao#_Yow2&DXdb z$B-DxjRp=HSOhEe{_m%v*Wx^CDc?Z{|A`FNQh5Y@REG4Hy=GC=jDCh%k?Z&pevDeF zeqJH%`3cnh@1wTj&&XIz4$Gz`51|HBjrCZEu^K7^RJ8POqL%C{ydTqe71VJPR^lKk zN#8`R*mYEgpQ3~RLnYk|MzaU&@gaN*U7W>emj(FtBa3Tpl(7CQsN|6`%diQxL@%O} z@+k6W&T-I8KSB*4NUCdzb5Xz7q6X52>oA6zh>yDOW7O7WaMNlGquQ}D)?YI@#R+*4 zwNzJa+e7}$A34m&v8=0Bsv66&6T9&cYDVciRXI?M+PWIlYquHi#LKt=Q@L3=@L-I} zI4V0)Bks38kEyhep=Nv%oADAV`=`!Jey~EQ8LmXFz-DADrXQKKdDXT*#B|z0X2BTD zIMfQqs;Fd8xf93YeRvl(S&txp=5r1Uv4ClXbRG8LUi=OQS(a+7MaF1)QP&+sJ{jf% z)ED-1+t!cy0rr0~6(!kxp1vDfQAzYCti=p6Z#gy~d1(evS$zu0rNpXf%N(MM(CpR| zD*FlDqoUb=yDXtmrT1T>f5iUs7;4#WCzM!s6Z?qKGM-8{p{3TluR?O)EIGEe6Z!6# zrwHa@)(|RM;U5qUL_JYK|2GS7PonTyOeB#S$_c8MtqH3+?iq!P*p6}J9n(H4G}SZB|a zS<_GntDx^(d`7h_yrsv5VMFsI(KSi6_;tWjQL-RaO$qh+-m4EG1Hi z9-@x;A<;qXASMzu#QntgiHC?RWnm{VK=cu#Wz}c}ClL1%lkB-#Yo(hu@fr8n#AY`? z^GI5EbW=yfeLZuRt<`0@B|XlzNK31^C%P@-bau5xIXK%pB2Kiet#ean%ND0Kx~Zqe z{a4n-v@M-okM+3cZ&{kXy=9lv)7jn?Y2|X$*wXIK$}XCac)Zi%=sLGC`z1F$=T!W6 zITZod$vqZ-FZWu&y_Emr_(;Ur72VDX`sHk#6i)$8Ex*MiDqm6L9Z+c%Ko^@+pz+E-ta(q_d`hdOVN$104E#5pcGvFRB z3f2F_Kji(&Kj;rQ-Z^jB-{+lC)4S}Qarou3zu&v!_j#ARGyYTlA%D>E&N`ggPo1`R zfh#z=S)nPxp_=%6MLPmP|Dd~a_Ez`P*`;n?@$GK7G$+2HcxNE~x032WJXRVF#tY{T z2IA++*QUf*R5S)kU-SFDv-Ep`-iON_|A05_cq85w?=^aT+B;A0SNy&H!T8lsO3\n" "Language-Team: \n" "Language: \n" @@ -15,7 +15,7 @@ msgstr "" "X-Poedit-Language: Ukrainian\n" "X-Poedit-Country: UKRAINE\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag\n" +"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n" msgid "poche, a read it later open source system" msgstr "poche, сервіс відкладеного читання з відкритим кодом" @@ -23,18 +23,6 @@ msgstr "poche, сервіс відкладеного читання з відк msgid "login failed: user doesn't exist" msgstr "увійти не вдалося: користувач не існує" -msgid "powered by" -msgstr "за підтримки" - -msgid "debug mode is on so cache is off." -msgstr "режим відладки включено, отже кеш виключено." - -msgid "your poche version:" -msgstr "версія вашої poche:" - -msgid "storage:" -msgstr "сховище:" - msgid "home" msgstr "головна" @@ -53,14 +41,17 @@ msgstr "налаштування" msgid "logout" msgstr "вихід" -msgid "return home" -msgstr "повернутися на головну" +msgid "back to home" +msgstr "назад на головну" -msgid "Poching links" -msgstr "Зберігання посилань" +msgid "Tags" +msgstr "Теги" -msgid "There are several ways to poche a link:" -msgstr "Є кілька способів зберегти посилання:" +msgid "Poching a link" +msgstr "Зберігання посилання" + +msgid "You can poche a link by several methods:" +msgstr "Ви можете зберегти посилання кількома способами:" msgid "read the documentation" msgstr "читати документацію" @@ -68,41 +59,36 @@ msgstr "читати документацію" msgid "download the extension" msgstr "завантажити розширення" -msgid "via F-Droid" -msgstr "через F-Droid" - -msgid " or " -msgstr "або" - -msgid "via Google Play" -msgstr "через Google Play" - msgid "download the application" msgstr "завантажити додаток" -msgid "By filling this field" +#, fuzzy +msgid "by filling this field" msgstr "Заповнивши це поле" msgid "poche it!" msgstr "зберегти!" -msgid "Bookmarklet: drag & drop this link to your bookmarks bar" +#, fuzzy +msgid "bookmarklet: drag & drop this link to your bookmarks bar" msgstr "З допомогою закладки: перетягніть і відпустіть посилання на панель закладок" msgid "Updating poche" msgstr "Оновлення poche" -msgid "Installed version" -msgstr "Встановлено ​​версію" +msgid "your version" +msgstr "ваша версія:" -msgid "Latest stable version" +#, fuzzy +msgid "latest stable version" msgstr "Остання стабільна версія" -msgid "A more recent stable version is available." +#, fuzzy +msgid "a more recent stable version is available." msgstr "Є новіша стабільна версія." -msgid "You are up to date." -msgstr "У вас остання версія." +msgid "you are up to date." +msgstr "у вас остання версія." msgid "latest dev version" msgstr "остання версія в розробці" @@ -110,33 +96,6 @@ msgstr "остання версія в розробці" msgid "a more recent development version is available." msgstr "доступна новіша версія в розробці." -msgid "you are up to date." -msgstr "у вас остання версія." - -msgid "Feeds" -msgstr "Завантаження (feeds)" - -msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." -msgstr "Ваш маркер завантажень (feed token) не визначено, ви повинні спочатку згенерувати його для того, щоб активувати завантаження. Натисніть тут для його генерації." - -msgid "Unread feed" -msgstr "Завантаження непрочитаного" - -msgid "Favorites feed" -msgstr "Завантаження вибраного" - -msgid "Archive feed" -msgstr "Завантаження архіву" - -msgid "Your token:" -msgstr "Ваш маркер (token): " - -msgid "Your user id:" -msgstr "Ваш ідентифікатор користувача (user id):" - -msgid "You can regenerate your token: generate!." -msgstr "Ви можете перестворити ваш маркер: натисніть згенерувати!." - msgid "Change your theme" msgstr "Змінити тему" @@ -146,12 +105,6 @@ msgstr "Тема:" msgid "Update" msgstr "Оновити" -msgid "Change your language" -msgstr "Змінити мову" - -msgid "Language:" -msgstr "Мова:" - msgid "Change your password" msgstr "Зміна паролю" @@ -167,75 +120,61 @@ msgstr "Новий пароль ще раз:" msgid "Import" msgstr "Імпортування" -msgid "Please execute the import script locally as it can take a very long time." +#, fuzzy +msgid "Please execute the import script locally, it can take a very long time." msgstr "Будь ласка, виконайте сценарій імпорту локально, оскільки це може тривати досить довго." -msgid "More info in the official docs:" +#, fuzzy +msgid "More infos in the official doc:" msgstr "Більш детальна інформація в офіційній документації:" -msgid "Import from Pocket" +#, fuzzy +msgid "import from Pocket" msgstr "Імпорт з Pocket-а" #, php-format msgid "(you must have a %s file on your server)" msgstr "(файл %s повинен бути присутнім на вашому сервері)" -msgid "Import from Readability" +#, fuzzy +msgid "import from Readability" msgstr "Імпорт з Readability" -msgid "Import from Instapaper" +#, fuzzy +msgid "import from Instapaper" msgstr "Імпорт з Instapaper" -msgid "Import from poche" -msgstr "Імпорт з poche" - -msgid "Export your poche data" +#, fuzzy +msgid "Export your poche datas" msgstr "Експортувати ваші дані з poche" msgid "Click here" msgstr "Клікніть тут" -msgid "to download your database." -msgstr "щоб завантажити вашу базу даних." - -msgid "to export your poche data." +#, fuzzy +msgid "to export your poche datas." msgstr "щоб експортувати ваші дані poche." -msgid "Tag" -msgstr "Тег" - -msgid "No link available here!" -msgstr "Немає доступних посилань!" - -msgid "toggle mark as read" -msgstr "змінити мітку на прочитано" - -msgid "toggle favorite" -msgstr "змінити мітку вибраного" - -msgid "delete" -msgstr "видалити" - -msgid "original" -msgstr "оригінал" - -msgid "estimated reading time:" -msgstr "приблизний час читання:" - -msgid "results" -msgstr "результат(ів)" - -msgid "You can enter multiple tags, separated by commas." -msgstr "Ви можете ввести декілька тегів, розділених комами." - -msgid "return to article" -msgstr "повернутися до статті" - msgid "plop" msgstr "plop" -msgid "You can check your configuration here." -msgstr "Ви можете перевірити вашу конфігурацію тут." +msgid "installation" +msgstr "інсталяція" + +msgid "install your wallabag" +msgstr "встановити wallabag" + +msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." +msgstr "wallabag ще не встановлено. Будь ласка, заповніть форму нижче, щоб його встановити. Ви можете звертутися до документації на сайті wallabag." + +msgid "Login" +msgstr "Логін" + +msgid "Repeat your password" +msgstr "Пароль ще раз" + +msgid "Install" +msgstr "Встановити" msgid "favoris" msgstr "вибране" @@ -261,48 +200,213 @@ msgstr "за назвою" msgid "by title desc" msgstr "за назвою по спаданню" -msgid "No articles found." -msgstr "Статей не знайдено." +msgid "No link available here!" +msgstr "Немає доступних посилань!" -msgid "Toggle mark as read" -msgstr "змінити мітку прочитаного" +msgid "toggle mark as read" +msgstr "змінити мітку на прочитано" -msgid "installation" -msgstr "інсталяція" +msgid "toggle favorite" +msgstr "змінити мітку вибраного" -msgid "install your wallabag" -msgstr "встановити wallabag" +msgid "delete" +msgstr "видалити" -msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." -msgstr "wallabag ще не встановлено. Будь ласка, заповніть форму нижче, щоб його встановити. Ви можете звертутися до документації на сайті wallabag." +msgid "original" +msgstr "оригінал" -msgid "Login" -msgstr "Логін" +msgid "estimated reading time:" +msgstr "приблизний час читання:" -msgid "Repeat your password" -msgstr "Пароль ще раз" - -msgid "Install" -msgstr "Встановити" +msgid "results" +msgstr "результат(ів)" msgid "login to your wallabag" msgstr "увійти до wallabag" -msgid "Login to wallabag" -msgstr "Увійти до wallabag" - msgid "you are in demo mode, some features may be disabled." msgstr "ви в демонстраційному режимі, деякі функції можуть бути відключені." -msgid "Username" -msgstr "Ім’я користувача" - msgid "Stay signed in" msgstr "Запам'ятати мене" msgid "(Do not check on public computers)" msgstr "(Не відмічайте на загальнодоступних комп'ютерах)" +msgid "Saving articles" +msgstr "Зберігання посилань" + +msgid "There are several ways to save an article:" +msgstr "Є кілька способів зберегти статтю:" + +msgid "via F-Droid" +msgstr "через F-Droid" + +msgid " or " +msgstr "або" + +msgid "via Google Play" +msgstr "через Google Play" + +msgid "By filling this field" +msgstr "Заповнивши це поле" + +msgid "bag it!" +msgstr "зберегти!" + +msgid "Bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "З допомогою закладки: перетягніть і відпустіть посилання на панель закладок" + +msgid "Upgrading wallabag" +msgstr "Оновлення wallabag" + +msgid "Installed version" +msgstr "Встановлено ​​версію" + +msgid "Latest stable version" +msgstr "Остання стабільна версія" + +msgid "A more recent stable version is available." +msgstr "Є новіша стабільна версія." + +msgid "You are up to date." +msgstr "У вас остання версія." + +#, fuzzy +msgid "Latest dev version" +msgstr "остання версія в розробці" + +#, fuzzy +msgid "A more recent development version is available." +msgstr "доступна новіша версія в розробці." + +msgid "Feeds" +msgstr "Завантаження (feeds)" + +msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." +msgstr "Ваш маркер завантажень (feed token) не визначено, ви повинні спочатку згенерувати його для того, щоб активувати завантаження. Натисніть тут для його генерації." + +msgid "Unread feed" +msgstr "Завантаження непрочитаного" + +msgid "Favorites feed" +msgstr "Завантаження вибраного" + +msgid "Archive feed" +msgstr "Завантаження архіву" + +msgid "Your token:" +msgstr "Ваш маркер (token): " + +msgid "Your user id:" +msgstr "Ваш ідентифікатор користувача (user id):" + +msgid "You can regenerate your token: generate!." +msgstr "Ви можете перестворити ваш маркер: натисніть згенерувати!." + +msgid "Change your language" +msgstr "Змінити мову" + +msgid "Language:" +msgstr "Мова:" + +msgid "Please execute the import script locally as it can take a very long time." +msgstr "Будь ласка, виконайте сценарій імпорту локально, оскільки це може тривати досить довго." + +#, fuzzy +msgid "More info in the official documentation:" +msgstr "Більш детальна інформація в офіційній документації:" + +msgid "Import from Pocket" +msgstr "Імпорт з Pocket-а" + +msgid "Import from Readability" +msgstr "Імпорт з Readability" + +msgid "Import from Instapaper" +msgstr "Імпорт з Instapaper" + +msgid "Import from wallabag" +msgstr "Імпорт з wallabag" + +msgid "Export your wallabag data" +msgstr "Експортувати ваші дані з wallabag" + +msgid "to download your database." +msgstr "щоб завантажити вашу базу даних." + +msgid "to export your wallabag data." +msgstr "щоб експортувати ваші дані wallabag." + +msgid "Cache" +msgstr "Кеш" + +msgid "to delete cache." +msgstr "щоб очистити кеш." + +msgid "tweet" +msgstr "твітнути" + +msgid "email" +msgstr "email" + +msgid "shaarli" +msgstr "shaarli" + +msgid "flattr" +msgstr "flattr" + +msgid "this article appears wrong?" +msgstr "ця стаття виглядає не так, як треба?" + +msgid "You can enter multiple tags, separated by commas." +msgstr "Ви можете ввести декілька тегів, розділених комами." + +msgid "return to article" +msgstr "повернутися до статті" + +msgid "powered by" +msgstr "за підтримки" + +msgid "debug mode is on so cache is off." +msgstr "режим відладки включено, отже кеш виключено." + +msgid "your wallabag version:" +msgstr "версія вашого wallabag:" + +msgid "storage:" +msgstr "сховище:" + +msgid "save a link" +msgstr "зберегти лінк" + +msgid "return home" +msgstr "повернутися на головну" + +msgid "You can check your configuration here." +msgstr "Ви можете перевірити вашу конфігурацію тут." + +msgid "Tag" +msgstr "Тег" + +msgid "No articles found." +msgstr "Статей не знайдено." + +msgid "Toggle mark as read" +msgstr "змінити мітку прочитаного" + +msgid "mark all the entries as read" +msgstr "відмітити всі статті як прочитані" + +msgid "Login to wallabag" +msgstr "Увійти до wallabag" + +msgid "Username" +msgstr "Ім’я користувача" + +msgid "Sign in" +msgstr "Увійти" + msgid "Return home" msgstr "Повернутися на головну" @@ -327,12 +431,6 @@ msgstr "Твітнути" msgid "Email" msgstr "Надіслати по e-mail" -msgid "shaarli" -msgstr "shaarli" - -msgid "flattr" -msgstr "flattr" - msgid "Does this article appear wrong?" msgstr "Ця стаття виглядає не так, як треба?" @@ -342,11 +440,15 @@ msgstr "теги:" msgid "Edit tags" msgstr "Редагувати теги" -msgid "previous" -msgstr "попередня" +msgid "save link!" +msgstr "зберегти лінк!" -msgid "next" -msgstr "наступна" +#, fuzzy +msgid "estimated reading time :" +msgstr "приблизний час читання:" + +msgid "Mark all the entries as read" +msgstr "Відмітити все як прочитане" msgid "Untitled" msgstr "Без назви" @@ -363,6 +465,15 @@ 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 "в демонстраційному режимі ви не можете змінювати свій пароль" @@ -390,15 +501,12 @@ msgstr "ви змінили свої налаштування мови" msgid "login failed: you have to fill all fields" msgstr "увійти не вдалося: ви повинні заповнити всі поля" -msgid "welcome to your poche" -msgstr "ласкаво просимо до вашого poche" +msgid "welcome to your wallabag" +msgstr "ласкаво просимо до вашого wallabag" msgid "login failed: bad login or password" msgstr "увійти не вдалося: не вірний логін або пароль" -msgid "see you soon!" -msgstr "бувайте, ще побачимось!" - msgid "import from instapaper completed" msgstr "імпорт з instapaper-а завершено" @@ -423,6 +531,17 @@ msgstr "Не вдалося знайти потрібний \"" msgid "Uh, there is a problem while generating feeds." msgstr "Ох, є проблема при створенні завантажень (feeds)." +msgid "Cache deleted." +msgstr "Кеш очищено." + msgid "Oops, it seems you don't have PHP 5." msgstr "Упс, здається, у вас немає PHP 5." +#~ msgid "Import from poche" +#~ msgstr "Імпорт з poche" + +#~ msgid "welcome to your poche" +#~ msgstr "ласкаво просимо до вашого poche" + +#~ msgid "see you soon!" +#~ msgstr "бувайте, ще побачимось!" From 4b842b20cecb198baccdeac76916df367da0400a Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Mon, 24 Feb 2014 19:13:54 +0200 Subject: [PATCH 05/79] fix of #486 - import issue --- inc/3rdparty/makefulltextfeed.php | 353 +--------------------- inc/3rdparty/makefulltextfeedHelpers.php | 355 +++++++++++++++++++++++ 2 files changed, 357 insertions(+), 351 deletions(-) create mode 100755 inc/3rdparty/makefulltextfeedHelpers.php diff --git a/inc/3rdparty/makefulltextfeed.php b/inc/3rdparty/makefulltextfeed.php index 313397d2d..b024547f7 100755 --- a/inc/3rdparty/makefulltextfeed.php +++ b/inc/3rdparty/makefulltextfeed.php @@ -55,42 +55,8 @@ if (get_magic_quotes_gpc()) { // set include path set_include_path(realpath(dirname(__FILE__).'/libraries').PATH_SEPARATOR.get_include_path()); -// Autoloading of classes allows us to include files only when they're -// needed. If we've got a cached copy, for example, only Zend_Cache is loaded. -function autoload($class_name) { - static $dir = null; - if ($dir === null) $dir = dirname(__FILE__).'/libraries/'; - static $mapping = array( - // Include FeedCreator for RSS/Atom creation - 'FeedWriter' => 'feedwriter/FeedWriter.php', - 'FeedItem' => 'feedwriter/FeedItem.php', - // Include ContentExtractor and Readability for identifying and extracting content from URLs - 'ContentExtractor' => 'content-extractor/ContentExtractor.php', - 'SiteConfig' => 'content-extractor/SiteConfig.php', - 'Readability' => 'readability/Readability.php', - // Include Humble HTTP Agent to allow parallel requests and response caching - 'HumbleHttpAgent' => 'humble-http-agent/HumbleHttpAgent.php', - 'SimplePie_HumbleHttpAgent' => 'humble-http-agent/SimplePie_HumbleHttpAgent.php', - 'CookieJar' => 'humble-http-agent/CookieJar.php', - // Include Zend Cache to improve performance (cache results) - 'Zend_Cache' => 'Zend/Cache.php', - // Language detect - 'Text_LanguageDetect' => 'language-detect/LanguageDetect.php', - // HTML5 Lib - 'HTML5_Parser' => 'html5/Parser.php', - // htmLawed - used if XSS filter is enabled (xss_filter) - 'htmLawed' => 'htmLawed/htmLawed.php' - ); - if (isset($mapping[$class_name])) { - debug("** Loading class $class_name ({$mapping[$class_name]})"); - require $dir.$mapping[$class_name]; - return true; - } else { - return false; - } -} -spl_autoload_register('autoload'); -require dirname(__FILE__).'/libraries/simplepie/autoloader.php'; + +require_once dirname(__FILE__).'/makefulltextfeedHelpers.php'; //////////////////////////////// // Load config file @@ -415,7 +381,6 @@ if (!$debug_mode) { ////////////////////////////////// // Set up HTTP agent ////////////////////////////////// -global $http; $http = new HumbleHttpAgent(); $http->debug = $debug_mode; $http->userAgentMap = $options->user_agents; @@ -479,29 +444,6 @@ if ($html_only || !$result) { $isDummyFeed = true; unset($feed, $result); // create single item dummy feed object - class DummySingleItemFeed { - public $item; - function __construct($url) { $this->item = new DummySingleItem($url); } - public function get_title() { return ''; } - public function get_description() { return 'Content extracted from '.$this->item->url; } - public function get_link() { return $this->item->url; } - public function get_language() { return false; } - public function get_image_url() { return false; } - public function get_items($start=0, $max=1) { return array(0=>$this->item); } - } - class DummySingleItem { - public $url; - function __construct($url) { $this->url = $url; } - public function get_permalink() { return $this->url; } - public function get_title() { return null; } - public function get_date($format='') { return false; } - public function get_author($key=0) { return null; } - public function get_authors() { return null; } - public function get_description() { return ''; } - public function get_enclosure($key=0, $prefer=null) { return null; } - public function get_enclosures() { return null; } - public function get_categories() { return null; } - } $feed = new DummySingleItemFeed($url); } @@ -904,294 +846,3 @@ if (!$debug_mode) { if ($callback) echo ');'; } -/////////////////////////////// -// HELPER FUNCTIONS -/////////////////////////////// - -function url_allowed($url) { - global $options; - if (!empty($options->allowed_urls)) { - $allowed = false; - foreach ($options->allowed_urls as $allowurl) { - if (stristr($url, $allowurl) !== false) { - $allowed = true; - break; - } - } - if (!$allowed) return false; - } else { - foreach ($options->blocked_urls as $blockurl) { - if (stristr($url, $blockurl) !== false) { - return false; - } - } - } - return true; -} - -////////////////////////////////////////////// -// Convert $html to UTF8 -// (uses HTTP headers and HTML to find encoding) -// adapted from http://stackoverflow.com/questions/910793/php-detect-encoding-and-make-everything-utf-8 -////////////////////////////////////////////// -function convert_to_utf8($html, $header=null) -{ - $encoding = null; - if ($html || $header) { - if (is_array($header)) $header = implode("\n", $header); - if (!$header || !preg_match_all('/^Content-Type:\s+([^;]+)(?:;\s*charset=["\']?([^;"\'\n]*))?/im', $header, $match, PREG_SET_ORDER)) { - // error parsing the response - debug('Could not find Content-Type header in HTTP response'); - } else { - $match = end($match); // get last matched element (in case of redirects) - if (isset($match[2])) $encoding = trim($match[2], "\"' \r\n\0\x0B\t"); - } - // TODO: check to see if encoding is supported (can we convert it?) - // If it's not, result will be empty string. - // For now we'll check for invalid encoding types returned by some sites, e.g. 'none' - // Problem URL: http://facta.co.jp/blog/archives/20111026001026.html - if (!$encoding || $encoding == 'none') { - // search for encoding in HTML - only look at the first 50000 characters - // Why 50000? See, for example, http://www.lemonde.fr/festival-de-cannes/article/2012/05/23/deux-cretes-en-goguette-sur-la-croisette_1705732_766360.html - // TODO: improve this so it looks at smaller chunks first - $html_head = substr($html, 0, 50000); - if (preg_match('/^<\?xml\s+version=(?:"[^"]*"|\'[^\']*\')\s+encoding=("[^"]*"|\'[^\']*\')/s', $html_head, $match)) { - $encoding = trim($match[1], '"\''); - } elseif (preg_match('/]+)/i', $html_head, $match)) { - $encoding = trim($match[1]); - } elseif (preg_match_all('/]+)>/i', $html_head, $match)) { - foreach ($match[1] as $_test) { - if (preg_match('/charset=["\']?([^"\']+)/i', $_test, $_m)) { - $encoding = trim($_m[1]); - break; - } - } - } - } - if (isset($encoding)) $encoding = trim($encoding); - // trim is important here! - if (!$encoding || (strtolower($encoding) == 'iso-8859-1')) { - // replace MS Word smart qutoes - $trans = array(); - $trans[chr(130)] = '‚'; // Single Low-9 Quotation Mark - $trans[chr(131)] = 'ƒ'; // Latin Small Letter F With Hook - $trans[chr(132)] = '„'; // Double Low-9 Quotation Mark - $trans[chr(133)] = '…'; // Horizontal Ellipsis - $trans[chr(134)] = '†'; // Dagger - $trans[chr(135)] = '‡'; // Double Dagger - $trans[chr(136)] = 'ˆ'; // Modifier Letter Circumflex Accent - $trans[chr(137)] = '‰'; // Per Mille Sign - $trans[chr(138)] = 'Š'; // Latin Capital Letter S With Caron - $trans[chr(139)] = '‹'; // Single Left-Pointing Angle Quotation Mark - $trans[chr(140)] = 'Œ'; // Latin Capital Ligature OE - $trans[chr(145)] = '‘'; // Left Single Quotation Mark - $trans[chr(146)] = '’'; // Right Single Quotation Mark - $trans[chr(147)] = '“'; // Left Double Quotation Mark - $trans[chr(148)] = '”'; // Right Double Quotation Mark - $trans[chr(149)] = '•'; // Bullet - $trans[chr(150)] = '–'; // En Dash - $trans[chr(151)] = '—'; // Em Dash - $trans[chr(152)] = '˜'; // Small Tilde - $trans[chr(153)] = '™'; // Trade Mark Sign - $trans[chr(154)] = 'š'; // Latin Small Letter S With Caron - $trans[chr(155)] = '›'; // Single Right-Pointing Angle Quotation Mark - $trans[chr(156)] = 'œ'; // Latin Small Ligature OE - $trans[chr(159)] = 'Ÿ'; // Latin Capital Letter Y With Diaeresis - $html = strtr($html, $trans); - } - if (!$encoding) { - debug('No character encoding found, so treating as UTF-8'); - $encoding = 'utf-8'; - } else { - debug('Character encoding: '.$encoding); - if (strtolower($encoding) != 'utf-8') { - debug('Converting to UTF-8'); - $html = SimplePie_Misc::change_encoding($html, $encoding, 'utf-8'); - /* - if (function_exists('iconv')) { - // iconv appears to handle certain character encodings better than mb_convert_encoding - $html = iconv($encoding, 'utf-8', $html); - } else { - $html = mb_convert_encoding($html, 'utf-8', $encoding); - } - */ - } - } - } - return $html; -} - -function makeAbsolute($base, $elem) { - $base = new SimplePie_IRI($base); - // remove '//' in URL path (used to prevent URLs from resolving properly) - // TODO: check if this is still the case - if (isset($base->path)) $base->path = preg_replace('!//+!', '/', $base->path); - foreach(array('a'=>'href', 'img'=>'src') as $tag => $attr) { - $elems = $elem->getElementsByTagName($tag); - for ($i = $elems->length-1; $i >= 0; $i--) { - $e = $elems->item($i); - //$e->parentNode->replaceChild($articleContent->ownerDocument->createTextNode($e->textContent), $e); - makeAbsoluteAttr($base, $e, $attr); - } - if (strtolower($elem->tagName) == $tag) makeAbsoluteAttr($base, $elem, $attr); - } -} -function makeAbsoluteAttr($base, $e, $attr) { - if ($e->hasAttribute($attr)) { - // Trim leading and trailing white space. I don't really like this but - // unfortunately it does appear on some sites. e.g. - $url = trim(str_replace('%20', ' ', $e->getAttribute($attr))); - $url = str_replace(' ', '%20', $url); - if (!preg_match('!https?://!i', $url)) { - if ($absolute = SimplePie_IRI::absolutize($base, $url)) { - $e->setAttribute($attr, $absolute); - } - } - } -} -function makeAbsoluteStr($base, $url) { - $base = new SimplePie_IRI($base); - // remove '//' in URL path (causes URLs not to resolve properly) - if (isset($base->path)) $base->path = preg_replace('!//+!', '/', $base->path); - if (preg_match('!^https?://!i', $url)) { - // already absolute - return $url; - } else { - if ($absolute = SimplePie_IRI::absolutize($base, $url)) { - return $absolute; - } - return false; - } -} -// returns single page response, or false if not found -function getSinglePage($item, $html, $url) { - global $http, $extractor; - debug('Looking for site config files to see if single page link exists'); - $site_config = $extractor->buildSiteConfig($url, $html); - $splink = null; - if (!empty($site_config->single_page_link)) { - $splink = $site_config->single_page_link; - } elseif (!empty($site_config->single_page_link_in_feed)) { - // single page link xpath is targeted at feed - $splink = $site_config->single_page_link_in_feed; - // so let's replace HTML with feed item description - $html = $item->get_description(); - } - if (isset($splink)) { - // Build DOM tree from HTML - $readability = new Readability($html, $url); - $xpath = new DOMXPath($readability->dom); - // Loop through single_page_link xpath expressions - $single_page_url = null; - foreach ($splink as $pattern) { - $elems = @$xpath->evaluate($pattern, $readability->dom); - if (is_string($elems)) { - $single_page_url = trim($elems); - break; - } elseif ($elems instanceof DOMNodeList && $elems->length > 0) { - foreach ($elems as $item) { - if ($item instanceof DOMElement && $item->hasAttribute('href')) { - $single_page_url = $item->getAttribute('href'); - break 2; - } elseif ($item instanceof DOMAttr && $item->value) { - $single_page_url = $item->value; - break 2; - } - } - } - } - // If we've got URL, resolve against $url - if (isset($single_page_url) && ($single_page_url = makeAbsoluteStr($url, $single_page_url))) { - // check it's not what we have already! - if ($single_page_url != $url) { - // it's not, so let's try to fetch it... - $_prev_ref = $http->referer; - $http->referer = $single_page_url; - if (($response = $http->get($single_page_url, true)) && $response['status_code'] < 300) { - $http->referer = $_prev_ref; - return $response; - } - $http->referer = $_prev_ref; - } - } - } - return false; -} - -// based on content-type http header, decide what to do -// param: HTTP headers string -// return: array with keys: 'mime', 'type', 'subtype', 'action', 'name' -// e.g. array('mime'=>'image/jpeg', 'type'=>'image', 'subtype'=>'jpeg', 'action'=>'link', 'name'=>'Image') -function get_mime_action_info($headers) { - global $options; - // check if action defined for returned Content-Type - $info = array(); - if (preg_match('!^Content-Type:\s*(([-\w]+)/([-\w\+]+))!im', $headers, $match)) { - // look for full mime type (e.g. image/jpeg) or just type (e.g. image) - // match[1] = full mime type, e.g. image/jpeg - // match[2] = first part, e.g. image - // match[3] = last part, e.g. jpeg - $info['mime'] = strtolower(trim($match[1])); - $info['type'] = strtolower(trim($match[2])); - $info['subtype'] = strtolower(trim($match[3])); - foreach (array($info['mime'], $info['type']) as $_mime) { - if (isset($options->content_type_exc[$_mime])) { - $info['action'] = $options->content_type_exc[$_mime]['action']; - $info['name'] = $options->content_type_exc[$_mime]['name']; - break; - } - } - } - return $info; -} - -function remove_url_cruft($url) { - // remove google analytics for the time being - // regex adapted from http://navitronic.co.uk/2010/12/removing-google-analytics-cruft-from-urls/ - // https://gist.github.com/758177 - return preg_replace('/(\?|\&)utm_[a-z]+=[^\&]+/', '', $url); -} - -function make_substitutions($string) { - if ($string == '') return $string; - global $item, $effective_url; - $string = str_replace('{url}', htmlspecialchars($item->get_permalink()), $string); - $string = str_replace('{effective-url}', htmlspecialchars($effective_url), $string); - return $string; -} - -function get_cache() { - global $options, $valid_key; - static $cache = null; - if ($cache === null) { - $frontendOptions = array( - 'lifetime' => 10*60, // cache lifetime of 10 minutes - 'automatic_serialization' => false, - 'write_control' => false, - 'automatic_cleaning_factor' => $options->cache_cleanup, - 'ignore_user_abort' => false - ); - $backendOptions = array( - 'cache_dir' => ($valid_key) ? $options->cache_dir.'/rss-with-key/' : $options->cache_dir.'/rss/', // directory where to put the cache files - 'file_locking' => false, - 'read_control' => true, - 'read_control_type' => 'strlen', - 'hashed_directory_level' => $options->cache_directory_level, - 'hashed_directory_perm' => 0777, - 'cache_file_perm' => 0664, - 'file_name_prefix' => 'ff' - ); - // getting a Zend_Cache_Core object - $cache = Zend_Cache::factory('Core', 'File', $frontendOptions, $backendOptions); - } - return $cache; -} - -function debug($msg) { - global $debug_mode; - if ($debug_mode) { - echo '* ',$msg,"\n"; - ob_flush(); - flush(); - } -} \ No newline at end of file diff --git a/inc/3rdparty/makefulltextfeedHelpers.php b/inc/3rdparty/makefulltextfeedHelpers.php new file mode 100755 index 000000000..1c11b8f6b --- /dev/null +++ b/inc/3rdparty/makefulltextfeedHelpers.php @@ -0,0 +1,355 @@ + 'feedwriter/FeedWriter.php', + 'FeedItem' => 'feedwriter/FeedItem.php', + // Include ContentExtractor and Readability for identifying and extracting content from URLs + 'ContentExtractor' => 'content-extractor/ContentExtractor.php', + 'SiteConfig' => 'content-extractor/SiteConfig.php', + 'Readability' => 'readability/Readability.php', + // Include Humble HTTP Agent to allow parallel requests and response caching + 'HumbleHttpAgent' => 'humble-http-agent/HumbleHttpAgent.php', + 'SimplePie_HumbleHttpAgent' => 'humble-http-agent/SimplePie_HumbleHttpAgent.php', + 'CookieJar' => 'humble-http-agent/CookieJar.php', + // Include Zend Cache to improve performance (cache results) + 'Zend_Cache' => 'Zend/Cache.php', + // Language detect + 'Text_LanguageDetect' => 'language-detect/LanguageDetect.php', + // HTML5 Lib + 'HTML5_Parser' => 'html5/Parser.php', + // htmLawed - used if XSS filter is enabled (xss_filter) + 'htmLawed' => 'htmLawed/htmLawed.php' + ); + if (isset($mapping[$class_name])) { + debug("** Loading class $class_name ({$mapping[$class_name]})"); + require $dir.$mapping[$class_name]; + return true; + } else { + return false; + } +} +spl_autoload_register('autoload'); +require dirname(__FILE__).'/libraries/simplepie/autoloader.php'; + + +class DummySingleItemFeed { + public $item; + function __construct($url) { $this->item = new DummySingleItem($url); } + public function get_title() { return ''; } + public function get_description() { return 'Content extracted from '.$this->item->url; } + public function get_link() { return $this->item->url; } + public function get_language() { return false; } + public function get_image_url() { return false; } + public function get_items($start=0, $max=1) { return array(0=>$this->item); } +} +class DummySingleItem { + public $url; + function __construct($url) { $this->url = $url; } + public function get_permalink() { return $this->url; } + public function get_title() { return null; } + public function get_date($format='') { return false; } + public function get_author($key=0) { return null; } + public function get_authors() { return null; } + public function get_description() { return ''; } + public function get_enclosure($key=0, $prefer=null) { return null; } + public function get_enclosures() { return null; } + public function get_categories() { return null; } +} + +/////////////////////////////// +// HELPER FUNCTIONS +/////////////////////////////// + +function url_allowed($url) { + global $options; + if (!empty($options->allowed_urls)) { + $allowed = false; + foreach ($options->allowed_urls as $allowurl) { + if (stristr($url, $allowurl) !== false) { + $allowed = true; + break; + } + } + if (!$allowed) return false; + } else { + foreach ($options->blocked_urls as $blockurl) { + if (stristr($url, $blockurl) !== false) { + return false; + } + } + } + return true; +} + +////////////////////////////////////////////// +// Convert $html to UTF8 +// (uses HTTP headers and HTML to find encoding) +// adapted from http://stackoverflow.com/questions/910793/php-detect-encoding-and-make-everything-utf-8 +////////////////////////////////////////////// +function convert_to_utf8($html, $header=null) +{ + $encoding = null; + if ($html || $header) { + if (is_array($header)) $header = implode("\n", $header); + if (!$header || !preg_match_all('/^Content-Type:\s+([^;]+)(?:;\s*charset=["\']?([^;"\'\n]*))?/im', $header, $match, PREG_SET_ORDER)) { + // error parsing the response + debug('Could not find Content-Type header in HTTP response'); + } else { + $match = end($match); // get last matched element (in case of redirects) + if (isset($match[2])) $encoding = trim($match[2], "\"' \r\n\0\x0B\t"); + } + // TODO: check to see if encoding is supported (can we convert it?) + // If it's not, result will be empty string. + // For now we'll check for invalid encoding types returned by some sites, e.g. 'none' + // Problem URL: http://facta.co.jp/blog/archives/20111026001026.html + if (!$encoding || $encoding == 'none') { + // search for encoding in HTML - only look at the first 50000 characters + // Why 50000? See, for example, http://www.lemonde.fr/festival-de-cannes/article/2012/05/23/deux-cretes-en-goguette-sur-la-croisette_1705732_766360.html + // TODO: improve this so it looks at smaller chunks first + $html_head = substr($html, 0, 50000); + if (preg_match('/^<\?xml\s+version=(?:"[^"]*"|\'[^\']*\')\s+encoding=("[^"]*"|\'[^\']*\')/s', $html_head, $match)) { + $encoding = trim($match[1], '"\''); + } elseif (preg_match('/]+)/i', $html_head, $match)) { + $encoding = trim($match[1]); + } elseif (preg_match_all('/]+)>/i', $html_head, $match)) { + foreach ($match[1] as $_test) { + if (preg_match('/charset=["\']?([^"\']+)/i', $_test, $_m)) { + $encoding = trim($_m[1]); + break; + } + } + } + } + if (isset($encoding)) $encoding = trim($encoding); + // trim is important here! + if (!$encoding || (strtolower($encoding) == 'iso-8859-1')) { + // replace MS Word smart qutoes + $trans = array(); + $trans[chr(130)] = '‚'; // Single Low-9 Quotation Mark + $trans[chr(131)] = 'ƒ'; // Latin Small Letter F With Hook + $trans[chr(132)] = '„'; // Double Low-9 Quotation Mark + $trans[chr(133)] = '…'; // Horizontal Ellipsis + $trans[chr(134)] = '†'; // Dagger + $trans[chr(135)] = '‡'; // Double Dagger + $trans[chr(136)] = 'ˆ'; // Modifier Letter Circumflex Accent + $trans[chr(137)] = '‰'; // Per Mille Sign + $trans[chr(138)] = 'Š'; // Latin Capital Letter S With Caron + $trans[chr(139)] = '‹'; // Single Left-Pointing Angle Quotation Mark + $trans[chr(140)] = 'Œ'; // Latin Capital Ligature OE + $trans[chr(145)] = '‘'; // Left Single Quotation Mark + $trans[chr(146)] = '’'; // Right Single Quotation Mark + $trans[chr(147)] = '“'; // Left Double Quotation Mark + $trans[chr(148)] = '”'; // Right Double Quotation Mark + $trans[chr(149)] = '•'; // Bullet + $trans[chr(150)] = '–'; // En Dash + $trans[chr(151)] = '—'; // Em Dash + $trans[chr(152)] = '˜'; // Small Tilde + $trans[chr(153)] = '™'; // Trade Mark Sign + $trans[chr(154)] = 'š'; // Latin Small Letter S With Caron + $trans[chr(155)] = '›'; // Single Right-Pointing Angle Quotation Mark + $trans[chr(156)] = 'œ'; // Latin Small Ligature OE + $trans[chr(159)] = 'Ÿ'; // Latin Capital Letter Y With Diaeresis + $html = strtr($html, $trans); + } + if (!$encoding) { + debug('No character encoding found, so treating as UTF-8'); + $encoding = 'utf-8'; + } else { + debug('Character encoding: '.$encoding); + if (strtolower($encoding) != 'utf-8') { + debug('Converting to UTF-8'); + $html = SimplePie_Misc::change_encoding($html, $encoding, 'utf-8'); + /* + if (function_exists('iconv')) { + // iconv appears to handle certain character encodings better than mb_convert_encoding + $html = iconv($encoding, 'utf-8', $html); + } else { + $html = mb_convert_encoding($html, 'utf-8', $encoding); + } + */ + } + } + } + return $html; +} + +function makeAbsolute($base, $elem) { + $base = new SimplePie_IRI($base); + // remove '//' in URL path (used to prevent URLs from resolving properly) + // TODO: check if this is still the case + if (isset($base->path)) $base->path = preg_replace('!//+!', '/', $base->path); + foreach(array('a'=>'href', 'img'=>'src') as $tag => $attr) { + $elems = $elem->getElementsByTagName($tag); + for ($i = $elems->length-1; $i >= 0; $i--) { + $e = $elems->item($i); + //$e->parentNode->replaceChild($articleContent->ownerDocument->createTextNode($e->textContent), $e); + makeAbsoluteAttr($base, $e, $attr); + } + if (strtolower($elem->tagName) == $tag) makeAbsoluteAttr($base, $elem, $attr); + } +} +function makeAbsoluteAttr($base, $e, $attr) { + if ($e->hasAttribute($attr)) { + // Trim leading and trailing white space. I don't really like this but + // unfortunately it does appear on some sites. e.g. + $url = trim(str_replace('%20', ' ', $e->getAttribute($attr))); + $url = str_replace(' ', '%20', $url); + if (!preg_match('!https?://!i', $url)) { + if ($absolute = SimplePie_IRI::absolutize($base, $url)) { + $e->setAttribute($attr, $absolute); + } + } + } +} +function makeAbsoluteStr($base, $url) { + $base = new SimplePie_IRI($base); + // remove '//' in URL path (causes URLs not to resolve properly) + if (isset($base->path)) $base->path = preg_replace('!//+!', '/', $base->path); + if (preg_match('!^https?://!i', $url)) { + // already absolute + return $url; + } else { + if ($absolute = SimplePie_IRI::absolutize($base, $url)) { + return $absolute; + } + return false; + } +} +// returns single page response, or false if not found +function getSinglePage($item, $html, $url) { + global $http, $extractor; + debug('Looking for site config files to see if single page link exists'); + $site_config = $extractor->buildSiteConfig($url, $html); + $splink = null; + if (!empty($site_config->single_page_link)) { + $splink = $site_config->single_page_link; + } elseif (!empty($site_config->single_page_link_in_feed)) { + // single page link xpath is targeted at feed + $splink = $site_config->single_page_link_in_feed; + // so let's replace HTML with feed item description + $html = $item->get_description(); + } + if (isset($splink)) { + // Build DOM tree from HTML + $readability = new Readability($html, $url); + $xpath = new DOMXPath($readability->dom); + // Loop through single_page_link xpath expressions + $single_page_url = null; + foreach ($splink as $pattern) { + $elems = @$xpath->evaluate($pattern, $readability->dom); + if (is_string($elems)) { + $single_page_url = trim($elems); + break; + } elseif ($elems instanceof DOMNodeList && $elems->length > 0) { + foreach ($elems as $item) { + if ($item instanceof DOMElement && $item->hasAttribute('href')) { + $single_page_url = $item->getAttribute('href'); + break 2; + } elseif ($item instanceof DOMAttr && $item->value) { + $single_page_url = $item->value; + break 2; + } + } + } + } + // If we've got URL, resolve against $url + if (isset($single_page_url) && ($single_page_url = makeAbsoluteStr($url, $single_page_url))) { + // check it's not what we have already! + if ($single_page_url != $url) { + // it's not, so let's try to fetch it... + $_prev_ref = $http->referer; + $http->referer = $single_page_url; + if (($response = $http->get($single_page_url, true)) && $response['status_code'] < 300) { + $http->referer = $_prev_ref; + return $response; + } + $http->referer = $_prev_ref; + } + } + } + return false; +} + +// based on content-type http header, decide what to do +// param: HTTP headers string +// return: array with keys: 'mime', 'type', 'subtype', 'action', 'name' +// e.g. array('mime'=>'image/jpeg', 'type'=>'image', 'subtype'=>'jpeg', 'action'=>'link', 'name'=>'Image') +function get_mime_action_info($headers) { + global $options; + // check if action defined for returned Content-Type + $info = array(); + if (preg_match('!^Content-Type:\s*(([-\w]+)/([-\w\+]+))!im', $headers, $match)) { + // look for full mime type (e.g. image/jpeg) or just type (e.g. image) + // match[1] = full mime type, e.g. image/jpeg + // match[2] = first part, e.g. image + // match[3] = last part, e.g. jpeg + $info['mime'] = strtolower(trim($match[1])); + $info['type'] = strtolower(trim($match[2])); + $info['subtype'] = strtolower(trim($match[3])); + foreach (array($info['mime'], $info['type']) as $_mime) { + if (isset($options->content_type_exc[$_mime])) { + $info['action'] = $options->content_type_exc[$_mime]['action']; + $info['name'] = $options->content_type_exc[$_mime]['name']; + break; + } + } + } + return $info; +} + +function remove_url_cruft($url) { + // remove google analytics for the time being + // regex adapted from http://navitronic.co.uk/2010/12/removing-google-analytics-cruft-from-urls/ + // https://gist.github.com/758177 + return preg_replace('/(\?|\&)utm_[a-z]+=[^\&]+/', '', $url); +} + +function make_substitutions($string) { + if ($string == '') return $string; + global $item, $effective_url; + $string = str_replace('{url}', htmlspecialchars($item->get_permalink()), $string); + $string = str_replace('{effective-url}', htmlspecialchars($effective_url), $string); + return $string; +} + +function get_cache() { + global $options, $valid_key; + static $cache = null; + if ($cache === null) { + $frontendOptions = array( + 'lifetime' => 10*60, // cache lifetime of 10 minutes + 'automatic_serialization' => false, + 'write_control' => false, + 'automatic_cleaning_factor' => $options->cache_cleanup, + 'ignore_user_abort' => false + ); + $backendOptions = array( + 'cache_dir' => ($valid_key) ? $options->cache_dir.'/rss-with-key/' : $options->cache_dir.'/rss/', // directory where to put the cache files + 'file_locking' => false, + 'read_control' => true, + 'read_control_type' => 'strlen', + 'hashed_directory_level' => $options->cache_directory_level, + 'hashed_directory_perm' => 0777, + 'cache_file_perm' => 0664, + 'file_name_prefix' => 'ff' + ); + // getting a Zend_Cache_Core object + $cache = Zend_Cache::factory('Core', 'File', $frontendOptions, $backendOptions); + } + return $cache; +} + +function debug($msg) { + global $debug_mode; + if ($debug_mode) { + echo '* ',$msg,"\n"; + ob_flush(); + flush(); + } +} From dcc73856a900a98b2b1efd5292eea6f662924884 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Tue, 25 Feb 2014 15:45:39 +0200 Subject: [PATCH 06/79] "poche" word removed completely, all locales .po files updated, en, pl, ru and uk .mo files recompiled. --- index.php | 2 +- locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po | 498 +++++++++++++++--- locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po | 496 +++++++++++++++--- locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo | Bin 4481 -> 11884 bytes locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po | 488 ++++++++++++++---- locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po | 499 +++++++++++++++--- locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po | 493 +++++++++++++++--- locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po | 465 +++++++++-------- locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po | 507 ++++++++++++++---- locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo | Bin 13856 -> 13552 bytes locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po | 496 +++++++++--------- locale/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po | 545 ++++++++++++++++---- locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo | Bin 14375 -> 15670 bytes locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po | 493 +++++++++--------- themes/baggy/_top.twig | 2 +- themes/courgette/_top.twig | 2 +- themes/courgette/config.twig | 12 +- themes/default/_bookmarklet.twig | 2 +- themes/default/_top.twig | 2 +- 19 files changed, 3640 insertions(+), 1362 deletions(-) diff --git a/index.php b/index.php index a26c42e14..7260e5831 100644 --- a/index.php +++ b/index.php @@ -30,7 +30,7 @@ $tpl_vars = array( 'referer' => $referer, 'view' => $view, 'poche_url' => Tools::getPocheUrl(), - 'title' => _('poche, a read it later open source system'), + 'title' => _('wallabag, a read it later open source system'), 'token' => Session::getToken(), 'theme' => $poche->getTheme() ); diff --git a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po b/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po index 8209a9cdd..cf727432b 100644 --- a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po +++ b/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po @@ -4,54 +4,137 @@ msgid "" msgstr "" "Project-Id-Version: poche\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: 2013-10-08 13:25+0100\n" -"Last-Translator: Nicolas Lœuillet \n" -"Language-Team: Czech (http://www.transifex.com/projects/p/poche/language/" -"cs/)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-02-25 15:28+0300\n" +"PO-Revision-Date: 2014-02-25 15:29+0300\n" +"Last-Translator: Maryana \n" +"Language-Team: Czech (http://www.transifex.com/projects/p/poche/language/cs/)\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Poedit 1.5.4\n" +"X-Poedit-Language: Czech\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 "nastavení" -msgid "Poching a link" -msgstr "Odkaz se ukládá" +msgid "Saving articles" +msgstr "" + +msgid "There are several ways to save an article:" +msgstr "" msgid "read the documentation" msgstr "číst dokumentaci" -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 "vyplněním tohoto pole" -msgid "poche it!" -msgstr "uložit!" +msgid "bag it!" +msgstr "" -msgid "Updating poche" -msgstr "Poche se aktualizuje" +msgid "Bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "" -msgid "your version" -msgstr "vaše verze" +msgid "Upgrading wallabag" +msgstr "" -msgid "latest stable version" +#, fuzzy +msgid "Installed version" msgstr "poslední stabilní verze" -msgid "a more recent stable version is available." +#, fuzzy +msgid "Latest stable version" +msgstr "poslední stabilní verze" + +#, fuzzy +msgid "A more recent stable version is available." msgstr "je k dispozici novější stabilní verze." -msgid "you are up to date." +#, fuzzy +msgid "You are up to date." msgstr "je aktuální" -msgid "latest dev version" +#, fuzzy +msgid "Latest dev version" msgstr "poslední vývojová verze" -msgid "a more recent development version is available." +#, fuzzy +msgid "A more recent development version is available." msgstr "je k dispozici novější vývojová verze." +msgid "Feeds" +msgstr "" + +msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." +msgstr "" + +msgid "Unread feed" +msgstr "" + +#, fuzzy +msgid "Favorites feed" +msgstr "oblíbené" + +#, fuzzy +msgid "Archive feed" +msgstr "archív" + +msgid "Your token:" +msgstr "" + +msgid "Your user id:" +msgstr "" + +msgid "You can regenerate your token: generate!." +msgstr "" + +#, fuzzy +msgid "Change your theme" +msgstr "Změnit heslo" + +msgid "Theme:" +msgstr "" + +msgid "Update" +msgstr "Aktualizovat" + +#, fuzzy +msgid "Change your language" +msgstr "Změnit heslo" + +msgid "Language:" +msgstr "" + msgid "Change your password" msgstr "Změnit heslo" @@ -64,65 +147,68 @@ msgstr "Heslo" msgid "Repeat your new password:" msgstr "Znovu nové heslo:" -msgid "Update" -msgstr "Aktualizovat" - msgid "Import" msgstr "Importovat" -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 "Spusťte importní skript lokálně, může to dlouho trvat." -msgid "More info in the official doc:" +#, fuzzy +msgid "More info in the official documentation:" msgstr "Více informací v oficiální dokumentaci:" -msgid "import from Pocket" +#, fuzzy +msgid "Import from Pocket" msgstr "importovat z Pocket" -msgid "import from Readability" +#, php-format +msgid "(you must have a %s file on your server)" +msgstr "" + +#, fuzzy +msgid "Import from Readability" msgstr "importovat z Readability" -msgid "import from Instapaper" +#, fuzzy +msgid "Import from Instapaper" msgstr "importovat z Instapaper" -msgid "Export your poche data" +#, fuzzy +msgid "Import from wallabag" +msgstr "importovat z Readability" + +#, fuzzy +msgid "Export your wallabag data" msgstr "Export dat" msgid "Click here" msgstr "Klikněte zde" -msgid "to export your poche data." +msgid "to download your database." +msgstr "" + +#, fuzzy +msgid "to export your wallabag data." msgstr "pro export vašich dat." -msgid "back to home" -msgstr "zpět na úvod" - -msgid "installation" -msgstr "instalace" - -msgid "install your poche" -msgstr "instalovat" - -msgid "" -"poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " -"on poche website." +msgid "Cache" msgstr "" -"poche ještě není nainstalováno. Pro instalaci vyplňte níže uvedený formulář. " -"Nezapomeňte si přečíst dokumentaci " -"na stránkách programu." -msgid "Login" -msgstr "Jméno" +msgid "to delete cache." +msgstr "" -msgid "Repeat your password" -msgstr "Zopakujte heslo" +msgid "You can enter multiple tags, separated by commas." +msgstr "" -msgid "Install" -msgstr "Instalovat" +msgid "return to article" +msgstr "" -msgid "back to top" -msgstr "zpět na začátek" +msgid "plop" +msgstr "" + +msgid "You can check your configuration here." +msgstr "" msgid "favoris" msgstr "oblíbené" @@ -151,10 +237,14 @@ msgstr "podle nadpisu" msgid "by title desc" msgstr "podle nadpisu sestupně" -msgid "No link available here!" -msgstr "Není k dispozici žádný odkaz!" +msgid "Tag" +msgstr "" -msgid "toggle mark as read" +msgid "No articles found." +msgstr "" + +#, fuzzy +msgid "Toggle mark as read" msgstr "označit jako přečtené" msgid "toggle favorite" @@ -166,13 +256,95 @@ msgstr "smazat" msgid "original" msgstr "originál" +msgid "estimated reading time:" +msgstr "" + +msgid "mark all the entries as read" +msgstr "" + msgid "results" msgstr "výsledky" -msgid "tweet" +msgid "installation" +msgstr "instalace" + +#, fuzzy +msgid "install your wallabag" +msgstr "instalovat" + +#, fuzzy +msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." +msgstr "poche ještě není nainstalováno. Pro instalaci vyplňte níže uvedený formulář. Nezapomeňte si přečíst dokumentaci na stránkách programu." + +msgid "Login" +msgstr "Jméno" + +msgid "Repeat your password" +msgstr "Zopakujte heslo" + +msgid "Install" +msgstr "Instalovat" + +#, fuzzy +msgid "login to your wallabag" +msgstr "přihlásit se k poche" + +msgid "Login to wallabag" +msgstr "" + +msgid "you are in demo mode, some features may be disabled." +msgstr "používáte ukázkový mód, některé funkce jsou zakázány." + +msgid "Username" +msgstr "" + +msgid "Stay signed in" +msgstr "Zůstat přihlášen(a)" + +msgid "(Do not check on public computers)" +msgstr "(Nezaškrtávejte na veřejně dostupných počítačích)" + +msgid "Sign in" +msgstr "Přihlásit se" + +msgid "favorites" +msgstr "oblíbené" + +msgid "estimated reading time :" +msgstr "" + +msgid "Mark all the entries as read" +msgstr "" + +msgid "Return home" +msgstr "" + +#, fuzzy +msgid "Back to top" +msgstr "zpět na začátek" + +#, fuzzy +msgid "Mark as read" +msgstr "označit jako přečtené" + +#, fuzzy +msgid "Favorite" +msgstr "oblíbené" + +#, fuzzy +msgid "Toggle favorite" +msgstr "označit jako oblíbené" + +#, fuzzy +msgid "Delete" +msgstr "smazat" + +#, fuzzy +msgid "Tweet" msgstr "tweetnout" -msgid "email" +#, fuzzy +msgid "Email" msgstr "email" msgid "shaarli" @@ -181,26 +353,24 @@ msgstr "shaarli" msgid "flattr" msgstr "flattr" -msgid "this article appears wrong?" +#, fuzzy +msgid "Does this article appear wrong?" msgstr "vypadá tento článek špatně?" -msgid "create an issue" -msgstr "odeslat požadavek" +msgid "tags:" +msgstr "" -msgid "or" -msgstr "nebo" +msgid "Edit tags" +msgstr "" -msgid "contact us by mail" -msgstr "kontaktovat e-mailem" - -msgid "plop" +msgid "save link!" msgstr "" msgid "home" msgstr "domů" -msgid "favorites" -msgstr "oblíbené" +msgid "tags" +msgstr "" msgid "logout" msgstr "odhlásit se" @@ -211,23 +381,187 @@ msgstr "běží na" msgid "debug mode is on so cache is off." msgstr "je zapnut ladicí mód, proto je keš vypnuta." -msgid "your poche version:" -msgstr "verze:" +#, fuzzy +msgid "your wallabag version:" +msgstr "vaše verze" msgid "storage:" msgstr "úložiště:" -msgid "login to your poche" -msgstr "přihlásit se k poche" +msgid "save a link" +msgstr "" -msgid "you are in demo mode, some features may be disabled." -msgstr "používáte ukázkový mód, některé funkce jsou zakázány." +msgid "back to home" +msgstr "zpět na úvod" -msgid "Stay signed in" -msgstr "Zůstat přihlášen(a)" +msgid "toggle mark as read" +msgstr "označit jako přečtené" -msgid "(Do not check on public computers)" -msgstr "(Nezaškrtávejte na veřejně dostupných počítačích)" +msgid "tweet" +msgstr "tweetnout" -msgid "Sign in" -msgstr "Přihlásit se" +msgid "email" +msgstr "email" + +msgid "this article appears wrong?" +msgstr "vypadá tento článek špatně?" + +msgid "No link available here!" +msgstr "Není k dispozici žádný odkaz!" + +msgid "Poching a link" +msgstr "Odkaz se ukládá" + +msgid "by filling this field" +msgstr "vyplněním tohoto pole" + +msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "" + +msgid "your version" +msgstr "vaše verze" + +msgid "latest stable version" +msgstr "poslední stabilní verze" + +msgid "a more recent stable version is available." +msgstr "je k dispozici novější stabilní verze." + +msgid "you are up to date." +msgstr "je aktuální" + +msgid "latest dev version" +msgstr "poslední vývojová verze" + +msgid "a more recent development version is available." +msgstr "je k dispozici novější vývojová verze." + +msgid "Please execute the import script locally, it can take a very long time." +msgstr "Spusťte importní skript lokálně, může to dlouho trvat." + +#, fuzzy +msgid "More infos in the official doc:" +msgstr "Více informací v oficiální dokumentaci:" + +msgid "import from Pocket" +msgstr "importovat z Pocket" + +msgid "import from Readability" +msgstr "importovat z Readability" + +msgid "import from Instapaper" +msgstr "importovat z Instapaper" + +msgid "Tags" +msgstr "" + +#, fuzzy +msgid "Untitled" +msgstr "podle nadpisu" + +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 "importovat z Instapaper" + +#, fuzzy +msgid "import from pocket completed" +msgstr "importovat z Pocket" + +#, fuzzy +msgid "import from Readability completed. " +msgstr "importovat z Readability" + +#, fuzzy +msgid "import from Poche completed. " +msgstr "importovat z 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 "smazat" + +msgid "Oops, it seems you don't have PHP 5." +msgstr "" + +#~ msgid "poche it!" +#~ msgstr "uložit!" + +#~ msgid "Updating poche" +#~ msgstr "Poche se aktualizuje" + +#~ msgid "create an issue" +#~ msgstr "odeslat požadavek" + +#~ msgid "or" +#~ msgstr "nebo" + +#~ msgid "contact us by mail" +#~ msgstr "kontaktovat e-mailem" + +#~ msgid "your poche version:" +#~ msgstr "verze:" 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 5b30d3d71..9abc59838 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 \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 here to generate it." +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: generate!." +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." +msgid "to download your database." +msgstr "" + +#, fuzzy +msgid "to export your wallabag data." msgstr "um deine Daten aus Poche zu exportieren." -msgid "back to home" -msgstr "züruck zur Hauptseite" - -msgid "installation" -msgstr "Installieren" - -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 read the documentation " -"on poche website." +msgid "Cache" msgstr "" -"Poche ist noch nicht installiert. Bitte fülle die Felder unten aus, um die " -"Installation durchzuführen. Zögere nicht, die Dokumentation auf der Website von Poche zu lesen falls du Probleme " -"haben solltest." -msgid "Login" -msgstr "Benutzername" +msgid "to delete cache." +msgstr "" -msgid "Repeat your password" -msgstr "Wiederhole dein Passwort" +msgid "You can enter multiple tags, separated by commas." +msgstr "" -msgid "Install" -msgstr "Installieren" +msgid "return to article" +msgstr "" -msgid "back to top" -msgstr "Nach Oben" +msgid "plop" +msgstr "plop" + +msgid "You can check your configuration here." +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 read the documentation on wallabag website." +msgstr "Poche ist noch nicht installiert. Bitte fülle die Felder unten aus, um die Installation durchzuführen. Zögere nicht, 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 "tags:" +msgstr "" -msgid "or" -msgstr "oder" +msgid "Edit tags" +msgstr "" -msgid "contact us by mail" -msgstr "kontaktieren Sie uns per E-Mail" - -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 "you are in demo mode, some features may be disabled." +msgid "save a link" msgstr "" -"Du befindest dich im Demomodus, einige Funktionen könnten deaktiviert sein." -msgid "Stay signed in" -msgstr "Angemeldet bleiben" +msgid "back to home" +msgstr "züruck zur Hauptseite" -msgid "(Do not check on public computers)" -msgstr "(nicht auf einem öffentlichen Computer anhaken)" +msgid "toggle mark as read" +msgstr "Als gelesen markieren" -msgid "Sign in" -msgstr "Einloggen" +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 "" + +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." + +#, 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" diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo index 83d0a85f208ebc0fb5c619bd740a2fdda7d7d531..bf5f69e7286a149f8f2646d2fba934698e3d5ce3 100644 GIT binary patch literal 11884 zcmeI1dypK*UB_EU$j;eL{E9Ioj$6Xk!@AwOlcmI7OD9>bcRCvrOfWGacCeh-F~I~Sf;g^S@>4?PmnH*d5bYznzit9_|}5g z!ArQ`1*O7K_~Yz@I3e+ls*qb_4gFiduO1=^988>Uxcdn5|kbP4$2r*T5^`aj1UUQ2L#MYUd%ytLBlS{G*UR zbC%N-{5?1ZFGAU)a2GrcABSr18jL7=jKUE(4y9KJHIApD?0BZQe;z8HzF6G94%N=T zL)BZ2bGbAZL+QBzs(b{hpB+$oAA;-P(c(UV8t46xKl219+2J`TJA4M}`72QV`VT1m zF6KsYaV1o{>!Iwt8B)bm;Z<+~%1(92pPA$IlkhQU;pd>@<}cwe{1>QkTt%nS|9YtR zcSDsQhk8GN7Cs6$!{?#;eHluh*P+_|Hz>U>BY0$&E1~Y!LFL(oqI?YM{TkHxjzZb@ z4oD~(SKQA-z4uAJuIRUr9 z`=HwSZK(MB1Go`>2fhPdM5pq@FqD06glAV7GYK`$?@~$gYMcvD`aS_==Vzhf;0sWCe-*0!*WqgTw@`k31A9yUe>arfPr$XX z0dbM(6!#y58t0Qx@$mwb9sU%`4qq>xe;>+Um*dp);4oBNY=dfd9Ik;AQ0*Loq>%Ao z=5Lt!8)AC%9JKH+pyK9rI1De`oR8y1sBzr}_5R&Oc?9+T!_dM{LH^8(oYe2XLg{k> z##FnPLg_UE&xhNJ`<-xz`#nYZ5vccXhZe~wZVy4l z+nrGTgizy7;RWyksCw^%FTkfDf960X_jd}nasMb(JAVRE(fl>U)n*mW*ZjB{UI=f2 zvd=VJ1yx7-j3TnXj;9f|xf9ukJc;PgxOO24vIn^X*^4YcZlT~85ZULai-*5h@L||M z?knzZg1=H+KMv0z9`dtAnJ|x>LVg|jIYfD;*wJwkk^LF2xf}TzWGkX0MBa@|Bex>& zK|X*?Aj<94$j>96Ky=7II`$)D*;Rf@i);D!&f@wRcs+76@(|(>9rBruHOR-1mTov? z^8k4hB0p#j(DB|J{j*}=YDBrB;~;W2yE5iC3(B9rfgDBVko%DzL3BKT^bp0+o00N} zxlkM`c5X+WKn^1j@>7V8Lpl2ANv1Pjl!x;2G_o7fnxkWV4)ZQ}EuvgH zj%d!;F@wxzSIi0UeaJ_O`;Qm=ApB+IL&&co7a=-M_9F-bZ8FO zp*i5A$Xk#PBRbkT*(kPV)4s@tQEKZgSD&>}XuG|cc2KwVsMGDGE>1R^O$$-ac6v!_ zTi%?rp1n4)jiBvRn@6!tTs-IE&E{s?iDGACS9f7*eK+UYQMaRO9w!0SgT#7sUeNYt z+OE2+ev+#6Tvg+GE1>g+bH2GbPJ=pCrFSFhh5kCT$3y!x;;(D=MA2-=i)Y&|tyw?z znsx(-x;Aame>(`XnwjP^Mb*U4c(K{Dpm9;5nOAKDuI-z>9=6HPjEP2_Up0GMUf6W` z@Y`JWye4&)6n4ENnU7*#Us9O1T!(7dchcD>n`^x~qd3j=n)limn&JCi>Y4rCToebX z>tEnR8FN3U#2oDCy#lroM;&`G#3Nm=>*9gp$*4Z-25TO3p6|^B?I2wks9Gvu4u%RR zna&1beWV*<(GlM@g3whdsCHZ3ETV=jmAu4ZXFbCVnG)@GNla6Ok~v&hy~b7Q2u|W{ z$-}H@Fr>`ks2PO$S+UYr?+C$SF&2h)mT-*&jP514!}Cr4u)I-x2Vo=Pl+}(Jji4TQ zZRgH`3BHTr`a4$|#Kvz|iMQT4?vVd7LGg$`TWNuD(%GF8cOyeN)v`y-9&`oVSsx$Bfjg~g+9;5PR zmE)Lsfu~A^phK?yUt7v_`$6sCdnK5c4bL2NL~{|Z;ebt+J}E6l^|TjMhuW8-j(~DX%F>%#@O^Cg4L4NtmEwTsQA6kYkZeve_*xT|w2T z*<_k&l$lf9Yi{X>$JD$d8>U;sGOmJy$g$lxVk+y{`Ie^1rVHsOm9omXq-v(a*)W<% z+uRpap9_2!>w#h}Pt55s4bnClI^89K9cad$uU7hjJI%}+df4I)!azgnG08>BcRZ#t zIbw%rTd`~G+*rPLQpt!udB&bprYHk9j^}GYHZj(tun{zSQk!X8Bik|JjW0Gzq`R0! zp`8Y#Y&HW8W6-Y08`ynjK?_L7W2~hbu`BFQ%$jL5>%!WicDrPo4PK{vlUG-#JIm@D z$IGjAeI4S=M2wX-Wb%41j!}s~cAaiYI5U}MD^??jnHpyLPCz#dU{YSJllf$`|vS?9Du=jPGW8P0ZqF*+O_F5rInZ zX?#qmRcdIhFg`ibj>rei%dC5>n^`;#K5(Z}7ixE5T($(dIA&wx_hO|=5aNg|hHF_X z*_=A>C7Llk-zU3>{-Bcutx`|#Xu`9#b3CY-d^$)9l0Bx;_R=&qnf;5DUcQ1ZEoKE} zJmre$SFKt0RO{=~qNVHWIm*x390n*>@x>|wjk6fj-_nO6OKB&{95kFQFw7#DtCvkf z`PQO8A!p6Aa%Pi8Il-8sGGZ(2!O1#Py9Wf; z-DsXkQZt|F#%?Z%dWp&Aa>eez=78dac~g%U7qj9TZHkS6$ycL%mCUXcy6a5R^1Qem z7@`*CdPx?rbg`b2h`lZ=T(%w5iOUv?Yq>u~4fZwKG;8mmd60Rra21J=)kRx^|9`9K z^1VrmUBirH2F^0cCcS#yB}t>lhJx0XS1R_-=crcXWKk)5J)M`+*n%g0AEL0_h@CfB z^-#t|KH2kBg$XMn%pWq})bhi@fK2BB~k{l(SD3AIypDr4!aw9=UVv zvh{Ru&rsYC>>1K*&(O=(dNUVzc7J7G90h)MeISao>6mPL3#LpcO^mt2<-NYks?^H1 z%UNh^=rjD{nr90cXYMVNGf1m;U%p9nNx&8rJ4K5tZ!1l^wUH5mv|4spjpF9W#_=}} zVEyhZE82NCLzBhspe!9`50t&jo>I9U+o(&JB&>{e{Iigxu4Cq1n>jF3WiSJkwA#$z z!X*i#_tkcG%h=rx~$&fY((Ql0_1a}uV&)@kC5!9G)Y-nGm~+2udAn(gMQ`q{AY2^4zb(i_gCde z(hU5{o?bJlOhpt=-ZoX)izT&!RrX=Yn%z1&wyiR{wX$`)9ot?Td)JoH>qkeaSUJY5 zqh+wDH+0xb(#llqg$XW*;+o}`%z_tsb_c;2#L@k`J8`u=7tB?A-Z-`MAF-7w=XL10 zyyx=B!6Orks*Y7hhxSHn|3X?{=%P`|Y&g;pAoz`ap}(Ksr{837VAk1Y+ae) zhoIKjn!RBrNQX{T4&-}dsW%xp{g@rAZm(|RNq$>d)MFxSwu7X#_-GI5$Ue4Jv(?4I zbto>0eaXsuHFZtyHKtwDN5vw&f0T<=e>0 zw~=$~gP2hke+ldKz31#Km$jY~o{9n2K&m8|xzm5Di@U^VR literal 4481 zcmeH}&yO5O6~`+iAz}Gt=O@3Clu5!S#xt7@PB3eG9kOdXYps)&v-u%JfST@_+4lBy zwYqEe2NHq=i4!?Mlqe^1i9m`Kkd;#sAr2@PkU*T01LPF>kQ*G3kO<=Q?de(D$ovOe zn(9y2s~_*xd#|eJ{Tr@%(NIoOzeHXAm@y9i^co(NJs&sb%WyBe2_A$~a0%W5S0O*M z&f_{*!E537;qCB8@YC=Wcq@DzUJu`a()lO&8F&kmKM(JQ(sK;*Gpjt*|82-nv);BV zI79ncxF4Q}{LEi@dkgd*RLSb|`xew(_G;_MU>$_cXi#eiwcg zR&XDDuI+ynYQN_oD$IHK3HWB)|9dD`{sGEge}-D`0+c`g)wcICNp{@@)jtbm-y*yb zehbQ;0umxKf=o4AQ0qSnUxPn^{LCytQk)L+klqte_C3?mL(Lz;FTxG@1^9EQeZCH* z_qR~{`wNu*ci}^cXf z=MAX5c@ruQ??L(L0+hY~fhXa0bSf_%gUXxlK_qX>%LIbh95y{$SglZ~IR{#pNm3_^*|3K$bE;hSK*ls5rh1<(S;AR@6%Aek)OZW%1%H`F<+xT zMAcrTPet)kPNKTm)90Yd!_*n7?3K?>QdQ)~uTZ~1Jx*1gOp5lda{m}+0WMOtSLKQSo7u`!zG9Xyrq^7%c~4pn)7AN5|UisFBD^JdIf zq2hEG_3N$dZg^+=J_{B1opR4&utkVAS@X%d4TUX7y*x{75{Bg{`l`OyEUdX=;O%x8 zRkn0>y&0<1EHG%@uKCKF<6C8@V%r~B$fhnjvow_0EERQhd2W`&AS=x2PyA3R;*jM;j-NIa^L9NXI3UgtmNL+-uf+{U~98p)@ZeL zQe|bdc}UQ`eZXey(4o<-d+Y3mueRwc1~z6x-!&^(ozZfQK6A#G-nAPlF0<&;o*h>_ zo(&4NV;+xg+txIEs^$|VZt!Dh@lvia&JN{*$|t^vHuW1m59Ltr7*%HkAgeEKxcfij zai!ewe}-1IYR&?sxv z?DxBj$URp2W_sUkget4en9=i=yBI6e?5>S=zY0U!BwFc8UztnA#CF}s%S30qOISP1_IEP|HsY&SKXthGIH$DC#WA$Mha?cCGULqtk0K zmUA;RoT_eCaL^i+T~77%JON3Yh3OnA^_rbFXTLeUo4&__{>Y4*?@mmO`*_>rw5J5t zTzLh=^(c?Esn?vV^32pRRBqtsOp{EmidjPPx{}jX)poPu03I_K?XP%&bma;b@%p6HH>rh)6NYc3d0)-W_#c7OyMvIto?!a$O8+xEDkvRX$e?V8D? zQ7H%NfHX4hy2cyrS)0?iY9|L)s&LjPv9pwRo*bXsIXkuT*lK41LzFn3MHXsgoilzT z)5)HQmR%h?tCcHik}Fhm_R%Z}IU8Dj=Y{8;qRK*vD=oS$0eJ|5xN z&Z>7qbevu~ef**sv)%iq7C46lwzIljVnp;?ai+{&RvhM@$M-%SePZ=Q=g`G*vZn8= z&ha7%Dd&IA9_nRr>gmo&U-)Wl=1TA>_vmc*f$qU6v-{!L{cz~g+5K?nZ&7pIw^#G- Phhz7{!QYuHe>naN_QP{_ diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po index b78759f53..119fb0601 100644 --- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po +++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po @@ -1,50 +1,124 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-02-25 15:17+0300\n" "PO-Revision-Date: \n" -"Last-Translator: Nicolas Lœuillet \n" +"Last-Translator: Maryana \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.4\n" +"X-Poedit-Language: English\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 "wallabag, a read it later open source system" + +msgid "login failed: user doesn't exist" +msgstr "login failed: user doesn't exist" + +msgid "return home" +msgstr "return home" msgid "config" msgstr "config" -msgid "Poching a link" -msgstr "Poching a link" +msgid "Saving articles" +msgstr "Saving articles" + +msgid "There are several ways to save an article:" +msgstr "There are several ways to save an article:" msgid "read the documentation" msgstr "read the documentation" -msgid "by filling this field" -msgstr "by filling this field" +msgid "download the extension" +msgstr "download the extension" -msgid "poche it!" -msgstr "poche it!" +msgid "via F-Droid" +msgstr "via F-Droid" -msgid "Updating poche" -msgstr "Updating poche" +msgid " or " +msgstr " or " -msgid "your version" -msgstr "your version" +msgid "via Google Play" +msgstr "via Google Play" -msgid "latest stable version" -msgstr "latest stable version" +msgid "download the application" +msgstr "download the application" -msgid "a more recent stable version is available." -msgstr "a more recent stable version is available." +msgid "By filling this field" +msgstr "By filling this field" -msgid "you are up to date." -msgstr "you are up to date." +msgid "bag it!" +msgstr "bag it!" -msgid "latest dev version" -msgstr "latest dev version" +msgid "Bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "Bookmarklet: drag & drop this link to your bookmarks bar" -msgid "a more recent development version is available." -msgstr "a more recent development version is available." +msgid "Upgrading wallabag" +msgstr "Upgrading wallabag" + +msgid "Installed version" +msgstr "Installed version" + +msgid "Latest stable version" +msgstr "Latest stable version" + +msgid "A more recent stable version is available." +msgstr "A more recent stable version is available." + +msgid "You are up to date." +msgstr "You are up to date." + +msgid "Latest dev version" +msgstr "Latest dev version" + +msgid "A more recent development version is available." +msgstr "A more recent development version is available." + +msgid "Feeds" +msgstr "Feeds" + +msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." +msgstr "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." + +msgid "Unread feed" +msgstr "Unread feed" + +msgid "Favorites feed" +msgstr "Favorites feed" + +msgid "Archive feed" +msgstr "Archive feed" + +msgid "Your token:" +msgstr "Your token:" + +msgid "Your user id:" +msgstr "Your user id:" + +msgid "You can regenerate your token: generate!." +msgstr "You can regenerate your token: generate!." + +msgid "Change your theme" +msgstr "Change your theme" + +msgid "Theme:" +msgstr "Theme:" + +msgid "Update" +msgstr "Update" + +msgid "Change your language" +msgstr "Change your language" + +msgid "Language:" +msgstr "Language:" msgid "Change your password" msgstr "Change your password" @@ -58,66 +132,60 @@ msgstr "Password" msgid "Repeat your new password:" msgstr "Repeat your new password:" -msgid "Update" -msgstr "Update" - msgid "Import" msgstr "Import" -msgid "Please execute the import script locally, it can take a very long time." -msgstr "" -"Please execute the import script locally, it can take a very long time." +msgid "Please execute the import script locally as it can take a very long time." +msgstr "Please execute the import script locally as it can take a very long time." -msgid "More info in the official doc:" -msgstr "More info in the official doc:" +msgid "More info in the official documentation:" +msgstr "More info in the official documentation:" -msgid "import from Pocket" -msgstr "import from Pocket" +msgid "Import from Pocket" +msgstr "Import from Pocket" -msgid "import from Readability" -msgstr "import from Readability" +#, php-format +msgid "(you must have a %s file on your server)" +msgstr "(you must have a %s file on your server)" -msgid "import from Instapaper" -msgstr "import from Instapaper" +msgid "Import from Readability" +msgstr "Import from Readability" -msgid "Export your poche data" -msgstr "Export your poche data" +msgid "Import from Instapaper" +msgstr "Import from Instapaper" + +msgid "Import from wallabag" +msgstr "Import from wallabag" + +msgid "Export your wallabag data" +msgstr "Export your wallabag data" msgid "Click here" msgstr "Click here" -msgid "to export your poche data." -msgstr "to export your poche data." +msgid "to download your database." +msgstr "to download your database." -msgid "back to home" -msgstr "back to home" +msgid "to export your wallabag data." +msgstr "to export your wallabag data." -msgid "installation" -msgstr "installation" +msgid "Cache" +msgstr "Cache" -msgid "install your poche" -msgstr "install your poche" +msgid "to delete cache." +msgstr "to delete cache." -msgid "" -"poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " -"on poche website." -msgstr "" -"poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " -"on poche website." +msgid "You can enter multiple tags, separated by commas." +msgstr "You can enter multiple tags, separated by commas." -msgid "Login" -msgstr "Login" +msgid "return to article" +msgstr "return to article" -msgid "Repeat your password" -msgstr "Repeat your password" +msgid "plop" +msgstr "plop" -msgid "Install" -msgstr "Install" - -msgid "back to top" -msgstr "back to top" +msgid "You can check your configuration here." +msgstr "You can check your configuration here." msgid "favoris" msgstr "favoris" @@ -146,11 +214,14 @@ msgstr "by title" msgid "by title desc" msgstr "by title desc" -msgid "No link available here!" -msgstr "No link available here!" +msgid "Tag" +msgstr "Tag" -msgid "toggle mark as read" -msgstr "toggle mark as read" +msgid "No articles found." +msgstr "No articles found." + +msgid "Toggle mark as read" +msgstr "Toggle mark as read" msgid "toggle favorite" msgstr "toggle favorite" @@ -161,14 +232,86 @@ msgstr "delete" msgid "original" msgstr "original" +msgid "estimated reading time:" +msgstr "estimated reading time:" + +msgid "mark all the entries as read" +msgstr "mark all the entries as read" + msgid "results" msgstr "results" -msgid "tweet" -msgstr "tweet" +msgid "installation" +msgstr "installation" -msgid "email" -msgstr "email" +msgid "install your wallabag" +msgstr "install your wallabag" + +msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." +msgstr "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." + +msgid "Login" +msgstr "Login" + +msgid "Repeat your password" +msgstr "Repeat your password" + +msgid "Install" +msgstr "Install" + +msgid "login to your wallabag" +msgstr "login to your wallabag" + +msgid "Login to wallabag" +msgstr "Login to wallabag" + +msgid "you are in demo mode, some features may be disabled." +msgstr "you are in demo mode, some features may be disabled." + +msgid "Username" +msgstr "Username" + +msgid "Stay signed in" +msgstr "Stay signed in" + +msgid "(Do not check on public computers)" +msgstr "(Do not check on public computers)" + +msgid "Sign in" +msgstr "Sign in" + +msgid "favorites" +msgstr "favorites" + +msgid "estimated reading time :" +msgstr "estimated reading time :" + +msgid "Mark all the entries as read" +msgstr "Mark all the entries as read" + +msgid "Return home" +msgstr "Return home" + +msgid "Back to top" +msgstr "Back to top" + +msgid "Mark as read" +msgstr "Mark as read" + +msgid "Favorite" +msgstr "Favorite" + +msgid "Toggle favorite" +msgstr "Toggle favorite" + +msgid "Delete" +msgstr "Delete" + +msgid "Tweet" +msgstr "Tweet" + +msgid "Email" +msgstr "Email" msgid "shaarli" msgstr "shaarli" @@ -176,26 +319,23 @@ msgstr "shaarli" msgid "flattr" msgstr "flattr" -msgid "this article appears wrong?" -msgstr "this article appears wrong?" +msgid "Does this article appear wrong?" +msgstr "Does this article appear wrong?" -msgid "create an issue" -msgstr "create an issue" +msgid "tags:" +msgstr "tags:" -msgid "or" -msgstr "or" +msgid "Edit tags" +msgstr "Edit tags" -msgid "contact us by mail" -msgstr "contact us by mail" - -msgid "plop" -msgstr "plop" +msgid "save link!" +msgstr "save link!" msgid "home" msgstr "home" -msgid "favorites" -msgstr "favorites" +msgid "tags" +msgstr "tags" msgid "logout" msgstr "logout" @@ -206,23 +346,179 @@ msgstr "powered by" msgid "debug mode is on so cache is off." msgstr "debug mode is on so cache is off." -msgid "your poche version:" -msgstr "your poche version:" +msgid "your wallabag version:" +msgstr "your wallabag version:" msgid "storage:" msgstr "storage:" -msgid "login to your poche" -msgstr "login to your poche" +msgid "save a link" +msgstr "save a link" -msgid "you are in demo mode, some features may be disabled." -msgstr "you are in demo mode, some features may be disabled." +msgid "back to home" +msgstr "back to home" -msgid "Stay signed in" -msgstr "Stay signed in" +msgid "toggle mark as read" +msgstr "toggle mark as read" -msgid "(Do not check on public computers)" -msgstr "(Do not check on public computers)" +msgid "tweet" +msgstr "tweet" -msgid "Sign in" -msgstr "Sign in" +msgid "email" +msgstr "email" + +msgid "this article appears wrong?" +msgstr "this article appears wrong?" + +msgid "No link available here!" +msgstr "No link available here!" + +msgid "Poching a link" +msgstr "Poching a link" + +msgid "by filling this field" +msgstr "by filling this field" + +msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "bookmarklet: drag & drop this link to your bookmarks bar" + +msgid "your version" +msgstr "your version" + +msgid "latest stable version" +msgstr "latest stable version" + +msgid "a more recent stable version is available." +msgstr "a more recent stable version is available." + +msgid "you are up to date." +msgstr "you are up to date." + +msgid "latest dev version" +msgstr "latest dev version" + +msgid "a more recent development version is available." +msgstr "a more recent development version is available." + +msgid "Please execute the import script locally, it can take a very long time." +msgstr "Please execute the import script locally, it can take a very long time." + +msgid "More infos in the official doc:" +msgstr "More infos in the official doc:" + +msgid "import from Pocket" +msgstr "import from Pocket" + +msgid "import from Readability" +msgstr "import from Readability" + +msgid "import from Instapaper" +msgstr "import from Instapaper" + +msgid "Tags" +msgstr "Tags" + +msgid "Untitled" +msgstr "Untitled" + +msgid "the link has been added successfully" +msgstr "the link has been added successfully" + +msgid "error during insertion : the link wasn't added" +msgstr "error during insertion : the link wasn't added" + +msgid "the link has been deleted successfully" +msgstr "the link has been deleted successfully" + +msgid "the link wasn't deleted" +msgstr "the link wasn't deleted" + +msgid "Article not found!" +msgstr "Article not found!" + +msgid "previous" +msgstr "previous" + +msgid "next" +msgstr "next" + +msgid "in demo mode, you can't update your password" +msgstr "in demo mode, you can't update your password" + +msgid "your password has been updated" +msgstr "your password has been updated" + +msgid "the two fields have to be filled & the password must be the same in the two fields" +msgstr "the two fields have to be filled & the password must be the same in the two fields" + +msgid "still using the \"" +msgstr "still using the \"" + +msgid "that theme does not seem to be installed" +msgstr "that theme does not seem to be installed" + +msgid "you have changed your theme preferences" +msgstr "you have changed your theme preferences" + +msgid "that language does not seem to be installed" +msgstr "that language does not seem to be installed" + +msgid "you have changed your language preferences" +msgstr "you have changed your language preferences" + +msgid "login failed: you have to fill all fields" +msgstr "login failed: you have to fill all fields" + +msgid "welcome to your wallabag" +msgstr "welcome to your wallabag" + +msgid "login failed: bad login or password" +msgstr "login failed: bad login or password" + +msgid "import from instapaper completed" +msgstr "import from instapaper completed" + +msgid "import from pocket completed" +msgstr "import from pocket completed" + +msgid "import from Readability completed. " +msgstr "import from Readability completed. " + +msgid "import from Poche completed. " +msgstr "import from Poche completed. " + +msgid "Unknown import provider." +msgstr "Unknown import provider." + +msgid "Incomplete inc/poche/define.inc.php file, please define \"" +msgstr "Incomplete inc/poche/define.inc.php file, please define \"" + +msgid "Could not find required \"" +msgstr "Could not find required \"" + +msgid "Uh, there is a problem while generating feeds." +msgstr "Uh, there is a problem while generating feeds." + +msgid "Cache deleted." +msgstr "Cache deleted." + +msgid "Oops, it seems you don't have PHP 5." +msgstr "Oops, it seems you don't have PHP 5." + +#~ msgid "poche it!" +#~ msgstr "poche it!" + +#~ msgid "Updating poche" +#~ msgstr "Updating poche" + +#~ msgid "create an issue" +#~ msgstr "create an issue" + +#~ msgid "or" +#~ msgstr "or" + +#~ msgid "contact us by mail" +#~ msgstr "contact us by mail" + +#~ msgid "your poche version:" +#~ msgstr "your poche version:" diff --git a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po index afe0595de..c08decfe2 100644 --- a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po +++ b/locale/es_ES.utf8/LC_MESSAGES/es_ES.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:16+0300\n" "PO-Revision-Date: \n" -"Last-Translator: Nicolas Lœuillet \n" +"Last-Translator: Maryana \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.4\n" +"X-Poedit-Language: Spanish\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 "configuración" -msgid "Poching a link" -msgstr "Pochear un enlace" +msgid "Saving articles" +msgstr "" + +msgid "There are several ways to save an article:" +msgstr "" msgid "read the documentation" msgstr "leer la documentación" -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 "rellenando este campo" -msgid "poche it!" -msgstr "pochéalo!" +msgid "bag it!" +msgstr "" -msgid "Updating poche" -msgstr "Actualizar" +msgid "Bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "" -msgid "your version" -msgstr "su versión" +msgid "Upgrading wallabag" +msgstr "" -msgid "latest stable version" +#, fuzzy +msgid "Installed version" msgstr "ultima versión estable" -msgid "a more recent stable version is available." +#, fuzzy +msgid "Latest stable version" +msgstr "ultima versión estable" + +#, fuzzy +msgid "A more recent stable version is available." msgstr "una versión estable más reciente está disponible." -msgid "you are up to date." +#, fuzzy +msgid "You are up to date." msgstr "estás actualizado." -msgid "latest dev version" +#, fuzzy +msgid "Latest dev version" msgstr "ultima versión de desarollo" -msgid "a more recent development version is available." +#, fuzzy +msgid "A more recent development version is available." msgstr "una versión de desarollo más reciente está disponible." +msgid "Feeds" +msgstr "" + +msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." +msgstr "" + +msgid "Unread feed" +msgstr "" + +#, fuzzy +msgid "Favorites feed" +msgstr "preferidos" + +#, fuzzy +msgid "Archive feed" +msgstr "archivos" + +msgid "Your token:" +msgstr "" + +msgid "Your user id:" +msgstr "" + +msgid "You can regenerate your token: generate!." +msgstr "" + +#, fuzzy +msgid "Change your theme" +msgstr "Modificar tu contraseña" + +msgid "Theme:" +msgstr "" + +msgid "Update" +msgstr "Actualizar" + +#, fuzzy +msgid "Change your language" +msgstr "Modificar tu contraseña" + +msgid "Language:" +msgstr "" + msgid "Change your password" msgstr "Modificar tu contraseña" @@ -58,66 +143,68 @@ msgstr "Contraseña" msgid "Repeat your new password:" msgstr "Repetir la nueva contraseña :" -msgid "Update" -msgstr "Actualizar" - msgid "Import" msgstr "Importar" -msgid "Please execute the import script locally, it can take a very long time." -msgstr "" -"Por favor, ejecute la importación en local, esto puede demorar un tiempo." +#, fuzzy +msgid "Please execute the import script locally as it can take a very long time." +msgstr "Por favor, ejecute la importación en local, esto puede demorar un tiempo." -msgid "More info in the official doc:" +#, fuzzy +msgid "More info in the official documentation:" msgstr "Más información en la documentación oficial :" -msgid "import from Pocket" +#, fuzzy +msgid "Import from Pocket" msgstr "importación desde Pocket" -msgid "import from Readability" +#, php-format +msgid "(you must have a %s file on your server)" +msgstr "" + +#, fuzzy +msgid "Import from Readability" msgstr "importación desde Readability" -msgid "import from Instapaper" +#, fuzzy +msgid "Import from Instapaper" msgstr "importación desde Instapaper" -msgid "Export your poche data" +#, fuzzy +msgid "Import from wallabag" +msgstr "importación desde Readability" + +#, fuzzy +msgid "Export your wallabag data" msgstr "Exportar sus datos de poche" msgid "Click here" msgstr "Haga clic aquí" -msgid "to export your poche data." +msgid "to download your database." +msgstr "" + +#, fuzzy +msgid "to export your wallabag data." msgstr "para exportar sus datos de poche." -msgid "back to home" -msgstr "volver a la página de inicio" - -msgid "installation" -msgstr "instalación" - -msgid "install your poche" -msgstr "instala tu Poche" - -msgid "" -"Poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " -"on poche website." +msgid "Cache" msgstr "" -"Poche todavia no està instalado. Por favor, completa los campos siguientes " -"para instalarlo. No dudes de leer la " -"documentación en el sitio de Poche." -msgid "Login" -msgstr "Nombre de usuario" +msgid "to delete cache." +msgstr "" -msgid "Repeat your password" -msgstr "Repita su contraseña" +msgid "You can enter multiple tags, separated by commas." +msgstr "" -msgid "Install" -msgstr "Instalar" +msgid "return to article" +msgstr "" -msgid "back to top" -msgstr "volver arriba" +msgid "plop" +msgstr "plop" + +msgid "You can check your configuration here." +msgstr "" msgid "favoris" msgstr "preferidos" @@ -146,10 +233,14 @@ msgstr "por título" msgid "by title desc" msgstr "por título descendiente" -msgid "No link available here!" -msgstr "¡No hay ningún enlace disponible por aquí!" +msgid "Tag" +msgstr "" -msgid "toggle mark as read" +msgid "No articles found." +msgstr "" + +#, fuzzy +msgid "Toggle mark as read" msgstr "marcar como leído" msgid "toggle favorite" @@ -161,13 +252,95 @@ msgstr "eliminar" msgid "original" msgstr "original" +msgid "estimated reading time:" +msgstr "" + +msgid "mark all the entries as read" +msgstr "" + msgid "results" msgstr "resultados" -msgid "tweet" +msgid "installation" +msgstr "instalación" + +#, fuzzy +msgid "install your wallabag" +msgstr "instala tu Poche" + +#, fuzzy +msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." +msgstr "Poche todavia no està instalado. Por favor, completa los campos siguientes para instalarlo. No dudes de leer la documentación en el sitio de Poche." + +msgid "Login" +msgstr "Nombre de usuario" + +msgid "Repeat your password" +msgstr "Repita su contraseña" + +msgid "Install" +msgstr "Instalar" + +#, fuzzy +msgid "login to your wallabag" +msgstr "conectarse a tu Poche" + +msgid "Login to wallabag" +msgstr "" + +msgid "you are in demo mode, some features may be disabled." +msgstr "este es el modo de demostración, algunas funcionalidades pueden estar desactivadas." + +msgid "Username" +msgstr "" + +msgid "Stay signed in" +msgstr "Seguir conectado" + +msgid "(Do not check on public computers)" +msgstr "(no marcar en un ordenador público)" + +msgid "Sign in" +msgstr "Iniciar sesión" + +msgid "favorites" +msgstr "preferidos" + +msgid "estimated reading time :" +msgstr "" + +msgid "Mark all the entries as read" +msgstr "" + +msgid "Return home" +msgstr "" + +#, fuzzy +msgid "Back to top" +msgstr "volver arriba" + +#, fuzzy +msgid "Mark as read" +msgstr "marcar como leído" + +#, fuzzy +msgid "Favorite" +msgstr "preferidos" + +#, fuzzy +msgid "Toggle favorite" +msgstr "preferido" + +#, fuzzy +msgid "Delete" +msgstr "eliminar" + +#, fuzzy +msgid "Tweet" msgstr "tweetear" -msgid "email" +#, fuzzy +msgid "Email" msgstr "enviar por 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 "este articulo no se ve bien?" -msgid "create an issue" -msgstr "crear un ticket" +msgid "tags:" +msgstr "" -msgid "or" -msgstr "o" +msgid "Edit tags" +msgstr "" -msgid "contact us by mail" -msgstr "contactarnos por mail" - -msgid "plop" -msgstr "plop" +msgid "save link!" +msgstr "" msgid "home" msgstr "inicio" -msgid "favorites" -msgstr "preferidos" +msgid "tags" +msgstr "" msgid "logout" msgstr "cerrar sesión" @@ -206,25 +377,187 @@ msgstr "hecho con" msgid "debug mode is on so cache is off." msgstr "el modo de depuración está activado, así que la cache está desactivada." -msgid "your poche version:" -msgstr "tu versión de Poche:" +#, fuzzy +msgid "your wallabag version:" +msgstr "su versión" msgid "storage:" msgstr "almacenamiento:" -msgid "login to your poche" -msgstr "conectarse a tu Poche" - -msgid "you are in demo mode, some features may be disabled." +msgid "save a link" msgstr "" -"este es el modo de demostración, algunas funcionalidades pueden estar " -"desactivadas." -msgid "Stay signed in" -msgstr "Seguir conectado" +msgid "back to home" +msgstr "volver a la página de inicio" -msgid "(Do not check on public computers)" -msgstr "(no marcar en un ordenador público)" +msgid "toggle mark as read" +msgstr "marcar como leído" -msgid "Sign in" -msgstr "Iniciar sesión" +msgid "tweet" +msgstr "tweetear" + +msgid "email" +msgstr "enviar por mail" + +msgid "this article appears wrong?" +msgstr "este articulo no se ve bien?" + +msgid "No link available here!" +msgstr "¡No hay ningún enlace disponible por aquí!" + +msgid "Poching a link" +msgstr "Pochear un enlace" + +msgid "by filling this field" +msgstr "rellenando este campo" + +msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "" + +msgid "your version" +msgstr "su versión" + +msgid "latest stable version" +msgstr "ultima versión estable" + +msgid "a more recent stable version is available." +msgstr "una versión estable más reciente está disponible." + +msgid "you are up to date." +msgstr "estás actualizado." + +msgid "latest dev version" +msgstr "ultima versión de desarollo" + +msgid "a more recent development version is available." +msgstr "una versión de desarollo más reciente está disponible." + +msgid "Please execute the import script locally, it can take a very long time." +msgstr "Por favor, ejecute la importación en local, esto puede demorar un tiempo." + +#, fuzzy +msgid "More infos in the official doc:" +msgstr "Más información en la documentación oficial :" + +msgid "import from Pocket" +msgstr "importación desde Pocket" + +msgid "import from Readability" +msgstr "importación desde Readability" + +msgid "import from Instapaper" +msgstr "importación desde Instapaper" + +msgid "Tags" +msgstr "" + +#, fuzzy +msgid "Untitled" +msgstr "por título" + +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 "importación desde Instapaper" + +#, fuzzy +msgid "import from pocket completed" +msgstr "importación desde Pocket" + +#, fuzzy +msgid "import from Readability completed. " +msgstr "importación desde Readability" + +#, fuzzy +msgid "import from Poche completed. " +msgstr "importación desde 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 "eliminar" + +msgid "Oops, it seems you don't have PHP 5." +msgstr "" + +#~ msgid "poche it!" +#~ msgstr "pochéalo!" + +#~ msgid "Updating poche" +#~ msgstr "Actualizar" + +#~ msgid "create an issue" +#~ msgstr "crear un ticket" + +#~ msgid "or" +#~ msgstr "o" + +#~ msgid "contact us by mail" +#~ msgstr "contactarnos por mail" + +#~ msgid "your poche version:" +#~ msgstr "tu versión de Poche:" diff --git a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po b/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po index 74a763c62..f24814d58 100644 --- a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po +++ b/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.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:15+0300\n" "PO-Revision-Date: \n" -"Last-Translator: Nicolas Lœuillet \n" +"Last-Translator: Maryana \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.4\n" +"X-Poedit-Language: Persian\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 "تنظیمات" -msgid "Poching a link" -msgstr "پیوندی را poche کنید" +msgid "Saving articles" +msgstr "" + +msgid "There are several ways to save an article:" +msgstr "" msgid "read the documentation" msgstr "راهنما را بخوانید" -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 "با پرکردن این بخش" -msgid "poche it!" -msgstr "poche کنید!" +msgid "bag it!" +msgstr "" -msgid "Updating poche" -msgstr "به‌روزرسانی poche" +msgid "Bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "" -msgid "your version" -msgstr "نسخهٔ شما" +msgid "Upgrading wallabag" +msgstr "" -msgid "latest stable version" +#, fuzzy +msgid "Installed version" msgstr "آخرین نسخهٔ پایدار" -msgid "a more recent stable version is available." +#, fuzzy +msgid "Latest stable version" +msgstr "آخرین نسخهٔ پایدار" + +#, fuzzy +msgid "A more recent stable version is available." msgstr "نسخهٔ پایدار تازه‌ای منتشر شده است." -msgid "you are up to date." +#, fuzzy +msgid "You are up to date." msgstr "شما به‌روز هستید." -msgid "latest dev version" +#, fuzzy +msgid "Latest dev version" msgstr "آخرین نسخهٔ آزمایشی" -msgid "a more recent development version is available." +#, fuzzy +msgid "A more recent development version is available." msgstr "نسخهٔ آزمایشی تازه‌ای منتشر شده است." +msgid "Feeds" +msgstr "" + +msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." +msgstr "" + +msgid "Unread feed" +msgstr "" + +#, fuzzy +msgid "Favorites feed" +msgstr "بهترین‌ها" + +#, fuzzy +msgid "Archive feed" +msgstr "بایگانی" + +msgid "Your token:" +msgstr "" + +msgid "Your user id:" +msgstr "" + +msgid "You can regenerate your token: generate!." +msgstr "" + +#, fuzzy +msgid "Change your theme" +msgstr "گذرواژهٔ خود را تغییر دهید" + +msgid "Theme:" +msgstr "" + +msgid "Update" +msgstr "به‌روزرسانی" + +#, fuzzy +msgid "Change your language" +msgstr "گذرواژهٔ خود را تغییر دهید" + +msgid "Language:" +msgstr "" + msgid "Change your password" msgstr "گذرواژهٔ خود را تغییر دهید" @@ -58,64 +143,68 @@ msgstr "گذرواژه" msgid "Repeat your new password:" msgstr "گذرواژهٔ تازه را دوباره وارد کنید" -msgid "Update" -msgstr "به‌روزرسانی" - msgid "Import" msgstr "درون‌ریزی" -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 "لطفاً برنامهٔ درون‌ریزی را به‌طور محلی اجرا کنید، شاید خیلی طول بکشد." -msgid "More info in the official doc:" +#, fuzzy +msgid "More info in the official documentation:" msgstr "اطلاعات بیشتر در راهنمای رسمی:" -msgid "import from Pocket" +#, fuzzy +msgid "Import from Pocket" msgstr "درون‌ریزی از Pocket" -msgid "import from Readability" +#, php-format +msgid "(you must have a %s file on your server)" +msgstr "" + +#, fuzzy +msgid "Import from Readability" msgstr "درون‌ریزی از Readability" -msgid "import from Instapaper" +#, fuzzy +msgid "Import from Instapaper" msgstr "درون‌ریزی از Instapaper" -msgid "Export your poche data" +#, fuzzy +msgid "Import from wallabag" +msgstr "درون‌ریزی از Readability" + +#, fuzzy +msgid "Export your wallabag data" msgstr "داده‌های poche خود را برون‌بری کنید" msgid "Click here" msgstr "اینجا را کلیک کنید" -msgid "to export your poche data." +msgid "to download your database." +msgstr "" + +#, fuzzy +msgid "to export your wallabag data." msgstr "برای برون‌بری داده‌های poche شما" -msgid "back to home" -msgstr "بازگشت به خانه" - -msgid "installation" -msgstr "نصب" - -msgid "install your poche" -msgstr "poche خود را نصب کنید" - -msgid "" -"poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " -"on poche website." +msgid "Cache" msgstr "" -"poche هنوز نصب نیست. برای نصب لطفاً فرم زیر را پر کنید. خواندن راهنما در وبگاه poche را از یاد نبرید." -msgid "Login" -msgstr "ورود" +msgid "to delete cache." +msgstr "" -msgid "Repeat your password" -msgstr "گذرواژه را دوباره وارد کنید" +msgid "You can enter multiple tags, separated by commas." +msgstr "" -msgid "Install" -msgstr "نصب" +msgid "return to article" +msgstr "" -msgid "back to top" -msgstr "بازگشت به بالای صفحه" +msgid "plop" +msgstr "plop" + +msgid "You can check your configuration here." +msgstr "" msgid "favoris" msgstr "بهترین‌ها" @@ -144,10 +233,14 @@ msgstr "با عنوان" msgid "by title desc" msgstr "با عنوان (الفبایی معکوس)" -msgid "No link available here!" -msgstr "اینجا پیوندی موجود نیست!" +msgid "Tag" +msgstr "" -msgid "toggle mark as read" +msgid "No articles found." +msgstr "" + +#, fuzzy +msgid "Toggle mark as read" msgstr "خوانده‌شده/خوانده‌نشده" msgid "toggle favorite" @@ -159,13 +252,95 @@ msgstr "پاک‌کردن" msgid "original" msgstr "اصلی" +msgid "estimated reading time:" +msgstr "" + +msgid "mark all the entries as read" +msgstr "" + msgid "results" msgstr "نتایج" -msgid "tweet" +msgid "installation" +msgstr "نصب" + +#, fuzzy +msgid "install your wallabag" +msgstr "poche خود را نصب کنید" + +#, fuzzy +msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." +msgstr "poche هنوز نصب نیست. برای نصب لطفاً فرم زیر را پر کنید. خواندن راهنما در وبگاه poche را از یاد نبرید." + +msgid "Login" +msgstr "ورود" + +msgid "Repeat your password" +msgstr "گذرواژه را دوباره وارد کنید" + +msgid "Install" +msgstr "نصب" + +#, fuzzy +msgid "login to your wallabag" +msgstr "به poche خود وارد شوید" + +msgid "Login to wallabag" +msgstr "" + +msgid "you are in demo mode, some features may be disabled." +msgstr "این تنها نسخهٔ نمایشی است، برخی از ویژگی‌ها کار نمی‌کنند." + +msgid "Username" +msgstr "" + +msgid "Stay signed in" +msgstr "مرا به خاطر بسپار" + +msgid "(Do not check on public computers)" +msgstr "(روی رایانه‌های عمومی این کار را نکنید)" + +msgid "Sign in" +msgstr "ورود" + +msgid "favorites" +msgstr "بهترین‌ها" + +msgid "estimated reading time :" +msgstr "" + +msgid "Mark all the entries as read" +msgstr "" + +msgid "Return home" +msgstr "" + +#, fuzzy +msgid "Back to top" +msgstr "بازگشت به بالای صفحه" + +#, fuzzy +msgid "Mark as read" +msgstr "خوانده‌شده/خوانده‌نشده" + +#, fuzzy +msgid "Favorite" +msgstr "بهترین‌ها" + +#, fuzzy +msgid "Toggle favorite" +msgstr "جزء بهترین‌ها هست/نیست" + +#, fuzzy +msgid "Delete" +msgstr "پاک‌کردن" + +#, fuzzy +msgid "Tweet" msgstr "توییت" -msgid "email" +#, fuzzy +msgid "Email" msgstr "ایمیل" msgid "shaarli" @@ -174,26 +349,24 @@ msgstr "shaarli" msgid "flattr" msgstr "flattr" -msgid "this article appears wrong?" +#, fuzzy +msgid "Does this article appear wrong?" msgstr "این مطلب اشتباه نمایش داده شده؟" -msgid "create an issue" -msgstr "یک درخواست رفع‌مشکل بنویسید" +msgid "tags:" +msgstr "" -msgid "or" -msgstr "یا" +msgid "Edit tags" +msgstr "" -msgid "contact us by mail" -msgstr "به ما ایمیل بزنید" - -msgid "plop" -msgstr "plop" +msgid "save link!" +msgstr "" msgid "home" msgstr "خانه" -msgid "favorites" -msgstr "بهترین‌ها" +msgid "tags" +msgstr "" msgid "logout" msgstr "بیرون رفتن" @@ -204,23 +377,187 @@ msgstr "نیروگرفته از" msgid "debug mode is on so cache is off." msgstr "حالت عیب‌یابی فعال است، پس کاشه خاموش است." -msgid "your poche version:" -msgstr "نسخهٔ poche شما:" +#, fuzzy +msgid "your wallabag version:" +msgstr "نسخهٔ شما" msgid "storage:" msgstr "ذخیره‌سازی:" -msgid "login to your poche" -msgstr "به poche خود وارد شوید" +msgid "save a link" +msgstr "" -msgid "you are in demo mode, some features may be disabled." -msgstr "این تنها نسخهٔ نمایشی است، برخی از ویژگی‌ها کار نمی‌کنند." +msgid "back to home" +msgstr "بازگشت به خانه" -msgid "Stay signed in" -msgstr "مرا به خاطر بسپار" +msgid "toggle mark as read" +msgstr "خوانده‌شده/خوانده‌نشده" -msgid "(Do not check on public computers)" -msgstr "(روی رایانه‌های عمومی این کار را نکنید)" +msgid "tweet" +msgstr "توییت" -msgid "Sign in" -msgstr "ورود" +msgid "email" +msgstr "ایمیل" + +msgid "this article appears wrong?" +msgstr "این مطلب اشتباه نمایش داده شده؟" + +msgid "No link available here!" +msgstr "اینجا پیوندی موجود نیست!" + +msgid "Poching a link" +msgstr "پیوندی را poche کنید" + +msgid "by filling this field" +msgstr "با پرکردن این بخش" + +msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "" + +msgid "your version" +msgstr "نسخهٔ شما" + +msgid "latest stable version" +msgstr "آخرین نسخهٔ پایدار" + +msgid "a more recent stable version is available." +msgstr "نسخهٔ پایدار تازه‌ای منتشر شده است." + +msgid "you are up to date." +msgstr "شما به‌روز هستید." + +msgid "latest dev version" +msgstr "آخرین نسخهٔ آزمایشی" + +msgid "a more recent development version is available." +msgstr "نسخهٔ آزمایشی تازه‌ای منتشر شده است." + +msgid "Please execute the import script locally, it can take a very long time." +msgstr "لطفاً برنامهٔ درون‌ریزی را به‌طور محلی اجرا کنید، شاید خیلی طول بکشد." + +#, fuzzy +msgid "More infos in the official doc:" +msgstr "اطلاعات بیشتر در راهنمای رسمی:" + +msgid "import from Pocket" +msgstr "درون‌ریزی از Pocket" + +msgid "import from Readability" +msgstr "درون‌ریزی از Readability" + +msgid "import from Instapaper" +msgstr "درون‌ریزی از Instapaper" + +msgid "Tags" +msgstr "" + +#, fuzzy +msgid "Untitled" +msgstr "با عنوان" + +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 "درون‌ریزی از Instapaper" + +#, fuzzy +msgid "import from pocket completed" +msgstr "درون‌ریزی از Pocket" + +#, fuzzy +msgid "import from Readability completed. " +msgstr "درون‌ریزی از Readability" + +#, fuzzy +msgid "import from Poche completed. " +msgstr "درون‌ریزی از 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 "پاک‌کردن" + +msgid "Oops, it seems you don't have PHP 5." +msgstr "" + +#~ msgid "poche it!" +#~ msgstr "poche کنید!" + +#~ msgid "Updating poche" +#~ msgstr "به‌روزرسانی poche" + +#~ msgid "create an issue" +#~ msgstr "یک درخواست رفع‌مشکل بنویسید" + +#~ msgid "or" +#~ msgstr "یا" + +#~ msgid "contact us by mail" +#~ msgstr "به ما ایمیل بزنید" + +#~ msgid "your poche version:" +#~ msgstr "نسخهٔ poche شما:" diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po index 133000b43..c113019a4 100644 --- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po +++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-24 15:32+0300\n" +"POT-Creation-Date: 2014-02-25 15:05+0300\n" "PO-Revision-Date: \n" "Last-Translator: Maryana \n" "Language-Team: \n" @@ -17,40 +17,22 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n" -msgid "poche, a read it later open source system" +msgid "wallabag, a read it later open source system" msgstr "" msgid "login failed: user doesn't exist" msgstr "" -msgid "home" -msgstr "accueil" - -msgid "favorites" -msgstr "favoris" - -msgid "archive" -msgstr "archive" - -msgid "tags" +msgid "return home" msgstr "" msgid "config" msgstr "configuration" -msgid "logout" -msgstr "déconnexion" - -msgid "back to home" -msgstr "retour à l'accueil" - -msgid "Tags" +msgid "Saving articles" msgstr "" -msgid "Poching a link" -msgstr "Pocher un lien" - -msgid "You can poche a link by several methods:" +msgid "There are several ways to save an article:" msgstr "" msgid "read the documentation" @@ -59,182 +41,6 @@ msgstr "lisez la documentation" msgid "download the extension" msgstr "" -msgid "download the application" -msgstr "" - -msgid "by filling this field" -msgstr "en remplissant ce champ" - -msgid "poche it!" -msgstr "pochez-le !" - -msgid "bookmarklet: drag & drop this link to your bookmarks bar" -msgstr "" - -msgid "Updating poche" -msgstr "Mettre à jour poche" - -msgid "your version" -msgstr "votre version" - -msgid "latest stable version" -msgstr "dernière version stable" - -msgid "a more recent stable version is available." -msgstr "une version stable plus récente est disponible." - -msgid "you are up to date." -msgstr "vous êtes à jour." - -msgid "latest dev version" -msgstr "dernière version de développement" - -msgid "a more recent development version is available." -msgstr "une version de développement plus récente est disponible." - -#, fuzzy -msgid "Change your theme" -msgstr "Modifier votre mot de passe" - -msgid "Theme:" -msgstr "" - -msgid "Update" -msgstr "Mettre à jour" - -msgid "Change your password" -msgstr "Modifier votre mot de passe" - -msgid "New password:" -msgstr "Nouveau mot de passe :" - -msgid "Password" -msgstr "Mot de passe" - -msgid "Repeat your new password:" -msgstr "Répétez votre nouveau mot de passe :" - -msgid "Import" -msgstr "Importer" - -msgid "Please execute the import script locally, it can take a very long time." -msgstr "Merci d'exécuter l'import en local, cela peut prendre du temps." - -#, fuzzy -msgid "More infos in the official doc:" -msgstr "Plus d'infos sur la documentation officielle" - -msgid "import from Pocket" -msgstr "import depuis Pocket" - -#, php-format -msgid "(you must have a %s file on your server)" -msgstr "" - -msgid "import from Readability" -msgstr "import depuis Readability" - -msgid "import from Instapaper" -msgstr "import depuis Instapaper" - -#, fuzzy -msgid "Export your poche datas" -msgstr "Exporter vos données de poche" - -msgid "Click here" -msgstr "Cliquez-ici" - -#, fuzzy -msgid "to export your poche datas." -msgstr "pour exporter vos données de poche." - -msgid "plop" -msgstr "plop" - -msgid "installation" -msgstr "installation" - -#, fuzzy -msgid "install your wallabag" -msgstr "installez votre poche" - -#, fuzzy -msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." -msgstr "poche n'est pas encore installé. Merci de remplir le formulaire suivant pour l'installer. N'hésitez pas à lire la documentation sur le site de poche." - -msgid "Login" -msgstr "Nom d'utilisateur" - -msgid "Repeat your password" -msgstr "Répétez votre mot de passe" - -msgid "Install" -msgstr "Installer" - -msgid "favoris" -msgstr "favoris" - -msgid "unread" -msgstr "non lus" - -msgid "by date asc" -msgstr "par date asc" - -msgid "by date" -msgstr "par date" - -msgid "by date desc" -msgstr "par date desc" - -msgid "by title asc" -msgstr "par titre asc" - -msgid "by title" -msgstr "par titre" - -msgid "by title desc" -msgstr "par titre desc" - -msgid "No link available here!" -msgstr "Aucun lien n'est disponible ici !" - -msgid "toggle mark as read" -msgstr "marquer comme lu / non lu" - -msgid "toggle favorite" -msgstr "marquer comme favori" - -msgid "delete" -msgstr "supprimer" - -msgid "original" -msgstr "original" - -msgid "estimated reading time:" -msgstr "" - -msgid "results" -msgstr "résultats" - -#, fuzzy -msgid "login to your wallabag" -msgstr "se connecter à votre poche" - -msgid "you are in demo mode, some features may be disabled." -msgstr "vous êtes en mode démo, certaines fonctionnalités peuvent être désactivées." - -msgid "Stay signed in" -msgstr "Rester connecté" - -msgid "(Do not check on public computers)" -msgstr "(ne pas cocher sur un ordinateur public)" - -msgid "Saving articles" -msgstr "" - -msgid "There are several ways to save an article:" -msgstr "" - msgid "via F-Droid" msgstr "" @@ -244,6 +50,9 @@ msgstr "" msgid "via Google Play" msgstr "" +msgid "download the application" +msgstr "" + #, fuzzy msgid "By filling this field" msgstr "en remplissant ce champ" @@ -307,6 +116,16 @@ msgstr "" msgid "You can regenerate your token: generate!." msgstr "" +#, fuzzy +msgid "Change your theme" +msgstr "Modifier votre mot de passe" + +msgid "Theme:" +msgstr "" + +msgid "Update" +msgstr "Mettre à jour" + #, fuzzy msgid "Change your language" msgstr "Modifier votre mot de passe" @@ -314,6 +133,21 @@ msgstr "Modifier votre mot de passe" msgid "Language:" msgstr "" +msgid "Change your password" +msgstr "Modifier votre mot de passe" + +msgid "New password:" +msgstr "Nouveau mot de passe :" + +msgid "Password" +msgstr "Mot de passe" + +msgid "Repeat your new password:" +msgstr "Répétez votre nouveau mot de passe :" + +msgid "Import" +msgstr "Importer" + #, fuzzy msgid "Please execute the import script locally as it can take a very long time." msgstr "Merci d'exécuter l'import en local, cela peut prendre du temps." @@ -326,6 +160,10 @@ msgstr "Plus d'infos sur la documentation officielle" msgid "Import from Pocket" msgstr "import depuis Pocket" +#, php-format +msgid "(you must have a %s file on your server)" +msgstr "" + #, fuzzy msgid "Import from Readability" msgstr "import depuis Readability" @@ -342,6 +180,9 @@ msgstr "import depuis Readability" msgid "Export your wallabag data" msgstr "Exporter vos données de poche" +msgid "Click here" +msgstr "Cliquez-ici" + msgid "to download your database." msgstr "" @@ -355,49 +196,45 @@ msgstr "" msgid "to delete cache." msgstr "" -msgid "tweet" -msgstr "tweet" - -msgid "email" -msgstr "email" - -msgid "shaarli" -msgstr "shaarli" - -msgid "flattr" -msgstr "flattr" - -msgid "this article appears wrong?" -msgstr "cet article s'affiche mal ?" - msgid "You can enter multiple tags, separated by commas." msgstr "" msgid "return to article" msgstr "" -msgid "powered by" -msgstr "propulsé par" - -msgid "debug mode is on so cache is off." -msgstr "le mode de debug est actif, le cache est donc désactivé." - -#, fuzzy -msgid "your wallabag version:" -msgstr "votre version" - -msgid "storage:" -msgstr "stockage :" - -msgid "save a link" -msgstr "" - -msgid "return home" -msgstr "" +msgid "plop" +msgstr "plop" msgid "You can check your configuration here." msgstr "" +msgid "favoris" +msgstr "favoris" + +msgid "archive" +msgstr "archive" + +msgid "unread" +msgstr "non lus" + +msgid "by date asc" +msgstr "par date asc" + +msgid "by date" +msgstr "par date" + +msgid "by date desc" +msgstr "par date desc" + +msgid "by title asc" +msgstr "par titre asc" + +msgid "by title" +msgstr "par titre" + +msgid "by title desc" +msgstr "par titre desc" + msgid "Tag" msgstr "" @@ -408,18 +245,75 @@ msgstr "" msgid "Toggle mark as read" msgstr "marquer comme lu / non lu" +msgid "toggle favorite" +msgstr "marquer comme favori" + +msgid "delete" +msgstr "supprimer" + +msgid "original" +msgstr "original" + +msgid "estimated reading time:" +msgstr "" + msgid "mark all the entries as read" msgstr "" +msgid "results" +msgstr "résultats" + +msgid "installation" +msgstr "installation" + +#, fuzzy +msgid "install your wallabag" +msgstr "installez votre poche" + +#, fuzzy +msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." +msgstr "poche n'est pas encore installé. Merci de remplir le formulaire suivant pour l'installer. N'hésitez pas à lire la documentation sur le site de poche." + +msgid "Login" +msgstr "Nom d'utilisateur" + +msgid "Repeat your password" +msgstr "Répétez votre mot de passe" + +msgid "Install" +msgstr "Installer" + +#, fuzzy +msgid "login to your wallabag" +msgstr "se connecter à votre poche" + msgid "Login to wallabag" msgstr "" +msgid "you are in demo mode, some features may be disabled." +msgstr "vous êtes en mode démo, certaines fonctionnalités peuvent être désactivées." + msgid "Username" msgstr "" +msgid "Stay signed in" +msgstr "Rester connecté" + +msgid "(Do not check on public computers)" +msgstr "(ne pas cocher sur un ordinateur public)" + msgid "Sign in" msgstr "Se connecter" +msgid "favorites" +msgstr "favoris" + +msgid "estimated reading time :" +msgstr "" + +msgid "Mark all the entries as read" +msgstr "" + msgid "Return home" msgstr "" @@ -451,6 +345,12 @@ msgstr "tweet" msgid "Email" msgstr "email" +msgid "shaarli" +msgstr "shaarli" + +msgid "flattr" +msgstr "flattr" + #, fuzzy msgid "Does this article appear wrong?" msgstr "cet article s'affiche mal ?" @@ -464,10 +364,93 @@ msgstr "" msgid "save link!" msgstr "" -msgid "estimated reading time :" +msgid "home" +msgstr "accueil" + +msgid "tags" msgstr "" -msgid "Mark all the entries as read" +msgid "logout" +msgstr "déconnexion" + +msgid "powered by" +msgstr "propulsé par" + +msgid "debug mode is on so cache is off." +msgstr "le mode de debug est actif, le cache est donc désactivé." + +#, fuzzy +msgid "your wallabag version:" +msgstr "votre version" + +msgid "storage:" +msgstr "stockage :" + +msgid "save a link" +msgstr "" + +msgid "back to home" +msgstr "retour à l'accueil" + +msgid "toggle mark as read" +msgstr "marquer comme lu / non lu" + +msgid "tweet" +msgstr "tweet" + +msgid "email" +msgstr "email" + +msgid "this article appears wrong?" +msgstr "cet article s'affiche mal ?" + +msgid "No link available here!" +msgstr "Aucun lien n'est disponible ici !" + +msgid "Poching a link" +msgstr "Pocher un lien" + +msgid "by filling this field" +msgstr "en remplissant ce champ" + +msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "" + +msgid "your version" +msgstr "votre version" + +msgid "latest stable version" +msgstr "dernière version stable" + +msgid "a more recent stable version is available." +msgstr "une version stable plus récente est disponible." + +msgid "you are up to date." +msgstr "vous êtes à jour." + +msgid "latest dev version" +msgstr "dernière version de développement" + +msgid "a more recent development version is available." +msgstr "une version de développement plus récente est disponible." + +msgid "Please execute the import script locally, it can take a very long time." +msgstr "Merci d'exécuter l'import en local, cela peut prendre du temps." + +#, fuzzy +msgid "More infos in the official doc:" +msgstr "Plus d'infos sur la documentation officielle" + +msgid "import from Pocket" +msgstr "import depuis Pocket" + +msgid "import from Readability" +msgstr "import depuis Readability" + +msgid "import from Instapaper" +msgstr "import depuis Instapaper" + +msgid "Tags" msgstr "" #, fuzzy @@ -563,6 +546,20 @@ msgstr "supprimer" msgid "Oops, it seems you don't have PHP 5." msgstr "" +#~ msgid "poche it!" +#~ msgstr "pochez-le !" + +#~ msgid "Updating poche" +#~ msgstr "Mettre à jour poche" + +#, fuzzy +#~ msgid "Export your poche datas" +#~ msgstr "Exporter vos données de poche" + +#, fuzzy +#~ msgid "to export your poche datas." +#~ msgstr "pour exporter vos données de poche." + #~ msgid "create an issue" #~ msgstr "créez un ticket" diff --git a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po index 429d5d558..41cc01e01 100644 --- a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po +++ b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po @@ -4,54 +4,138 @@ msgid "" msgstr "" "Project-Id-Version: poche\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: 2013-11-25 09:47+0100\n" -"Last-Translator: Nicolas Lœuillet \n" -"Language-Team: Italian (http://www.transifex.com/projects/p/poche/language/" -"it/)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-02-25 15:13+0300\n" +"PO-Revision-Date: 2014-02-25 15:13+0300\n" +"Last-Translator: Maryana \n" +"Language-Team: Italian (http://www.transifex.com/projects/p/poche/language/it/)\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.5.4\n" +"X-Poedit-Language: Italian\n" +"X-Poedit-Country: ITALY\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 "configurazione" -msgid "Poching a link" -msgstr "Pochare un link" +msgid "Saving articles" +msgstr "" + +msgid "There are several ways to save an article:" +msgstr "" msgid "read the documentation" msgstr "leggi la documentazione" -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 "compilando questo campo" -msgid "poche it!" -msgstr "pochalo!" +msgid "bag it!" +msgstr "" -msgid "Updating poche" -msgstr "Aggiornamento poche" +msgid "Bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "" -msgid "your version" -msgstr "la tua versione" +msgid "Upgrading wallabag" +msgstr "" -msgid "latest stable version" +#, fuzzy +msgid "Installed version" msgstr "ultima versione stabile" -msgid "a more recent stable version is available." +#, fuzzy +msgid "Latest stable version" +msgstr "ultima versione stabile" + +#, fuzzy +msgid "A more recent stable version is available." msgstr "è disponibile una versione stabile più recente." -msgid "you are up to date." +#, fuzzy +msgid "You are up to date." msgstr "sei aggiornato." -msgid "latest dev version" +#, fuzzy +msgid "Latest dev version" msgstr "ultima versione di sviluppo" -msgid "a more recent development version is available." +#, fuzzy +msgid "A more recent development version is available." msgstr "è disponibile una versione di sviluppo più recente." +msgid "Feeds" +msgstr "" + +msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." +msgstr "" + +msgid "Unread feed" +msgstr "" + +#, fuzzy +msgid "Favorites feed" +msgstr "preferiti" + +#, fuzzy +msgid "Archive feed" +msgstr "archivio" + +msgid "Your token:" +msgstr "" + +msgid "Your user id:" +msgstr "" + +msgid "You can regenerate your token: generate!." +msgstr "" + +#, fuzzy +msgid "Change your theme" +msgstr "Cambia la tua password" + +msgid "Theme:" +msgstr "" + +msgid "Update" +msgstr "Aggiorna" + +#, fuzzy +msgid "Change your language" +msgstr "Cambia la tua password" + +msgid "Language:" +msgstr "" + msgid "Change your password" msgstr "Cambia la tua password" @@ -64,67 +148,68 @@ msgstr "Password" msgid "Repeat your new password:" msgstr "Ripeti la nuova password:" -msgid "Update" -msgstr "Aggiorna" - msgid "Import" msgstr "Importa" -msgid "Please execute the import script locally, it can take a very long time." -msgstr "" -"Si prega di eseguire lo script di importazione a livello locale, può " -"richiedere un tempo molto lungo." +#, fuzzy +msgid "Please execute the import script locally as it can take a very long time." +msgstr "Si prega di eseguire lo script di importazione a livello locale, può richiedere un tempo molto lungo." -msgid "More info in the official doc:" +#, fuzzy +msgid "More info in the official documentation:" msgstr "Maggiori info nella documentazione ufficiale" -msgid "import from Pocket" +#, fuzzy +msgid "Import from Pocket" msgstr "Importa da Pocket" -msgid "import from Readability" +#, php-format +msgid "(you must have a %s file on your server)" +msgstr "" + +#, fuzzy +msgid "Import from Readability" msgstr "Importa da Readability" -msgid "import from Instapaper" +#, fuzzy +msgid "Import from Instapaper" msgstr "Importa da Instapaper" -msgid "Export your poche data" +#, fuzzy +msgid "Import from wallabag" +msgstr "Importa da Readability" + +#, fuzzy +msgid "Export your wallabag data" msgstr "Esporta i tuoi dati di poche" msgid "Click here" msgstr "Fai clic qui" -msgid "to export your poche data." +msgid "to download your database." +msgstr "" + +#, fuzzy +msgid "to export your wallabag data." msgstr "per esportare i tuoi dati di poche." -msgid "back to home" -msgstr "torna alla home" - -msgid "installation" -msgstr "installazione" - -msgid "install your poche" -msgstr "installa il tuo poche" - -msgid "" -"poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " -"on poche website." +msgid "Cache" msgstr "" -"poche non è ancora installato. Si prega di riempire il modulo sottostante " -"per completare l'installazione. Leggere " -"la documentazione sul sito di poche." -msgid "Login" -msgstr "Nome utente" +msgid "to delete cache." +msgstr "" -msgid "Repeat your password" -msgstr "Ripeti la tua password" +msgid "You can enter multiple tags, separated by commas." +msgstr "" -msgid "Install" -msgstr "Installa" +msgid "return to article" +msgstr "" -msgid "back to top" -msgstr "torna a inizio pagina" +msgid "plop" +msgstr "plop" + +msgid "You can check your configuration here." +msgstr "" msgid "favoris" msgstr "preferiti" @@ -153,10 +238,14 @@ msgstr "per titolo" msgid "by title desc" msgstr "per titolo decr" -msgid "No link available here!" -msgstr "Nessun link disponibile!" +msgid "Tag" +msgstr "" -msgid "toggle mark as read" +msgid "No articles found." +msgstr "" + +#, fuzzy +msgid "Toggle mark as read" msgstr "segna come letto / non letto" msgid "toggle favorite" @@ -168,13 +257,95 @@ msgstr "elimina" msgid "original" msgstr "originale" +msgid "estimated reading time:" +msgstr "" + +msgid "mark all the entries as read" +msgstr "" + msgid "results" msgstr "risultati" -msgid "tweet" +msgid "installation" +msgstr "installazione" + +#, fuzzy +msgid "install your wallabag" +msgstr "installa il tuo poche" + +#, fuzzy +msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." +msgstr "poche non è ancora installato. Si prega di riempire il modulo sottostante per completare l'installazione. Leggere la documentazione sul sito di poche." + +msgid "Login" +msgstr "Nome utente" + +msgid "Repeat your password" +msgstr "Ripeti la tua password" + +msgid "Install" +msgstr "Installa" + +#, fuzzy +msgid "login to your wallabag" +msgstr "accedi al tuo poche" + +msgid "Login to wallabag" +msgstr "" + +msgid "you are in demo mode, some features may be disabled." +msgstr "sei in modalità dimostrazione, alcune funzionalità potrebbero essere disattivate." + +msgid "Username" +msgstr "" + +msgid "Stay signed in" +msgstr "Resta connesso" + +msgid "(Do not check on public computers)" +msgstr "(non selezionare su computer pubblici)" + +msgid "Sign in" +msgstr "Accedi" + +msgid "favorites" +msgstr "preferiti" + +msgid "estimated reading time :" +msgstr "" + +msgid "Mark all the entries as read" +msgstr "" + +msgid "Return home" +msgstr "" + +#, fuzzy +msgid "Back to top" +msgstr "torna a inizio pagina" + +#, fuzzy +msgid "Mark as read" +msgstr "segna come letto / non letto" + +#, fuzzy +msgid "Favorite" +msgstr "preferiti" + +#, fuzzy +msgid "Toggle favorite" +msgstr "segna come preferito" + +#, fuzzy +msgid "Delete" +msgstr "elimina" + +#, fuzzy +msgid "Tweet" msgstr "twitta" -msgid "email" +#, fuzzy +msgid "Email" msgstr "email" msgid "shaarli" @@ -183,26 +354,24 @@ msgstr "shaarli" msgid "flattr" msgstr "flattr" -msgid "this article appears wrong?" +#, fuzzy +msgid "Does this article appear wrong?" msgstr "articolo non visualizzato correttamente?" -msgid "create an issue" -msgstr "crea una segnalazione" +msgid "tags:" +msgstr "" -msgid "or" -msgstr "oppure" +msgid "Edit tags" +msgstr "" -msgid "contact us by mail" -msgstr "contattaci via email" - -msgid "plop" -msgstr "plop" +msgid "save link!" +msgstr "" msgid "home" msgstr "home" -msgid "favorites" -msgstr "preferiti" +msgid "tags" +msgstr "" msgid "logout" msgstr "esci" @@ -213,25 +382,187 @@ msgstr "realizzato con" msgid "debug mode is on so cache is off." msgstr "modalità di debug attiva, cache disattivata." -msgid "your poche version:" -msgstr "la tua versione di poche:" +#, fuzzy +msgid "your wallabag version:" +msgstr "la tua versione" msgid "storage:" msgstr "memoria:" -msgid "login to your poche" -msgstr "accedi al tuo poche" - -msgid "you are in demo mode, some features may be disabled." +msgid "save a link" msgstr "" -"sei in modalità dimostrazione, alcune funzionalità potrebbero essere " -"disattivate." -msgid "Stay signed in" -msgstr "Resta connesso" +msgid "back to home" +msgstr "torna alla home" -msgid "(Do not check on public computers)" -msgstr "(non selezionare su computer pubblici)" +msgid "toggle mark as read" +msgstr "segna come letto / non letto" -msgid "Sign in" -msgstr "Accedi" +msgid "tweet" +msgstr "twitta" + +msgid "email" +msgstr "email" + +msgid "this article appears wrong?" +msgstr "articolo non visualizzato correttamente?" + +msgid "No link available here!" +msgstr "Nessun link disponibile!" + +msgid "Poching a link" +msgstr "Pochare un link" + +msgid "by filling this field" +msgstr "compilando questo campo" + +msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "" + +msgid "your version" +msgstr "la tua versione" + +msgid "latest stable version" +msgstr "ultima versione stabile" + +msgid "a more recent stable version is available." +msgstr "è disponibile una versione stabile più recente." + +msgid "you are up to date." +msgstr "sei aggiornato." + +msgid "latest dev version" +msgstr "ultima versione di sviluppo" + +msgid "a more recent development version is available." +msgstr "è disponibile una versione di sviluppo più recente." + +msgid "Please execute the import script locally, it can take a very long time." +msgstr "Si prega di eseguire lo script di importazione a livello locale, può richiedere un tempo molto lungo." + +#, fuzzy +msgid "More infos in the official doc:" +msgstr "Maggiori info nella documentazione ufficiale" + +msgid "import from Pocket" +msgstr "Importa da Pocket" + +msgid "import from Readability" +msgstr "Importa da Readability" + +msgid "import from Instapaper" +msgstr "Importa da Instapaper" + +msgid "Tags" +msgstr "" + +#, fuzzy +msgid "Untitled" +msgstr "per titolo" + +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 "Importa da Instapaper" + +#, fuzzy +msgid "import from pocket completed" +msgstr "Importa da Pocket" + +#, fuzzy +msgid "import from Readability completed. " +msgstr "Importa da Readability" + +#, fuzzy +msgid "import from Poche completed. " +msgstr "Importa da 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 "elimina" + +msgid "Oops, it seems you don't have PHP 5." +msgstr "" + +#~ msgid "poche it!" +#~ msgstr "pochalo!" + +#~ msgid "Updating poche" +#~ msgstr "Aggiornamento poche" + +#~ msgid "create an issue" +#~ msgstr "crea una segnalazione" + +#~ msgid "or" +#~ msgstr "oppure" + +#~ msgid "contact us by mail" +#~ msgstr "contattaci via email" + +#~ msgid "your poche version:" +#~ msgstr "la tua versione di poche:" diff --git a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo index cf3868be8da627a256f062ab5bb9ca29ed23a29a..5cbfad164299132aadc7ff72992bba203b8df993 100755 GIT binary patch delta 3287 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 mudiQMU#f!?Z%D`A8\n" "Language-Team: \n" @@ -16,223 +16,18 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n" -msgid "poche, a read it later open source system" -msgstr "poche, сервис отложенного чтения с открытым исходным кодом" +msgid "wallabag, a read it later open source system" +msgstr "wallabag, сервис отложенного чтения с открытым исходным кодом" msgid "login failed: user doesn't exist" msgstr "войти не удалось: пользователь не существует" -msgid "home" -msgstr "главная" - -msgid "favorites" -msgstr "избранное" - -msgid "archive" -msgstr "архив" - -msgid "tags" -msgstr "теги" +msgid "return home" +msgstr "на главную" msgid "config" msgstr "настройки" -msgid "logout" -msgstr "выход" - -msgid "back to home" -msgstr "домой" - -msgid "Tags" -msgstr "Теги" - -#, fuzzy -msgid "Poching a link" -msgstr "Сохранение ссылок" - -msgid "You can poche a link by several methods:" -msgstr "Вы можете сохранить ссылку несколькими путями:" - -msgid "read the documentation" -msgstr "читать инструкцию" - -msgid "download the extension" -msgstr "скачать расширение" - -msgid "download the application" -msgstr "скачать приложение" - -#, fuzzy -msgid "by filling this field" -msgstr "Заполнением этого поля" - -msgid "poche it!" -msgstr "прикарманить!" - -#, fuzzy -msgid "bookmarklet: drag & drop this link to your bookmarks bar" -msgstr "Закладка: перетащите и опустите ссылку на панель закладок" - -msgid "Updating poche" -msgstr "Обновления poche" - -msgid "your version" -msgstr "Ваша версия" - -#, fuzzy -msgid "latest stable version" -msgstr "Последняя стабильная версия" - -#, fuzzy -msgid "a more recent stable version is available." -msgstr "Доступна новая стабильная версия." - -msgid "you are up to date." -msgstr "у вас всё самое новое." - -msgid "latest dev version" -msgstr "последняя версия в разработке" - -msgid "a more recent development version is available." -msgstr "есть более свежая версия в разработке." - -msgid "Change your theme" -msgstr "Изменить тему" - -msgid "Theme:" -msgstr "Тема:" - -msgid "Update" -msgstr "Обновить" - -msgid "Change your password" -msgstr "Смена пароля" - -msgid "New password:" -msgstr "Новый пароль:" - -msgid "Password" -msgstr "Пароль" - -msgid "Repeat your new password:" -msgstr "Ещё раз новый пароль:" - -msgid "Import" -msgstr "Импортировать" - -#, fuzzy -msgid "Please execute the import script locally, it can take a very long time." -msgstr "Пожалуйста, выполните сценарий импорта локально - это может занять слишком много времени." - -#, fuzzy -msgid "More infos in the official doc:" -msgstr "Больше сведений в официальной документации:" - -#, fuzzy -msgid "import from Pocket" -msgstr "Импортировать из Pocket" - -#, php-format -msgid "(you must have a %s file on your server)" -msgstr "(файл %s должен присутствовать на вашем сервере)" - -#, fuzzy -msgid "import from Readability" -msgstr "Импортировать из Readability" - -#, fuzzy -msgid "import from Instapaper" -msgstr "Импортировать из Instapaper" - -#, fuzzy -msgid "Export your poche datas" -msgstr "Экспортировать данные poche" - -msgid "Click here" -msgstr "Кликните здесь" - -#, fuzzy -msgid "to export your poche datas." -msgstr "чтобы экспортировать свои записи из poche." - -msgid "plop" -msgstr "plop" - -msgid "installation" -msgstr "установка" - -msgid "install your wallabag" -msgstr "установка wallabag" - -msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." -msgstr "wallabag всё ещё не установлен. Надо заполнить форму ниже, чтобы установить его. Неплохо также прочесть документацию на сайте wallabag." - -msgid "Login" -msgstr "Имя пользователя" - -msgid "Repeat your password" -msgstr "Повторите пароль" - -msgid "Install" -msgstr "Установить" - -msgid "favoris" -msgstr "избранное" - -msgid "unread" -msgstr "непрочитанное" - -msgid "by date asc" -msgstr "по дате, сперва старые" - -msgid "by date" -msgstr "по дате" - -msgid "by date desc" -msgstr "по дате, сперва новые" - -msgid "by title asc" -msgstr "по заголовку (прямой)" - -msgid "by title" -msgstr "по заголовку" - -msgid "by title desc" -msgstr "по заголовку (обратный)" - -msgid "No link available here!" -msgstr "Здесь нет ссылки!" - -msgid "toggle mark as read" -msgstr "изменить отметку 'прочитано'" - -msgid "toggle favorite" -msgstr "изменить метку избранного" - -msgid "delete" -msgstr "удалить" - -msgid "original" -msgstr "источник" - -msgid "estimated reading time:" -msgstr "ориентировочное время чтения:" - -msgid "results" -msgstr "найдено" - -msgid "login to your wallabag" -msgstr "войти в свой wallabag" - -msgid "you are in demo mode, some features may be disabled." -msgstr "демонстрационный режим - работают не все возможности." - -msgid "Stay signed in" -msgstr "Запомнить меня" - -msgid "(Do not check on public computers)" -msgstr "(Не отмечайте на чужих компьютерах)" - msgid "Saving articles" msgstr "Сохранение статей" @@ -240,6 +35,12 @@ msgstr "Сохранение статей" msgid "There are several ways to save an article:" msgstr "Существует несколько способов сохранить ссылку:" +msgid "read the documentation" +msgstr "читать инструкцию" + +msgid "download the extension" +msgstr "скачать расширение" + msgid "via F-Droid" msgstr "с F-Droid" @@ -249,6 +50,9 @@ msgstr "или" msgid "via Google Play" msgstr "с Google Play" +msgid "download the application" +msgstr "скачать приложение" + msgid "By filling this field" msgstr "Заполнением этого поля" @@ -305,12 +109,36 @@ msgstr "Ваш идентификатор пользователя (user id):" msgid "You can regenerate your token: generate!." msgstr "Вы можете создать новый ​​маркер: сгенерировать!." +msgid "Change your theme" +msgstr "Изменить тему" + +msgid "Theme:" +msgstr "Тема:" + +msgid "Update" +msgstr "Обновить" + msgid "Change your language" msgstr "Изменить язык" msgid "Language:" msgstr "Язык:" +msgid "Change your password" +msgstr "Смена пароля" + +msgid "New password:" +msgstr "Новый пароль:" + +msgid "Password" +msgstr "Пароль" + +msgid "Repeat your new password:" +msgstr "Ещё раз новый пароль:" + +msgid "Import" +msgstr "Импортировать" + msgid "Please execute the import script locally as it can take a very long time." msgstr "Пожалуйста, выполните сценарий импорта локально - это может занять слишком много времени." @@ -321,6 +149,10 @@ msgstr "Больше сведений в официальной документ msgid "Import from Pocket" msgstr "Импортировать из Pocket" +#, php-format +msgid "(you must have a %s file on your server)" +msgstr "(файл %s должен присутствовать на вашем сервере)" + msgid "Import from Readability" msgstr "Импортировать из Readability" @@ -333,6 +165,9 @@ msgstr "Импортировать из wallabag" msgid "Export your wallabag data" msgstr "Экспортировать данные wallabag" +msgid "Click here" +msgstr "Кликните здесь" + msgid "to download your database." msgstr "чтобы скачать вашу базу данных" @@ -345,49 +180,45 @@ msgstr "Кэш" msgid "to delete cache." msgstr "чтобы сбросить кэш." -msgid "tweet" -msgstr "твитнуть" - -msgid "email" -msgstr "email" - -msgid "shaarli" -msgstr "shaarli" - -msgid "flattr" -msgstr "проспонсировать" - -#, fuzzy -msgid "this article appears wrong?" -msgstr "Статья выглядит криво?" - msgid "You can enter multiple tags, separated by commas." msgstr "Вы можете ввести несколько тегов, разделяя их запятой." msgid "return to article" msgstr "вернуться к статье" -msgid "powered by" -msgstr "при поддержке" - -msgid "debug mode is on so cache is off." -msgstr "включён режим отладки - кеш выключен." - -msgid "your wallabag version:" -msgstr "Ваша версия wallabag:" - -msgid "storage:" -msgstr "хранилище:" - -msgid "save a link" -msgstr "сохранить ссылку" - -msgid "return home" -msgstr "на главную" +msgid "plop" +msgstr "plop" msgid "You can check your configuration here." msgstr "Вы можете проверить конфигурацию здесь." +msgid "favoris" +msgstr "избранное" + +msgid "archive" +msgstr "архив" + +msgid "unread" +msgstr "непрочитанное" + +msgid "by date asc" +msgstr "по дате, сперва старые" + +msgid "by date" +msgstr "по дате" + +msgid "by date desc" +msgstr "по дате, сперва новые" + +msgid "by title asc" +msgstr "по заголовку (прямой)" + +msgid "by title" +msgstr "по заголовку" + +msgid "by title desc" +msgstr "по заголовку (обратный)" + msgid "Tag" msgstr "Тег" @@ -397,18 +228,73 @@ msgstr "Статей не найдено." msgid "Toggle mark as read" msgstr "Изменить отметку 'прочитано'" +msgid "toggle favorite" +msgstr "изменить метку избранного" + +msgid "delete" +msgstr "удалить" + +msgid "original" +msgstr "источник" + +msgid "estimated reading time:" +msgstr "ориентировочное время чтения:" + msgid "mark all the entries as read" msgstr "отметить все статьи как прочитанные " +msgid "results" +msgstr "найдено" + +msgid "installation" +msgstr "установка" + +msgid "install your wallabag" +msgstr "установка wallabag" + +msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." +msgstr "wallabag всё ещё не установлен. Надо заполнить форму ниже, чтобы установить его. Неплохо также прочесть документацию на сайте wallabag." + +msgid "Login" +msgstr "Имя пользователя" + +msgid "Repeat your password" +msgstr "Повторите пароль" + +msgid "Install" +msgstr "Установить" + +msgid "login to your wallabag" +msgstr "войти в свой wallabag" + msgid "Login to wallabag" msgstr "Войдите в wallabag" +msgid "you are in demo mode, some features may be disabled." +msgstr "демонстрационный режим - работают не все возможности." + msgid "Username" msgstr "Имя пользователя" +msgid "Stay signed in" +msgstr "Запомнить меня" + +msgid "(Do not check on public computers)" +msgstr "(Не отмечайте на чужих компьютерах)" + msgid "Sign in" msgstr "Зарегистрироваться" +msgid "favorites" +msgstr "избранное" + +#, fuzzy +msgid "estimated reading time :" +msgstr "ориентировочное время чтения:" + +msgid "Mark all the entries as read" +msgstr "Отметить все как прочитанное" + msgid "Return home" msgstr "На главную" @@ -433,6 +319,12 @@ msgstr "Твитнуть" msgid "Email" msgstr "Отправить по почте" +msgid "shaarli" +msgstr "shaarli" + +msgid "flattr" +msgstr "проспонсировать" + msgid "Does this article appear wrong?" msgstr "Статья выглядит криво?" @@ -445,12 +337,103 @@ msgstr "Редактировать теги" msgid "save link!" msgstr "сохранить ссылку!" -#, fuzzy -msgid "estimated reading time :" -msgstr "ориентировочное время чтения:" +msgid "home" +msgstr "главная" -msgid "Mark all the entries as read" -msgstr "Отметить все как прочитанное" +msgid "tags" +msgstr "теги" + +msgid "logout" +msgstr "выход" + +msgid "powered by" +msgstr "при поддержке" + +msgid "debug mode is on so cache is off." +msgstr "включён режим отладки - кеш выключен." + +msgid "your wallabag version:" +msgstr "Ваша версия wallabag:" + +msgid "storage:" +msgstr "хранилище:" + +msgid "save a link" +msgstr "сохранить ссылку" + +msgid "back to home" +msgstr "домой" + +msgid "toggle mark as read" +msgstr "изменить отметку 'прочитано'" + +msgid "tweet" +msgstr "твитнуть" + +msgid "email" +msgstr "email" + +#, fuzzy +msgid "this article appears wrong?" +msgstr "Статья выглядит криво?" + +msgid "No link available here!" +msgstr "Здесь нет ссылки!" + +#, fuzzy +msgid "Poching a link" +msgstr "Сохранение ссылок" + +#, fuzzy +msgid "by filling this field" +msgstr "Заполнением этого поля" + +#, fuzzy +msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "Закладка: перетащите и опустите ссылку на панель закладок" + +msgid "your version" +msgstr "Ваша версия" + +#, fuzzy +msgid "latest stable version" +msgstr "Последняя стабильная версия" + +#, fuzzy +msgid "a more recent stable version is available." +msgstr "Доступна новая стабильная версия." + +msgid "you are up to date." +msgstr "у вас всё самое новое." + +msgid "latest dev version" +msgstr "последняя версия в разработке" + +msgid "a more recent development version is available." +msgstr "есть более свежая версия в разработке." + +#, fuzzy +msgid "Please execute the import script locally, it can take a very long time." +msgstr "Пожалуйста, выполните сценарий импорта локально - это может занять слишком много времени." + +#, fuzzy +msgid "More infos in the official doc:" +msgstr "Больше сведений в официальной документации:" + +#, fuzzy +msgid "import from Pocket" +msgstr "Импортировать из Pocket" + +#, fuzzy +msgid "import from Readability" +msgstr "Импортировать из Readability" + +#, fuzzy +msgid "import from Instapaper" +msgstr "Импортировать из Instapaper" + +msgid "Tags" +msgstr "Теги" msgid "Untitled" msgstr "Без названия" @@ -539,6 +522,23 @@ msgstr "Кэш очищен. " msgid "Oops, it seems you don't have PHP 5." msgstr "Упс, кажется у вас не установлен PHP 5." +#~ msgid "You can poche a link by several methods:" +#~ msgstr "Вы можете сохранить ссылку несколькими путями:" + +#~ msgid "poche it!" +#~ msgstr "прикарманить!" + +#~ msgid "Updating poche" +#~ msgstr "Обновления poche" + +#, fuzzy +#~ msgid "Export your poche datas" +#~ msgstr "Экспортировать данные poche" + +#, fuzzy +#~ msgid "to export your poche datas." +#~ msgstr "чтобы экспортировать свои записи из poche." + #~ msgid "your poche version:" #~ msgstr "ваша версия poche:" diff --git a/locale/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po b/locale/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po index 6eac8e018..8ad2ededc 100644 --- a/locale/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po +++ b/locale/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po @@ -4,55 +4,138 @@ msgid "" msgstr "" "Project-Id-Version: wallabag\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: 2014-02-21 15:09+0100\n" -"Last-Translator: Nicolas Lœuillet \n" -"Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/" -"wallabag/language/sl_SI/)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-02-25 15:12+0300\n" +"PO-Revision-Date: 2014-02-25 15:12+0300\n" +"Last-Translator: Maryana \n" +"Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/wallabag/language/sl_SI/)\n" +"Language: sl_SI\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl_SI\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" "X-Generator: Poedit 1.5.4\n" +"X-Poedit-Language: Slovenian\n" +"X-Poedit-Country: SLOVENIA\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 "nastavitve" -msgid "Poching a link" -msgstr "Shrani povezavo" +msgid "Saving articles" +msgstr "" + +msgid "There are several ways to save an article:" +msgstr "" msgid "read the documentation" msgstr "preberite dokumentacijo" -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 "z vnosom v to polje" -msgid "poche it!" -msgstr "shrani!" +msgid "bag it!" +msgstr "" -msgid "Updating poche" -msgstr "Posodabljam Poche" +msgid "Bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "" -msgid "your version" -msgstr "vaša različica" +msgid "Upgrading wallabag" +msgstr "" -msgid "latest stable version" +#, fuzzy +msgid "Installed version" msgstr "zadnja stabilna različica" -msgid "a more recent stable version is available." +#, fuzzy +msgid "Latest stable version" +msgstr "zadnja stabilna različica" + +#, fuzzy +msgid "A more recent stable version is available." msgstr "na voljo je nova stabilna različica." -msgid "you are up to date." +#, fuzzy +msgid "You are up to date." msgstr "imate najnovejšo različico." -msgid "latest dev version" +#, fuzzy +msgid "Latest dev version" msgstr "zadnja razvojna različica" -msgid "a more recent development version is available." +#, fuzzy +msgid "A more recent development version is available." msgstr "na voljo je nova razvojna različica." +msgid "Feeds" +msgstr "" + +msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." +msgstr "" + +msgid "Unread feed" +msgstr "" + +#, fuzzy +msgid "Favorites feed" +msgstr "priljubljeni" + +#, fuzzy +msgid "Archive feed" +msgstr "arhiv" + +msgid "Your token:" +msgstr "" + +msgid "Your user id:" +msgstr "" + +msgid "You can regenerate your token: generate!." +msgstr "" + +#, fuzzy +msgid "Change your theme" +msgstr "Zamenjava gesla" + +msgid "Theme:" +msgstr "" + +msgid "Update" +msgstr "Posodobi" + +#, fuzzy +msgid "Change your language" +msgstr "Zamenjava gesla" + +msgid "Language:" +msgstr "" + msgid "Change your password" msgstr "Zamenjava gesla" @@ -65,67 +148,69 @@ msgstr "Geslo" msgid "Repeat your new password:" msgstr "Ponovite novo geslo:" -msgid "Update" -msgstr "Posodobi" - msgid "Import" msgstr "Uvozi" -msgid "Please execute the import script locally, it can take a very long time." -msgstr "" -"Prosimo poženite skripto za uvoz lokalno, saj lahko postopek traja precej " -"časa." +#, fuzzy +msgid "Please execute the import script locally as it can take a very long time." +msgstr "Prosimo poženite skripto za uvoz lokalno, saj lahko postopek traja precej časa." -msgid "More infos in the official doc:" +#, fuzzy +msgid "More info in the official documentation:" msgstr "Več informacij v uradni dokumentaciji:" -msgid "import from Pocket" +#, fuzzy +msgid "Import from Pocket" msgstr "Uvoz iz aplikacije Pocket" -msgid "import from Readability" +#, php-format +msgid "(you must have a %s file on your server)" +msgstr "" + +#, fuzzy +msgid "Import from Readability" msgstr "Uvoz iz aplikacije Readability" -msgid "import from Instapaper" +#, fuzzy +msgid "Import from Instapaper" msgstr "Uvoz iz aplikacije Instapaper" -msgid "Export your poche datas" +#, fuzzy +msgid "Import from wallabag" +msgstr "Uvoz iz aplikacije Readability" + +#, fuzzy +msgid "Export your wallabag data" msgstr "Izvoz vsebine" msgid "Click here" msgstr "Kliknite tukaj" -msgid "to export your poche datas." +#, fuzzy +msgid "to download your database." msgstr "za izvoz vsebine aplikacije Poche." -msgid "back to home" -msgstr "Nazaj domov" +#, fuzzy +msgid "to export your wallabag data." +msgstr "za izvoz vsebine aplikacije Poche." -msgid "installation" -msgstr "Namestitev" - -msgid "install your poche" -msgstr "Namestitev aplikacije Poche" - -msgid "" -"poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " -"on poche website." +msgid "Cache" msgstr "" -"Poche še vedno ni nameščen. Za namestitev izpolnite spodnji obrazec. Za več " -"informacij preberite dokumentacijo na " -"spletni strani." -msgid "Login" -msgstr "Prijava" +msgid "to delete cache." +msgstr "" -msgid "Repeat your password" -msgstr "Ponovite geslo" +msgid "You can enter multiple tags, separated by commas." +msgstr "" -msgid "Install" -msgstr "Namesti" +msgid "return to article" +msgstr "" -msgid "back to top" -msgstr "nazaj na vrh" +msgid "plop" +msgstr "štrbunk" + +msgid "You can check your configuration here." +msgstr "" msgid "favoris" msgstr "priljubljeni" @@ -154,10 +239,14 @@ msgstr "po naslovu" msgid "by title desc" msgstr "po naslovu - padajoče" -msgid "No link available here!" -msgstr "Povezava ni na voljo!" +msgid "Tag" +msgstr "" -msgid "toggle mark as read" +msgid "No articles found." +msgstr "" + +#, fuzzy +msgid "Toggle mark as read" msgstr "označi kot prebrano" msgid "toggle favorite" @@ -169,65 +258,47 @@ msgstr "zavrzi" msgid "original" msgstr "izvirnik" +msgid "estimated reading time:" +msgstr "" + +msgid "mark all the entries as read" +msgstr "" + msgid "results" msgstr "rezultati" -msgid "tweet" -msgstr "tvitni" +msgid "installation" +msgstr "Namestitev" -msgid "email" -msgstr "pošlji po e-pošti" +#, fuzzy +msgid "install your wallabag" +msgstr "Namestitev aplikacije Poche" -msgid "shaarli" -msgstr "shaarli" +#, fuzzy +msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." +msgstr "Poche še vedno ni nameščen. Za namestitev izpolnite spodnji obrazec. Za več informacij preberite dokumentacijo na spletni strani." -msgid "flattr" -msgstr "flattr" +msgid "Login" +msgstr "Prijava" -msgid "this article appears wrong?" -msgstr "napaka?" +msgid "Repeat your password" +msgstr "Ponovite geslo" -msgid "create an issue" -msgstr "prijavi napako" +msgid "Install" +msgstr "Namesti" -msgid "or" -msgstr "ali" - -msgid "contact us by mail" -msgstr "pošlji e-pošto razvijalcem" - -msgid "plop" -msgstr "štrbunk" - -msgid "home" -msgstr "domov" - -msgid "favorites" -msgstr "priljubljeni" - -msgid "logout" -msgstr "odjava" - -msgid "powered by" -msgstr "stran poganja" - -msgid "debug mode is on so cache is off." -msgstr "" -"vklopljen je način odpravljanja napak, zato je predpomnilnik izključen." - -msgid "your poche version:" -msgstr "vaša verzija Poche:" - -msgid "storage:" -msgstr "pomnilnik:" - -msgid "login to your poche" +#, fuzzy +msgid "login to your wallabag" msgstr "prijavite se v svoj Poche" -msgid "you are in demo mode, some features may be disabled." +msgid "Login to wallabag" +msgstr "" + +msgid "you are in demo mode, some features may be disabled." +msgstr "uporabljate vzorčno različico programa, zato so lahko nekatere funkcije izklopljene." + +msgid "Username" msgstr "" -"uporabljate vzorčno različico programa, zato so lahko nekatere funkcije " -"izklopljene." msgid "Stay signed in" msgstr "Ostani prijavljen" @@ -237,3 +308,261 @@ msgstr "(Ne označi na javnih napravah)" msgid "Sign in" msgstr "Prijava" + +msgid "favorites" +msgstr "priljubljeni" + +msgid "estimated reading time :" +msgstr "" + +msgid "Mark all the entries as read" +msgstr "" + +msgid "Return home" +msgstr "" + +#, fuzzy +msgid "Back to top" +msgstr "nazaj na vrh" + +#, fuzzy +msgid "Mark as read" +msgstr "označi kot prebrano" + +#, fuzzy +msgid "Favorite" +msgstr "priljubljeni" + +#, fuzzy +msgid "Toggle favorite" +msgstr "označi kot priljubljeno" + +#, fuzzy +msgid "Delete" +msgstr "zavrzi" + +#, fuzzy +msgid "Tweet" +msgstr "tvitni" + +#, fuzzy +msgid "Email" +msgstr "pošlji po e-pošti" + +msgid "shaarli" +msgstr "shaarli" + +msgid "flattr" +msgstr "flattr" + +#, fuzzy +msgid "Does this article appear wrong?" +msgstr "napaka?" + +msgid "tags:" +msgstr "" + +msgid "Edit tags" +msgstr "" + +msgid "save link!" +msgstr "" + +msgid "home" +msgstr "domov" + +msgid "tags" +msgstr "" + +msgid "logout" +msgstr "odjava" + +msgid "powered by" +msgstr "stran poganja" + +msgid "debug mode is on so cache is off." +msgstr "vklopljen je način odpravljanja napak, zato je predpomnilnik izključen." + +#, fuzzy +msgid "your wallabag version:" +msgstr "vaša različica" + +msgid "storage:" +msgstr "pomnilnik:" + +msgid "save a link" +msgstr "" + +msgid "back to home" +msgstr "Nazaj domov" + +msgid "toggle mark as read" +msgstr "označi kot prebrano" + +msgid "tweet" +msgstr "tvitni" + +msgid "email" +msgstr "pošlji po e-pošti" + +msgid "this article appears wrong?" +msgstr "napaka?" + +msgid "No link available here!" +msgstr "Povezava ni na voljo!" + +msgid "Poching a link" +msgstr "Shrani povezavo" + +msgid "by filling this field" +msgstr "z vnosom v to polje" + +msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "" + +msgid "your version" +msgstr "vaša različica" + +msgid "latest stable version" +msgstr "zadnja stabilna različica" + +msgid "a more recent stable version is available." +msgstr "na voljo je nova stabilna različica." + +msgid "you are up to date." +msgstr "imate najnovejšo različico." + +msgid "latest dev version" +msgstr "zadnja razvojna različica" + +msgid "a more recent development version is available." +msgstr "na voljo je nova razvojna različica." + +msgid "Please execute the import script locally, it can take a very long time." +msgstr "Prosimo poženite skripto za uvoz lokalno, saj lahko postopek traja precej časa." + +msgid "More infos in the official doc:" +msgstr "Več informacij v uradni dokumentaciji:" + +msgid "import from Pocket" +msgstr "Uvoz iz aplikacije Pocket" + +msgid "import from Readability" +msgstr "Uvoz iz aplikacije Readability" + +msgid "import from Instapaper" +msgstr "Uvoz iz aplikacije Instapaper" + +msgid "Tags" +msgstr "" + +#, fuzzy +msgid "Untitled" +msgstr "po naslovu" + +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 "Uvoz iz aplikacije Instapaper" + +#, fuzzy +msgid "import from pocket completed" +msgstr "Uvoz iz aplikacije Pocket" + +#, fuzzy +msgid "import from Readability completed. " +msgstr "Uvoz iz aplikacije Readability" + +#, fuzzy +msgid "import from Poche completed. " +msgstr "Uvoz iz aplikacije 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 "zavrzi" + +msgid "Oops, it seems you don't have PHP 5." +msgstr "" + +#~ msgid "poche it!" +#~ msgstr "shrani!" + +#~ msgid "Updating poche" +#~ msgstr "Posodabljam Poche" + +#~ msgid "create an issue" +#~ msgstr "prijavi napako" + +#~ msgid "or" +#~ msgstr "ali" + +#~ msgid "contact us by mail" +#~ msgstr "pošlji e-pošto razvijalcem" + +#~ msgid "your poche version:" +#~ msgstr "vaša verzija Poche:" diff --git a/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo b/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo index 49c3c7d868400be1b9eb28699a8a96744b6bf143..4884abf5c5dda633e2c8847a0be1ef162f27630a 100755 GIT binary patch delta 4124 zcmbW(dr*|u8OQOn+{6ol2uOm$3lc*>ZndJ~1!A<3G+Ggpg4e9LC=pn0qQ#iSTS6K% zk(WrK)x?z4w9~3#Q^&?jXOcg(F}1ss&WN?6j*V@n)5K<`X>HO>`~B^{WICPx)iXT% zIq$pgp38I2dG%QHsZQVZ#Hg1HWq_DS%!xMU2Cf>#2W2SEm?*r8S$G|D&^6YWLd?Zn zT!CY74<=$Sj>b1|CccHq_$QN7D^lDJNG%*AnBm!ZZ`iTB_tjKL1f!0k8^ z52G49hI;NN7>gH>4otxL{s!vzw=o6(jEVGbA`^_6z>O5tKnidcK7=E1J8D3CP#yN8 zW_T1eqqk85cpvp#0F}vGsEqszm9a5=sew;Nl4u^oMEWtIgZCsd}v1L zSb*7>idCqN8c+k=ifU*F@>A38+&_f;nE^hQ<7q6$I7VBEW!Q`RlgPgs%qEXYNf8#} zJk-FNP&0W2mCB>e^>NguI^|s7LACRD)N_$6FjbR)8t4?%{X$efb5H|+B!&EEQmJ%q zw4r9&iToLx4`t#mOyEL$BNf$f7An;bAdi>=oP-NenW{zpOoxxp z$yD~Cg@dTg^C3>fzo2F^iC#5>X{ZLuQTMA*zpqCN_u>P19M$mjl zWyY6EMK>~0$8C!9MKP*@Qq&A9Q7NuL_M`DQ*IQ7(+l6{=pY#0zR0nUO+J6g`$y1nz zXE8_T|BqC%xiRiuI>!=Z(q=U-!_An67m<@>K0^M?XM8B734E!|TY%bh^H3cvL(RMz zHSo2l=QiO9+=f$i{`1HSSuxf4b!{0Q}`ZDD7s!9G++hftXrbbR0OmgDC* zo$nL*u`;y?%drL-n>mP@z-cVOE9lb;Vk|pIYcdHftUzVtNmQzLA**DLAXzh~o$r5* zE4ls{Int(rb=2ltgE|e}sN>v=Iz8{A_R6QIcK?}8{`F#*KtASU1?mOS<9Ho4kRmn) zeV7VVgN>+}9!6#ELwpTyI__Y-v}9TAF#0l&pxW`Gmb4pb+W2$GzZ$s84W;Jy7=zJF zBNoS?W|E9r!wf9NwWzf`h)VS(tis=-23ABb)36S8S`MNz{bN)H&!B}@^!{bg<}N;s z8LYz^Jc2fUiDfQcl~coO7|iD%Chp%s4QLv9)j-;C6b_&!ast)yWz?R!iQ4^*q)(aI zj>>@V4Jzyda|!i>PmoE3TGfNOw64@GLoLlFOu%!f1}>xa&R;Patzy!RQ&9I?91r7I zu7BY;gk;)h{@~pB1hpx?L=7PIYvD~dAC#pBz?E37^Zz;(b^HY?g()oHJj}!de8RB>qqyFQI)=|;BEE{s#2_kD zL&$2HPm%3pCUVwvdKRMkS&JjE6Z7cb?4%Np$5ET^JdVT*Sb;&uv>D-Zx>=r_*w$CAw##g<>o{WMym zEwc@u!naYIw|GuCW7SyBbw6rP4WZio0(E>7=kotX)V|VEv5da(X5-=&f)y}4V-^qx z2oJ!w=UpdAWp@~}2kVFy=UQ2LK2#_F`>7ly+{9C%o8gZw zu$A~8@id{$q*giSn3c!_U^=O2Dy zaQ#(TN-c?4Nu&}_65EO4GLcFzQBJT&LnX_RLl8QSI!RT;Jb3`9;kkEe?RjR{;-tDWMdJb+NzC(<6?(M~Aocek!A@T^F_lJp6Vz_jxqRpYA zH&kP&X3UGI7f~}YkEkW|LRm~?65l0M_7N7*Ps}045h}@HLT}AO)Z>YloO=z@^0rzg zXMxvh^4dvp%k7)vv-~UKmPCwR@9D5QJgsf@-X{CC_?ktFy{#UrzNya3htTB!W4c2;Z?dC>LQ@gvJXG_gj54QcUCrj`NeiOv*)zu2ALJ(4uB;DA_6H9H&IEgc z-GQH4RL=!>2hIn(0%rp!gU8prYX_I3ff(3O^@^t88>(qc9eqR}xDCQKCc2$ZrI5?3U{sW_P>Ix|j&L>Qbn!~7wMhWY;PIZbBX^f{mRoO{nX z@B6&Zd*S4kBkLl6PLJ(2v_r%Q;zq17SMcmW4zvNu#&F3D!~#sgVywUtT!Km1h3R+z z6Y((KiSJ<+UdK2zDbYU@kD10qOqSO%C78zNQ*jVB;80wO@wgfDa64*jucID#1ogdl zZ~%Ua{27;nKK~2q{;N0yZ=ePm9BfQB?>9r}FcMRS6LA_Q;C9r2x==5C88wq%p&oq7 z|NI;(bC*$>xPeU8+(Nx5AyqFjW*8P?C2F7xv7Yyvm2?=CIf|OeY1DwOpi=oA@+|Wo z)WBjHmA;>ZK^%@+qCC`03sFl`in^~6Gw@;5z_(x-?!ZV6onv(LqR&tx`wI1-Z%{A# zJ8C93{m3Fa6M}658zllhWweYIcP%vMv`D|qwY&*6c&!hF}N^7MOozo0qjSm%*IlD6^rp>EX03e5oVBQx+aWsaV`$W!${ql3pfnFL}l`O zq&Oock&;(24M)AG9F>V0)W|2Js(2$+DZWN! z<{GBP&|!4(+W%<`XEEnFz8i2H=a+C4{)}3?5Kq&CX5e0&kNQRY7B%45JnsdGs7w_2 zhJEMywqp&S@50mwogO;1_&M?}GsyBrUX0^8pMlzjPoS1yAM$5Tb5JJ!giOlZM3Q4t z*aAv@G3xW__#iGr>fD@0)y{7*qGI}yjMYVDd2i@O}TB;`t$-h$kE*Es;S4cL^x2TlrLlt8JYM`k& z6^CIMm!Oua8&zbV;5__2YCxq$##CVws`|T8nLL6T$jPFJm#WKLu(?g1a zm*e}m1k)&e8#{1nfDU=olGQSuX}BCUz_)M^{tY#u?@+{iOckQQJ%GCzM{btsc=jQHog!^MHSC0qP-I z<2}SP#N&iTs9yRTNr*NTv)USuh@rlsmEDfoVmpaUqM4{8mJw?639aW$ozPw&4iJlV zLc51(iuSyJf`jz6g=-0I%~y!KiH(HnA(2SZ&>y9v^_Whm*@X72s#UFvm=W!H%cGxG zZ6Q_rYND0U`l_`Mn~C*0q5XompIAhw==3w3K_nAu6O_6*LhC%4SWc*EN2prY5u=Eg zh&5T&F7~6l0%BZLk-lz3)7bJ}Hpc+_b4}?IYH@&Q-1U(-{|{offOf>S$ZL z+Ir}5Yh%mimJLlE)|!@0t)0yq!_Jh-7~9&0ybkF*bE_uB0_ z=aW~pwpeYO@{JzZVpokAb;W&f-2HK(GeA>f3He-jfIeTLIp(ioU=%6-p0(YM1r;W~Z0+#bvQ&^_O`)9rE3 zxX0ad?zz6_Ew{JtpnIlouiNXMch9=VEk5_Yb)K7#bEzln{8ajAjQw`m6uYy0rCl~I z*|}Z*M!>#UG0iTnEU`N(6CJzq-hlm9b;v2LUJ=Orzqj_!Dl}=av%AKQbGA-86ZkK% C=&!y2 diff --git a/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po b/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po index 9af81e898..087977056 100755 --- a/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po +++ b/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: wballabag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-24 14:54+0300\n" -"PO-Revision-Date: 2014-02-24 15:07+0300\n" +"POT-Creation-Date: 2014-02-25 15:06+0300\n" +"PO-Revision-Date: 2014-02-25 15:08+0300\n" "Last-Translator: Maryana \n" "Language-Team: \n" "Language: \n" @@ -17,228 +17,30 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n" -msgid "poche, a read it later open source system" -msgstr "poche, сервіс відкладеного читання з відкритим кодом" +msgid "wallabag, a read it later open source system" +msgstr "wallabag, сервіс відкладеного читання з відкритим кодом" msgid "login failed: user doesn't exist" msgstr "увійти не вдалося: користувач не існує" -msgid "home" -msgstr "головна" - -msgid "favorites" -msgstr "вибране" - -msgid "archive" -msgstr "архів" - -msgid "tags" -msgstr "теги" +msgid "return home" +msgstr "повернутися на головну" msgid "config" msgstr "налаштування" -msgid "logout" -msgstr "вихід" - -msgid "back to home" -msgstr "назад на головну" - -msgid "Tags" -msgstr "Теги" - -msgid "Poching a link" -msgstr "Зберігання посилання" - -msgid "You can poche a link by several methods:" -msgstr "Ви можете зберегти посилання кількома способами:" - -msgid "read the documentation" -msgstr "читати документацію" - -msgid "download the extension" -msgstr "завантажити розширення" - -msgid "download the application" -msgstr "завантажити додаток" - -#, fuzzy -msgid "by filling this field" -msgstr "Заповнивши це поле" - -msgid "poche it!" -msgstr "зберегти!" - -#, fuzzy -msgid "bookmarklet: drag & drop this link to your bookmarks bar" -msgstr "З допомогою закладки: перетягніть і відпустіть посилання на панель закладок" - -msgid "Updating poche" -msgstr "Оновлення poche" - -msgid "your version" -msgstr "ваша версія:" - -#, fuzzy -msgid "latest stable version" -msgstr "Остання стабільна версія" - -#, fuzzy -msgid "a more recent stable version is available." -msgstr "Є новіша стабільна версія." - -msgid "you are up to date." -msgstr "у вас остання версія." - -msgid "latest dev version" -msgstr "остання версія в розробці" - -msgid "a more recent development version is available." -msgstr "доступна новіша версія в розробці." - -msgid "Change your theme" -msgstr "Змінити тему" - -msgid "Theme:" -msgstr "Тема:" - -msgid "Update" -msgstr "Оновити" - -msgid "Change your password" -msgstr "Зміна паролю" - -msgid "New password:" -msgstr "Новий пароль:" - -msgid "Password" -msgstr "Пароль" - -msgid "Repeat your new password:" -msgstr "Новий пароль ще раз:" - -msgid "Import" -msgstr "Імпортування" - -#, fuzzy -msgid "Please execute the import script locally, it can take a very long time." -msgstr "Будь ласка, виконайте сценарій імпорту локально, оскільки це може тривати досить довго." - -#, fuzzy -msgid "More infos in the official doc:" -msgstr "Більш детальна інформація в офіційній документації:" - -#, fuzzy -msgid "import from Pocket" -msgstr "Імпорт з Pocket-а" - -#, php-format -msgid "(you must have a %s file on your server)" -msgstr "(файл %s повинен бути присутнім на вашому сервері)" - -#, fuzzy -msgid "import from Readability" -msgstr "Імпорт з Readability" - -#, fuzzy -msgid "import from Instapaper" -msgstr "Імпорт з Instapaper" - -#, fuzzy -msgid "Export your poche datas" -msgstr "Експортувати ваші дані з poche" - -msgid "Click here" -msgstr "Клікніть тут" - -#, fuzzy -msgid "to export your poche datas." -msgstr "щоб експортувати ваші дані poche." - -msgid "plop" -msgstr "plop" - -msgid "installation" -msgstr "інсталяція" - -msgid "install your wallabag" -msgstr "встановити wallabag" - -msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." -msgstr "wallabag ще не встановлено. Будь ласка, заповніть форму нижче, щоб його встановити. Ви можете звертутися до документації на сайті wallabag." - -msgid "Login" -msgstr "Логін" - -msgid "Repeat your password" -msgstr "Пароль ще раз" - -msgid "Install" -msgstr "Встановити" - -msgid "favoris" -msgstr "вибране" - -msgid "unread" -msgstr "непрочитане" - -msgid "by date asc" -msgstr "за датою по зростанню" - -msgid "by date" -msgstr "за датою" - -msgid "by date desc" -msgstr "за датою по спаданню" - -msgid "by title asc" -msgstr "за назвою по зростанню" - -msgid "by title" -msgstr "за назвою" - -msgid "by title desc" -msgstr "за назвою по спаданню" - -msgid "No link available here!" -msgstr "Немає доступних посилань!" - -msgid "toggle mark as read" -msgstr "змінити мітку на прочитано" - -msgid "toggle favorite" -msgstr "змінити мітку вибраного" - -msgid "delete" -msgstr "видалити" - -msgid "original" -msgstr "оригінал" - -msgid "estimated reading time:" -msgstr "приблизний час читання:" - -msgid "results" -msgstr "результат(ів)" - -msgid "login to your wallabag" -msgstr "увійти до wallabag" - -msgid "you are in demo mode, some features may be disabled." -msgstr "ви в демонстраційному режимі, деякі функції можуть бути відключені." - -msgid "Stay signed in" -msgstr "Запам'ятати мене" - -msgid "(Do not check on public computers)" -msgstr "(Не відмічайте на загальнодоступних комп'ютерах)" - msgid "Saving articles" msgstr "Зберігання посилань" msgid "There are several ways to save an article:" msgstr "Є кілька способів зберегти статтю:" +msgid "read the documentation" +msgstr "читати документацію" + +msgid "download the extension" +msgstr "завантажити розширення" + msgid "via F-Droid" msgstr "через F-Droid" @@ -248,6 +50,9 @@ msgstr "або" msgid "via Google Play" msgstr "через Google Play" +msgid "download the application" +msgstr "завантажити додаток" + msgid "By filling this field" msgstr "Заповнивши це поле" @@ -272,13 +77,11 @@ msgstr "Є новіша стабільна версія." msgid "You are up to date." msgstr "У вас остання версія." -#, fuzzy msgid "Latest dev version" -msgstr "остання версія в розробці" +msgstr "Остання версія в розробці" -#, fuzzy msgid "A more recent development version is available." -msgstr "доступна новіша версія в розробці." +msgstr "Доступна новіша версія в розробці." msgid "Feeds" msgstr "Завантаження (feeds)" @@ -304,22 +107,49 @@ msgstr "Ваш ідентифікатор користувача (user id):" msgid "You can regenerate your token: generate!." msgstr "Ви можете перестворити ваш маркер: натисніть згенерувати!." +msgid "Change your theme" +msgstr "Змінити тему" + +msgid "Theme:" +msgstr "Тема:" + +msgid "Update" +msgstr "Оновити" + msgid "Change your language" msgstr "Змінити мову" msgid "Language:" msgstr "Мова:" +msgid "Change your password" +msgstr "Зміна паролю" + +msgid "New password:" +msgstr "Новий пароль:" + +msgid "Password" +msgstr "Пароль" + +msgid "Repeat your new password:" +msgstr "Новий пароль ще раз:" + +msgid "Import" +msgstr "Імпортування" + msgid "Please execute the import script locally as it can take a very long time." msgstr "Будь ласка, виконайте сценарій імпорту локально, оскільки це може тривати досить довго." -#, fuzzy msgid "More info in the official documentation:" -msgstr "Більш детальна інформація в офіційній документації:" +msgstr "Більше інформації в офіційній документації:" msgid "Import from Pocket" msgstr "Імпорт з Pocket-а" +#, php-format +msgid "(you must have a %s file on your server)" +msgstr "(файл %s повинен бути присутнім на вашому сервері)" + msgid "Import from Readability" msgstr "Імпорт з Readability" @@ -332,6 +162,9 @@ msgstr "Імпорт з wallabag" msgid "Export your wallabag data" msgstr "Експортувати ваші дані з wallabag" +msgid "Click here" +msgstr "Клікніть тут" + msgid "to download your database." msgstr "щоб завантажити вашу базу даних." @@ -344,48 +177,45 @@ msgstr "Кеш" msgid "to delete cache." msgstr "щоб очистити кеш." -msgid "tweet" -msgstr "твітнути" - -msgid "email" -msgstr "email" - -msgid "shaarli" -msgstr "shaarli" - -msgid "flattr" -msgstr "flattr" - -msgid "this article appears wrong?" -msgstr "ця стаття виглядає не так, як треба?" - msgid "You can enter multiple tags, separated by commas." msgstr "Ви можете ввести декілька тегів, розділених комами." msgid "return to article" msgstr "повернутися до статті" -msgid "powered by" -msgstr "за підтримки" - -msgid "debug mode is on so cache is off." -msgstr "режим відладки включено, отже кеш виключено." - -msgid "your wallabag version:" -msgstr "версія вашого wallabag:" - -msgid "storage:" -msgstr "сховище:" - -msgid "save a link" -msgstr "зберегти лінк" - -msgid "return home" -msgstr "повернутися на головну" +msgid "plop" +msgstr "plop" msgid "You can check your configuration here." msgstr "Ви можете перевірити вашу конфігурацію тут." +msgid "favoris" +msgstr "вибране" + +msgid "archive" +msgstr "архів" + +msgid "unread" +msgstr "непрочитане" + +msgid "by date asc" +msgstr "за датою по зростанню" + +msgid "by date" +msgstr "за датою" + +msgid "by date desc" +msgstr "за датою по спаданню" + +msgid "by title asc" +msgstr "за назвою по зростанню" + +msgid "by title" +msgstr "за назвою" + +msgid "by title desc" +msgstr "за назвою по спаданню" + msgid "Tag" msgstr "Тег" @@ -395,18 +225,72 @@ msgstr "Статей не знайдено." msgid "Toggle mark as read" msgstr "змінити мітку прочитаного" +msgid "toggle favorite" +msgstr "змінити мітку вибраного" + +msgid "delete" +msgstr "видалити" + +msgid "original" +msgstr "оригінал" + +msgid "estimated reading time:" +msgstr "приблизний час читання:" + msgid "mark all the entries as read" msgstr "відмітити всі статті як прочитані" +msgid "results" +msgstr "результат(ів)" + +msgid "installation" +msgstr "інсталяція" + +msgid "install your wallabag" +msgstr "встановити wallabag" + +msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." +msgstr "wallabag ще не встановлено. Будь ласка, заповніть форму нижче, щоб його встановити. Ви можете звертутися до документації на сайті wallabag." + +msgid "Login" +msgstr "Логін" + +msgid "Repeat your password" +msgstr "Пароль ще раз" + +msgid "Install" +msgstr "Встановити" + +msgid "login to your wallabag" +msgstr "увійти до wallabag" + msgid "Login to wallabag" msgstr "Увійти до wallabag" +msgid "you are in demo mode, some features may be disabled." +msgstr "ви в демонстраційному режимі, деякі функції можуть бути відключені." + msgid "Username" msgstr "Ім’я користувача" +msgid "Stay signed in" +msgstr "Запам'ятати мене" + +msgid "(Do not check on public computers)" +msgstr "(Не відмічайте на загальнодоступних комп'ютерах)" + msgid "Sign in" msgstr "Увійти" +msgid "favorites" +msgstr "вибране" + +msgid "estimated reading time :" +msgstr "приблизний час читання:" + +msgid "Mark all the entries as read" +msgstr "Відмітити все як прочитане" + msgid "Return home" msgstr "Повернутися на головну" @@ -431,6 +315,12 @@ msgstr "Твітнути" msgid "Email" msgstr "Надіслати по e-mail" +msgid "shaarli" +msgstr "shaarli" + +msgid "flattr" +msgstr "flattr" + msgid "Does this article appear wrong?" msgstr "Ця стаття виглядає не так, як треба?" @@ -443,12 +333,92 @@ msgstr "Редагувати теги" msgid "save link!" msgstr "зберегти лінк!" -#, fuzzy -msgid "estimated reading time :" -msgstr "приблизний час читання:" +msgid "home" +msgstr "головна" -msgid "Mark all the entries as read" -msgstr "Відмітити все як прочитане" +msgid "tags" +msgstr "теги" + +msgid "logout" +msgstr "вихід" + +msgid "powered by" +msgstr "за підтримки" + +msgid "debug mode is on so cache is off." +msgstr "режим відладки включено, отже кеш виключено." + +msgid "your wallabag version:" +msgstr "версія вашого wallabag:" + +msgid "storage:" +msgstr "сховище:" + +msgid "save a link" +msgstr "зберегти лінк" + +msgid "back to home" +msgstr "назад на головну" + +msgid "toggle mark as read" +msgstr "змінити мітку на прочитано" + +msgid "tweet" +msgstr "твітнути" + +msgid "email" +msgstr "email" + +msgid "this article appears wrong?" +msgstr "ця стаття виглядає не так, як треба?" + +msgid "No link available here!" +msgstr "Немає доступних посилань!" + +msgid "Poching a link" +msgstr "Зберігання посилання" + +msgid "by filling this field" +msgstr "заповнивши це поле" + +msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "з допомогою закладки: перетягніть і відпустіть посилання на панель закладок" + +msgid "your version" +msgstr "ваша версія:" + +msgid "latest stable version" +msgstr "остання стабільна версія" + +msgid "a more recent stable version is available." +msgstr "є новіша стабільна версія." + +msgid "you are up to date." +msgstr "у вас остання версія." + +msgid "latest dev version" +msgstr "остання версія в розробці" + +msgid "a more recent development version is available." +msgstr "доступна новіша версія в розробці." + +msgid "Please execute the import script locally, it can take a very long time." +msgstr "Будь ласка, виконайте сценарій імпорту локально, оскільки це може тривати досить довго." + +msgid "More infos in the official doc:" +msgstr "Більше інформації в офіційній документації:" + +msgid "import from Pocket" +msgstr "імпорт з Pocket-а" + +msgid "import from Readability" +msgstr "імпорт з Readability" + +msgid "import from Instapaper" +msgstr "імпорт з Instapaper" + +msgid "Tags" +msgstr "Теги" msgid "Untitled" msgstr "Без назви" @@ -537,6 +507,23 @@ msgstr "Кеш очищено." msgid "Oops, it seems you don't have PHP 5." msgstr "Упс, здається, у вас немає PHP 5." +#~ msgid "You can poche a link by several methods:" +#~ msgstr "Ви можете зберегти посилання кількома способами:" + +#~ msgid "poche it!" +#~ msgstr "зберегти!" + +#~ msgid "Updating poche" +#~ msgstr "Оновлення poche" + +#, fuzzy +#~ msgid "Export your poche datas" +#~ msgstr "Експортувати ваші дані з poche" + +#, fuzzy +#~ msgid "to export your poche datas." +#~ msgstr "щоб експортувати ваші дані poche." + #~ msgid "Import from poche" #~ msgstr "Імпорт з poche" diff --git a/themes/baggy/_top.twig b/themes/baggy/_top.twig index 4f476a37b..d3e35aa3f 100644 --- a/themes/baggy/_top.twig +++ b/themes/baggy/_top.twig @@ -1,6 +1,6 @@

- {% if view == 'home' %}{% block logo %}logo poche{% endblock %} + {% if view == 'home' %}{% block logo %}wallabag logo{% endblock %} {% else %}{{ block('logo') }} {% endif %}

diff --git a/themes/courgette/_top.twig b/themes/courgette/_top.twig index 792687c06..2a2de2118 100755 --- a/themes/courgette/_top.twig +++ b/themes/courgette/_top.twig @@ -1,6 +1,6 @@

- {% if view == 'home' %}{% block logo %}logo poche{% endblock %} + {% if view == 'home' %}{% block logo %}wallabag logo{% endblock %} {% elseif view == 'fav' %}{{ block('logo') }} Favoris {% elseif view == 'archive' %}{{ block('logo') }} Archive {% else %}{{ block('logo') }} diff --git a/themes/courgette/config.twig b/themes/courgette/config.twig index 26da7289b..5c0aa4b11 100755 --- a/themes/courgette/config.twig +++ b/themes/courgette/config.twig @@ -7,7 +7,7 @@ {% block content %}

{% trans "Poching a link" %}

-

{% trans "You can poche a link by several methods:" %} (?)

+

{% trans "There are several ways to save an article:" %} (?)

-

{% trans "Updating poche" %}

+

{% trans "Upgrading wallabag" %}

-

{% trans "Export your poche datas" %}

-

{% trans "Click here" %} {% trans "to export your poche datas." %}

+

{% trans "Export your wallabag data" %}

+

{% trans "Click here" %} {% trans "to export your wallabag data." %}

{% endblock %} \ No newline at end of file diff --git a/themes/default/_bookmarklet.twig b/themes/default/_bookmarklet.twig index 2e3071ad6..619963539 100644 --- a/themes/default/_bookmarklet.twig +++ b/themes/default/_bookmarklet.twig @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/themes/default/_top.twig b/themes/default/_top.twig index 0711acdce..c6e41b2f4 100644 --- a/themes/default/_top.twig +++ b/themes/default/_top.twig @@ -1,6 +1,6 @@

- {% if view == 'home' %}{% block logo %}logo poche{% endblock %} + {% if view == 'home' %}{% block logo %}wallabag logo{% endblock %} {% else %}{{ block('logo') }} {% endif %}

From 2cf87a4da1b7d9c848b3e4650f3e02d2bfde1925 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Tue, 25 Feb 2014 18:40:25 +0200 Subject: [PATCH 07/79] French translation added by @Draky50110, issue #488 --- locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo | Bin 4810 -> 12738 bytes locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po | 304 +++++++++----------- 2 files changed, 132 insertions(+), 172 deletions(-) diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo index 76872b5a0fe47c51d05e0f65221616214ce72e28..600b3281562a698075c658f0adfef5aef25bd93b 100644 GIT binary patch literal 12738 zcmb`N3y>VedB+<|2qS|5V+e6D9tqG1xZ9Hu!mtPl^n$~Z5PA?G5M^$6c5l$`%rcKV zooo^eCLzWqfP;bf5t9%=RKSp=Tq%mGRB}m~va1ruArIlq5* z&))7yMFNIZ`@a7AJAM0oOCK>DPg2gNY&hPS*Wj(o`QiB1$;K>&e+gH@ zZ^PB_xc3?}4ljfk!du`;@Lu>n_%M7A{0(>+d=Z`j{~7WLV@@%KQ?m@dAD-cPAv}%i zO;BC90sc6=6)uC*@I&xUcq04)RC`ZD)q4)U8-5k4{crf^uR*>420Rn~3sgUsoNCOE z!84)yQG=JmE${?*Cscp#h5Fv3Q13kfHJ;yr`u^9T>U{%Bj;}+>qM8c^S#hUdWtp!)yYa00#zuYt>`tnuuE8s}|L{hfi5^QRy~GLJ#^`x&VEFTf@6 z_n_u+4oVKMK+W5qK)v?^csg9pkH&Kjtiki(S#U4ZcREo0I|S9v$04tp`~3aSLH?O1 z`Pm157p{dT)7cx~CipOX2&%pF5TfL<29CpxQ2k1v#_>3m9G~#l&qL|cSN!$&pxXI& zsCrA7Tu#lYQ2ks5b$=Y{I~$<-eH~l@Z}8VS)Hn}A{+ZA4BRM<^C5IQFp1%e)U;hEs zzf-x8UYrHh?n)>*UjV6MYVd<_8HpL5{@Fo3@Wr8j>DN8!IhjpKuSRQ+EE z_5M{*_xD1*AHx8C8eRaOhx+cfp!)MYsCK^()vwc09?9h_sOuF_cDBmjUkmkq9cp|x zK*{%Jh$@=MU(Z0jcMnv(2mJHTLbd-4RQoSN$?+@jBKR^~4gV3I2T%I|--ee$hHP$w zdteEF0=@z$iPbg_6(Z@XwDkW;c8n*Q+pYjq3tMfcL^R z@b{tQ_a@Z*Ee%|IAAp;=9)TMF?NH;m8_Is~gP4kW6w-C`oBsM0sPX+RRD1sfH4i_8 zs&@j)t#O|VC69HGf2Pil>fH(@*Cy0Fl~D6`7)mbpKz;Y~kf|~+LXG?Da1(qTO7B;) zC`d0yq2AvFrI*)2wbOwb_r3o5QUCk}sCHk49EBH4lFT zx4>_Do{2I^UbjHiiy>2I9`yI0gOcydQ18DAHU7VcOW>PuDf~XvIQ|Q&UrWz-^M46c zfA>PoPZwSebBGF<=b+mAI+R`f4OD;r0ZIn;BJIw-m9 zftZ9j2&HfLL)$)N3d~E8DK@V`)mwrSxeA^O^?nm-e0M_C`=r1BJd|9&3fIGBqsCkb zH$d6*VW{^WhkEZRsQ!Kpz8iiME`@&$CAYtW?}6WinvWmA}N>`}af1qsacq3oyZqWm1?QuG^%);DA`3z+TC8hi%MaOjx{omc3N%ww=B3r(lawnxa&gSG{ z%2kxhDLPgtFNyCHRY!U#9#DMS82_CI{;; zZu94>VVg2bIo;p;H2isg-h`J@E~3b;uA$T^)p1{S0x?a~_16zV`GFo~Bc(x+{qCf! zpnQ^|;{i%Qd6cq&avDX4)_fhZwa-ybp*%v-(a}$kW`S9~H4T!q2pUsS<6w{`L9d+b z#Eqblc6((JW%&hW^=w)O-7+tNscdS9gc>zU1IdaxU22Rl(w51Lun4pxD*7Zg)`zY{06rtSHpubKywVP-bZYFt!k zyQ-}?>NL%k5ZSn2#zdo0vu3tTg-JVd!|!lfhHdH$-0X#UK9gp=K5(;`in>%oz6XP; zDC0COJ54u^IB6oeJIXkVn!!r5)qcrrO{3g(CiH_2d%Y;kf|)E$+MCR_W?TeC*v`$i zE^;;74)xNkaQ&JII|!QLH^U+{+r#NJi;Jj#!X!$V+xf}OL|5;51g$LX1``Q0(hGZ0 zHgtP;+Bg^u*W43@&2TdA#Kr7T)v5z#B9S^tbU~an#(OCe9dAahIEiZ9sP(3LR-;A( zDusE3ob?Pb*iLjh6%mbBC9}gzz0O$?p`7U3z(ad$Sf$L4v>hkzSGv;g-cFPyKv)Pm z3Q*T9M(APAbc9Xg9#$99?>K3t{Mg!Qs}(omuoE=XMk!Sf3-r8hc2*VhW7VviUC~TX zsR&nT;HQ^KkwVvW%W7)hT&%*ZFxRKOd^BLv^C;@(nrJ?qjCkAJeeLdGea-BylyA2a zXLKlPV9d71v7PB4Z)9<=2s&wlfzN8RwAlz5Rd`S~j+ke8DpQEN*y`JD$@cB7+F|Zx zV4)qJ*%P77USE?TnG8OuBt`Y2%#vU##fYmIk@?Zb>y2R88A$+)S&o9Dgm}(pQgtGZEIXe`-|1 zm2#jtK`%>jW!+$AN^Y_pC48q)XJv7D&FoJOCg}{lb#p=W>9`qXdLW&1hPgi};-Z6v z?(bp15ol*&Q?2wBcR!vt36aIksDXx5;^b1dvy3jG z$Wgafpw2i`yJEHC4A(H(p9K1bfTF}MHEuQn=a2hhdW(+O8Rq?}L)gqfm)wXn;4CPa znILY~P52Ji#NqnG4s5~l8M-ymO!~FYT7~?5T&ytF%Jz;IL8i{Cn%~ zC8=W7Rdwx2^`g75Z#tzi&1kZ0BbKJM7St=GDd8G%i+%w#HY!bDgduG?0uPn`*KdCaic#JbS_xNDVGrl)u0 z@Phgx59-FbgWMDAF|AHm6q&K|_a?n?1s%N23d(q@6|q?h%z~#{Uk7guuCI&SU$i*{ z;8*eaDnpI481ucshY3q*H?R!VDEc^lT{ zz9tWb`_32AvM|ocFA@_Z=$s*%qIY4(^oVjzFP*_j%JZ3C7EQ-#nH%fNrMpAH0k?Df zrXJ5PX8xSs_&~t8)yS=q_FSsF!sJt7m~~=<*3!8$w+hQAR&pmL)@6mW;h=svonmpV z;#0aoT%({_v4i{|e$h`AhG6T`Ta^EQs~EZ1WQwR^GQtB}OA7L`(TMWART5Cp+QLdc zc3z~Kw@F{gzFy2|(g?xx{v6U_O(Sw%73d3o9Q?VwvTPi(zt2Q zuSrt{9lJZ>tf>r2j?qoHX0JbGHEP*#*{ZgNKFN-2h7dBd(_0y5T-1WCE=Y{>m=F~? zrSmKAR8jQmas&D!H58;`BP+V@ozgPCZOCVg~J-5n(cvhNa8%GR?W?V%<) zD`SKCnazu+Yi6PjKG1e$*aBs=3TBwX0Y{XpZi`^C#D0P8{M|J9xNx?W&bs{GjGSuvCU;WAKRC5d-wJG#n>WeZp|7hj_twgXc_eNmhTAjVr*X)COK1(X7zxb%xsv1!3LBu z&eFqIb+cM$I-ahT;YMn^P3+jdDD3j(>YCG?6FaxfcXe%T&GIcN;a@`QvpsrL;0?!n zoiI+WAdL`ac~o4vf8X}8%jWB;7sz^S8yi8bvGw4x$+%d4)7b7bVh20+k!V(%<$MP& zydE65q8$}#wc>#!O?&gTH)Dqcuv7J*Hh*)kRW5eh`hGnqixwTYY3v#od~5vfTfy4e z`r3yF-eWi2nA%NqV{7WcxEAqoFQD-QTesafj)sp{v)DfwBeq4a$F#IDp5-Pj&FWp& zA+eOQzLOPE7^u~Y0W))4xzq{?6>TbF_CeG-KgZEvCUeggsC+M*JCY+=`!cm`W~C&x zvY*|s-}zz`L38eiO|JCNPipr%B^%VaBg(t5gVkm@&Ule0n%0qlb z-qL1W@_~#CZZ%8G>A54p3Uh5(YTJz$CiyXtbqVT0yA$Vmba;%8_EJs)?7kD@1Da?; zFr8|!q+Iyr{VJl`mf$tW6Yy%tsCWf+>h^{*Fj1=&Hs+3085pe1wq=bvV%yz}Su(1- zUA(33AARwOnCek6HTR6m#oSTSJvQ;|$%9_Rh*(tIAZcf%*`^Ohnb|^+RIMKQNT_{3 z4!6tx(Pd$%+(Be^@!f`c^pi2RH=5-nnL9!aI#j8X&&A}XFY!tgy5Vyve0##}6Pr=5 zWF?sBhja@b45wy%?L9{)XZ(}-UU*$xG&jQom%kYex>44MH3nvu98D|{*$%NPXU03U zYKdaJE>EL)dMkU?cMmh z*58HkL?QXq0oA0LtIGzyqS7yKVq{3|ZEHBm$go{YWwF8QOXY*6HC9|i9(6JK!&ZgK zS};34BeZkib7rTT!;$C^E<;J)pflq46etPEigT&ikXNrjPWW*THd84IQPKw7*jPVpB=| z$49H5OD9c`PKw3#qjdne9tspl|i(Qe)YL)UC?(ZR_``o(U z90?~05&Zh^8)S7wc2eVlKYF-@#m=vCRd&64JH7Mra!ui^`XiMHG}nHp{%T??K~vwq zqV(neBjy-<_ie=-RWgf>utts|bw(;Hb~!Da-9S?7{~BXhbzlWC)rrkh^)JwrhQSFQ zGY(NLXDt1*{@eDx6s=)~^xGhKo9fbp+r*dLxF)tW%If43U)Hs!Nkgk@Zf9K~PG0tU z8Of;36mv&9_-caNw$x!{Fd4S+*+4!la&ZV5F&lp3!xdNI><6-9^uez$_%|XSJTU4P z;sl_v-d^_KVWDN`B~^~QR3NvYh2Yqaswk%7c6J~n$g27DZt3lXGxD502Cv=>zv#oA z;hT$xI|EM!+niV=wpzT7`|jX#6voZ*+>vfNzZ!f0C#iOaysIXDXxZ{R_5RXV`9k9# z__XKSh@kj0!h$HvM^Jbi{-8kQV%uVx8&hdXfQBJ;S;0aA%c_c$gst;%4;O#EGZ>cz z#3@R|*{zVNT0F)_ZOEd(5g+!(HW0Ddus=7fKtmy(bI^U+U@P|VA?1F%ZzJl<%Xpfx zEzI2Ur{S{0f}y2?z?~o1s4bkTH8VA{7$>j8REd6la&=#4_v2Eus;Z^A8OxW%vz3M0i zXD8+MI}0lItH?`PFAxsfKYy){8a87$_e_3NCBGLtcBN!w(4Y9KG$EJ4lIW&bYv44Z z_RF95x+M1&7>HXd-5yzw=AI>(a?!bOQ1a-<&kOfwb}_YGu#0JxSj-KSGACHmyq zsy$nc^e&5%OZ(BpwDtza*w5AaYPd+?S83_dfuG9>R&m)|Bn9`9%ZW^71Tr_)6S)|# zF#S2L1wKaC|H#m;T5*KU4VL6;P%Uo`K0eT*Q1G{4{tOxH8ks`JN$a_t1dDM$-dH4A zII@xUrH;sDaId5!2wzoO5@^+J7spjsqso&gD`hZ|yydgT#h% zi#QMIgq(*uX>*EpX|(3)T9~iRTgR;Ja}rJm2fZ&_54S9L@zTBzG^!ZR@1=*Y21Sjl F_#fPHNG$*W literal 4810 zcma);ON<;x8GtL`@K{2KV;o)~l*wc4WM|d}8=Uns_=O`oEb9%5P!Ou^uG#HuPj^#Y zJ-cghARIU#qzIy%5P<-PtRWyv2nobX8d(CQfO6shG8g0%7sLr6B)-48X1wbMqBY&$ zR8?2iU;neO-n;E3#dU`Je(r@gDP`c-w(;P)=PgQo7;cB}hWp_ZJPYrG3y_~$;qg}J z;GOUyd;oq4z7u{Mz6ZVr-v+Nh+4B$ZZg?M)-v=Ltvd=NdPc86}@n<2gs+HJwaEA8t z@KJaf@>74|aToj>dI89pWMTo`xdd=OQhX`2+X?IE3$q-+*$?*P!hC zODN}i1Iqq?g8SjsIKBfV%X=Lt@*jeC+@aJb;cnVb(kbiLkS_HC6uL7WMcxtI z4qu1U@UKwhz6)cBz8{2isZ;PcoQL8UFTzLQccJ+2@1VSQ4c-I)3FW~p9&+$dA=l7uO_X~*IgzG3zkxl$WWRQ#D$tC&dgR#|v2jc$@ z6x)cuJQ4d&Lyo3C%6*($WD$MICHuw*y!W2?_nsuBG*1{@yE%v`(&w$((7c|CM&uubk!{8 zS)!A2P&MAVdXGA>Y>FkT*UQG~%GC90=~8uqmsa$$byl5Pt4inNc*#OKHQuPR1L;<0 zi`tt!SLe#5tWf7mXLVNeOCH+uYT55+NoI1LmdUJo%C1hfpjGNTD^|1_nk+Yqxefd6 zQgdS==5lLltL>UikTtBAgxUBLzFBA4&pVk>CH0)?rtTuXR-8y5%lJ?oa_S76w zXS7V%PtDuPns}gMi$t48CaSoQEfpL`UGQdI*EDP@&8I8WU|Y!Im8eD;JrET*o7lqZ z)DCT4Rs;EuP<4g@vikagdpEp~Dn$*qdDU@>p;e0p%lJ|+mxJpKUsh^yT`WUiOKs|8 z@;|k0qo3vI9K|dnM?bT9DzEs==V4y>GoIKs!px*B`q`2K-XvZ(wPw};v#G?POO!4L zs~f9QyVxwDgcLuh#o_7_(}>qdv)}LWMsAVPhUtAXEL~QsmfrF&H{LrHP8Y4+cjZ6_ zN2^R_o!Z=uZC9+{(lu{QY8JCR^Xn>W-E))oj=PM<8j8(q9Sk+r`nYSWEmSW4EoyJ$ zBp92%vhk{P{4$13t}4u}f-A^*Ymd4^{6#rz+SAdi#S+1#7jcnQ-7nohmLCh8`JO&m z79CGe)R`9@GkVzQWoP?GI?LWyvokY9RWB^?rT*q8{_g!)xLCQ$v!Ff$Zbh%ou zIs)*RLTG!-1kz(@X^9DA(~sK&(1L@CXqevI%jI%U2vwTajw$M>Zh`#%sJ4xD=#(}-FkhvXuEoO zY1^*jOA-!Zz@t;=$j1$e?Jig|V2|@>&!4(3#=hR(sT0H@hV3q_R|w(lnxCn1lNE=^ z^XT6CBTp}!?jF4Uo=DTTu6wFT%9Qw@)dv?dKlM!aj4iBd#hfc`N*>+UJJ8!drFIuq zQZ}PdV7MUbo3mHar- zQIBA}J~t-G|2@IP!sV=&7(=kUW0It?l#kelDwhrF3!bxNRb^aT%f^2~O`0@9O=6Bi z#W+W8sILi1SvCW*FLNnfe7Q{iO=gFFcA*%eFiKj3^Gh9|C6x_d#UM5A>vUV767+zv zFdyknDh+NDs+*`S)H=}*Q?vfGW~{AsL1$%=h-PaU9F8`6s&1;v@kQcpS^OrYZ>*c> zW~r?jYDtKTE%h%B%x$TFv2*_B8aQ#eHsE5RX^)>;S7f7CahuzEg}V8j*7}N1w23>4 zb=ySH?!x)Q*qSK0Y;IX7+c1=5V@XfQ5Jf{}I)\n" "Language-Team: \n" @@ -12,126 +12,114 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-KeywordsList: _;gettext;gettext_noop\n" "X-Poedit-Basepath: .\n" -"X-Poedit-Language: Franch\n" -"X-Poedit-Country: FRANCE\n" "X-Poedit-SourceCharset: utf-8\n" +"X-Generator: Poedit 1.5.7\n" "X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-testing\n" msgid "wallabag, a read it later open source system" -msgstr "" +msgstr "wallabag, un système open source de lecture différé" msgid "login failed: user doesn't exist" -msgstr "" +msgstr "identification échouée : l'utilisateur n'existe pas" msgid "return home" -msgstr "" +msgstr "retour à l'accueil" msgid "config" msgstr "configuration" msgid "Saving articles" -msgstr "" +msgstr "Sauvegarde des articles" msgid "There are several ways to save an article:" -msgstr "" +msgstr "Il y a plusieurs façons de sauver un article :" msgid "read the documentation" msgstr "lisez la documentation" msgid "download the extension" -msgstr "" +msgstr "télécharger l'extension" msgid "via F-Droid" -msgstr "" +msgstr "via F-Droid" msgid " or " -msgstr "" +msgstr "ou" msgid "via Google Play" -msgstr "" +msgstr "via Google PlayStore" msgid "download the application" -msgstr "" +msgstr "télécharger l'application" -#, fuzzy msgid "By filling this field" -msgstr "en remplissant ce champ" +msgstr "En remplissant ce champ" msgid "bag it!" -msgstr "" +msgstr "bag it !" msgid "Bookmarklet: drag & drop this link to your bookmarks bar" -msgstr "" +msgstr "Bookmarklet : glissez-déposez ce lien dans votre barre de favoris" msgid "Upgrading wallabag" -msgstr "" +msgstr "Mise à jour de wallabag" -#, fuzzy msgid "Installed version" -msgstr "dernière version stable" +msgstr "Version installée" -#, fuzzy msgid "Latest stable version" -msgstr "dernière version stable" +msgstr "Dernière version stable" -#, fuzzy msgid "A more recent stable version is available." -msgstr "une version stable plus récente est disponible." +msgstr "Une version stable plus récente est disponible." -#, fuzzy msgid "You are up to date." -msgstr "vous êtes à jour." +msgstr "Vous êtes à jour." -#, fuzzy msgid "Latest dev version" -msgstr "dernière version de développement" +msgstr "Dernière version de développement" -#, fuzzy msgid "A more recent development version is available." -msgstr "une version de développement plus récente est disponible." +msgstr "Une version de développement plus récente est disponible." msgid "Feeds" -msgstr "" +msgstr "Flux" msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." -msgstr "" +msgstr "Votre jeton de flux est actuellement vide doit d'abord être généré pour activer les flux. Cliquez ici pour le générer." msgid "Unread feed" -msgstr "" +msgstr "Flux des non lus" -#, fuzzy msgid "Favorites feed" -msgstr "favoris" +msgstr "Flux des favoris" -#, fuzzy msgid "Archive feed" -msgstr "archive" +msgstr "Flux des archives" msgid "Your token:" -msgstr "" +msgstr "Votre jeton :" msgid "Your user id:" -msgstr "" +msgstr "Votre ID utilisateur :" msgid "You can regenerate your token: generate!." -msgstr "" +msgstr "Vous pouvez regénérer votre jeton : génération !." -#, fuzzy msgid "Change your theme" -msgstr "Modifier votre mot de passe" +msgstr "Changer votre thème" msgid "Theme:" -msgstr "" +msgstr "Thème :" msgid "Update" msgstr "Mettre à jour" -#, fuzzy msgid "Change your language" -msgstr "Modifier votre mot de passe" +msgstr "Changer votre langue" msgid "Language:" -msgstr "" +msgstr "Langue :" msgid "Change your password" msgstr "Modifier votre mot de passe" @@ -148,65 +136,57 @@ msgstr "Répétez votre nouveau mot de passe :" msgid "Import" msgstr "Importer" -#, fuzzy msgid "Please execute the import script locally as it can take a very long time." -msgstr "Merci d'exécuter l'import en local, cela peut prendre du temps." +msgstr "Merci d'exécuter l'import en local car cela peut prendre du temps." -#, fuzzy msgid "More info in the official documentation:" -msgstr "Plus d'infos sur la documentation officielle" +msgstr "Plus d'infos dans la documentation officielle :" -#, fuzzy msgid "Import from Pocket" -msgstr "import depuis Pocket" +msgstr "Import depuis Pocket" #, php-format msgid "(you must have a %s file on your server)" -msgstr "" +msgstr "(le fichier %s doit être présent sur le serveur)" -#, fuzzy msgid "Import from Readability" -msgstr "import depuis Readability" +msgstr "Import depuis Readability" -#, fuzzy msgid "Import from Instapaper" -msgstr "import depuis Instapaper" +msgstr "Import depuis Instapaper" -#, fuzzy msgid "Import from wallabag" -msgstr "import depuis Readability" +msgstr "Import depuis wallabag" -#, fuzzy msgid "Export your wallabag data" -msgstr "Exporter vos données de poche" +msgstr "Exporter vos données de wallabag" msgid "Click here" -msgstr "Cliquez-ici" +msgstr "Cliquez ici" msgid "to download your database." -msgstr "" +msgstr "pour télécharger votre base de données." -#, fuzzy msgid "to export your wallabag data." -msgstr "pour exporter vos données de poche." +msgstr "pour exporter vos données de wallabag." msgid "Cache" -msgstr "" +msgstr "Cache" msgid "to delete cache." -msgstr "" +msgstr "pour effacer le cache." msgid "You can enter multiple tags, separated by commas." -msgstr "" +msgstr "Vous pouvez entrer plusieurs tags, séparés par des virgules." msgid "return to article" -msgstr "" +msgstr "retourner à l'article" msgid "plop" msgstr "plop" msgid "You can check your configuration here." -msgstr "" +msgstr "Vous pouvez vérifier votre configuration ici." msgid "favoris" msgstr "favoris" @@ -236,17 +216,16 @@ msgid "by title desc" msgstr "par titre desc" msgid "Tag" -msgstr "" +msgstr "Tag" msgid "No articles found." -msgstr "" +msgstr "Aucun article trouvé." -#, fuzzy msgid "Toggle mark as read" -msgstr "marquer comme lu / non lu" +msgstr "Marquer comme lu / non lu" msgid "toggle favorite" -msgstr "marquer comme favori" +msgstr "marquer / enlever comme favori" msgid "delete" msgstr "supprimer" @@ -255,10 +234,10 @@ msgid "original" msgstr "original" msgid "estimated reading time:" -msgstr "" +msgstr "temps de lecture estimé :" msgid "mark all the entries as read" -msgstr "" +msgstr "marquer tous les articles comme lus" msgid "results" msgstr "résultats" @@ -266,13 +245,11 @@ msgstr "résultats" msgid "installation" msgstr "installation" -#, fuzzy msgid "install your wallabag" -msgstr "installez votre poche" +msgstr "installez votre wallabag" -#, fuzzy msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." -msgstr "poche n'est pas encore installé. Merci de remplir le formulaire suivant pour l'installer. N'hésitez pas à lire la documentation sur le site de poche." +msgstr "wallabag n'est pas encore installé. Merci de remplir le formulaire suivant pour l'installer. N'hésitez pas à lire la documentation sur le site de wallabag." msgid "Login" msgstr "Nom d'utilisateur" @@ -283,95 +260,68 @@ msgstr "Répétez votre mot de passe" msgid "Install" msgstr "Installer" -#, fuzzy msgid "login to your wallabag" -msgstr "se connecter à votre poche" +msgstr "se connecter à votre wallabag" msgid "Login to wallabag" -msgstr "" +msgstr "Se connecter à wallabag" msgid "you are in demo mode, some features may be disabled." msgstr "vous êtes en mode démo, certaines fonctionnalités peuvent être désactivées." msgid "Username" -msgstr "" +msgstr "Nom d'utilisateur" msgid "Stay signed in" msgstr "Rester connecté" msgid "(Do not check on public computers)" -msgstr "(ne pas cocher sur un ordinateur public)" +msgstr "(Ne pas cocher sur un ordinateur public)" msgid "Sign in" msgstr "Se connecter" -msgid "favorites" -msgstr "favoris" - -msgid "estimated reading time :" -msgstr "" - -msgid "Mark all the entries as read" -msgstr "" - msgid "Return home" -msgstr "" +msgstr "Retour accueil" -#, fuzzy msgid "Back to top" -msgstr "retour en haut de page" +msgstr "Haut de page" -#, fuzzy msgid "Mark as read" -msgstr "marquer comme lu / non lu" +msgstr "Marquer comme lu / non lu" -#, fuzzy msgid "Favorite" -msgstr "favoris" +msgstr "Favoris" -#, fuzzy msgid "Toggle favorite" -msgstr "marquer comme favori" +msgstr "Marquer / enlever comme favori" -#, fuzzy msgid "Delete" -msgstr "supprimer" +msgstr "Effacer" -#, fuzzy msgid "Tweet" -msgstr "tweet" +msgstr "Tweet" -#, fuzzy msgid "Email" -msgstr "email" +msgstr "E-mail" msgid "shaarli" -msgstr "shaarli" +msgstr "Shaarli" msgid "flattr" -msgstr "flattr" +msgstr "Flattr" -#, fuzzy msgid "Does this article appear wrong?" -msgstr "cet article s'affiche mal ?" +msgstr "Cet article s'affiche mal ?" msgid "tags:" -msgstr "" +msgstr "tags :" msgid "Edit tags" -msgstr "" +msgstr "Editer les tags" msgid "save link!" -msgstr "" - -msgid "home" -msgstr "accueil" - -msgid "tags" -msgstr "" - -msgid "logout" -msgstr "déconnexion" +msgstr "sauver le lien !" msgid "powered by" msgstr "propulsé par" @@ -379,15 +329,26 @@ msgstr "propulsé par" msgid "debug mode is on so cache is off." msgstr "le mode de debug est actif, le cache est donc désactivé." -#, fuzzy msgid "your wallabag version:" -msgstr "votre version" +msgstr "votre version de wallabag :" msgid "storage:" msgstr "stockage :" +msgid "home" +msgstr "accueil" + +msgid "favorites" +msgstr "favoris" + +msgid "tags" +msgstr "tags" + msgid "save a link" -msgstr "" +msgstr "sauver un lien" + +msgid "logout" +msgstr "déconnexion" msgid "back to home" msgstr "retour à l'accueil" @@ -399,7 +360,7 @@ msgid "tweet" msgstr "tweet" msgid "email" -msgstr "email" +msgstr "ee-mail" msgid "this article appears wrong?" msgstr "cet article s'affiche mal ?" @@ -408,13 +369,13 @@ msgid "No link available here!" msgstr "Aucun lien n'est disponible ici !" msgid "Poching a link" -msgstr "Pocher un lien" +msgstr "Sauver un lien" msgid "by filling this field" msgstr "en remplissant ce champ" msgid "bookmarklet: drag & drop this link to your bookmarks bar" -msgstr "" +msgstr "bookmarklet : glissez-déposez ce lien dans votre barre de favoris" msgid "your version" msgstr "votre version" @@ -435,11 +396,10 @@ msgid "a more recent development version is available." msgstr "une version de développement plus récente est disponible." msgid "Please execute the import script locally, it can take a very long time." -msgstr "Merci d'exécuter l'import en local, cela peut prendre du temps." +msgstr "Merci d'exécuter l'import en local car cela peut prendre du temps." -#, fuzzy msgid "More infos in the official doc:" -msgstr "Plus d'infos sur la documentation officielle" +msgstr "Plus d'infos dans la documentation officielle :" msgid "import from Pocket" msgstr "import depuis Pocket" @@ -450,101 +410,101 @@ msgstr "import depuis Readability" msgid "import from Instapaper" msgstr "import depuis Instapaper" -msgid "Tags" -msgstr "" +msgid "estimated reading time :" +msgstr "temps de lecture estimé :" + +msgid "Mark all the entries as read" +msgstr "Marquer tous les articles comme lus" + +msgid "Tags" +msgstr "Tags" -#, fuzzy msgid "Untitled" -msgstr "par titre" +msgstr "Sans titre" msgid "the link has been added successfully" -msgstr "" +msgstr "le lien a été ajouté avec succès" msgid "error during insertion : the link wasn't added" -msgstr "" +msgstr "erreur pendant l'insertion : le lien n'a pas été ajouté" msgid "the link has been deleted successfully" -msgstr "" +msgstr "le lien a été effacé avec succès" msgid "the link wasn't deleted" -msgstr "" +msgstr "le lien n'a pas été effacé" msgid "Article not found!" -msgstr "" +msgstr "Article non trouvé !" msgid "previous" -msgstr "" +msgstr "précédent" msgid "next" -msgstr "" +msgstr "suivant" msgid "in demo mode, you can't update your password" -msgstr "" +msgstr "en mode démo, vous ne pouvez pas mettre à jour le mot de passe" msgid "your password has been updated" -msgstr "" +msgstr "votre mot de passe a été mis à jour" msgid "the two fields have to be filled & the password must be the same in the two fields" -msgstr "" +msgstr "les deux champs doivent être remplis & le mot de passe doit être le même dans les deux" msgid "still using the \"" -msgstr "" +msgstr "utilise encore \"" msgid "that theme does not seem to be installed" -msgstr "" +msgstr "ce thème ne semble pas installé" msgid "you have changed your theme preferences" -msgstr "" +msgstr "vous avez changez vos préférences de thème" msgid "that language does not seem to be installed" -msgstr "" +msgstr "cette langue ne semble pas être installée" msgid "you have changed your language preferences" -msgstr "" +msgstr "vous avez changé vos préférences de langue" msgid "login failed: you have to fill all fields" -msgstr "" +msgstr "identification échouée : vous devez remplir tous les champs" msgid "welcome to your wallabag" -msgstr "" +msgstr "bienvenue dans votre wallabag" msgid "login failed: bad login or password" -msgstr "" +msgstr "identification échouée : mauvais identifiant ou mot de passe" -#, fuzzy msgid "import from instapaper completed" -msgstr "import depuis Instapaper" +msgstr "Import depuis Instapaper complété" -#, fuzzy msgid "import from pocket completed" -msgstr "import depuis Pocket" +msgstr "Import depuis Pocket complété" -#, fuzzy msgid "import from Readability completed. " -msgstr "import depuis Readability" +msgstr "Import depuis Readability complété" -#, fuzzy msgid "import from Poche completed. " -msgstr "import depuis Pocket" +msgstr "Import depuis Pocket complété" msgid "Unknown import provider." -msgstr "" +msgstr "Fournisseur d'import inconnu." msgid "Incomplete inc/poche/define.inc.php file, please define \"" -msgstr "" +msgstr "Fichier inc/poche/define.inc.php incomplet, merci de définir \"" msgid "Could not find required \"" -msgstr "" +msgstr "Ne peut pas trouver \"" msgid "Uh, there is a problem while generating feeds." -msgstr "" +msgstr "Ih, il y a un problème lors de la génération des flux." -#, fuzzy msgid "Cache deleted." -msgstr "supprimer" +msgstr "Cache effacé." msgid "Oops, it seems you don't have PHP 5." -msgstr "" +msgstr "Oups, vous ne semblez pas avoir PHP 5." #~ msgid "poche it!" #~ msgstr "pochez-le !" From f5b5622a89fc24dcf9b65db5dd0d0306b3fba17f Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Tue, 25 Feb 2014 19:08:18 +0200 Subject: [PATCH 08/79] fix of #498, #493, #494 - because disappeared in last commit --- inc/3rdparty/makefulltextfeed.php | 1 + 1 file changed, 1 insertion(+) diff --git a/inc/3rdparty/makefulltextfeed.php b/inc/3rdparty/makefulltextfeed.php index b024547f7..135964f18 100755 --- a/inc/3rdparty/makefulltextfeed.php +++ b/inc/3rdparty/makefulltextfeed.php @@ -381,6 +381,7 @@ if (!$debug_mode) { ////////////////////////////////// // Set up HTTP agent ////////////////////////////////// +global $http; $http = new HumbleHttpAgent(); $http->debug = $debug_mode; $http->userAgentMap = $options->user_agents; From 2c83741171d85b045fae9211e1b0377ce075807d Mon Sep 17 00:00:00 2001 From: Skibbi Date: Tue, 25 Feb 2014 18:20:13 +0100 Subject: [PATCH 09/79] Update pl_PL.utf8.po First cleanup, more to come. --- locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po | 155 ++++++++++---------- 1 file changed, 74 insertions(+), 81 deletions(-) diff --git a/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po b/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po index c65e1c63c..1764bd612 100755 --- a/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po +++ b/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po @@ -24,7 +24,7 @@ msgid "login failed: user doesn't exist" msgstr "logowanie nie udało się: użytkownik nie istnieje" msgid "home" -msgstr "główna" +msgstr "strona domowa" msgid "favorites" msgstr "ulubione" @@ -42,10 +42,10 @@ msgid "logout" msgstr "wyloguj" msgid "back to home" -msgstr "wrócić do głównej" +msgstr "wróć do strony domowej" msgid "Tags" -msgstr "Tegi" +msgstr "Tagi" #, fuzzy msgid "Poching a link" @@ -55,20 +55,20 @@ msgid "You can poche a link by several methods:" msgstr "Istnieje kilka sposobów aby zapisać link:" msgid "read the documentation" -msgstr "zapoznać się z dokumentacją" +msgstr "przeczytaj dokumentację" msgid "download the extension" -msgstr "pobrać rozszerzenie" +msgstr "pobierz rozszerzenie" msgid "download the application" -msgstr "pobrać aplikację" +msgstr "pobierz aplikację" #, fuzzy msgid "by filling this field" msgstr "Poprzez wypełnienie tego pola" msgid "poche it!" -msgstr "zapisać!" +msgstr "zapisz!" #, fuzzy msgid "bookmarklet: drag & drop this link to your bookmarks bar" @@ -89,16 +89,16 @@ msgid "a more recent stable version is available." msgstr "Nowsza stabilna wersja jest dostępna." msgid "you are up to date." -msgstr "masz wszystko najnowsze." +msgstr "brak nowych aktualizacji." msgid "latest dev version" -msgstr "najnowsza wersja dev" +msgstr "najnowsza wersja rozwojowa" msgid "a more recent development version is available." msgstr "Nowsza wersja rozwojowa jest dostępna." msgid "Change your theme" -msgstr "Zmienic motyw" +msgstr "Zmień motyw" msgid "Theme:" msgstr "Motyw:" @@ -121,40 +121,35 @@ msgstr "Powtórz hasło jeszcze raz:" msgid "Import" msgstr "Import" -#, fuzzy msgid "Please execute the import script locally, it can take a very long time." -msgstr "Proszę wykonać skrypt import lokalnie, gdyż moze to trwać bardzo długo." +msgstr "Proszę wykonać skrypt importu lokalnie, ponieważ moze to trwać bardzo długo." -#, fuzzy msgid "More infos in the official doc:" -msgstr "Więcej informacji w oficjalnej dokumentacji:" +msgstr "Więcej informacji znajduje się w oficjalnej dokumentacji:" -#, fuzzy msgid "import from Pocket" -msgstr "Іmport z Pocket'a" +msgstr "Importuj z Pocket'a" #, php-format msgid "(you must have a %s file on your server)" msgstr "(musisz mieć plik %s na serwerze)" -#, fuzzy msgid "import from Readability" -msgstr "Import z Readability" +msgstr "Importuj z Readability" -#, fuzzy msgid "import from Instapaper" -msgstr "Import z Instapaper" +msgstr "Importuj z Instapaper" #, fuzzy msgid "Export your poche datas" -msgstr "Eksportowac dane poche" +msgstr "Exportuj dane poche" msgid "Click here" msgstr "Kliknij tu" #, fuzzy msgid "to export your poche datas." -msgstr "aby eksportować dane poche." +msgstr "aby wyeksportować dane poche." msgid "plop" msgstr "plop" @@ -163,10 +158,10 @@ msgid "installation" msgstr "instalacja" msgid "install your wallabag" -msgstr "zainstalować wallabag" +msgstr "zainstaluj wallabag" msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." -msgstr "wallabag nie jest jeszcze zainstalowany. Proszę wypełnić poniższy formularz, aby go zainstalowac. Nie wahaj się zapoznac się z dokumentacja na stronie wallabag." +msgstr "wallabag nie jest jeszcze zainstalowany. Proszę wypełnić poniższy formularz, aby go zainstalować. Nie wahaj się zapoznać się z dokumentacją na stronie wallabag." msgid "Login" msgstr "Login" @@ -175,7 +170,7 @@ msgid "Repeat your password" msgstr "Powtórz hasło" msgid "Install" -msgstr "Instalowac" +msgstr "Instaluj" msgid "favoris" msgstr "ulubione" @@ -190,7 +185,7 @@ msgid "by date" msgstr "wg daty" msgid "by date desc" -msgstr "według daty spadająco" +msgstr "według daty malejąco" msgid "by title asc" msgstr "według tytułu rosnąco" @@ -205,16 +200,16 @@ msgid "No link available here!" msgstr "Brak dostępnych linków!" msgid "toggle mark as read" -msgstr "przełączyć znak jako przeczytane" +msgstr "przełącz jako przeczytane" msgid "toggle favorite" -msgstr "przełączyc ulubione" +msgstr "przełącz ulubione" msgid "delete" -msgstr "usunąć" +msgstr "usuń" msgid "original" -msgstr "oryginal" +msgstr "oryginał" msgid "estimated reading time:" msgstr "szacowany czas odczytu:" @@ -223,23 +218,22 @@ msgid "results" msgstr "wyniki" msgid "login to your wallabag" -msgstr "zalogować się do swojego wallabag" +msgstr "zaloguj się do swojego wallabag" msgid "you are in demo mode, some features may be disabled." -msgstr "jesteś w trybie demo, niektóre funkcje mogą być niedostępne." +msgstr "jesteś w trybie demo, niektóre funkcje mogą być wyłączone." msgid "Stay signed in" msgstr "Pozostań zalogowany" msgid "(Do not check on public computers)" -msgstr "(Nie sprawdzaj na publicznych komputerach" +msgstr "(Nie sprawdzaj na publicznych komputerach)" msgid "Saving articles" msgstr "Zapisywanie artykułów" -#, fuzzy msgid "There are several ways to save an article:" -msgstr "Istnieje kilka sposobów aby zapisać link:" +msgstr "Istnieje kilka sposobów aby zapisać artykuł:" msgid "via F-Droid" msgstr "przez F-Droid" @@ -254,10 +248,10 @@ msgid "By filling this field" msgstr "Poprzez wypełnienie tego pola" msgid "bag it!" -msgstr "zapisać!" +msgstr "zapisz!" msgid "Bookmarklet: drag & drop this link to your bookmarks bar" -msgstr "Bookmarklet: przeciągnij i upucs ten link na pasek zakladek" +msgstr "Bookmarklet: przeciągnij i upuść ten link na pasek zakladek" msgid "Upgrading wallabag" msgstr "Aktualizacja wallabag" @@ -272,11 +266,10 @@ msgid "A more recent stable version is available." msgstr "Nowsza stabilna wersja jest dostępna." msgid "You are up to date." -msgstr "Masz wszystko najnowsze." +msgstr "Brak nowych aktualizacji." -#, fuzzy msgid "Latest dev version" -msgstr "najnowsza wersja dev" +msgstr "Najnowsza wersja rozwojowa" #, fuzzy msgid "A more recent development version is available." @@ -286,38 +279,38 @@ msgid "Feeds" msgstr "Kanały (feeds)" msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." -msgstr "Twój znak kanału jest pusty i musi najpierw zostac wygenerowany. Kliknij tu dla jego generacji." +msgstr "Twój token kanału jest pusty i musi najpierw zostać wygenerowany. Kliknij tu aby go wygenerować." msgid "Unread feed" -msgstr "Kanał nieprzeczytanego" +msgstr "Kanał nieprzeczytanych" msgid "Favorites feed" -msgstr "Kanał ulubionego" +msgstr "Kanał ulubionych" msgid "Archive feed" msgstr "Kanał archiwum" msgid "Your token:" -msgstr "Twój znak (token): " +msgstr "Twój token: " msgid "Your user id:" -msgstr "Twój id użytkownika (user id):" +msgstr "Twój identyfikator użytkownika:" msgid "You can regenerate your token: generate!." -msgstr "Mozna zgenerowac nowy znak: kliknij zgenerowac!." +msgstr "Możesz wygenerować token ponownie: kliknij generuj!." msgid "Change your language" -msgstr "Zmienić język" +msgstr "Zmień język" msgid "Language:" msgstr "Język:" msgid "Please execute the import script locally as it can take a very long time." -msgstr "Proszę wykonać skrypt import lokalnie, gdyż moze to trwać bardzo długo." +msgstr "Proszę wykonać skrypt importu lokalnie, gdyż moze to trwać bardzo długo." #, fuzzy msgid "More info in the official documentation:" -msgstr "Więcej informacji w oficjalnej dokumentacji:" +msgstr "Więcej informacji znajduje się w oficjalnej dokumentacji:" msgid "Import from Pocket" msgstr "Іmport z Pocket'a" @@ -351,7 +344,7 @@ msgstr "tweet" #, fuzzy msgid "email" -msgstr "Wyslij email" +msgstr "Wyślij email" msgid "shaarli" msgstr "shaarli" @@ -359,21 +352,21 @@ msgstr "shaarli" msgid "flattr" msgstr "flattr" -#, fuzzy msgid "this article appears wrong?" -msgstr "Czy ten artykuł wygląda nieprawidłowo?" +msgstr "Czy ten artykuł wyświetla się nieprawidłowo?" msgid "You can enter multiple tags, separated by commas." -msgstr "Mozna wprowadzić wiele tagów rozdzielajac je przecinkami." +msgstr "Możesz wprowadzić wiele tagów, rozdzielając je przecinkami." msgid "return to article" -msgstr "wrócić do artykułu" +msgstr "wróć do artykułu" +#, fuzzy msgid "powered by" msgstr "zasilany przez" msgid "debug mode is on so cache is off." -msgstr "tryb debugowania jest włączony, więc cash jest wyłączony." +msgstr "tryb debugowania jest włączony, więc cashe jest wyłączony." msgid "your wallabag version:" msgstr "twoja wersja wallabag:" @@ -382,16 +375,16 @@ msgid "storage:" msgstr "magazyn:" msgid "save a link" -msgstr "zapisać link" +msgstr "zapisz link" msgid "return home" -msgstr "wrócić do głównej" +msgstr "wróć do strony domowej" msgid "You can check your configuration here." -msgstr "Można sprawdzić swoją konfigurację tu." +msgstr "Możesz sprawdzić swoją konfigurację tu." msgid "Tag" -msgstr "Teg" +msgstr "Tag" msgid "No articles found." msgstr "Nie znaleziono artykułów." @@ -400,28 +393,28 @@ msgid "Toggle mark as read" msgstr "Przełącz jako przeczytane" msgid "mark all the entries as read" -msgstr "zaznaczyć wszystko jako przeczytane" +msgstr "zaznacz wszystko jako przeczytane" msgid "Login to wallabag" -msgstr "Zalogować się do wallabag" +msgstr "Zaloguj się do wallabag" msgid "Username" -msgstr "Imię użytkownika" +msgstr "Nazwa użytkownika" msgid "Sign in" msgstr "Login" msgid "Return home" -msgstr "Wrocic do głównej" +msgstr "Wróć do strony domowej" msgid "Back to top" -msgstr "Wrócić na górę" +msgstr "Wróć na górę" msgid "Mark as read" msgstr "Zaznacz jako przeczytane" msgid "Favorite" -msgstr "Ulubiony" +msgstr "Ulubione" msgid "Toggle favorite" msgstr "Zaznacz jako ulubione" @@ -433,16 +426,16 @@ msgid "Tweet" msgstr "Tweet" msgid "Email" -msgstr "Wyslij email" +msgstr "Wyślij email" msgid "Does this article appear wrong?" -msgstr "Czy ten artykuł wygląda nieprawidłowo?" +msgstr "Czy ten artykuł wyświetla się nieprawidłowo?" msgid "tags:" msgstr "tegi:" msgid "Edit tags" -msgstr "Redagowac tegi" +msgstr "Edytuj tagi" msgid "save link!" msgstr "zapisz link!" @@ -452,16 +445,16 @@ msgid "estimated reading time :" msgstr "szacowany czas odczytu:" msgid "Mark all the entries as read" -msgstr "zaznacz wszystko jako przeczytane" +msgstr "Oznacz wszystko jako przeczytane" msgid "Untitled" msgstr "Bez nazwy" msgid "the link has been added successfully" -msgstr "link pozostał pomyślnie dodany" +msgstr "link został pomyślnie dodany" msgid "error during insertion : the link wasn't added" -msgstr "błąd podczas wprowadzania: link nie zostal dodany" +msgstr "błąd podczas wprowadzania: link nie został dodany" msgid "the link has been deleted successfully" msgstr "link zostal pomyślnie usunięty" @@ -482,7 +475,7 @@ msgid "in demo mode, you can't update your password" msgstr "w trybie demo, nie można zmieniać hasła" msgid "your password has been updated" -msgstr "twoje hasło zmienione" +msgstr "twoje hasło zostało zmienione" msgid "the two fields have to be filled & the password must be the same in the two fields" msgstr "oba pola muszą być wypełnione i hasła muszę być takie same w obu polach" @@ -491,16 +484,16 @@ msgid "still using the \"" msgstr "nadal w użyciu \"" msgid "that theme does not seem to be installed" -msgstr "wydaje się że motyw nie był zainstalowany" +msgstr "wydaje się że ten motyw nie jest zainstalowany" msgid "you have changed your theme preferences" -msgstr "ustawienia motywu zostałe zmienione" +msgstr "ustawienia motywu zostały zmienione" msgid "that language does not seem to be installed" -msgstr "wydaje się że język nie był zainstalowany" +msgstr "wydaje się że ten język nie jest zainstalowany" msgid "you have changed your language preferences" -msgstr "ustawienia języka zostałe zmienione" +msgstr "ustawienia języka zostały zmienione" msgid "login failed: you have to fill all fields" msgstr "logowanie nie powiodlo się: musisz wypełnić wszystkie pola" @@ -509,10 +502,10 @@ msgid "welcome to your wallabag" msgstr "Witamy w wallabag" msgid "login failed: bad login or password" -msgstr "logowanie nie powiodlo się: zly login lub hasło" +msgstr "logowanie nie powiodlo się: niepoprawny login lub hasło" msgid "import from instapaper completed" -msgstr "import з instapaper'a zakończony" +msgstr "import z instapaper'a zakończony" msgid "import from pocket completed" msgstr "import z pocket'a zakończony" @@ -527,19 +520,19 @@ msgid "Unknown import provider." msgstr "Nieznany dostawca importu." msgid "Incomplete inc/poche/define.inc.php file, please define \"" -msgstr "Niekompletny plik inc/poche/define.inc.php, proszę definiować \"" +msgstr "Niekompletny plik inc/poche/define.inc.php, proszę zdefiniować \"" msgid "Could not find required \"" msgstr "Nie znaleziono potrzebnego \"" msgid "Uh, there is a problem while generating feeds." -msgstr "Uh, jest problem podczas generowania kanałów (feeds)." +msgstr "Uh, jest problem podczas generowania kanałów." msgid "Cache deleted." msgstr "Cache wyczyszczony." msgid "Oops, it seems you don't have PHP 5." -msgstr "Oops, wygląda ze u was niema PHP 5." +msgstr "Oops, wygląda ze nie masz PHP 5." #~ msgid "Import from poche" #~ msgstr "Import z poche" From cbcae4037c02cd6c1ce7c373c6dae390565b7c51 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Wed, 26 Feb 2014 15:43:49 +0200 Subject: [PATCH 10/79] translation related: how-to md file added, script to generate php from all twig templates, polish mo file compiled --- TRANSLATION.md | 67 ++++++++++++++++++++ inc/poche/Poche.class.php | 6 +- locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo | Bin 11248 -> 11935 bytes locale/tools/fillCache.php | 59 +++++++++++++++++ 4 files changed, 129 insertions(+), 3 deletions(-) create mode 100755 TRANSLATION.md create mode 100755 locale/tools/fillCache.php diff --git a/TRANSLATION.md b/TRANSLATION.md new file mode 100755 index 000000000..2ea9279e4 --- /dev/null +++ b/TRANSLATION.md @@ -0,0 +1,67 @@ +# How to manage translations of wallabag + +This guide will describe procedure of translation management of wallabag web application. + +All translation are made using [gettext](http://en.wikipedia.org/wiki/Gettext) system and tools. + +You will need [Poedit](http://www.poedit.net/download.php) editor to update, edit and create your translation files comfortably. In general, you can handle translations also without it: all can be done using gettext tools and your favorite plain text editor only. This guide, however, describes editing with Poedit. If you want to use gettext only, pls refer to xgettext manual page to update po files from sources (see also how it is used by Poedit below) and use msgunfmt tool to compile .mo files manually. + +You need to know, that translation phrases are stored in **".po"** files (for example: `locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po`), which are then complied in **".mo"** files using **msgfmt** gettext tool or by Poedit, which will run msgfmt for you in background. + +**It's assumed, that you have wallabag installed locally on your computer or on the server you have access to.** + +## To change existing translation you will need to do: + +### 1. Clear cache +You can do this using **http://your-wallabag-host.com/?empty-cache** link (replace http://your-wallabag-host.com/ with real url of your wallabag application) + +OR + +from command line: +go to root of your installation of wallabag project and run next command: + +`rm -rf ./cache/*` + +(this may require root privileges if you run, for example Apatche web server with mod_php) + +### 2. Generate php files from all twig templates +Do this using next command: + +`php ./locale/tools/fillCache.php` + +OR + +from your browser: **http://your-wallabag-host.com/locale/tools/fillCache.php** (this may require removal of .htacces file in locale/ directory). + +### 3. Configure your Poedit +Open Poedit editor, open Edit->Preferences. Go to "Parsers" tab, click on PHP and press "Edit" button. Make sure your "Parser command:" looks like + +`xgettext --no-location --force-po -o %o %C %K %F` + +Usualy it is required to add "--no-location" to default value. + +### 4. Open .po file you want to edit in Poedit and change it's settings +Open, for example `locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po` file in your Poedit. + +Go to "Catalog"->"Settings..." menu. Go to "Path" tab and add path to wallabag installaion in your local file system. This step can't be ommited as you will not be able to update phrases otherwise. + +You can also check "project into" tab to be sure, that "Language" is set correctly (this will allow you to spell check your translation). + +### 5. Update opened .po file from sources +Once you have set your path correctly, you are able to update phrases from sources. Press "Update catalog - synchronize it with sources" button or go to "Catalog"->"Update from sources" menu. + +As a result you will see confirmation popup with two tabs: "New strings" and "Obsolete strings". Pls review and accept changes (or press "Undo" if you see too many obsolete strings, as Poedit will remove them all - in this case please make sure all previous steps are performed w/o errors). + +### 6. Translate and save your .po file +If you have any dificulties on this step, please consult with Poedit manual. +Every time you save your .po file, Poedit will also comple appropriate .mo file by default (of course, if not disabled in preferences). + +So, you are almost done. + +### 7. Clear cache again +This step may be required if your web server runs php scripts in name of, say, www user (i.e. Apache with mod_php, not cgi). + + +##To create new tanslation +Please simple create appropriate directories in locale folder and perform all steps, described above. Instead of opening an existing file just create new one. + diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 8a9de488d..deec42267 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -34,7 +34,7 @@ class Poche 'pl_PL.utf8' => 'Polski', 'ru_RU.utf8' => 'Pусский', 'sl_SI.utf8' => 'Slovenščina', - 'uk_UA.utf8' => 'Український', + 'uk_UA.utf8' => 'Українська', ); public function __construct() { @@ -336,7 +336,7 @@ class Poche while (($language = readdir($handle)) !== false) { # Languages are stored in a directory, so all directory names are languages # @todo move language installation data to database - if (! is_dir(LOCALE . '/' . $language) || in_array($language, array('..', '.'))) { + if (! is_dir(LOCALE . '/' . $language) || in_array($language, array('..', '.', 'tools'))) { continue; } @@ -346,7 +346,7 @@ class Poche $current = true; } - $languages[] = array('name' => $this->language_names[$language], 'value' => $language, 'current' => $current); + $languages[] = array('name' => (isset($this->language_names[$language]) ? $this->language_names[$language] : $language), 'value' => $language, 'current' => $current); } return $languages; diff --git a/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo b/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo index 22985970c8722aa3d171c3c79dc2180e2595b92a..b363385ac3f3e30a95b3fa573cbc8258a817f186 100755 GIT binary patch delta 4805 zcmaKudvH|c8Hc|F5D2$OxG0e16YOwOXe`y+o~wtyD;DJ6L;>v9;8@qvKeorPDft{?X^RyJ=-?`_2B&^PY3Q z%lp3H`<>*k8}7e6`_{zayAADLGy@GEVa)I0r=z*h7LDT>Y=_lwDQtu`oC$ZrvG5r< z5xxw^z$0)Gd>2lJ)5aUa)TR~kGYhy(GA3(Qa;w;Z%4ntYv+(8$+JI09V6<@N77a zSryquP!4)fsoe%y)7%c_=mSs@{{RkyKZe?}{ZNq~fZD28pvE18Ww01;vWj2|#%wqP zo&wiEEfj!qEDAMI8fu~IAV1U3MeiSkn(&8kJ$wna!AU%9ge&0%(1W|+&!FaCKZ*P+ zHJyYv2S%VGx(_Oaj}-0)3fvDh@L=KnYfugxE!=+yHQzBPhqX^tU?kLi6I6h$P_?jn zGWl2JojlN<^g}uDDAb-m4mI$3sFWUn8aN2c;ZaDi<~Y>&alEX7by(!x*H_v*tF8X*{?eDy1(#Rp}ofbz(k-TIfrt3>4E@j*f=vHyJ(- z>mX~HBXBiE0?6~Vhusrw9Sq9RIL_fw%Fnh7_;v*79QKB&|17Q6zM z)ERRVbfLEH7*qySNGitaEQV5l4pgKULZv=jU;=94YoLmB7gVi02G##*C`Vo`JpTyF zkz-Ji&Se!jya*~|YoJa?Cse@M-57FUUxClUlem8g%Hy9yIq*8v)_ek0R3jVn4o!z- z-^_)I>>{XRoPs(%yP^6YfO7nGsG52kw(I;K$C$^1`FyUv0ehhZAAuv`D^L@^21moc z75D`l&ix2hQNI#63r>VuXc<(7)<6XmDBOpj9NGrQu)etqLwo%&)I?80rR;e)3Lb`9 z=m=Cw--K=O9jN0ukqzf)o8{1gT~HC;09D-gLG}9-Y75I-@{Y}im8@^pV#uRDs4Bf4 zYN30f{@gwUwG~f6o!bNOH}H3b`-cd78TZdX)xtj^b!JNW%SIiV1+Wrsf@9&;P>$RL zvqczcs$w-2Pbg;@a|=A9U~ez52i{w-RS#7c1yjI@F0=!WK_-AKt-I~#T7 ztb9oi!@eG!iB_l-_hKwZDMSu)A6+FZgH#bzT&{hOt9E=D>P9!A)kv)aX%kg)tB{An zs1&KWD2sKVb?9<*7gCGok-KspvSttF zT69U_#SQR0v=BuL&-4M>g4Up$Q2?z(cOW%=m^P!)=ys&GDUTDb-{Q_jccW|3)w$ik zP^(5eP)s+pKJ?9;mA_;Q_AaR7I@E#~OHe0TjPy-Xn~m;4jRS*YA1WRbaJE=moLJoT zB7WzDjg@P?m}9w-9xu+-O7uFG*VE&6yLQ+Lc-6C%P zlb$OY=$~?D(X?JSUKqphXw;(96j&n<( z3U{rSNT)jdd#W2ov2E#4a&W8vxz+1$u4)^mi1${VG5=gUld`Sk;EU-*$V)}skZsP4 z*&!?9rRZYWp+wRSyBRq-n+XSBbnx$qlbika>X|LMJ1Z59k+49<#T|Ac>?qj>2U0Co z%**iD3ERO#+x=Urm(45;NN;u`js`Iz;f0)t;?n9)hZPFDp@TwK#}w%wJsHnSC9ne%J?JFLQJH$cMEJw%!CVkboHAFWw9 z{pO#d-?TY$(|I?b$ex$ylgxp3w9gK*7Tm4SGEpKS@ zw^vU00}UsSAKYr9VJ|uq>$Zm0RqCB_0uk3XGP*PAgndHM5?Lxu!MG+B`){R4>h!`d zZJdltjg9Nd5^Qw-Fzb}&Qt02@SXr;INW!IHe?LI+W@3k51KEi+0-4>FxX5J(OPTJ9*CM zJ-7FL-pg4yu=$Vc3TG}J^01*iLQE!(4>9H!xP2rC%1^yU53j&&I1Zn{q4+Xhh{x~}V+!VtQpLQ3W4ZAU9ED?fsv0NbFuWXVaSiN@Hg}+B7s!_DUFr0{UQSD!c1!c04iW-QZI*6k( z&!O($hidR)T!W9}Ec`o$a3&A0#trxoeizljVqVfrti&0(9yO4=Q8Tr#iuu=t{lSgL zP%l0eJn%d!fn&k>&ruDYMkV|X*5TRUyo%}52q&S|`ctTpuS6|D4%Od-s3q;Yg!xxP zhq$1rd;%}SXK)I>iVmJdt?|WdfM%S5+6$XFXe4Q5(58TT?;&*XFoy9>R6=DO)Zau@ zd$k2B>Ube)q)UVIm8cA_M>Vhk^;PUZJ@)|eXTHKgBYGM&bBB>tF+UE@Pom!YHR`!{ zgZm$%+9?cWUX;LvsLfJ^)3F*uxC|T6$Ej$MKl1{Ic6=S#XQq*PpM;mAW^grXGbWMM zF$Gln7BvHXNWukkkcu9B5}&~%$e&5@NzB1rs0Lm@{otIyCj1C%u#R4}1Xm)1GOKi6 zZcG$4ux-q>=>2ceq=wI z@1dR_#HIKqDuL?S(&lVHt@(V^0IxzNv&j$}2L%sML)E@XN zDxo^Zm}@bF8fgzI;fGL(K8o5Shfy7#KqY(<^~3cxYH8kcn140+0T=i}%txrqD#=PO zPRBN!g)FCup&H(aBk}8~gujiNnSN9|$Aa_IsDZtY>v04dU;( zo{v|Veg_?V3ANeIpq6MD)1VG2Q3*7nrg%nhy$zM%D%4VVs031|ncNdxKZJ`pf4V?L z4ZnvP!JknHjBMoB3u{mfwxgbl2WC(+w>>!Dfm(|DP`mu`z~jiiGw-9mo-tEPU&$4y z1Pj+wQHL9G7A8?0e-jts8_3{I71N-Rwjnv1C8!yQq7w6Q2xf!p+p&f7yHLCSho}yZ zBKy>wz+w9S-=m@_{ZrtmQ0cRBP;1+Y!*Ky>hOWjDcq6LAn{X&bQ60vy8NZ4S4hH@f zwTFg>Sstv%@%sK#RJ2CBkqvGRq7r%;HS$xa4n9VWMDwWcz7qBMU52mXjNtrlxK#Jq zVQP0ZGW#Zunz?JCY*tq0hMu|9R+cz$5FQ*T!InQk|sx9tN?*uL&uI=*x( z6C3DrqDd#~CKB!zx5J(YPqFoN)iztVc61MyGfJe(wI}OZYRUKV@Fr zF4^{`d1VQEf784X!4kOk?WP(#J2b8Qwdd^SQ0LI%>e`=$rdC9~TkS`on(}U=&IO`AC>?`C2N*Uverbl%I;uZ;RJ*VxXMnuR8tW9ech zn?BnAza#tit8ThG*V!}J+jGACZ%k`%XE6C(r?wW~3Y$0Y#?I|fKS%3PH|{yby*YTq zbGo#r{@=rinBVE7l6Lv@Z`sS5H`e4L|N0b+vL5Um*cHh$*wPx`+x!G;+}5&ST%^=N zo@MFm>GJ$;=Ge7+T5fJ6t!OgSJisDir() and $tplDir!='.' and $tplDir!='..') { + echo "\n$tplDir\n"; + + $loader = new Twig_Loader_Filesystem($tplDirRoot.$tplDir); + + // force auto-reload to always have the latest version of the template + $twig = new Twig_Environment($loader, array( + 'cache' => $tmpDir, + 'auto_reload' => true + )); + + $twig->addExtension(new Twig_Extensions_Extension_I18n()); + + $filter = new Twig_SimpleFilter('getDomain', 'Tools::getDomain'); + $twig->addFilter($filter); + + $filter = new Twig_SimpleFilter('getReadingTime', 'Tools::getReadingTime'); + $twig->addFilter($filter); + + $filter = new Twig_SimpleFilter('getPrettyFilename', function($string) { return str_replace($siteRoot, '', $string); }); + $twig->addFilter($filter); + +// // iterate over all your templates + foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($tplDirRoot.$tplDir), RecursiveIteratorIterator::LEAVES_ONLY) as $file) { + // force compilation + if ($file->isFile() and pathinfo($file, PATHINFO_EXTENSION)=='twig') { + echo "\t$file\n"; + $twig->loadTemplate(str_replace($tplDirRoot.$tplDir.'/', '', $file)); + } + } + + } + + } + From fa37042b32a706709d3862f0aaf257ab315cfec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 27 Feb 2014 13:21:54 +0100 Subject: [PATCH 11/79] [fix] Baggy theme navigation bug #485 --- themes/baggy/css/main.css | 1 + 1 file changed, 1 insertion(+) diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 3e128b08d..6316fcc09 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -442,6 +442,7 @@ footer a { .pagination { text-align: right; + margin-bottom:50px; } .nb-results { From 56532c4e7231bf7f26779754c18eb2bb5e1739bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 27 Feb 2014 13:24:29 +0100 Subject: [PATCH 12/79] [add] Empty cache after changing theme #503 --- inc/poche/Poche.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index deec42267..a9e226c4b 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -750,6 +750,8 @@ class Poche $currentConfig['theme'] = $_POST['theme']; $_SESSION['poche_user']->setConfig($currentConfig); + + $this->emptyCache(); Tools::redirect('?view=config'); } From e145f767f38c3531196dad5453f298fbea243daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 27 Feb 2014 13:26:07 +0100 Subject: [PATCH 13/79] [add] empty cache after changing language #492 --- inc/poche/Poche.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index a9e226c4b..87c00b78c 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -790,6 +790,8 @@ class Poche $currentConfig['language'] = $_POST['language']; $_SESSION['poche_user']->setConfig($currentConfig); + + $this->emptyCache(); Tools::redirect('?view=config'); } From a8464c97197c1ea9c4b3c35d7cec6a5398b7a522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 27 Feb 2014 13:36:06 +0100 Subject: [PATCH 14/79] [fix] hover problem with logout link #489 --- themes/baggy/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 6316fcc09..9a65dbeec 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -227,7 +227,7 @@ h2:after { #links li:last-child { position: fixed; bottom: 1em; - width: 10%; + width: 9em; } #links li:last-child a:before { From 36a733af8dee1de5a0f81f1efe70e96a435b6a17 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Thu, 27 Feb 2014 16:11:37 +0200 Subject: [PATCH 15/79] some baggy theme fixes and enhancement: issue #479 --- themes/baggy/_display-mode.twig | 5 ++ themes/baggy/_head.twig | 1 + themes/baggy/css/main.css | 69 +++++++++++++++++- themes/baggy/home.twig | 4 ++ themes/baggy/img/baggy/blank.png | Bin 0 -> 141 bytes themes/baggy/img/baggy/down.png | Bin 0 -> 216 bytes themes/baggy/img/baggy/list.png | Bin 0 -> 201 bytes themes/baggy/img/baggy/table.png | Bin 0 -> 229 bytes themes/baggy/img/baggy/top.png | Bin 0 -> 212 bytes themes/baggy/js/init.js | 44 +++++++++--- themes/baggy/js/jquery.cookie.js | 117 +++++++++++++++++++++++++++++++ themes/default/_sorting.twig | 6 ++ themes/default/home.twig | 7 +- 13 files changed, 234 insertions(+), 19 deletions(-) create mode 100755 themes/baggy/_display-mode.twig mode change 100644 => 100755 themes/baggy/_head.twig mode change 100644 => 100755 themes/baggy/home.twig create mode 100755 themes/baggy/img/baggy/blank.png create mode 100644 themes/baggy/img/baggy/down.png create mode 100755 themes/baggy/img/baggy/list.png create mode 100755 themes/baggy/img/baggy/table.png create mode 100644 themes/baggy/img/baggy/top.png create mode 100755 themes/baggy/js/jquery.cookie.js create mode 100755 themes/default/_sorting.twig mode change 100644 => 100755 themes/default/home.twig diff --git a/themes/baggy/_display-mode.twig b/themes/baggy/_display-mode.twig new file mode 100755 index 000000000..31f76581e --- /dev/null +++ b/themes/baggy/_display-mode.twig @@ -0,0 +1,5 @@ + diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig old mode 100644 new mode 100755 index 206d5aae6..1ea59abf3 --- a/themes/baggy/_head.twig +++ b/themes/baggy/_head.twig @@ -8,5 +8,6 @@ + diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 3e128b08d..0a8d2c7b0 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -177,7 +177,7 @@ h2:after { left: 0; text-align: right; background: #333; - padding-top: 9em; + padding-top: 9.5em; height: 100%; box-shadow:inset -4px 0 20px rgba(0,0,0,0.6); z-index: 10; @@ -188,6 +188,7 @@ h2:after { position: relative; z-index: 10; padding-right: 5%; + padding-bottom: 1em; } #links a { @@ -227,7 +228,7 @@ h2:after { #links li:last-child { position: fixed; bottom: 1em; - width: 10%; + width: 9em; } #links li:last-child a:before { @@ -237,6 +238,61 @@ h2:after { } +#sort { + padding: 0; + list-style-type: none; + opacity: 0.5; + display: inline-block; +} + +#sort li { + display: inline; + font-size: 0.9em; +} + +#sort li + li { + margin-left: 10px; +} + +#sort a { + padding: 2px 2px 0; + vertical-align: middle; +} + +#sort img { + vertical-align: baseline; +} +#sort img:hover { + cursor: pointer; +} + +#display-mode { + float: right; + vertical-align: middle; + margin-top: 10px; + margin-bottom: 10px; + opacity: 0.5; +} +#listmode { + width: 16px; + display: inline-block; + text-decoration: none; +} +#listmode a:hover { + opacity: 1; +} +.tablemode { + background-image: url("../img/baggy/table.png"); + background-repeat: no-repeat; + background-position: bottom; +} +.listmode { + background-image: url("../img/baggy/list.png"); + background-repeat: no-repeat; + background-position: bottom; +} + + /* ========================================================================== 2 = Layout ========================================================================== */ @@ -248,7 +304,7 @@ h2:after { footer { text-align: right; - position: fixed; + position: relative; bottom: 0; right: 5em; color: #999; @@ -731,6 +787,9 @@ blockquote { width: 100%; margin-left: 0; } + #display-mode { + display: none; + } } @media screen and (max-width: 500px) { @@ -820,4 +879,8 @@ blockquote { #article_toolbar a { padding: 0.3em 0.4em 0.2em; } + + #display-mode { + display: none; + } } diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig old mode 100644 new mode 100755 index 4f9db0638..5262c05bb --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -18,6 +18,10 @@ {% if entries is empty %}

{% trans "No articles found." %}

{% else %} +
+ {% include '_display-mode.twig' %} + {% include '_sorting.twig' %} +
{% block pager %} {% if nb_results > 1 %}
diff --git a/themes/baggy/img/baggy/blank.png b/themes/baggy/img/baggy/blank.png new file mode 100755 index 0000000000000000000000000000000000000000..63e09844e139f9e1530537cf771608d1498c25bd GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmUzPnffIy#(?lOI#yL zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+JN+Wx;TbZ+)DcM|Gz!6YC~tElR?&j j6^x77c*K|)n0OeHXEDo0Cp|s}RLbD#>gTe~DWM4f(PJm; literal 0 HcmV?d00001 diff --git a/themes/baggy/img/baggy/down.png b/themes/baggy/img/baggy/down.png new file mode 100644 index 0000000000000000000000000000000000000000..b9d536a7cabbd3e404dc187a2e2844562e07fbb0 GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`^F3W0LoEE?PEO==FyLvmWb|ti ze(+=mqxwU(J?goe&RPl9>t?28-`_sH?9-dar{uqIe_~&>_0>EEk>Z)9_6iqeGViTc z^Aiy5VB9F(AoP6klgQ`2?G1bfZ)zVYUGRwQr{u+U1~Gvk>j}PdLW+!!uI|vE{?M93 zQKaDFRbLtA4`*6C{{5;j&puSusi>m0O-3U|@y_N%E6M9q|4yz5?L5mlagv(gyMmSN QK&LWzy85}Sb4q9e0C^WwoB#j- literal 0 HcmV?d00001 diff --git a/themes/baggy/img/baggy/list.png b/themes/baggy/img/baggy/list.png new file mode 100755 index 0000000000000000000000000000000000000000..bd5aff5ae99ccc7aa59d0e166ba16817d7378d3d GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmUzPnffIy#(?lOI#yL zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i$*k|AR$Xcyt_c_>U|K_!q5E$Cc{MywQO1o`KqoMGy85}Sb4q9e0N>_HPXGV_ literal 0 HcmV?d00001 diff --git a/themes/baggy/img/baggy/top.png b/themes/baggy/img/baggy/top.png new file mode 100644 index 0000000000000000000000000000000000000000..954a8c0acbb221eb20d04d6184d3317c9604adf6 GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`vproLLoEE?PJYPi;K0-R-Yh}L z?7)+r11dQV@t4$c*ZUobpMJvm{%@_)>6edB)&AL*Wqe)zlJci}j4F4EGgNsM1rM|@ zE#&yfAbU^aW?|Gj?hdveA3Pq;Wz>Cn$btDHg9O{I3%rRuZ&Mg*G86 1 %} +
    +
  • {% trans {% trans "by date" %} {% trans
    • +
  • {% trans {% trans "by title" %} {% trans
    • +
+{% endif %} diff --git a/themes/default/home.twig b/themes/default/home.twig old mode 100644 new mode 100755 index 165fecc63..bd5fc2d6e --- a/themes/default/home.twig +++ b/themes/default/home.twig @@ -12,12 +12,7 @@ {% include '_menu.twig' %} {% endblock %} {% block precontent %} - {% if entries|length > 1 %} -
    -
  • {% trans {% trans "by date" %} {% trans
    • -
  • {% trans {% trans "by title" %} {% trans
    • -
- {% endif %} + {% include '_sorting.twig' %} {% endblock %} {% block content %} {% if tag %} From decb9a5814be82effde73f798fbdc0c76c3dd1de Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Thu, 27 Feb 2014 18:12:43 +0200 Subject: [PATCH 16/79] fix of #509, related to php 5.3 --- inc/poche/Poche.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index deec42267..e13e7e1b4 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -366,7 +366,7 @@ class Poche // Saving and clearing context $REAL = array(); foreach( $GLOBALS as $key => $value ) { - if( $key != "GLOBALS" && $key != "_SESSION" ) { + if( $key != 'GLOBALS' && $key != '_SESSION' && $key != 'HTTP_SESSION_VARS' ) { $GLOBALS[$key] = array(); $REAL[$key] = $value; } From 35c7e0a69cfed916cbc946fb48b17219622fb20a Mon Sep 17 00:00:00 2001 From: Camporez Date: Thu, 27 Feb 2014 16:18:53 -0300 Subject: [PATCH 17/79] Create pt_BR.utf8.mo --- locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo | 549 ++++++++++++++++++++ 1 file changed, 549 insertions(+) create mode 100644 locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo diff --git a/locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo b/locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo new file mode 100644 index 000000000..2b95c30fb --- /dev/null +++ b/locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo @@ -0,0 +1,549 @@ +msgid "" +msgstr "" +"Project-Id-Version: Wallabag\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-02-25 15:17+0300\n" +"PO-Revision-Date: \n" +"Last-Translator: Maryana \n" +"Language-Team: @iancamporez \n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\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 "wallabag, um \"read it later\" de código aberto" + +msgid "login failed: user doesn't exist" +msgstr "falha ao entrar: o usuário não existe" + +msgid "return home" +msgstr "retornar à página inicial" + +msgid "config" +msgstr "configurações" + +msgid "Saving articles" +msgstr "Salvando artigos" + +msgid "There are several ways to save an article:" +msgstr "Existem várias maneiras de salvar um artigo:" + +msgid "read the documentation" +msgstr "ler a documentação" + +msgid "download the extension" +msgstr "baixar a extensão" + +msgid "via F-Droid" +msgstr "via F-Droid" + +msgid " or " +msgstr "ou " + +msgid "via Google Play" +msgstr "via Google Play" + +msgid "download the application" +msgstr "baixar o aplicativo" + +msgid "By filling this field" +msgstr "Preenchendo esse campo" + +msgid "bag it!" +msgstr "adicionar ao wallabag" + +msgid "Bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "Bookmarklet: arraste esse link para sua barra de favoritos" + +msgid "Upgrading wallabag" +msgstr "Atualizando o wallabag" + +msgid "Installed version" +msgstr "Versão instalada" + +msgid "Latest stable version" +msgstr "Última versão estável" + +msgid "A more recent stable version is available." +msgstr "Uma versão estável mais nova está disponível" + +msgid "You are up to date." +msgstr "Você está atualizado." + +msgid "Latest dev version" +msgstr "Última versão em desenvolvimento" + +msgid "A more recent development version is available." +msgstr "Uma versão em desenvolvimento mais recente está disponível" + +msgid "Feeds" +msgstr "Feeds" + +msgid "" +"Your feed token is currently empty and must first be generated to enable " +"feeds. Click here to generate it." +msgstr "" +"Seu token do feed e precisa ser gerado para ativar os feeds. Clique aqui para gerar um token." + +msgid "Unread feed" +msgstr "Feed de artigos não lidos" + +msgid "Favorites feed" +msgstr "Feed dos favoritos" + +msgid "Archive feed" +msgstr "Feed de arquivados" + +msgid "Your token:" +msgstr "Seu token:" + +msgid "Your user id:" +msgstr "Seu código de usuário:" + +msgid "" +"You can regenerate your token: generate!" +"." +msgstr "" +"Você pode regerar seu token: gerar!." + +msgid "Change your theme" +msgstr "Mudar seu tema" + +msgid "Theme:" +msgstr "Tema:" + +msgid "Update" +msgstr "Atualizar" + +msgid "Change your language" +msgstr "Alterar seu idioma" + +msgid "Language:" +msgstr "Idioma:" + +msgid "Change your password" +msgstr "Alterar sua senha" + +msgid "New password:" +msgstr "Nova senha:" + +msgid "Password" +msgstr "Senha" + +msgid "Repeat your new password:" +msgstr "Repetir sua nova senha:" + +msgid "Import" +msgstr "Importar" + +msgid "" +"Please execute the import script locally as it can take a very long time." +msgstr "" +"Por favor, execute o script de importação localmente, pois pode demorar " +"muito tempo." + +msgid "More info in the official documentation:" +msgstr "Mais informações na documentação oficial:" + +msgid "Import from Pocket" +msgstr "Importar do Pocket" + +#, php-format +msgid "(you must have a %s file on your server)" +msgstr "(você deve ter um arquivo %s no seu servidor)" + +msgid "Import from Readability" +msgstr "Importar do Readability" + +msgid "Import from Instapaper" +msgstr "Importar do Instapaper" + +msgid "Import from wallabag" +msgstr "Importar do wallabag" + +msgid "Export your wallabag data" +msgstr "Exportar seus dados do wallabag" + +msgid "Click here" +msgstr "Clique aqui" + +msgid "to download your database." +msgstr "para baixar seu banco de dados." + +msgid "to export your wallabag data." +msgstr "para exportar seus dados do wallabag." + +msgid "Cache" +msgstr "Cache" + +msgid "to delete cache." +msgstr "para apagar o cache." + +msgid "You can enter multiple tags, separated by commas." +msgstr "Você pode inserir várias tags, separadas por vírgulas." + +msgid "return to article" +msgstr "retornar ao artigo" + +msgid "plop" +msgstr "plop" + +msgid "" +"You can check your configuration " +"here." +msgstr "" +"Você pode checar suas " +"configurações aqui." + +msgid "favoris" +msgstr "favoritos" + +msgid "archive" +msgstr "arquivo" + +msgid "unread" +msgstr "não lidos" + +msgid "by date asc" +msgstr "por data (cresc.)" + +msgid "by date" +msgstr "por data" + +msgid "by date desc" +msgstr "por data (decr.)" + +msgid "by title asc" +msgstr "por título (cresc.)" + +msgid "by title" +msgstr "por título" + +msgid "by title desc" +msgstr "por título (decr.)" + +msgid "Tag" +msgstr "Tag" + +msgid "No articles found." +msgstr "Nenhum artigo encontrado." + +msgid "Toggle mark as read" +msgstr "Alterar \"marcar como lido\"" + +msgid "toggle favorite" +msgstr "alterar \"favorito\"" + +msgid "delete" +msgstr "deletar" + +msgid "original" +msgstr "original" + +msgid "estimated reading time:" +msgstr "tempo estimado de leitura:" + +msgid "mark all the entries as read" +msgstr "marcar todas as entradas como lidas" + +msgid "results" +msgstr "resultados" + +msgid "installation" +msgstr "instalação" + +msgid "install your wallabag" +msgstr "instalar seu wallabag" + +msgid "" +"wallabag is still not installed. Please fill the below form to install it. " +"Don't hesitate to read the documentation " +"on wallabag website." +msgstr "" +"O wallabag ainda não está instalado. Preencha o formulário abaixo para " +"instalá-lo. Não hesite em ler a " +"documentação no site do wallabag." + +msgid "Login" +msgstr "Login" + +msgid "Repeat your password" +msgstr "Repetir sua senha" + +msgid "Install" +msgstr "Instalar" + +msgid "login to your wallabag" +msgstr "entrar no seu wallabag" + +msgid "Login to wallabag" +msgstr "Entrar no wallabag" + +msgid "you are in demo mode, some features may be disabled." +msgstr "você está no modo demo, alguns recursos podem estar desativados." + +msgid "Username" +msgstr "Nome de usuário" + +msgid "Stay signed in" +msgstr "Continuar conectado" + +msgid "(Do not check on public computers)" +msgstr "(Não marque em computadores públicos)" + +msgid "Sign in" +msgstr "Entrar" + +msgid "favorites" +msgstr "favoritos" + +msgid "estimated reading time :" +msgstr "tempo estimado de leitura :" + +msgid "Mark all the entries as read" +msgstr "Marcar todas as entradas como lidas" + +msgid "Return home" +msgstr "Retornar à página inicial" + +msgid "Back to top" +msgstr "Voltar ao topo" + +msgid "Mark as read" +msgstr "Marcar como lido" + +msgid "Favorite" +msgstr "Favoritar" + +msgid "Toggle favorite" +msgstr "Alterar \"favorito\"" + +msgid "Delete" +msgstr "Deletar" + +msgid "Tweet" +msgstr "Tweetar" + +msgid "Email" +msgstr "Email" + +msgid "shaarli" +msgstr "shaarli" + +msgid "flattr" +msgstr "flattr" + +msgid "Does this article appear wrong?" +msgstr "Esse artigo está sendo exibido incorretamente?" + +msgid "tags:" +msgstr "tags:" + +msgid "Edit tags" +msgstr "Editar tags" + +msgid "save link!" +msgstr "salvar link!" + +msgid "home" +msgstr "página inicial" + +msgid "tags" +msgstr "tags" + +msgid "logout" +msgstr "sair" + +msgid "powered by" +msgstr "powered by" + +msgid "debug mode is on so cache is off." +msgstr "o modo debug está ativo, então o cache foi desativado." + +msgid "your wallabag version:" +msgstr "sua versão do wallabag:" + +msgid "storage:" +msgstr "armazenamento:" + +msgid "save a link" +msgstr "salvar um link" + +msgid "back to home" +msgstr "voltar à página inicial" + +msgid "toggle mark as read" +msgstr "alterar \"marcar como lido\"" + +msgid "tweet" +msgstr "tweetar" + +msgid "email" +msgstr "email" + +msgid "this article appears wrong?" +msgstr "esse artigo está sendo mostrado incorretamente?" + +msgid "No link available here!" +msgstr "Nenhum link disponível aqui!" + +msgid "Poching a link" +msgstr "Pocheando um link" + +msgid "by filling this field" +msgstr "preenchendo esse campo" + +msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "bookmarklet: arraste esse link para a sua barra de favoritos" + +msgid "your version" +msgstr "sua versão" + +msgid "latest stable version" +msgstr "última versão estável" + +msgid "a more recent stable version is available." +msgstr "uma versão estável mais nova está disponível" + +msgid "you are up to date." +msgstr "você está atualizado." + +msgid "latest dev version" +msgstr "última versão em desenvolvimento" + +msgid "a more recent development version is available." +msgstr "uma versão em desenvolvimento mais nova está disponível" + +msgid "Please execute the import script locally, it can take a very long time." +msgstr "" +"Por favor, execute o script de importação localmente, pois pode demorar " +"muito tempo." + +msgid "More infos in the official doc:" +msgstr "Mais informações na documentação oficial:" + +msgid "import from Pocket" +msgstr "importar do Pocket" + +msgid "import from Readability" +msgstr "importar do Readability" + +msgid "import from Instapaper" +msgstr "importar do Instapaper" + +msgid "Tags" +msgstr "Tags" + +msgid "Untitled" +msgstr "Sem título" + +msgid "the link has been added successfully" +msgstr "o link foi adicionado com sucesso" + +msgid "error during insertion : the link wasn't added" +msgstr "erro durante a inserção: o link não foi adicionado" + +msgid "the link has been deleted successfully" +msgstr "o link foi deletado com sucesso" + +msgid "the link wasn't deleted" +msgstr "o link não foi deletado" + +msgid "Article not found!" +msgstr "Artigo não encontrado!" + +msgid "previous" +msgstr "anterior" + +msgid "next" +msgstr "próximo" + +msgid "in demo mode, you can't update your password" +msgstr "você não pode alterar a senha no modo demo" + +msgid "your password has been updated" +msgstr "sua senha foi atualizada" + +msgid "" +"the two fields have to be filled & the password must be the same in the two " +"fields" +msgstr "" +"os dois campos devem estar preenchidos e as senhas devem ser iguais em ambos" + +msgid "still using the \"" +msgstr "ainda usando o \"" + +msgid "that theme does not seem to be installed" +msgstr "esse tema aparentemente não está instalado" + +msgid "you have changed your theme preferences" +msgstr "você alterou suas preferências de tema" + +msgid "that language does not seem to be installed" +msgstr "esse idioma aparentemente não está instalado" + +msgid "you have changed your language preferences" +msgstr "você alterou suas preferências de idioma" + +msgid "login failed: you have to fill all fields" +msgstr "falha ao entrar: você deve preencher todos os campos" + +msgid "welcome to your wallabag" +msgstr "bem-vindo ao seu wallabag" + +msgid "login failed: bad login or password" +msgstr "falha ao entrar: login ou senha incorretos" + +msgid "import from instapaper completed" +msgstr "importação do instapaper completa" + +msgid "import from pocket completed" +msgstr "importação do pocket completa" + +msgid "import from Readability completed. " +msgstr "importação do Readability completa. " + +msgid "import from Poche completed. " +msgstr "importação do Poche completa. " + +msgid "Unknown import provider." +msgstr "Serviço de importação desconhecido." + +msgid "Incomplete inc/poche/define.inc.php file, please define \"" +msgstr "Arquivo inc/poche/define.inc.php incompleto, por favor defina \"" + +msgid "Could not find required \"" +msgstr "Não foi possível encontrar o requerido \"" + +msgid "Uh, there is a problem while generating feeds." +msgstr "Uh, houve um problema ao gerar os feeds." + +msgid "Cache deleted." +msgstr "Cache deletado." + +msgid "Oops, it seems you don't have PHP 5." +msgstr "Oops, parece que você não tem o PHP 5." + +#~ msgid "poche it!" +#~ msgstr "poche it!" + +#~ msgid "Updating poche" +#~ msgstr "Updating poche" + +#~ msgid "create an issue" +#~ msgstr "create an issue" + +#~ msgid "or" +#~ msgstr "or" + +#~ msgid "contact us by mail" +#~ msgstr "contact us by mail" + +#~ msgid "your poche version:" +#~ msgstr "your poche version:" From 6a0329f756cc00495f075eb4342b347d747e4a96 Mon Sep 17 00:00:00 2001 From: camporez Date: Thu, 27 Feb 2014 16:36:32 -0300 Subject: [PATCH 18/79] Add brazilian portuguese (pt-BR) translation modified: locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo renamed: locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo -> locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po --- locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo | Bin 12339 -> 12462 bytes locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po | 549 ++++++++++++++++++++ 2 files changed, 549 insertions(+) create mode 100644 locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po diff --git a/locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo b/locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo index 2b95c30fb9a64c7982ebbf907df04c5ed6414940..ab0a459cbbb2480a0e4e6c907c4304f852f57339 100644 GIT binary patch literal 12462 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 X0(#f7pv}I~A2JlNC=Ues&h`HQNGINF diff --git a/locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po b/locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po new file mode 100644 index 000000000..2b95c30fb --- /dev/null +++ b/locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.po @@ -0,0 +1,549 @@ +msgid "" +msgstr "" +"Project-Id-Version: Wallabag\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-02-25 15:17+0300\n" +"PO-Revision-Date: \n" +"Last-Translator: Maryana \n" +"Language-Team: @iancamporez \n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\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 "wallabag, um \"read it later\" de código aberto" + +msgid "login failed: user doesn't exist" +msgstr "falha ao entrar: o usuário não existe" + +msgid "return home" +msgstr "retornar à página inicial" + +msgid "config" +msgstr "configurações" + +msgid "Saving articles" +msgstr "Salvando artigos" + +msgid "There are several ways to save an article:" +msgstr "Existem várias maneiras de salvar um artigo:" + +msgid "read the documentation" +msgstr "ler a documentação" + +msgid "download the extension" +msgstr "baixar a extensão" + +msgid "via F-Droid" +msgstr "via F-Droid" + +msgid " or " +msgstr "ou " + +msgid "via Google Play" +msgstr "via Google Play" + +msgid "download the application" +msgstr "baixar o aplicativo" + +msgid "By filling this field" +msgstr "Preenchendo esse campo" + +msgid "bag it!" +msgstr "adicionar ao wallabag" + +msgid "Bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "Bookmarklet: arraste esse link para sua barra de favoritos" + +msgid "Upgrading wallabag" +msgstr "Atualizando o wallabag" + +msgid "Installed version" +msgstr "Versão instalada" + +msgid "Latest stable version" +msgstr "Última versão estável" + +msgid "A more recent stable version is available." +msgstr "Uma versão estável mais nova está disponível" + +msgid "You are up to date." +msgstr "Você está atualizado." + +msgid "Latest dev version" +msgstr "Última versão em desenvolvimento" + +msgid "A more recent development version is available." +msgstr "Uma versão em desenvolvimento mais recente está disponível" + +msgid "Feeds" +msgstr "Feeds" + +msgid "" +"Your feed token is currently empty and must first be generated to enable " +"feeds. Click here to generate it." +msgstr "" +"Seu token do feed e precisa ser gerado para ativar os feeds. Clique aqui para gerar um token." + +msgid "Unread feed" +msgstr "Feed de artigos não lidos" + +msgid "Favorites feed" +msgstr "Feed dos favoritos" + +msgid "Archive feed" +msgstr "Feed de arquivados" + +msgid "Your token:" +msgstr "Seu token:" + +msgid "Your user id:" +msgstr "Seu código de usuário:" + +msgid "" +"You can regenerate your token: generate!" +"." +msgstr "" +"Você pode regerar seu token: gerar!." + +msgid "Change your theme" +msgstr "Mudar seu tema" + +msgid "Theme:" +msgstr "Tema:" + +msgid "Update" +msgstr "Atualizar" + +msgid "Change your language" +msgstr "Alterar seu idioma" + +msgid "Language:" +msgstr "Idioma:" + +msgid "Change your password" +msgstr "Alterar sua senha" + +msgid "New password:" +msgstr "Nova senha:" + +msgid "Password" +msgstr "Senha" + +msgid "Repeat your new password:" +msgstr "Repetir sua nova senha:" + +msgid "Import" +msgstr "Importar" + +msgid "" +"Please execute the import script locally as it can take a very long time." +msgstr "" +"Por favor, execute o script de importação localmente, pois pode demorar " +"muito tempo." + +msgid "More info in the official documentation:" +msgstr "Mais informações na documentação oficial:" + +msgid "Import from Pocket" +msgstr "Importar do Pocket" + +#, php-format +msgid "(you must have a %s file on your server)" +msgstr "(você deve ter um arquivo %s no seu servidor)" + +msgid "Import from Readability" +msgstr "Importar do Readability" + +msgid "Import from Instapaper" +msgstr "Importar do Instapaper" + +msgid "Import from wallabag" +msgstr "Importar do wallabag" + +msgid "Export your wallabag data" +msgstr "Exportar seus dados do wallabag" + +msgid "Click here" +msgstr "Clique aqui" + +msgid "to download your database." +msgstr "para baixar seu banco de dados." + +msgid "to export your wallabag data." +msgstr "para exportar seus dados do wallabag." + +msgid "Cache" +msgstr "Cache" + +msgid "to delete cache." +msgstr "para apagar o cache." + +msgid "You can enter multiple tags, separated by commas." +msgstr "Você pode inserir várias tags, separadas por vírgulas." + +msgid "return to article" +msgstr "retornar ao artigo" + +msgid "plop" +msgstr "plop" + +msgid "" +"You can check your configuration " +"here." +msgstr "" +"Você pode checar suas " +"configurações aqui." + +msgid "favoris" +msgstr "favoritos" + +msgid "archive" +msgstr "arquivo" + +msgid "unread" +msgstr "não lidos" + +msgid "by date asc" +msgstr "por data (cresc.)" + +msgid "by date" +msgstr "por data" + +msgid "by date desc" +msgstr "por data (decr.)" + +msgid "by title asc" +msgstr "por título (cresc.)" + +msgid "by title" +msgstr "por título" + +msgid "by title desc" +msgstr "por título (decr.)" + +msgid "Tag" +msgstr "Tag" + +msgid "No articles found." +msgstr "Nenhum artigo encontrado." + +msgid "Toggle mark as read" +msgstr "Alterar \"marcar como lido\"" + +msgid "toggle favorite" +msgstr "alterar \"favorito\"" + +msgid "delete" +msgstr "deletar" + +msgid "original" +msgstr "original" + +msgid "estimated reading time:" +msgstr "tempo estimado de leitura:" + +msgid "mark all the entries as read" +msgstr "marcar todas as entradas como lidas" + +msgid "results" +msgstr "resultados" + +msgid "installation" +msgstr "instalação" + +msgid "install your wallabag" +msgstr "instalar seu wallabag" + +msgid "" +"wallabag is still not installed. Please fill the below form to install it. " +"Don't hesitate to read the documentation " +"on wallabag website." +msgstr "" +"O wallabag ainda não está instalado. Preencha o formulário abaixo para " +"instalá-lo. Não hesite em ler a " +"documentação no site do wallabag." + +msgid "Login" +msgstr "Login" + +msgid "Repeat your password" +msgstr "Repetir sua senha" + +msgid "Install" +msgstr "Instalar" + +msgid "login to your wallabag" +msgstr "entrar no seu wallabag" + +msgid "Login to wallabag" +msgstr "Entrar no wallabag" + +msgid "you are in demo mode, some features may be disabled." +msgstr "você está no modo demo, alguns recursos podem estar desativados." + +msgid "Username" +msgstr "Nome de usuário" + +msgid "Stay signed in" +msgstr "Continuar conectado" + +msgid "(Do not check on public computers)" +msgstr "(Não marque em computadores públicos)" + +msgid "Sign in" +msgstr "Entrar" + +msgid "favorites" +msgstr "favoritos" + +msgid "estimated reading time :" +msgstr "tempo estimado de leitura :" + +msgid "Mark all the entries as read" +msgstr "Marcar todas as entradas como lidas" + +msgid "Return home" +msgstr "Retornar à página inicial" + +msgid "Back to top" +msgstr "Voltar ao topo" + +msgid "Mark as read" +msgstr "Marcar como lido" + +msgid "Favorite" +msgstr "Favoritar" + +msgid "Toggle favorite" +msgstr "Alterar \"favorito\"" + +msgid "Delete" +msgstr "Deletar" + +msgid "Tweet" +msgstr "Tweetar" + +msgid "Email" +msgstr "Email" + +msgid "shaarli" +msgstr "shaarli" + +msgid "flattr" +msgstr "flattr" + +msgid "Does this article appear wrong?" +msgstr "Esse artigo está sendo exibido incorretamente?" + +msgid "tags:" +msgstr "tags:" + +msgid "Edit tags" +msgstr "Editar tags" + +msgid "save link!" +msgstr "salvar link!" + +msgid "home" +msgstr "página inicial" + +msgid "tags" +msgstr "tags" + +msgid "logout" +msgstr "sair" + +msgid "powered by" +msgstr "powered by" + +msgid "debug mode is on so cache is off." +msgstr "o modo debug está ativo, então o cache foi desativado." + +msgid "your wallabag version:" +msgstr "sua versão do wallabag:" + +msgid "storage:" +msgstr "armazenamento:" + +msgid "save a link" +msgstr "salvar um link" + +msgid "back to home" +msgstr "voltar à página inicial" + +msgid "toggle mark as read" +msgstr "alterar \"marcar como lido\"" + +msgid "tweet" +msgstr "tweetar" + +msgid "email" +msgstr "email" + +msgid "this article appears wrong?" +msgstr "esse artigo está sendo mostrado incorretamente?" + +msgid "No link available here!" +msgstr "Nenhum link disponível aqui!" + +msgid "Poching a link" +msgstr "Pocheando um link" + +msgid "by filling this field" +msgstr "preenchendo esse campo" + +msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "bookmarklet: arraste esse link para a sua barra de favoritos" + +msgid "your version" +msgstr "sua versão" + +msgid "latest stable version" +msgstr "última versão estável" + +msgid "a more recent stable version is available." +msgstr "uma versão estável mais nova está disponível" + +msgid "you are up to date." +msgstr "você está atualizado." + +msgid "latest dev version" +msgstr "última versão em desenvolvimento" + +msgid "a more recent development version is available." +msgstr "uma versão em desenvolvimento mais nova está disponível" + +msgid "Please execute the import script locally, it can take a very long time." +msgstr "" +"Por favor, execute o script de importação localmente, pois pode demorar " +"muito tempo." + +msgid "More infos in the official doc:" +msgstr "Mais informações na documentação oficial:" + +msgid "import from Pocket" +msgstr "importar do Pocket" + +msgid "import from Readability" +msgstr "importar do Readability" + +msgid "import from Instapaper" +msgstr "importar do Instapaper" + +msgid "Tags" +msgstr "Tags" + +msgid "Untitled" +msgstr "Sem título" + +msgid "the link has been added successfully" +msgstr "o link foi adicionado com sucesso" + +msgid "error during insertion : the link wasn't added" +msgstr "erro durante a inserção: o link não foi adicionado" + +msgid "the link has been deleted successfully" +msgstr "o link foi deletado com sucesso" + +msgid "the link wasn't deleted" +msgstr "o link não foi deletado" + +msgid "Article not found!" +msgstr "Artigo não encontrado!" + +msgid "previous" +msgstr "anterior" + +msgid "next" +msgstr "próximo" + +msgid "in demo mode, you can't update your password" +msgstr "você não pode alterar a senha no modo demo" + +msgid "your password has been updated" +msgstr "sua senha foi atualizada" + +msgid "" +"the two fields have to be filled & the password must be the same in the two " +"fields" +msgstr "" +"os dois campos devem estar preenchidos e as senhas devem ser iguais em ambos" + +msgid "still using the \"" +msgstr "ainda usando o \"" + +msgid "that theme does not seem to be installed" +msgstr "esse tema aparentemente não está instalado" + +msgid "you have changed your theme preferences" +msgstr "você alterou suas preferências de tema" + +msgid "that language does not seem to be installed" +msgstr "esse idioma aparentemente não está instalado" + +msgid "you have changed your language preferences" +msgstr "você alterou suas preferências de idioma" + +msgid "login failed: you have to fill all fields" +msgstr "falha ao entrar: você deve preencher todos os campos" + +msgid "welcome to your wallabag" +msgstr "bem-vindo ao seu wallabag" + +msgid "login failed: bad login or password" +msgstr "falha ao entrar: login ou senha incorretos" + +msgid "import from instapaper completed" +msgstr "importação do instapaper completa" + +msgid "import from pocket completed" +msgstr "importação do pocket completa" + +msgid "import from Readability completed. " +msgstr "importação do Readability completa. " + +msgid "import from Poche completed. " +msgstr "importação do Poche completa. " + +msgid "Unknown import provider." +msgstr "Serviço de importação desconhecido." + +msgid "Incomplete inc/poche/define.inc.php file, please define \"" +msgstr "Arquivo inc/poche/define.inc.php incompleto, por favor defina \"" + +msgid "Could not find required \"" +msgstr "Não foi possível encontrar o requerido \"" + +msgid "Uh, there is a problem while generating feeds." +msgstr "Uh, houve um problema ao gerar os feeds." + +msgid "Cache deleted." +msgstr "Cache deletado." + +msgid "Oops, it seems you don't have PHP 5." +msgstr "Oops, parece que você não tem o PHP 5." + +#~ msgid "poche it!" +#~ msgstr "poche it!" + +#~ msgid "Updating poche" +#~ msgstr "Updating poche" + +#~ msgid "create an issue" +#~ msgstr "create an issue" + +#~ msgid "or" +#~ msgstr "or" + +#~ msgid "contact us by mail" +#~ msgstr "contact us by mail" + +#~ msgid "your poche version:" +#~ msgstr "your poche version:" From 381d182726132b55a24644634b965bb0ccd7830a Mon Sep 17 00:00:00 2001 From: tcitworld Date: Thu, 27 Feb 2014 21:16:16 +0100 Subject: [PATCH 19/79] Syntax fix. I think this will be the smallest commit I'll ever make. --- TRANSLATION.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TRANSLATION.md b/TRANSLATION.md index 2ea9279e4..2e38d5ccb 100755 --- a/TRANSLATION.md +++ b/TRANSLATION.md @@ -62,6 +62,6 @@ So, you are almost done. This step may be required if your web server runs php scripts in name of, say, www user (i.e. Apache with mod_php, not cgi). -##To create new tanslation +##To create new translation Please simple create appropriate directories in locale folder and perform all steps, described above. Instead of opening an existing file just create new one. From 346380e131ac41229fdcadb5bc5dcb99347552ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 27 Feb 2014 21:37:25 +0100 Subject: [PATCH 20/79] [add] label for brazilian language on config screen --- inc/poche/Poche.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 4100f1564..714fa9ee4 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -35,6 +35,7 @@ class Poche 'ru_RU.utf8' => 'Pусский', 'sl_SI.utf8' => 'Slovenščina', 'uk_UA.utf8' => 'Українська', + 'pt_BR.utf8' => 'Brasileiro', ); public function __construct() { From 6065553c137ec63ec3ffddda0350f1d3d805b852 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 28 Feb 2014 13:08:11 +0200 Subject: [PATCH 21/79] effect of block rebuilding on next page removed, issue #479 --- inc/poche/Poche.class.php | 1 + themes/baggy/home.twig | 80 +++++++++++++++++++-------------------- 2 files changed, 41 insertions(+), 40 deletions(-) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 4100f1564..d42da60d4 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -660,6 +660,7 @@ class Poche 'entries' => '', 'page_links' => '', 'nb_results' => '', + 'listmode' => (isset($_COOKIE['listmode']) ? true : false), ); //if id is given - we retrive entries by tag: id is tag id diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index 5262c05bb..a935b034a 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -12,45 +12,45 @@ {% include '_menu.twig' %} {% endblock %} {% block content %} - {% if tag %} -

{% trans "Tag" %}: {{ tag.value }}

- {% endif %} - {% if entries is empty %} -

{% trans "No articles found." %}

- {% else %} -
- {% include '_display-mode.twig' %} - {% include '_sorting.twig' %} -
- {% block pager %} - {% if nb_results > 1 %} -
-
{{ nb_results }} {% trans "results" %}
- {{ page_links | raw }} -
- {% endif %} - {% endblock %} -
- {% for entry in entries %} -
-

{{ entry.title|raw }}

- {% if entry.content| getReadingTime > 0 %} -
{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
- {% else %} -
{% trans "estimated reading time :" %} < 1 min
- {% endif %} - -

{{ entry.content|striptags|slice(0, 300) }}...

-
+ {% if tag %} +

{% trans "Tag" %}: {{ tag.value }}

+ {% endif %} + {% if entries is empty %} +

{% trans "No articles found." %}

+ {% else %} +
+ {% include '_display-mode.twig' %} + {% include '_sorting.twig' %} +
+ {% block pager %} + {% if nb_results > 1 %} +
+
{{ nb_results }} {% trans "results" %}
+ {{ page_links | raw }} +
+ {% endif %} + {% endblock %} +
+ {% for entry in entries %} +
+

{{ entry.title|raw }}

+ {% if entry.content| getReadingTime > 0 %} +
{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
+ {% else %} +
{% trans "estimated reading time :" %} < 1 min
+ {% endif %} + +

{{ entry.content|striptags|slice(0, 300) }}...

+
- {% endfor %} -
- {% if view == 'home' %}{% if nb_results > 1 %}{{ "Mark all the entries as read" }}{% endif %}{% endif %} - {% endif %} - {{ block('pager') }} + {% endfor %} +
+ {% if view == 'home' %}{% if nb_results > 1 %}{{ "Mark all the entries as read" }}{% endif %}{% endif %} + {% endif %} + {{ block('pager') }} {% endblock %} From fc52df0677cf0477d348a7b71627ea0c2232c2c3 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 28 Feb 2014 13:13:30 +0200 Subject: [PATCH 22/79] effect of block rebuilding on next page removed, issue #479 --- themes/baggy/home.twig | 80 +++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index a935b034a..7bc0472dc 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -12,45 +12,45 @@ {% include '_menu.twig' %} {% endblock %} {% block content %} - {% if tag %} -

{% trans "Tag" %}: {{ tag.value }}

- {% endif %} - {% if entries is empty %} -

{% trans "No articles found." %}

- {% else %} -
- {% include '_display-mode.twig' %} - {% include '_sorting.twig' %} -
- {% block pager %} - {% if nb_results > 1 %} -
-
{{ nb_results }} {% trans "results" %}
- {{ page_links | raw }} -
- {% endif %} - {% endblock %} -
- {% for entry in entries %} -
-

{{ entry.title|raw }}

- {% if entry.content| getReadingTime > 0 %} -
{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
- {% else %} -
{% trans "estimated reading time :" %} < 1 min
- {% endif %} - -

{{ entry.content|striptags|slice(0, 300) }}...

-
+ {% if tag %} +

{% trans "Tag" %}: {{ tag.value }}

+ {% endif %} + {% if entries is empty %} +

{% trans "No articles found." %}

+ {% else %} +
+ {% include '_display-mode.twig' %} + {% include '_sorting.twig' %} +
+ {% block pager %} + {% if nb_results > 1 %} +
+
{{ nb_results }} {% trans "results" %}
+ {{ page_links | raw }} +
+ {% endif %} + {% endblock %} +
+ {% for entry in entries %} +
+

{{ entry.title|raw }}

+ {% if entry.content| getReadingTime > 0 %} +
{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
+ {% else %} +
{% trans "estimated reading time :" %} < 1 min
+ {% endif %} + +

{{ entry.content|striptags|slice(0, 300) }}...

+
- {% endfor %} -
- {% if view == 'home' %}{% if nb_results > 1 %}{{ "Mark all the entries as read" }}{% endif %}{% endif %} - {% endif %} - {{ block('pager') }} + {% endfor %} +
+ {% if view == 'home' %}{% if nb_results > 1 %}{{ "Mark all the entries as read" }}{% endif %}{% endif %} + {% endif %} + {{ block('pager') }} {% endblock %} From d4293058364f6f13a7ce55373924b0a563918db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 28 Feb 2014 14:27:10 +0100 Subject: [PATCH 23/79] [fix] #490 flattr icon in baggy theme --- themes/baggy/view.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index 4751c4cbf..c925e91c1 100644 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@ -14,7 +14,7 @@ {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %} - {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • {% trans "flattr" %}
    • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %} ({{ flattr.numflattrs }})
    • {% endif %}{% endif %} + {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • {% trans "flattr" %}
    • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %} ({{ flattr.numflattrs }})
    • {% endif %}{% endif %}
  • {% trans "Does this article appear wrong?" %}
    • From 2bb207d005850263ee4cc227d7b4ad147d6291e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 28 Feb 2014 14:54:50 +0100 Subject: [PATCH 24/79] [fix] #483 pdo_sqlite not required if we want mysql / pgsql --- check_setup.php | 10 ---------- install/index.php | 31 +++++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/check_setup.php b/check_setup.php index 96dd0f7d4..2b84a7440 100644 --- a/check_setup.php +++ b/check_setup.php @@ -13,16 +13,6 @@ if (version_compare(PHP_VERSION, '5.4.0', '<')) { } } -// Check PDO Sqlite -if (! extension_loaded('pdo_sqlite')) { - die('PHP extension required: pdo_sqlite'); -} - -// Check ZIP -if (! extension_loaded('zip')) { - die('PHP extension required: zip'); -} - // Check if /cache is writeable if (! is_writable('cache')) { die('The directory "cache" must be writeable by your web server user'); diff --git a/install/index.php b/install/index.php index 975b997f1..b21cec521 100644 --- a/install/index.php +++ b/install/index.php @@ -225,7 +225,11 @@ php composer.phar install

    Database engine:

      -
      • +
    • +
      +

      You have to enable pdo_sqlite extension.

      +
      +
      • @@ -263,26 +267,49 @@ php composer.phar install

        - + + {% endblock %} From f98373cc34f1826ba93fd93ae7f291726af1f933 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 7 Mar 2014 12:54:08 +0200 Subject: [PATCH 36/79] getPageContent moved to Tools, fix of #426 --- inc/poche/Tools.class.php | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index 393a415dd..eeb101b40 100644 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php @@ -263,10 +263,12 @@ class Tools } } // Saving and clearing session - $REAL_SESSION = array(); - foreach( $_SESSION as $key => $value ) { - $REAL_SESSION[$key] = $value; - unset($_SESSION[$key]); + if ( isset($_SESSION) ) { + $REAL_SESSION = array(); + foreach( $_SESSION as $key => $value ) { + $REAL_SESSION[$key] = $value; + unset($_SESSION[$key]); + } } // Running code in different context @@ -282,7 +284,8 @@ class Tools ); ob_start(); require func_get_arg(0); - $json = ob_get_flush(); + $json = ob_get_contents(); + ob_end_clean(); return $json; }; $json = $scope( "inc/3rdparty/makefulltextfeed.php", array("url" => $url) ); @@ -297,12 +300,15 @@ class Tools $GLOBALS[$key] = $value; } // Clearing and restoring session - foreach( $_SESSION as $key => $value ) { - unset($_SESSION[$key]); - } - foreach( $REAL_SESSION as $key => $value ) { - $_SESSION[$key] = $value; + if ( isset($REAL_SESSION) ) { + foreach( $_SESSION as $key => $value ) { + unset($_SESSION[$key]); + } + foreach( $REAL_SESSION as $key => $value ) { + $_SESSION[$key] = $value; + } } + return json_decode($json, true); } } From 042486c511d07226715c2e0d7cd9823f591d8d10 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 7 Mar 2014 14:52:52 +0200 Subject: [PATCH 37/79] fix of #530 - import fail from Poche --- inc/poche/Poche.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index fb4e1a7fe..134925060 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -377,6 +377,7 @@ class Poche // clean content from prevent xss attack $config = HTMLPurifier_Config::createDefault(); + $config->set('Cache.SerializerPath', CACHE); $purifier = new HTMLPurifier($config); $title = $purifier->purify($title); $body = $purifier->purify($body); From 1ab567f6e35e1d082b142db8084089a4517747a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 7 Mar 2014 14:49:36 +0100 Subject: [PATCH 38/79] [add] clean content articles in cron --- cron.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cron.php b/cron.php index cc137ca28..8fbf421ae 100644 --- a/cron.php +++ b/cron.php @@ -1,5 +1,5 @@ purify($title); - // $body = $purifier->purify($body); + $config = HTMLPurifier_Config::createDefault(); + $purifier = new HTMLPurifier($config); + $title = $purifier->purify($title); + $body = $purifier->purify($body); $store->updateContentAndTitle($item['id'], $title, $body, $user_id); From 7c6aa8d826067ad2949952001ecf7197d8e4c011 Mon Sep 17 00:00:00 2001 From: Bob Maerten Date: Fri, 7 Mar 2014 16:44:05 +0100 Subject: [PATCH 39/79] Changed text to clarify import process. --- themes/baggy/config.twig | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 95db92fe6..20ff9a000 100644 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -44,7 +44,7 @@

        {% trans "Your user id:" %} {{user_id}}

        {% trans "You can regenerate your token: generate!." %}

        {% endif %} - +

        {% trans "Change your theme" %}

        @@ -105,7 +105,8 @@ {% endif %}

        {% trans "Import" %}

        -

        1. {% trans "Select a file on your computer and upload it." %}

        +

        {% trans "Importing from other services can be quite long, and webservers default configuration often prevents long scripts execution time, so it must be done in multiple parts." %}

        +

        1. {% trans "First, select the export file on your computer and upload it." %}

        @@ -130,8 +131,8 @@ {% if token == '' %}

        {% trans "3. Your feed token is currently empty and must first be generated to fetch content. Click here to generate it." %}

        {% else %} -

        3. {% trans "You can fetch content for imported items." %} Click here to fetch content for 10 articles.

        -

        {% trans "You can also create a cron task:" %}

        +

        3. {% trans "Finaly, you have to fetch content for imported items." %} {% trans "Click here" %} {% trans "to fetch content for 10 articles" %}.

        +

        {% trans "If you have console access to your server, you can also create a cron task:" %}

        0 */4 * * *  cd /path/to/wallabag && php cron.php --limit=10 --user-id={{user_id}} --token={{token}} >/dev/null 2>&1
        {% endif %} From 4744cb0e1df8ee7c1cd10c9fbd67caec73051024 Mon Sep 17 00:00:00 2001 From: Thomas LEBEAU Date: Sat, 8 Mar 2014 13:47:15 +0100 Subject: [PATCH 40/79] bagit link + overlay save link + listmode --- themes/baggy/_menu.twig | 2 +- themes/baggy/_pocheit-form.twig | 8 ++++ themes/baggy/css/main.css | 48 +++++++++++++++++++--- themes/baggy/home.twig | 2 +- themes/baggy/js/init.js | 71 +++++++++++++++++++++++++-------- 5 files changed, 107 insertions(+), 24 deletions(-) create mode 100755 themes/baggy/_pocheit-form.twig diff --git a/themes/baggy/_menu.twig b/themes/baggy/_menu.twig index e9cd9d4ad..7dd799f93 100644 --- a/themes/baggy/_menu.twig +++ b/themes/baggy/_menu.twig @@ -4,7 +4,7 @@
      • {% trans "favorites" %}
      • {% trans "archive" %}
      • {% trans "tags" %}
        • -
      • {% trans "save a link" %}
        • +
      • {% trans "save a link" %}
      • {% trans "config" %}
      • {% trans "logout" %}
      diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig new file mode 100755 index 000000000..3c4a4d6eb --- /dev/null +++ b/themes/baggy/_pocheit-form.twig @@ -0,0 +1,8 @@ +
      + + +

      {% trans "Save a link" %}

      + + + +
      diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index fe77a967d..586501b06 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -173,7 +173,7 @@ h2:after { #links { position: fixed; top: 0; - width: 9em; + width: 10em; left: 0; text-align: right; background: #333; @@ -184,7 +184,7 @@ h2:after { } #main { - margin-left: 12em; + margin-left: 13em; position: relative; z-index: 10; padding-right: 5%; @@ -228,7 +228,7 @@ h2:after { #links li:last-child { position: fixed; bottom: 1em; - width: 9em; + width: 10em; } #links li:last-child a:before { @@ -322,6 +322,15 @@ footer a { letter-spacing:-5px; } +.listmode .entrie { + width: 100%!important; + margin-left: 0!important; +} + +.listmode .entrie p { + display: none; +} + .list-entries + .results { margin-bottom: 2em; } @@ -343,10 +352,10 @@ footer a { letter-spacing:normal; box-shadow: 0 3px 7px rgba(0,0,0,0.3); display: inline-block; - width: 32%; + width: 32%!important; margin-bottom: 1.5em; vertical-align: top; - margin-left: 1.5%; + margin-left: 1.5%!important; position: relative; overflow: hidden; padding: 1.5em 1.5em 3em 1.5em; @@ -481,7 +490,7 @@ footer a { } .entrie:nth-child(3n+1) { - margin-left: 0; + margin-left: 0!important; } .results { @@ -525,6 +534,33 @@ footer a { display: none; } +#bagit-form { + background: rgba(0,0,0,0.8); + position: fixed; + top: 0; + left: 10em; + z-index: 20; + height: 100%; + width: 100%; + margin: 0; + padding: 2em; + display: none; +} + +#bagit-form form { + background: #FFF; + position: absolute; + top: 50%; + left: 50%; + z-index: 20; + border: 10px solid #000; + width: 600px; + height: 300px; + margin: -150px 0 0 -300px; + padding: 2em; +} + + /* ========================================================================== 3 = Pictos ========================================================================== */ diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index 7bc0472dc..e34897fa8 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -30,7 +30,7 @@ {% endif %} {% endblock %} -
      +
      {% for entry in entries %}

      {{ entry.title|raw }}

      diff --git a/themes/baggy/js/init.js b/themes/baggy/js/init.js index 4a843548c..99bffd09b 100755 --- a/themes/baggy/js/init.js +++ b/themes/baggy/js/init.js @@ -1,36 +1,75 @@ -$(document).ready(function() { +$.fn.ready(function() { + + var $listmode = $('#listmode'), + $listentries = $("#list-entries"), + $bagit = $('#bagit'), + $bagitForm = $('#bagit-form'); + + /* ========================================================================== + Menu + ========================================================================== */ $("#menu").click(function(){ $("#links").toggle(); }); + /* ========================================================================== + List mode or Table Mode + ========================================================================== */ - $("#listmode").click(function(){ + $listmode.click(function(){ if ( $.cookie("listmode") == 1 ) { - $(".entrie").css("width", ""); - $(".entrie").css("margin-left", ""); - + // Cookie $.removeCookie("listmode"); - $("#listmode").removeClass("tablemode"); - $("#listmode").addClass("listmode"); + + $listentries.removeClass("listmode"); + $listmode.removeClass("tablemode"); + $listmode.addClass("listmode"); } else { + // Cookie $.cookie("listmode", 1, {expires: 365}); - $(".entrie").css("width", "100%"); - $(".entrie").css("margin-left", "0"); - $("#listmode").removeClass("listmode"); - $("#listmode").addClass("tablemode"); + $listentries.addClass("listmode"); + $listmode.removeClass("listmode"); + $listmode.addClass("tablemode"); } }); + /* ========================================================================== + Cookie listmode + ========================================================================== */ + if ( $.cookie("listmode") == 1 ) { - $(".entrie").css("width", "100%"); - $(".entrie").css("margin-left", "0"); - $("#listmode").removeClass("listmode"); - $("#listmode").addClass("tablemode"); + $listentries.addClass("listmode"); + $listmode.removeClass("listmode"); + $listmode.addClass("tablemode"); } + /* ========================================================================== + bag it link + ========================================================================== */ -}); + $bagit.click(function(){ + $bagitForm.toggle(); + }); + + /* ========================================================================== + Keyboard gestion + ========================================================================== */ + + $(window).keydown(function(e){ + switch (e.keyCode) { + // s letter + case 83: + $bagitForm.toggle(); + break; + case 27: + $bagitForm.hide(); + break; + } + }) + + +}); \ No newline at end of file From 17b2afefad1947042cc9fbbb841c3a023d00d96d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 10 Mar 2014 08:10:03 +0100 Subject: [PATCH 41/79] [fix] test if user_id doesn't exist in feeds generation --- inc/poche/Poche.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 134925060..0c8e798c0 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -1109,6 +1109,10 @@ class Poche $allowed_types = array('home', 'fav', 'archive', 'tag'); $config = $this->store->getConfigUser($user_id); + if ($config == null) { + die(_('User with this id (' . $user_id . ') does not exist.')); + } + if (!in_array($type, $allowed_types) || $token != $config['token']) { die(_('Uh, there is a problem while generating feeds.')); From fb26cc9375ce9ef8df748eb473eb6e58884421c6 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Mon, 10 Mar 2014 16:28:47 +0200 Subject: [PATCH 42/79] a lot of enhancements related to tags: tags list is now sorted, shows number of articles, autocomplete added according to #477, #542 --- inc/poche/Database.class.php | 11 +- inc/poche/Poche.class.php | 50 +- inc/poche/Tools.class.php | 10 + themes/baggy/edit-tags.twig | 8 +- themes/baggy/tags.twig | 2 +- .../default/css/images/animated-overlay.gif | Bin 0 -> 1738 bytes .../css/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 0 -> 212 bytes .../images/ui-bg_flat_75_ffffff_40x100.png | Bin 0 -> 208 bytes .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 0 -> 335 bytes .../images/ui-bg_glass_65_ffffff_1x400.png | Bin 0 -> 207 bytes .../images/ui-bg_glass_75_dadada_1x400.png | Bin 0 -> 262 bytes .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 0 -> 262 bytes .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 0 -> 332 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 0 -> 280 bytes .../css/images/ui-icons_222222_256x240.png | Bin 0 -> 6922 bytes .../css/images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4549 bytes .../css/images/ui-icons_454545_256x240.png | Bin 0 -> 6992 bytes .../css/images/ui-icons_888888_256x240.png | Bin 0 -> 6999 bytes .../css/images/ui-icons_cd0a0a_256x240.png | Bin 0 -> 4549 bytes .../default/css/jquery-ui-1.10.4.custom.css | 560 ++++ .../css/jquery-ui-1.10.4.custom.min.css | 7 + themes/default/css/style.css | 8 + themes/default/edit-tags.twig | 10 +- themes/default/js/autoCompleteTags.js | 47 + themes/default/js/jquery-ui-1.10.4.custom.js | 2519 +++++++++++++++++ .../default/js/jquery-ui-1.10.4.custom.min.js | 6 + themes/default/tags.twig | 12 +- 27 files changed, 3225 insertions(+), 25 deletions(-) mode change 100644 => 100755 inc/poche/Tools.class.php mode change 100644 => 100755 themes/baggy/edit-tags.twig mode change 100644 => 100755 themes/baggy/tags.twig create mode 100644 themes/default/css/images/animated-overlay.gif create mode 100644 themes/default/css/images/ui-bg_flat_0_aaaaaa_40x100.png create mode 100644 themes/default/css/images/ui-bg_flat_75_ffffff_40x100.png create mode 100644 themes/default/css/images/ui-bg_glass_55_fbf9ee_1x400.png create mode 100644 themes/default/css/images/ui-bg_glass_65_ffffff_1x400.png create mode 100644 themes/default/css/images/ui-bg_glass_75_dadada_1x400.png create mode 100644 themes/default/css/images/ui-bg_glass_75_e6e6e6_1x400.png create mode 100644 themes/default/css/images/ui-bg_glass_95_fef1ec_1x400.png create mode 100644 themes/default/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png create mode 100644 themes/default/css/images/ui-icons_222222_256x240.png create mode 100644 themes/default/css/images/ui-icons_2e83ff_256x240.png create mode 100644 themes/default/css/images/ui-icons_454545_256x240.png create mode 100644 themes/default/css/images/ui-icons_888888_256x240.png create mode 100644 themes/default/css/images/ui-icons_cd0a0a_256x240.png create mode 100644 themes/default/css/jquery-ui-1.10.4.custom.css create mode 100644 themes/default/css/jquery-ui-1.10.4.custom.min.css mode change 100644 => 100755 themes/default/css/style.css mode change 100644 => 100755 themes/default/edit-tags.twig create mode 100755 themes/default/js/autoCompleteTags.js create mode 100644 themes/default/js/jquery-ui-1.10.4.custom.js create mode 100644 themes/default/js/jquery-ui-1.10.4.custom.min.js mode change 100644 => 100755 themes/default/tags.twig diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php index edc775f59..5b51b507a 100755 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php @@ -389,12 +389,15 @@ class Database { return $this->getHandle()->lastInsertId($column); } - public function retrieveAllTags($user_id) { - $sql = "SELECT DISTINCT tags.* FROM tags + public function retrieveAllTags($user_id, $term = null) { + $sql = "SELECT DISTINCT tags.*, count(entries.id) AS entriescount FROM tags LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id LEFT JOIN entries ON tags_entries.entry_id=entries.id - WHERE entries.content <> '' AND entries.user_id=?"; - $query = $this->executeQuery($sql, array($user_id)); + WHERE entries.content <> '' AND entries.user_id=? + ". (($term) ? "AND lower(tags.value) LIKE ?" : '') ." + GROUP BY tags.id, tags.value + ORDER BY tags.value"; + $query = $this->executeQuery($sql, (($term)? array($user_id, strtolower('%'.$term.'%')) : array($user_id) )); $tags = $query->fetchAll(); return $tags; diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 0c8e798c0..480f6d455 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -488,25 +488,33 @@ class Poche Tools::logm('error : article not found'); Tools::redirect(); } + //get all already set tags to preven duplicates + $already_set_tags = array(); + $entry_tags = $this->store->retrieveTagsByEntry($entry_id); + foreach ($entry_tags as $tag) { + $already_set_tags[] = $tag['value']; + } foreach($tags as $key => $tag_value) { $value = trim($tag_value); - $tag = $this->store->retrieveTagByValue($value); + if ($value && !in_array($value, $already_set_tags)) { + $tag = $this->store->retrieveTagByValue($value); - if (is_null($tag)) { - # we create the tag - $tag = $this->store->createTag($value); - $sequence = ''; - if (STORAGE == 'postgres') { - $sequence = 'tags_id_seq'; - } - $tag_id = $this->store->getLastId($sequence); - } - else { - $tag_id = $tag['id']; - } + if (is_null($tag)) { + # we create the tag + $tag = $this->store->createTag($value); + $sequence = ''; + if (STORAGE == 'postgres') { + $sequence = 'tags_id_seq'; + } + $tag_id = $this->store->getLastId($sequence); + } + else { + $tag_id = $tag['id']; + } - # we assign the tag to the article - $this->store->setTagToEntry($tag_id, $entry_id); + # we assign the tag to the article + $this->store->setTagToEntry($tag_id, $entry_id); + } } if(!$import) { Tools::redirect(); @@ -579,7 +587,17 @@ class Poche break; case 'tags': $token = $this->user->getConfigValue('token'); - $tags = $this->store->retrieveAllTags($this->user->getId()); + //if term is set - search tags for this term + $term = Tools::checkVar('term'); + $tags = $this->store->retrieveAllTags($this->user->getId(), $term); + if (Tools::isAjaxRequest()) { + $result = array(); + foreach ($tags as $tag) { + $result[] = $tag['value']; + } + echo json_encode($result); + exit; + } $tpl_vars = array( 'token' => $token, 'user_id' => $this->user->getId(), diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php old mode 100644 new mode 100755 index eeb101b40..ad451fc67 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php @@ -311,4 +311,14 @@ class Tools return json_decode($json, true); } + + /** + * Returns whether we handle an AJAX (XMLHttpRequest) request. + * @return boolean whether we handle an AJAX (XMLHttpRequest) request. + */ + public static function isAjaxRequest() + { + return isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH']==='XMLHttpRequest'; + } + } diff --git a/themes/baggy/edit-tags.twig b/themes/baggy/edit-tags.twig old mode 100644 new mode 100755 index 9e9012eea..65ac996a4 --- a/themes/baggy/edit-tags.twig +++ b/themes/baggy/edit-tags.twig @@ -4,6 +4,11 @@ {% include '_menu.twig' %} {% endblock %} {% block content %} + + + + +

      {{ entry.title|raw }}

      @@ -17,7 +22,8 @@ -

      {% trans "You can enter multiple tags, separated by commas." %}

      +

      {% trans "Start typing for auto complete." %}
      + {% trans "You can enter multiple tags, separated by commas." %}

      {% trans "return to article" %} {% endblock %} diff --git a/themes/baggy/tags.twig b/themes/baggy/tags.twig old mode 100644 new mode 100755 index 9df44bb77..9bb93a45d --- a/themes/baggy/tags.twig +++ b/themes/baggy/tags.twig @@ -6,7 +6,7 @@ {% block content %}

      {% trans "Tags" %}

        -{% for tag in tags %}
      • {% if token != '' %}rss{% endif %} {{ tag.value }} +{% for tag in tags %}
      • {% if token != '' %}rss{% endif %} {{ tag.value }} ({{ tag.entriescount }})
        • {% endfor %}
      diff --git a/themes/default/css/images/animated-overlay.gif b/themes/default/css/images/animated-overlay.gif new file mode 100644 index 0000000000000000000000000000000000000000..d441f75ebfbdf26a265dfccd670120d25c0a341c GIT binary patch literal 1738 zcmZ|OX;ji_6b5ixNYt8>l?gOuO)6lU%W(mxn(`>1S(XO;u`D+P%xqBvMr|w-Vyr1s z7R|Cn0b8|Hu<=Zmv1mFqh9Fj!NuZfKB2MP$e75`XJ@>=!y!Ux9xR3x;EW!q1^V>X| znVFuRUN`NqJ2)ybXh%e__h!!pv(M|S3+?9F%(K}zyE40MGyhWF5-IDgL&=%2-9`Nk z!1@8uk4t%_{(K~>N;sK&dzJbwJ=$kYTlL=$%#0Pfh>U{%i@~wWbvYsD_K-D`&+u1( z#Ma`>%q<^UhzGvi(hyE`zCD{-=2|zL5>wnB=DE!U?(CZG%q4@lDnCq_%&3DCla#(X zmBhDD+RN$aMWWHm?ig*>1Onn6~r?Ma~N2JKAxN>H%UtRyRqS)6Um!-Tz%-r=& zQmTb^JFIe3W^-kAm`}`2P|niMh>RYyd)S^f(dbrx965?rzbhP|XeP}o&&DSZ4|oYQ z)I{f!SfycYw?3=9W;o-B%U5xs(pP267X~9-7L|4WzaYexC0GtG8wWygm63rF{llCEraxzkc=IxvFQ-y37=_;e5 zJLq^gsSO0Ayz?a>E_?{dmUc+t#qv$)XN8$<<}rQ#)lsiw+pmL&J>~+hgpo>i$m+;l zZIa_ZRIfSeT$~v5d`EBV&*k`apPgjv&B|+d`Q!nyu{L4rs%ZfoF0*Kq8I%ByOcFpL zK=>wzofZo<+0GZLCnWM3oQ^pb(gRSf02;~cEn@LJ>~XB9IkEX{$N#Z`m%>S!U{uPx zloI%bLdo$Adxlh(Uv^yX7s5G&C zLwNRG>~T?G{kzupp8EcyLGPoPf)@&9Wqfw_l&uU-6cexk%5;uQg%wb=0k_733{i#& z1a2p)gV3S2+QG1-K9tZ}E~I<(P0r2aFFY-c{o?TUOz3Xjod#TLE2A_c?*T7t z=1>~%YW450{Qqno4t`}gvLnuMrcu8+#xEBoY%2_+Mb#Z6S38+r*M4O`-+!zl(@m`D zQsi|GA2l3gEy}LFe<#Hv8?$_L#u8E|3-bP$*La*E>B{X!Sy4i6?TKam!49aXCAW4S*P_O^H4^*DpiA40o}Uqw~Eo&veh1`|8i zD2$x+>_b^bXE4N;AW=5>iYak2%!JAh0j1*k1{p#iRCjbB7!cSws~U{1IA@acLII$t z$>X#A+^s6iJ5~DFG!xa?>z{=lxtdi1rzbM-(nqAu3D8h-&64xo6|E!p?pK0xT;qoK z`6%+SpBk+~M?nO}>2mTw!A{yZ6O>Z@kwSd4;8aWU5z!P~tQl?u==^+R`{OmOS}oZh zOXQ3{6kuz?Is^n^L7;9ieB9C+8B{>t+pDrlq4xGDDn#T#3T5$l1g`FTQkU;b-981j zNm{zC`$wn7etklM#qHI4=3m5gwa6DNS{?Z!vSObi_od{4eUo=_S2BKNpkSdiqe(k9WtkeM79;2-%CFbb)aB=&H1?i1}uwFzoZQ(38Kn1zBP ORn*B%u*Wk|4g3!*Rv{Mv literal 0 HcmV?d00001 diff --git a/themes/default/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/themes/default/css/images/ui-bg_flat_0_aaaaaa_40x100.png new file mode 100644 index 0000000000000000000000000000000000000000..9f10cb65de14cb37299675c04deb285898d86642 GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F1SA+{?>A)!QcOwS?k)_>#w|r1Kptm-M`SUO z_5fqIli7AahM1>|V~EA+ zRdP`(kYX@0Ff`FMFxE9N3Nf^>GBvd_G|)A$ure^{mHt?Qq9HdwB{QuOw}wA%o+p4B O7(8A5T-G@yGywpWRx|7X literal 0 HcmV?d00001 diff --git a/themes/default/css/images/ui-bg_flat_75_ffffff_40x100.png b/themes/default/css/images/ui-bg_flat_75_ffffff_40x100.png new file mode 100644 index 0000000000000000000000000000000000000000..b89b914b9b50f0235ae80746bf199b2aed781b00 GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F2qYNp$opRhQcOwS?k)_Bce{j_0C}7R9+AaB z+5?Q;PG;Ky8A6^ejv*T7lYj6t@hpC#;TbB#aBAWwna#KLs)4eqC9V-ADTyViR>?)F zK#IZ0z|ch3z*yJ7D8$gh%GA`#&_LI~!pgv)SNdZKiiX_$l+3hB+#3G4d7c1jVDNPH Kb6Mw<&;$VJ5;V{N literal 0 HcmV?d00001 diff --git a/themes/default/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/themes/default/css/images/ui-bg_glass_55_fbf9ee_1x400.png new file mode 100644 index 0000000000000000000000000000000000000000..780d3ffdcde762e40bf7811de538195843f3c2c2 GIT binary patch literal 335 zcmeAS@N?(olHy`uVBq!ia0vp^j6gI&fCnc6a#?2AmP!?*K(O3p^r= zfwTu0yPeFo12TF&T^vI^j=w#x$i?I+((tf;UXnmgbH|3oY>pC!)f}(GR!16S-u+#{ ze6YEqRkW=8vGl=5qArKM<9}TC-}iEvB{zdaTcX5$wyRTK&ALlzq^7+P4FnpznExfWIi23!AK{fVL>H$NpatrE9}Ba3rgff^V*UHx3v IIVCg!0AL+7%m4rY literal 0 HcmV?d00001 diff --git a/themes/default/css/images/ui-bg_glass_75_dadada_1x400.png b/themes/default/css/images/ui-bg_glass_75_dadada_1x400.png new file mode 100644 index 0000000000000000000000000000000000000000..f6306608bdaf8a8831066656e9eb8fa595e39cc7 GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^j6gI&0LWmFTHNUZq?nSt-Ch3w7g=q17Rci)@Q5r1 z(jH*!b~4)z#PD=+46!(!T=8puqDZgOs>RXUCGx5b?-VBQkUm|IuXOmYJrBRJgj{Vx zMbNnqUkncy+qa2-mWYc>swkcIuvGK#>(0d)B7)5f`@$Ei28nH~0h*~=;u=wsl30>z zm0Xkxq!^403{7+mjCBo+LJTdeOiisoTnj4$gUXPr=_nd<^HVa@DsgMz;LN=Z)WG2B L>gTe~DWM4fPQXpw literal 0 HcmV?d00001 diff --git a/themes/default/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/themes/default/css/images/ui-bg_glass_75_e6e6e6_1x400.png new file mode 100644 index 0000000000000000000000000000000000000000..7d3470653bc81f29b8f65abbcb8694429b4ccb0e GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^j6gI&0LWmFTHNUZq?nSt-Ch3w7g=q17Rci)@Q5r1 z(jH*!b~4)z#PD=+46!(!TrvH)L6@80)r*_cdCvDr%)6ghVL16=s@mbz7H!uRdGeDa z?kzLg)16i!f8fKx84s0>4nc6a#?2AmP!?*K(O3p^r= zfwTu0yPeFo12VciT^vI^j=w#>k(V)1qW$CZ|6)SVV-&*#dav<$DMuV&n0Dbpw@alzq^7+P4Fnpzo}=^9vA85q1f heZ&t%LvDUbW?Cg~4fChfd;)4<@O1TaS?83{1OV|-bm9O2 literal 0 HcmV?d00001 diff --git a/themes/default/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/themes/default/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png new file mode 100644 index 0000000000000000000000000000000000000000..bf3a9481a20156628f4271feb521269fe5bd53f7 GIT binary patch literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^j6j?s03;ZUuHXC*q?nSt-Ch3w7g=q17Rci)@Q5r1 z(jH*!b~4)z$cXZEaSV~ToLo`U+vu0Ue0cG9p8hWqa?gxxGLm=1A1u)Cewe3oSeCaf zI$k30UHXoTXA5lSJe(zTcE%W-S*bfB&J`pw9sa4-R?IGW?p~6`>jMSP&M+u3 zY@9al)zrvpHlQu4C9V-ADTyViR>?)FK#IZ0z|ch3z*yJ7D8$gh%GA`#&_dV1!pgv4 i-nC}Q!>*kacelgl6^f;1B0ilpUXO@geCw}y;~dr literal 0 HcmV?d00001 diff --git a/themes/default/css/images/ui-icons_222222_256x240.png b/themes/default/css/images/ui-icons_222222_256x240.png new file mode 100644 index 0000000000000000000000000000000000000000..c1cb1170c8b3795835b8831ab81fa9ae63b606b1 GIT binary patch literal 6922 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 QJ~;stWz}Trq%1=J3#jBGg8%>k literal 0 HcmV?d00001 diff --git a/themes/default/css/images/ui-icons_2e83ff_256x240.png b/themes/default/css/images/ui-icons_2e83ff_256x240.png new file mode 100644 index 0000000000000000000000000000000000000000..84b601bf0f726bf95801da487deaf2344a32e4b8 GIT binary patch literal 4549 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 F{{S81aohj^ literal 0 HcmV?d00001 diff --git a/themes/default/css/images/ui-icons_454545_256x240.png b/themes/default/css/images/ui-icons_454545_256x240.png new file mode 100644 index 0000000000000000000000000000000000000000..b6db1acdd433be80a472b045018f25c7f2cf7e08 GIT binary patch literal 6992 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 literal 0 HcmV?d00001 diff --git a/themes/default/css/images/ui-icons_cd0a0a_256x240.png b/themes/default/css/images/ui-icons_cd0a0a_256x240.png new file mode 100644 index 0000000000000000000000000000000000000000..ed5b6b0930f672fa08e9b9bdbe5e55370fd1dc30 GIT binary patch literal 4549 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 DTfr$v literal 0 HcmV?d00001 diff --git a/themes/default/css/jquery-ui-1.10.4.custom.css b/themes/default/css/jquery-ui-1.10.4.custom.css new file mode 100644 index 000000000..5690172f6 --- /dev/null +++ b/themes/default/css/jquery-ui-1.10.4.custom.css @@ -0,0 +1,560 @@ +/*! jQuery UI - v1.10.4 - 2014-03-09 +* http://jqueryui.com +* Includes: jquery.ui.core.css, jquery.ui.autocomplete.css, jquery.ui.menu.css, jquery.ui.theme.css +* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px +* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */ + +/* Layout helpers +----------------------------------*/ +.ui-helper-hidden { + display: none; +} +.ui-helper-hidden-accessible { + border: 0; + clip: rect(0 0 0 0); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + width: 1px; +} +.ui-helper-reset { + margin: 0; + padding: 0; + border: 0; + outline: 0; + line-height: 1.3; + text-decoration: none; + font-size: 100%; + list-style: none; +} +.ui-helper-clearfix:before, +.ui-helper-clearfix:after { + content: ""; + display: table; + border-collapse: collapse; +} +.ui-helper-clearfix:after { + clear: both; +} +.ui-helper-clearfix { + min-height: 0; /* support: IE7 */ +} +.ui-helper-zfix { + width: 100%; + height: 100%; + top: 0; + left: 0; + position: absolute; + opacity: 0; + filter:Alpha(Opacity=0); +} + +.ui-front { + z-index: 100; +} + + +/* Interaction Cues +----------------------------------*/ +.ui-state-disabled { + cursor: default !important; +} + + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { + display: block; + text-indent: -99999px; + overflow: hidden; + background-repeat: no-repeat; +} + + +/* Misc visuals +----------------------------------*/ + +/* Overlays */ +.ui-widget-overlay { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; +} +.ui-autocomplete { + position: absolute; + top: 0; + left: 0; + cursor: default; +} +.ui-menu { + list-style: none; + padding: 2px; + margin: 0; + display: block; + outline: none; +} +.ui-menu .ui-menu { + margin-top: -3px; + position: absolute; +} +.ui-menu .ui-menu-item { + margin: 0; + padding: 0; + width: 100%; + /* support: IE10, see #8844 */ + list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7); +} +.ui-menu .ui-menu-divider { + margin: 5px -2px 5px -2px; + height: 0; + font-size: 0; + line-height: 0; + border-width: 1px 0 0 0; +} +.ui-menu .ui-menu-item a { + text-decoration: none; + display: block; + padding: 2px .4em; + line-height: 1.5; + min-height: 0; /* support: IE7 */ + font-weight: normal; +} +.ui-menu .ui-menu-item a.ui-state-focus, +.ui-menu .ui-menu-item a.ui-state-active { + font-weight: normal; + margin: -1px; +} + +.ui-menu .ui-state-disabled { + font-weight: normal; + margin: .4em 0 .2em; + line-height: 1.5; +} +.ui-menu .ui-state-disabled a { + cursor: default; +} + +/* icon support */ +.ui-menu-icons { + position: relative; +} +.ui-menu-icons .ui-menu-item a { + position: relative; + padding-left: 2em; +} + +/* left-aligned */ +.ui-menu .ui-icon { + position: absolute; + top: .2em; + left: .2em; +} + +/* right-aligned */ +.ui-menu .ui-menu-icon { + position: static; + float: right; +} + +/* Component containers +----------------------------------*/ +.ui-widget { + font-family: Verdana,Arial,sans-serif; + font-size: 1.1em; +} +.ui-widget .ui-widget { + font-size: 1em; +} +.ui-widget input, +.ui-widget select, +.ui-widget textarea, +.ui-widget button { + font-family: Verdana,Arial,sans-serif; + font-size: 1em; +} +.ui-widget-content { + border: 1px solid #aaaaaa; + background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; + color: #222222; +} +.ui-widget-content a { + color: #222222; +} +.ui-widget-header { + border: 1px solid #aaaaaa; + background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; + color: #222222; + font-weight: bold; +} +.ui-widget-header a { + color: #222222; +} + +/* Interaction states +----------------------------------*/ +.ui-state-default, +.ui-widget-content .ui-state-default, +.ui-widget-header .ui-state-default { + border: 1px solid #d3d3d3; + background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; + font-weight: normal; + color: #555555; +} +.ui-state-default a, +.ui-state-default a:link, +.ui-state-default a:visited { + color: #555555; + text-decoration: none; +} +.ui-state-hover, +.ui-widget-content .ui-state-hover, +.ui-widget-header .ui-state-hover, +.ui-state-focus, +.ui-widget-content .ui-state-focus, +.ui-widget-header .ui-state-focus { + border: 1px solid #999999; + background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; + font-weight: normal; + color: #212121; +} +.ui-state-hover a, +.ui-state-hover a:hover, +.ui-state-hover a:link, +.ui-state-hover a:visited, +.ui-state-focus a, +.ui-state-focus a:hover, +.ui-state-focus a:link, +.ui-state-focus a:visited { + color: #212121; + text-decoration: none; +} +.ui-state-active, +.ui-widget-content .ui-state-active, +.ui-widget-header .ui-state-active { + border: 1px solid #aaaaaa; + background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; + font-weight: normal; + color: #212121; +} +.ui-state-active a, +.ui-state-active a:link, +.ui-state-active a:visited { + color: #212121; + text-decoration: none; +} + +/* Interaction Cues +----------------------------------*/ +.ui-state-highlight, +.ui-widget-content .ui-state-highlight, +.ui-widget-header .ui-state-highlight { + border: 1px solid #fcefa1; + background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; + color: #363636; +} +.ui-state-highlight a, +.ui-widget-content .ui-state-highlight a, +.ui-widget-header .ui-state-highlight a { + color: #363636; +} +.ui-state-error, +.ui-widget-content .ui-state-error, +.ui-widget-header .ui-state-error { + border: 1px solid #cd0a0a; + background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; + color: #cd0a0a; +} +.ui-state-error a, +.ui-widget-content .ui-state-error a, +.ui-widget-header .ui-state-error a { + color: #cd0a0a; +} +.ui-state-error-text, +.ui-widget-content .ui-state-error-text, +.ui-widget-header .ui-state-error-text { + color: #cd0a0a; +} +.ui-priority-primary, +.ui-widget-content .ui-priority-primary, +.ui-widget-header .ui-priority-primary { + font-weight: bold; +} +.ui-priority-secondary, +.ui-widget-content .ui-priority-secondary, +.ui-widget-header .ui-priority-secondary { + opacity: .7; + filter:Alpha(Opacity=70); + font-weight: normal; +} +.ui-state-disabled, +.ui-widget-content .ui-state-disabled, +.ui-widget-header .ui-state-disabled { + opacity: .35; + filter:Alpha(Opacity=35); + background-image: none; +} +.ui-state-disabled .ui-icon { + filter:Alpha(Opacity=35); /* For IE8 - See #6059 */ +} + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { + width: 16px; + height: 16px; +} +.ui-icon, +.ui-widget-content .ui-icon { + background-image: url(images/ui-icons_222222_256x240.png); +} +.ui-widget-header .ui-icon { + background-image: url(images/ui-icons_222222_256x240.png); +} +.ui-state-default .ui-icon { + background-image: url(images/ui-icons_888888_256x240.png); +} +.ui-state-hover .ui-icon, +.ui-state-focus .ui-icon { + background-image: url(images/ui-icons_454545_256x240.png); +} +.ui-state-active .ui-icon { + background-image: url(images/ui-icons_454545_256x240.png); +} +.ui-state-highlight .ui-icon { + background-image: url(images/ui-icons_2e83ff_256x240.png); +} +.ui-state-error .ui-icon, +.ui-state-error-text .ui-icon { + background-image: url(images/ui-icons_cd0a0a_256x240.png); +} + +/* positioning */ +.ui-icon-blank { background-position: 16px 16px; } +.ui-icon-carat-1-n { background-position: 0 0; } +.ui-icon-carat-1-ne { background-position: -16px 0; } +.ui-icon-carat-1-e { background-position: -32px 0; } +.ui-icon-carat-1-se { background-position: -48px 0; } +.ui-icon-carat-1-s { background-position: -64px 0; } +.ui-icon-carat-1-sw { background-position: -80px 0; } +.ui-icon-carat-1-w { background-position: -96px 0; } +.ui-icon-carat-1-nw { background-position: -112px 0; } +.ui-icon-carat-2-n-s { background-position: -128px 0; } +.ui-icon-carat-2-e-w { background-position: -144px 0; } +.ui-icon-triangle-1-n { background-position: 0 -16px; } +.ui-icon-triangle-1-ne { background-position: -16px -16px; } +.ui-icon-triangle-1-e { background-position: -32px -16px; } +.ui-icon-triangle-1-se { background-position: -48px -16px; } +.ui-icon-triangle-1-s { background-position: -64px -16px; } +.ui-icon-triangle-1-sw { background-position: -80px -16px; } +.ui-icon-triangle-1-w { background-position: -96px -16px; } +.ui-icon-triangle-1-nw { background-position: -112px -16px; } +.ui-icon-triangle-2-n-s { background-position: -128px -16px; } +.ui-icon-triangle-2-e-w { background-position: -144px -16px; } +.ui-icon-arrow-1-n { background-position: 0 -32px; } +.ui-icon-arrow-1-ne { background-position: -16px -32px; } +.ui-icon-arrow-1-e { background-position: -32px -32px; } +.ui-icon-arrow-1-se { background-position: -48px -32px; } +.ui-icon-arrow-1-s { background-position: -64px -32px; } +.ui-icon-arrow-1-sw { background-position: -80px -32px; } +.ui-icon-arrow-1-w { background-position: -96px -32px; } +.ui-icon-arrow-1-nw { background-position: -112px -32px; } +.ui-icon-arrow-2-n-s { background-position: -128px -32px; } +.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } +.ui-icon-arrow-2-e-w { background-position: -160px -32px; } +.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } +.ui-icon-arrowstop-1-n { background-position: -192px -32px; } +.ui-icon-arrowstop-1-e { background-position: -208px -32px; } +.ui-icon-arrowstop-1-s { background-position: -224px -32px; } +.ui-icon-arrowstop-1-w { background-position: -240px -32px; } +.ui-icon-arrowthick-1-n { background-position: 0 -48px; } +.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } +.ui-icon-arrowthick-1-e { background-position: -32px -48px; } +.ui-icon-arrowthick-1-se { background-position: -48px -48px; } +.ui-icon-arrowthick-1-s { background-position: -64px -48px; } +.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } +.ui-icon-arrowthick-1-w { background-position: -96px -48px; } +.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } +.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } +.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } +.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } +.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } +.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } +.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } +.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } +.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } +.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } +.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } +.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } +.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } +.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } +.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } +.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } +.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } +.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } +.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } +.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } +.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } +.ui-icon-arrow-4 { background-position: 0 -80px; } +.ui-icon-arrow-4-diag { background-position: -16px -80px; } +.ui-icon-extlink { background-position: -32px -80px; } +.ui-icon-newwin { background-position: -48px -80px; } +.ui-icon-refresh { background-position: -64px -80px; } +.ui-icon-shuffle { background-position: -80px -80px; } +.ui-icon-transfer-e-w { background-position: -96px -80px; } +.ui-icon-transferthick-e-w { background-position: -112px -80px; } +.ui-icon-folder-collapsed { background-position: 0 -96px; } +.ui-icon-folder-open { background-position: -16px -96px; } +.ui-icon-document { background-position: -32px -96px; } +.ui-icon-document-b { background-position: -48px -96px; } +.ui-icon-note { background-position: -64px -96px; } +.ui-icon-mail-closed { background-position: -80px -96px; } +.ui-icon-mail-open { background-position: -96px -96px; } +.ui-icon-suitcase { background-position: -112px -96px; } +.ui-icon-comment { background-position: -128px -96px; } +.ui-icon-person { background-position: -144px -96px; } +.ui-icon-print { background-position: -160px -96px; } +.ui-icon-trash { background-position: -176px -96px; } +.ui-icon-locked { background-position: -192px -96px; } +.ui-icon-unlocked { background-position: -208px -96px; } +.ui-icon-bookmark { background-position: -224px -96px; } +.ui-icon-tag { background-position: -240px -96px; } +.ui-icon-home { background-position: 0 -112px; } +.ui-icon-flag { background-position: -16px -112px; } +.ui-icon-calendar { background-position: -32px -112px; } +.ui-icon-cart { background-position: -48px -112px; } +.ui-icon-pencil { background-position: -64px -112px; } +.ui-icon-clock { background-position: -80px -112px; } +.ui-icon-disk { background-position: -96px -112px; } +.ui-icon-calculator { background-position: -112px -112px; } +.ui-icon-zoomin { background-position: -128px -112px; } +.ui-icon-zoomout { background-position: -144px -112px; } +.ui-icon-search { background-position: -160px -112px; } +.ui-icon-wrench { background-position: -176px -112px; } +.ui-icon-gear { background-position: -192px -112px; } +.ui-icon-heart { background-position: -208px -112px; } +.ui-icon-star { background-position: -224px -112px; } +.ui-icon-link { background-position: -240px -112px; } +.ui-icon-cancel { background-position: 0 -128px; } +.ui-icon-plus { background-position: -16px -128px; } +.ui-icon-plusthick { background-position: -32px -128px; } +.ui-icon-minus { background-position: -48px -128px; } +.ui-icon-minusthick { background-position: -64px -128px; } +.ui-icon-close { background-position: -80px -128px; } +.ui-icon-closethick { background-position: -96px -128px; } +.ui-icon-key { background-position: -112px -128px; } +.ui-icon-lightbulb { background-position: -128px -128px; } +.ui-icon-scissors { background-position: -144px -128px; } +.ui-icon-clipboard { background-position: -160px -128px; } +.ui-icon-copy { background-position: -176px -128px; } +.ui-icon-contact { background-position: -192px -128px; } +.ui-icon-image { background-position: -208px -128px; } +.ui-icon-video { background-position: -224px -128px; } +.ui-icon-script { background-position: -240px -128px; } +.ui-icon-alert { background-position: 0 -144px; } +.ui-icon-info { background-position: -16px -144px; } +.ui-icon-notice { background-position: -32px -144px; } +.ui-icon-help { background-position: -48px -144px; } +.ui-icon-check { background-position: -64px -144px; } +.ui-icon-bullet { background-position: -80px -144px; } +.ui-icon-radio-on { background-position: -96px -144px; } +.ui-icon-radio-off { background-position: -112px -144px; } +.ui-icon-pin-w { background-position: -128px -144px; } +.ui-icon-pin-s { background-position: -144px -144px; } +.ui-icon-play { background-position: 0 -160px; } +.ui-icon-pause { background-position: -16px -160px; } +.ui-icon-seek-next { background-position: -32px -160px; } +.ui-icon-seek-prev { background-position: -48px -160px; } +.ui-icon-seek-end { background-position: -64px -160px; } +.ui-icon-seek-start { background-position: -80px -160px; } +/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ +.ui-icon-seek-first { background-position: -80px -160px; } +.ui-icon-stop { background-position: -96px -160px; } +.ui-icon-eject { background-position: -112px -160px; } +.ui-icon-volume-off { background-position: -128px -160px; } +.ui-icon-volume-on { background-position: -144px -160px; } +.ui-icon-power { background-position: 0 -176px; } +.ui-icon-signal-diag { background-position: -16px -176px; } +.ui-icon-signal { background-position: -32px -176px; } +.ui-icon-battery-0 { background-position: -48px -176px; } +.ui-icon-battery-1 { background-position: -64px -176px; } +.ui-icon-battery-2 { background-position: -80px -176px; } +.ui-icon-battery-3 { background-position: -96px -176px; } +.ui-icon-circle-plus { background-position: 0 -192px; } +.ui-icon-circle-minus { background-position: -16px -192px; } +.ui-icon-circle-close { background-position: -32px -192px; } +.ui-icon-circle-triangle-e { background-position: -48px -192px; } +.ui-icon-circle-triangle-s { background-position: -64px -192px; } +.ui-icon-circle-triangle-w { background-position: -80px -192px; } +.ui-icon-circle-triangle-n { background-position: -96px -192px; } +.ui-icon-circle-arrow-e { background-position: -112px -192px; } +.ui-icon-circle-arrow-s { background-position: -128px -192px; } +.ui-icon-circle-arrow-w { background-position: -144px -192px; } +.ui-icon-circle-arrow-n { background-position: -160px -192px; } +.ui-icon-circle-zoomin { background-position: -176px -192px; } +.ui-icon-circle-zoomout { background-position: -192px -192px; } +.ui-icon-circle-check { background-position: -208px -192px; } +.ui-icon-circlesmall-plus { background-position: 0 -208px; } +.ui-icon-circlesmall-minus { background-position: -16px -208px; } +.ui-icon-circlesmall-close { background-position: -32px -208px; } +.ui-icon-squaresmall-plus { background-position: -48px -208px; } +.ui-icon-squaresmall-minus { background-position: -64px -208px; } +.ui-icon-squaresmall-close { background-position: -80px -208px; } +.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } +.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } +.ui-icon-grip-solid-vertical { background-position: -32px -224px; } +.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } +.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } +.ui-icon-grip-diagonal-se { background-position: -80px -224px; } + + +/* Misc visuals +----------------------------------*/ + +/* Corner radius */ +.ui-corner-all, +.ui-corner-top, +.ui-corner-left, +.ui-corner-tl { + border-top-left-radius: 4px; +} +.ui-corner-all, +.ui-corner-top, +.ui-corner-right, +.ui-corner-tr { + border-top-right-radius: 4px; +} +.ui-corner-all, +.ui-corner-bottom, +.ui-corner-left, +.ui-corner-bl { + border-bottom-left-radius: 4px; +} +.ui-corner-all, +.ui-corner-bottom, +.ui-corner-right, +.ui-corner-br { + border-bottom-right-radius: 4px; +} + +/* Overlays */ +.ui-widget-overlay { + background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; + opacity: .3; + filter: Alpha(Opacity=30); +} +.ui-widget-shadow { + margin: -8px 0 0 -8px; + padding: 8px; + background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; + opacity: .3; + filter: Alpha(Opacity=30); + border-radius: 8px; +} diff --git a/themes/default/css/jquery-ui-1.10.4.custom.min.css b/themes/default/css/jquery-ui-1.10.4.custom.min.css new file mode 100644 index 000000000..4dba92a8a --- /dev/null +++ b/themes/default/css/jquery-ui-1.10.4.custom.min.css @@ -0,0 +1,7 @@ +/*! jQuery UI - v1.10.4 - 2014-03-09 +* http://jqueryui.com +* Includes: jquery.ui.core.css, jquery.ui.autocomplete.css, jquery.ui.menu.css, jquery.ui.theme.css +* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px +* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */ + +.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-menu{list-style:none;padding:2px;margin:0;display:block;outline:none}.ui-menu .ui-menu{margin-top:-3px;position:absolute}.ui-menu .ui-menu-item{margin:0;padding:0;width:100%;list-style-image:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}.ui-menu .ui-menu-divider{margin:5px -2px 5px -2px;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-menu-item a{text-decoration:none;display:block;padding:2px .4em;line-height:1.5;min-height:0;font-weight:normal}.ui-menu .ui-menu-item a.ui-state-focus,.ui-menu .ui-menu-item a.ui-state-active{font-weight:normal;margin:-1px}.ui-menu .ui-state-disabled{font-weight:normal;margin:.4em 0 .2em;line-height:1.5}.ui-menu .ui-state-disabled a{cursor:default}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item a{position:relative;padding-left:2em}.ui-menu .ui-icon{position:absolute;top:.2em;left:.2em}.ui-menu .ui-menu-icon{position:static;float:right}.ui-widget{font-family:Verdana,Arial,sans-serif;font-size:1.1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Verdana,Arial,sans-serif;font-size:1em}.ui-widget-content{border:1px solid #aaa;background:#fff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;color:#222}.ui-widget-content a{color:#222}.ui-widget-header{border:1px solid #aaa;background:#ccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;color:#222;font-weight:bold}.ui-widget-header a{color:#222}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #d3d3d3;background:#e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x;font-weight:normal;color:#555}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#555;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid #999;background:#dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited{color:#212121;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #aaa;background:#fff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#212121;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #fcefa1;background:#fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x;color:#363636}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #cd0a0a;background:#fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x;color:#cd0a0a}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#cd0a0a}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#cd0a0a}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url(images/ui-icons_222222_256x240.png)}.ui-widget-header .ui-icon{background-image:url(images/ui-icons_222222_256x240.png)}.ui-state-default .ui-icon{background-image:url(images/ui-icons_888888_256x240.png)}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url(images/ui-icons_454545_256x240.png)}.ui-state-active .ui-icon{background-image:url(images/ui-icons_454545_256x240.png)}.ui-state-highlight .ui-icon{background-image:url(images/ui-icons_2e83ff_256x240.png)}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url(images/ui-icons_cd0a0a_256x240.png)}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:4px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:4px}.ui-widget-overlay{background:#aaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30)}.ui-widget-shadow{margin:-8px 0 0 -8px;padding:8px;background:#aaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;opacity:.3;filter:Alpha(Opacity=30);border-radius:8px} \ No newline at end of file diff --git a/themes/default/css/style.css b/themes/default/css/style.css old mode 100644 new mode 100755 index 286759076..b3d300ed9 --- a/themes/default/css/style.css +++ b/themes/default/css/style.css @@ -347,3 +347,11 @@ a.reading-time span { margin-left: -30px; } +.two-column { + display: block; + width: 50%; + paddig-right: 20px; + float: left; + vertical-align: top; +} + diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig old mode 100644 new mode 100755 index 83f04aa0a..cd6bc66f1 --- a/themes/default/edit-tags.twig +++ b/themes/default/edit-tags.twig @@ -5,6 +5,10 @@ {% endblock %} {% block content %} + + + +

      {{ entry.title|raw }}

      @@ -17,13 +21,15 @@ no tags
        {% for tag in tags %}
      • {{ tag.value }} ✘
        • {% endfor %}
      -
      + -

      {% trans "You can enter multiple tags, separated by commas." %}

      +

      {% trans "Start typing for auto complete." %}
      + {% trans "You can enter multiple tags, separated by commas." %}

      +
      « {% trans "return to article" %} {% endblock %} diff --git a/themes/default/js/autoCompleteTags.js b/themes/default/js/autoCompleteTags.js new file mode 100755 index 000000000..90bc982c2 --- /dev/null +++ b/themes/default/js/autoCompleteTags.js @@ -0,0 +1,47 @@ +jQuery(function($) { + + function split( val ) { + return val.split( /,\s*/ ); + } + function extractLast( term ) { + return split( term ).pop(); + } + + + $("#value").bind("keydown", function(event) { + if (event.keyCode === $.ui.keyCode.TAB && $(this).data("ui-autocomplete").menu.active) { + event.preventDefault(); + } + }).autocomplete({ + source : function(request, response) { + $.getJSON("./?view=tags", { + term : extractLast(request.term), + //id: $(':hidden#entry_id').val() + }, response); + }, + search : function() { + // custom minLength + var term = extractLast(this.value); + if (term.length < 1) { + return false; + } + }, + focus : function() { + // prevent value inserted on focus + return false; + }, + select : function(event, ui) { + var terms = split(this.value); + // remove the current input + terms.pop(); + // add the selected item + terms.push(ui.item.value); + // add placeholder to get the comma-and-space at the end + terms.push(""); + this.value = terms.join(", "); + return false; + } + }); + + +}); diff --git a/themes/default/js/jquery-ui-1.10.4.custom.js b/themes/default/js/jquery-ui-1.10.4.custom.js new file mode 100644 index 000000000..6f599fca4 --- /dev/null +++ b/themes/default/js/jquery-ui-1.10.4.custom.js @@ -0,0 +1,2519 @@ +/*! jQuery UI - v1.10.4 - 2014-03-08 +* http://jqueryui.com +* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.position.js, jquery.ui.autocomplete.js, jquery.ui.menu.js +* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */ + +(function( $, undefined ) { + +var uuid = 0, + runiqueId = /^ui-id-\d+$/; + +// $.ui might exist from components with no dependencies, e.g., $.ui.position +$.ui = $.ui || {}; + +$.extend( $.ui, { + version: "1.10.4", + + keyCode: { + BACKSPACE: 8, + COMMA: 188, + DELETE: 46, + DOWN: 40, + END: 35, + ENTER: 13, + ESCAPE: 27, + HOME: 36, + LEFT: 37, + NUMPAD_ADD: 107, + NUMPAD_DECIMAL: 110, + NUMPAD_DIVIDE: 111, + NUMPAD_ENTER: 108, + NUMPAD_MULTIPLY: 106, + NUMPAD_SUBTRACT: 109, + PAGE_DOWN: 34, + PAGE_UP: 33, + PERIOD: 190, + RIGHT: 39, + SPACE: 32, + TAB: 9, + UP: 38 + } +}); + +// plugins +$.fn.extend({ + focus: (function( orig ) { + return function( delay, fn ) { + return typeof delay === "number" ? + this.each(function() { + var elem = this; + setTimeout(function() { + $( elem ).focus(); + if ( fn ) { + fn.call( elem ); + } + }, delay ); + }) : + orig.apply( this, arguments ); + }; + })( $.fn.focus ), + + scrollParent: function() { + var scrollParent; + if (($.ui.ie && (/(static|relative)/).test(this.css("position"))) || (/absolute/).test(this.css("position"))) { + scrollParent = this.parents().filter(function() { + return (/(relative|absolute|fixed)/).test($.css(this,"position")) && (/(auto|scroll)/).test($.css(this,"overflow")+$.css(this,"overflow-y")+$.css(this,"overflow-x")); + }).eq(0); + } else { + scrollParent = this.parents().filter(function() { + return (/(auto|scroll)/).test($.css(this,"overflow")+$.css(this,"overflow-y")+$.css(this,"overflow-x")); + }).eq(0); + } + + return (/fixed/).test(this.css("position")) || !scrollParent.length ? $(document) : scrollParent; + }, + + zIndex: function( zIndex ) { + if ( zIndex !== undefined ) { + return this.css( "zIndex", zIndex ); + } + + if ( this.length ) { + var elem = $( this[ 0 ] ), position, value; + while ( elem.length && elem[ 0 ] !== document ) { + // Ignore z-index if position is set to a value where z-index is ignored by the browser + // This makes behavior of this function consistent across browsers + // WebKit always returns auto if the element is positioned + position = elem.css( "position" ); + if ( position === "absolute" || position === "relative" || position === "fixed" ) { + // IE returns 0 when zIndex is not specified + // other browsers return a string + // we ignore the case of nested elements with an explicit value of 0 + //
      + value = parseInt( elem.css( "zIndex" ), 10 ); + if ( !isNaN( value ) && value !== 0 ) { + return value; + } + } + elem = elem.parent(); + } + } + + return 0; + }, + + uniqueId: function() { + return this.each(function() { + if ( !this.id ) { + this.id = "ui-id-" + (++uuid); + } + }); + }, + + removeUniqueId: function() { + return this.each(function() { + if ( runiqueId.test( this.id ) ) { + $( this ).removeAttr( "id" ); + } + }); + } +}); + +// selectors +function focusable( element, isTabIndexNotNaN ) { + var map, mapName, img, + nodeName = element.nodeName.toLowerCase(); + if ( "area" === nodeName ) { + map = element.parentNode; + mapName = map.name; + if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) { + return false; + } + img = $( "img[usemap=#" + mapName + "]" )[0]; + return !!img && visible( img ); + } + return ( /input|select|textarea|button|object/.test( nodeName ) ? + !element.disabled : + "a" === nodeName ? + element.href || isTabIndexNotNaN : + isTabIndexNotNaN) && + // the element and all of its ancestors must be visible + visible( element ); +} + +function visible( element ) { + return $.expr.filters.visible( element ) && + !$( element ).parents().addBack().filter(function() { + return $.css( this, "visibility" ) === "hidden"; + }).length; +} + +$.extend( $.expr[ ":" ], { + data: $.expr.createPseudo ? + $.expr.createPseudo(function( dataName ) { + return function( elem ) { + return !!$.data( elem, dataName ); + }; + }) : + // support: jQuery <1.8 + function( elem, i, match ) { + return !!$.data( elem, match[ 3 ] ); + }, + + focusable: function( element ) { + return focusable( element, !isNaN( $.attr( element, "tabindex" ) ) ); + }, + + tabbable: function( element ) { + var tabIndex = $.attr( element, "tabindex" ), + isTabIndexNaN = isNaN( tabIndex ); + return ( isTabIndexNaN || tabIndex >= 0 ) && focusable( element, !isTabIndexNaN ); + } +}); + +// support: jQuery <1.8 +if ( !$( "" ).outerWidth( 1 ).jquery ) { + $.each( [ "Width", "Height" ], function( i, name ) { + var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ], + type = name.toLowerCase(), + orig = { + innerWidth: $.fn.innerWidth, + innerHeight: $.fn.innerHeight, + outerWidth: $.fn.outerWidth, + outerHeight: $.fn.outerHeight + }; + + function reduce( elem, size, border, margin ) { + $.each( side, function() { + size -= parseFloat( $.css( elem, "padding" + this ) ) || 0; + if ( border ) { + size -= parseFloat( $.css( elem, "border" + this + "Width" ) ) || 0; + } + if ( margin ) { + size -= parseFloat( $.css( elem, "margin" + this ) ) || 0; + } + }); + return size; + } + + $.fn[ "inner" + name ] = function( size ) { + if ( size === undefined ) { + return orig[ "inner" + name ].call( this ); + } + + return this.each(function() { + $( this ).css( type, reduce( this, size ) + "px" ); + }); + }; + + $.fn[ "outer" + name] = function( size, margin ) { + if ( typeof size !== "number" ) { + return orig[ "outer" + name ].call( this, size ); + } + + return this.each(function() { + $( this).css( type, reduce( this, size, true, margin ) + "px" ); + }); + }; + }); +} + +// support: jQuery <1.8 +if ( !$.fn.addBack ) { + $.fn.addBack = function( selector ) { + return this.add( selector == null ? + this.prevObject : this.prevObject.filter( selector ) + ); + }; +} + +// support: jQuery 1.6.1, 1.6.2 (http://bugs.jquery.com/ticket/9413) +if ( $( "" ).data( "a-b", "a" ).removeData( "a-b" ).data( "a-b" ) ) { + $.fn.removeData = (function( removeData ) { + return function( key ) { + if ( arguments.length ) { + return removeData.call( this, $.camelCase( key ) ); + } else { + return removeData.call( this ); + } + }; + })( $.fn.removeData ); +} + + + + + +// deprecated +$.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() ); + +$.support.selectstart = "onselectstart" in document.createElement( "div" ); +$.fn.extend({ + disableSelection: function() { + return this.bind( ( $.support.selectstart ? "selectstart" : "mousedown" ) + + ".ui-disableSelection", function( event ) { + event.preventDefault(); + }); + }, + + enableSelection: function() { + return this.unbind( ".ui-disableSelection" ); + } +}); + +$.extend( $.ui, { + // $.ui.plugin is deprecated. Use $.widget() extensions instead. + plugin: { + add: function( module, option, set ) { + var i, + proto = $.ui[ module ].prototype; + for ( i in set ) { + proto.plugins[ i ] = proto.plugins[ i ] || []; + proto.plugins[ i ].push( [ option, set[ i ] ] ); + } + }, + call: function( instance, name, args ) { + var i, + set = instance.plugins[ name ]; + if ( !set || !instance.element[ 0 ].parentNode || instance.element[ 0 ].parentNode.nodeType === 11 ) { + return; + } + + for ( i = 0; i < set.length; i++ ) { + if ( instance.options[ set[ i ][ 0 ] ] ) { + set[ i ][ 1 ].apply( instance.element, args ); + } + } + } + }, + + // only used by resizable + hasScroll: function( el, a ) { + + //If overflow is hidden, the element might have extra content, but the user wants to hide it + if ( $( el ).css( "overflow" ) === "hidden") { + return false; + } + + var scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop", + has = false; + + if ( el[ scroll ] > 0 ) { + return true; + } + + // TODO: determine which cases actually cause this to happen + // if the element doesn't have the scroll set, see if it's possible to + // set the scroll + el[ scroll ] = 1; + has = ( el[ scroll ] > 0 ); + el[ scroll ] = 0; + return has; + } +}); + +})( jQuery ); +(function( $, undefined ) { + +var uuid = 0, + slice = Array.prototype.slice, + _cleanData = $.cleanData; +$.cleanData = function( elems ) { + for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) { + try { + $( elem ).triggerHandler( "remove" ); + // http://bugs.jquery.com/ticket/8235 + } catch( e ) {} + } + _cleanData( elems ); +}; + +$.widget = function( name, base, prototype ) { + var fullName, existingConstructor, constructor, basePrototype, + // proxiedPrototype allows the provided prototype to remain unmodified + // so that it can be used as a mixin for multiple widgets (#8876) + proxiedPrototype = {}, + namespace = name.split( "." )[ 0 ]; + + name = name.split( "." )[ 1 ]; + fullName = namespace + "-" + name; + + if ( !prototype ) { + prototype = base; + base = $.Widget; + } + + // create selector for plugin + $.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) { + return !!$.data( elem, fullName ); + }; + + $[ namespace ] = $[ namespace ] || {}; + existingConstructor = $[ namespace ][ name ]; + constructor = $[ namespace ][ name ] = function( options, element ) { + // allow instantiation without "new" keyword + if ( !this._createWidget ) { + return new constructor( options, element ); + } + + // allow instantiation without initializing for simple inheritance + // must use "new" keyword (the code above always passes args) + if ( arguments.length ) { + this._createWidget( options, element ); + } + }; + // extend with the existing constructor to carry over any static properties + $.extend( constructor, existingConstructor, { + version: prototype.version, + // copy the object used to create the prototype in case we need to + // redefine the widget later + _proto: $.extend( {}, prototype ), + // track widgets that inherit from this widget in case this widget is + // redefined after a widget inherits from it + _childConstructors: [] + }); + + basePrototype = new base(); + // we need to make the options hash a property directly on the new instance + // otherwise we'll modify the options hash on the prototype that we're + // inheriting from + basePrototype.options = $.widget.extend( {}, basePrototype.options ); + $.each( prototype, function( prop, value ) { + if ( !$.isFunction( value ) ) { + proxiedPrototype[ prop ] = value; + return; + } + proxiedPrototype[ prop ] = (function() { + var _super = function() { + return base.prototype[ prop ].apply( this, arguments ); + }, + _superApply = function( args ) { + return base.prototype[ prop ].apply( this, args ); + }; + return function() { + var __super = this._super, + __superApply = this._superApply, + returnValue; + + this._super = _super; + this._superApply = _superApply; + + returnValue = value.apply( this, arguments ); + + this._super = __super; + this._superApply = __superApply; + + return returnValue; + }; + })(); + }); + constructor.prototype = $.widget.extend( basePrototype, { + // TODO: remove support for widgetEventPrefix + // always use the name + a colon as the prefix, e.g., draggable:start + // don't prefix for widgets that aren't DOM-based + widgetEventPrefix: existingConstructor ? (basePrototype.widgetEventPrefix || name) : name + }, proxiedPrototype, { + constructor: constructor, + namespace: namespace, + widgetName: name, + widgetFullName: fullName + }); + + // If this widget is being redefined then we need to find all widgets that + // are inheriting from it and redefine all of them so that they inherit from + // the new version of this widget. We're essentially trying to replace one + // level in the prototype chain. + if ( existingConstructor ) { + $.each( existingConstructor._childConstructors, function( i, child ) { + var childPrototype = child.prototype; + + // redefine the child widget using the same prototype that was + // originally used, but inherit from the new version of the base + $.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, child._proto ); + }); + // remove the list of existing child constructors from the old constructor + // so the old child constructors can be garbage collected + delete existingConstructor._childConstructors; + } else { + base._childConstructors.push( constructor ); + } + + $.widget.bridge( name, constructor ); +}; + +$.widget.extend = function( target ) { + var input = slice.call( arguments, 1 ), + inputIndex = 0, + inputLength = input.length, + key, + value; + for ( ; inputIndex < inputLength; inputIndex++ ) { + for ( key in input[ inputIndex ] ) { + value = input[ inputIndex ][ key ]; + if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) { + // Clone objects + if ( $.isPlainObject( value ) ) { + target[ key ] = $.isPlainObject( target[ key ] ) ? + $.widget.extend( {}, target[ key ], value ) : + // Don't extend strings, arrays, etc. with objects + $.widget.extend( {}, value ); + // Copy everything else by reference + } else { + target[ key ] = value; + } + } + } + } + return target; +}; + +$.widget.bridge = function( name, object ) { + var fullName = object.prototype.widgetFullName || name; + $.fn[ name ] = function( options ) { + var isMethodCall = typeof options === "string", + args = slice.call( arguments, 1 ), + returnValue = this; + + // allow multiple hashes to be passed on init + options = !isMethodCall && args.length ? + $.widget.extend.apply( null, [ options ].concat(args) ) : + options; + + if ( isMethodCall ) { + this.each(function() { + var methodValue, + instance = $.data( this, fullName ); + if ( !instance ) { + return $.error( "cannot call methods on " + name + " prior to initialization; " + + "attempted to call method '" + options + "'" ); + } + if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) { + return $.error( "no such method '" + options + "' for " + name + " widget instance" ); + } + methodValue = instance[ options ].apply( instance, args ); + if ( methodValue !== instance && methodValue !== undefined ) { + returnValue = methodValue && methodValue.jquery ? + returnValue.pushStack( methodValue.get() ) : + methodValue; + return false; + } + }); + } else { + this.each(function() { + var instance = $.data( this, fullName ); + if ( instance ) { + instance.option( options || {} )._init(); + } else { + $.data( this, fullName, new object( options, this ) ); + } + }); + } + + return returnValue; + }; +}; + +$.Widget = function( /* options, element */ ) {}; +$.Widget._childConstructors = []; + +$.Widget.prototype = { + widgetName: "widget", + widgetEventPrefix: "", + defaultElement: "
      ", + options: { + disabled: false, + + // callbacks + create: null + }, + _createWidget: function( options, element ) { + element = $( element || this.defaultElement || this )[ 0 ]; + this.element = $( element ); + this.uuid = uuid++; + this.eventNamespace = "." + this.widgetName + this.uuid; + this.options = $.widget.extend( {}, + this.options, + this._getCreateOptions(), + options ); + + this.bindings = $(); + this.hoverable = $(); + this.focusable = $(); + + if ( element !== this ) { + $.data( element, this.widgetFullName, this ); + this._on( true, this.element, { + remove: function( event ) { + if ( event.target === element ) { + this.destroy(); + } + } + }); + this.document = $( element.style ? + // element within the document + element.ownerDocument : + // element is window or document + element.document || element ); + this.window = $( this.document[0].defaultView || this.document[0].parentWindow ); + } + + this._create(); + this._trigger( "create", null, this._getCreateEventData() ); + this._init(); + }, + _getCreateOptions: $.noop, + _getCreateEventData: $.noop, + _create: $.noop, + _init: $.noop, + + destroy: function() { + this._destroy(); + // we can probably remove the unbind calls in 2.0 + // all event bindings should go through this._on() + this.element + .unbind( this.eventNamespace ) + // 1.9 BC for #7810 + // TODO remove dual storage + .removeData( this.widgetName ) + .removeData( this.widgetFullName ) + // support: jquery <1.6.3 + // http://bugs.jquery.com/ticket/9413 + .removeData( $.camelCase( this.widgetFullName ) ); + this.widget() + .unbind( this.eventNamespace ) + .removeAttr( "aria-disabled" ) + .removeClass( + this.widgetFullName + "-disabled " + + "ui-state-disabled" ); + + // clean up events and states + this.bindings.unbind( this.eventNamespace ); + this.hoverable.removeClass( "ui-state-hover" ); + this.focusable.removeClass( "ui-state-focus" ); + }, + _destroy: $.noop, + + widget: function() { + return this.element; + }, + + option: function( key, value ) { + var options = key, + parts, + curOption, + i; + + if ( arguments.length === 0 ) { + // don't return a reference to the internal hash + return $.widget.extend( {}, this.options ); + } + + if ( typeof key === "string" ) { + // handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } } + options = {}; + parts = key.split( "." ); + key = parts.shift(); + if ( parts.length ) { + curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] ); + for ( i = 0; i < parts.length - 1; i++ ) { + curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {}; + curOption = curOption[ parts[ i ] ]; + } + key = parts.pop(); + if ( arguments.length === 1 ) { + return curOption[ key ] === undefined ? null : curOption[ key ]; + } + curOption[ key ] = value; + } else { + if ( arguments.length === 1 ) { + return this.options[ key ] === undefined ? null : this.options[ key ]; + } + options[ key ] = value; + } + } + + this._setOptions( options ); + + return this; + }, + _setOptions: function( options ) { + var key; + + for ( key in options ) { + this._setOption( key, options[ key ] ); + } + + return this; + }, + _setOption: function( key, value ) { + this.options[ key ] = value; + + if ( key === "disabled" ) { + this.widget() + .toggleClass( this.widgetFullName + "-disabled ui-state-disabled", !!value ) + .attr( "aria-disabled", value ); + this.hoverable.removeClass( "ui-state-hover" ); + this.focusable.removeClass( "ui-state-focus" ); + } + + return this; + }, + + enable: function() { + return this._setOption( "disabled", false ); + }, + disable: function() { + return this._setOption( "disabled", true ); + }, + + _on: function( suppressDisabledCheck, element, handlers ) { + var delegateElement, + instance = this; + + // no suppressDisabledCheck flag, shuffle arguments + if ( typeof suppressDisabledCheck !== "boolean" ) { + handlers = element; + element = suppressDisabledCheck; + suppressDisabledCheck = false; + } + + // no element argument, shuffle and use this.element + if ( !handlers ) { + handlers = element; + element = this.element; + delegateElement = this.widget(); + } else { + // accept selectors, DOM elements + element = delegateElement = $( element ); + this.bindings = this.bindings.add( element ); + } + + $.each( handlers, function( event, handler ) { + function handlerProxy() { + // allow widgets to customize the disabled handling + // - disabled as an array instead of boolean + // - disabled class as method for disabling individual parts + if ( !suppressDisabledCheck && + ( instance.options.disabled === true || + $( this ).hasClass( "ui-state-disabled" ) ) ) { + return; + } + return ( typeof handler === "string" ? instance[ handler ] : handler ) + .apply( instance, arguments ); + } + + // copy the guid so direct unbinding works + if ( typeof handler !== "string" ) { + handlerProxy.guid = handler.guid = + handler.guid || handlerProxy.guid || $.guid++; + } + + var match = event.match( /^(\w+)\s*(.*)$/ ), + eventName = match[1] + instance.eventNamespace, + selector = match[2]; + if ( selector ) { + delegateElement.delegate( selector, eventName, handlerProxy ); + } else { + element.bind( eventName, handlerProxy ); + } + }); + }, + + _off: function( element, eventName ) { + eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace; + element.unbind( eventName ).undelegate( eventName ); + }, + + _delay: function( handler, delay ) { + function handlerProxy() { + return ( typeof handler === "string" ? instance[ handler ] : handler ) + .apply( instance, arguments ); + } + var instance = this; + return setTimeout( handlerProxy, delay || 0 ); + }, + + _hoverable: function( element ) { + this.hoverable = this.hoverable.add( element ); + this._on( element, { + mouseenter: function( event ) { + $( event.currentTarget ).addClass( "ui-state-hover" ); + }, + mouseleave: function( event ) { + $( event.currentTarget ).removeClass( "ui-state-hover" ); + } + }); + }, + + _focusable: function( element ) { + this.focusable = this.focusable.add( element ); + this._on( element, { + focusin: function( event ) { + $( event.currentTarget ).addClass( "ui-state-focus" ); + }, + focusout: function( event ) { + $( event.currentTarget ).removeClass( "ui-state-focus" ); + } + }); + }, + + _trigger: function( type, event, data ) { + var prop, orig, + callback = this.options[ type ]; + + data = data || {}; + event = $.Event( event ); + event.type = ( type === this.widgetEventPrefix ? + type : + this.widgetEventPrefix + type ).toLowerCase(); + // the original event may come from any element + // so we need to reset the target on the new event + event.target = this.element[ 0 ]; + + // copy original event properties over to the new event + orig = event.originalEvent; + if ( orig ) { + for ( prop in orig ) { + if ( !( prop in event ) ) { + event[ prop ] = orig[ prop ]; + } + } + } + + this.element.trigger( event, data ); + return !( $.isFunction( callback ) && + callback.apply( this.element[0], [ event ].concat( data ) ) === false || + event.isDefaultPrevented() ); + } +}; + +$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) { + $.Widget.prototype[ "_" + method ] = function( element, options, callback ) { + if ( typeof options === "string" ) { + options = { effect: options }; + } + var hasOptions, + effectName = !options ? + method : + options === true || typeof options === "number" ? + defaultEffect : + options.effect || defaultEffect; + options = options || {}; + if ( typeof options === "number" ) { + options = { duration: options }; + } + hasOptions = !$.isEmptyObject( options ); + options.complete = callback; + if ( options.delay ) { + element.delay( options.delay ); + } + if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) { + element[ method ]( options ); + } else if ( effectName !== method && element[ effectName ] ) { + element[ effectName ]( options.duration, options.easing, callback ); + } else { + element.queue(function( next ) { + $( this )[ method ](); + if ( callback ) { + callback.call( element[ 0 ] ); + } + next(); + }); + } + }; +}); + +})( jQuery ); +(function( $, undefined ) { + +$.ui = $.ui || {}; + +var cachedScrollbarWidth, + max = Math.max, + abs = Math.abs, + round = Math.round, + rhorizontal = /left|center|right/, + rvertical = /top|center|bottom/, + roffset = /[\+\-]\d+(\.[\d]+)?%?/, + rposition = /^\w+/, + rpercent = /%$/, + _position = $.fn.position; + +function getOffsets( offsets, width, height ) { + return [ + parseFloat( offsets[ 0 ] ) * ( rpercent.test( offsets[ 0 ] ) ? width / 100 : 1 ), + parseFloat( offsets[ 1 ] ) * ( rpercent.test( offsets[ 1 ] ) ? height / 100 : 1 ) + ]; +} + +function parseCss( element, property ) { + return parseInt( $.css( element, property ), 10 ) || 0; +} + +function getDimensions( elem ) { + var raw = elem[0]; + if ( raw.nodeType === 9 ) { + return { + width: elem.width(), + height: elem.height(), + offset: { top: 0, left: 0 } + }; + } + if ( $.isWindow( raw ) ) { + return { + width: elem.width(), + height: elem.height(), + offset: { top: elem.scrollTop(), left: elem.scrollLeft() } + }; + } + if ( raw.preventDefault ) { + return { + width: 0, + height: 0, + offset: { top: raw.pageY, left: raw.pageX } + }; + } + return { + width: elem.outerWidth(), + height: elem.outerHeight(), + offset: elem.offset() + }; +} + +$.position = { + scrollbarWidth: function() { + if ( cachedScrollbarWidth !== undefined ) { + return cachedScrollbarWidth; + } + var w1, w2, + div = $( "
      " ), + innerDiv = div.children()[0]; + + $( "body" ).append( div ); + w1 = innerDiv.offsetWidth; + div.css( "overflow", "scroll" ); + + w2 = innerDiv.offsetWidth; + + if ( w1 === w2 ) { + w2 = div[0].clientWidth; + } + + div.remove(); + + return (cachedScrollbarWidth = w1 - w2); + }, + getScrollInfo: function( within ) { + var overflowX = within.isWindow || within.isDocument ? "" : + within.element.css( "overflow-x" ), + overflowY = within.isWindow || within.isDocument ? "" : + within.element.css( "overflow-y" ), + hasOverflowX = overflowX === "scroll" || + ( overflowX === "auto" && within.width < within.element[0].scrollWidth ), + hasOverflowY = overflowY === "scroll" || + ( overflowY === "auto" && within.height < within.element[0].scrollHeight ); + return { + width: hasOverflowY ? $.position.scrollbarWidth() : 0, + height: hasOverflowX ? $.position.scrollbarWidth() : 0 + }; + }, + getWithinInfo: function( element ) { + var withinElement = $( element || window ), + isWindow = $.isWindow( withinElement[0] ), + isDocument = !!withinElement[ 0 ] && withinElement[ 0 ].nodeType === 9; + return { + element: withinElement, + isWindow: isWindow, + isDocument: isDocument, + offset: withinElement.offset() || { left: 0, top: 0 }, + scrollLeft: withinElement.scrollLeft(), + scrollTop: withinElement.scrollTop(), + width: isWindow ? withinElement.width() : withinElement.outerWidth(), + height: isWindow ? withinElement.height() : withinElement.outerHeight() + }; + } +}; + +$.fn.position = function( options ) { + if ( !options || !options.of ) { + return _position.apply( this, arguments ); + } + + // make a copy, we don't want to modify arguments + options = $.extend( {}, options ); + + var atOffset, targetWidth, targetHeight, targetOffset, basePosition, dimensions, + target = $( options.of ), + within = $.position.getWithinInfo( options.within ), + scrollInfo = $.position.getScrollInfo( within ), + collision = ( options.collision || "flip" ).split( " " ), + offsets = {}; + + dimensions = getDimensions( target ); + if ( target[0].preventDefault ) { + // force left top to allow flipping + options.at = "left top"; + } + targetWidth = dimensions.width; + targetHeight = dimensions.height; + targetOffset = dimensions.offset; + // clone to reuse original targetOffset later + basePosition = $.extend( {}, targetOffset ); + + // force my and at to have valid horizontal and vertical positions + // if a value is missing or invalid, it will be converted to center + $.each( [ "my", "at" ], function() { + var pos = ( options[ this ] || "" ).split( " " ), + horizontalOffset, + verticalOffset; + + if ( pos.length === 1) { + pos = rhorizontal.test( pos[ 0 ] ) ? + pos.concat( [ "center" ] ) : + rvertical.test( pos[ 0 ] ) ? + [ "center" ].concat( pos ) : + [ "center", "center" ]; + } + pos[ 0 ] = rhorizontal.test( pos[ 0 ] ) ? pos[ 0 ] : "center"; + pos[ 1 ] = rvertical.test( pos[ 1 ] ) ? pos[ 1 ] : "center"; + + // calculate offsets + horizontalOffset = roffset.exec( pos[ 0 ] ); + verticalOffset = roffset.exec( pos[ 1 ] ); + offsets[ this ] = [ + horizontalOffset ? horizontalOffset[ 0 ] : 0, + verticalOffset ? verticalOffset[ 0 ] : 0 + ]; + + // reduce to just the positions without the offsets + options[ this ] = [ + rposition.exec( pos[ 0 ] )[ 0 ], + rposition.exec( pos[ 1 ] )[ 0 ] + ]; + }); + + // normalize collision option + if ( collision.length === 1 ) { + collision[ 1 ] = collision[ 0 ]; + } + + if ( options.at[ 0 ] === "right" ) { + basePosition.left += targetWidth; + } else if ( options.at[ 0 ] === "center" ) { + basePosition.left += targetWidth / 2; + } + + if ( options.at[ 1 ] === "bottom" ) { + basePosition.top += targetHeight; + } else if ( options.at[ 1 ] === "center" ) { + basePosition.top += targetHeight / 2; + } + + atOffset = getOffsets( offsets.at, targetWidth, targetHeight ); + basePosition.left += atOffset[ 0 ]; + basePosition.top += atOffset[ 1 ]; + + return this.each(function() { + var collisionPosition, using, + elem = $( this ), + elemWidth = elem.outerWidth(), + elemHeight = elem.outerHeight(), + marginLeft = parseCss( this, "marginLeft" ), + marginTop = parseCss( this, "marginTop" ), + collisionWidth = elemWidth + marginLeft + parseCss( this, "marginRight" ) + scrollInfo.width, + collisionHeight = elemHeight + marginTop + parseCss( this, "marginBottom" ) + scrollInfo.height, + position = $.extend( {}, basePosition ), + myOffset = getOffsets( offsets.my, elem.outerWidth(), elem.outerHeight() ); + + if ( options.my[ 0 ] === "right" ) { + position.left -= elemWidth; + } else if ( options.my[ 0 ] === "center" ) { + position.left -= elemWidth / 2; + } + + if ( options.my[ 1 ] === "bottom" ) { + position.top -= elemHeight; + } else if ( options.my[ 1 ] === "center" ) { + position.top -= elemHeight / 2; + } + + position.left += myOffset[ 0 ]; + position.top += myOffset[ 1 ]; + + // if the browser doesn't support fractions, then round for consistent results + if ( !$.support.offsetFractions ) { + position.left = round( position.left ); + position.top = round( position.top ); + } + + collisionPosition = { + marginLeft: marginLeft, + marginTop: marginTop + }; + + $.each( [ "left", "top" ], function( i, dir ) { + if ( $.ui.position[ collision[ i ] ] ) { + $.ui.position[ collision[ i ] ][ dir ]( position, { + targetWidth: targetWidth, + targetHeight: targetHeight, + elemWidth: elemWidth, + elemHeight: elemHeight, + collisionPosition: collisionPosition, + collisionWidth: collisionWidth, + collisionHeight: collisionHeight, + offset: [ atOffset[ 0 ] + myOffset[ 0 ], atOffset [ 1 ] + myOffset[ 1 ] ], + my: options.my, + at: options.at, + within: within, + elem : elem + }); + } + }); + + if ( options.using ) { + // adds feedback as second argument to using callback, if present + using = function( props ) { + var left = targetOffset.left - position.left, + right = left + targetWidth - elemWidth, + top = targetOffset.top - position.top, + bottom = top + targetHeight - elemHeight, + feedback = { + target: { + element: target, + left: targetOffset.left, + top: targetOffset.top, + width: targetWidth, + height: targetHeight + }, + element: { + element: elem, + left: position.left, + top: position.top, + width: elemWidth, + height: elemHeight + }, + horizontal: right < 0 ? "left" : left > 0 ? "right" : "center", + vertical: bottom < 0 ? "top" : top > 0 ? "bottom" : "middle" + }; + if ( targetWidth < elemWidth && abs( left + right ) < targetWidth ) { + feedback.horizontal = "center"; + } + if ( targetHeight < elemHeight && abs( top + bottom ) < targetHeight ) { + feedback.vertical = "middle"; + } + if ( max( abs( left ), abs( right ) ) > max( abs( top ), abs( bottom ) ) ) { + feedback.important = "horizontal"; + } else { + feedback.important = "vertical"; + } + options.using.call( this, props, feedback ); + }; + } + + elem.offset( $.extend( position, { using: using } ) ); + }); +}; + +$.ui.position = { + fit: { + left: function( position, data ) { + var within = data.within, + withinOffset = within.isWindow ? within.scrollLeft : within.offset.left, + outerWidth = within.width, + collisionPosLeft = position.left - data.collisionPosition.marginLeft, + overLeft = withinOffset - collisionPosLeft, + overRight = collisionPosLeft + data.collisionWidth - outerWidth - withinOffset, + newOverRight; + + // element is wider than within + if ( data.collisionWidth > outerWidth ) { + // element is initially over the left side of within + if ( overLeft > 0 && overRight <= 0 ) { + newOverRight = position.left + overLeft + data.collisionWidth - outerWidth - withinOffset; + position.left += overLeft - newOverRight; + // element is initially over right side of within + } else if ( overRight > 0 && overLeft <= 0 ) { + position.left = withinOffset; + // element is initially over both left and right sides of within + } else { + if ( overLeft > overRight ) { + position.left = withinOffset + outerWidth - data.collisionWidth; + } else { + position.left = withinOffset; + } + } + // too far left -> align with left edge + } else if ( overLeft > 0 ) { + position.left += overLeft; + // too far right -> align with right edge + } else if ( overRight > 0 ) { + position.left -= overRight; + // adjust based on position and margin + } else { + position.left = max( position.left - collisionPosLeft, position.left ); + } + }, + top: function( position, data ) { + var within = data.within, + withinOffset = within.isWindow ? within.scrollTop : within.offset.top, + outerHeight = data.within.height, + collisionPosTop = position.top - data.collisionPosition.marginTop, + overTop = withinOffset - collisionPosTop, + overBottom = collisionPosTop + data.collisionHeight - outerHeight - withinOffset, + newOverBottom; + + // element is taller than within + if ( data.collisionHeight > outerHeight ) { + // element is initially over the top of within + if ( overTop > 0 && overBottom <= 0 ) { + newOverBottom = position.top + overTop + data.collisionHeight - outerHeight - withinOffset; + position.top += overTop - newOverBottom; + // element is initially over bottom of within + } else if ( overBottom > 0 && overTop <= 0 ) { + position.top = withinOffset; + // element is initially over both top and bottom of within + } else { + if ( overTop > overBottom ) { + position.top = withinOffset + outerHeight - data.collisionHeight; + } else { + position.top = withinOffset; + } + } + // too far up -> align with top + } else if ( overTop > 0 ) { + position.top += overTop; + // too far down -> align with bottom edge + } else if ( overBottom > 0 ) { + position.top -= overBottom; + // adjust based on position and margin + } else { + position.top = max( position.top - collisionPosTop, position.top ); + } + } + }, + flip: { + left: function( position, data ) { + var within = data.within, + withinOffset = within.offset.left + within.scrollLeft, + outerWidth = within.width, + offsetLeft = within.isWindow ? within.scrollLeft : within.offset.left, + collisionPosLeft = position.left - data.collisionPosition.marginLeft, + overLeft = collisionPosLeft - offsetLeft, + overRight = collisionPosLeft + data.collisionWidth - outerWidth - offsetLeft, + myOffset = data.my[ 0 ] === "left" ? + -data.elemWidth : + data.my[ 0 ] === "right" ? + data.elemWidth : + 0, + atOffset = data.at[ 0 ] === "left" ? + data.targetWidth : + data.at[ 0 ] === "right" ? + -data.targetWidth : + 0, + offset = -2 * data.offset[ 0 ], + newOverRight, + newOverLeft; + + if ( overLeft < 0 ) { + newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth - outerWidth - withinOffset; + if ( newOverRight < 0 || newOverRight < abs( overLeft ) ) { + position.left += myOffset + atOffset + offset; + } + } + else if ( overRight > 0 ) { + newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset + atOffset + offset - offsetLeft; + if ( newOverLeft > 0 || abs( newOverLeft ) < overRight ) { + position.left += myOffset + atOffset + offset; + } + } + }, + top: function( position, data ) { + var within = data.within, + withinOffset = within.offset.top + within.scrollTop, + outerHeight = within.height, + offsetTop = within.isWindow ? within.scrollTop : within.offset.top, + collisionPosTop = position.top - data.collisionPosition.marginTop, + overTop = collisionPosTop - offsetTop, + overBottom = collisionPosTop + data.collisionHeight - outerHeight - offsetTop, + top = data.my[ 1 ] === "top", + myOffset = top ? + -data.elemHeight : + data.my[ 1 ] === "bottom" ? + data.elemHeight : + 0, + atOffset = data.at[ 1 ] === "top" ? + data.targetHeight : + data.at[ 1 ] === "bottom" ? + -data.targetHeight : + 0, + offset = -2 * data.offset[ 1 ], + newOverTop, + newOverBottom; + if ( overTop < 0 ) { + newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight - outerHeight - withinOffset; + if ( ( position.top + myOffset + atOffset + offset) > overTop && ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) ) { + position.top += myOffset + atOffset + offset; + } + } + else if ( overBottom > 0 ) { + newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop; + if ( ( position.top + myOffset + atOffset + offset) > overBottom && ( newOverTop > 0 || abs( newOverTop ) < overBottom ) ) { + position.top += myOffset + atOffset + offset; + } + } + } + }, + flipfit: { + left: function() { + $.ui.position.flip.left.apply( this, arguments ); + $.ui.position.fit.left.apply( this, arguments ); + }, + top: function() { + $.ui.position.flip.top.apply( this, arguments ); + $.ui.position.fit.top.apply( this, arguments ); + } + } +}; + +// fraction support test +(function () { + var testElement, testElementParent, testElementStyle, offsetLeft, i, + body = document.getElementsByTagName( "body" )[ 0 ], + div = document.createElement( "div" ); + + //Create a "fake body" for testing based on method used in jQuery.support + testElement = document.createElement( body ? "div" : "body" ); + testElementStyle = { + visibility: "hidden", + width: 0, + height: 0, + border: 0, + margin: 0, + background: "none" + }; + if ( body ) { + $.extend( testElementStyle, { + position: "absolute", + left: "-1000px", + top: "-1000px" + }); + } + for ( i in testElementStyle ) { + testElement.style[ i ] = testElementStyle[ i ]; + } + testElement.appendChild( div ); + testElementParent = body || document.documentElement; + testElementParent.insertBefore( testElement, testElementParent.firstChild ); + + div.style.cssText = "position: absolute; left: 10.7432222px;"; + + offsetLeft = $( div ).offset().left; + $.support.offsetFractions = offsetLeft > 10 && offsetLeft < 11; + + testElement.innerHTML = ""; + testElementParent.removeChild( testElement ); +})(); + +}( jQuery ) ); +(function( $, undefined ) { + +$.widget( "ui.autocomplete", { + version: "1.10.4", + defaultElement: "", + options: { + appendTo: null, + autoFocus: false, + delay: 300, + minLength: 1, + position: { + my: "left top", + at: "left bottom", + collision: "none" + }, + source: null, + + // callbacks + change: null, + close: null, + focus: null, + open: null, + response: null, + search: null, + select: null + }, + + requestIndex: 0, + pending: 0, + + _create: function() { + // Some browsers only repeat keydown events, not keypress events, + // so we use the suppressKeyPress flag to determine if we've already + // handled the keydown event. #7269 + // Unfortunately the code for & in keypress is the same as the up arrow, + // so we use the suppressKeyPressRepeat flag to avoid handling keypress + // events when we know the keydown event was used to modify the + // search term. #7799 + var suppressKeyPress, suppressKeyPressRepeat, suppressInput, + nodeName = this.element[0].nodeName.toLowerCase(), + isTextarea = nodeName === "textarea", + isInput = nodeName === "input"; + + this.isMultiLine = + // Textareas are always multi-line + isTextarea ? true : + // Inputs are always single-line, even if inside a contentEditable element + // IE also treats inputs as contentEditable + isInput ? false : + // All other element types are determined by whether or not they're contentEditable + this.element.prop( "isContentEditable" ); + + this.valueMethod = this.element[ isTextarea || isInput ? "val" : "text" ]; + this.isNewMenu = true; + + this.element + .addClass( "ui-autocomplete-input" ) + .attr( "autocomplete", "off" ); + + this._on( this.element, { + keydown: function( event ) { + if ( this.element.prop( "readOnly" ) ) { + suppressKeyPress = true; + suppressInput = true; + suppressKeyPressRepeat = true; + return; + } + + suppressKeyPress = false; + suppressInput = false; + suppressKeyPressRepeat = false; + var keyCode = $.ui.keyCode; + switch( event.keyCode ) { + case keyCode.PAGE_UP: + suppressKeyPress = true; + this._move( "previousPage", event ); + break; + case keyCode.PAGE_DOWN: + suppressKeyPress = true; + this._move( "nextPage", event ); + break; + case keyCode.UP: + suppressKeyPress = true; + this._keyEvent( "previous", event ); + break; + case keyCode.DOWN: + suppressKeyPress = true; + this._keyEvent( "next", event ); + break; + case keyCode.ENTER: + case keyCode.NUMPAD_ENTER: + // when menu is open and has focus + if ( this.menu.active ) { + // #6055 - Opera still allows the keypress to occur + // which causes forms to submit + suppressKeyPress = true; + event.preventDefault(); + this.menu.select( event ); + } + break; + case keyCode.TAB: + if ( this.menu.active ) { + this.menu.select( event ); + } + break; + case keyCode.ESCAPE: + if ( this.menu.element.is( ":visible" ) ) { + this._value( this.term ); + this.close( event ); + // Different browsers have different default behavior for escape + // Single press can mean undo or clear + // Double press in IE means clear the whole form + event.preventDefault(); + } + break; + default: + suppressKeyPressRepeat = true; + // search timeout should be triggered before the input value is changed + this._searchTimeout( event ); + break; + } + }, + keypress: function( event ) { + if ( suppressKeyPress ) { + suppressKeyPress = false; + if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) { + event.preventDefault(); + } + return; + } + if ( suppressKeyPressRepeat ) { + return; + } + + // replicate some key handlers to allow them to repeat in Firefox and Opera + var keyCode = $.ui.keyCode; + switch( event.keyCode ) { + case keyCode.PAGE_UP: + this._move( "previousPage", event ); + break; + case keyCode.PAGE_DOWN: + this._move( "nextPage", event ); + break; + case keyCode.UP: + this._keyEvent( "previous", event ); + break; + case keyCode.DOWN: + this._keyEvent( "next", event ); + break; + } + }, + input: function( event ) { + if ( suppressInput ) { + suppressInput = false; + event.preventDefault(); + return; + } + this._searchTimeout( event ); + }, + focus: function() { + this.selectedItem = null; + this.previous = this._value(); + }, + blur: function( event ) { + if ( this.cancelBlur ) { + delete this.cancelBlur; + return; + } + + clearTimeout( this.searching ); + this.close( event ); + this._change( event ); + } + }); + + this._initSource(); + this.menu = $( "
        " ) + .addClass( "ui-autocomplete ui-front" ) + .appendTo( this._appendTo() ) + .menu({ + // disable ARIA support, the live region takes care of that + role: null + }) + .hide() + .data( "ui-menu" ); + + this._on( this.menu.element, { + mousedown: function( event ) { + // prevent moving focus out of the text field + event.preventDefault(); + + // IE doesn't prevent moving focus even with event.preventDefault() + // so we set a flag to know when we should ignore the blur event + this.cancelBlur = true; + this._delay(function() { + delete this.cancelBlur; + }); + + // clicking on the scrollbar causes focus to shift to the body + // but we can't detect a mouseup or a click immediately afterward + // so we have to track the next mousedown and close the menu if + // the user clicks somewhere outside of the autocomplete + var menuElement = this.menu.element[ 0 ]; + if ( !$( event.target ).closest( ".ui-menu-item" ).length ) { + this._delay(function() { + var that = this; + this.document.one( "mousedown", function( event ) { + if ( event.target !== that.element[ 0 ] && + event.target !== menuElement && + !$.contains( menuElement, event.target ) ) { + that.close(); + } + }); + }); + } + }, + menufocus: function( event, ui ) { + // support: Firefox + // Prevent accidental activation of menu items in Firefox (#7024 #9118) + if ( this.isNewMenu ) { + this.isNewMenu = false; + if ( event.originalEvent && /^mouse/.test( event.originalEvent.type ) ) { + this.menu.blur(); + + this.document.one( "mousemove", function() { + $( event.target ).trigger( event.originalEvent ); + }); + + return; + } + } + + var item = ui.item.data( "ui-autocomplete-item" ); + if ( false !== this._trigger( "focus", event, { item: item } ) ) { + // use value to match what will end up in the input, if it was a key event + if ( event.originalEvent && /^key/.test( event.originalEvent.type ) ) { + this._value( item.value ); + } + } else { + // Normally the input is populated with the item's value as the + // menu is navigated, causing screen readers to notice a change and + // announce the item. Since the focus event was canceled, this doesn't + // happen, so we update the live region so that screen readers can + // still notice the change and announce it. + this.liveRegion.text( item.value ); + } + }, + menuselect: function( event, ui ) { + var item = ui.item.data( "ui-autocomplete-item" ), + previous = this.previous; + + // only trigger when focus was lost (click on menu) + if ( this.element[0] !== this.document[0].activeElement ) { + this.element.focus(); + this.previous = previous; + // #6109 - IE triggers two focus events and the second + // is asynchronous, so we need to reset the previous + // term synchronously and asynchronously :-( + this._delay(function() { + this.previous = previous; + this.selectedItem = item; + }); + } + + if ( false !== this._trigger( "select", event, { item: item } ) ) { + this._value( item.value ); + } + // reset the term after the select event + // this allows custom select handling to work properly + this.term = this._value(); + + this.close( event ); + this.selectedItem = item; + } + }); + + this.liveRegion = $( "", { + role: "status", + "aria-live": "polite" + }) + .addClass( "ui-helper-hidden-accessible" ) + .insertBefore( this.element ); + + // turning off autocomplete prevents the browser from remembering the + // value when navigating through history, so we re-enable autocomplete + // if the page is unloaded before the widget is destroyed. #7790 + this._on( this.window, { + beforeunload: function() { + this.element.removeAttr( "autocomplete" ); + } + }); + }, + + _destroy: function() { + clearTimeout( this.searching ); + this.element + .removeClass( "ui-autocomplete-input" ) + .removeAttr( "autocomplete" ); + this.menu.element.remove(); + this.liveRegion.remove(); + }, + + _setOption: function( key, value ) { + this._super( key, value ); + if ( key === "source" ) { + this._initSource(); + } + if ( key === "appendTo" ) { + this.menu.element.appendTo( this._appendTo() ); + } + if ( key === "disabled" && value && this.xhr ) { + this.xhr.abort(); + } + }, + + _appendTo: function() { + var element = this.options.appendTo; + + if ( element ) { + element = element.jquery || element.nodeType ? + $( element ) : + this.document.find( element ).eq( 0 ); + } + + if ( !element ) { + element = this.element.closest( ".ui-front" ); + } + + if ( !element.length ) { + element = this.document[0].body; + } + + return element; + }, + + _initSource: function() { + var array, url, + that = this; + if ( $.isArray(this.options.source) ) { + array = this.options.source; + this.source = function( request, response ) { + response( $.ui.autocomplete.filter( array, request.term ) ); + }; + } else if ( typeof this.options.source === "string" ) { + url = this.options.source; + this.source = function( request, response ) { + if ( that.xhr ) { + that.xhr.abort(); + } + that.xhr = $.ajax({ + url: url, + data: request, + dataType: "json", + success: function( data ) { + response( data ); + }, + error: function() { + response( [] ); + } + }); + }; + } else { + this.source = this.options.source; + } + }, + + _searchTimeout: function( event ) { + clearTimeout( this.searching ); + this.searching = this._delay(function() { + // only search if the value has changed + if ( this.term !== this._value() ) { + this.selectedItem = null; + this.search( null, event ); + } + }, this.options.delay ); + }, + + search: function( value, event ) { + value = value != null ? value : this._value(); + + // always save the actual value, not the one passed as an argument + this.term = this._value(); + + if ( value.length < this.options.minLength ) { + return this.close( event ); + } + + if ( this._trigger( "search", event ) === false ) { + return; + } + + return this._search( value ); + }, + + _search: function( value ) { + this.pending++; + this.element.addClass( "ui-autocomplete-loading" ); + this.cancelSearch = false; + + this.source( { term: value }, this._response() ); + }, + + _response: function() { + var index = ++this.requestIndex; + + return $.proxy(function( content ) { + if ( index === this.requestIndex ) { + this.__response( content ); + } + + this.pending--; + if ( !this.pending ) { + this.element.removeClass( "ui-autocomplete-loading" ); + } + }, this ); + }, + + __response: function( content ) { + if ( content ) { + content = this._normalize( content ); + } + this._trigger( "response", null, { content: content } ); + if ( !this.options.disabled && content && content.length && !this.cancelSearch ) { + this._suggest( content ); + this._trigger( "open" ); + } else { + // use ._close() instead of .close() so we don't cancel future searches + this._close(); + } + }, + + close: function( event ) { + this.cancelSearch = true; + this._close( event ); + }, + + _close: function( event ) { + if ( this.menu.element.is( ":visible" ) ) { + this.menu.element.hide(); + this.menu.blur(); + this.isNewMenu = true; + this._trigger( "close", event ); + } + }, + + _change: function( event ) { + if ( this.previous !== this._value() ) { + this._trigger( "change", event, { item: this.selectedItem } ); + } + }, + + _normalize: function( items ) { + // assume all items have the right format when the first item is complete + if ( items.length && items[0].label && items[0].value ) { + return items; + } + return $.map( items, function( item ) { + if ( typeof item === "string" ) { + return { + label: item, + value: item + }; + } + return $.extend({ + label: item.label || item.value, + value: item.value || item.label + }, item ); + }); + }, + + _suggest: function( items ) { + var ul = this.menu.element.empty(); + this._renderMenu( ul, items ); + this.isNewMenu = true; + this.menu.refresh(); + + // size and position menu + ul.show(); + this._resizeMenu(); + ul.position( $.extend({ + of: this.element + }, this.options.position )); + + if ( this.options.autoFocus ) { + this.menu.next(); + } + }, + + _resizeMenu: function() { + var ul = this.menu.element; + ul.outerWidth( Math.max( + // Firefox wraps long text (possibly a rounding bug) + // so we add 1px to avoid the wrapping (#7513) + ul.width( "" ).outerWidth() + 1, + this.element.outerWidth() + ) ); + }, + + _renderMenu: function( ul, items ) { + var that = this; + $.each( items, function( index, item ) { + that._renderItemData( ul, item ); + }); + }, + + _renderItemData: function( ul, item ) { + return this._renderItem( ul, item ).data( "ui-autocomplete-item", item ); + }, + + _renderItem: function( ul, item ) { + return $( "
      • " ) + .append( $( "" ).text( item.label ) ) + .appendTo( ul ); + }, + + _move: function( direction, event ) { + if ( !this.menu.element.is( ":visible" ) ) { + this.search( null, event ); + return; + } + if ( this.menu.isFirstItem() && /^previous/.test( direction ) || + this.menu.isLastItem() && /^next/.test( direction ) ) { + this._value( this.term ); + this.menu.blur(); + return; + } + this.menu[ direction ]( event ); + }, + + widget: function() { + return this.menu.element; + }, + + _value: function() { + return this.valueMethod.apply( this.element, arguments ); + }, + + _keyEvent: function( keyEvent, event ) { + if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) { + this._move( keyEvent, event ); + + // prevents moving cursor to beginning/end of the text field in some browsers + event.preventDefault(); + } + } +}); + +$.extend( $.ui.autocomplete, { + escapeRegex: function( value ) { + return value.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&"); + }, + filter: function(array, term) { + var matcher = new RegExp( $.ui.autocomplete.escapeRegex(term), "i" ); + return $.grep( array, function(value) { + return matcher.test( value.label || value.value || value ); + }); + } +}); + + +// live region extension, adding a `messages` option +// NOTE: This is an experimental API. We are still investigating +// a full solution for string manipulation and internationalization. +$.widget( "ui.autocomplete", $.ui.autocomplete, { + options: { + messages: { + noResults: "No search results.", + results: function( amount ) { + return amount + ( amount > 1 ? " results are" : " result is" ) + + " available, use up and down arrow keys to navigate."; + } + } + }, + + __response: function( content ) { + var message; + this._superApply( arguments ); + if ( this.options.disabled || this.cancelSearch ) { + return; + } + if ( content && content.length ) { + message = this.options.messages.results( content.length ); + } else { + message = this.options.messages.noResults; + } + this.liveRegion.text( message ); + } +}); + +}( jQuery )); +(function( $, undefined ) { + +$.widget( "ui.menu", { + version: "1.10.4", + defaultElement: " {% include '_pocheit-form.twig' %} - {% include '_search-form.twig' %} + {% include '_search-form.twig' %} diff --git a/themes/default/_pocheit-form.twig b/themes/default/_pocheit-form.twig index 130961594..8c982db09 100755 --- a/themes/default/_pocheit-form.twig +++ b/themes/default/_pocheit-form.twig @@ -1,22 +1,8 @@ -
        -
        -
        - - +
        +   + + + + -
        - diff --git a/themes/default/css/style.css b/themes/default/css/style.css index b3d300ed9..e536ac6b5 100755 --- a/themes/default/css/style.css +++ b/themes/default/css/style.css @@ -355,3 +355,50 @@ a.reading-time span { vertical-align: top; } + +/* ========================================================================== + "save a link" popup div related styles + ========================================================================== */ + +#bagit-form { + display: none; + padding-left: 30px; + width: 450px; + +} + +a#bagit-form-close { + color: #FFF; + display: inline-block; + float: right; + background: url("../img/messages/close.png") no-repeat scroll 0 0 rgba(0, 0, 0, 0); + height: 16px; + margin: -14px -8px 0 0; + width: 16px; + text-decoration: none; +} + + +.add-to-wallabag-link-after { + background-color: #000; + color: #fff; + padding: 0 4px 1px 3px; + font-weight: bold; + font-size: 0.7em; + border-radius: 4px; +} +.add-to-wallabag-link-after:hover, .add-to-wallabag-link-after:active { + color: #fff; +} +.add-to-wallabag-link-after:visited { + color: #999; +} + +#add-link-result { + display: inline; + padding-left: 10px; +} + +.opacity03 { + /*opacity: 0.3;*/ +} diff --git a/themes/default/js/saveLink.js b/themes/default/js/saveLink.js new file mode 100755 index 000000000..ccc00d1eb --- /dev/null +++ b/themes/default/js/saveLink.js @@ -0,0 +1,101 @@ +$.fn.ready(function() { + + var $bagit = $('#bagit'), + $bagitForm = $('#bagit-form'), + $bagitFormForm = $('#bagit-form-form'); + + /* ========================================================================== + bag it link and close button + ========================================================================== */ + + function toggleSaveLinkForm(url, event) { + $("#add-link-result").empty(); + + $bagit.toggleClass("active-current"); + + //only if bagiti link is not presented on page + if ( $bagit.length === 0 ) { + if ( event !== 'undefined' && event ) { + $bagitForm.css( {position:"absolute", top:event.pageY, left:event.pageX-200}); + } + else { + $bagitForm.css( {position:"relative", top:"auto", left:"auto"}); + } + } + + $bagitForm.toggle(); + $('#content').toggleClass("opacity03"); + if (url !== 'undefined' && url) { + $('#plainurl').val(url); + } + $('#plainurl').focus(); + } + + + $bagit.click(function(){ + $bagit.toggleClass("current"); + $("#bagit-arrow").toggleClass("arrow-down"); + toggleSaveLinkForm(); + }); + + $("#bagit-form-close").click(function(){ + $bagit.removeClass("current"); + $("#bagit-arrow").removeClass("arrow-down"); + toggleSaveLinkForm(); + }); + + + //send "bag it link" form request via ajax + $bagitFormForm.submit( function(event) { + $("body").css("cursor", "wait"); + $("#add-link-result").empty(); + + $.ajax({ + type: $bagitFormForm.attr('method'), + url: $bagitFormForm.attr('action'), + data: $bagitFormForm.serialize(), + success: function(data) { + $('#add-link-result').html("Done!"); + $('#plainurl').val(''); + $('#plainurl').blur(''); + $("body").css("cursor", "auto"); + //setTimeout( function() { toggleSaveLinkForm(); }, 1000); //close form after 1000 delay + }, + error: function(data) { + $('#add-link-result').html("Failed!"); + $("body").css("cursor", "auto"); + } + }); + + event.preventDefault(); + }); + + /* ========================================================================== + Keyboard gestion + ========================================================================== */ + + $(window).keydown(function(e){ + if ( ( e.target.tagName.toLowerCase() !== 'input' && e.keyCode == 83 ) || e.keyCode == 27 ) { + $bagit.removeClass("current"); + $("#bagit-arrow").removeClass("arrow-down"); + toggleSaveLinkForm(); + return false; + } + }); + + /* ========================================================================== + Process all links inside an article + ========================================================================== */ + + $("article a[href^='http']").after(function() { + return " w "; + }); + + $(".add-to-wallabag-link-after").click(function(event){ + toggleSaveLinkForm($(this).attr('href'), event); + event.preventDefault(); + }); + +}); + + diff --git a/themes/default/view.twig b/themes/default/view.twig index 916abe0dd..2be0c33c6 100644 --- a/themes/default/view.twig +++ b/themes/default/view.twig @@ -1,6 +1,7 @@ {% extends "layout.twig" %} {% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %} {% block content %} + {% include '_pocheit-form.twig' %}
        • {% trans "Return home" %}
          • @@ -55,3 +56,4 @@ }); {% endblock %} + From b152f2b6ba73fbb3e4fb8d4c3b0d69fddad8f9d8 Mon Sep 17 00:00:00 2001 From: tcit Date: Fri, 28 Mar 2014 00:57:07 +0100 Subject: [PATCH 65/79] Fix to bug #570 Forces the download of the data exported file as a poche-export file. --- inc/poche/Poche.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index a8cd58719..aacbec95b 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -1092,6 +1092,7 @@ class Poche public function export() { $entries = $this->store->retrieveAll($this->user->getId()); + header('Content-Disposition: attachment; filename=poche-export'); echo $this->tpl->render('export.twig', array( 'export' => Tools::renderJson($entries), )); From 08718c01e4b8b35fe75b1e04534e028dd26c8c53 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 28 Mar 2014 11:26:48 +0200 Subject: [PATCH 66/79] problem with resources and localhost url fix --- themes/baggy/_display-mode.twig | 2 +- themes/baggy/_head.twig | 30 +++++++++++++++--------------- themes/baggy/_top.twig | 2 +- themes/baggy/edit-tags.twig | 6 +++--- themes/baggy/view.twig | 2 +- themes/courgette/_head.twig | 18 +++++++++--------- themes/courgette/_top.twig | 2 +- themes/courgette/_view.twig | 2 +- themes/courgette/home.twig | 4 ++-- themes/courgette/tags.twig | 2 +- themes/default/_head.twig | 26 +++++++++++++------------- themes/default/_sorting.twig | 4 ++-- themes/default/_top.twig | 2 +- themes/default/edit-tags.twig | 6 +++--- themes/default/tags.twig | 2 +- themes/default/view.twig | 2 +- 16 files changed, 56 insertions(+), 56 deletions(-) mode change 100644 => 100755 themes/baggy/_top.twig mode change 100644 => 100755 themes/baggy/view.twig mode change 100644 => 100755 themes/courgette/tags.twig mode change 100644 => 100755 themes/default/_head.twig mode change 100644 => 100755 themes/default/_top.twig mode change 100644 => 100755 themes/default/view.twig diff --git a/themes/baggy/_display-mode.twig b/themes/baggy/_display-mode.twig index 31f76581e..382dd5f1c 100755 --- a/themes/baggy/_display-mode.twig +++ b/themes/baggy/_display-mode.twig @@ -1,5 +1,5 @@ diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig index acc9fa3df..968ea1f6c 100755 --- a/themes/baggy/_head.twig +++ b/themes/baggy/_head.twig @@ -1,15 +1,15 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/themes/baggy/_top.twig b/themes/baggy/_top.twig old mode 100644 new mode 100755 index d3e35aa3f..a31c09259 --- a/themes/baggy/_top.twig +++ b/themes/baggy/_top.twig @@ -1,6 +1,6 @@

          - {% if view == 'home' %}{% block logo %}wallabag logo{% endblock %} + {% if view == 'home' %}{% block logo %}wallabag logo{% endblock %} {% else %}{{ block('logo') }} {% endif %}

          diff --git a/themes/baggy/edit-tags.twig b/themes/baggy/edit-tags.twig index 65ac996a4..2113e964e 100755 --- a/themes/baggy/edit-tags.twig +++ b/themes/baggy/edit-tags.twig @@ -5,9 +5,9 @@ {% endblock %} {% block content %} - - - + + +

          {{ entry.title|raw }} diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig old mode 100644 new mode 100755 index 092be04ec..ffb512a38 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@ -29,7 +29,7 @@ {{ content | raw }}

          - + - + diff --git a/themes/courgette/_top.twig b/themes/courgette/_top.twig index 2a2de2118..4d2dbb216 100755 --- a/themes/courgette/_top.twig +++ b/themes/courgette/_top.twig @@ -1,6 +1,6 @@

          - {% if view == 'home' %}{% block logo %}wallabag logo{% endblock %} + {% if view == 'home' %}{% block logo %}wallabag logo{% endblock %} {% elseif view == 'fav' %}{{ block('logo') }} Favoris {% elseif view == 'archive' %}{{ block('logo') }} Archive {% else %}{{ block('logo') }} diff --git a/themes/courgette/_view.twig b/themes/courgette/_view.twig index e80829eff..5aa201d49 100755 --- a/themes/courgette/_view.twig +++ b/themes/courgette/_view.twig @@ -23,7 +23,7 @@ {{ content | raw }}

        - + - - - + + + + + + + + + + + + + diff --git a/themes/default/_sorting.twig b/themes/default/_sorting.twig index 4f2fceb09..dfa5cfe40 100755 --- a/themes/default/_sorting.twig +++ b/themes/default/_sorting.twig @@ -1,6 +1,6 @@ {% if entries|length > 1 %}
          -
        • {% trans {% trans "by date" %} {% trans
          • -
        • {% trans {% trans "by title" %} {% trans
          • +
        • {% trans {% trans "by date" %} {% trans
          • +
        • {% trans {% trans "by title" %} {% trans
        {% endif %} diff --git a/themes/default/_top.twig b/themes/default/_top.twig old mode 100644 new mode 100755 index c6e41b2f4..45806f01a --- a/themes/default/_top.twig +++ b/themes/default/_top.twig @@ -1,6 +1,6 @@

        - {% if view == 'home' %}{% block logo %}wallabag logo{% endblock %} + {% if view == 'home' %}{% block logo %}wallabag logo{% endblock %} {% else %}{{ block('logo') }} {% endif %}

        diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig index cd6bc66f1..bd498d26f 100755 --- a/themes/default/edit-tags.twig +++ b/themes/default/edit-tags.twig @@ -5,9 +5,9 @@ {% endblock %} {% block content %} - - - + + +
        diff --git a/themes/default/tags.twig b/themes/default/tags.twig index cc1960106..e5be748e3 100755 --- a/themes/default/tags.twig +++ b/themes/default/tags.twig @@ -6,7 +6,7 @@ {% block content %}
        {% for tag in tags %} - {{ tag.value }} ({{ tag.entriescount }}) {% if token != '' %}{% endif %} + {{ tag.value }} ({{ tag.entriescount }}) {% if token != '' %}{% endif %}
        {% if loop.index == '%d'|format(loop.length/2 + 0.5) %} diff --git a/themes/default/view.twig b/themes/default/view.twig old mode 100644 new mode 100755 index 2be0c33c6..a6e2a33ac --- a/themes/default/view.twig +++ b/themes/default/view.twig @@ -31,7 +31,7 @@ {{ block('tags') }}
        - + - + + - - + + diff --git a/themes/baggy/js/autoClose.js b/themes/baggy/js/autoClose.js deleted file mode 100644 index e9145b7e2..000000000 --- a/themes/baggy/js/autoClose.js +++ /dev/null @@ -1,6 +0,0 @@ -$(document).ready(function() { - current_url = window.location.href - if (current_url.match("&closewin=true")) { - window.close(); - } -}); diff --git a/themes/baggy/js/jquery-2.0.3.min.js b/themes/baggy/js/jquery-2.0.3.min.js deleted file mode 100644 index a4dd0a2f5..000000000 --- a/themes/baggy/js/jquery-2.0.3.min.js +++ /dev/null @@ -1 +0,0 @@ -(function(e,undefined){var t,n,r=typeof undefined,i=e.location,o=e.document,s=o.documentElement,a=e.jQuery,u=e.$,l={},c=[],p="2.0.3",f=c.concat,h=c.push,d=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,x=function(e,n){return new x.fn.init(e,n,t)},b=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^-ms-/,N=/-([\da-z])/gi,E=function(e,t){return t.toUpperCase()},S=function(){o.removeEventListener("DOMContentLoaded",S,!1),e.removeEventListener("load",S,!1),x.ready()};x.fn=x.prototype={jquery:p,constructor:x,init:function(e,t,n){var r,i;if(!e)return this;if("string"==typeof e){if(r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:T.exec(e),!r||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof x?t[0]:t,x.merge(this,x.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:o,!0)),C.test(r[1])&&x.isPlainObject(t))for(r in t)x.isFunction(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return i=o.getElementById(r[2]),i&&i.parentNode&&(this.length=1,this[0]=i),this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?n.ready(e):(e.selector!==undefined&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return d.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,t,n,r,i,o,s=arguments[0]||{},a=1,u=arguments.length,l=!1;for("boolean"==typeof s&&(l=s,s=arguments[1]||{},a=2),"object"==typeof s||x.isFunction(s)||(s={}),u===a&&(s=this,--a);u>a;a++)if(null!=(e=arguments[a]))for(t in e)n=s[t],r=e[t],s!==r&&(l&&r&&(x.isPlainObject(r)||(i=x.isArray(r)))?(i?(i=!1,o=n&&x.isArray(n)?n:[]):o=n&&x.isPlainObject(n)?n:{},s[t]=x.extend(l,o,r)):r!==undefined&&(s[t]=r));return s},x.extend({expando:"jQuery"+(p+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=a),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){(e===!0?--x.readyWait:x.isReady)||(x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(o,[x]),x.fn.trigger&&x(o).trigger("ready").off("ready")))},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray,isWindow:function(e){return null!=e&&e===e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if("object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(t){return!1}return!0},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:JSON.parse,parseXML:function(e){var t,n;if(!e||"string"!=typeof e)return null;try{n=new DOMParser,t=n.parseFromString(e,"text/xml")}catch(r){t=undefined}return(!t||t.getElementsByTagName("parsererror").length)&&x.error("Invalid XML: "+e),t},noop:function(){},globalEval:function(e){var t,n=eval;e=x.trim(e),e&&(1===e.indexOf("use strict")?(t=o.createElement("script"),t.text=e,o.head.appendChild(t).parentNode.removeChild(t)):n(e))},camelCase:function(e){return e.replace(k,"ms-").replace(N,E)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,s=j(e);if(n){if(s){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(s){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:function(e){return null==e?"":v.call(e)},makeArray:function(e,t){var n=t||[];return null!=e&&(j(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:g.call(t,e,n)},merge:function(e,t){var n=t.length,r=e.length,i=0;if("number"==typeof n)for(;n>i;i++)e[r++]=t[i];else while(t[i]!==undefined)e[r++]=t[i++];return e.length=r,e},grep:function(e,t,n){var r,i=[],o=0,s=e.length;for(n=!!n;s>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,s=j(e),a=[];if(s)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(a[a.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(a[a.length]=r);return f.apply([],a)},guid:1,proxy:function(e,t){var n,r,i;return"string"==typeof t&&(n=e[t],t=e,e=n),x.isFunction(e)?(r=d.call(arguments,2),i=function(){return e.apply(t||this,r.concat(d.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):undefined},access:function(e,t,n,r,i,o,s){var a=0,u=e.length,l=null==n;if("object"===x.type(n)){i=!0;for(a in n)x.access(e,t,a,n[a],!0,o,s)}else if(r!==undefined&&(i=!0,x.isFunction(r)||(s=!0),l&&(s?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(x(e),n)})),t))for(;u>a;a++)t(e[a],n,s?r:r.call(e[a],a,t(e[a],n)));return i?e:l?t.call(e):u?t(e[0],n):o},now:Date.now,swap:function(e,t,n,r){var i,o,s={};for(o in t)s[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=s[o];return i}}),x.ready.promise=function(t){return n||(n=x.Deferred(),"complete"===o.readyState?setTimeout(x.ready):(o.addEventListener("DOMContentLoaded",S,!1),e.addEventListener("load",S,!1))),n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function j(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}t=x(o),function(e,undefined){var t,n,r,i,o,s,a,u,l,c,p,f,h,d,g,m,y,v="sizzle"+-new Date,b=e.document,w=0,T=0,C=st(),k=st(),N=st(),E=!1,S=function(e,t){return e===t?(E=!0,0):0},j=typeof undefined,D=1<<31,A={}.hasOwnProperty,L=[],q=L.pop,H=L.push,O=L.push,F=L.slice,P=L.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",W="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",$=W.replace("w","w#"),B="\\["+M+"*("+W+")"+M+"*(?:([*^$|!~]?=)"+M+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+$+")|)|)"+M+"*\\]",I=":("+W+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+B.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=RegExp("^"+M+"*,"+M+"*"),X=RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=RegExp(M+"*[+~]"),Y=RegExp("="+M+"*([^\\]'\"]*)"+M+"*\\]","g"),V=RegExp(I),G=RegExp("^"+$+"$"),J={ID:RegExp("^#("+W+")"),CLASS:RegExp("^\\.("+W+")"),TAG:RegExp("^("+W.replace("w","w*")+")"),ATTR:RegExp("^"+B),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:RegExp("^(?:"+R+")$","i"),needsContext:RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Q=/^[^{]+\{\s*\[native \w/,K=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,Z=/^(?:input|select|textarea|button)$/i,et=/^h\d$/i,tt=/'|\\/g,nt=RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),rt=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{O.apply(L=F.call(b.childNodes),b.childNodes),L[b.childNodes.length].nodeType}catch(it){O={apply:L.length?function(e,t){H.apply(e,F.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function ot(e,t,r,i){var o,s,a,u,l,f,g,m,x,w;if((t?t.ownerDocument||t:b)!==p&&c(t),t=t||p,r=r||[],!e||"string"!=typeof e)return r;if(1!==(u=t.nodeType)&&9!==u)return[];if(h&&!i){if(o=K.exec(e))if(a=o[1]){if(9===u){if(s=t.getElementById(a),!s||!s.parentNode)return r;if(s.id===a)return r.push(s),r}else if(t.ownerDocument&&(s=t.ownerDocument.getElementById(a))&&y(t,s)&&s.id===a)return r.push(s),r}else{if(o[2])return O.apply(r,t.getElementsByTagName(e)),r;if((a=o[3])&&n.getElementsByClassName&&t.getElementsByClassName)return O.apply(r,t.getElementsByClassName(a)),r}if(n.qsa&&(!d||!d.test(e))){if(m=g=v,x=t,w=9===u&&e,1===u&&"object"!==t.nodeName.toLowerCase()){f=gt(e),(g=t.getAttribute("id"))?m=g.replace(tt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",l=f.length;while(l--)f[l]=m+mt(f[l]);x=U.test(e)&&t.parentNode||t,w=f.join(",")}if(w)try{return O.apply(r,x.querySelectorAll(w)),r}catch(T){}finally{g||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,r,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>i.cacheLength&&delete t[e.shift()],t[n]=r}return t}function at(e){return e[v]=!0,e}function ut(e){var t=p.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function lt(e,t){var n=e.split("|"),r=e.length;while(r--)i.attrHandle[n[r]]=t}function ct(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function pt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return at(function(t){return t=+t,at(function(n,r){var i,o=e([],n.length,t),s=o.length;while(s--)n[i=o[s]]&&(n[i]=!(r[i]=n[i]))})})}s=ot.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},n=ot.support={},c=ot.setDocument=function(e){var t=e?e.ownerDocument||e:b,r=t.defaultView;return t!==p&&9===t.nodeType&&t.documentElement?(p=t,f=t.documentElement,h=!s(t),r&&r.attachEvent&&r!==r.top&&r.attachEvent("onbeforeunload",function(){c()}),n.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ut(function(e){return e.appendChild(t.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=ut(function(e){return e.innerHTML="
        ",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),n.getById=ut(function(e){return f.appendChild(e).id=v,!t.getElementsByName||!t.getElementsByName(v).length}),n.getById?(i.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},i.filter.ID=function(e){var t=e.replace(nt,rt);return function(e){return e.getAttribute("id")===t}}):(delete i.find.ID,i.filter.ID=function(e){var t=e.replace(nt,rt);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),i.find.TAG=n.getElementsByTagName?function(e,t){return typeof t.getElementsByTagName!==j?t.getElementsByTagName(e):undefined}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},i.find.CLASS=n.getElementsByClassName&&function(e,t){return typeof t.getElementsByClassName!==j&&h?t.getElementsByClassName(e):undefined},g=[],d=[],(n.qsa=Q.test(t.querySelectorAll))&&(ut(function(e){e.innerHTML="",e.querySelectorAll("[selected]").length||d.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll(":checked").length||d.push(":checked")}),ut(function(e){var n=t.createElement("input");n.setAttribute("type","hidden"),e.appendChild(n).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&d.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||d.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),d.push(",.*:")})),(n.matchesSelector=Q.test(m=f.webkitMatchesSelector||f.mozMatchesSelector||f.oMatchesSelector||f.msMatchesSelector))&&ut(function(e){n.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),g.push("!=",I)}),d=d.length&&RegExp(d.join("|")),g=g.length&&RegExp(g.join("|")),y=Q.test(f.contains)||f.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},S=f.compareDocumentPosition?function(e,r){if(e===r)return E=!0,0;var i=r.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(r);return i?1&i||!n.sortDetached&&r.compareDocumentPosition(e)===i?e===t||y(b,e)?-1:r===t||y(b,r)?1:l?P.call(l,e)-P.call(l,r):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,n){var r,i=0,o=e.parentNode,s=n.parentNode,a=[e],u=[n];if(e===n)return E=!0,0;if(!o||!s)return e===t?-1:n===t?1:o?-1:s?1:l?P.call(l,e)-P.call(l,n):0;if(o===s)return ct(e,n);r=e;while(r=r.parentNode)a.unshift(r);r=n;while(r=r.parentNode)u.unshift(r);while(a[i]===u[i])i++;return i?ct(a[i],u[i]):a[i]===b?-1:u[i]===b?1:0},t):p},ot.matches=function(e,t){return ot(e,null,null,t)},ot.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&c(e),t=t.replace(Y,"='$1']"),!(!n.matchesSelector||!h||g&&g.test(t)||d&&d.test(t)))try{var r=m.call(e,t);if(r||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(i){}return ot(t,p,null,[e]).length>0},ot.contains=function(e,t){return(e.ownerDocument||e)!==p&&c(e),y(e,t)},ot.attr=function(e,t){(e.ownerDocument||e)!==p&&c(e);var r=i.attrHandle[t.toLowerCase()],o=r&&A.call(i.attrHandle,t.toLowerCase())?r(e,t,!h):undefined;return o===undefined?n.attributes||!h?e.getAttribute(t):(o=e.getAttributeNode(t))&&o.specified?o.value:null:o},ot.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},ot.uniqueSort=function(e){var t,r=[],i=0,o=0;if(E=!n.detectDuplicates,l=!n.sortStable&&e.slice(0),e.sort(S),E){while(t=e[o++])t===e[o]&&(i=r.push(o));while(i--)e.splice(r[i],1)}return e},o=ot.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=o(t);return n},i=ot.selectors={cacheLength:50,createPseudo:at,match:J,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(nt,rt),e[3]=(e[4]||e[5]||"").replace(nt,rt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||ot.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&ot.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return J.CHILD.test(e[0])?null:(e[3]&&e[4]!==undefined?e[2]=e[4]:n&&V.test(n)&&(t=gt(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(nt,rt).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=C[e+" "];return t||(t=RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&C(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=ot.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),s="last"!==e.slice(-4),a="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,p,f,h,d,g=o!==s?"nextSibling":"previousSibling",m=t.parentNode,y=a&&t.nodeName.toLowerCase(),x=!u&&!a;if(m){if(o){while(g){p=t;while(p=p[g])if(a?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;d=g="only"===e&&!d&&"nextSibling"}return!0}if(d=[s?m.firstChild:m.lastChild],s&&x){c=m[v]||(m[v]={}),l=c[e]||[],h=l[0]===w&&l[1],f=l[0]===w&&l[2],p=h&&m.childNodes[h];while(p=++h&&p&&p[g]||(f=h=0)||d.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[w,h,f];break}}else if(x&&(l=(t[v]||(t[v]={}))[e])&&l[0]===w)f=l[1];else while(p=++h&&p&&p[g]||(f=h=0)||d.pop())if((a?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(x&&((p[v]||(p[v]={}))[e]=[w,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||ot.error("unsupported pseudo: "+e);return r[v]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?at(function(e,n){var i,o=r(e,t),s=o.length;while(s--)i=P.call(e,o[s]),e[i]=!(n[i]=o[s])}):function(e){return r(e,0,n)}):r}},pseudos:{not:at(function(e){var t=[],n=[],r=a(e.replace(z,"$1"));return r[v]?at(function(e,t,n,i){var o,s=r(e,null,i,[]),a=e.length;while(a--)(o=s[a])&&(e[a]=!(t[a]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:at(function(e){return function(t){return ot(e,t).length>0}}),contains:at(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:at(function(e){return G.test(e||"")||ot.error("unsupported lang: "+e),e=e.replace(nt,rt).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===f},focus:function(e){return e===p.activeElement&&(!p.hasFocus||p.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!i.pseudos.empty(e)},header:function(e){return et.test(e.nodeName)},input:function(e){return Z.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},i.pseudos.nth=i.pseudos.eq;for(t in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})i.pseudos[t]=pt(t);for(t in{submit:!0,reset:!0})i.pseudos[t]=ft(t);function dt(){}dt.prototype=i.filters=i.pseudos,i.setFilters=new dt;function gt(e,t){var n,r,o,s,a,u,l,c=k[e+" "];if(c)return t?0:c.slice(0);a=e,u=[],l=i.preFilter;while(a){(!n||(r=_.exec(a)))&&(r&&(a=a.slice(r[0].length)||a),u.push(o=[])),n=!1,(r=X.exec(a))&&(n=r.shift(),o.push({value:n,type:r[0].replace(z," ")}),a=a.slice(n.length));for(s in i.filter)!(r=J[s].exec(a))||l[s]&&!(r=l[s](r))||(n=r.shift(),o.push({value:n,type:s,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?ot.error(e):k(e,u).slice(0)}function mt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function yt(e,t,n){var i=t.dir,o=n&&"parentNode"===i,s=T++;return t.first?function(t,n,r){while(t=t[i])if(1===t.nodeType||o)return e(t,n,r)}:function(t,n,a){var u,l,c,p=w+" "+s;if(a){while(t=t[i])if((1===t.nodeType||o)&&e(t,n,a))return!0}else while(t=t[i])if(1===t.nodeType||o)if(c=t[v]||(t[v]={}),(l=c[i])&&l[0]===p){if((u=l[1])===!0||u===r)return u===!0}else if(l=c[i]=[p],l[1]=e(t,n,a)||r,l[1]===!0)return!0}}function vt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,s=[],a=0,u=e.length,l=null!=t;for(;u>a;a++)(o=e[a])&&(!n||n(o,r,i))&&(s.push(o),l&&t.push(a));return s}function bt(e,t,n,r,i,o){return r&&!r[v]&&(r=bt(r)),i&&!i[v]&&(i=bt(i,o)),at(function(o,s,a,u){var l,c,p,f=[],h=[],d=s.length,g=o||Ct(t||"*",a.nodeType?[a]:a,[]),m=!e||!o&&t?g:xt(g,f,e,a,u),y=n?i||(o?e:d||r)?[]:s:m;if(n&&n(m,y,a,u),r){l=xt(y,h),r(l,[],a,u),c=l.length;while(c--)(p=l[c])&&(y[h[c]]=!(m[h[c]]=p))}if(o){if(i||e){if(i){l=[],c=y.length;while(c--)(p=y[c])&&l.push(m[c]=p);i(null,y=[],l,u)}c=y.length;while(c--)(p=y[c])&&(l=i?P.call(o,p):f[c])>-1&&(o[l]=!(s[l]=p))}}else y=xt(y===s?y.splice(d,y.length):y),i?i(null,s,y,u):O.apply(s,y)})}function wt(e){var t,n,r,o=e.length,s=i.relative[e[0].type],a=s||i.relative[" "],l=s?1:0,c=yt(function(e){return e===t},a,!0),p=yt(function(e){return P.call(t,e)>-1},a,!0),f=[function(e,n,r){return!s&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;o>l;l++)if(n=i.relative[e[l].type])f=[yt(vt(f),n)];else{if(n=i.filter[e[l].type].apply(null,e[l].matches),n[v]){for(r=++l;o>r;r++)if(i.relative[e[r].type])break;return bt(l>1&&vt(f),l>1&&mt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&wt(e.slice(l,r)),o>r&&wt(e=e.slice(r)),o>r&&mt(e))}f.push(n)}return vt(f)}function Tt(e,t){var n=0,o=t.length>0,s=e.length>0,a=function(a,l,c,f,h){var d,g,m,y=[],v=0,x="0",b=a&&[],T=null!=h,C=u,k=a||s&&i.find.TAG("*",h&&l.parentNode||l),N=w+=null==C?1:Math.random()||.1;for(T&&(u=l!==p&&l,r=n);null!=(d=k[x]);x++){if(s&&d){g=0;while(m=e[g++])if(m(d,l,c)){f.push(d);break}T&&(w=N,r=++n)}o&&((d=!m&&d)&&v--,a&&b.push(d))}if(v+=x,o&&x!==v){g=0;while(m=t[g++])m(b,y,l,c);if(a){if(v>0)while(x--)b[x]||y[x]||(y[x]=q.call(f));y=xt(y)}O.apply(f,y),T&&!a&&y.length>0&&v+t.length>1&&ot.uniqueSort(f)}return T&&(w=N,u=C),b};return o?at(a):a}a=ot.compile=function(e,t){var n,r=[],i=[],o=N[e+" "];if(!o){t||(t=gt(e)),n=t.length;while(n--)o=wt(t[n]),o[v]?r.push(o):i.push(o);o=N(e,Tt(i,r))}return o};function Ct(e,t,n){var r=0,i=t.length;for(;i>r;r++)ot(e,t[r],n);return n}function kt(e,t,r,o){var s,u,l,c,p,f=gt(e);if(!o&&1===f.length){if(u=f[0]=f[0].slice(0),u.length>2&&"ID"===(l=u[0]).type&&n.getById&&9===t.nodeType&&h&&i.relative[u[1].type]){if(t=(i.find.ID(l.matches[0].replace(nt,rt),t)||[])[0],!t)return r;e=e.slice(u.shift().value.length)}s=J.needsContext.test(e)?0:u.length;while(s--){if(l=u[s],i.relative[c=l.type])break;if((p=i.find[c])&&(o=p(l.matches[0].replace(nt,rt),U.test(u[0].type)&&t.parentNode||t))){if(u.splice(s,1),e=o.length&&mt(u),!e)return O.apply(r,o),r;break}}}return a(e,f)(o,t,!h,r,U.test(e)),r}n.sortStable=v.split("").sort(S).join("")===v,n.detectDuplicates=E,c(),n.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(p.createElement("div"))}),ut(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||lt("type|href|height|width",function(e,t,n){return n?undefined:e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),n.attributes&&ut(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||lt("value",function(e,t,n){return n||"input"!==e.nodeName.toLowerCase()?undefined:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||lt(R,function(e,t,n){var r;return n?undefined:(r=e.getAttributeNode(t))&&r.specified?r.value:e[t]===!0?t.toLowerCase():null}),x.find=ot,x.expr=ot.selectors,x.expr[":"]=x.expr.pseudos,x.unique=ot.uniqueSort,x.text=ot.getText,x.isXMLDoc=ot.isXML,x.contains=ot.contains}(e);var D={};function A(e){var t=D[e]={};return x.each(e.match(w)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?D[e]||A(e):x.extend({},e);var t,n,r,i,o,s,a=[],u=!e.once&&[],l=function(p){for(t=e.memory&&p,n=!0,s=i||0,i=0,o=a.length,r=!0;a&&o>s;s++)if(a[s].apply(p[0],p[1])===!1&&e.stopOnFalse){t=!1;break}r=!1,a&&(u?u.length&&l(u.shift()):t?a=[]:c.disable())},c={add:function(){if(a){var n=a.length;(function s(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&c.has(n)||a.push(n):n&&n.length&&"string"!==r&&s(n)})})(arguments),r?o=a.length:t&&(i=n,l(t))}return this},remove:function(){return a&&x.each(arguments,function(e,t){var n;while((n=x.inArray(t,a,n))>-1)a.splice(n,1),r&&(o>=n&&o--,s>=n&&s--)}),this},has:function(e){return e?x.inArray(e,a)>-1:!(!a||!a.length)},empty:function(){return a=[],o=0,this},disable:function(){return a=u=t=undefined,this},disabled:function(){return!a},lock:function(){return u=undefined,t||c.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!a||n&&!u||(t=t||[],t=[e,t.slice?t.slice():t],r?u.push(t):l(t)),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!n}};return c},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var s=o[0],a=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=a&&a.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s+"With"](this===r?n.promise():this,a?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var s=o[2],a=o[3];r[o[1]]=s.add,a&&s.add(function(){n=a},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=s.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=d.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),s=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?d.call(arguments):r,n===a?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},a,u,l;if(r>1)for(a=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(s(t,l,n)).fail(o.reject).progress(s(t,u,a)):--i;return i||o.resolveWith(l,n),o.promise()}}),x.support=function(t){var n=o.createElement("input"),r=o.createDocumentFragment(),i=o.createElement("div"),s=o.createElement("select"),a=s.appendChild(o.createElement("option"));return n.type?(n.type="checkbox",t.checkOn=""!==n.value,t.optSelected=a.selected,t.reliableMarginRight=!0,t.boxSizingReliable=!0,t.pixelPosition=!1,n.checked=!0,t.noCloneChecked=n.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!a.disabled,n=o.createElement("input"),n.value="t",n.type="radio",t.radioValue="t"===n.value,n.setAttribute("checked","t"),n.setAttribute("name","t"),r.appendChild(n),t.checkClone=r.cloneNode(!0).cloneNode(!0).lastChild.checked,t.focusinBubbles="onfocusin"in e,i.style.backgroundClip="content-box",i.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===i.style.backgroundClip,x(function(){var n,r,s="padding:0;margin:0;border:0;display:block;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box",a=o.getElementsByTagName("body")[0];a&&(n=o.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",a.appendChild(n).appendChild(i),i.innerHTML="",i.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%",x.swap(a,null!=a.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===i.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(i,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(i,null)||{width:"4px"}).width,r=i.appendChild(o.createElement("div")),r.style.cssText=i.style.cssText=s,r.style.marginRight=r.style.width="0",i.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),a.removeChild(n))}),t):t}({});var L,q,H=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,O=/([A-Z])/g;function F(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=x.expando+Math.random()}F.uid=1,F.accepts=function(e){return e.nodeType?1===e.nodeType||9===e.nodeType:!0},F.prototype={key:function(e){if(!F.accepts(e))return 0;var t={},n=e[this.expando];if(!n){n=F.uid++;try{t[this.expando]={value:n},Object.defineProperties(e,t)}catch(r){t[this.expando]=n,x.extend(e,t)}}return this.cache[n]||(this.cache[n]={}),n},set:function(e,t,n){var r,i=this.key(e),o=this.cache[i];if("string"==typeof t)o[t]=n;else if(x.isEmptyObject(o))x.extend(this.cache[i],t);else for(r in t)o[r]=t[r];return o},get:function(e,t){var n=this.cache[this.key(e)];return t===undefined?n:n[t]},access:function(e,t,n){var r;return t===undefined||t&&"string"==typeof t&&n===undefined?(r=this.get(e,t),r!==undefined?r:this.get(e,x.camelCase(t))):(this.set(e,t,n),n!==undefined?n:t)},remove:function(e,t){var n,r,i,o=this.key(e),s=this.cache[o];if(t===undefined)this.cache[o]={};else{x.isArray(t)?r=t.concat(t.map(x.camelCase)):(i=x.camelCase(t),t in s?r=[t,i]:(r=i,r=r in s?[r]:r.match(w)||[])),n=r.length;while(n--)delete s[r[n]]}},hasData:function(e){return!x.isEmptyObject(this.cache[e[this.expando]]||{})},discard:function(e){e[this.expando]&&delete this.cache[e[this.expando]]}},L=new F,q=new F,x.extend({acceptData:F.accepts,hasData:function(e){return L.hasData(e)||q.hasData(e)},data:function(e,t,n){return L.access(e,t,n)},removeData:function(e,t){L.remove(e,t)},_data:function(e,t,n){return q.access(e,t,n)},_removeData:function(e,t){q.remove(e,t)}}),x.fn.extend({data:function(e,t){var n,r,i=this[0],o=0,s=null;if(e===undefined){if(this.length&&(s=L.get(i),1===i.nodeType&&!q.get(i,"hasDataAttrs"))){for(n=i.attributes;n.length>o;o++)r=n[o].name,0===r.indexOf("data-")&&(r=x.camelCase(r.slice(5)),P(i,r,s[r]));q.set(i,"hasDataAttrs",!0)}return s}return"object"==typeof e?this.each(function(){L.set(this,e)}):x.access(this,function(t){var n,r=x.camelCase(e);if(i&&t===undefined){if(n=L.get(i,e),n!==undefined)return n;if(n=L.get(i,r),n!==undefined)return n;if(n=P(i,r,undefined),n!==undefined)return n}else this.each(function(){var n=L.get(this,r);L.set(this,r,t),-1!==e.indexOf("-")&&n!==undefined&&L.set(this,e,t)})},null,t,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){L.remove(this,e)})}});function P(e,t,n){var r;if(n===undefined&&1===e.nodeType)if(r="data-"+t.replace(O,"-$1").toLowerCase(),n=e.getAttribute(r),"string"==typeof n){try{n="true"===n?!0:"false"===n?!1:"null"===n?null:+n+""===n?+n:H.test(n)?JSON.parse(n):n}catch(i){}L.set(e,t,n)}else n=undefined;return n}x.extend({queue:function(e,t,n){var r;return e?(t=(t||"fx")+"queue",r=q.get(e,t),n&&(!r||x.isArray(n)?r=q.access(e,t,x.makeArray(n)):r.push(n)),r||[]):undefined},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),s=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,s,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return q.get(e,n)||q.access(e,n,{empty:x.Callbacks("once memory").add(function(){q.remove(e,[t+"queue",n])})})}}),x.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),n>arguments.length?x.queue(this[0],e):t===undefined?this:this.each(function(){var n=x.queue(this,e,t);x._queueHooks(this,e),"fx"===e&&"inprogress"!==n[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=x.Deferred(),o=this,s=this.length,a=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=undefined),e=e||"fx";while(s--)n=q.get(o[s],e+"queueHooks"),n&&n.empty&&(r++,n.empty.add(a));return a(),i.promise(t)}});var R,M,W=/[\t\r\n\f]/g,$=/\r/g,B=/^(?:input|select|textarea|button)$/i;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[x.propFix[e]||e]})},addClass:function(e){var t,n,r,i,o,s=0,a=this.length,u="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];a>s;s++)if(n=this[s],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(W," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,s=0,a=this.length,u=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];a>s;s++)if(n=this[s],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(W," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,i=0,o=x(this),s=e.match(w)||[];while(t=s[i++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===r||"boolean"===n)&&(this.className&&q.set(this,"__className__",this.className),this.className=this.className||e===!1?"":q.get(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(W," ").indexOf(t)>=0)return!0;return!1},val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=x.isFunction(e),this.each(function(n){var i;1===this.nodeType&&(i=r?e.call(this,n,x(this).val()):e,null==i?i="":"number"==typeof i?i+="":x.isArray(i)&&(i=x.map(i,function(e){return null==e?"":e+""})),t=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],t&&"set"in t&&t.set(this,i,"value")!==undefined||(this.value=i))});if(i)return t=x.valHooks[i.type]||x.valHooks[i.nodeName.toLowerCase()],t&&"get"in t&&(n=t.get(i,"value"))!==undefined?n:(n=i.value,"string"==typeof n?n.replace($,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,s=o?null:[],a=o?i+1:r.length,u=0>i?a:o?i:0;for(;a>u;u++)if(n=r[u],!(!n.selected&&u!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),s=i.length;while(s--)r=i[s],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,t,n){var i,o,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===r?x.prop(e,t,n):(1===s&&x.isXMLDoc(e)||(t=t.toLowerCase(),i=x.attrHooks[t]||(x.expr.match.bool.test(t)?M:R)),n===undefined?i&&"get"in i&&null!==(o=i.get(e,t))?o:(o=x.find.attr(e,t),null==o?undefined:o):null!==n?i&&"set"in i&&(o=i.set(e,n,t))!==undefined?o:(e.setAttribute(t,n+""),n):(x.removeAttr(e,t),undefined))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(w);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)&&(e[r]=!1),e.removeAttribute(n)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,t,n){var r,i,o,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return o=1!==s||!x.isXMLDoc(e),o&&(t=x.propFix[t]||t,i=x.propHooks[t]),n!==undefined?i&&"set"in i&&(r=i.set(e,n,t))!==undefined?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){return e.hasAttribute("tabindex")||B.test(e.nodeName)||e.href?e.tabIndex:-1}}}}),M={set:function(e,t,n){return t===!1?x.removeAttr(e,n):e.setAttribute(n,n),n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,t){var n=x.expr.attrHandle[t]||x.find.attr;x.expr.attrHandle[t]=function(e,t,r){var i=x.expr.attrHandle[t],o=r?undefined:(x.expr.attrHandle[t]=undefined)!=n(e,t,r)?t.toLowerCase():null;return x.expr.attrHandle[t]=i,o}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,t){return x.isArray(t)?e.checked=x.inArray(x(e).val(),t)>=0:undefined}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var I=/^key/,z=/^(?:mouse|contextmenu)|click/,_=/^(?:focusinfocus|focusoutblur)$/,X=/^([^.]*)(?:\.(.+)|)$/;function U(){return!0}function Y(){return!1}function V(){try{return o.activeElement}catch(e){}}x.event={global:{},add:function(e,t,n,i,o){var s,a,u,l,c,p,f,h,d,g,m,y=q.get(e);if(y){n.handler&&(s=n,n=s.handler,o=s.selector),n.guid||(n.guid=x.guid++),(l=y.events)||(l=y.events={}),(a=y.handle)||(a=y.handle=function(e){return typeof x===r||e&&x.event.triggered===e.type?undefined:x.event.dispatch.apply(a.elem,arguments)},a.elem=e),t=(t||"").match(w)||[""],c=t.length;while(c--)u=X.exec(t[c])||[],d=m=u[1],g=(u[2]||"").split(".").sort(),d&&(f=x.event.special[d]||{},d=(o?f.delegateType:f.bindType)||d,f=x.event.special[d]||{},p=x.extend({type:d,origType:m,data:i,handler:n,guid:n.guid,selector:o,needsContext:o&&x.expr.match.needsContext.test(o),namespace:g.join(".")},s),(h=l[d])||(h=l[d]=[],h.delegateCount=0,f.setup&&f.setup.call(e,i,g,a)!==!1||e.addEventListener&&e.addEventListener(d,a,!1)),f.add&&(f.add.call(e,p),p.handler.guid||(p.handler.guid=n.guid)),o?h.splice(h.delegateCount++,0,p):h.push(p),x.event.global[d]=!0);e=null}},remove:function(e,t,n,r,i){var o,s,a,u,l,c,p,f,h,d,g,m=q.hasData(e)&&q.get(e);if(m&&(u=m.events)){t=(t||"").match(w)||[""],l=t.length;while(l--)if(a=X.exec(t[l])||[],h=g=a[1],d=(a[2]||"").split(".").sort(),h){p=x.event.special[h]||{},h=(r?p.delegateType:p.bindType)||h,f=u[h]||[],a=a[2]&&RegExp("(^|\\.)"+d.join("\\.(?:.*\\.|)")+"(\\.|$)"),s=o=f.length;while(o--)c=f[o],!i&&g!==c.origType||n&&n.guid!==c.guid||a&&!a.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(f.splice(o,1),c.selector&&f.delegateCount--,p.remove&&p.remove.call(e,c));s&&!f.length&&(p.teardown&&p.teardown.call(e,d,m.handle)!==!1||x.removeEvent(e,h,m.handle),delete u[h])}else for(h in u)x.event.remove(e,h+t[l],n,r,!0);x.isEmptyObject(u)&&(delete m.handle,q.remove(e,"events"))}},trigger:function(t,n,r,i){var s,a,u,l,c,p,f,h=[r||o],d=y.call(t,"type")?t.type:t,g=y.call(t,"namespace")?t.namespace.split("."):[];if(a=u=r=r||o,3!==r.nodeType&&8!==r.nodeType&&!_.test(d+x.event.triggered)&&(d.indexOf(".")>=0&&(g=d.split("."),d=g.shift(),g.sort()),c=0>d.indexOf(":")&&"on"+d,t=t[x.expando]?t:new x.Event(d,"object"==typeof t&&t),t.isTrigger=i?2:3,t.namespace=g.join("."),t.namespace_re=t.namespace?RegExp("(^|\\.)"+g.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=undefined,t.target||(t.target=r),n=null==n?[t]:x.makeArray(n,[t]),f=x.event.special[d]||{},i||!f.trigger||f.trigger.apply(r,n)!==!1)){if(!i&&!f.noBubble&&!x.isWindow(r)){for(l=f.delegateType||d,_.test(l+d)||(a=a.parentNode);a;a=a.parentNode)h.push(a),u=a;u===(r.ownerDocument||o)&&h.push(u.defaultView||u.parentWindow||e)}s=0;while((a=h[s++])&&!t.isPropagationStopped())t.type=s>1?l:f.bindType||d,p=(q.get(a,"events")||{})[t.type]&&q.get(a,"handle"),p&&p.apply(a,n),p=c&&a[c],p&&x.acceptData(a)&&p.apply&&p.apply(a,n)===!1&&t.preventDefault();return t.type=d,i||t.isDefaultPrevented()||f._default&&f._default.apply(h.pop(),n)!==!1||!x.acceptData(r)||c&&x.isFunction(r[d])&&!x.isWindow(r)&&(u=r[c],u&&(r[c]=null),x.event.triggered=d,r[d](),x.event.triggered=undefined,u&&(r[c]=u)),t.result}},dispatch:function(e){e=x.event.fix(e);var t,n,r,i,o,s=[],a=d.call(arguments),u=(q.get(this,"events")||{})[e.type]||[],l=x.event.special[e.type]||{};if(a[0]=e,e.delegateTarget=this,!l.preDispatch||l.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),t=0;while((i=s[t++])&&!e.isPropagationStopped()){e.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(o.namespace))&&(e.handleObj=o,e.data=o.data,r=((x.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,a),r!==undefined&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return l.postDispatch&&l.postDispatch.call(this,e),e.result}},handlers:function(e,t){var n,r,i,o,s=[],a=t.delegateCount,u=e.target;if(a&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!==this;u=u.parentNode||this)if(u.disabled!==!0||"click"!==e.type){for(r=[],n=0;a>n;n++)o=t[n],i=o.selector+" ",r[i]===undefined&&(r[i]=o.needsContext?x(i,this).index(u)>=0:x.find(i,this,null,[u]).length),r[i]&&r.push(o);r.length&&s.push({elem:u,handlers:r})}return t.length>a&&s.push({elem:this,handlers:t.slice(a)}),s},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,t){var n,r,i,s=t.button;return null==e.pageX&&null!=t.clientX&&(n=e.target.ownerDocument||o,r=n.documentElement,i=n.body,e.pageX=t.clientX+(r&&r.scrollLeft||i&&i.scrollLeft||0)-(r&&r.clientLeft||i&&i.clientLeft||0),e.pageY=t.clientY+(r&&r.scrollTop||i&&i.scrollTop||0)-(r&&r.clientTop||i&&i.clientTop||0)),e.which||s===undefined||(e.which=1&s?1:2&s?3:4&s?2:0),e}},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,s=e,a=this.fixHooks[i];a||(this.fixHooks[i]=a=z.test(i)?this.mouseHooks:I.test(i)?this.keyHooks:{}),r=a.props?this.props.concat(a.props):this.props,e=new x.Event(s),t=r.length;while(t--)n=r[t],e[n]=s[n];return e.target||(e.target=o),3===e.target.nodeType&&(e.target=e.target.parentNode),a.filter?a.filter(e,s):e},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==V()&&this.focus?(this.focus(),!1):undefined},delegateType:"focusin"},blur:{trigger:function(){return this===V()&&this.blur?(this.blur(),!1):undefined},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&x.nodeName(this,"input")?(this.click(),!1):undefined},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==undefined&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)},x.Event=function(e,t){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.getPreventDefault&&e.getPreventDefault()?U:Y):this.type=e,t&&x.extend(this,t),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,undefined):new x.Event(e,t)},x.Event.prototype={isDefaultPrevented:Y,isPropagationStopped:Y,isImmediatePropagationStopped:Y,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=U,e&&e.preventDefault&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=U,e&&e.stopPropagation&&e.stopPropagation()},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=U,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&o.addEventListener(e,r,!0)},teardown:function(){0===--n&&o.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,t,n,r,i){var o,s;if("object"==typeof e){"string"!=typeof t&&(n=n||t,t=undefined);for(s in e)this.on(s,t,n,e[s],i);return this}if(null==n&&null==r?(r=t,n=t=undefined):null==r&&("string"==typeof t?(r=n,n=undefined):(r=n,n=t,t=undefined)),r===!1)r=Y;else if(!r)return this;return 1===i&&(o=r,r=function(e){return x().off(e),o.apply(this,arguments)},r.guid=o.guid||(o.guid=x.guid++)),this.each(function(){x.event.add(this,e,r,n,t)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,x(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return(t===!1||"function"==typeof t)&&(n=t,t=undefined),n===!1&&(n=Y),this.each(function(){x.event.remove(this,e,n,t)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];return n?x.event.trigger(e,t,n,!0):undefined}});var G=/^.[^:#\[\.,]*$/,J=/^(?:parents|prev(?:Until|All))/,Q=x.expr.match.needsContext,K={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t=x(e,this),n=t.length;return this.filter(function(){var e=0;for(;n>e;e++)if(x.contains(this,t[e]))return!0})},not:function(e){return this.pushStack(et(this,e||[],!0))},filter:function(e){return this.pushStack(et(this,e||[],!1))},is:function(e){return!!et(this,"string"==typeof e&&Q.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],s=Q.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(s?s.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?g.call(x(e),this[0]):g.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function Z(e,t){while((e=e[t])&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return Z(e,"nextSibling")},prev:function(e){return Z(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return e.contentDocument||x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(K[e]||x.unique(i),J.test(e)&&i.reverse()),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,t,n){var r=[],i=n!==undefined;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&x(e).is(n))break;r.push(e)}return r},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function et(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(G.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return g.call(t,e)>=0!==n})}var tt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,nt=/<([\w:]+)/,rt=/<|&#?\w+;/,it=/<(?:script|style|link)/i,ot=/^(?:checkbox|radio)$/i,st=/checked\s*(?:[^=]|=\s*.checked.)/i,at=/^$|\/(?:java|ecma)script/i,ut=/^true\/(.*)/,lt=/^\s*\s*$/g,ct={option:[1,""],thead:[1,"","
        "],col:[2,"","
        "],tr:[2,"","
        "],td:[3,"","
        "],_default:[0,"",""]};ct.optgroup=ct.option,ct.tbody=ct.tfoot=ct.colgroup=ct.caption=ct.thead,ct.th=ct.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===undefined?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=pt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=pt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(mt(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&dt(mt(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++)1===e.nodeType&&(x.cleanData(mt(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var t=this[0]||{},n=0,r=this.length;if(e===undefined&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!it.test(e)&&!ct[(nt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(tt,"<$1>");try{for(;r>n;n++)t=this[n]||{},1===t.nodeType&&(x.cleanData(mt(t,!1)),t.innerHTML=e);t=0}catch(i){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=f.apply([],e);var r,i,o,s,a,u,l=0,c=this.length,p=this,h=c-1,d=e[0],g=x.isFunction(d);if(g||!(1>=c||"string"!=typeof d||x.support.checkClone)&&st.test(d))return this.each(function(r){var i=p.eq(r);g&&(e[0]=d.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(r=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),i=r.firstChild,1===r.childNodes.length&&(r=i),i)){for(o=x.map(mt(r,"script"),ft),s=o.length;c>l;l++)a=r,l!==h&&(a=x.clone(a,!0,!0),s&&x.merge(o,mt(a,"script"))),t.call(this[l],a,l);if(s)for(u=o[o.length-1].ownerDocument,x.map(o,ht),l=0;s>l;l++)a=o[l],at.test(a.type||"")&&!q.access(a,"globalEval")&&x.contains(u,a)&&(a.src?x._evalUrl(a.src):x.globalEval(a.textContent.replace(lt,"")))}return this}}),x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=[],i=x(e),o=i.length-1,s=0;for(;o>=s;s++)n=s===o?this:this.clone(!0),x(i[s])[t](n),h.apply(r,n.get());return this.pushStack(r)}}),x.extend({clone:function(e,t,n){var r,i,o,s,a=e.cloneNode(!0),u=x.contains(e.ownerDocument,e);if(!(x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(s=mt(a),o=mt(e),r=0,i=o.length;i>r;r++)yt(o[r],s[r]);if(t)if(n)for(o=o||mt(e),s=s||mt(a),r=0,i=o.length;i>r;r++)gt(o[r],s[r]);else gt(e,a);return s=mt(a,"script"),s.length>0&&dt(s,!u&&mt(e,"script")),a},buildFragment:function(e,t,n,r){var i,o,s,a,u,l,c=0,p=e.length,f=t.createDocumentFragment(),h=[];for(;p>c;c++)if(i=e[c],i||0===i)if("object"===x.type(i))x.merge(h,i.nodeType?[i]:i);else if(rt.test(i)){o=o||f.appendChild(t.createElement("div")),s=(nt.exec(i)||["",""])[1].toLowerCase(),a=ct[s]||ct._default,o.innerHTML=a[1]+i.replace(tt,"<$1>")+a[2],l=a[0];while(l--)o=o.lastChild;x.merge(h,o.childNodes),o=f.firstChild,o.textContent=""}else h.push(t.createTextNode(i));f.textContent="",c=0;while(i=h[c++])if((!r||-1===x.inArray(i,r))&&(u=x.contains(i.ownerDocument,i),o=mt(f.appendChild(i),"script"),u&&dt(o),n)){l=0;while(i=o[l++])at.test(i.type||"")&&n.push(i)}return f},cleanData:function(e){var t,n,r,i,o,s,a=x.event.special,u=0;for(;(n=e[u])!==undefined;u++){if(F.accepts(n)&&(o=n[q.expando],o&&(t=q.cache[o]))){if(r=Object.keys(t.events||{}),r.length)for(s=0;(i=r[s])!==undefined;s++)a[i]?x.event.remove(n,i):x.removeEvent(n,i,t.handle);q.cache[o]&&delete q.cache[o]}delete L.cache[n[L.expando]]}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}});function pt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function ft(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function ht(e){var t=ut.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function dt(e,t){var n=e.length,r=0;for(;n>r;r++)q.set(e[r],"globalEval",!t||q.get(t[r],"globalEval"))}function gt(e,t){var n,r,i,o,s,a,u,l;if(1===t.nodeType){if(q.hasData(e)&&(o=q.access(e),s=q.set(t,o),l=o.events)){delete s.handle,s.events={};for(i in l)for(n=0,r=l[i].length;r>n;n++)x.event.add(t,i,l[i][n])}L.hasData(e)&&(a=L.access(e),u=x.extend({},a),L.set(t,u))}}function mt(e,t){var n=e.getElementsByTagName?e.getElementsByTagName(t||"*"):e.querySelectorAll?e.querySelectorAll(t||"*"):[];return t===undefined||t&&x.nodeName(e,t)?x.merge([e],n):n}function yt(e,t){var n=t.nodeName.toLowerCase();"input"===n&&ot.test(e.type)?t.checked=e.checked:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}x.fn.extend({wrapAll:function(e){var t;return x.isFunction(e)?this.each(function(t){x(this).wrapAll(e.call(this,t))}):(this[0]&&(t=x(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this)},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var vt,xt,bt=/^(none|table(?!-c[ea]).+)/,wt=/^margin/,Tt=RegExp("^("+b+")(.*)$","i"),Ct=RegExp("^("+b+")(?!px)[a-z%]+$","i"),kt=RegExp("^([+-])=("+b+")","i"),Nt={BODY:"block"},Et={position:"absolute",visibility:"hidden",display:"block"},St={letterSpacing:0,fontWeight:400},jt=["Top","Right","Bottom","Left"],Dt=["Webkit","O","Moz","ms"];function At(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Dt.length;while(i--)if(t=Dt[i]+n,t in e)return t;return r}function Lt(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function qt(t){return e.getComputedStyle(t,null)}function Ht(e,t){var n,r,i,o=[],s=0,a=e.length;for(;a>s;s++)r=e[s],r.style&&(o[s]=q.get(r,"olddisplay"),n=r.style.display,t?(o[s]||"none"!==n||(r.style.display=""),""===r.style.display&&Lt(r)&&(o[s]=q.access(r,"olddisplay",Rt(r.nodeName)))):o[s]||(i=Lt(r),(n&&"none"!==n||!i)&&q.set(r,"olddisplay",i?n:x.css(r,"display"))));for(s=0;a>s;s++)r=e[s],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[s]||"":"none"));return e}x.fn.extend({css:function(e,t){return x.access(this,function(e,t,n){var r,i,o={},s=0;if(x.isArray(t)){for(r=qt(e),i=t.length;i>s;s++)o[t[s]]=x.css(e,t[s],!1,r);return o}return n!==undefined?x.style(e,t,n):x.css(e,t)},e,t,arguments.length>1)},show:function(){return Ht(this,!0)},hide:function(){return Ht(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){Lt(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=vt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,s,a=x.camelCase(t),u=e.style;return t=x.cssProps[a]||(x.cssProps[a]=At(u,a)),s=x.cssHooks[t]||x.cssHooks[a],n===undefined?s&&"get"in s&&(i=s.get(e,!1,r))!==undefined?i:u[t]:(o=typeof n,"string"===o&&(i=kt.exec(n))&&(n=(i[1]+1)*i[2]+parseFloat(x.css(e,t)),o="number"),null==n||"number"===o&&isNaN(n)||("number"!==o||x.cssNumber[a]||(n+="px"),x.support.clearCloneStyle||""!==n||0!==t.indexOf("background")||(u[t]="inherit"),s&&"set"in s&&(n=s.set(e,n,r))===undefined||(u[t]=n)),undefined)}},css:function(e,t,n,r){var i,o,s,a=x.camelCase(t);return t=x.cssProps[a]||(x.cssProps[a]=At(e.style,a)),s=x.cssHooks[t]||x.cssHooks[a],s&&"get"in s&&(i=s.get(e,!0,n)),i===undefined&&(i=vt(e,t,r)),"normal"===i&&t in St&&(i=St[t]),""===n||n?(o=parseFloat(i),n===!0||x.isNumeric(o)?o||0:i):i}}),vt=function(e,t,n){var r,i,o,s=n||qt(e),a=s?s.getPropertyValue(t)||s[t]:undefined,u=e.style;return s&&(""!==a||x.contains(e.ownerDocument,e)||(a=x.style(e,t)),Ct.test(a)&&wt.test(t)&&(r=u.width,i=u.minWidth,o=u.maxWidth,u.minWidth=u.maxWidth=u.width=a,a=s.width,u.width=r,u.minWidth=i,u.maxWidth=o)),a};function Ot(e,t,n){var r=Tt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function Ft(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,s=0;for(;4>o;o+=2)"margin"===n&&(s+=x.css(e,n+jt[o],!0,i)),r?("content"===n&&(s-=x.css(e,"padding"+jt[o],!0,i)),"margin"!==n&&(s-=x.css(e,"border"+jt[o]+"Width",!0,i))):(s+=x.css(e,"padding"+jt[o],!0,i),"padding"!==n&&(s+=x.css(e,"border"+jt[o]+"Width",!0,i)));return s}function Pt(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=qt(e),s=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=vt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Ct.test(i))return i;r=s&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+Ft(e,t,n||(s?"border":"content"),r,o)+"px"}function Rt(e){var t=o,n=Nt[e];return n||(n=Mt(e,t),"none"!==n&&n||(xt=(xt||x("