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: [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 00000000..32543a44 Binary files /dev/null and b/themes/baggy/img/logo-other_themes.png differ diff --git a/themes/default/_top.twig b/themes/default/_top.twig index 083be152..0711acdc 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 %}

-- cgit v1.2.3 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: [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 34f2ff5a..8a9de488 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') -- cgit v1.2.3 From 25e1213d1bcb7f8777fbe664f96b54fb5fe547bf Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Mon, 24 Feb 2014 12:19:46 +0200 Subject: 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 2852c4c2..313397d2 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; -- cgit v1.2.3 From 49b56f19d88a824fee8de95949d16d92526c32c0 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Mon, 24 Feb 2014 15:38:49 +0200 Subject: Polish, Russian and Ukrainian locales updated, Franch locale po file uopdated. issue #488 --- locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po | 458 ++++++++++++++++++++++++---- locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo | Bin 10557 -> 11248 bytes locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po | 429 ++++++++++++++++---------- locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo | Bin 13000 -> 13856 bytes locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po | 435 ++++++++++++++++---------- locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo | Bin 13258 -> 14375 bytes locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po | 421 ++++++++++++++++--------- 7 files changed, 1225 insertions(+), 518 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 f105d180..133000b4 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 "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 "You can enter multiple tags, separated by commas." +msgstr "" -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 "save a link" +msgstr "" -msgid "you are in demo mode, some features may be disabled." +msgid "return home" msgstr "" -"vous êtes en mode démo, certaines fonctionnalités peuvent être désactivées." -msgid "Stay signed in" -msgstr "Rester connecté" +msgid "You can check your configuration here." +msgstr "" -msgid "(Do not check on public computers)" -msgstr "(ne pas cocher sur un ordinateur public)" +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 3e8b132f..22985970 100755 Binary files a/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo and b/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo differ 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 0e7cbcf8..c65e1c63 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 "favorites" +msgstr "ulubione" -msgid "original" -msgstr "oryginal" +msgid "archive" +msgstr "archiwum" -msgid "Mark as read" -msgstr "Zaznacz jako przeczytane" +msgid "tags" +msgstr "tagi" -msgid "Toggle mark as read" -msgstr "Przełącz jako przeczytane" +msgid "config" +msgstr "ustawienia" -msgid "Favorite" -msgstr "Ulubiony" +msgid "logout" +msgstr "wyloguj" -msgid "Toggle favorite" -msgstr "Zaznacz jako ulubione" +msgid "back to home" +msgstr "wrócić do głównej" -msgid "Delete" -msgstr "Usuń" +msgid "Tags" +msgstr "Tegi" -msgid "Tweet" -msgstr "Tweet" +#, fuzzy +msgid "Poching a link" +msgstr "Zapisywanie linków" -msgid "Email" -msgstr "Wyslij email" +msgid "You can poche a link by several methods:" +msgstr "Istnieje kilka sposobów aby zapisać link:" -msgid "shaarli" -msgstr "shaarli" +msgid "read the documentation" +msgstr "zapoznać się z dokumentacją" -msgid "flattr" -msgstr "flattr" +msgid "download the extension" +msgstr "pobrać rozszerzenie" -msgid "Does this article appear wrong?" -msgstr "Czy ten artykuł wygląda nieprawidłowo?" +msgid "download the application" +msgstr "pobrać aplikację" -msgid "tags:" -msgstr "tegi:" +#, fuzzy +msgid "by filling this field" +msgstr "Poprzez wypełnienie tego pola" -msgid "Edit tags" -msgstr "Redagowac tegi" +msgid "poche it!" +msgstr "zapisać!" -msgid "return home" -msgstr "wrócić do głównej" +#, fuzzy +msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "Bookmarklet: przeciągnij i upucs ten link na pasek zakladek" -msgid "powered by" -msgstr "zasilany przez" +msgid "Updating poche" +msgstr "Aktualizacja poche" -msgid "debug mode is on so cache is off." -msgstr "tryb debugowania jest włączony, więc cash jest wyłączony." +msgid "your version" +msgstr "twoja wersja" -msgid "your poche version:" -msgstr "twoja wersja poche:" +#, fuzzy +msgid "latest stable version" +msgstr "Najnowsza stabilna wersja" -msgid "storage:" -msgstr "magazyn:" +#, 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 "archive" -msgstr "archiwum" - 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 "favorites" -msgstr "ulubione" +msgid "login to your wallabag" +msgstr "zalogować się do swojego wallabag" -msgid "tags" -msgstr "tagi" +msgid "you are in demo mode, some features may be disabled." +msgstr "jesteś w trybie demo, niektóre funkcje mogą być niedostępne." -msgid "config" -msgstr "ustawienia" +msgid "Stay signed in" +msgstr "Pozostań zalogowany" -msgid "logout" -msgstr "wyloguj" +msgid "(Do not check on public computers)" +msgstr "(Nie sprawdzaj na publicznych komputerach" -msgid "Poching links" -msgstr "Zapisywanie linków" +msgid "Saving articles" +msgstr "Zapisywanie artykułó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 "You can check your configuration here." -msgstr "Można sprawdzić swoją konfigurację tu." +msgid "debug mode is on so cache is off." +msgstr "tryb debugowania jest włączony, więc cash jest wyłączony." -msgid "installation" -msgstr "instalacja" +msgid "your wallabag version:" +msgstr "twoja wersja wallabag:" -msgid "install your wallabag" -msgstr "zainstalować wallabag" +msgid "storage:" +msgstr "magazyn:" -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 "save a link" +msgstr "zapisać link" -msgid "Login" -msgstr "Login" +msgid "return home" +msgstr "wrócić do głównej" -msgid "Repeat your password" -msgstr "Powtórz hasło" +msgid "You can check your configuration here." +msgstr "Można sprawdzić swoją konfigurację tu." -msgid "Install" -msgstr "Instalowac" +msgid "Tag" +msgstr "Teg" -msgid "login to your wallabag" -msgstr "zalogować się do swojego wallabag" +msgid "No articles found." +msgstr "Nie znaleziono artykułów." + +msgid "Toggle mark as read" +msgstr "Przełącz jako przeczytane" + +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 c9cf1a55..cf3868be 100755 Binary files a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo and b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo differ 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 aa1769cf..5a6cb829 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 "favorites" +msgstr "избранное" -msgid "original" -msgstr "источник" +msgid "archive" +msgstr "архив" -msgid "Mark as read" -msgstr "Отметить как прочитанное" +msgid "tags" +msgstr "теги" -msgid "Toggle mark as read" -msgstr "Изменить отметку 'прочитано'" +msgid "config" +msgstr "настройки" -msgid "Favorite" -msgstr "Избранное" +msgid "logout" +msgstr "выход" -msgid "Toggle favorite" -msgstr "Изменить метку избранного" +msgid "back to home" +msgstr "домой" -msgid "Delete" -msgstr "Удалить" +msgid "Tags" +msgstr "Теги" -msgid "Tweet" -msgstr "Твитнуть" +#, fuzzy +msgid "Poching a link" +msgstr "Сохранение ссылок" -msgid "Email" -msgstr "Отправить по почте" +msgid "You can poche a link by several methods:" +msgstr "Вы можете сохранить ссылку несколькими путями:" -msgid "shaarli" -msgstr "shaarli" +msgid "read the documentation" +msgstr "читать инструкцию" -msgid "flattr" -msgstr "проспонсировать" +msgid "download the extension" +msgstr "скачать расширение" -msgid "Does this article appear wrong?" -msgstr "Статья выглядит криво?" +msgid "download the application" +msgstr "скачать приложение" -msgid "tags:" -msgstr "теги:" +#, fuzzy +msgid "by filling this field" +msgstr "Заполнением этого поля" -msgid "Edit tags" -msgstr "Редактировать теги" +msgid "poche it!" +msgstr "прикарманить!" -msgid "return home" -msgstr "на главную" +#, fuzzy +msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "Закладка: перетащите и опустите ссылку на панель закладок" -msgid "powered by" -msgstr "при поддержке" +msgid "Updating poche" +msgstr "Обновления poche" -msgid "debug mode is on so cache is off." -msgstr "включён режим отладки - кеш выключен." +msgid "your version" +msgstr "Ваша версия" -msgid "your poche version:" -msgstr "ваша версия poche:" +#, fuzzy +msgid "latest stable version" +msgstr "Последняя стабильная версия" -msgid "storage:" -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 "archive" -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 "favorites" -msgstr "избранное" +msgid "login to your wallabag" +msgstr "войти в свой wallabag" -msgid "tags" -msgstr "теги" +msgid "you are in demo mode, some features may be disabled." +msgstr "демонстрационный режим - работают не все возможности." -msgid "config" -msgstr "настройки" +msgid "Stay signed in" +msgstr "Запомнить меня" -msgid "logout" -msgstr "выход" +msgid "(Do not check on public computers)" +msgstr "(Не отмечайте на чужих компьютерах)" -msgid "Poching links" -msgstr "Сохранение ссылок" +msgid "Saving articles" +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 "You can check your configuration here." -msgstr "Вы можете проверить конфигурацию здесь." +msgid "debug mode is on so cache is off." +msgstr "включён режим отладки - кеш выключен." -msgid "installation" -msgstr "установка" +msgid "your wallabag version:" +msgstr "Ваша версия wallabag:" -msgid "install your wallabag" -msgstr "установка wallabag" +msgid "storage:" +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 "save a link" +msgstr "сохранить ссылку" -msgid "Login" -msgstr "Имя пользователя" +msgid "return home" +msgstr "на главную" -msgid "Repeat your password" -msgstr "Повторите пароль" +msgid "You can check your configuration here." +msgstr "Вы можете проверить конфигурацию здесь." -msgid "Install" -msgstr "Установить" +msgid "Tag" +msgstr "Тег" -msgid "login to your wallabag" -msgstr "войти в свой wallabag" +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 "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 "Import from poche" +#~ msgstr "Импортировать из poche" -#~ msgid "back to home" -#~ msgstr "домой" +#~ 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 80972b65..49c3c7d8 100755 Binary files a/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo and b/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo differ 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 6092cbab..9af81e89 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-06 19:23+0300\n" -"PO-Revision-Date: 2014-02-06 19:24+0300\n" +"POT-Creation-Date: 2014-02-24 14:54+0300\n" +"PO-Revision-Date: 2014-02-24 15:07+0300\n" "Last-Translator: Maryana \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 "plop" +msgstr "plop" -msgid "estimated reading time:" -msgstr "приблизний час читання:" +msgid "installation" +msgstr "інсталяція" -msgid "results" -msgstr "результат(ів)" +msgid "install your wallabag" +msgstr "встановити wallabag" -msgid "You can enter multiple tags, separated by commas." -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 "return to article" -msgstr "повернутися до статті" +msgid "Login" +msgstr "Логін" -msgid "plop" -msgstr "plop" +msgid "Repeat your password" +msgstr "Пароль ще раз" -msgid "You can check your configuration here." -msgstr "Ви можете перевірити вашу конфігурацію тут." +msgid "Install" +msgstr "Встановити" msgid "favoris" msgstr "вибране" @@ -261,48 +200,213 @@ msgstr "за назвою" msgid "by title desc" msgstr "за назвою по спаданню" -msgid "No articles found." -msgstr "Статей не знайдено." - -msgid "Toggle mark as read" -msgstr "змінити мітку прочитаного" +msgid "No link available here!" +msgstr "Немає доступних посилань!" -msgid "installation" -msgstr "інсталяція" +msgid "toggle mark as read" +msgstr "змінити мітку на прочитано" -msgid "install your wallabag" -msgstr "встановити wallabag" +msgid "toggle favorite" +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 "delete" +msgstr "видалити" -msgid "Login" -msgstr "Логін" +msgid "original" +msgstr "оригінал" -msgid "Repeat your password" -msgstr "Пароль ще раз" +msgid "estimated reading time:" +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 "бувайте, ще побачимось!" -- cgit v1.2.3 From 4b842b20cecb198baccdeac76916df367da0400a Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Mon, 24 Feb 2014 19:13:54 +0200 Subject: 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 313397d2..b024547f 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 00000000..1c11b8f6 --- /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(); + } +} -- cgit v1.2.3 From dcc73856a900a98b2b1efd5292eea6f662924884 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Tue, 25 Feb 2014 15:45:39 +0200 Subject: "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 | 496 ++++++++++++++++++++++----- locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po | 492 ++++++++++++++++++++++----- 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 | 495 ++++++++++++++++++++++----- locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po | 491 ++++++++++++++++++++++----- locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po | 449 ++++++++++++------------ locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po | 503 ++++++++++++++++++++++----- locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo | Bin 13856 -> 13552 bytes locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po | 472 +++++++++++++------------- locale/sl_SI.utf8/LC_MESSAGES/sl_SI.utf8.po | 507 +++++++++++++++++++++++----- locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo | Bin 14375 -> 15670 bytes locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po | 471 +++++++++++++------------- 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, 3582 insertions(+), 1304 deletions(-) diff --git a/index.php b/index.php index a26c42e1..7260e583 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 8209a9cd..cf727432 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." -msgstr "pro export vašich dat." - -msgid "back to home" -msgstr "zpět na úvod" +msgid "to download your database." +msgstr "" -msgid "installation" -msgstr "instalace" +#, fuzzy +msgid "to export your wallabag data." +msgstr "pro export vašich dat." -msgid "install your poche" -msgstr "instalovat" +msgid "Cache" +msgstr "" -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 "to delete 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 "You can enter multiple tags, separated by commas." +msgstr "" -msgid "Repeat your password" -msgstr "Zopakujte heslo" +msgid "return to article" +msgstr "" -msgid "Install" -msgstr "Instalovat" +msgid "plop" +msgstr "" -msgid "back to top" -msgstr "zpět na začátek" +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 "or" -msgstr "nebo" +msgid "tags:" +msgstr "" -msgid "contact us by mail" -msgstr "kontaktovat e-mailem" +msgid "Edit tags" +msgstr "" -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 5b30d3d7..9abc5983 100644 --- a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po +++ b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po @@ -1,51 +1,136 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-02-25 15:28+0300\n" "PO-Revision-Date: \n" -"Last-Translator: Square252\n" +"Last-Translator: Maryana \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." -msgstr "um deine Daten aus Poche zu exportieren." - -msgid "back to home" -msgstr "züruck zur Hauptseite" +msgid "to download your database." +msgstr "" -msgid "installation" -msgstr "Installieren" +#, fuzzy +msgid "to export your wallabag data." +msgstr "um deine Daten aus Poche zu exportieren." -msgid "install your poche" -msgstr "Installiere dein Poche" +msgid "Cache" +msgstr "" -msgid "" -"poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " -"on poche website." +msgid "to delete cache." msgstr "" -"Poche ist noch nicht installiert. Bitte fülle die Felder unten aus, um die " -"Installation durchzuführen. Zögere nicht, die Dokumentation auf der Website von Poche zu lesen falls du Probleme " -"haben solltest." -msgid "Login" -msgstr "Benutzername" +msgid "You can enter multiple tags, separated by commas." +msgstr "" -msgid "Repeat your password" -msgstr "Wiederhole dein Passwort" +msgid "return to article" +msgstr "" -msgid "Install" -msgstr "Installieren" +msgid "plop" +msgstr "plop" -msgid "back to top" -msgstr "Nach Oben" +msgid "You can 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 "or" -msgstr "oder" +msgid "tags:" +msgstr "" -msgid "contact us by mail" -msgstr "kontaktieren Sie uns per E-Mail" +msgid "Edit tags" +msgstr "" -msgid "plop" -msgstr "plop" +msgid "save link!" +msgstr "" msgid "home" msgstr "Start" -msgid "favorites" -msgstr "Favoriten" +msgid "tags" +msgstr "" msgid "logout" msgstr "Logout" @@ -206,24 +377,187 @@ msgstr "bereitgestellt von" msgid "debug mode is on so cache is off." msgstr "Debug Modus ist aktiviert, das Caching ist somit deaktiviert" -msgid "your poche version:" -msgstr "Deine Poche Version" +#, fuzzy +msgid "your wallabag version:" +msgstr "Deine Version" msgid "storage:" msgstr "Speicher:" -msgid "login to your poche" -msgstr "Bei Poche anmelden" +msgid "save a link" +msgstr "" -msgid "you are in demo mode, some features may be disabled." +msgid "back to home" +msgstr "züruck zur Hauptseite" + +msgid "toggle mark as read" +msgstr "Als gelesen markieren" + +msgid "tweet" +msgstr "Twittern" + +msgid "email" +msgstr "senden per E-Mail" + +msgid "this article appears wrong?" +msgstr "dieser Artikel erscheint falsch?" + +msgid "No link available here!" +msgstr "Kein Link verfügbar!" + +msgid "Poching a link" +msgstr "Poche einen Link" + +msgid "by filling this field" +msgstr "durch das ausfüllen dieses Feldes:" + +msgid "bookmarklet: drag & drop this link to your bookmarks bar" msgstr "" -"Du befindest dich im Demomodus, einige Funktionen könnten deaktiviert sein." -msgid "Stay signed in" -msgstr "Angemeldet bleiben" +msgid "your version" +msgstr "Deine Version" -msgid "(Do not check on public computers)" -msgstr "(nicht auf einem öffentlichen Computer anhaken)" +msgid "latest stable version" +msgstr "Neuste stabile Version" -msgid "Sign in" -msgstr "Einloggen" +msgid "a more recent stable version is available." +msgstr "Eine neuere stabile Version ist verfügbar." + +msgid "you are up to date." +msgstr "Du bist auf den neuesten Stand." + +msgid "latest dev version" +msgstr "Neuste Entwicklungsversion" + +msgid "a more recent development version is available." +msgstr "Eine neuere Entwicklungsversion ist verfügbar." + +msgid "Please execute the import script locally, it can take a very long time." +msgstr "Bitte führe das Import Script lokal aus, dies kann eine Weile dauern." + +#, fuzzy +msgid "More infos in the official doc:" +msgstr "Mehr Informationen in der offiziellen Dokumentation:" + +msgid "import from Pocket" +msgstr "Import aus Pocket" + +msgid "import from Readability" +msgstr "Import aus Readability" + +msgid "import from Instapaper" +msgstr "Import aus Instapaper" + +msgid "Tags" +msgstr "" + +#, fuzzy +msgid "Untitled" +msgstr "nach Titel" + +msgid "the link has been added successfully" +msgstr "" + +msgid "error during insertion : the link wasn't added" +msgstr "" + +msgid "the link has been deleted successfully" +msgstr "" + +msgid "the link wasn't deleted" +msgstr "" + +msgid "Article not found!" +msgstr "" + +msgid "previous" +msgstr "" + +msgid "next" +msgstr "" + +msgid "in demo mode, you can't update your password" +msgstr "" + +msgid "your password has been updated" +msgstr "" + +msgid "the two fields have to be filled & the password must be the same in the two fields" +msgstr "" + +msgid "still using the \"" +msgstr "" + +msgid "that theme does not seem to be installed" +msgstr "" + +msgid "you have changed your theme preferences" +msgstr "" + +msgid "that language does not seem to be installed" +msgstr "" + +msgid "you have changed your language preferences" +msgstr "" + +msgid "login failed: you have to fill all fields" +msgstr "" + +msgid "welcome to your wallabag" +msgstr "" + +msgid "login failed: bad login or password" +msgstr "" + +#, fuzzy +msgid "import from instapaper completed" +msgstr "Import aus Instapaper" + +#, fuzzy +msgid "import from pocket completed" +msgstr "Import aus Pocket" + +#, fuzzy +msgid "import from Readability completed. " +msgstr "Import aus Readability" + +#, fuzzy +msgid "import from Poche completed. " +msgstr "Import aus Pocket" + +msgid "Unknown import provider." +msgstr "" + +msgid "Incomplete inc/poche/define.inc.php file, please define \"" +msgstr "" + +msgid "Could not find required \"" +msgstr "" + +msgid "Uh, there is a problem while generating feeds." +msgstr "" + +#, fuzzy +msgid "Cache deleted." +msgstr "Löschen" + +msgid "Oops, it seems you don't have PHP 5." +msgstr "" + +#~ msgid "poche it!" +#~ msgstr "Poche es!" + +#~ msgid "Updating poche" +#~ msgstr "Poche aktualisieren" + +#~ msgid "create an issue" +#~ msgstr "ein Ticket erstellen" + +#~ msgid "or" +#~ msgstr "oder" + +#~ msgid "contact us by mail" +#~ msgstr "kontaktieren Sie uns per E-Mail" + +#~ msgid "your poche version:" +#~ msgstr "Deine Poche Version" 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 83d0a85f..bf5f69e7 100644 Binary files a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo and b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo differ 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 b78759f5..119fb060 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 "Import from Instapaper" +msgstr "Import from Instapaper" -msgid "Export your poche data" -msgstr "Export your poche data" +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 "Login" -msgstr "Login" +msgid "You can enter multiple tags, separated by commas." +msgstr "You can enter multiple tags, separated by commas." -msgid "Repeat your password" -msgstr "Repeat your password" +msgid "return to article" +msgstr "return to article" -msgid "Install" -msgstr "Install" +msgid "plop" +msgstr "plop" -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 afe0595d..c08decfe 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." -msgstr "para exportar sus datos de poche." - -msgid "back to home" -msgstr "volver a la página de inicio" +msgid "to download your database." +msgstr "" -msgid "installation" -msgstr "instalación" +#, fuzzy +msgid "to export your wallabag data." +msgstr "para exportar sus datos de poche." -msgid "install your poche" -msgstr "instala tu Poche" +msgid "Cache" +msgstr "" -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 "to delete 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 "You can enter multiple tags, separated by commas." +msgstr "" -msgid "Repeat your password" -msgstr "Repita su contraseña" +msgid "return to article" +msgstr "" -msgid "Install" -msgstr "Instalar" +msgid "plop" +msgstr "plop" -msgid "back to top" -msgstr "volver arriba" +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 "or" -msgstr "o" +msgid "tags:" +msgstr "" -msgid "contact us by mail" -msgstr "contactarnos por mail" +msgid "Edit tags" +msgstr "" -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 "save a link" +msgstr "" -msgid "you are in demo mode, some features may be disabled." +msgid "back to home" +msgstr "volver a la página de inicio" + +msgid "toggle mark as read" +msgstr "marcar como leído" + +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 "" -"este es el modo de demostración, algunas funcionalidades pueden estar " -"desactivadas." -msgid "Stay signed in" -msgstr "Seguir conectado" +msgid "your version" +msgstr "su versión" -msgid "(Do not check on public computers)" -msgstr "(no marcar en un ordenador público)" +msgid "latest stable version" +msgstr "ultima versión estable" -msgid "Sign in" -msgstr "Iniciar sesión" +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 74a763c6..f24814d5 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." -msgstr "برای برون‌بری داده‌های poche شما" - -msgid "back to home" -msgstr "بازگشت به خانه" +msgid "to download your database." +msgstr "" -msgid "installation" -msgstr "نصب" +#, fuzzy +msgid "to export your wallabag data." +msgstr "برای برون‌بری داده‌های poche شما" -msgid "install your poche" -msgstr "poche خود را نصب کنید" +msgid "Cache" +msgstr "" -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 "to delete cache." msgstr "" -"poche هنوز نصب نیست. برای نصب لطفاً فرم زیر را پر کنید. خواندن راهنما در وبگاه poche را از یاد نبرید." -msgid "Login" -msgstr "ورود" +msgid "You can enter multiple tags, separated by commas." +msgstr "" -msgid "Repeat your password" -msgstr "گذرواژه را دوباره وارد کنید" +msgid "return to article" +msgstr "" -msgid "Install" -msgstr "نصب" +msgid "plop" +msgstr "plop" -msgid "back to top" -msgstr "بازگشت به بالای صفحه" +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 "or" -msgstr "یا" +msgid "tags:" +msgstr "" -msgid "contact us by mail" -msgstr "به ما ایمیل بزنید" +msgid "Edit tags" +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 133000b4..c113019a 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,39 +41,81 @@ msgstr "lisez la documentation" msgid "download the extension" msgstr "" +msgid "via F-Droid" +msgstr "" + +msgid " or " +msgstr "" + +msgid "via Google Play" +msgstr "" + msgid "download the application" msgstr "" -msgid "by filling this field" +#, fuzzy +msgid "By filling this field" msgstr "en remplissant ce champ" -msgid "poche it!" -msgstr "pochez-le !" +msgid "bag it!" +msgstr "" -msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgid "Bookmarklet: drag & drop this link to your bookmarks bar" msgstr "" -msgid "Updating poche" -msgstr "Mettre à jour poche" +msgid "Upgrading wallabag" +msgstr "" -msgid "your version" -msgstr "votre version" +#, fuzzy +msgid "Installed version" +msgstr "dernière version stable" -msgid "latest stable version" +#, fuzzy +msgid "Latest stable version" msgstr "dernière version stable" -msgid "a more recent stable version is available." +#, fuzzy +msgid "A more recent stable version is available." msgstr "une version stable plus récente est disponible." -msgid "you are up to date." +#, fuzzy +msgid "You are up to date." msgstr "vous êtes à jour." -msgid "latest dev version" +#, fuzzy +msgid "Latest dev version" msgstr "dernière version de développement" -msgid "a more recent development version is available." +#, 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 theme" msgstr "Modifier votre mot de passe" @@ -102,6 +126,13 @@ msgstr "" msgid "Update" msgstr "Mettre à jour" +#, fuzzy +msgid "Change your language" +msgstr "Modifier votre mot de passe" + +msgid "Language:" +msgstr "" + msgid "Change your password" msgstr "Modifier votre mot de passe" @@ -117,63 +148,72 @@ 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." +#, 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 infos in the official doc:" +msgid "More info in the official documentation:" msgstr "Plus d'infos sur la documentation officielle" -msgid "import from Pocket" +#, fuzzy +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" +#, fuzzy +msgid "Import from Readability" msgstr "import depuis Readability" -msgid "import from Instapaper" +#, fuzzy +msgid "Import from Instapaper" msgstr "import depuis Instapaper" #, fuzzy -msgid "Export your poche datas" +msgid "Import from wallabag" +msgstr "import depuis Readability" + +#, fuzzy +msgid "Export your wallabag data" msgstr "Exporter vos données de poche" msgid "Click here" msgstr "Cliquez-ici" +msgid "to download your database." +msgstr "" + #, fuzzy -msgid "to export your poche datas." +msgid "to export your wallabag data." msgstr "pour exporter vos données de poche." -msgid "plop" -msgstr "plop" - -msgid "installation" -msgstr "installation" +msgid "Cache" +msgstr "" -#, fuzzy -msgid "install your wallabag" -msgstr "installez votre poche" +msgid "to delete cache." +msgstr "" -#, 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 "You can enter multiple tags, separated by commas." +msgstr "" -msgid "Login" -msgstr "Nom d'utilisateur" +msgid "return to article" +msgstr "" -msgid "Repeat your password" -msgstr "Répétez votre mot de passe" +msgid "plop" +msgstr "plop" -msgid "Install" -msgstr "Installer" +msgid "You can check your configuration here." +msgstr "" msgid "favoris" msgstr "favoris" +msgid "archive" +msgstr "archive" + msgid "unread" msgstr "non lus" @@ -195,10 +235,14 @@ msgstr "par titre" msgid "by title desc" msgstr "par titre desc" -msgid "No link available here!" -msgstr "Aucun lien n'est disponible ici !" +msgid "Tag" +msgstr "" -msgid "toggle mark as read" +msgid "No articles found." +msgstr "" + +#, fuzzy +msgid "Toggle mark as read" msgstr "marquer comme lu / non lu" msgid "toggle favorite" @@ -213,152 +257,92 @@ 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!" +msgid "mark all the entries as read" msgstr "" -msgid "Bookmarklet: drag & drop this link to your bookmarks bar" -msgstr "" +msgid "results" +msgstr "résultats" -msgid "Upgrading wallabag" -msgstr "" +msgid "installation" +msgstr "installation" #, fuzzy -msgid "Installed version" -msgstr "dernière version stable" +msgid "install your wallabag" +msgstr "installez votre poche" #, fuzzy -msgid "Latest stable version" -msgstr "dernière version stable" +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." -#, fuzzy -msgid "A more recent stable version is available." -msgstr "une version stable plus récente est disponible." +msgid "Login" +msgstr "Nom d'utilisateur" -#, fuzzy -msgid "You are up to date." -msgstr "vous êtes à jour." +msgid "Repeat your password" +msgstr "Répétez votre mot de passe" -#, fuzzy -msgid "Latest dev version" -msgstr "dernière version de développement" +msgid "Install" +msgstr "Installer" #, fuzzy -msgid "A more recent development version is available." -msgstr "une version de développement plus récente est disponible." +msgid "login to your wallabag" +msgstr "se connecter à votre poche" -msgid "Feeds" +msgid "Login to wallabag" msgstr "" -msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." -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 "Unread feed" +msgid "Username" msgstr "" -#, fuzzy -msgid "Favorites feed" -msgstr "favoris" +msgid "Stay signed in" +msgstr "Rester connecté" -#, fuzzy -msgid "Archive feed" -msgstr "archive" +msgid "(Do not check on public computers)" +msgstr "(ne pas cocher sur un ordinateur public)" -msgid "Your token:" -msgstr "" +msgid "Sign in" +msgstr "Se connecter" -msgid "Your user id:" -msgstr "" +msgid "favorites" +msgstr "favoris" -msgid "You can regenerate your token: generate!." +msgid "estimated reading time :" msgstr "" -#, fuzzy -msgid "Change your language" -msgstr "Modifier votre mot de passe" - -msgid "Language:" +msgid "Mark all the entries as read" 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" +msgid "Return home" +msgstr "" #, fuzzy -msgid "Import from Pocket" -msgstr "import depuis Pocket" +msgid "Back to top" +msgstr "retour en haut de page" #, fuzzy -msgid "Import from Readability" -msgstr "import depuis Readability" +msgid "Mark as read" +msgstr "marquer comme lu / non lu" #, fuzzy -msgid "Import from Instapaper" -msgstr "import depuis Instapaper" +msgid "Favorite" +msgstr "favoris" #, fuzzy -msgid "Import from wallabag" -msgstr "import depuis Readability" +msgid "Toggle favorite" +msgstr "marquer comme favori" #, fuzzy -msgid "Export your wallabag data" -msgstr "Exporter vos données de poche" - -msgid "to download your database." -msgstr "" +msgid "Delete" +msgstr "supprimer" #, 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" +msgid "Tweet" msgstr "tweet" -msgid "email" +#, fuzzy +msgid "Email" msgstr "email" msgid "shaarli" @@ -367,15 +351,28 @@ msgstr "shaarli" msgid "flattr" msgstr "flattr" -msgid "this article appears wrong?" +#, fuzzy +msgid "Does this article appear wrong?" msgstr "cet article s'affiche mal ?" -msgid "You can enter multiple tags, separated by commas." +msgid "tags:" msgstr "" -msgid "return to article" +msgid "Edit tags" +msgstr "" + +msgid "save link!" msgstr "" +msgid "home" +msgstr "accueil" + +msgid "tags" +msgstr "" + +msgid "logout" +msgstr "déconnexion" + msgid "powered by" msgstr "propulsé par" @@ -392,82 +389,68 @@ msgstr "stockage :" msgid "save a link" msgstr "" -msgid "return home" -msgstr "" - -msgid "You can check your configuration here." -msgstr "" +msgid "back to home" +msgstr "retour à l'accueil" -msgid "Tag" -msgstr "" +msgid "toggle mark as read" +msgstr "marquer comme lu / non lu" -msgid "No articles found." -msgstr "" +msgid "tweet" +msgstr "tweet" -#, fuzzy -msgid "Toggle mark as read" -msgstr "marquer comme lu / non lu" +msgid "email" +msgstr "email" -msgid "mark all the entries as read" -msgstr "" +msgid "this article appears wrong?" +msgstr "cet article s'affiche mal ?" -msgid "Login to wallabag" -msgstr "" +msgid "No link available here!" +msgstr "Aucun lien n'est disponible ici !" -msgid "Username" -msgstr "" +msgid "Poching a link" +msgstr "Pocher un lien" -msgid "Sign in" -msgstr "Se connecter" +msgid "by filling this field" +msgstr "en remplissant ce champ" -msgid "Return home" +msgid "bookmarklet: drag & drop this link to your bookmarks bar" msgstr "" -#, fuzzy -msgid "Back to top" -msgstr "retour en haut de page" +msgid "your version" +msgstr "votre version" -#, fuzzy -msgid "Mark as read" -msgstr "marquer comme lu / non lu" +msgid "latest stable version" +msgstr "dernière version stable" -#, fuzzy -msgid "Favorite" -msgstr "favoris" +msgid "a more recent stable version is available." +msgstr "une version stable plus récente est disponible." -#, fuzzy -msgid "Toggle favorite" -msgstr "marquer comme favori" +msgid "you are up to date." +msgstr "vous êtes à jour." -#, fuzzy -msgid "Delete" -msgstr "supprimer" +msgid "latest dev version" +msgstr "dernière version de développement" -#, fuzzy -msgid "Tweet" -msgstr "tweet" +msgid "a more recent development version is available." +msgstr "une version de développement plus récente est disponible." -#, fuzzy -msgid "Email" -msgstr "email" +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 "Does this article appear wrong?" -msgstr "cet article s'affiche mal ?" - -msgid "tags:" -msgstr "" +msgid "More infos in the official doc:" +msgstr "Plus d'infos sur la documentation officielle" -msgid "Edit tags" -msgstr "" +msgid "import from Pocket" +msgstr "import depuis Pocket" -msgid "save link!" -msgstr "" +msgid "import from Readability" +msgstr "import depuis Readability" -msgid "estimated reading time :" -msgstr "" +msgid "import from Instapaper" +msgstr "import depuis Instapaper" -msgid "Mark all the entries as read" +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 429d5d55..41cc01e0 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." -msgstr "per esportare i tuoi dati di poche." - -msgid "back to home" -msgstr "torna alla home" +msgid "to download your database." +msgstr "" -msgid "installation" -msgstr "installazione" +#, fuzzy +msgid "to export your wallabag data." +msgstr "per esportare i tuoi dati di poche." -msgid "install your poche" -msgstr "installa il tuo poche" +msgid "Cache" +msgstr "" -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 "to delete 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 "You can enter multiple tags, separated by commas." +msgstr "" -msgid "Repeat your password" -msgstr "Ripeti la tua password" +msgid "return to article" +msgstr "" -msgid "Install" -msgstr "Installa" +msgid "plop" +msgstr "plop" -msgid "back to top" -msgstr "torna a inizio pagina" +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 "or" -msgstr "oppure" +msgid "tags:" +msgstr "" -msgid "contact us by mail" -msgstr "contattaci via email" +msgid "Edit tags" +msgstr "" -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 "save a link" +msgstr "" -msgid "you are in demo mode, some features may be disabled." +msgid "back to home" +msgstr "torna alla home" + +msgid "toggle mark as read" +msgstr "segna come letto / non letto" + +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 "" -"sei in modalità dimostrazione, alcune funzionalità potrebbero essere " -"disattivate." -msgid "Stay signed in" -msgstr "Resta connesso" +msgid "your version" +msgstr "la tua versione" -msgid "(Do not check on public computers)" -msgstr "(non selezionare su computer pubblici)" +msgid "latest stable version" +msgstr "ultima versione stabile" -msgid "Sign in" -msgstr "Accedi" +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 cf3868be..5cbfad16 100755 Binary files a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo and b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo differ 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 5a6cb829..08f12b7c 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-24 15:09+0300\n" +"POT-Creation-Date: 2014-02-25 15:09+0300\n" "PO-Revision-Date: \n" "Last-Translator: Maryana \n" "Language-Team: \n" @@ -16,42 +16,24 @@ 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 "Saving articles" +msgstr "Сохранение статей" #, fuzzy -msgid "Poching a link" -msgstr "Сохранение ссылок" - -msgid "You can poche a link by several methods:" -msgstr "Вы можете сохранить ссылку несколькими путями:" +msgid "There are several ways to save an article:" +msgstr "Существует несколько способов сохранить ссылку:" msgid "read the documentation" msgstr "читать инструкцию" @@ -59,43 +41,74 @@ 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 "скачать приложение" -#, fuzzy -msgid "by filling this field" +msgid "By filling this field" msgstr "Заполнением этого поля" -msgid "poche it!" +msgid "bag it!" msgstr "прикарманить!" -#, fuzzy -msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgid "Bookmarklet: drag & drop this link to your bookmarks bar" msgstr "Закладка: перетащите и опустите ссылку на панель закладок" -msgid "Updating poche" -msgstr "Обновления poche" +msgid "Upgrading wallabag" +msgstr "Обновление wallabag" -msgid "your version" -msgstr "Ваша версия" +msgid "Installed version" +msgstr "Установленная версия" -#, fuzzy -msgid "latest stable version" +msgid "Latest stable version" msgstr "Последняя стабильная версия" -#, fuzzy -msgid "a more recent stable version is available." +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" +#, 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 "Ленты (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 "Изменить тему" @@ -105,6 +118,12 @@ msgstr "Тема:" msgid "Update" msgstr "Обновить" +msgid "Change your language" +msgstr "Изменить язык" + +msgid "Language:" +msgstr "Язык:" + msgid "Change your password" msgstr "Смена пароля" @@ -120,65 +139,65 @@ msgstr "Ещё раз новый пароль:" msgid "Import" msgstr "Импортировать" -#, fuzzy -msgid "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 "Пожалуйста, выполните сценарий импорта локально - это может занять слишком много времени." #, fuzzy -msgid "More infos in the official doc:" +msgid "More info in the official documentation:" msgstr "Больше сведений в официальной документации:" -#, fuzzy -msgid "import from Pocket" +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" +msgid "Import from Readability" msgstr "Импортировать из Readability" -#, fuzzy -msgid "import from Instapaper" +msgid "Import from Instapaper" msgstr "Импортировать из Instapaper" -#, fuzzy -msgid "Export your poche datas" -msgstr "Экспортировать данные poche" +msgid "Import from wallabag" +msgstr "Импортировать из wallabag" + +msgid "Export your wallabag data" +msgstr "Экспортировать данные wallabag" msgid "Click here" msgstr "Кликните здесь" -#, fuzzy -msgid "to export your poche datas." -msgstr "чтобы экспортировать свои записи из poche." +msgid "to download your database." +msgstr "чтобы скачать вашу базу данных" -msgid "plop" -msgstr "plop" +msgid "to export your wallabag data." +msgstr "чтобы экспортировать свои записи из wallabag." -msgid "installation" -msgstr "установка" +msgid "Cache" +msgstr "Кэш" -msgid "install your wallabag" -msgstr "установка wallabag" +msgid "to delete cache." +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 "You can enter multiple tags, separated by commas." +msgstr "Вы можете ввести несколько тегов, разделяя их запятой." -msgid "Login" -msgstr "Имя пользователя" +msgid "return to article" +msgstr "вернуться к статье" -msgid "Repeat your password" -msgstr "Повторите пароль" +msgid "plop" +msgstr "plop" -msgid "Install" -msgstr "Установить" +msgid "You can check your configuration here." +msgstr "Вы можете проверить конфигурацию здесь." msgid "favoris" msgstr "избранное" +msgid "archive" +msgstr "архив" + msgid "unread" msgstr "непрочитанное" @@ -200,11 +219,14 @@ msgstr "по заголовку" msgid "by title desc" msgstr "по заголовку (обратный)" -msgid "No link available here!" -msgstr "Здесь нет ссылки!" +msgid "Tag" +msgstr "Тег" -msgid "toggle mark as read" -msgstr "изменить отметку 'прочитано'" +msgid "No articles found." +msgstr "Статей не найдено." + +msgid "Toggle mark as read" +msgstr "Изменить отметку 'прочитано'" msgid "toggle favorite" msgstr "изменить метку избранного" @@ -218,138 +240,84 @@ msgstr "источник" msgid "estimated reading time:" msgstr "ориентировочное время чтения:" +msgid "mark all the entries as read" +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 "Сохранение статей" - -#, fuzzy -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 "У вас всё самое новое." +msgid "installation" +msgstr "установка" -#, fuzzy -msgid "Latest dev version" -msgstr "последняя версия в разработке" +msgid "install your wallabag" +msgstr "установка wallabag" -#, fuzzy -msgid "A more recent development version is available." -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 "Feeds" -msgstr "Ленты (feeds)" +msgid "Login" +msgstr "Имя пользователя" -msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." -msgstr "Ваш маркер ленты (feed token) не определен, для того, чтобы активировать ленту, сначала создайте его. Нажмите здесь для его генерации." +msgid "Repeat your password" +msgstr "Повторите пароль" -msgid "Unread feed" -msgstr "Лента непрочитанного" +msgid "Install" +msgstr "Установить" -msgid "Favorites feed" -msgstr "Лента избранного" +msgid "login to your wallabag" +msgstr "войти в свой wallabag" -msgid "Archive feed" -msgstr "Лента архива" +msgid "Login to wallabag" +msgstr "Войдите в wallabag" -msgid "Your token:" -msgstr "Ваш маркер (token):" +msgid "you are in demo mode, some features may be disabled." +msgstr "демонстрационный режим - работают не все возможности." -msgid "Your user id:" -msgstr "Ваш идентификатор пользователя (user id):" +msgid "Username" +msgstr "Имя пользователя" -msgid "You can regenerate your token: generate!." -msgstr "Вы можете создать новый ​​маркер: сгенерировать!." +msgid "Stay signed in" +msgstr "Запомнить меня" -msgid "Change your language" -msgstr "Изменить язык" +msgid "(Do not check on public computers)" +msgstr "(Не отмечайте на чужих компьютерах)" -msgid "Language:" -msgstr "Язык:" +msgid "Sign in" +msgstr "Зарегистрироваться" -msgid "Please execute the import script locally as it can take a very long time." -msgstr "Пожалуйста, выполните сценарий импорта локально - это может занять слишком много времени." +msgid "favorites" +msgstr "избранное" #, fuzzy -msgid "More info in the official documentation:" -msgstr "Больше сведений в официальной документации:" - -msgid "Import from Pocket" -msgstr "Импортировать из Pocket" - -msgid "Import from Readability" -msgstr "Импортировать из Readability" +msgid "estimated reading time :" +msgstr "ориентировочное время чтения:" -msgid "Import from Instapaper" -msgstr "Импортировать из Instapaper" +msgid "Mark all the entries as read" +msgstr "Отметить все как прочитанное" -msgid "Import from wallabag" -msgstr "Импортировать из wallabag" +msgid "Return home" +msgstr "На главную" -msgid "Export your wallabag data" -msgstr "Экспортировать данные wallabag" +msgid "Back to top" +msgstr "Наверх" -msgid "to download your database." -msgstr "чтобы скачать вашу базу данных" +msgid "Mark as read" +msgstr "Отметить как прочитанное" -msgid "to export your wallabag data." -msgstr "чтобы экспортировать свои записи из wallabag." +msgid "Favorite" +msgstr "Избранное" -msgid "Cache" -msgstr "Кэш" +msgid "Toggle favorite" +msgstr "Изменить метку избранного" -msgid "to delete cache." -msgstr "чтобы сбросить кэш." +msgid "Delete" +msgstr "Удалить" -msgid "tweet" -msgstr "твитнуть" +msgid "Tweet" +msgstr "Твитнуть" -msgid "email" -msgstr "email" +msgid "Email" +msgstr "Отправить по почте" msgid "shaarli" msgstr "shaarli" @@ -357,15 +325,26 @@ msgstr "shaarli" msgid "flattr" msgstr "проспонсировать" -#, fuzzy -msgid "this article appears wrong?" +msgid "Does this article appear wrong?" msgstr "Статья выглядит криво?" -msgid "You can enter multiple tags, separated by commas." -msgstr "Вы можете ввести несколько тегов, разделяя их запятой." +msgid "tags:" +msgstr "теги:" -msgid "return to article" -msgstr "вернуться к статье" +msgid "Edit tags" +msgstr "Редактировать теги" + +msgid "save link!" +msgstr "сохранить ссылку!" + +msgid "home" +msgstr "главная" + +msgid "tags" +msgstr "теги" + +msgid "logout" +msgstr "выход" msgid "powered by" msgstr "при поддержке" @@ -382,75 +361,79 @@ msgstr "хранилище:" msgid "save a link" msgstr "сохранить ссылку" -msgid "return home" -msgstr "на главную" - -msgid "You can check your configuration here." -msgstr "Вы можете проверить конфигурацию здесь." - -msgid "Tag" -msgstr "Тег" +msgid "back to home" +msgstr "домой" -msgid "No articles found." -msgstr "Статей не найдено." +msgid "toggle mark as read" +msgstr "изменить отметку 'прочитано'" -msgid "Toggle mark as read" -msgstr "Изменить отметку 'прочитано'" +msgid "tweet" +msgstr "твитнуть" -msgid "mark all the entries as read" -msgstr "отметить все статьи как прочитанные " +msgid "email" +msgstr "email" -msgid "Login to wallabag" -msgstr "Войдите в wallabag" +#, fuzzy +msgid "this article appears wrong?" +msgstr "Статья выглядит криво?" -msgid "Username" -msgstr "Имя пользователя" +msgid "No link available here!" +msgstr "Здесь нет ссылки!" -msgid "Sign in" -msgstr "Зарегистрироваться" +#, fuzzy +msgid "Poching a link" +msgstr "Сохранение ссылок" -msgid "Return home" -msgstr "На главную" +#, fuzzy +msgid "by filling this field" +msgstr "Заполнением этого поля" -msgid "Back to top" -msgstr "Наверх" +#, fuzzy +msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "Закладка: перетащите и опустите ссылку на панель закладок" -msgid "Mark as read" -msgstr "Отметить как прочитанное" +msgid "your version" +msgstr "Ваша версия" -msgid "Favorite" -msgstr "Избранное" +#, fuzzy +msgid "latest stable version" +msgstr "Последняя стабильная версия" -msgid "Toggle favorite" -msgstr "Изменить метку избранного" +#, fuzzy +msgid "a more recent stable version is available." +msgstr "Доступна новая стабильная версия." -msgid "Delete" -msgstr "Удалить" +msgid "you are up to date." +msgstr "у вас всё самое новое." -msgid "Tweet" -msgstr "Твитнуть" +msgid "latest dev version" +msgstr "последняя версия в разработке" -msgid "Email" -msgstr "Отправить по почте" +msgid "a more recent development version is available." +msgstr "есть более свежая версия в разработке." -msgid "Does this article appear wrong?" -msgstr "Статья выглядит криво?" +#, fuzzy +msgid "Please execute the import script locally, it can take a very long time." +msgstr "Пожалуйста, выполните сценарий импорта локально - это может занять слишком много времени." -msgid "tags:" -msgstr "теги:" +#, fuzzy +msgid "More infos in the official doc:" +msgstr "Больше сведений в официальной документации:" -msgid "Edit tags" -msgstr "Редактировать теги" +#, fuzzy +msgid "import from Pocket" +msgstr "Импортировать из Pocket" -msgid "save link!" -msgstr "сохранить ссылку!" +#, fuzzy +msgid "import from Readability" +msgstr "Импортировать из Readability" #, fuzzy -msgid "estimated reading time :" -msgstr "ориентировочное время чтения:" +msgid "import from Instapaper" +msgstr "Импортировать из Instapaper" -msgid "Mark all the entries as read" -msgstr "Отметить все как прочитанное" +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 6eac8e01..8ad2eded 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" - -msgid "installation" -msgstr "Namestitev" +#, fuzzy +msgid "to export your wallabag data." +msgstr "za izvoz vsebine aplikacije Poche." -msgid "install your poche" -msgstr "Namestitev aplikacije Poche" +msgid "Cache" +msgstr "" -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 "to delete 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 "You can enter multiple tags, separated by commas." +msgstr "" -msgid "Repeat your password" -msgstr "Ponovite geslo" +msgid "return to article" +msgstr "" -msgid "Install" -msgstr "Namesti" +msgid "plop" +msgstr "štrbunk" -msgid "back to top" -msgstr "nazaj na vrh" +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,13 +258,95 @@ 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" +msgid "installation" +msgstr "Namestitev" + +#, fuzzy +msgid "install your wallabag" +msgstr "Namestitev aplikacije 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 še vedno ni nameščen. Za namestitev izpolnite spodnji obrazec. Za več informacij preberite dokumentacijo na spletni strani." + +msgid "Login" +msgstr "Prijava" + +msgid "Repeat your password" +msgstr "Ponovite geslo" + +msgid "Install" +msgstr "Namesti" + +#, fuzzy +msgid "login to your wallabag" +msgstr "prijavite se v svoj Poche" + +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 "" + +msgid "Stay signed in" +msgstr "Ostani prijavljen" + +msgid "(Do not check on public computers)" +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" -msgid "email" +#, fuzzy +msgid "Email" msgstr "pošlji po e-pošti" msgid "shaarli" @@ -184,26 +355,24 @@ msgstr "shaarli" msgid "flattr" msgstr "flattr" -msgid "this article appears wrong?" +#, fuzzy +msgid "Does this article appear wrong?" msgstr "napaka?" -msgid "create an issue" -msgstr "prijavi napako" - -msgid "or" -msgstr "ali" +msgid "tags:" +msgstr "" -msgid "contact us by mail" -msgstr "pošlji e-pošto razvijalcem" +msgid "Edit tags" +msgstr "" -msgid "plop" -msgstr "štrbunk" +msgid "save link!" +msgstr "" msgid "home" msgstr "domov" -msgid "favorites" -msgstr "priljubljeni" +msgid "tags" +msgstr "" msgid "logout" msgstr "odjava" @@ -212,28 +381,188 @@ 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." +msgstr "vklopljen je način odpravljanja napak, zato je predpomnilnik izključen." -msgid "your poche version:" -msgstr "vaša verzija Poche:" +#, fuzzy +msgid "your wallabag version:" +msgstr "vaša različica" msgid "storage:" msgstr "pomnilnik:" -msgid "login to your poche" -msgstr "prijavite se v svoj Poche" +msgid "save a link" +msgstr "" -msgid "you are in demo mode, some features may be disabled." +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 "" -"uporabljate vzorčno različico programa, zato so lahko nekatere funkcije " -"izklopljene." -msgid "Stay signed in" -msgstr "Ostani prijavljen" +msgid "your version" +msgstr "vaša različica" -msgid "(Do not check on public computers)" -msgstr "(Ne označi na javnih napravah)" +msgid "latest stable version" +msgstr "zadnja stabilna različica" -msgid "Sign in" -msgstr "Prijava" +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 49c3c7d8..4884abf5 100755 Binary files a/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo and b/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo differ 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 9af81e89..08797705 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,41 +17,23 @@ 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 "Saving articles" +msgstr "Зберігання посилань" -msgid "You can poche a link by several methods:" -msgstr "Ви можете зберегти посилання кількома способами:" +msgid "There are several ways to save an article:" +msgstr "Є кілька способів зберегти статтю:" msgid "read the documentation" msgstr "читати документацію" @@ -59,42 +41,71 @@ 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 "завантажити додаток" -#, fuzzy -msgid "by filling this field" +msgid "By filling this field" msgstr "Заповнивши це поле" -msgid "poche it!" +msgid "bag it!" msgstr "зберегти!" -#, fuzzy -msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgid "Bookmarklet: drag & drop this link to your bookmarks bar" msgstr "З допомогою закладки: перетягніть і відпустіть посилання на панель закладок" -msgid "Updating poche" -msgstr "Оновлення poche" +msgid "Upgrading wallabag" +msgstr "Оновлення wallabag" -msgid "your version" -msgstr "ваша версія:" +msgid "Installed version" +msgstr "Встановлено ​​версію" -#, fuzzy -msgid "latest stable version" +msgid "Latest stable version" msgstr "Остання стабільна версія" -#, fuzzy -msgid "a more recent stable version is available." +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 "остання версія в розробці" +msgid "Latest dev version" +msgstr "Остання версія в розробці" -msgid "a more recent development version is available." -msgstr "доступна новіша версія в розробці." +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 theme" msgstr "Змінити тему" @@ -105,6 +116,12 @@ msgstr "Тема:" msgid "Update" msgstr "Оновити" +msgid "Change your language" +msgstr "Змінити мову" + +msgid "Language:" +msgstr "Мова:" + msgid "Change your password" msgstr "Зміна паролю" @@ -120,65 +137,64 @@ msgstr "Новий пароль ще раз:" msgid "Import" msgstr "Імпортування" -#, fuzzy -msgid "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 "Будь ласка, виконайте сценарій імпорту локально, оскільки це може тривати досить довго." -#, fuzzy -msgid "More infos in the official doc:" -msgstr "Більш детальна інформація в офіційній документації:" +msgid "More info in the official documentation:" +msgstr "Більше інформації в офіційній документації:" -#, fuzzy -msgid "import from Pocket" +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" +msgid "Import from Readability" msgstr "Імпорт з Readability" -#, fuzzy -msgid "import from Instapaper" +msgid "Import from Instapaper" msgstr "Імпорт з Instapaper" -#, fuzzy -msgid "Export your poche datas" -msgstr "Експортувати ваші дані з poche" +msgid "Import from wallabag" +msgstr "Імпорт з wallabag" + +msgid "Export your wallabag data" +msgstr "Експортувати ваші дані з wallabag" msgid "Click here" msgstr "Клікніть тут" -#, fuzzy -msgid "to export your poche datas." -msgstr "щоб експортувати ваші дані poche." +msgid "to download your database." +msgstr "щоб завантажити вашу базу даних." -msgid "plop" -msgstr "plop" +msgid "to export your wallabag data." +msgstr "щоб експортувати ваші дані wallabag." -msgid "installation" -msgstr "інсталяція" +msgid "Cache" +msgstr "Кеш" -msgid "install your wallabag" -msgstr "встановити wallabag" +msgid "to delete cache." +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 "You can enter multiple tags, separated by commas." +msgstr "Ви можете ввести декілька тегів, розділених комами." -msgid "Login" -msgstr "Логін" +msgid "return to article" +msgstr "повернутися до статті" -msgid "Repeat your password" -msgstr "Пароль ще раз" +msgid "plop" +msgstr "plop" -msgid "Install" -msgstr "Встановити" +msgid "You can check your configuration here." +msgstr "Ви можете перевірити вашу конфігурацію тут." msgid "favoris" msgstr "вибране" +msgid "archive" +msgstr "архів" + msgid "unread" msgstr "непрочитане" @@ -200,11 +216,14 @@ msgstr "за назвою" msgid "by title desc" msgstr "за назвою по спаданню" -msgid "No link available here!" -msgstr "Немає доступних посилань!" +msgid "Tag" +msgstr "Тег" -msgid "toggle mark as read" -msgstr "змінити мітку на прочитано" +msgid "No articles found." +msgstr "Статей не знайдено." + +msgid "Toggle mark as read" +msgstr "змінити мітку прочитаного" msgid "toggle favorite" msgstr "змінити мітку вибраного" @@ -218,137 +237,83 @@ msgstr "оригінал" msgid "estimated reading time:" msgstr "приблизний час читання:" +msgid "mark all the entries as read" +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 "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 "installation" +msgstr "інсталяція" -msgid "Feeds" -msgstr "Завантаження (feeds)" +msgid "install your wallabag" +msgstr "встановити wallabag" -msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." -msgstr "Ваш маркер завантажень (feed token) не визначено, ви повинні спочатку згенерувати його для того, щоб активувати завантаження. Натисніть тут для його генерації." +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 "Unread feed" -msgstr "Завантаження непрочитаного" +msgid "Login" +msgstr "Логін" -msgid "Favorites feed" -msgstr "Завантаження вибраного" +msgid "Repeat your password" +msgstr "Пароль ще раз" -msgid "Archive feed" -msgstr "Завантаження архіву" +msgid "Install" +msgstr "Встановити" -msgid "Your token:" -msgstr "Ваш маркер (token): " +msgid "login to your wallabag" +msgstr "увійти до wallabag" -msgid "Your user id:" -msgstr "Ваш ідентифікатор користувача (user id):" +msgid "Login to wallabag" +msgstr "Увійти до wallabag" -msgid "You can regenerate your token: generate!." -msgstr "Ви можете перестворити ваш маркер: натисніть згенерувати!." +msgid "you are in demo mode, some features may be disabled." +msgstr "ви в демонстраційному режимі, деякі функції можуть бути відключені." -msgid "Change your language" -msgstr "Змінити мову" +msgid "Username" +msgstr "Ім’я користувача" -msgid "Language:" -msgstr "Мова:" +msgid "Stay signed in" +msgstr "Запам'ятати мене" -msgid "Please execute the import script locally as it can take a very long time." -msgstr "Будь ласка, виконайте сценарій імпорту локально, оскільки це може тривати досить довго." +msgid "(Do not check on public computers)" +msgstr "(Не відмічайте на загальнодоступних комп'ютерах)" -#, fuzzy -msgid "More info in the official documentation:" -msgstr "Більш детальна інформація в офіційній документації:" +msgid "Sign in" +msgstr "Увійти" -msgid "Import from Pocket" -msgstr "Імпорт з Pocket-а" +msgid "favorites" +msgstr "вибране" -msgid "Import from Readability" -msgstr "Імпорт з Readability" +msgid "estimated reading time :" +msgstr "приблизний час читання:" -msgid "Import from Instapaper" -msgstr "Імпорт з Instapaper" +msgid "Mark all the entries as read" +msgstr "Відмітити все як прочитане" -msgid "Import from wallabag" -msgstr "Імпорт з wallabag" +msgid "Return home" +msgstr "Повернутися на головну" -msgid "Export your wallabag data" -msgstr "Експортувати ваші дані з wallabag" +msgid "Back to top" +msgstr "Догори" -msgid "to download your database." -msgstr "щоб завантажити вашу базу даних." +msgid "Mark as read" +msgstr "Відмітити як прочитано/не прочитано" -msgid "to export your wallabag data." -msgstr "щоб експортувати ваші дані wallabag." +msgid "Favorite" +msgstr "Вибране" -msgid "Cache" -msgstr "Кеш" +msgid "Toggle favorite" +msgstr "Відмітити як вибране/не вибране" -msgid "to delete cache." -msgstr "щоб очистити кеш." +msgid "Delete" +msgstr "Видалити" -msgid "tweet" -msgstr "твітнути" +msgid "Tweet" +msgstr "Твітнути" -msgid "email" -msgstr "email" +msgid "Email" +msgstr "Надіслати по e-mail" msgid "shaarli" msgstr "shaarli" @@ -356,14 +321,26 @@ msgstr "shaarli" msgid "flattr" msgstr "flattr" -msgid "this article appears wrong?" -msgstr "ця стаття виглядає не так, як треба?" +msgid "Does this article appear wrong?" +msgstr "Ця стаття виглядає не так, як треба?" -msgid "You can enter multiple tags, separated by commas." -msgstr "Ви можете ввести декілька тегів, розділених комами." +msgid "tags:" +msgstr "теги:" -msgid "return to article" -msgstr "повернутися до статті" +msgid "Edit tags" +msgstr "Редагувати теги" + +msgid "save link!" +msgstr "зберегти лінк!" + +msgid "home" +msgstr "головна" + +msgid "tags" +msgstr "теги" + +msgid "logout" +msgstr "вихід" msgid "powered by" msgstr "за підтримки" @@ -380,75 +357,68 @@ msgstr "сховище:" msgid "save a link" msgstr "зберегти лінк" -msgid "return home" -msgstr "повернутися на головну" - -msgid "You can check your configuration here." -msgstr "Ви можете перевірити вашу конфігурацію тут." - -msgid "Tag" -msgstr "Тег" +msgid "back to home" +msgstr "назад на головну" -msgid "No articles found." -msgstr "Статей не знайдено." +msgid "toggle mark as read" +msgstr "змінити мітку на прочитано" -msgid "Toggle mark as read" -msgstr "змінити мітку прочитаного" +msgid "tweet" +msgstr "твітнути" -msgid "mark all the entries as read" -msgstr "відмітити всі статті як прочитані" +msgid "email" +msgstr "email" -msgid "Login to wallabag" -msgstr "Увійти до wallabag" +msgid "this article appears wrong?" +msgstr "ця стаття виглядає не так, як треба?" -msgid "Username" -msgstr "Ім’я користувача" +msgid "No link available here!" +msgstr "Немає доступних посилань!" -msgid "Sign in" -msgstr "Увійти" +msgid "Poching a link" +msgstr "Зберігання посилання" -msgid "Return home" -msgstr "Повернутися на головну" +msgid "by filling this field" +msgstr "заповнивши це поле" -msgid "Back to top" -msgstr "Догори" +msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "з допомогою закладки: перетягніть і відпустіть посилання на панель закладок" -msgid "Mark as read" -msgstr "Відмітити як прочитано/не прочитано" +msgid "your version" +msgstr "ваша версія:" -msgid "Favorite" -msgstr "Вибране" +msgid "latest stable version" +msgstr "остання стабільна версія" -msgid "Toggle favorite" -msgstr "Відмітити як вибране/не вибране" +msgid "a more recent stable version is available." +msgstr "є новіша стабільна версія." -msgid "Delete" -msgstr "Видалити" +msgid "you are up to date." +msgstr "у вас остання версія." -msgid "Tweet" -msgstr "Твітнути" +msgid "latest dev version" +msgstr "остання версія в розробці" -msgid "Email" -msgstr "Надіслати по e-mail" +msgid "a more recent development version is available." +msgstr "доступна новіша версія в розробці." -msgid "Does this article appear wrong?" -msgstr "Ця стаття виглядає не так, як треба?" +msgid "Please execute the import script locally, it can take a very long time." +msgstr "Будь ласка, виконайте сценарій імпорту локально, оскільки це може тривати досить довго." -msgid "tags:" -msgstr "теги:" +msgid "More infos in the official doc:" +msgstr "Більше інформації в офіційній документації:" -msgid "Edit tags" -msgstr "Редагувати теги" +msgid "import from Pocket" +msgstr "імпорт з Pocket-а" -msgid "save link!" -msgstr "зберегти лінк!" +msgid "import from Readability" +msgstr "імпорт з Readability" -#, fuzzy -msgid "estimated reading time :" -msgstr "приблизний час читання:" +msgid "import from Instapaper" +msgstr "імпорт з Instapaper" -msgid "Mark all the entries as read" -msgstr "Відмітити все як прочитане" +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 4f476a37..d3e35aa3 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 792687c0..2a2de211 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 26da7289..5c0aa4b1 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 2e3071ad..61996353 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 0711acdc..c6e41b2f 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 %}

-- cgit v1.2.3 From 2cf87a4da1b7d9c848b3e4650f3e02d2bfde1925 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Tue, 25 Feb 2014 18:40:25 +0200 Subject: 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 | 302 ++++++++++++---------------- 2 files changed, 131 insertions(+), 171 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 76872b5a..600b3281 100644 Binary files a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo and b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo differ 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 c113019a..5053e9e3 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-25 15:05+0300\n" +"POT-Creation-Date: 2014-02-25 18:33+0300\n" "PO-Revision-Date: \n" "Last-Translator: Maryana \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 "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 "" +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 !" -- cgit v1.2.3 From f5b5622a89fc24dcf9b65db5dd0d0306b3fba17f Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Tue, 25 Feb 2014 19:08:18 +0200 Subject: 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 b024547f..135964f1 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; -- cgit v1.2.3 From 2c83741171d85b045fae9211e1b0377ce075807d Mon Sep 17 00:00:00 2001 From: Skibbi Date: Tue, 25 Feb 2014 18:20:13 +0100 Subject: 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 c65e1c63..1764bd61 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" -- cgit v1.2.3 From cbcae4037c02cd6c1ce7c373c6dae390565b7c51 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Wed, 26 Feb 2014 15:43:49 +0200 Subject: 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 00000000..2ea9279e --- /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 8a9de488..deec4226 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 22985970..b363385a 100755 Binary files a/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo and b/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo differ diff --git a/locale/tools/fillCache.php b/locale/tools/fillCache.php new file mode 100755 index 00000000..bdd9cc58 --- /dev/null +++ b/locale/tools/fillCache.php @@ -0,0 +1,59 @@ +isDir() 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)); + } + } + + } + + } + -- cgit v1.2.3 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: [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 3e128b08..6316fcc0 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 { -- cgit v1.2.3 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: [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 deec4226..a9e226c4 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'); } -- cgit v1.2.3 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: [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 a9e226c4..87c00b78 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'); } -- cgit v1.2.3 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: [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 6316fcc0..9a65dbee 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 { -- cgit v1.2.3 From 36a733af8dee1de5a0f81f1efe70e96a435b6a17 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Thu, 27 Feb 2014 16:11:37 +0200 Subject: 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 00000000..31f76581 --- /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 206d5aae..1ea59abf --- 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 3e128b08..0a8d2c7b 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 4f9db063..5262c05b --- 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 00000000..63e09844 Binary files /dev/null and b/themes/baggy/img/baggy/blank.png differ diff --git a/themes/baggy/img/baggy/down.png b/themes/baggy/img/baggy/down.png new file mode 100644 index 00000000..b9d536a7 Binary files /dev/null and b/themes/baggy/img/baggy/down.png differ diff --git a/themes/baggy/img/baggy/list.png b/themes/baggy/img/baggy/list.png new file mode 100755 index 00000000..bd5aff5a Binary files /dev/null and b/themes/baggy/img/baggy/list.png differ diff --git a/themes/baggy/img/baggy/table.png b/themes/baggy/img/baggy/table.png new file mode 100755 index 00000000..859c4cd8 Binary files /dev/null and b/themes/baggy/img/baggy/table.png differ diff --git a/themes/baggy/img/baggy/top.png b/themes/baggy/img/baggy/top.png new file mode 100644 index 00000000..954a8c0a Binary files /dev/null and b/themes/baggy/img/baggy/top.png differ diff --git a/themes/baggy/js/init.js b/themes/baggy/js/init.js index c1d3c0ec..4a843548 100755 --- a/themes/baggy/js/init.js +++ b/themes/baggy/js/init.js @@ -1,12 +1,36 @@ -document.addEventListener('DOMContentLoaded', function() { - var menu = document.getElementById('menu'); - - menu.addEventListener('click', function(){ - if(this.nextElementSibling.style.display === "block") { - this.nextElementSibling.style.display = "none"; - }else { - this.nextElementSibling.style.display = "block"; +$(document).ready(function() { + + $("#menu").click(function(){ + $("#links").toggle(); + }); + + + $("#listmode").click(function(){ + if ( $.cookie("listmode") == 1 ) { + $(".entrie").css("width", ""); + $(".entrie").css("margin-left", ""); + + $.removeCookie("listmode"); + $("#listmode").removeClass("tablemode"); + $("#listmode").addClass("listmode"); } - + else { + $.cookie("listmode", 1, {expires: 365}); + + $(".entrie").css("width", "100%"); + $(".entrie").css("margin-left", "0"); + $("#listmode").removeClass("listmode"); + $("#listmode").addClass("tablemode"); + } + }); -}); \ No newline at end of file + + if ( $.cookie("listmode") == 1 ) { + $(".entrie").css("width", "100%"); + $(".entrie").css("margin-left", "0"); + $("#listmode").removeClass("listmode"); + $("#listmode").addClass("tablemode"); + } + + +}); diff --git a/themes/baggy/js/jquery.cookie.js b/themes/baggy/js/jquery.cookie.js new file mode 100755 index 00000000..92719000 --- /dev/null +++ b/themes/baggy/js/jquery.cookie.js @@ -0,0 +1,117 @@ +/*! + * jQuery Cookie Plugin v1.4.0 + * https://github.com/carhartl/jquery-cookie + * + * Copyright 2013 Klaus Hartl + * Released under the MIT license + */ +(function (factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Register as anonymous module. + define(['jquery'], factory); + } else { + // Browser globals. + factory(jQuery); + } +}(function ($) { + + var pluses = /\+/g; + + function encode(s) { + return config.raw ? s : encodeURIComponent(s); + } + + function decode(s) { + return config.raw ? s : decodeURIComponent(s); + } + + function stringifyCookieValue(value) { + return encode(config.json ? JSON.stringify(value) : String(value)); + } + + function parseCookieValue(s) { + if (s.indexOf('"') === 0) { + // This is a quoted cookie as according to RFC2068, unescape... + s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\'); + } + + try { + // Replace server-side written pluses with spaces. + // If we can't decode the cookie, ignore it, it's unusable. + s = decodeURIComponent(s.replace(pluses, ' ')); + } catch(e) { + return; + } + + try { + // If we can't parse the cookie, ignore it, it's unusable. + return config.json ? JSON.parse(s) : s; + } catch(e) {} + } + + function read(s, converter) { + var value = config.raw ? s : parseCookieValue(s); + return $.isFunction(converter) ? converter(value) : value; + } + + var config = $.cookie = function (key, value, options) { + + // Write + if (value !== undefined && !$.isFunction(value)) { + options = $.extend({}, config.defaults, options); + + if (typeof options.expires === 'number') { + var days = options.expires, t = options.expires = new Date(); + t.setDate(t.getDate() + days); + } + + return (document.cookie = [ + encode(key), '=', stringifyCookieValue(value), + options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE + options.path ? '; path=' + options.path : '', + options.domain ? '; domain=' + options.domain : '', + options.secure ? '; secure' : '' + ].join('')); + } + + // Read + + var result = key ? undefined : {}; + + // To prevent the for loop in the first place assign an empty array + // in case there are no cookies at all. Also prevents odd result when + // calling $.cookie(). + var cookies = document.cookie ? document.cookie.split('; ') : []; + + for (var i = 0, l = cookies.length; i < l; i++) { + var parts = cookies[i].split('='); + var name = decode(parts.shift()); + var cookie = parts.join('='); + + if (key && key === name) { + // If second argument (value) is a function it's a converter... + result = read(cookie, value); + break; + } + + // Prevent storing a cookie that we couldn't decode. + if (!key && (cookie = read(cookie)) !== undefined) { + result[name] = cookie; + } + } + + return result; + }; + + config.defaults = {}; + + $.removeCookie = function (key, options) { + if ($.cookie(key) !== undefined) { + // Must not alter options, thus extending a fresh object... + $.cookie(key, '', $.extend({}, options, { expires: -1 })); + return true; + } + return false; + }; + +})); diff --git a/themes/default/_sorting.twig b/themes/default/_sorting.twig new file mode 100755 index 00000000..4f2fceb0 --- /dev/null +++ b/themes/default/_sorting.twig @@ -0,0 +1,6 @@ +{% if entries|length > 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 165fecc6..bd5fc2d6 --- 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 %} -- cgit v1.2.3 From decb9a5814be82effde73f798fbdc0c76c3dd1de Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Thu, 27 Feb 2014 18:12:43 +0200 Subject: 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 deec4226..e13e7e1b 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; } -- cgit v1.2.3 From 35c7e0a69cfed916cbc946fb48b17219622fb20a Mon Sep 17 00:00:00 2001 From: Camporez Date: Thu, 27 Feb 2014 16:18:53 -0300 Subject: 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 00000000..2b95c30f --- /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:" -- cgit v1.2.3 From 6a0329f756cc00495f075eb4342b347d747e4a96 Mon Sep 17 00:00:00 2001 From: camporez Date: Thu, 27 Feb 2014 16:36:32 -0300 Subject: 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 2b95c30f..ab0a459c 100644 Binary files a/locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo and b/locale/pt_BR.utf8/LC_MESSAGES/pt_BR.utf8.mo differ 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 00000000..2b95c30f --- /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:" -- cgit v1.2.3 From 381d182726132b55a24644634b965bb0ccd7830a Mon Sep 17 00:00:00 2001 From: tcitworld Date: Thu, 27 Feb 2014 21:16:16 +0100 Subject: 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 2ea9279e..2e38d5cc 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. -- cgit v1.2.3 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: [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 4100f156..714fa9ee 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() { -- cgit v1.2.3 From 6065553c137ec63ec3ffddda0350f1d3d805b852 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 28 Feb 2014 13:08:11 +0200 Subject: 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 4100f156..d42da60d 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 5262c05b..a935b034 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 %} - - {% else %} - - {% 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 %} + - {% 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 %} -- cgit v1.2.3 From fc52df0677cf0477d348a7b71627ea0c2232c2c3 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 28 Feb 2014 13:13:30 +0200 Subject: 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 a935b034..7bc0472d 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 %} - - {% else %} - - {% 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 %} + - {% 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 %} -- cgit v1.2.3 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: [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 4751c4cb..c925e91c 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?" %}
  • -- cgit v1.2.3 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: [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 96dd0f7d..2b84a744 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 975b997f..b21cec52 100644 --- a/install/index.php +++ b/install/index.php @@ -225,7 +225,11 @@ php composer.phar install

    Database engine: