aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--README.md4
-rw-r--r--inc/3rdparty/simplepie/SimplePie/Misc.php1
-rw-r--r--inc/3rdparty/site_config/custom/dilbert.com.txt4
-rw-r--r--inc/poche/Database.class.php2
-rw-r--r--inc/poche/Poche.class.php10
-rw-r--r--inc/poche/Tools.class.php8
-rw-r--r--index.php2
-rw-r--r--install/mysql.sql8
-rw-r--r--locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mobin0 -> 4900 bytes
-rw-r--r--locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po237
-rw-r--r--locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mobin0 -> 5806 bytes
-rw-r--r--locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po228
-rw-r--r--poche_compatibility_test.php2
-rw-r--r--[-rwxr-xr-x]themes/dark/img/dark/backtotop.pngbin326 -> 250 bytes
-rw-r--r--[-rwxr-xr-x]themes/dark/img/dark/bad-display.pngbin343 -> 403 bytes
-rw-r--r--themes/dark/img/dark/checkmark-off.pngbin277 -> 339 bytes
-rw-r--r--themes/dark/img/dark/checkmark-on.pngbin235 -> 288 bytes
-rw-r--r--themes/dark/img/dark/down.pngbin216 -> 269 bytes
-rw-r--r--themes/dark/img/dark/envelop.pngbin285 -> 361 bytes
-rw-r--r--[-rwxr-xr-x]themes/dark/img/dark/flattr.pngbin270 -> 331 bytes
-rw-r--r--themes/dark/img/dark/left.pngbin196 -> 264 bytes
-rw-r--r--[-rwxr-xr-x]themes/dark/img/dark/link.pngbin341 -> 404 bytes
-rw-r--r--themes/dark/img/dark/remove.pngbin252 -> 300 bytes
-rw-r--r--themes/dark/img/dark/shaarli.pngbin729 -> 841 bytes
-rw-r--r--themes/dark/img/dark/star-off.pngbin314 -> 382 bytes
-rw-r--r--themes/dark/img/dark/star-on.pngbin281 -> 327 bytes
-rw-r--r--themes/dark/img/dark/top.pngbin212 -> 250 bytes
-rw-r--r--themes/dark/img/dark/twitter.pngbin297 -> 375 bytes
-rw-r--r--themes/default/_head.twig1
-rw-r--r--themes/default/config.twig7
-rw-r--r--themes/default/css/print.css3
-rw-r--r--themes/default/js/autoClose.js6
32 files changed, 504 insertions, 19 deletions
diff --git a/README.md b/README.md
index ef1ecc4d..d1ed79ee 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Abandon Pocket, Instapaper and other Readability service : adopt poche. It is th
12* multi users (very soon!) 12* multi users (very soon!)
13* update notification in configuration screen 13* update notification in configuration screen
14* many storage modes (sqlite, mysql, postgresql) 14* many storage modes (sqlite, mysql, postgresql)
15* many templates: [have a look here](https://github.com/inthepoche/poche-themes). 15* many templates: [have a look here](https://github.com/inthepoche/poche/tree/master/themes).
16* ... 16* ...
17 17
18To test poche, a demo website is online : [demo.inthepoche.com](http://demo.inthepoche.com) (login poche, password poche). 18To 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
26Copyright © 2010-2013 Nicolas Lœuillet <nicolas.loeuillet@gmail.com> 26Copyright © 2010-2013 Nicolas Lœuillet <nicolas.loeuillet@gmail.com>
27This work is free. You can redistribute it and/or modify it under the 27This work is free. You can redistribute it and/or modify it under the
28terms of the Do What The Fuck You Want To Public License, Version 2, 28terms of the Do What The Fuck You Want To Public License, Version 2,
29as published by Sam Hocevar. See the COPYING file for more details. \ No newline at end of file 29as published by Sam Hocevar. See the COPYING file for more details.
diff --git a/inc/3rdparty/simplepie/SimplePie/Misc.php b/inc/3rdparty/simplepie/SimplePie/Misc.php
index eabf2738..17dbf963 100644
--- a/inc/3rdparty/simplepie/SimplePie/Misc.php
+++ b/inc/3rdparty/simplepie/SimplePie/Misc.php
@@ -1613,6 +1613,7 @@ class SimplePie_Misc
1613 case 'utf7': 1613 case 'utf7':
1614 return 'UTF-7'; 1614 return 'UTF-7';
1615 1615
1616 case 'utf8lias':
1616 case 'utf8': 1617 case 'utf8':
1617 return 'UTF-8'; 1618 return 'UTF-8';
1618 1619
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 00000000..6c8d95a2
--- /dev/null
+++ b/inc/3rdparty/site_config/custom/dilbert.com.txt
@@ -0,0 +1,4 @@
1title: //div[contains(@class, 'SB_Title')]//a
2body: //div[contains(@class, 'STR_Content')]
3
4test_url: http://dilbert.com/strips/comic/2013-10-22 \ No newline at end of file
diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index 1d3ff0c2..bf67de2a 100644
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -166,7 +166,7 @@ class Database {
166 $query = $this->executeQuery($sql, $params); 166 $query = $this->executeQuery($sql, $params);
167 $entry = $query->fetchAll(); 167 $entry = $query->fetchAll();
168 168
169 return $entry[0]; 169 return isset($entry[0]) ? $entry[0] : null;
170 } 170 }
171 171
172 public function getEntriesByView($view, $user_id, $limit = '') { 172 public function getEntriesByView($view, $user_id, $limit = '') {
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 0766cd51..3ecaf084 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -327,7 +327,7 @@ class Poche
327 /** 327 /**
328 * Call action (mark as fav, archive, delete, etc.) 328 * Call action (mark as fav, archive, delete, etc.)
329 */ 329 */
330 public function action($action, Url $url, $id = 0, $import = FALSE) 330 public function action($action, Url $url, $id = 0, $import = FALSE, $autoclose = FALSE)
331 { 331 {
332 switch ($action) 332 switch ($action)
333 { 333 {
@@ -358,7 +358,11 @@ class Poche
358 } 358 }
359 359
360 if (!$import) { 360 if (!$import) {
361 Tools::redirect('?view=home'); 361 if ($autoclose == TRUE) {
362 Tools::redirect('?view=home');
363 } else {
364 Tools::redirect('?view=home&closewin=true');
365 }
362 } 366 }
363 break; 367 break;
364 case 'delete': 368 case 'delete':
@@ -374,7 +378,7 @@ class Poche
374 $msg = 'error : can\'t delete link #' . $id; 378 $msg = 'error : can\'t delete link #' . $id;
375 } 379 }
376 Tools::logm($msg); 380 Tools::logm($msg);
377 Tools::redirect(); 381 Tools::redirect('?');
378 break; 382 break;
379 case 'toggle_fav' : 383 case 'toggle_fav' :
380 $this->store->favoriteById($id, $this->user->getId()); 384 $this->store->favoriteById($id, $this->user->getId());
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 1d092823..750553f1 100644
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -53,12 +53,12 @@ class Tools
53 53
54 $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]); 54 $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]);
55 55
56 if (!isset($_SERVER["SERVER_NAME"])) { 56 if (!isset($_SERVER["HTTP_HOST"])) {
57 return $scriptname; 57 return $scriptname;
58 } 58 }
59 59
60 return 'http' . ($https ? 's' : '') . '://' 60 return 'http' . ($https ? 's' : '') . '://'
61 . $_SERVER["SERVER_NAME"] . $serverport . $scriptname; 61 . $_SERVER["HTTP_HOST"] . $serverport . $scriptname;
62 } 62 }
63 63
64 public static function redirect($url = '') 64 public static function redirect($url = '')
@@ -133,7 +133,9 @@ class Tools
133 $curl = curl_init(); 133 $curl = curl_init();
134 curl_setopt($curl, CURLOPT_URL, $url); 134 curl_setopt($curl, CURLOPT_URL, $url);
135 curl_setopt($curl, CURLOPT_TIMEOUT, $timeout); 135 curl_setopt($curl, CURLOPT_TIMEOUT, $timeout);
136 curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); 136 if (!ini_get('open_basedir') && !ini_get('safe_mode')) {
137 curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
138 }
137 curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); 139 curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
138 curl_setopt($curl, CURLOPT_HEADER, false); 140 curl_setopt($curl, CURLOPT_HEADER, false);
139 141
diff --git a/index.php b/index.php
index 66a2e816..ba146257 100644
--- a/index.php
+++ b/index.php
@@ -8,7 +8,7 @@
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
10 10
11define ('POCHE', '1.1.0'); 11define ('POCHE', '1.2.0');
12require_once 'inc/poche/global.inc.php'; 12require_once 'inc/poche/global.inc.php';
13session_start(); 13session_start();
14 14
diff --git a/install/mysql.sql b/install/mysql.sql
index cb232a84..9b01e32c 100644
--- a/install/mysql.sql
+++ b/install/mysql.sql
@@ -3,7 +3,7 @@ CREATE TABLE IF NOT EXISTS `config` (
3 `name` varchar(255) NOT NULL, 3 `name` varchar(255) NOT NULL,
4 `value` varchar(255) NOT NULL, 4 `value` varchar(255) NOT NULL,
5 PRIMARY KEY (`id`) 5 PRIMARY KEY (`id`)
6) ENGINE=InnoDB DEFAULT CHARSET=latin1; 6) ENGINE=InnoDB DEFAULT CHARSET=utf8;
7 7
8CREATE TABLE IF NOT EXISTS `entries` ( 8CREATE TABLE IF NOT EXISTS `entries` (
9 `id` int(11) NOT NULL AUTO_INCREMENT, 9 `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `entries` (
14 `content` blob NOT NULL, 14 `content` blob NOT NULL,
15 `user_id` int(11) NOT NULL, 15 `user_id` int(11) NOT NULL,
16 PRIMARY KEY (`id`) 16 PRIMARY KEY (`id`)
17) ENGINE=InnoDB DEFAULT CHARSET=latin1; 17) ENGINE=InnoDB DEFAULT CHARSET=utf8;
18 18
19CREATE TABLE IF NOT EXISTS `users` ( 19CREATE TABLE IF NOT EXISTS `users` (
20 `id` int(11) NOT NULL AUTO_INCREMENT, 20 `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -23,7 +23,7 @@ CREATE TABLE IF NOT EXISTS `users` (
23 `name` int(255) NOT NULL, 23 `name` int(255) NOT NULL,
24 `email` varchar(255) NOT NULL, 24 `email` varchar(255) NOT NULL,
25 PRIMARY KEY (`id`) 25 PRIMARY KEY (`id`)
26) ENGINE=InnoDB DEFAULT CHARSET=latin1; 26) ENGINE=InnoDB DEFAULT CHARSET=utf8;
27 27
28CREATE TABLE IF NOT EXISTS `users_config` ( 28CREATE TABLE IF NOT EXISTS `users_config` (
29 `id` int(11) NOT NULL AUTO_INCREMENT, 29 `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -31,4 +31,4 @@ CREATE TABLE IF NOT EXISTS `users_config` (
31 `name` varchar(255) NOT NULL, 31 `name` varchar(255) NOT NULL,
32 `value` varchar(255) NOT NULL, 32 `value` varchar(255) NOT NULL,
33 PRIMARY KEY (`id`) 33 PRIMARY KEY (`id`)
34) ENGINE=InnoDB DEFAULT CHARSET=latin1; \ No newline at end of file 34) ENGINE=InnoDB DEFAULT CHARSET=utf8; \ No newline at end of file
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 00000000..e4d4fb3d
--- /dev/null
+++ b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo
Binary files differ
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 00000000..f4e69c07
--- /dev/null
+++ b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po
@@ -0,0 +1,237 @@
1#
2# Translators:
3# Damtux <sun_lion@live.com>, 2013
4msgid ""
5msgstr ""
6"Project-Id-Version: poche\n"
7"POT-Creation-Date: \n"
8"PO-Revision-Date: 2013-11-25 09:47+0100\n"
9"Last-Translator: Nicolas Lœuillet <nicolas.loeuillet@gmail.com>\n"
10"Language-Team: Italian (http://www.transifex.com/projects/p/poche/language/"
11"it/)\n"
12"MIME-Version: 1.0\n"
13"Content-Type: text/plain; charset=UTF-8\n"
14"Content-Transfer-Encoding: 8bit\n"
15"Language: it\n"
16"Plural-Forms: nplurals=2; plural=(n != 1);\n"
17"X-Generator: Poedit 1.5.4\n"
18
19msgid "config"
20msgstr "configurazione"
21
22msgid "Poching a link"
23msgstr "Pochare un link"
24
25msgid "read the documentation"
26msgstr "leggi la documentazione"
27
28msgid "by filling this field"
29msgstr "compilando questo campo"
30
31msgid "poche it!"
32msgstr "pochalo!"
33
34msgid "Updating poche"
35msgstr "Aggiornamento poche"
36
37msgid "your version"
38msgstr "la tua versione"
39
40msgid "latest stable version"
41msgstr "ultima versione stabile"
42
43msgid "a more recent stable version is available."
44msgstr "è disponibile una versione stabile più recente."
45
46msgid "you are up to date."
47msgstr "sei aggiornato."
48
49msgid "latest dev version"
50msgstr "ultima versione di sviluppo"
51
52msgid "a more recent development version is available."
53msgstr "è disponibile una versione di sviluppo più recente."
54
55msgid "Change your password"
56msgstr "Cambia la tua password"
57
58msgid "New password:"
59msgstr "Nuova password:"
60
61msgid "Password"
62msgstr "Password"
63
64msgid "Repeat your new password:"
65msgstr "Ripeti la nuova password:"
66
67msgid "Update"
68msgstr "Aggiorna"
69
70msgid "Import"
71msgstr "Importa"
72
73msgid "Please execute the import script locally, it can take a very long time."
74msgstr ""
75"Si prega di eseguire lo script di importazione a livello locale, può "
76"richiedere un tempo molto lungo."
77
78msgid "More infos in the official doc:"
79msgstr "Maggiori info nella documentazione ufficiale"
80
81msgid "import from Pocket"
82msgstr "Importa da Pocket"
83
84msgid "import from Readability"
85msgstr "Importa da Readability"
86
87msgid "import from Instapaper"
88msgstr "Importa da Instapaper"
89
90msgid "Export your poche datas"
91msgstr "Esporta i tuoi dati di poche"
92
93msgid "Click here"
94msgstr "Fai clic qui"
95
96msgid "to export your poche datas."
97msgstr "per esportare i tuoi dati di poche."
98
99msgid "back to home"
100msgstr "torna alla home"
101
102msgid "installation"
103msgstr "installazione"
104
105msgid "install your poche"
106msgstr "installa il tuo poche"
107
108msgid ""
109"poche is still not installed. Please fill the below form to install it. "
110"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation "
111"on poche website</a>."
112msgstr ""
113"poche non è ancora installato. Si prega di riempire il modulo sottostante "
114"per completare l'installazione. <a href='http://inthepoche.com/doc'>Leggere "
115"la documentazione sul sito di poche</a>."
116
117msgid "Login"
118msgstr "Nome utente"
119
120msgid "Repeat your password"
121msgstr "Ripeti la tua password"
122
123msgid "Install"
124msgstr "Installa"
125
126msgid "back to top"
127msgstr "torna a inizio pagina"
128
129msgid "favoris"
130msgstr "preferiti"
131
132msgid "archive"
133msgstr "archivio"
134
135msgid "unread"
136msgstr "non letti"
137
138msgid "by date asc"
139msgstr "per data cresc"
140
141msgid "by date"
142msgstr "per data"
143
144msgid "by date desc"
145msgstr "per data decr"
146
147msgid "by title asc"
148msgstr "per titolo cresc"
149
150msgid "by title"
151msgstr "per titolo"
152
153msgid "by title desc"
154msgstr "per titolo decr"
155
156msgid "No link available here!"
157msgstr "Nessun link disponibile!"
158
159msgid "toggle mark as read"
160msgstr "segna come letto / non letto"
161
162msgid "toggle favorite"
163msgstr "segna come preferito"
164
165msgid "delete"
166msgstr "elimina"
167
168msgid "original"
169msgstr "originale"
170
171msgid "results"
172msgstr "risultati"
173
174msgid "tweet"
175msgstr "twitta"
176
177msgid "email"
178msgstr "email"
179
180msgid "shaarli"
181msgstr "shaarli"
182
183msgid "flattr"
184msgstr "flattr"
185
186msgid "this article appears wrong?"
187msgstr "articolo non visualizzato correttamente?"
188
189msgid "create an issue"
190msgstr "crea una segnalazione"
191
192msgid "or"
193msgstr "oppure"
194
195msgid "contact us by mail"
196msgstr "contattaci via email"
197
198msgid "plop"
199msgstr "plop"
200
201msgid "home"
202msgstr "home"
203
204msgid "favorites"
205msgstr "preferiti"
206
207msgid "logout"
208msgstr "esci"
209
210msgid "powered by"
211msgstr "realizzato con"
212
213msgid "debug mode is on so cache is off."
214msgstr "modalità di debug attiva, cache disattivata."
215
216msgid "your poche version:"
217msgstr "la tua versione di poche:"
218
219msgid "storage:"
220msgstr "memoria:"
221
222msgid "login to your poche"
223msgstr "accedi al tuo poche"
224
225msgid "you are in demo mode, some features may be disabled."
226msgstr ""
227"sei in modalità dimostrazione, alcune funzionalità potrebbero essere "
228"disattivate."
229
230msgid "Stay signed in"
231msgstr "Resta connesso"
232
233msgid "(Do not check on public computers)"
234msgstr "(non selezionare su computer pubblici)"
235
236msgid "Sign in"
237msgstr "Accedi"
diff --git a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo
new file mode 100644
index 00000000..eea7ff0b
--- /dev/null
+++ b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo
Binary files differ
diff --git a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po
new file mode 100644
index 00000000..78ddb158
--- /dev/null
+++ b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po
@@ -0,0 +1,228 @@
1msgid ""
2msgstr ""
3"Project-Id-Version: \n"
4"POT-Creation-Date: \n"
5"PO-Revision-Date: \n"
6"Last-Translator: Nicolas Lœuillet <nicolas.loeuillet@gmail.com>\n"
7"Language-Team: \n"
8"MIME-Version: 1.0\n"
9"Content-Type: text/plain; charset=UTF-8\n"
10"Content-Transfer-Encoding: 8bit\n"
11"X-Generator: Poedit 1.5.4\n"
12
13msgid "config"
14msgstr "настройки"
15
16msgid "Poching a link"
17msgstr "Сохраняю ссылку"
18
19msgid "read the documentation"
20msgstr "читать инструкцию"
21
22msgid "by filling this field"
23msgstr "заполнением этого поля"
24
25msgid "poche it!"
26msgstr "Прикарманить!"
27
28msgid "Updating poche"
29msgstr "Обновляю poche"
30
31msgid "your version"
32msgstr "Ваша версия"
33
34msgid "latest stable version"
35msgstr "крайняя стабильная версия"
36
37msgid "a more recent stable version is available."
38msgstr "есть более новая стабильная версия."
39
40msgid "you are up to date."
41msgstr "у Вас всё самое новое."
42
43msgid "latest dev version"
44msgstr "крайняя версия разработчиков"
45
46msgid "a more recent development version is available."
47msgstr "есть более свежая версия разработчиков."
48
49msgid "Change your password"
50msgstr "Смени пароль"
51
52msgid "New password:"
53msgstr "Новый пароль:"
54
55msgid "Password"
56msgstr "Пароль"
57
58msgid "Repeat your new password:"
59msgstr "Ещё раз новый пароль:"
60
61msgid "Update"
62msgstr "Обновить"
63
64msgid "Import"
65msgstr "Импортировать"
66
67msgid "Please execute the import script locally, it can take a very long time."
68msgstr ""
69"Выполните сценарий импорта локально - он может занять слишком много времени."
70
71msgid "More infos in the official doc:"
72msgstr "Больше сведений в официальной документации:"
73
74msgid "import from Pocket"
75msgstr "импортировать из Pocket"
76
77msgid "import from Readability"
78msgstr "импортировать из Readability"
79
80msgid "import from Instapaper"
81msgstr "импортировать из Instapaper"
82
83msgid "Export your poche datas"
84msgstr "Экспортировать данные poche"
85
86msgid "Click here"
87msgstr "Кликни сюда"
88
89msgid "to export your poche datas."
90msgstr "чтобы экспортировать твои записи из poche."
91
92msgid "back to home"
93msgstr "домой"
94
95msgid "installation"
96msgstr "установка"
97
98msgid "install your poche"
99msgstr "установить твой poche"
100
101msgid ""
102"poche is still not installed. Please fill the below form to install it. "
103"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation "
104"on poche website</a>."
105msgstr ""
106"poche всё ещё не установлен. Надо заполнить форму ниже, чтобы установить "
107"его. Неплохо также <a href='http://inthepoche.com/doc'>прочесть документацию "
108"на сайте poche</a>."
109
110msgid "Login"
111msgstr "Регистрационное имя"
112
113msgid "Repeat your password"
114msgstr "Повтори пароль"
115
116msgid "Install"
117msgstr "Установить"
118
119msgid "back to top"
120msgstr "наверх"
121
122msgid "favoris"
123msgstr "избранное"
124
125msgid "archive"
126msgstr "архив"
127
128msgid "unread"
129msgstr "нечитанное"
130
131msgid "by date asc"
132msgstr "по дате, сперва старые"
133
134msgid "by date"
135msgstr "по дате"
136
137msgid "by date desc"
138msgstr "по дате, сперва новые"
139
140msgid "by title asc"
141msgstr "по заголовку (прямой)"
142
143msgid "by title"
144msgstr "по заголовку"
145
146msgid "by title desc"
147msgstr "по заголовку (обратный)"
148
149msgid "No link available here!"
150msgstr "Здесь нет линка!"
151
152msgid "toggle mark as read"
153msgstr "изменить отметку 'прочитано'"
154
155msgid "toggle favorite"
156msgstr "изменить избранность"
157
158msgid "delete"
159msgstr "удалить"
160
161msgid "original"
162msgstr "исходный"
163
164msgid "results"
165msgstr "найдено"
166
167msgid "tweet"
168msgstr "твитнуть"
169
170msgid "email"
171msgstr "отправить по почте"
172
173msgid "shaarli"
174msgstr "Шаарли"
175
176msgid "flattr"
177msgstr "проспонсировать"
178
179msgid "this article appears wrong?"
180msgstr "статья выглядит криво?"
181
182msgid "create an issue"
183msgstr "оповестить об ошибке"
184
185msgid "or"
186msgstr "или"
187
188msgid "contact us by mail"
189msgstr "связаться по почте"
190
191msgid "plop"
192msgstr "plop"
193
194msgid "home"
195msgstr "домой"
196
197msgid "favorites"
198msgstr "избранное"
199
200msgid "logout"
201msgstr "выйти"
202
203msgid "powered by"
204msgstr "на основе"
205
206msgid "debug mode is on so cache is off."
207msgstr "включён режим отладки - кеш выключен."
208
209msgid "your poche version:"
210msgstr "Ваша версия poche:"
211
212msgid "storage:"
213msgstr "хранилище:"
214
215msgid "login to your poche"
216msgstr "войти в свой poche"
217
218msgid "you are in demo mode, some features may be disabled."
219msgstr "демонстрационный режим - работают не все возможности."
220
221msgid "Stay signed in"
222msgstr "Оставаться зарегистрированным"
223
224msgid "(Do not check on public computers)"
225msgstr "(Не отмечай на чужих компьютерах)"
226
227msgid "Sign in"
228msgstr "Зарегистрироваться"
diff --git a/poche_compatibility_test.php b/poche_compatibility_test.php
index be4fd6f8..eed3c391 100644
--- a/poche_compatibility_test.php
+++ b/poche_compatibility_test.php
@@ -1,7 +1,7 @@
1<?php 1<?php
2$app_name = 'poche 1.0'; 2$app_name = 'poche 1.0';
3 3
4$php_ok = (function_exists('version_compare') && version_compare(phpversion(), '5.2.0', '>=')); 4$php_ok = (function_exists('version_compare') && version_compare(phpversion(), '5.3.3', '>='));
5$pcre_ok = extension_loaded('pcre'); 5$pcre_ok = extension_loaded('pcre');
6$zlib_ok = extension_loaded('zlib'); 6$zlib_ok = extension_loaded('zlib');
7$mbstring_ok = extension_loaded('mbstring'); 7$mbstring_ok = extension_loaded('mbstring');
diff --git a/themes/dark/img/dark/backtotop.png b/themes/dark/img/dark/backtotop.png
index 051238ef..c885086d 100755..100644
--- a/themes/dark/img/dark/backtotop.png
+++ b/themes/dark/img/dark/backtotop.png
Binary files differ
diff --git a/themes/dark/img/dark/bad-display.png b/themes/dark/img/dark/bad-display.png
index 6866799f..66ea2e16 100755..100644
--- a/themes/dark/img/dark/bad-display.png
+++ b/themes/dark/img/dark/bad-display.png
Binary files differ
diff --git a/themes/dark/img/dark/checkmark-off.png b/themes/dark/img/dark/checkmark-off.png
index 3db5a06d..661ea997 100644
--- a/themes/dark/img/dark/checkmark-off.png
+++ b/themes/dark/img/dark/checkmark-off.png
Binary files differ
diff --git a/themes/dark/img/dark/checkmark-on.png b/themes/dark/img/dark/checkmark-on.png
index cd3abb2c..5ee8c8d3 100644
--- a/themes/dark/img/dark/checkmark-on.png
+++ b/themes/dark/img/dark/checkmark-on.png
Binary files differ
diff --git a/themes/dark/img/dark/down.png b/themes/dark/img/dark/down.png
index b9d536a7..4150e17c 100644
--- a/themes/dark/img/dark/down.png
+++ b/themes/dark/img/dark/down.png
Binary files differ
diff --git a/themes/dark/img/dark/envelop.png b/themes/dark/img/dark/envelop.png
index 6be1c886..73d9b0b9 100644
--- a/themes/dark/img/dark/envelop.png
+++ b/themes/dark/img/dark/envelop.png
Binary files differ
diff --git a/themes/dark/img/dark/flattr.png b/themes/dark/img/dark/flattr.png
index 0404aaea..b457d080 100755..100644
--- a/themes/dark/img/dark/flattr.png
+++ b/themes/dark/img/dark/flattr.png
Binary files differ
diff --git a/themes/dark/img/dark/left.png b/themes/dark/img/dark/left.png
index a0a53631..c2f7a20e 100644
--- a/themes/dark/img/dark/left.png
+++ b/themes/dark/img/dark/left.png
Binary files differ
diff --git a/themes/dark/img/dark/link.png b/themes/dark/img/dark/link.png
index db62819d..a5b8d8d2 100755..100644
--- a/themes/dark/img/dark/link.png
+++ b/themes/dark/img/dark/link.png
Binary files differ
diff --git a/themes/dark/img/dark/remove.png b/themes/dark/img/dark/remove.png
index f8ad56a3..0c3dcfdf 100644
--- a/themes/dark/img/dark/remove.png
+++ b/themes/dark/img/dark/remove.png
Binary files differ
diff --git a/themes/dark/img/dark/shaarli.png b/themes/dark/img/dark/shaarli.png
index 1eb30f60..e68ac8b5 100644
--- a/themes/dark/img/dark/shaarli.png
+++ b/themes/dark/img/dark/shaarli.png
Binary files differ
diff --git a/themes/dark/img/dark/star-off.png b/themes/dark/img/dark/star-off.png
index 6a0133a7..8194bc2d 100644
--- a/themes/dark/img/dark/star-off.png
+++ b/themes/dark/img/dark/star-off.png
Binary files differ
diff --git a/themes/dark/img/dark/star-on.png b/themes/dark/img/dark/star-on.png
index a9f96eaa..109c3aec 100644
--- a/themes/dark/img/dark/star-on.png
+++ b/themes/dark/img/dark/star-on.png
Binary files differ
diff --git a/themes/dark/img/dark/top.png b/themes/dark/img/dark/top.png
index 954a8c0a..d137bd24 100644
--- a/themes/dark/img/dark/top.png
+++ b/themes/dark/img/dark/top.png
Binary files differ
diff --git a/themes/dark/img/dark/twitter.png b/themes/dark/img/dark/twitter.png
index cfcfe419..6ce8a4d9 100644
--- a/themes/dark/img/dark/twitter.png
+++ b/themes/dark/img/dark/twitter.png
Binary files differ
diff --git a/themes/default/_head.twig b/themes/default/_head.twig
index d0cbd320..577cc693 100644
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -8,3 +8,4 @@
8 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/messages.css" media="all"> 8 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/messages.css" media="all">
9 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/print.css" media="print"> 9 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/print.css" media="print">
10 <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/jquery-2.0.3.min.js"></script> 10 <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/jquery-2.0.3.min.js"></script>
11 <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/autoClose.js"></script> \ No newline at end of file
diff --git a/themes/default/config.twig b/themes/default/config.twig
index 72671702..21345827 100644
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -8,9 +8,10 @@
8 <h2>{% trans "Poching a link" %}</h2> 8 <h2>{% trans "Poching a link" %}</h2>
9 <p>{% trans "You can poche a link by several methods:" %} (<a href="http://inthepoche.com/doc" title="{% trans "read the documentation" %}">?</a>)</p> 9 <p>{% trans "You can poche a link by several methods:" %} (<a href="http://inthepoche.com/doc" title="{% trans "read the documentation" %}">?</a>)</p>
10 <ul> 10 <ul>
11 <li>firefox: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.xpi" title="download the firefox extension">{% trans "download the extension" %}</a></li> 11 <li>firefox: <a href="https://addons.mozilla.org/fr/firefox/addon/poche/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
12 <li>chrome: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.crx" title="download the chrome extension">{% trans "download the extension" %}</a></li> 12 <li>chrome: <a href="http://doc.inthepoche.com/doku.php?id=users:chrome_extension" title="download the chrome extension">{% trans "download the extension" %}</a></li>
13 <li>android: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/Poche.apk" title="download the application">{% trans "download the application" %}</a></li> 13 <li>android: <a href="https://f-droid.org/repository/browse/?fdid=fr.gaulupeau.apps.Poche" title="download the application">{% trans "via f-droid" %}</a>{% trans "or" %}<a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.Poche" title="download the application">{% trans "via google play" %}</a></li>
14 <li>windows phone: <a href="http://www.windowsphone.com/en-us/store/app/poche/334de2f0-51b5-4826-8549-a3d805a37e83" title="download the window phone application">{% trans "download the application" %}</a></li>
14 <li> 15 <li>
15 <form method="get" action="index.php"> 16 <form method="get" action="index.php">
16 <label class="addurl" for="plainurl">{% trans "by filling this field" %}:</label> 17 <label class="addurl" for="plainurl">{% trans "by filling this field" %}:</label>
diff --git a/themes/default/css/print.css b/themes/default/css/print.css
index 9aefa779..99c00bdf 100644
--- a/themes/default/css/print.css
+++ b/themes/default/css/print.css
@@ -24,7 +24,8 @@ body > footer,
24div.tools, 24div.tools,
25header div, 25header div,
26.messages, 26.messages,
27.entrie + .results { 27.entrie + .results,
28#article_toolbar {
28 display: none !important; 29 display: none !important;
29} 30}
30 31
diff --git a/themes/default/js/autoClose.js b/themes/default/js/autoClose.js
new file mode 100644
index 00000000..e9145b7e
--- /dev/null
+++ b/themes/default/js/autoClose.js
@@ -0,0 +1,6 @@
1$(document).ready(function() {
2 current_url = window.location.href
3 if (current_url.match("&closewin=true")) {
4 window.close();
5 }
6});