From f355d2c87fa441221ca8a9339c426c1c95e7c2ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 28 Jan 2014 13:47:15 +0100 Subject: poche -> wallabag --- README.md | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index d1ed79ee..6f950ad0 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,10 @@ -# what is poche ? -Abandon Pocket, Instapaper and other Readability service : adopt poche. It is the same, but it is free (like in freedom) and open source. +# what is wallabag ? +wallabag is a self hostable application allowing you to not miss any content anymore. Click, save, read it when you can. It extracts content so that you can read it when you have time. -## Some features -* adding, deleting, archiving and setting as favorite a link -* import from pocket / readability / instapaper -* share links by email and on twitter -* a design adapted to tablets and smartphones -* extensions for Chrome and Firefox -* Android application -* multi languages: french, english, spanish, german. -* multi users (very soon!) -* update notification in configuration screen -* many storage modes (sqlite, mysql, postgresql) -* many templates: [have a look here](https://github.com/inthepoche/poche/tree/master/themes). -* ... - -To test poche, a demo website is online : [demo.inthepoche.com](http://demo.inthepoche.com) (login poche, password poche). - -To use poche hosting, [you can create an account here](http://app.inthepoche.com/). - -## Installation -Read the [INSTALL.md file](https://github.com/inthepoche/poche/blob/master/INSTALL.md). +To test wallabag, a demo website is online : [demo.wallabag.org](http://demo.wallabag.org) (login poche, password poche). ## License -Copyright © 2010-2013 Nicolas Lœuillet +Copyright © 2010-2013 Nicolas Lœuillet This work is free. You can redistribute it and/or modify it under the terms of the Do What The Fuck You Want To Public License, Version 2, as published by Sam Hocevar. See the COPYING file for more details. -- cgit v1.2.3 From fa0bfb775a53a074e0a9d642298685b5ed1af83f Mon Sep 17 00:00:00 2001 From: nicosomb Date: Mon, 3 Feb 2014 17:11:00 +0100 Subject: [fix] #389 Empty article title (blank title tag) --- 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 77361ef7..4df90067 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -375,7 +375,7 @@ class Poche { case 'add': $content = $this->getPageContent($url); - $title = $content['rss']['channel']['item']['title']; + $title = ($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled'); $body = $content['rss']['channel']['item']['description']; if ($this->store->add($url->getUrl(), $title, $body, $this->user->getId())) { -- cgit v1.2.3 From 736a4fb77e2da27e1dc7f9f5a1697744b7596085 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Tue, 4 Feb 2014 11:52:03 +0200 Subject: all locale files re-compiled: fix of #416 Some language problems in the french Config Page --- locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo | Bin 4823 -> 4823 bytes locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo | Bin 4776 -> 4776 bytes locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo | Bin 4481 -> 4481 bytes locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo | Bin 4195 -> 4848 bytes locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo | Bin 5632 -> 5632 bytes locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo | Bin 4810 -> 4810 bytes locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo | Bin 4897 -> 4897 bytes locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo | Bin 5803 -> 5803 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo b/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo index 0e8f88bf..af0920d2 100644 Binary files a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo and b/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo differ diff --git a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo index 253d8c7e..375e923f 100644 Binary files a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo and b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo differ diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo index 974ca4f3..83d0a85f 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/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo index 20978239..f4309896 100644 Binary files a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo and b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo differ diff --git a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo b/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo index a7bb6f64..be6ebc57 100644 Binary files a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo and b/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo differ 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 99e7142c..76872b5a 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/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo index d6ef9890..42e26ba0 100644 Binary files a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo and b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo differ 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 970898db..c8c29021 100644 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 -- cgit v1.2.3 From c8265d95b0247c146793c9804198a9ed45b6f846 Mon Sep 17 00:00:00 2001 From: Thomas LEBEAU Date: Fri, 7 Feb 2014 00:07:54 +0100 Subject: [add] maj theme courgette : ajout tag --- themes/courgette/_menu.twig | 1 + themes/courgette/_view.twig | 45 ++++++++++++++++++++++ themes/courgette/css/.DS_Store | Bin 6148 -> 0 bytes themes/courgette/css/font.css | 14 ++++++- themes/courgette/css/style.css | 76 ++++++++++++++++++++++++++++++++++--- themes/courgette/edit-tags.twig | 20 ++++++++++ themes/courgette/font/icomoon.eot | Bin 0 -> 3056 bytes themes/courgette/font/icomoon.svg | 23 +++++++++++ themes/courgette/font/icomoon.ttf | Bin 0 -> 2892 bytes themes/courgette/font/icomoon.woff | Bin 0 -> 3020 bytes themes/courgette/tags.twig | 8 ++++ themes/courgette/view.twig | 45 ---------------------- 12 files changed, 180 insertions(+), 52 deletions(-) create mode 100755 themes/courgette/_view.twig delete mode 100644 themes/courgette/css/.DS_Store create mode 100644 themes/courgette/edit-tags.twig create mode 100755 themes/courgette/font/icomoon.eot create mode 100755 themes/courgette/font/icomoon.svg create mode 100755 themes/courgette/font/icomoon.ttf create mode 100755 themes/courgette/font/icomoon.woff create mode 100644 themes/courgette/tags.twig delete mode 100755 themes/courgette/view.twig diff --git a/themes/courgette/_menu.twig b/themes/courgette/_menu.twig index 85487f73..5e737299 100755 --- a/themes/courgette/_menu.twig +++ b/themes/courgette/_menu.twig @@ -3,6 +3,7 @@
  • {% trans "home" %}
  • {% trans "favorites" %}
  • {% trans "archive" %}
    • +
  • {% trans "tags" %}
  • {% trans "config" %}
  • {% trans "logout" %}
    • diff --git a/themes/courgette/_view.twig b/themes/courgette/_view.twig new file mode 100755 index 00000000..e80829ef --- /dev/null +++ b/themes/courgette/_view.twig @@ -0,0 +1,45 @@ +{% extends "layout.twig" %} +{% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %} +{% block content %} +
    + +
    +
    +
    +

    {{ entry.title|raw }}

    +
    +
    + {{ content | raw }} +
    +
    + + +{% endblock %} \ No newline at end of file diff --git a/themes/courgette/css/.DS_Store b/themes/courgette/css/.DS_Store deleted file mode 100644 index c788a093..00000000 Binary files a/themes/courgette/css/.DS_Store and /dev/null differ diff --git a/themes/courgette/css/font.css b/themes/courgette/css/font.css index 7c16cce4..849ff85b 100755 --- a/themes/courgette/css/font.css +++ b/themes/courgette/css/font.css @@ -7,4 +7,16 @@ url('../font/fontello.svg?97381924#fontello') format('svg'); font-weight: normal; font-style: normal; -} \ No newline at end of file +} + +@font-face { + font-family: 'icomoon'; + src:url('../font/icomoon.eot?-72nnzw'); + src:url('../font/icomoon.eot?#iefix-72nnzw') format('embedded-opentype'), + url('../font/icomoon.woff?-72nnzw') format('woff'), + url('../font/comoon.ttf?-72nnzw') format('truetype'), + url('../font/icomoon.svg?-72nnzw#icomoon') format('svg'); + font-weight: normal; + font-style: normal; +} + diff --git a/themes/courgette/css/style.css b/themes/courgette/css/style.css index 2ba16b71..edd09c78 100755 --- a/themes/courgette/css/style.css +++ b/themes/courgette/css/style.css @@ -157,6 +157,8 @@ h1 a { transition-delay:1.55ms; } +#article_toolbar li:nth-child(2) { display: none; } + #menu:before { content: "\e801"; display: block; @@ -299,7 +301,7 @@ ul li { color:#000; } -.tools a:before { display: block; font-family: 'fontello'; } +.tools a:before { display: block; font-family: 'icomoon'; } .fav-off:before, .fav:before { content: '\e805'; } /* '' */ @@ -308,13 +310,13 @@ ul li { background: #FFF; color:#000; } -.link:before { content: '\e800'; } /* '' */ -.delete:before { content: '\e803'; } /* '' */ -.reading-time:before { content: '\e802'; } /* '' */ +.link:before { content: '\e801'; } /* '' */ +.delete:before { content: '\e80c'; } /* '' */ +.reading-time:before { content: '\e803'; } /* '' */ #article_toolbar a:before { display: block; - font-family: 'fontello'; + font-family: 'icomoon'; } #article_toolbar a { @@ -343,7 +345,8 @@ ul li { .email:before { content: '\e80a'; } /* '' */ .icon-check:before { content: '\e804'; } /* '' */ .back:before { content: '\e806'; } /* '' */ -.bad-display:before { content: '\e808'; } /* '' */ +.flattr:before { content: '\e800'; } /* '' */ +.bad-display:before { content: '\e600'; } /* '' */ .twitter:before { content: '\e807'; } /* '' */ #article_toolbar .flattrli { @@ -618,3 +621,64 @@ form button:hover, form button:focus, form input[type="submit"]:hover, form inpu position:static; } } + + +.w600p { + width: 70%; + margin: auto; +} + +.tagForm { + margin: 1em 0; +} + +.tagForm p { + font-style: italic; + margin: 0; + font-size: 0.8em; + color: #999; +} + +.tagForm label { + width: auto; + margin-right: 1em; +} + +.back:before { + font-family: "icomoon"; +} + +.back.link { + color: #000; + text-decoration: none; +} + +.back.link:before { + margin-right: 0.5em; +} + +.tag-list a { + color: #000; + text-decoration: none; +} + +.tag-list li { + display: inline-block; + margin-right: 1em; +} + +a:hover { + text-decoration: underline; +} + +.tag { + background: #000; + color: #FFF; + padding: 0.5em 1em; + text-decoration: none; +} + +.tag:hover, .tag:focus { + background: #FFF; + color: #000; +} \ No newline at end of file diff --git a/themes/courgette/edit-tags.twig b/themes/courgette/edit-tags.twig new file mode 100644 index 00000000..bcddbe46 --- /dev/null +++ b/themes/courgette/edit-tags.twig @@ -0,0 +1,20 @@ +{% extends "layout.twig" %} +{% block title %}edit tags{% endblock %} +{% block menu %} +{% include '_menu.twig' %} +{% endblock %} +{% block content %} +{% if tags is empty %} +no tags +{% endif %} +
      +{% for tag in tags %}
    • {{ tag.value }} ✘
      • {% endfor %} +
    +
    + +

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

    + + +
    +{% trans "return to article" %} +{% endblock %} diff --git a/themes/courgette/font/icomoon.eot b/themes/courgette/font/icomoon.eot new file mode 100755 index 00000000..ff2d109d Binary files /dev/null and b/themes/courgette/font/icomoon.eot differ diff --git a/themes/courgette/font/icomoon.svg b/themes/courgette/font/icomoon.svg new file mode 100755 index 00000000..8968452d --- /dev/null +++ b/themes/courgette/font/icomoon.svg @@ -0,0 +1,23 @@ + + + +Generated by IcoMoon + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/themes/courgette/font/icomoon.ttf b/themes/courgette/font/icomoon.ttf new file mode 100755 index 00000000..52463a87 Binary files /dev/null and b/themes/courgette/font/icomoon.ttf differ diff --git a/themes/courgette/font/icomoon.woff b/themes/courgette/font/icomoon.woff new file mode 100755 index 00000000..ddb96f29 Binary files /dev/null and b/themes/courgette/font/icomoon.woff differ diff --git a/themes/courgette/tags.twig b/themes/courgette/tags.twig new file mode 100644 index 00000000..9dfdab52 --- /dev/null +++ b/themes/courgette/tags.twig @@ -0,0 +1,8 @@ +{% extends "layout.twig" %} +{% block title %}tags{% endblock %} +{% block menu %} +{% include '_menu.twig' %} +{% endblock %} +{% block content %} +{% for tag in tags %}{{ tag.value }} {% if token != '' %}{% endif %} {% endfor %} +{% endblock %} \ No newline at end of file diff --git a/themes/courgette/view.twig b/themes/courgette/view.twig deleted file mode 100755 index e80829ef..00000000 --- a/themes/courgette/view.twig +++ /dev/null @@ -1,45 +0,0 @@ -{% extends "layout.twig" %} -{% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %} -{% block content %} -
    - -
    -
    -
    -

    {{ entry.title|raw }}

    -
    -
    - {{ content | raw }} -
    -
    - - -{% endblock %} \ No newline at end of file -- cgit v1.2.3 From 1e1e4e4ecaca5755bdf5bfcb84997f7e2e8d9200 Mon Sep 17 00:00:00 2001 From: Thomas LEBEAU Date: Fri, 7 Feb 2014 00:08:58 +0100 Subject: [remove] fontello theme courgette --- themes/courgette/font/fontello.eot | Bin 6428 -> 0 bytes themes/courgette/font/fontello.svg | 23 ----------------------- themes/courgette/font/fontello.ttf | Bin 6260 -> 0 bytes themes/courgette/font/fontello.woff | Bin 3988 -> 0 bytes 4 files changed, 23 deletions(-) delete mode 100644 themes/courgette/font/fontello.eot delete mode 100644 themes/courgette/font/fontello.svg delete mode 100644 themes/courgette/font/fontello.ttf delete mode 100644 themes/courgette/font/fontello.woff diff --git a/themes/courgette/font/fontello.eot b/themes/courgette/font/fontello.eot deleted file mode 100644 index 3c5603dd..00000000 Binary files a/themes/courgette/font/fontello.eot and /dev/null differ diff --git a/themes/courgette/font/fontello.svg b/themes/courgette/font/fontello.svg deleted file mode 100644 index 0e0118ed..00000000 --- a/themes/courgette/font/fontello.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - -Copyright (C) 2013 by original authors @ fontello.com - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/themes/courgette/font/fontello.ttf b/themes/courgette/font/fontello.ttf deleted file mode 100644 index 1967dfaa..00000000 Binary files a/themes/courgette/font/fontello.ttf and /dev/null differ diff --git a/themes/courgette/font/fontello.woff b/themes/courgette/font/fontello.woff deleted file mode 100644 index c62afa54..00000000 Binary files a/themes/courgette/font/fontello.woff and /dev/null differ -- cgit v1.2.3 From c515ffec9c4e43c6e826645168a36cedaf0b6870 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 7 Feb 2014 17:49:27 +0200 Subject: Polish and Ukrainian translations added. Russian - updated. Plust 2 small translation related fixes in code. --- inc/poche/Poche.class.php | 3 +- locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo | Bin 0 -> 10557 bytes locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po | 428 ++++++++++++++++++++++++++ locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo | Bin 5803 -> 13000 bytes locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po | 460 ++++++++++++++++++++-------- locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo | Bin 0 -> 13258 bytes locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po | 428 ++++++++++++++++++++++++++ themes/default/view.twig | 2 +- 8 files changed, 1197 insertions(+), 124 deletions(-) create mode 100755 locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo create mode 100755 locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po mode change 100644 => 100755 locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo mode change 100644 => 100755 locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po create mode 100755 locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo create mode 100755 locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 4df90067..74827253 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -565,7 +565,8 @@ class Poche if (count($entries) > 0) { $this->pagination->set_total(count($entries)); - $page_links = $this->pagination->page_links('?view=' . $view . '&sort=' . $_SESSION['sort'] . '&'); + $page_links = str_replace(array('previous', 'next'), array(_('previous'), _('next')), + $this->pagination->page_links('?view=' . $view . '&sort=' . $_SESSION['sort'] . '&')); $datas = $this->store->getEntriesByView($view, $this->user->getId(), $this->pagination->get_limit()); $tpl_vars['entries'] = $datas; $tpl_vars['page_links'] = $page_links; diff --git a/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo b/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo new file mode 100755 index 00000000..3e8b132f Binary files /dev/null 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 new file mode 100755 index 00000000..0e7cbcf8 --- /dev/null +++ b/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po @@ -0,0 +1,428 @@ +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" +"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-Poedit-KeywordsList: _;gettext;gettext_noop\n" +"X-Poedit-Basepath: .\n" +"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" + +msgid "poche, a read it later open source system" +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 "Back to top" +msgstr "Wrócić na górę" + +msgid "original" +msgstr "oryginal" + +msgid "Mark as read" +msgstr "Zaznacz jako przeczytane" + +msgid "Toggle mark as read" +msgstr "Przełącz jako przeczytane" + +msgid "Favorite" +msgstr "Ulubiony" + +msgid "Toggle favorite" +msgstr "Zaznacz jako ulubione" + +msgid "Delete" +msgstr "Usuń" + +msgid "Tweet" +msgstr "Tweet" + +msgid "Email" +msgstr "Wyslij email" + +msgid "shaarli" +msgstr "shaarli" + +msgid "flattr" +msgstr "flattr" + +msgid "Does this article appear wrong?" +msgstr "Czy ten artykuł wygląda nieprawidłowo?" + +msgid "tags:" +msgstr "tegi:" + +msgid "Edit tags" +msgstr "Redagowac tegi" + +msgid "return home" +msgstr "wrócić do głównej" + +msgid "powered by" +msgstr "zasilany przez" + +msgid "debug mode is on so cache is off." +msgstr "tryb debugowania jest włączony, więc cash jest wyłączony." + +msgid "your poche version:" +msgstr "twoja wersja poche:" + +msgid "storage:" +msgstr "magazyn:" + +msgid "favoris" +msgstr "ulubione" + +msgid "archive" +msgstr "archiwum" + +msgid "unread" +msgstr "nieprzeczytane" + +msgid "by date asc" +msgstr "według daty rosnąco" + +msgid "by date" +msgstr "wg daty" + +msgid "by date desc" +msgstr "według daty spadająco" + +msgid "by title asc" +msgstr "według tytułu rosnąco" + +msgid "by title" +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 "toggle favorite" +msgstr "przełączyc ulubione" + +msgid "delete" +msgstr "usunąć" + +msgid "estimated reading time:" +msgstr "szacowany czas odczytu:" + +msgid "results" +msgstr "wyniki" + +msgid "home" +msgstr "główna" + +msgid "favorites" +msgstr "ulubione" + +msgid "tags" +msgstr "tagi" + +msgid "config" +msgstr "ustawienia" + +msgid "logout" +msgstr "wyloguj" + +msgid "Poching links" +msgstr "Zapisywanie linków" + +msgid "There are several ways to poche a link:" +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" + +msgid " or " +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!" +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 "Installed version" +msgstr "Zainstalowana wersja " + +msgid "Latest stable version" +msgstr "Najnowsza stabilna wersja" + +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 "you are up to date." +msgstr "masz wszystko najnowsze." + +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." + +msgid "Unread feed" +msgstr "Kanał nieprzeczytanego" + +msgid "Favorites feed" +msgstr "Kanał ulubionego" + +msgid "Archive feed" +msgstr "Kanał archiwum" + +msgid "Your token:" +msgstr "Twój znak (token): " + +msgid "Your user id:" +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:" +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 "Export your poche data" +msgstr "Eksportowac dane poche" + +msgid "Click here" +msgstr "Kliknij tu" + +msgid "to download your database." +msgstr "aby pobrac bazę danych." + +msgid "to export your poche data." +msgstr "aby eksportować dane poche." + +msgid "Tag" +msgstr "Teg" + +msgid "No link available here!" +msgstr "Brak dostępnych linków!" + +msgid "toggle mark as read" +msgstr "przełączyć znak jako przeczytane" + +msgid "You can enter multiple tags, separated by commas." +msgstr "Mozna wprowadzić wiele tagów rozdzielajac je przecinkami." + +msgid "return to article" +msgstr "wrócić do artykułu" + +msgid "plop" +msgstr "plop" + +msgid "You can check your configuration here." +msgstr "Można sprawdzić swoją konfigurację tu." + +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 "login to your wallabag" +msgstr "zalogować się do swojego wallabag" + +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 "(Do not check on public computers)" +msgstr "(Nie sprawdzaj na publicznych komputerach" + +msgid "Untitled" +msgstr "Bez nazwy" + +msgid "the link has been added successfully" +msgstr "link pozostał pomyślnie dodany" + +msgid "error during insertion : the link wasn't added" +msgstr "błąd podczas wprowadzania: link nie zostal dodany" + +msgid "the link has been deleted successfully" +msgstr "link zostal pomyślnie usunięty" + +msgid "the link wasn't deleted" +msgstr "link nie został usunięty" + +msgid "previous" +msgstr "poprzednia" + +msgid "next" +msgstr "następna" + +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" + +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" + +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" + +msgid "you have changed your theme preferences" +msgstr "ustawienia motywu zostałe zmienione" + +msgid "that language does not seem to be installed" +msgstr "wydaje się że język nie był zainstalowany" + +msgid "you have changed your language preferences" +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 "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" + +msgid "import from pocket completed" +msgstr "import z pocket'a zakończony" + +msgid "import from Readability completed. " +msgstr "import z Readability zakończony. " + +msgid "import from Poche completed. " +msgstr "import z Poche zakończony. " + +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ć \"" + +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)." + +msgid "Oops, it seems you don't have PHP 5." +msgstr "Oops, wygląda ze u was niema PHP 5." + diff --git a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo old mode 100644 new mode 100755 index c8c29021..c9cf1a55 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 old mode 100644 new mode 100755 index 6f647e36..aa1769cf --- a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po +++ b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po @@ -1,53 +1,242 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-02-07 12:40+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: Russian\n" +"X-Poedit-Country: RUSSIA\n" +"X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag\n" + +msgid "poche, a read it later open source system" +msgstr "poche, сервис отложенного чтения с открытым исходным кодом" + +msgid "login failed: user doesn't exist" +msgstr "войти не удалось: пользователь не существует" + +msgid "Return home" +msgstr "На главную" + +msgid "Back to top" +msgstr "Наверх" + +msgid "original" +msgstr "источник" + +msgid "Mark as read" +msgstr "Отметить как прочитанное" + +msgid "Toggle mark as read" +msgstr "Изменить отметку 'прочитано'" + +msgid "Favorite" +msgstr "Избранное" + +msgid "Toggle favorite" +msgstr "Изменить метку избранного" + +msgid "Delete" +msgstr "Удалить" + +msgid "Tweet" +msgstr "Твитнуть" + +msgid "Email" +msgstr "Отправить по почте" + +msgid "shaarli" +msgstr "shaarli" + +msgid "flattr" +msgstr "проспонсировать" + +msgid "Does this article appear wrong?" +msgstr "Статья выглядит криво?" + +msgid "tags:" +msgstr "теги:" + +msgid "Edit tags" +msgstr "Редактировать теги" + +msgid "return home" +msgstr "на главную" + +msgid "powered by" +msgstr "при поддержке" + +msgid "debug mode is on so cache is off." +msgstr "включён режим отладки - кеш выключен." + +msgid "your poche version:" +msgstr "ваша версия poche:" + +msgid "storage:" +msgstr "хранилище:" + +msgid "favoris" +msgstr "избранное" + +msgid "archive" +msgstr "архив" + +msgid "unread" +msgstr "непрочитанное" + +msgid "by date asc" +msgstr "по дате, сперва старые" + +msgid "by date" +msgstr "по дате" + +msgid "by date desc" +msgstr "по дате, сперва новые" + +msgid "by title asc" +msgstr "по заголовку (прямой)" + +msgid "by title" +msgstr "по заголовку" + +msgid "by title desc" +msgstr "по заголовку (обратный)" + +msgid "No articles found." +msgstr "Статей не найдено." + +msgid "toggle favorite" +msgstr "изменить метку избранного" + +msgid "delete" +msgstr "удалить" + +msgid "estimated reading time:" +msgstr "ориентировочное время чтения:" + +msgid "results" +msgstr "найдено" + +msgid "home" +msgstr "главная" + +msgid "favorites" +msgstr "избранное" + +msgid "tags" +msgstr "теги" msgid "config" msgstr "настройки" -msgid "Poching a link" -msgstr "Сохраняю ссылку" +msgid "logout" +msgstr "выход" + +msgid "Poching links" +msgstr "Сохранение ссылок" + +msgid "There are several ways to poche a link:" +msgstr "Существует несколько способов сохранить ссылку:" msgid "read the documentation" msgstr "читать инструкцию" -msgid "by filling this field" -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" +msgstr "Заполнением этого поля" msgid "poche it!" -msgstr "Прикарманить!" +msgstr "прикарманить!" + +msgid "Bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "Закладка: перетащите и опустите ссылку на панель закладок" msgid "Updating poche" -msgstr "Обновляю poche" +msgstr "Обновления poche" -msgid "your version" -msgstr "Ваша версия" +msgid "Installed version" +msgstr "Установленная версия" -msgid "latest stable version" -msgstr "крайняя стабильная версия" +msgid "Latest stable version" +msgstr "Последняя стабильная версия" -msgid "a more recent stable version is available." -msgstr "есть более новая стабильная версия." +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 "крайняя версия разработчиков" +msgstr "последняя версия в разработке" msgid "a more recent development version is available." -msgstr "есть более свежая версия разработчиков." +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 "Изменить тему" + +msgid "Theme:" +msgstr "Тема:" + +msgid "Update" +msgstr "Обновить" + +msgid "Change your language" +msgstr "Изменить язык" + +msgid "Language:" +msgstr "Язык:" msgid "Change your password" -msgstr "Смени пароль" +msgstr "Смена пароля" msgid "New password:" msgstr "Новый пароль:" @@ -58,171 +247,198 @@ 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." -msgstr "" -"Выполните сценарий импорта локально - он может занять слишком много времени." +msgid "Please execute the import script locally as it can take a very long time." +msgstr "Пожалуйста, выполните сценарий импорта локально - это может занять слишком много времени." -msgid "More info in the official doc:" +msgid "More info in the official docs:" msgstr "Больше сведений в официальной документации:" -msgid "import from Pocket" -msgstr "импортировать из Pocket" +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 Readability" -msgstr "импортировать из Readability" +msgid "Import from Instapaper" +msgstr "Импортировать из Instapaper" -msgid "import from Instapaper" -msgstr "импортировать из Instapaper" +msgid "Import from poche" +msgstr "Импортировать из poche" msgid "Export your poche data" msgstr "Экспортировать данные poche" msgid "Click here" -msgstr "Кликни сюда" +msgstr "Кликните здесь" + +msgid "to download your database." +msgstr "чтобы скачать вашу базу данных" msgid "to export your poche data." -msgstr "чтобы экспортировать твои записи из poche." +msgstr "чтобы экспортировать свои записи из poche." + +msgid "Tag" +msgstr "Тег" -msgid "back to home" -msgstr "домой" +msgid "No link available here!" +msgstr "Здесь нет ссылки!" + +msgid "toggle mark as read" +msgstr "изменить отметку 'прочитано'" + +msgid "You can enter multiple tags, separated by commas." +msgstr "Вы можете ввести несколько тегов, разделяя их запятой." + +msgid "return to article" +msgstr "вернуться к статье" + +msgid "plop" +msgstr "plop" + +msgid "You can check your configuration here." +msgstr "Вы можете проверить конфигурацию здесь." msgid "installation" msgstr "установка" -msgid "install your poche" -msgstr "установить твой poche" +msgid "install your wallabag" +msgstr "установка wallabag" -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 всё ещё не установлен. Надо заполнить форму ниже, чтобы установить " -"его. Неплохо также прочесть документацию " -"на сайте poche." +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 "Регистрационное имя" +msgstr "Имя пользователя" msgid "Repeat your password" -msgstr "Повтори пароль" +msgstr "Повторите пароль" msgid "Install" msgstr "Установить" -msgid "back to top" -msgstr "наверх" +msgid "login to your wallabag" +msgstr "войти в свой wallabag" -msgid "favoris" -msgstr "избранное" +msgid "Login to wallabag" +msgstr "Войдите в wallabag" -msgid "archive" -msgstr "архив" +msgid "you are in demo mode, some features may be disabled." +msgstr "демонстрационный режим - работают не все возможности." -msgid "unread" -msgstr "нечитанное" +msgid "Username" +msgstr "Имя пользователя" -msgid "by date asc" -msgstr "по дате, сперва старые" +msgid "Stay signed in" +msgstr "Запомнить меня" -msgid "by date" -msgstr "по дате" +msgid "(Do not check on public computers)" +msgstr "(Не отмечайте на чужих компьютерах)" -msgid "by date desc" -msgstr "по дате, сперва новые" +msgid "Untitled" +msgstr "Без названия" -msgid "by title asc" -msgstr "по заголовку (прямой)" +msgid "the link has been added successfully" +msgstr "ссылка успешно добавлена" -msgid "by title" -msgstr "по заголовку" +msgid "error during insertion : the link wasn't added" +msgstr "ошибка во время вставки: ссылка не добавлена" -msgid "by title desc" -msgstr "по заголовку (обратный)" +msgid "the link has been deleted successfully" +msgstr "ссылка успешно удалена" -msgid "No link available here!" -msgstr "Здесь нет линка!" +msgid "the link wasn't deleted" +msgstr "ссылка не удалена" -msgid "toggle mark as read" -msgstr "изменить отметку 'прочитано'" +msgid "previous" +msgstr "предыдущая" -msgid "toggle favorite" -msgstr "изменить избранность" +msgid "next" +msgstr "следующая" -msgid "delete" -msgstr "удалить" +msgid "in demo mode, you can't update your password" +msgstr "в демонстрационном режиме смена пароля не разрешена" -msgid "original" -msgstr "исходный" +msgid "your password has been updated" +msgstr "ваш пароль обновлен" -msgid "results" -msgstr "найдено" +msgid "the two fields have to be filled & the password must be the same in the two fields" +msgstr "необходимо заполнить оба поля и пароль в обоих должен совпадать" -msgid "tweet" -msgstr "твитнуть" +msgid "still using the \"" +msgstr "все еще используется \"" -msgid "email" -msgstr "отправить по почте" +msgid "that theme does not seem to be installed" +msgstr "кажется, эта тема не установлена" -msgid "shaarli" -msgstr "Шаарли" +msgid "you have changed your theme preferences" +msgstr "вы изменили свои настройки темы" -msgid "flattr" -msgstr "проспонсировать" +msgid "that language does not seem to be installed" +msgstr "кажется, что этот язык не установлен" -msgid "this article appears wrong?" -msgstr "статья выглядит криво?" +msgid "you have changed your language preferences" +msgstr "вы изменили свои настройки языка" -msgid "create an issue" -msgstr "оповестить об ошибке" +msgid "login failed: you have to fill all fields" +msgstr "войти не удалось: вы должны заполнить все поля" -msgid "or" -msgstr "или" +msgid "welcome to your poche" +msgstr "добро пожаловать в ваш poche" -msgid "contact us by mail" -msgstr "связаться по почте" +msgid "login failed: bad login or password" +msgstr "войти не удалось: неправильное имя пользователя или пароль" -msgid "plop" -msgstr "plop" +msgid "see you soon!" +msgstr "увидимся!" -msgid "home" -msgstr "домой" +msgid "import from instapaper completed" +msgstr "импорт из instapaper завершен" -msgid "favorites" -msgstr "избранное" +msgid "import from pocket completed" +msgstr "импорт из pocket завершен" -msgid "logout" -msgstr "выйти" +msgid "import from Readability completed. " +msgstr "импорт из Readability завершен" -msgid "powered by" -msgstr "на основе" +msgid "import from Poche completed. " +msgstr "импорт из Poche завершен." -msgid "debug mode is on so cache is off." -msgstr "включён режим отладки - кеш выключен." +msgid "Unknown import provider." +msgstr "Неизвестный провайдер импорта." -msgid "your poche version:" -msgstr "Ваша версия poche:" +msgid "Incomplete inc/poche/define.inc.php file, please define \"" +msgstr "Незавершенный файл inc/poche/define.inc.php file, пожалуйста определите \"" -msgid "storage:" -msgstr "хранилище:" +msgid "Could not find required \"" +msgstr "Не удалось найти требуемый \"" -msgid "login to your poche" -msgstr "войти в свой poche" +msgid "Uh, there is a problem while generating feeds." +msgstr "Ох, возникла проблема при создании ленты." -msgid "you are in demo mode, some features may be disabled." -msgstr "демонстрационный режим - работают не все возможности." +msgid "Oops, it seems you don't have PHP 5." +msgstr "Упс, кажется у вас не установлен PHP 5." -msgid "Stay signed in" -msgstr "Оставаться зарегистрированным" +#~ msgid "your version" +#~ msgstr "Ваша версия" -msgid "(Do not check on public computers)" -msgstr "(Не отмечай на чужих компьютерах)" +#~ msgid "back to home" +#~ msgstr "домой" + +#~ msgid "create an issue" +#~ msgstr "оповестить об ошибке" + +#~ msgid "or" +#~ msgstr "или" + +#~ msgid "contact us by mail" +#~ msgstr "связаться по почте" -msgid "Sign in" -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 new file mode 100755 index 00000000..80972b65 Binary files /dev/null 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 new file mode 100755 index 00000000..6092cbab --- /dev/null +++ b/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.po @@ -0,0 +1,428 @@ +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" +"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-Poedit-KeywordsList: _;gettext;gettext_noop\n" +"X-Poedit-Basepath: .\n" +"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" + +msgid "poche, a read it later open source system" +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 "головна" + +msgid "favorites" +msgstr "вибране" + +msgid "archive" +msgstr "архів" + +msgid "tags" +msgstr "теги" + +msgid "config" +msgstr "налаштування" + +msgid "logout" +msgstr "вихід" + +msgid "return home" +msgstr "повернутися на головну" + +msgid "Poching links" +msgstr "Зберігання посилань" + +msgid "There are several ways to poche a link:" +msgstr "Є кілька способів зберегти посилання:" + +msgid "read the documentation" +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" +msgstr "Заповнивши це поле" + +msgid "poche it!" +msgstr "зберегти!" + +msgid "Bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "З допомогою закладки: перетягніть і відпустіть посилання на панель закладок" + +msgid "Updating poche" +msgstr "Оновлення poche" + +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 "latest dev version" +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 "Змінити тему" + +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:" +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 "Export your poche data" +msgstr "Експортувати ваші дані з poche" + +msgid "Click here" +msgstr "Клікніть тут" + +msgid "to download your database." +msgstr "щоб завантажити вашу базу даних." + +msgid "to export your poche data." +msgstr "щоб експортувати ваші дані poche." + +msgid "Tag" +msgstr "Тег" + +msgid "No link available here!" +msgstr "Немає доступних посилань!" + +msgid "toggle mark as read" +msgstr "змінити мітку на прочитано" + +msgid "toggle favorite" +msgstr "змінити мітку вибраного" + +msgid "delete" +msgstr "видалити" + +msgid "original" +msgstr "оригінал" + +msgid "estimated reading time:" +msgstr "приблизний час читання:" + +msgid "results" +msgstr "результат(ів)" + +msgid "You can enter multiple tags, separated by commas." +msgstr "Ви можете ввести декілька тегів, розділених комами." + +msgid "return to article" +msgstr "повернутися до статті" + +msgid "plop" +msgstr "plop" + +msgid "You can check your configuration here." +msgstr "Ви можете перевірити вашу конфігурацію тут." + +msgid "favoris" +msgstr "вибране" + +msgid "unread" +msgstr "непрочитане" + +msgid "by date asc" +msgstr "за датою по зростанню" + +msgid "by date" +msgstr "за датою" + +msgid "by date desc" +msgstr "за датою по спаданню" + +msgid "by title asc" +msgstr "за назвою по зростанню" + +msgid "by title" +msgstr "за назвою" + +msgid "by title desc" +msgstr "за назвою по спаданню" + +msgid "No articles found." +msgstr "Статей не знайдено." + +msgid "Toggle mark as read" +msgstr "змінити мітку прочитаного" + +msgid "installation" +msgstr "інсталяція" + +msgid "install your wallabag" +msgstr "встановити wallabag" + +msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." +msgstr "wallabag ще не встановлено. Будь ласка, заповніть форму нижче, щоб його встановити. Ви можете звертутися до документації на сайті wallabag." + +msgid "Login" +msgstr "Логін" + +msgid "Repeat your password" +msgstr "Пароль ще раз" + +msgid "Install" +msgstr "Встановити" + +msgid "login to your wallabag" +msgstr "увійти до wallabag" + +msgid "Login to wallabag" +msgstr "Увійти до wallabag" + +msgid "you are in demo mode, some features may be disabled." +msgstr "ви в демонстраційному режимі, деякі функції можуть бути відключені." + +msgid "Username" +msgstr "Ім’я користувача" + +msgid "Stay signed in" +msgstr "Запам'ятати мене" + +msgid "(Do not check on public computers)" +msgstr "(Не відмічайте на загальнодоступних комп'ютерах)" + +msgid "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 "Надіслати по e-mail" + +msgid "shaarli" +msgstr "shaarli" + +msgid "flattr" +msgstr "flattr" + +msgid "Does this article appear wrong?" +msgstr "Ця стаття виглядає не так, як треба?" + +msgid "tags:" +msgstr "теги:" + +msgid "Edit tags" +msgstr "Редагувати теги" + +msgid "previous" +msgstr "попередня" + +msgid "next" +msgstr "наступна" + +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 "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 poche" +msgstr "ласкаво просимо до вашого poche" + +msgid "login failed: bad login or password" +msgstr "увійти не вдалося: не вірний логін або пароль" + +msgid "see you soon!" +msgstr "бувайте, ще побачимось!" + +msgid "import from instapaper completed" +msgstr "імпорт з instapaper-а завершено" + +msgid "import from pocket completed" +msgstr "імпорт з pocket-а завершено" + +msgid "import from Readability completed. " +msgstr "імпорт з Readability завершено" + +msgid "import from Poche completed. " +msgstr "імпорт з Poche завершено." + +msgid "Unknown import provider." +msgstr "Невідомий провайдер імпорту." + +msgid "Incomplete inc/poche/define.inc.php file, please define \"" +msgstr "Неповний файл inc/poche/define.inc.php, будь ласка, визначте \"" + +msgid "Could not find required \"" +msgstr "Не вдалося знайти потрібний \"" + +msgid "Uh, there is a problem while generating feeds." +msgstr "Ох, є проблема при створенні завантажень (feeds)." + +msgid "Oops, it seems you don't have PHP 5." +msgstr "Упс, здається, у вас немає PHP 5." + diff --git a/themes/default/view.twig b/themes/default/view.twig index d09977a8..9858996f 100644 --- a/themes/default/view.twig +++ b/themes/default/view.twig @@ -21,7 +21,7 @@

    {{ entry.title|raw }}
    {{ content | raw }} -- cgit v1.2.3 From 3a68883ae943dcd99f33df0a29b0fba7b4d2f2f4 Mon Sep 17 00:00:00 2001 From: Florian Lauck Date: Sun, 9 Feb 2014 23:17:10 +0100 Subject: Adding .htaccess files to prohibit access to critical directories, e.g., db/ --- cache/.gitignore | 1 + cache/.htaccess | 2 ++ db/.htaccess | 2 ++ inc/.htaccess | 2 ++ locale/.htaccess | 2 ++ 5 files changed, 9 insertions(+) create mode 100644 cache/.htaccess create mode 100644 db/.htaccess create mode 100644 inc/.htaccess create mode 100644 locale/.htaccess diff --git a/cache/.gitignore b/cache/.gitignore index e69de29b..35c8ca2e 100644 --- a/cache/.gitignore +++ b/cache/.gitignore @@ -0,0 +1 @@ +!.htaccess diff --git a/cache/.htaccess b/cache/.htaccess new file mode 100644 index 00000000..93169e4e --- /dev/null +++ b/cache/.htaccess @@ -0,0 +1,2 @@ +Order deny,allow +Deny from all diff --git a/db/.htaccess b/db/.htaccess new file mode 100644 index 00000000..93169e4e --- /dev/null +++ b/db/.htaccess @@ -0,0 +1,2 @@ +Order deny,allow +Deny from all diff --git a/inc/.htaccess b/inc/.htaccess new file mode 100644 index 00000000..93169e4e --- /dev/null +++ b/inc/.htaccess @@ -0,0 +1,2 @@ +Order deny,allow +Deny from all diff --git a/locale/.htaccess b/locale/.htaccess new file mode 100644 index 00000000..93169e4e --- /dev/null +++ b/locale/.htaccess @@ -0,0 +1,2 @@ +Order deny,allow +Deny from all -- cgit v1.2.3