Merge branch 'dev' of https://github.com/wallabag/wallabag into dev

36 files changed, 1343 insertions, 156 deletions

diff --git a/README.md b/README.md
index 4dc13522..fe6a06b6 100644
--- a/README.md
+++ b/README.md
@@ -7,4 +7,4 @@ More informations on our website: [wallabag.org](http://wallabag.org)
 Copyright © 2010-2013 Nicolas Lœuillet <nicolas@loeuillet.org>
 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.
\ No newline at end of file
+as published by Sam Hocevar. See the COPYING file for more details.
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/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 78031984..9345d1c1 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -371,7 +371,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())) {
@@ -561,7 +561,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/.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
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
--- a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo
+++ b/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo
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
--- a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo
+++ b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo
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
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
+++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
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
--- a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo
+++ b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo
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
--- a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo
+++ b/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo
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
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
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
--- a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo
+++ b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo
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
--- /dev/null
+++ b/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo
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 <mariroz@mr.lviv.ua>\n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-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 <a href='?feed&amp;action=generate'>here to generate it</a>."
+msgstr "Twój znak kanału jest pusty i musi najpierw zostac wygenerowany. Kliknij <a href='?feed&action=generate'>tu dla jego generacji</a>."
+
+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: <a href='?feed&amp;action=generate'>generate!</a>."
+msgstr "Mozna zgenerowac nowy znak: kliknij <a href='?feed&amp;action=generate'>zgenerowac!</a>."
+
+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 <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
+msgstr "Można <a href='wallabag_compatibility_test.php'>sprawdzić swoją konfigurację tu</a>."
+
+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 <a href='http://doc.wallabag.org/'>read the documentation on wallabag website</a>."
+msgstr "wallabag nie jest jeszcze zainstalowany. Proszę wypełnić poniższy formularz, aby go zainstalowac. Nie wahaj się <a href='http://doc.wallabag.org/'>zapoznac się z dokumentacja na stronie wallabag</a>."
+
+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
index 970898db..c9cf1a55 100644..100755
--- a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo
+++ b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo
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 6f647e36..aa1769cf 100644..100755
--- 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 <nicolas.loeuillet@gmail.com>\n"
+"Last-Translator: Maryana <mariroz@mr.lviv.ua>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.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 <a href='?feed&amp;action=generate'>here to generate it</a>."
+msgstr "Ваш маркер ленты (feed token) не определен, для того, чтобы активировать ленту, сначала создайте его. Нажмите <a href='?feed&action=generate'>здесь для его генерации</ а>."
+
+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: <a href='?feed&amp;action=generate'>generate!</a>."
+msgstr "Вы можете создать новый ​​маркер: <a href='?feed&action=generate'>сгенерировать!</a>."
+
+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 <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
+msgstr "Вы можете <a href='wallabag_compatibility_test.php'>проверить конфигурацию здесь</a>."
 
 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 <a href='http://doc.inthepoche.com'>read the documentation "
-"on poche website</a>."
-msgstr ""
-"poche всё ещё не установлен. Надо заполнить форму ниже, чтобы установить "
-"его. Неплохо также <a href='http://doc.inthepoche.com'>прочесть документацию "
-"на сайте poche</a>."
+msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://doc.wallabag.org/'>read the documentation on wallabag website</a>."
+msgstr "wallabag всё ещё не установлен. Надо заполнить форму ниже, чтобы установить его. Неплохо также <a href='http://doc.wallabag.org'>прочесть документацию на сайте wallabag</a>."
 
 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
--- /dev/null
+++ b/locale/uk_UA.utf8/LC_MESSAGES/uk_UA.utf8.mo
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 <mariroz@mr.lviv.ua>\n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-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 <a href='?feed&amp;action=generate'>here to generate it</a>."
+msgstr "Ваш маркер завантажень (feed token) не визначено, ви повинні спочатку згенерувати його для того, щоб активувати завантаження. Натисніть <a href='?feed&action=generate'>тут для його генерації</ A>."
+
+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: <a href='?feed&amp;action=generate'>generate!</a>."
+msgstr "Ви можете перестворити ваш маркер: натисніть <a href='?feed&amp;action=generate'>згенерувати!</a>."
+
+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 <a href='wallabag_compatibility_test.php'>check your configuration here</a>."
+msgstr "Ви можете <a href='wallabag_compatibility_test.php'>перевірити вашу конфігурацію тут</a>."
+
+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 <a href='http://doc.wallabag.org/'>read the documentation on wallabag website</a>."
+msgstr "wallabag ще не встановлено. Будь ласка, заповніть форму нижче, щоб його встановити. Ви можете <a href='http://doc.wallabag.org/'>звертутися до документації на сайті wallabag</ A>."
+
+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/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 @@
                   <li><a href="./" {% if view == 'home' %}class="current"{% endif %}>{% trans "home" %}</a></li>
                   <li><a href="./?view=fav" {% if view == 'fav' %}class="current"{% endif %}>{% trans "favorites" %}</a></li>
                   <li><a href="./?view=archive" {% if view == 'archive' %}class="current"{% endif %}>{% trans "archive" %}</a></li>
+                  <li><a href="./?view=tags" {% if view == 'tags' %}class="current"{% endif %}>{% trans "tags" %}</a></li>
                   <li><a href="./?view=config" {% if view == 'config' %}class="current"{% endif %}>{% trans "config" %}</a></li>
                   <li><a href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li>
               </ul>
diff --git a/themes/courgette/view.twig b/themes/courgette/_view.twig
index e80829ef..e80829ef 100755
--- a/themes/courgette/view.twig
+++ b/themes/courgette/_view.twig
diff --git a/themes/courgette/css/.DS_Store b/themes/courgette/css/.DS_Store
deleted file mode 100644
index c788a093..00000000
--- a/themes/courgette/css/.DS_Store
+++ /dev/null
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 %}
+<em>no tags</em>
+{% endif %}
+<ul class='tag-list'>
+{% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
+</ul>
+<form method="post" action="./?action=add_tag" class="tagForm">
+    <label for="value">Add tags: </label><input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" />
+    <p>{% trans "You can enter multiple tags, separated by commas." %}</p>
+    <input type="hidden" name="entry_id" value="{{ entry_id }}" />
+    <input type="submit" value="Tag" />
+</form>
+<a class="back link" href="./?view=view&id={{ entry_id }}">{% trans "return to article" %}</a>
+{% endblock %}
diff --git a/themes/courgette/font/fontello.eot b/themes/courgette/font/fontello.eot
deleted file mode 100644
index 3c5603dd..00000000
--- a/themes/courgette/font/fontello.eot
+++ /dev/null
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 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Copyright (C) 2013 by original authors @ fontello.com</metadata>
-<defs>
-<font id="fontello" horiz-adv-x="1000" >
-<font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
-<missing-glyph horiz-adv-x="1000" />
-<glyph glyph-name="mail" unicode="&#xe80a;" d="m929 11v428q-18-20-39-37q-149-114-238-188q-28-24-46-38t-48-27t-57-13h-2q-26 0-57 13t-48 27t-46 38q-88 74-238 188q-21 17-39 37v-428q0-8 6-13t12-5h822q7 0 12 5t6 13z m0 586v14t-1 7t-1 7t-3 5t-5 4t-8 2h-822q-7 0-12-6t-6-12q0-94 82-159q108-85 224-177q4-2 20-16t25-21t25-18t28-15t24-5h2q11 0 24 5t28 15t25 18t25 21t20 16q116 92 224 177q30 24 56 65t26 73z m71 21v-607q0-37-26-63t-63-27h-822q-36 0-63 27t-26 63v607q0 37 26 63t63 26h822q37 0 63-26t26-63z" horiz-adv-x="1000" />
-<glyph glyph-name="up-open" unicode="&#xe80b;" d="m0 174l352 352l148 148l148-148l352-352l-148-148l-352 351l-352-351z" horiz-adv-x="1000" />
-<glyph glyph-name="star" unicode="&#xe805;" d="m440 790l120-336l320 0l-262-196l94-348l-272 208l-272-208l94 348l-262 196l320 0z" horiz-adv-x="880" />
-<glyph glyph-name="check" unicode="&#xe804;" d="m249 0q-34 0-56 28l-180 236q-16 24-12 52t26 46t51 14t47-28l118-154l296 474q16 24 43 30t53-8q24-16 30-43t-8-53l-350-560q-20-32-56-32z" horiz-adv-x="667" />
-<glyph glyph-name="link" unicode="&#xe800;" d="m294 116q14 14 34 14t36-14q32-34 0-70l-42-40q-56-56-132-56q-78 0-134 56t-56 132q0 78 56 134l148 148q70 68 144 77t128-43q16-16 16-36t-16-36q-36-32-70 0q-50 48-132-34l-148-146q-26-26-26-64t26-62q26-26 63-26t63 26z m450 574q56-56 56-132q0-78-56-134l-158-158q-74-72-150-72q-62 0-112 50q-14 14-14 34t14 36q14 14 35 14t35-14q50-48 122 24l158 156q28 28 28 64q0 38-28 62q-24 26-56 31t-60-21l-50-50q-16-14-36-14t-34 14q-34 34 0 70l50 50q54 54 127 51t129-61z" horiz-adv-x="800" />
-<glyph glyph-name="reply" unicode="&#xe806;" d="m900 10q-86 152-208 197t-330 45l0-218l-362 334l362 322l0-192q90 0 168-27t131-70t96-95t69-104t44-95t24-69z" horiz-adv-x="900" />
-<glyph glyph-name="menu" unicode="&#xe801;" d="m857 100v-71q0-15-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 25t25 11h785q15 0 26-11t10-25z m0 286v-72q0-14-10-25t-26-10h-785q-15 0-25 10t-11 25v72q0 14 11 25t25 10h785q15 0 26-10t10-25z m0 285v-71q0-15-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 26t25 10h785q15 0 26-10t10-26z" horiz-adv-x="857.1" />
-<glyph glyph-name="clock" unicode="&#xe802;" d="m460 810q190 0 325-135t135-325t-135-325t-325-135t-325 135t-135 325t135 325t325 135z m0-820q150 0 255 106t105 254q0 150-105 255t-255 105q-148 0-254-105t-106-255q0-148 106-254t254-106z m36 620l0-244l150-150l-50-50l-170 170l0 274l70 0z" horiz-adv-x="920" />
-<glyph glyph-name="block" unicode="&#xe808;" d="m480 830q200 0 340-140t140-340q0-198-140-339t-340-141q-198 0-339 141t-141 339q0 200 141 340t339 140z m258-220z m-622-260q0-132 82-230l514 514q-100 82-232 82q-152 0-258-107t-106-259z m106-258z m258-106q152 0 259 107t107 257q0 130-82 232l-514-514q98-82 230-82z" horiz-adv-x="960" />
-<glyph glyph-name="twitter" unicode="&#xe807;" d="m920 636q-36-54-94-98l0-24q0-130-60-250t-186-203t-290-83q-160 0-290 84q14-2 46-2q132 0 234 80q-62 2-110 38t-66 94q10-4 34-4q26 0 50 6q-66 14-108 66t-42 120l0 2q36-20 84-24q-84 58-84 158q0 48 26 94q154-188 390-196q-6 18-6 42q0 78 55 133t135 55q82 0 136-58q60 12 120 44q-20-66-82-104q56 8 108 30z" horiz-adv-x="920" />
-<glyph glyph-name="down-open" unicode="&#xe809;" d="m0 526l148 148l352-351l352 351l148-148l-352-352l-148-148l-148 148z" horiz-adv-x="1000" />
-<glyph glyph-name="trash" unicode="&#xe803;" d="m50 458q122-70 330-70t330 70l-54-486q-2-14-35-36t-100-43t-141-21t-140 21t-100 43t-36 36z m488 300q94-18 158-55t64-71l0-10q0-58-112-99t-268-41t-268 41t-112 99l0 10q0 34 64 71t158 55l42 48q22 26 70 26l92 0q52 0 70-26z m-54-112l84 0q-92 110-104 126q-14 16-32 16l-102 0q-22 0-32-16l-106-126l84 0l64 66l82 0z" horiz-adv-x="760" />
-</font>
-</defs>
-</svg>
\ 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
--- a/themes/courgette/font/fontello.ttf
+++ /dev/null
diff --git a/themes/courgette/font/fontello.woff b/themes/courgette/font/fontello.woff
deleted file mode 100644
index c62afa54..00000000
--- a/themes/courgette/font/fontello.woff
+++ /dev/null
diff --git a/themes/courgette/font/icomoon.eot b/themes/courgette/font/icomoon.eot
new file mode 100755
index 00000000..ff2d109d
--- /dev/null
+++ b/themes/courgette/font/icomoon.eot
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 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="icomoon" horiz-adv-x="512">
+<font-face units-per-em="512" ascent="480" descent="-32" />
+<missing-glyph horiz-adv-x="512" />
+<glyph unicode="&#x20;" d="" horiz-adv-x="256" />
+<glyph unicode="&#xe600;" d="M256 389.333c-94.272 0-170.667-76.416-170.667-170.666s76.394-170.667 170.667-170.667 170.667 76.416 170.667 170.667-76.394 170.666-170.667 170.666zM335.082 169.749c8.341-8.341 8.341-21.824 0-30.166-4.16-4.16-9.622-6.25-15.082-6.25s-10.923 2.091-15.082 6.25l-48.918 48.918-48.917-48.918c-4.16-4.16-9.621-6.25-15.083-6.25s-10.923 2.091-15.083 6.25c-8.341 8.341-8.341 21.824 0 30.166l48.917 48.918-48.917 48.917c-8.341 8.341-8.341 21.824 0 30.166s21.824 8.341 30.166 0l48.917-48.917 48.918 48.917c8.341 8.341 21.824 8.341 30.166 0s8.341-21.824 0-30.166l-48.918-48.917 48.918-48.918z" />
+<glyph unicode="&#xe800;" d="M0 25.856v263.168q0 91.648 43.52 142.336t132.608 50.688h280.576q-2.56-2.56-26.624-27.136t-51.2-51.712-55.808-55.808-48.64-47.616-21.504-18.944q-7.68 0-7.68 8.192v79.872h-24.576q-30.208 0-48.128-3.072t-32.256-13.312-19.968-29.184-6.144-49.152v-134.144zM34.304-34.048q2.56 2.56 27.136 27.136t51.2 51.712 55.808 56.32 48.64 47.616 20.992 18.432q7.68 0 7.68-8.192v-79.872h24.576q59.392 0 82.944 18.432t23.040 76.288v134.144l114.688 114.176v-263.168q0-91.648-43.008-142.336t-133.12-50.688h-280.576z" horiz-adv-x="491" />
+<glyph unicode="&#xe801;" d="M150.528 104.192q7.168 7.168 17.408 7.168t18.432-7.168q16.384-17.408 0-35.84l-21.504-20.48q-28.672-28.672-67.584-28.672-39.936 0-68.608 28.672t-28.672 67.584q0 39.936 28.672 68.608l75.776 75.776q35.84 34.816 73.728 39.424t65.536-22.016q8.192-8.192 8.192-18.432t-8.192-18.432q-18.432-16.384-35.84 0-25.6 24.576-67.584-17.408l-75.776-74.752q-13.312-13.312-13.312-32.768t13.312-31.744q13.312-13.312 32.256-13.312t32.256 13.312zM380.928 398.080q28.672-28.672 28.672-67.584 0-39.936-28.672-68.608l-80.896-80.896q-37.888-36.864-76.8-36.864-31.744 0-57.344 25.6-7.168 7.168-7.168 17.408t7.168 18.432q7.168 7.168 17.92 7.168t17.92-7.168q25.6-24.576 62.464 12.288l80.896 79.872q14.336 14.336 14.336 32.768 0 19.456-14.336 31.744-12.288 13.312-28.672 15.872t-30.72-10.752l-25.6-25.6q-8.192-7.168-18.432-7.168t-17.408 7.168q-17.408 17.408 0 35.84l25.6 25.6q27.648 27.648 65.024 26.112t66.048-31.232z" horiz-adv-x="410" />
+<glyph unicode="&#xe802;" d="M438.784 96v-36.352q0-7.68-5.12-12.8t-13.312-5.632h-401.92q-7.68 0-12.8 5.632t-5.632 12.8v36.352q0 7.68 5.632 12.8t12.8 5.632h401.92q7.68 0 13.312-5.632t5.12-12.8zM438.784 242.432v-36.864q0-7.168-5.12-12.8t-13.312-5.12h-401.92q-7.68 0-12.8 5.12t-5.632 12.8v36.864q0 7.168 5.632 12.8t12.8 5.12h401.92q7.68 0 13.312-5.12t5.12-12.8zM438.784 388.352v-36.352q0-7.68-5.12-12.8t-13.312-5.632h-401.92q-7.68 0-12.8 5.632t-5.632 12.8v36.352q0 7.68 5.632 13.312t12.8 5.12h401.92q7.68 0 13.312-5.12t5.12-13.312z" horiz-adv-x="439" />
+<glyph unicode="&#xe803;" d="M235.52 459.52q97.28 0 166.4-69.12t69.12-166.4-69.12-166.4-166.4-69.12-166.4 69.12-69.12 166.4 69.12 166.4 166.4 69.12zM235.52 39.68q76.8 0 130.56 54.272t53.76 130.048q0 76.8-53.76 130.56t-130.56 53.76q-75.776 0-130.048-53.76t-54.272-130.56q0-75.776 54.272-130.048t130.048-54.272zM253.952 357.12v-124.928l76.8-76.8-25.6-25.6-87.040 87.040v140.288h35.84z" horiz-adv-x="471" />
+<glyph unicode="&#xe804;" d="M127.488 44.8q-17.408 0-28.672 14.336l-92.16 120.832q-8.192 12.288-6.144 26.624t13.312 23.552 26.112 7.168 24.064-14.336l60.416-78.848 151.552 242.688q8.192 12.288 22.016 15.36t27.136-4.096q12.288-8.192 15.36-22.016t-4.096-27.136l-179.2-286.72q-10.24-16.384-28.672-16.384z" horiz-adv-x="342" />
+<glyph unicode="&#xe805;" d="M225.28 449.28l61.44-172.032h163.84l-134.144-100.352 48.128-178.176-139.264 106.496-139.264-106.496 48.128 178.176-134.144 100.352h163.84z" horiz-adv-x="451" />
+<glyph unicode="&#xe806;" d="M460.8 49.92q-44.032 77.824-106.496 100.864t-168.96 23.040v-111.616l-185.344 171.008 185.344 164.864v-98.304q46.080 0 86.016-13.824t67.072-35.84 49.152-48.64 35.328-53.248 22.528-48.64 12.288-35.328z" horiz-adv-x="461" />
+<glyph unicode="&#xe807;" d="M471.040 370.432q-18.432-27.648-48.128-50.176v-12.288q0-66.56-30.72-128t-95.232-103.936-148.48-42.496q-81.92 0-148.48 43.008 7.168-1.024 23.552-1.024 67.584 0 119.808 40.96-31.744 1.024-56.32 19.456t-33.792 48.128q5.12-2.048 17.408-2.048 13.312 0 25.6 3.072-33.792 7.168-55.296 33.792t-21.504 61.44v1.024q18.432-10.24 43.008-12.288-43.008 29.696-43.008 80.896 0 24.576 13.312 48.128 78.848-96.256 199.68-100.352-3.072 9.216-3.072 21.504 0 39.936 28.16 68.096t69.12 28.16q41.984 0 69.632-29.696 30.72 6.144 61.44 22.528-10.24-33.792-41.984-53.248 28.672 4.096 55.296 15.36z" horiz-adv-x="471" />
+<glyph unicode="&#xe809;" d="M0 314.112l75.776 75.776 180.224-179.712 180.224 179.712 75.776-75.776-256-256-75.776 75.776z" />
+<glyph unicode="&#xe80a;" d="M475.648 50.432v219.136q-9.216-10.24-19.968-18.944-76.288-58.368-121.856-96.256-14.336-12.288-23.552-19.456t-24.576-13.824-29.184-6.656h-1.024q-13.312 0-29.184 6.656t-24.576 13.824-23.552 19.456q-45.056 37.888-121.856 96.256-10.752 8.704-19.968 18.944v-219.136q0-4.096 3.072-6.656t6.144-2.56h420.864q3.584 0 6.144 2.56t3.072 6.656zM475.648 350.464v7.168t-0.512 3.584-0.512 3.584-1.536 2.56-2.56 2.048-4.096 1.024h-420.864q-3.584 0-6.144-3.072t-3.072-6.144q0-48.128 41.984-81.408 55.296-43.52 114.688-90.624 2.048-1.024 10.24-8.192t12.8-10.752 12.8-9.216 14.336-7.68 12.288-2.56h1.024q5.632 0 12.288 2.56t14.336 7.68 12.8 9.216 12.8 10.752 10.24 8.192q59.392 47.104 114.688 90.624 15.36 12.288 28.672 33.28t13.312 37.376zM512 361.216v-310.784q0-18.944-13.312-32.256t-32.256-13.824h-420.864q-18.432 0-32.256 13.824t-13.312 32.256v310.784q0 18.944 13.312 32.256t32.256 13.312h420.864q18.944 0 32.256-13.312t13.312-32.256z" />
+<glyph unicode="&#xe80b;" d="M0 133.888l256 256 256-256-75.776-75.776-180.224 179.712-180.224-179.712z" />
+<glyph unicode="&#xe80c;" d="M25.6 279.296q62.464-35.84 168.96-35.84t168.96 35.84l-27.648-248.832q-1.024-7.168-17.92-18.432t-51.2-22.016-72.192-10.752-71.68 10.752-51.2 22.016-18.432 18.432zM275.456 432.896q48.128-9.216 80.896-28.16t32.768-36.352v-5.12q0-29.696-57.344-50.688t-137.216-20.992-137.216 20.992-57.344 50.688v5.12q0 17.408 32.768 36.352t80.896 28.16l21.504 24.576q11.264 13.312 35.84 13.312h47.104q26.624 0 35.84-13.312zM247.808 375.552h43.008q-47.104 56.32-53.248 64.512-7.168 8.192-16.384 8.192h-52.224q-11.264 0-16.384-8.192l-54.272-64.512h43.008l32.768 33.792h41.984z" horiz-adv-x="389" />
+</font></defs></svg>
\ 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
--- /dev/null
+++ b/themes/courgette/font/icomoon.ttf
diff --git a/themes/courgette/font/icomoon.woff b/themes/courgette/font/icomoon.woff
new file mode 100755
index 00000000..ddb96f29
--- /dev/null
+++ b/themes/courgette/font/icomoon.woff
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 %}<a class="tag" href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> {% if token != '' %}<a href="?feed&amp;type=tag&amp;user_id={{ user_id }}&amp;tag_id={{ tag.id }}&amp;token={{ token }}" target="_blank"><img src="{{ poche_url }}/themes/{{ theme }}/img/{{ theme }}/rss.png" /></a>{% endif %} {% endfor %}
+{% endblock %}
\ No newline at end of file
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 @@
                 <h1>{{ entry.title|raw }}</h1>
             </header>
             <aside class="tags">
-                tags: {% for tag in tags %}<a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> {% endfor %}<a href="./?view=edit-tags&amp;id={{ entry.id|e }}" title="{% trans "Edit tags" %}">✎</a>
+                {% trans "tags:" %} {% for tag in tags %}<a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> {% endfor %}<a href="./?view=edit-tags&amp;id={{ entry.id|e }}" title="{% trans "Edit tags" %}">✎</a>
             </aside>
             <article>
                 {{ content | raw }}