From 33fe6a46a42ca1c13f2585b42d9da54aa2e45899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 25 Oct 2013 14:20:18 +0200 Subject: [PATCH 01/18] bug fix #278: mysql collation not UTF8 --- install/mysql.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/mysql.sql b/install/mysql.sql index cb232a8..9b01e32 100644 --- a/install/mysql.sql +++ b/install/mysql.sql @@ -3,7 +3,7 @@ CREATE TABLE IF NOT EXISTS `config` ( `name` varchar(255) NOT NULL, `value` varchar(255) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `entries` ( `id` int(11) NOT NULL AUTO_INCREMENT, @@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `entries` ( `content` blob NOT NULL, `user_id` int(11) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `users` ( `id` int(11) NOT NULL AUTO_INCREMENT, @@ -23,7 +23,7 @@ CREATE TABLE IF NOT EXISTS `users` ( `name` int(255) NOT NULL, `email` varchar(255) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `users_config` ( `id` int(11) NOT NULL AUTO_INCREMENT, @@ -31,4 +31,4 @@ CREATE TABLE IF NOT EXISTS `users_config` ( `name` varchar(255) NOT NULL, `value` varchar(255) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8; \ No newline at end of file From 985ce3ec53a71174b30b1872813cb69cab8d7081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 25 Oct 2013 14:25:37 +0200 Subject: [PATCH 02/18] bug fix #259: Deleting article doesn't redirect --- 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 0766cd5..39d4376 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -374,7 +374,7 @@ class Poche $msg = 'error : can\'t delete link #' . $id; } Tools::logm($msg); - Tools::redirect(); + Tools::redirect('?'); break; case 'toggle_fav' : $this->store->favoriteById($id, $this->user->getId()); From 83020b993c9dc18093cbe213ef40afa03f33c124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 25 Oct 2013 15:50:16 +0200 Subject: [PATCH 03/18] parse dilbert.com --- inc/3rdparty/simplepie/SimplePie/Misc.php | 1 + inc/3rdparty/site_config/custom/dilbert.com.txt | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 inc/3rdparty/site_config/custom/dilbert.com.txt diff --git a/inc/3rdparty/simplepie/SimplePie/Misc.php b/inc/3rdparty/simplepie/SimplePie/Misc.php index eabf273..17dbf96 100644 --- a/inc/3rdparty/simplepie/SimplePie/Misc.php +++ b/inc/3rdparty/simplepie/SimplePie/Misc.php @@ -1613,6 +1613,7 @@ class SimplePie_Misc case 'utf7': return 'UTF-7'; + case 'utf8lias': case 'utf8': return 'UTF-8'; diff --git a/inc/3rdparty/site_config/custom/dilbert.com.txt b/inc/3rdparty/site_config/custom/dilbert.com.txt new file mode 100644 index 0000000..6c8d95a --- /dev/null +++ b/inc/3rdparty/site_config/custom/dilbert.com.txt @@ -0,0 +1,4 @@ +title: //div[contains(@class, 'SB_Title')]//a +body: //div[contains(@class, 'STR_Content')] + +test_url: http://dilbert.com/strips/comic/2013-10-22 \ No newline at end of file From 7d7ed6a0ee869faf2ab04747f68c3fc6bdda7550 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sat, 26 Oct 2013 12:59:55 +0200 Subject: [PATCH 04/18] change link to themes --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ef1ecc4..d1ed79e 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Abandon Pocket, Instapaper and other Readability service : adopt poche. It is th * 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-themes). +* 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). @@ -26,4 +26,4 @@ Read the [INSTALL.md file](https://github.com/inthepoche/poche/blob/master/INSTA 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. \ No newline at end of file +as published by Sam Hocevar. See the COPYING file for more details. From 2b191d8c37bd774bd3eecbf42a5ac9d948ee61a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sat, 26 Oct 2013 13:23:31 +0200 Subject: [PATCH 05/18] fix download links --- themes/default/config.twig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/themes/default/config.twig b/themes/default/config.twig index 7267170..2134582 100644 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -8,9 +8,10 @@

{% trans "Poching a link" %}

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

    -
  • firefox: {% trans "download the extension" %}
    • -
  • chrome: {% trans "download the extension" %}
    • -
  • android: {% trans "download the application" %}
    • +
  • firefox: {% trans "download the extension" %}
    • +
  • chrome: {% trans "download the extension" %}
    • +
  • android: {% trans "via f-droid" %}{% trans "or" %}{% trans "via google play" %}
    • +
  • windows phone: {% trans "download the application" %}
  • From 363bc4eb8642d464cc0c099f7ab72a425b56b463 Mon Sep 17 00:00:00 2001 From: banux Date: Sun, 27 Oct 2013 07:37:05 +0100 Subject: [PATCH 06/18] Add a autoclose parameters. When we use sharing method in plugins like the tiny tiny rss one or the firefox plugins we can passe the autoclose=true parameters that close the popup. --- inc/poche/Poche.class.php | 8 ++++++-- themes/default/_head.twig | 1 + themes/default/js/autoClose.js | 6 ++++++ 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 themes/default/js/autoClose.js diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 39d4376..5d80726 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -327,7 +327,7 @@ class Poche /** * Call action (mark as fav, archive, delete, etc.) */ - public function action($action, Url $url, $id = 0, $import = FALSE) + public function action($action, Url $url, $id = 0, $import = FALSE, $autoclose = FALSE) { switch ($action) { @@ -358,7 +358,11 @@ class Poche } if (!$import) { - Tools::redirect('?view=home'); + if ($autoclose == TRUE) { + Tools::redirect('?view=home'); + } else { + Tools::redirect('?view=home&autoclose=true'); + } } break; case 'delete': diff --git a/themes/default/_head.twig b/themes/default/_head.twig index d0cbd32..577cc69 100644 --- a/themes/default/_head.twig +++ b/themes/default/_head.twig @@ -8,3 +8,4 @@ + \ No newline at end of file diff --git a/themes/default/js/autoClose.js b/themes/default/js/autoClose.js new file mode 100644 index 0000000..3035d42 --- /dev/null +++ b/themes/default/js/autoClose.js @@ -0,0 +1,6 @@ +$(document).ready(function() { + current_url = window.location.href + if (current_url.match("&autoclose=true")) { + window.close(); + } +}); \ No newline at end of file From f616ab60efc502b919b9b72f81aee2975b2e8465 Mon Sep 17 00:00:00 2001 From: banux Date: Sun, 27 Oct 2013 07:47:14 +0100 Subject: [PATCH 07/18] use 2 seprate variable for autoclosing windows to avoid to quick closing when sharing, the popup can be close before the link is save --- inc/poche/Poche.class.php | 2 +- themes/default/js/autoClose.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 5d80726..3ecaf08 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -361,7 +361,7 @@ class Poche if ($autoclose == TRUE) { Tools::redirect('?view=home'); } else { - Tools::redirect('?view=home&autoclose=true'); + Tools::redirect('?view=home&closewin=true'); } } break; diff --git a/themes/default/js/autoClose.js b/themes/default/js/autoClose.js index 3035d42..e9145b7 100644 --- a/themes/default/js/autoClose.js +++ b/themes/default/js/autoClose.js @@ -1,6 +1,6 @@ $(document).ready(function() { current_url = window.location.href - if (current_url.match("&autoclose=true")) { + if (current_url.match("&closewin=true")) { window.close(); } -}); \ No newline at end of file +}); From 352523640d7692c802bc31ae9198d083de6de5d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 4 Nov 2013 08:44:56 +0100 Subject: [PATCH 08/18] compatibility with 5.3.3 --- poche_compatibility_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/poche_compatibility_test.php b/poche_compatibility_test.php index be4fd6f..eed3c39 100644 --- a/poche_compatibility_test.php +++ b/poche_compatibility_test.php @@ -1,7 +1,7 @@ =')); +$php_ok = (function_exists('version_compare') && version_compare(phpversion(), '5.3.3', '>=')); $pcre_ok = extension_loaded('pcre'); $zlib_ok = extension_loaded('zlib'); $mbstring_ok = extension_loaded('mbstring'); From 45e9e0f5653993d5f463209691953e7a41527267 Mon Sep 17 00:00:00 2001 From: Dmitry Sandalov Date: Tue, 5 Nov 2013 12:13:55 +0300 Subject: [PATCH 09/18] fix #270 access from remote machine Replacing SERVER_NAME with HTTP_HOST allows me to use Poche on remote machines --- inc/poche/Tools.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index 1d09282..030d75b 100644 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php @@ -53,12 +53,12 @@ class Tools $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]); - if (!isset($_SERVER["SERVER_NAME"])) { + if (!isset($_SERVER["HTTP_HOST"])) { return $scriptname; } return 'http' . ($https ? 's' : '') . '://' - . $_SERVER["SERVER_NAME"] . $serverport . $scriptname; + . $_SERVER["HTTP_HOST"] . $serverport . $scriptname; } public static function redirect($url = '') From b3a2586ecfea346870b71075ba25cbe69db502aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 12 Nov 2013 13:05:27 +0100 Subject: [PATCH 10/18] [add] russian language --- locale/ru_RU.utf8/ru_RU.utf8.mo | Bin 0 -> 5806 bytes locale/ru_RU.utf8/ru_RU.utf8.po | 228 ++++++++++++++++++++++++++++++++ 2 files changed, 228 insertions(+) create mode 100644 locale/ru_RU.utf8/ru_RU.utf8.mo create mode 100644 locale/ru_RU.utf8/ru_RU.utf8.po diff --git a/locale/ru_RU.utf8/ru_RU.utf8.mo b/locale/ru_RU.utf8/ru_RU.utf8.mo new file mode 100644 index 0000000000000000000000000000000000000000..eea7ff0bece78ce6049e3d48c2ea487db1284d95 GIT binary patch literal 5806 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\n" +"Language-Team: \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" + +msgid "config" +msgstr "настройки" + +msgid "Poching a link" +msgstr "Сохраняю ссылку" + +msgid "read the documentation" +msgstr "читать инструкцию" + +msgid "by filling this field" +msgstr "заполнением этого поля" + +msgid "poche it!" +msgstr "Прикарманить!" + +msgid "Updating poche" +msgstr "Обновляю poche" + +msgid "your version" +msgstr "Ваша версия" + +msgid "latest stable version" +msgstr "крайняя стабильная версия" + +msgid "a more recent stable version is available." +msgstr "есть более новая стабильная версия." + +msgid "you are up to date." +msgstr "у Вас всё самое новое." + +msgid "latest dev version" +msgstr "крайняя версия разработчиков" + +msgid "a more recent development version is available." +msgstr "есть более свежая версия разработчиков." + +msgid "Change your password" +msgstr "Смени пароль" + +msgid "New password:" +msgstr "Новый пароль:" + +msgid "Password" +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 "More infos in the official doc:" +msgstr "Больше сведений в официальной документации:" + +msgid "import from Pocket" +msgstr "импортировать из Pocket" + +msgid "import from Readability" +msgstr "импортировать из Readability" + +msgid "import from Instapaper" +msgstr "импортировать из Instapaper" + +msgid "Export your poche datas" +msgstr "Экспортировать данные poche" + +msgid "Click here" +msgstr "Кликни сюда" + +msgid "to export your poche datas." +msgstr "чтобы экспортировать твои записи из poche." + +msgid "back to home" +msgstr "домой" + +msgid "installation" +msgstr "установка" + +msgid "install your poche" +msgstr "установить твой poche" + +msgid "" +"poche is still not installed. Please fill the below form to install it. " +"Don't hesitate to read the documentation " +"on poche website." +msgstr "" +"poche всё ещё не установлен. Надо заполнить форму ниже, чтобы установить " +"его. Неплохо также прочесть документацию " +"на сайте poche." + +msgid "Login" +msgstr "Регистрационное имя" + +msgid "Repeat your password" +msgstr "Повтори пароль" + +msgid "Install" +msgstr "Установить" + +msgid "back to top" +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 link available here!" +msgstr "Здесь нет линка!" + +msgid "toggle mark as read" +msgstr "изменить отметку 'прочитано'" + +msgid "toggle favorite" +msgstr "изменить избранность" + +msgid "delete" +msgstr "удалить" + +msgid "original" +msgstr "исходный" + +msgid "results" +msgstr "найдено" + +msgid "tweet" +msgstr "твитнуть" + +msgid "email" +msgstr "отправить по почте" + +msgid "shaarli" +msgstr "Шаарли" + +msgid "flattr" +msgstr "проспонсировать" + +msgid "this article appears wrong?" +msgstr "статья выглядит криво?" + +msgid "create an issue" +msgstr "оповестить об ошибке" + +msgid "or" +msgstr "или" + +msgid "contact us by mail" +msgstr "связаться по почте" + +msgid "plop" +msgstr "plop" + +msgid "home" +msgstr "домой" + +msgid "favorites" +msgstr "избранное" + +msgid "logout" +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 "login to your poche" +msgstr "войти в свой poche" + +msgid "you are in demo mode, some features may be disabled." +msgstr "демонстрационный режим - работают не все возможности." + +msgid "Stay signed in" +msgstr "Оставаться зарегистрированным" + +msgid "(Do not check on public computers)" +msgstr "(Не отмечай на чужих компьютерах)" + +msgid "Sign in" +msgstr "Зарегистрироваться" From c7abf20bbe5a0dd504007c16ff42265f67604516 Mon Sep 17 00:00:00 2001 From: jno Date: Tue, 12 Nov 2013 20:34:55 +0400 Subject: [PATCH 11/18] dark theme images replaced to visible set, no executable bits for pictures --- themes/dark/img/dark/backtotop.png | Bin 326 -> 250 bytes themes/dark/img/dark/bad-display.png | Bin 343 -> 403 bytes themes/dark/img/dark/checkmark-off.png | Bin 277 -> 339 bytes themes/dark/img/dark/checkmark-on.png | Bin 235 -> 288 bytes themes/dark/img/dark/down.png | Bin 216 -> 269 bytes themes/dark/img/dark/envelop.png | Bin 285 -> 361 bytes themes/dark/img/dark/flattr.png | Bin 270 -> 331 bytes themes/dark/img/dark/left.png | Bin 196 -> 264 bytes themes/dark/img/dark/link.png | Bin 341 -> 404 bytes themes/dark/img/dark/remove.png | Bin 252 -> 300 bytes themes/dark/img/dark/shaarli.png | Bin 729 -> 841 bytes themes/dark/img/dark/star-off.png | Bin 314 -> 382 bytes themes/dark/img/dark/star-on.png | Bin 281 -> 327 bytes themes/dark/img/dark/top.png | Bin 212 -> 250 bytes themes/dark/img/dark/twitter.png | Bin 297 -> 375 bytes 15 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 themes/dark/img/dark/backtotop.png mode change 100755 => 100644 themes/dark/img/dark/bad-display.png mode change 100755 => 100644 themes/dark/img/dark/flattr.png mode change 100755 => 100644 themes/dark/img/dark/link.png diff --git a/themes/dark/img/dark/backtotop.png b/themes/dark/img/dark/backtotop.png old mode 100755 new mode 100644 index 051238ef9216989a3baac6426a16592c8e177bd8..c885086dc9bffe73a694d3d99b6aa478b691afd6 GIT binary patch delta 223 zcmX@c^owzVayQL70(Y z)*K0-AbW|YuPggqZf;?AX0G0oqClZ4PZ!6Kh{JEM8uB$5@Hk(*CDZl0UxsU{WQ*1$ zD}x7Ta{onht^Hd&VegIaYv+sUYR56hJT~T75%DOJWy(h$rdJgrja?NijjMhHvuHi` z7dUg|y;z^p;@FTQ=>j1~H*>6-ANob-D)-{@2*K%f?5qB_<;eFlvPmQ~FtSzft;(~V V5p;FhMW8bnJYD@<);T3K0RVTkQPKba delta 300 zcmV+{0n`5a0mcH5BYy!6Nkl>S+=x&xA4<1tl!N6*b)5cy@4aWuaV6}0S=jX(gnoX3lRa}#KRC? z07*Oq;Q_FSyCJLq9&s0h1t21BhR^_N;<)jt1aq-+40B?2NPhs5ILhr=lpJDdYbI4% z1F!_*03cvl`vKtq(BUpjLn%{P1CSv0G&$;+9KeHqS``4?IZ6OEh=C?Hd29Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2i*$`69_mw9z6a4009$8L_t(I%dL{lZG$iz#eYT} zfKE`j`514I5pwmZFhSX%*#LEd&=be9LDUJHBe#$Zk_qVLxqm_gMJlQ-=@G9uzg^n1Uevf z)(^iONc9Xj;35?>%NdnBAc%vJ@>#?J2qMo5>wu%q4e$cwi7o~xob@N*7W%dheOoP% zpM@#JIXubUIC8Pt0o5$?QH6d^a3f%1gh4S%l~^y3FWNIX%YiI$)?Y=+1+FKB#dsgW zyv8WN)>(g@e&Zf^pD5RImP$F!#5b^$Fn4V`>l+nVsp*@BXaM%{{~wO$U*~&0`9IbV XM5}_a)<%D300000NkvXXu0mjfb8?#W delta 317 zcmV-D0mA;11J?qOBYy!NNkl5QU`!Di9UW0V<#aQ2`xD2Xuf6=s;9J z2ciQi;C-3hOoWk1ZsyJHUGDwtU4mA#5s9`Hf}jE4$#Zdcbp<}inEw(OXn!Gu0(DzR zg{v?XGG|X-6yV@N82xDr^06SAC&1}si5{9`bMeS%x^tqsFMo_lMFN~}!d-xHF(F7U z;Le!1P*-&i0U{9_&?gCaA_Uh);0)xB5DFwt*mHrQ7Fi@=C(N)fksl8g7NPG8vEnd!P;{qQrTdt$+b8Km-(_h%ynC(l_TQll$C(S}W5#Z+oDUM_Po(G0Nd_7>%@^X=REf_{9g4 zB>7ad1OtpykTF&}ppg!~!XKR|&%cqW(369sx~Tq z4bhlmlSW||c&wEM&96}ron$9Vg|PW%OJ>vEb3hXkkMB)MI3|eAJ4?bIjKV_#{~RQD z6Me*P^J|bgNMBcW$=FHE)l|jRhQ?Ema?45FHN00000NkvXXu0mjfuV-$T diff --git a/themes/dark/img/dark/checkmark-on.png b/themes/dark/img/dark/checkmark-on.png index cd3abb2c0b501af84a0f7db7f46bee779bc1af27..5ee8c8d30900db3864f2eed29a38713d12965e4d 100644 GIT binary patch delta 260 zcmaFOxPWPbNGZx^prw85kJYlDyqr82*Fcg1yTp14TFsJR*x37`TN&n2}-D z90{Nxdx@v7EBjq;ZecD3S(js4K%oVmE{-7gcOC&_45@FHds?;$o5!*sr*Y7hBBUQgD&Uu*nlcZz1gy}SnD3s+NbpXRDz<1t|B zU2|k1+fSzZjdL@qYr9@=dh2>yo9ARAL*YHS#@Z_eOuPlB6C0Q;7_P6-oHOg_c^RMZ zy$n~+Sg-n_>d~pV`G;=jsR=4!i)DCkJ}WS?I2ZkS^8FtSMa;p+Hks(Y20E6()78&q Iol`;+0K!IQD*ylh delta 207 zcmV;=05Jcc0_y>gB!99=L_t(IPo0iJmVr7^&2 zuPoTmY#D6!V&MO3&r$y-6|oP+?oPS2apj{b=uU;!3~Dp8U??J@uW002ov JPDHLkV1mL_TAu&_ diff --git a/themes/dark/img/dark/down.png b/themes/dark/img/dark/down.png index b9d536a7cabbd3e404dc187a2e2844562e07fbb0..4150e17cbbf9ff19d14952265a375940bda01731 100644 GIT binary patch delta 241 zcmcb?*vm9QrJk`k$lZxy-8q?;3=9lxN#5=*4F5rJ!QSPQfg+p*9+AZi4BWyX%*Zfn zjs#GUy~NYkmHjR^w=g${;j8$GK%rhw7sn8b({Cqj6l^izVG(~;tkL{tVe@k4AgvO~ z9n809o?g)6FO%WW#Bd_u$%8W8UKanb6MAiLvJM44D}MB2UTskP+fSk$x-D;PE-*a4 zaCY^^Yhn=%r7xZZzFxpSO=!ylxfNRk)f6%(@y_uQTjI%5Yq=nT;fOV(y=7ABmRD1? p?;KopV8V(Gnm0T)Jcxe9Z@a?c&)FoIXrRj&JYD@<);T3K0RTdEU%dbT delta 188 zcmV;t07L(c0@wkNB!8btL_t(IPwkUo4nQyrg*gFEf)n86xB(~O2D~S2vduaXe=TWb zYu~q*cJl1w${+L#@&}@|>Ye};bD4ENAkiFY-m4}~5EY04u^WIA=cD9V=Z%Me4#C+g z#C4$J2KgD$hX583Qag}MoK$i%#jA)fm*G1IArx@Y)lD1&@HNbZi2nL`H*3Ori6JB^ qwj3y2A>6ZJIvLlM{gZfAiOmU-k|q)EaH)p?0000Nk+IzWkxt}K%`@N*&vx9*L(wx5r3y}iX$LE5cwY|ih}>P z!aOHnw@}{|=K20k1s|jRH(;S^j;{pfxdm$A3!oevp=!23FwZCRym}&BndcKwE0zbq z2vPuMp6ijg1`N23#nUScwgq}YS^@XK8EB`$<@6v_%@x=H7vLcA1&H#!2AJnhAgNJj ztq2_Cn+KTZs7LaXvPEV76|`5(!ypZF&}pF7p=$b>Cyc<4U};*x4(R5@>QApk=~)Gf gtQ2vnb#MR1KWnyFBkO2R*Z=?k07*qoM6N<$fdL_t(IPpy-I4T3NbMPUNnKsV44bOW70+`tWl35*kn6X*u& z1nLI5fli?Rk%N>9AptM>X?oXt_e)9`bd0cLe*hqs)-6E^fKSWjtjz`NwZBT+2H;Bd zv9$03z*4CvEv1(S>TAD~-cpo1cOB#(^r+%UnoBo>F!3N=ta_PrcJ(R%lg@0Lw{4K~y-)os+QOAIud% z2NGVUR3Ig2co|e+3v>b*p>&`foMvQV2U>w98{9a@9rB}{+kbukX8!CZi0s&xzzHaU zjJWDTn=TQ!0$P@SSZFiM1(L=R3&D#FVhS4Au|KRfkhIU9Rvt3wLYpb?8+Tt+Xh{UR zNSS$d=B7fhs3{CY(4-MKb`#UT*Z2kopewYw0(=2!##yq|nX)!7Z{dEFoB(a0rOB2 zkZBbNI>a~2EnKZXS&B(;g3U6UlzN!+0cM^A+Q9f~zvKn6E^9FJ2UxEv5*$%%!tX2* z?_I8#An=td_=_OQFX}L2P1fRGvVj!grn^J7*gk0em0x(2$)7hQP6b sF`kluvRYe0N_;uwnWB>pF07*qoM6N<$f;2E|6#xJL diff --git a/themes/dark/img/dark/left.png b/themes/dark/img/dark/left.png index a0a53631ed0e93c4c63a6316abde8c66aa7366fb..c2f7a20ec760954a2329021cd6a1d8aade38f616 100644 GIT binary patch delta 236 zcmX@Y*ugYGrJk`k$lZxy-8q?;3=9lxN#5=*4F5rJ!QSPQfg+p*9+AZi4BWyX%*Zfn zjs#GUy~NYkmHjR^w=j?1nq@w#fkGXgE{-7$lGGT;~KBT)}VW-QN7`IgPCxU z5mOFBNzXx!>q|I-rW_6^$kTEE>A!9N!?y-2Q;(<0dnGUlJXdAkAX&&9vfpZh?@e1K<*7jsx)+?!zb?tm``c&;4astHkcsSa@VIpik#WJ~jho!xl} hA+kYCNk4x7V2aZ)`o%YmlNabH22WQ%mvv4FO#r(jRTcmM delta 168 zcmV;Z09XHr0>lB3B!7!ZL_t(IPh(`D5HM1xp8=Nv0ziZJLk%~?X9+d~V44kp8Xp3& z0x1R{YrY87=m5kYh&6y@%^-teULZ>|vH=Hx9D5RDPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2i*$`6AcQ9zL`4!009(9L_t(I%bk<4QNu74hCk`( z@dh!SI-&{U4dPZ6VFQ?ej1V?3mD*$ioCy?n>Tos)8_+y)I)7cl*{IV=-+TZ2bW%)M zA^Hk<16rU0df?R>H>!#7C$I$0zzD2>3t;sO_ycIHaSiY+Np@-~Y>nF#=RNSK{{zda zf$v)*Y;!n7Ul$EJU;*rJ6=;D$;0^Eqkw5TO@c z%$#OD0ILvvV{?t`fg`Y%vo65^cZINH)@?1_Qr9zpHEy5JstaK+a_Iy-SmU}}*fm)y zL_Z2tUwO_h6ZRXsOi*Q_X2GdIFT&cna2lZoPQbkstIMbQ>%VAg+$a(cfCUurJ_QE& Y0S*>}yxS|Ex&QzG07*qoM6N<$f_K=LkN^Mx delta 315 zcmV-B0mS~41JweMBYy!LNklCLw@uV~`?FoFqFKlD&p1-gGztM9ua{rJ9S+n1im+pwC&<1{;_dR#d47-i8 zVN2F?F!e8(!5Vg6j+Z0+pENjbSYBvCs6p4TFh4PIvkI(`5E N002ovPDHLkV1kq~kT?JU diff --git a/themes/dark/img/dark/remove.png b/themes/dark/img/dark/remove.png index f8ad56a3e744982a2c7f20843de726fd8ac4724f..0c3dcfdffdf29d905b3ad09b7ef14782a839b117 100644 GIT binary patch delta 273 zcmV+s0q*|%0jvU$B!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru-3tp74Iw20V0!=n0IW$wK~y-)t&*`3!Y~X)pR)iS zA*D(*jw;xMut})WGD0>;%9OA{Hh?C%^O0bb9KW$F$@2gH4u7nm8=4w8eWY(HcE*El zXkMNiKu8)Y;DQfV6{`S>Bs69Oob%@BmP;pkg5x1LN9&SxU^pT6)V3ns2%$6>E;bM X`Y$tiuzp(r015yANkvXXu0mjf|4eNz delta 224 zcmV<603ZLX0{j7xB!9z6L_t(IPh(`j4i*4~3ViDE=OZu^JEnlvoeMjzD|>hXD>i@%>0@P+4LDT@srMsAhm6&=nW3 zr2~+yg+M$3hZjI0-;bPru%&lc0Ace2dQ4%YL{RAS6G(;+f$|D4HRvt?IX$0%0q{fw aQU?GU{WcNlf%zW*0000(R4C7ll5a@dbsWcEzu&DX^9SxMQ1nJb_@^=4UBR4#7K7`=i3K@zCMd?FTJ9)% za2X?n89_JHf^~!sRwjO%*fR|ur0K7OfsF68KYWFq2YaByo}8T99di49dZd&E^?LZ> z{rP-&f4_NK{0sH<_0|_RqaOfo0>^-#fy<$qj^Fq{Xrr!`mzT@f*qFGkE8X4QqK(?n zMwR^Mav%^W)J8p=nVFG2^7*_}RaJ>LDtb_F9~?~2T|W*SX=rF*WMqW)_I7+eA1y5{ z053%%k-zCJfV*qoo)M9EfaihI*BU?cudlDuf78>$!omWnREmj-368&D=K%x!U|H7Z z!Rm`CTN~9TB0t@@KKJ^s%lVoIsiXe+`FQ|#cX#(cwYIiW;GH~l`^WT&E0=D(D>6}gxD%?7e>kYg<0u>@2IRt9S*!3)(0>Ffbq@BDq{n z(&@CM(`l)#trcyQXrp9sa8M2skH4p{YHEt&;$o7?BwtVVbL*=W z{{1&$nIbX-V;86c4RUs zZ}nYxrsKkuU|Crio12>?5(&c1fycnr(5Yh;=U?u6s-mI-&-3W-@8`vH&)tqiZ+>R& z+4%U==;8CP)PDrD0f&LRz)+~B!(CaMEb`=W40szT0bJYib)T$myZq$q+Qp$H*pB7xVU(1o-KMDl@{-f7NwjT?2N4~BEj z%zS_II>Y@9Hk*wn5D4OYK7WqS6P_KRQ26L<{SP4drBz~k{yka#=}*vf0C(|PN8 z2S|E?#uAo!jnAdQU?5T;5CFYiPxn%(#M*!Of${+*BNmGdM8>i_D5qdB2!%ocn$0H6 zW-}srz208|4u=CwCKJeJvtYN|0jV40U2z!gb1s)7r`>J`^Z6Xc<1zI6eJ~o0pj0ZM zTrNYkT7`DI4a?<{e527QtLQx|;$}1&kD!k91e#>j>TfoYPCQn zlfk9UUav>3A$g1P46C3)K19ODP$)!B4u=D9A7HcD(7Rr*18yQ^W$^iYEJ2&d4EVPg zjJNG{I3QY~kH+Td7v7 z#i&f8^Cx`H@%{z_TrnGdqYM+gK-)Kz6UtjG{{hEw+)t00l(;BWLW2MR000O{MNUMn GLSTXzv^LEE diff --git a/themes/dark/img/dark/star-off.png b/themes/dark/img/dark/star-off.png index 6a0133a79f1e183c4bd10a71131efc7baf8d8f53..8194bc2dce3421196a370d512e31d8c5ee77fb62 100644 GIT binary patch delta 356 zcmV-q0h|810{#M!BYyw^b5ch_0Itp)=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2i*$`6AlzuocEgm0090;L_t(I%axO{al&nl>aFW{i5C?>kEB(xt>QS^!|@CsCb1>T(TmE;b< zFVKpjKWBUkFpDWPz*cyEfQtb4**HtU0Sn+GrU39+NQWKp4lKr&m5uie9G&s&{s@yK zdGW&%HIkv?pcbg3;D1q7;-@k(@rmzMY?f(!{SWf)T2h0sx-Ek>98h2a(00005+} zB-Ofz0gCQZd)~)flmSB}wWUiKCCU>>3`^1u}oKX7Ql&j+>QKw zT{zh3!$2Av;CSr@;2@o)S$TwiAYaAc!%J*}REp~WBym}>*Lf+%<$nH&FfmmS7ky73 z{>oS8ma^h@Lcl@+ZX3`_nmdv6)`h&zCI%qDYvAB!2)O`y5)Qb18s#f=khz!yI+fSV mARuWBfc>yA;2Gp2esbPRS2&T#`D*b10000=W7B!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY z3ljhU3ljkVnw%H_000McNliru-3tp74lC~Z+NJ;i0LMv0K~y-)wUV(7!Y~v>pAkJ7 z0XmoQ24MqQS7ZclK-h#-ZZiUzz$x7!HV7Ng7-WUSBuJd}C4bwxe|O(DB;dTwoVQtu zvmy->Y7!#l4&1_ar=;$eCNMx2$}CC{xxeP`r&5ThDF-${0p!48z-@pIxB?F)bq64v zw-s>WH=IRqzW~RD&9#!cj7L}^QY)#;k4u~>@@^h`Ml-|Rr2auZLm>aFz&2X9z&=zv y!C^h3eg}+_x+RIu3+HVKRLPXi+rzi~L(UWN)I1}J*=3;s0000dLR;G2zFdEHUmJR{+@tW1cCDK zG=c5{Pz>xRV1OeuCcw(j4JZJL^%F3l5GX$ZrUu;rkVHOI@*p&dLEHu)wug#O1kxaj zu)5#?P*ee`0F-c$K?2mE2SC~ZmjR&EhprLbM<{9llWZlCac-ON00000NkvXXu0mjf D?A~3B diff --git a/themes/dark/img/dark/top.png b/themes/dark/img/dark/top.png index 954a8c0acbb221eb20d04d6184d3317c9604adf6..d137bd240e3ee1b4fdf61dbdbbb2870e18fbddec 100644 GIT binary patch delta 222 zcmcb@_=|CZNGZx^prw85kJYlDyqr82*Fcg1yTp14TFsJR*x37`TN&n2}-D z90{Nxdx@v7EBjq;Zef0w7=vs3fI?NCE{-7boFyt=akR{04xkroB#j- delta 184 zcmV;p07w7&0n`DIB!8PpL_t(IPwkW84M0E)h3__C5;nl(jKCypKwr`(ZLdzmUzf;3 z-}@?cm($0UEBS_MGuJ25Bl6w>B;0doB@H1Fz=x%A2=M?N-YD5|TJ8&o2Kewu;hh03 z>B2w*(Eu0*y3h?_4DDn9d}tsLC}xs80452et^s%!2;lG;05LZ+;sJ%Hwhy8&_yNI~ mpN5D{gC%F;^$??9Yu;U@G9?ik4Y|+&0000)ikV0QX5mK~y-)wUfPV!!QtqKM@%~ z8^q;x_Dx`UgQR2?c>`|}Z4h^CtqI~xK&4}6k05X0=7iWpq<=&R@&Go+d+*&34*rPZ zH%T#t1+WH6pjGi_i#F9#S~sL_s0?8i;8awOYDH<&1VmE=2DLcY*hU5!CX$6KxsYx2xl&vx$9H$M*yed zdn@xYgWuj(fK`e=0Q(sN&7HtZv_tuK0xEuIvuG#CpZQi?w)3^U@9+UsHnXo=h$&Ro u({jSKQStl9W3q#(fQ5xRpc@Y7-*5$%1Wjq}_CbgM0000&%Ml>B7ghCVz)2utXF!p~H@YUM_>`P%I%o9!?mcuKV z5w^galZXHp+a8VW+b25#s?vY>55i=sa$d(=g$@d9kD0+oa-S)d`_V#@^zGmcO~NR# Uw(5?(00000Ne4wvM6N<$f>g?U5C8xG From b7066c033317bf305c93a808c456da1c9d7415f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 13 Nov 2013 14:50:56 +0100 Subject: [PATCH 12/18] [fix] bug fix #311: remove toolbar when printing article --- themes/default/css/print.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/themes/default/css/print.css b/themes/default/css/print.css index 9aefa77..914efbd 100644 --- a/themes/default/css/print.css +++ b/themes/default/css/print.css @@ -32,6 +32,10 @@ article { border: none !important; } +#article_toolbar { + display: none; +} + /* Add URL after links */ .vieworiginal a:after { content: " (" attr(href) ")"; From f2d3ee98a6a3137f8c3edd62294d34a8ff4700b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 13 Nov 2013 15:17:34 +0100 Subject: [PATCH 13/18] [fix] bug fix #287: test if open_basedir & safe_mode are active to use CURLOPT_FOLLOWLOCATION --- inc/poche/Tools.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index 1d09282..7a872e7 100644 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php @@ -133,7 +133,9 @@ class Tools $curl = curl_init(); curl_setopt($curl, CURLOPT_URL, $url); curl_setopt($curl, CURLOPT_TIMEOUT, $timeout); - curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); + if (!ini_get('open_basedir') && !ini_get('safe_mode')) { + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); + } curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); curl_setopt($curl, CURLOPT_HEADER, false); From d7aec74403a0ed93d3079883dbc99c291a7e6b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 14 Nov 2013 11:14:15 +0100 Subject: [PATCH 14/18] [change] reuse existing class for article_toolbar --- themes/default/css/print.css | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/themes/default/css/print.css b/themes/default/css/print.css index 914efbd..99c00bd 100644 --- a/themes/default/css/print.css +++ b/themes/default/css/print.css @@ -24,7 +24,8 @@ body > footer, div.tools, header div, .messages, -.entrie + .results { +.entrie + .results, +#article_toolbar { display: none !important; } @@ -32,10 +33,6 @@ article { border: none !important; } -#article_toolbar { - display: none; -} - /* Add URL after links */ .vieworiginal a:after { content: " (" attr(href) ")"; From 0c2f453750b742fde21ec2a8fdcf3beb9eff2faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 20 Nov 2013 10:22:21 +0100 Subject: [PATCH 15/18] Fix Undefined offset Notice (thx @vjousse) --- inc/poche/Database.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php index 1d3ff0c..bf67de2 100644 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php @@ -166,7 +166,7 @@ class Database { $query = $this->executeQuery($sql, $params); $entry = $query->fetchAll(); - return $entry[0]; + return isset($entry[0]) ? $entry[0] : null; } public function getEntriesByView($view, $user_id, $limit = '') { From 99c8761b754e53921584e5c7026638ce57ecd49b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 25 Nov 2013 09:43:45 +0100 Subject: [PATCH 16/18] fix russian directory --- locale/ru_RU.utf8/{ => LC_MESSAGES}/ru_RU.utf8.mo | Bin locale/ru_RU.utf8/{ => LC_MESSAGES}/ru_RU.utf8.po | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename locale/ru_RU.utf8/{ => LC_MESSAGES}/ru_RU.utf8.mo (100%) rename locale/ru_RU.utf8/{ => LC_MESSAGES}/ru_RU.utf8.po (100%) diff --git a/locale/ru_RU.utf8/ru_RU.utf8.mo b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo similarity index 100% rename from locale/ru_RU.utf8/ru_RU.utf8.mo rename to locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo diff --git a/locale/ru_RU.utf8/ru_RU.utf8.po b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po similarity index 100% rename from locale/ru_RU.utf8/ru_RU.utf8.po rename to locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po From 1bf152a5510e6e3f68962b188f7aca51ca15f701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 25 Nov 2013 09:48:51 +0100 Subject: [PATCH 17/18] add italian language --- locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo | Bin 0 -> 4900 bytes locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po | 237 ++++++++++++++++++++ 2 files changed, 237 insertions(+) create mode 100644 locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo create mode 100644 locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po diff --git a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo new file mode 100644 index 0000000000000000000000000000000000000000..e4d4fb3dab38c58c9d100a97bbc39d2942a7bae4 GIT binary patch literal 4900 zcma);ON<;x8Gs82HY^V(aT3BKxXiaTRcvQvZ=#4tP|ZxuY_UCE zO?UOK*GNcFKtfTZ2n7%)AQyy?c!+R;96(wkE;)e61r7lYAOzeH9EcG4{_39D*^NQ8 zruyruuCDs)f6gnn-|`j3b&>Wy+VUHfGVtkJxN+UOOQ{dQ+u$AW7@UHO@Lg~j@>2=7 z-LQafhM$G|;1lp2@Hr^+zYpI6e*tCBU&437yZQLta2m=!XCOcIC^vckIAp3C*8Kom z^q+)>;q#E6dWGBD;h*5!;NR=<|J426Y%cHj!aJdcBF}yG_-QEeUV^gU$KdVIz&$X) z{qXbk`)@%x?{^_vsORBZ;S2Tq7on)~C3qM76_oY<3`HNW*8RPFByt^q^8P3k`7Xe{ z@Dotv$si_D>yS^?4JhkB3BLos2>Gd_7)k6j&rSCIC=~fVRdWF4dk^0Wuh;xClym+7 z%Dz8?a=w?L?EhPM4E~{he-}!Yd559MzW|?ogHjK{1N48#pzOa3rONwzp!nHgDDqr{ zBFDp!Pt;>@2KJ!H@g;aSd=ARIpTIuctluBTImB<;Q1)4dBIhdPr*dxc-4jscd<@)_DHk1AKa1*`ngYw;R$P~2z*-~AGVz-Y&RG^ckO`{VF7_z;wHezG19P~>_FiXFcOMZO4T^nNpzQYrDBnK~ufeZERG|I>#cuzq`*$ELZWFHs?jrO1X>wM%m^Qv7AKg>; zno#U1*ECIJmiUxC<+?!QXzHkRxa17thjNMD#D*Lto=N;nu8+`KH1TtZwTra-X>y(e zvB0CHb>ib9X#iC>VxjC*zT(K zsm{ty;<~!)hglhHUK~*xah~*E64o`n_i%-7~=y zYH=vzYB4Q>NfLF*4_vA)``l`m_I<%!2PXS|-*ufybkBF&>WW<-Z$i)O#HFj+tQnV> zPGaMZ`_D}K1u2|iPu4Y3Vl z6}2h4EFLR_x!m`40Yy8V8W8Hq(o8$a)xHJ`geRScG=#DtKmc)Hr! z{oD_A^t8-mHdm9w*ml*1Z9`YB>6wm8T-Z>q^3MtX9Sxa)H58lKA{uI>_0iCFTc|`F zT-07gN;EcOz6{Fe{2Z@MqB6{_qASRGi-5Xg1lDrcUQ^dzEtZHb-N8lHb>HVhS$-t2 z3r&5_r_+I;C|nR7^Y)a{E4l5@Pp^cKwOcKh5@d0^CNbS2$fg%CNG~o-uN2pdCymh` z<9FS5SkRtonT6&^)UcnYb>h8;Vb#r7V7MrgP^enTZA^LgEokkqV*bcUT|LepO!fYGJ$LBj)MJf{Hnn-Bo+WR4r1rVy@#e89bug85LiV_U zp2ZD{a$L!zvPo%kR5UZ}I8wdQp)})iqb?YyyHfl{8;kvY$ zQEf96DjbXogl5!bGZ;9+oj~nVTy4TW<3JO^m|536tFDxOZA%2Hf8@xts(LtR=2J(W zvJ)lm8baiDz?x3m!VXHuITJrBc#Kxb&s1AUMWe(pA(lcrgB~`2sB=fDusz~gvt6(h zO=2a%{gW~s_^Kj`25Vu|RhL;*z**8AB5%Ffrp+_mE~cTBk|r@insPF)&P3g$X8a)O z$Jc7z{I&$;=*(;#3$?_IM5`{=TvBETnz_v%*9DYF{a;^6ibj1qzA&*)I!`*u*@Hg_ zBu%N6bsx()w1;O%%2pJV_?KqInoCw(&c zII%+YZnTCJQ6eGQt}3R1dg}BV{#w;TDW_32*q(Y)Po4H;RPm?uvG5({%;ml--ofuuJD(u9_)z=qTLWyctj%;05 zv08kph8y18+G^*!+NR1x2g7<3t6~aa=teyP2QyKw`dC9G7!LNPA4=NQF*CNxLd8du{X1u=J~tzsd@A^G2t;#oyGv0$EC zJWit0o{qk2t3)WuxJfE(s_2HI4)jtxlAjzzNl4m?d&Or8wqpw=o67(KT1l3o>9G$F z(RCdLGnlwrk^=f=DhjUWWIp7!)3G^!ABsX$x#i+y1zEF7#HpB<|7=LV-NRzJYwvuc FUIX_g7Y6_U literal 0 HcmV?d00001 diff --git a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po new file mode 100644 index 0000000..f4e69c0 --- /dev/null +++ b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po @@ -0,0 +1,237 @@ +# +# Translators: +# Damtux , 2013 +msgid "" +msgstr "" +"Project-Id-Version: poche\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: 2013-11-25 09:47+0100\n" +"Last-Translator: Nicolas Lœuillet \n" +"Language-Team: Italian (http://www.transifex.com/projects/p/poche/language/" +"it/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: it\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.5.4\n" + +msgid "config" +msgstr "configurazione" + +msgid "Poching a link" +msgstr "Pochare un link" + +msgid "read the documentation" +msgstr "leggi la documentazione" + +msgid "by filling this field" +msgstr "compilando questo campo" + +msgid "poche it!" +msgstr "pochalo!" + +msgid "Updating poche" +msgstr "Aggiornamento poche" + +msgid "your version" +msgstr "la tua versione" + +msgid "latest stable version" +msgstr "ultima versione stabile" + +msgid "a more recent stable version is available." +msgstr "è disponibile una versione stabile più recente." + +msgid "you are up to date." +msgstr "sei aggiornato." + +msgid "latest dev version" +msgstr "ultima versione di sviluppo" + +msgid "a more recent development version is available." +msgstr "è disponibile una versione di sviluppo più recente." + +msgid "Change your password" +msgstr "Cambia la tua password" + +msgid "New password:" +msgstr "Nuova password:" + +msgid "Password" +msgstr "Password" + +msgid "Repeat your new password:" +msgstr "Ripeti la nuova password:" + +msgid "Update" +msgstr "Aggiorna" + +msgid "Import" +msgstr "Importa" + +msgid "Please execute the import script locally, it can take a very long time." +msgstr "" +"Si prega di eseguire lo script di importazione a livello locale, può " +"richiedere un tempo molto lungo." + +msgid "More infos in the official doc:" +msgstr "Maggiori info nella documentazione ufficiale" + +msgid "import from Pocket" +msgstr "Importa da Pocket" + +msgid "import from Readability" +msgstr "Importa da Readability" + +msgid "import from Instapaper" +msgstr "Importa da Instapaper" + +msgid "Export your poche datas" +msgstr "Esporta i tuoi dati di poche" + +msgid "Click here" +msgstr "Fai clic qui" + +msgid "to export your poche datas." +msgstr "per esportare i tuoi dati di poche." + +msgid "back to home" +msgstr "torna alla home" + +msgid "installation" +msgstr "installazione" + +msgid "install your poche" +msgstr "installa il tuo poche" + +msgid "" +"poche is still not installed. Please fill the below form to install it. " +"Don't hesitate to read the documentation " +"on poche website." +msgstr "" +"poche non è ancora installato. Si prega di riempire il modulo sottostante " +"per completare l'installazione. Leggere " +"la documentazione sul sito di poche." + +msgid "Login" +msgstr "Nome utente" + +msgid "Repeat your password" +msgstr "Ripeti la tua password" + +msgid "Install" +msgstr "Installa" + +msgid "back to top" +msgstr "torna a inizio pagina" + +msgid "favoris" +msgstr "preferiti" + +msgid "archive" +msgstr "archivio" + +msgid "unread" +msgstr "non letti" + +msgid "by date asc" +msgstr "per data cresc" + +msgid "by date" +msgstr "per data" + +msgid "by date desc" +msgstr "per data decr" + +msgid "by title asc" +msgstr "per titolo cresc" + +msgid "by title" +msgstr "per titolo" + +msgid "by title desc" +msgstr "per titolo decr" + +msgid "No link available here!" +msgstr "Nessun link disponibile!" + +msgid "toggle mark as read" +msgstr "segna come letto / non letto" + +msgid "toggle favorite" +msgstr "segna come preferito" + +msgid "delete" +msgstr "elimina" + +msgid "original" +msgstr "originale" + +msgid "results" +msgstr "risultati" + +msgid "tweet" +msgstr "twitta" + +msgid "email" +msgstr "email" + +msgid "shaarli" +msgstr "shaarli" + +msgid "flattr" +msgstr "flattr" + +msgid "this article appears wrong?" +msgstr "articolo non visualizzato correttamente?" + +msgid "create an issue" +msgstr "crea una segnalazione" + +msgid "or" +msgstr "oppure" + +msgid "contact us by mail" +msgstr "contattaci via email" + +msgid "plop" +msgstr "plop" + +msgid "home" +msgstr "home" + +msgid "favorites" +msgstr "preferiti" + +msgid "logout" +msgstr "esci" + +msgid "powered by" +msgstr "realizzato con" + +msgid "debug mode is on so cache is off." +msgstr "modalità di debug attiva, cache disattivata." + +msgid "your poche version:" +msgstr "la tua versione di poche:" + +msgid "storage:" +msgstr "memoria:" + +msgid "login to your poche" +msgstr "accedi al tuo poche" + +msgid "you are in demo mode, some features may be disabled." +msgstr "" +"sei in modalità dimostrazione, alcune funzionalità potrebbero essere " +"disattivate." + +msgid "Stay signed in" +msgstr "Resta connesso" + +msgid "(Do not check on public computers)" +msgstr "(non selezionare su computer pubblici)" + +msgid "Sign in" +msgstr "Accedi" From 7a4482b8a43afca7f5c311ae7e44b3f0c4d239c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 25 Nov 2013 09:57:10 +0100 Subject: [PATCH 18/18] 1.2.0: here we go --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 66a2e81..ba14625 100644 --- a/index.php +++ b/index.php @@ -8,7 +8,7 @@ * @license http://www.wtfpl.net/ see COPYING file */ -define ('POCHE', '1.1.0'); +define ('POCHE', '1.2.0'); require_once 'inc/poche/global.inc.php'; session_start();