aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--application/Languages.php16
-rw-r--r--application/NetscapeBookmarkUtils.php1
-rw-r--r--composer.lock104
-rw-r--r--inc/languages/fr/LC_MESSAGES/shaarli.po411
-rw-r--r--index.php13
-rw-r--r--tests/LanguagesTest.php6
-rw-r--r--tests/languages/fr/LanguagesFrTest.php6
-rw-r--r--tpl/default/changetag.html2
-rw-r--r--tpl/default/configure.html24
-rw-r--r--tpl/default/install.html21
10 files changed, 382 insertions, 222 deletions
diff --git a/application/Languages.php b/application/Languages.php
index 4ba32f29..357c7524 100644
--- a/application/Languages.php
+++ b/application/Languages.php
@@ -62,7 +62,7 @@ class Languages
62 /** 62 /**
63 * Languages constructor. 63 * Languages constructor.
64 * 64 *
65 * @param string $language lang determined by autoLocale(), can be override. 65 * @param string $language lang determined by autoLocale(), can be overridden.
66 * @param ConfigManager $conf instance. 66 * @param ConfigManager $conf instance.
67 */ 67 */
68 public function __construct($language, $conf) 68 public function __construct($language, $conf)
@@ -147,4 +147,18 @@ class Languages
147 { 147 {
148 return preg_match('/^[a-z]{2}(_[A-Z]{2})?/', $language) === 1; 148 return preg_match('/^[a-z]{2}(_[A-Z]{2})?/', $language) === 1;
149 } 149 }
150
151 /**
152 * Get the list of available languages for Shaarli.
153 *
154 * @return array List of available languages, with their label.
155 */
156 public static function getAvailableLanguages()
157 {
158 return [
159 'auto' => t('Automatic'),
160 'en' => t('English'),
161 'fr' => t('French'),
162 ];
163 }
150} 164}
diff --git a/application/NetscapeBookmarkUtils.php b/application/NetscapeBookmarkUtils.php
index 31a14537..dd7057f8 100644
--- a/application/NetscapeBookmarkUtils.php
+++ b/application/NetscapeBookmarkUtils.php
@@ -36,7 +36,6 @@ class NetscapeBookmarkUtils
36 } 36 }
37 37
38 $bookmarkLinks = array(); 38 $bookmarkLinks = array();
397
40 foreach ($linkDb as $link) { 39 foreach ($linkDb as $link) {
41 if ($link['private'] != 0 && $selection == 'public') { 40 if ($link['private'] != 0 && $selection == 'public') {
42 continue; 41 continue;
diff --git a/composer.lock b/composer.lock
index ea20025d..39909b8f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -494,12 +494,12 @@
494 "source": { 494 "source": {
495 "type": "git", 495 "type": "git",
496 "url": "https://github.com/pubsubhubbub/php-publisher.git", 496 "url": "https://github.com/pubsubhubbub/php-publisher.git",
497 "reference": "a5d6a0e1cc9d49101c3904480e5b06cbb8addba7" 497 "reference": "0d224daebd504ab61c22fee4db58f8d1fc18945f"
498 }, 498 },
499 "dist": { 499 "dist": {
500 "type": "zip", 500 "type": "zip",
501 "url": "https://api.github.com/repos/pubsubhubbub/php-publisher/zipball/a5d6a0e1cc9d49101c3904480e5b06cbb8addba7", 501 "url": "https://api.github.com/repos/pubsubhubbub/php-publisher/zipball/0d224daebd504ab61c22fee4db58f8d1fc18945f",
502 "reference": "a5d6a0e1cc9d49101c3904480e5b06cbb8addba7", 502 "reference": "0d224daebd504ab61c22fee4db58f8d1fc18945f",
503 "shasum": "" 503 "shasum": ""
504 }, 504 },
505 "require": { 505 "require": {
@@ -529,7 +529,7 @@
529 "publishers", 529 "publishers",
530 "pubsubhubbub" 530 "pubsubhubbub"
531 ], 531 ],
532 "time": "2016-11-15T06:24:01+00:00" 532 "time": "2017-10-08T10:59:41+00:00"
533 }, 533 },
534 { 534 {
535 "name": "shaarli/netscape-bookmark-parser", 535 "name": "shaarli/netscape-bookmark-parser",
@@ -755,16 +755,16 @@
755 }, 755 },
756 { 756 {
757 "name": "phpdocumentor/reflection-common", 757 "name": "phpdocumentor/reflection-common",
758 "version": "1.0", 758 "version": "1.0.1",
759 "source": { 759 "source": {
760 "type": "git", 760 "type": "git",
761 "url": "https://github.com/phpDocumentor/ReflectionCommon.git", 761 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
762 "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" 762 "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
763 }, 763 },
764 "dist": { 764 "dist": {
765 "type": "zip", 765 "type": "zip",
766 "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", 766 "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
767 "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", 767 "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
768 "shasum": "" 768 "shasum": ""
769 }, 769 },
770 "require": { 770 "require": {
@@ -805,7 +805,7 @@
805 "reflection", 805 "reflection",
806 "static analysis" 806 "static analysis"
807 ], 807 ],
808 "time": "2015-12-27T11:43:31+00:00" 808 "time": "2017-09-11T18:02:19+00:00"
809 }, 809 },
810 { 810 {
811 "name": "phpdocumentor/reflection-docblock", 811 "name": "phpdocumentor/reflection-docblock",
@@ -967,22 +967,22 @@
967 }, 967 },
968 { 968 {
969 "name": "phpspec/prophecy", 969 "name": "phpspec/prophecy",
970 "version": "v1.7.0", 970 "version": "v1.7.2",
971 "source": { 971 "source": {
972 "type": "git", 972 "type": "git",
973 "url": "https://github.com/phpspec/prophecy.git", 973 "url": "https://github.com/phpspec/prophecy.git",
974 "reference": "93d39f1f7f9326d746203c7c056f300f7f126073" 974 "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6"
975 }, 975 },
976 "dist": { 976 "dist": {
977 "type": "zip", 977 "type": "zip",
978 "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073", 978 "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
979 "reference": "93d39f1f7f9326d746203c7c056f300f7f126073", 979 "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
980 "shasum": "" 980 "shasum": ""
981 }, 981 },
982 "require": { 982 "require": {
983 "doctrine/instantiator": "^1.0.2", 983 "doctrine/instantiator": "^1.0.2",
984 "php": "^5.3|^7.0", 984 "php": "^5.3|^7.0",
985 "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", 985 "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
986 "sebastian/comparator": "^1.1|^2.0", 986 "sebastian/comparator": "^1.1|^2.0",
987 "sebastian/recursion-context": "^1.0|^2.0|^3.0" 987 "sebastian/recursion-context": "^1.0|^2.0|^3.0"
988 }, 988 },
@@ -993,7 +993,7 @@
993 "type": "library", 993 "type": "library",
994 "extra": { 994 "extra": {
995 "branch-alias": { 995 "branch-alias": {
996 "dev-master": "1.6.x-dev" 996 "dev-master": "1.7.x-dev"
997 } 997 }
998 }, 998 },
999 "autoload": { 999 "autoload": {
@@ -1026,7 +1026,7 @@
1026 "spy", 1026 "spy",
1027 "stub" 1027 "stub"
1028 ], 1028 ],
1029 "time": "2017-03-02T20:05:34+00:00" 1029 "time": "2017-09-04T11:05:03+00:00"
1030 }, 1030 },
1031 { 1031 {
1032 "name": "phpunit/php-code-coverage", 1032 "name": "phpunit/php-code-coverage",
@@ -1998,16 +1998,16 @@
1998 }, 1998 },
1999 { 1999 {
2000 "name": "symfony/config", 2000 "name": "symfony/config",
2001 "version": "v3.3.8", 2001 "version": "v3.3.10",
2002 "source": { 2002 "source": {
2003 "type": "git", 2003 "type": "git",
2004 "url": "https://github.com/symfony/config.git", 2004 "url": "https://github.com/symfony/config.git",
2005 "reference": "6ac0cc1f047c1dbc058fc25b7a4d91b068ed4488" 2005 "reference": "4ab62407bff9cd97c410a7feaef04c375aaa5cfd"
2006 }, 2006 },
2007 "dist": { 2007 "dist": {
2008 "type": "zip", 2008 "type": "zip",
2009 "url": "https://api.github.com/repos/symfony/config/zipball/6ac0cc1f047c1dbc058fc25b7a4d91b068ed4488", 2009 "url": "https://api.github.com/repos/symfony/config/zipball/4ab62407bff9cd97c410a7feaef04c375aaa5cfd",
2010 "reference": "6ac0cc1f047c1dbc058fc25b7a4d91b068ed4488", 2010 "reference": "4ab62407bff9cd97c410a7feaef04c375aaa5cfd",
2011 "shasum": "" 2011 "shasum": ""
2012 }, 2012 },
2013 "require": { 2013 "require": {
@@ -2056,20 +2056,20 @@
2056 ], 2056 ],
2057 "description": "Symfony Config Component", 2057 "description": "Symfony Config Component",
2058 "homepage": "https://symfony.com", 2058 "homepage": "https://symfony.com",
2059 "time": "2017-08-03T08:59:45+00:00" 2059 "time": "2017-10-04T18:56:58+00:00"
2060 }, 2060 },
2061 { 2061 {
2062 "name": "symfony/console", 2062 "name": "symfony/console",
2063 "version": "v2.8.27", 2063 "version": "v2.8.28",
2064 "source": { 2064 "source": {
2065 "type": "git", 2065 "type": "git",
2066 "url": "https://github.com/symfony/console.git", 2066 "url": "https://github.com/symfony/console.git",
2067 "reference": "c0807a2ca978e64d8945d373a9221a5c35d1a253" 2067 "reference": "f81549d2c5fdee8d711c9ab3c7e7362353ea5853"
2068 }, 2068 },
2069 "dist": { 2069 "dist": {
2070 "type": "zip", 2070 "type": "zip",
2071 "url": "https://api.github.com/repos/symfony/console/zipball/c0807a2ca978e64d8945d373a9221a5c35d1a253", 2071 "url": "https://api.github.com/repos/symfony/console/zipball/f81549d2c5fdee8d711c9ab3c7e7362353ea5853",
2072 "reference": "c0807a2ca978e64d8945d373a9221a5c35d1a253", 2072 "reference": "f81549d2c5fdee8d711c9ab3c7e7362353ea5853",
2073 "shasum": "" 2073 "shasum": ""
2074 }, 2074 },
2075 "require": { 2075 "require": {
@@ -2117,7 +2117,7 @@
2117 ], 2117 ],
2118 "description": "Symfony Console Component", 2118 "description": "Symfony Console Component",
2119 "homepage": "https://symfony.com", 2119 "homepage": "https://symfony.com",
2120 "time": "2017-08-27T14:29:03+00:00" 2120 "time": "2017-10-01T21:00:16+00:00"
2121 }, 2121 },
2122 { 2122 {
2123 "name": "symfony/debug", 2123 "name": "symfony/debug",
@@ -2178,16 +2178,16 @@
2178 }, 2178 },
2179 { 2179 {
2180 "name": "symfony/dependency-injection", 2180 "name": "symfony/dependency-injection",
2181 "version": "v3.3.8", 2181 "version": "v3.3.10",
2182 "source": { 2182 "source": {
2183 "type": "git", 2183 "type": "git",
2184 "url": "https://github.com/symfony/dependency-injection.git", 2184 "url": "https://github.com/symfony/dependency-injection.git",
2185 "reference": "2ac658972626c75cbde7b0067c84b988170a6907" 2185 "reference": "8ebad929aee3ca185b05f55d9cc5521670821ad1"
2186 }, 2186 },
2187 "dist": { 2187 "dist": {
2188 "type": "zip", 2188 "type": "zip",
2189 "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2ac658972626c75cbde7b0067c84b988170a6907", 2189 "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/8ebad929aee3ca185b05f55d9cc5521670821ad1",
2190 "reference": "2ac658972626c75cbde7b0067c84b988170a6907", 2190 "reference": "8ebad929aee3ca185b05f55d9cc5521670821ad1",
2191 "shasum": "" 2191 "shasum": ""
2192 }, 2192 },
2193 "require": { 2193 "require": {
@@ -2244,20 +2244,20 @@
2244 ], 2244 ],
2245 "description": "Symfony DependencyInjection Component", 2245 "description": "Symfony DependencyInjection Component",
2246 "homepage": "https://symfony.com", 2246 "homepage": "https://symfony.com",
2247 "time": "2017-08-28T22:20:37+00:00" 2247 "time": "2017-10-04T17:15:30+00:00"
2248 }, 2248 },
2249 { 2249 {
2250 "name": "symfony/filesystem", 2250 "name": "symfony/filesystem",
2251 "version": "v3.3.8", 2251 "version": "v3.3.10",
2252 "source": { 2252 "source": {
2253 "type": "git", 2253 "type": "git",
2254 "url": "https://github.com/symfony/filesystem.git", 2254 "url": "https://github.com/symfony/filesystem.git",
2255 "reference": "b32a0e5f928d0fa3d1dd03c78d020777e50c10cb" 2255 "reference": "90bc45abf02ae6b7deb43895c1052cb0038506f1"
2256 }, 2256 },
2257 "dist": { 2257 "dist": {
2258 "type": "zip", 2258 "type": "zip",
2259 "url": "https://api.github.com/repos/symfony/filesystem/zipball/b32a0e5f928d0fa3d1dd03c78d020777e50c10cb", 2259 "url": "https://api.github.com/repos/symfony/filesystem/zipball/90bc45abf02ae6b7deb43895c1052cb0038506f1",
2260 "reference": "b32a0e5f928d0fa3d1dd03c78d020777e50c10cb", 2260 "reference": "90bc45abf02ae6b7deb43895c1052cb0038506f1",
2261 "shasum": "" 2261 "shasum": ""
2262 }, 2262 },
2263 "require": { 2263 "require": {
@@ -2293,20 +2293,20 @@
2293 ], 2293 ],
2294 "description": "Symfony Filesystem Component", 2294 "description": "Symfony Filesystem Component",
2295 "homepage": "https://symfony.com", 2295 "homepage": "https://symfony.com",
2296 "time": "2017-07-29T21:54:42+00:00" 2296 "time": "2017-10-03T13:33:10+00:00"
2297 }, 2297 },
2298 { 2298 {
2299 "name": "symfony/finder", 2299 "name": "symfony/finder",
2300 "version": "v3.3.8", 2300 "version": "v3.3.10",
2301 "source": { 2301 "source": {
2302 "type": "git", 2302 "type": "git",
2303 "url": "https://github.com/symfony/finder.git", 2303 "url": "https://github.com/symfony/finder.git",
2304 "reference": "b2260dbc80f3c4198f903215f91a1ac7fe9fe09e" 2304 "reference": "773e19a491d97926f236942484cb541560ce862d"
2305 }, 2305 },
2306 "dist": { 2306 "dist": {
2307 "type": "zip", 2307 "type": "zip",
2308 "url": "https://api.github.com/repos/symfony/finder/zipball/b2260dbc80f3c4198f903215f91a1ac7fe9fe09e", 2308 "url": "https://api.github.com/repos/symfony/finder/zipball/773e19a491d97926f236942484cb541560ce862d",
2309 "reference": "b2260dbc80f3c4198f903215f91a1ac7fe9fe09e", 2309 "reference": "773e19a491d97926f236942484cb541560ce862d",
2310 "shasum": "" 2310 "shasum": ""
2311 }, 2311 },
2312 "require": { 2312 "require": {
@@ -2342,20 +2342,20 @@
2342 ], 2342 ],
2343 "description": "Symfony Finder Component", 2343 "description": "Symfony Finder Component",
2344 "homepage": "https://symfony.com", 2344 "homepage": "https://symfony.com",
2345 "time": "2017-07-29T21:54:42+00:00" 2345 "time": "2017-10-02T06:42:24+00:00"
2346 }, 2346 },
2347 { 2347 {
2348 "name": "symfony/polyfill-mbstring", 2348 "name": "symfony/polyfill-mbstring",
2349 "version": "v1.5.0", 2349 "version": "v1.6.0",
2350 "source": { 2350 "source": {
2351 "type": "git", 2351 "type": "git",
2352 "url": "https://github.com/symfony/polyfill-mbstring.git", 2352 "url": "https://github.com/symfony/polyfill-mbstring.git",
2353 "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803" 2353 "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296"
2354 }, 2354 },
2355 "dist": { 2355 "dist": {
2356 "type": "zip", 2356 "type": "zip",
2357 "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803", 2357 "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296",
2358 "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803", 2358 "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296",
2359 "shasum": "" 2359 "shasum": ""
2360 }, 2360 },
2361 "require": { 2361 "require": {
@@ -2367,7 +2367,7 @@
2367 "type": "library", 2367 "type": "library",
2368 "extra": { 2368 "extra": {
2369 "branch-alias": { 2369 "branch-alias": {
2370 "dev-master": "1.5-dev" 2370 "dev-master": "1.6-dev"
2371 } 2371 }
2372 }, 2372 },
2373 "autoload": { 2373 "autoload": {
@@ -2401,20 +2401,20 @@
2401 "portable", 2401 "portable",
2402 "shim" 2402 "shim"
2403 ], 2403 ],
2404 "time": "2017-06-14T15:44:48+00:00" 2404 "time": "2017-10-11T12:05:26+00:00"
2405 }, 2405 },
2406 { 2406 {
2407 "name": "symfony/yaml", 2407 "name": "symfony/yaml",
2408 "version": "v3.3.8", 2408 "version": "v3.3.10",
2409 "source": { 2409 "source": {
2410 "type": "git", 2410 "type": "git",
2411 "url": "https://github.com/symfony/yaml.git", 2411 "url": "https://github.com/symfony/yaml.git",
2412 "reference": "1d8c2a99c80862bdc3af94c1781bf70f86bccac0" 2412 "reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46"
2413 }, 2413 },
2414 "dist": { 2414 "dist": {
2415 "type": "zip", 2415 "type": "zip",
2416 "url": "https://api.github.com/repos/symfony/yaml/zipball/1d8c2a99c80862bdc3af94c1781bf70f86bccac0", 2416 "url": "https://api.github.com/repos/symfony/yaml/zipball/8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46",
2417 "reference": "1d8c2a99c80862bdc3af94c1781bf70f86bccac0", 2417 "reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46",
2418 "shasum": "" 2418 "shasum": ""
2419 }, 2419 },
2420 "require": { 2420 "require": {
@@ -2456,7 +2456,7 @@
2456 ], 2456 ],
2457 "description": "Symfony Yaml Component", 2457 "description": "Symfony Yaml Component",
2458 "homepage": "https://symfony.com", 2458 "homepage": "https://symfony.com",
2459 "time": "2017-07-29T21:54:42+00:00" 2459 "time": "2017-10-05T14:43:42+00:00"
2460 }, 2460 },
2461 { 2461 {
2462 "name": "theseer/fdomdocument", 2462 "name": "theseer/fdomdocument",
diff --git a/inc/languages/fr/LC_MESSAGES/shaarli.po b/inc/languages/fr/LC_MESSAGES/shaarli.po
index 46b457e4..cb9161db 100644
--- a/inc/languages/fr/LC_MESSAGES/shaarli.po
+++ b/inc/languages/fr/LC_MESSAGES/shaarli.po
@@ -1,34 +1,45 @@
1msgid "" 1msgid ""
2msgstr "" 2msgstr ""
3"Project-Id-Version: Shaarli\n" 3"Project-Id-Version: Shaarli\n"
4"POT-Creation-Date: 2017-05-20 15:36+0200\n" 4"POT-Creation-Date: 2017-09-01 19:21+0200\n"
5"PO-Revision-Date: 2017-05-20 15:40+0200\n" 5"PO-Revision-Date: 2017-09-01 19:21+0200\n"
6"Last-Translator: \n" 6"Last-Translator: \n"
7"Language-Team: Shaarli\n" 7"Language-Team: Shaarli\n"
8"Language: fr_FR\n" 8"Language: fr_FR\n"
9"MIME-Version: 1.0\n" 9"MIME-Version: 1.0\n"
10"Content-Type: text/plain; charset=UTF-8\n" 10"Content-Type: text/plain; charset=UTF-8\n"
11"Content-Transfer-Encoding: 8bit\n" 11"Content-Transfer-Encoding: 8bit\n"
12"X-Generator: Poedit 2.0.1\n" 12"X-Generator: Poedit 2.0.3\n"
13"X-Poedit-Basepath: ../../../..\n" 13"X-Poedit-Basepath: ../../../..\n"
14"Plural-Forms: nplurals=2; plural=(n > 1);\n" 14"Plural-Forms: nplurals=2; plural=(n > 1);\n"
15"X-Poedit-SourceCharset: UTF-8\n" 15"X-Poedit-SourceCharset: UTF-8\n"
16"X-Poedit-KeywordsList: t:1,2;t\n" 16"X-Poedit-KeywordsList: t:1,2;t\n"
17"X-Poedit-SearchPath-0: .\n" 17"X-Poedit-SearchPath-0: .\n"
18 18
19#: application/ApplicationUtils.php:180 application/ApplicationUtils.php:192 19#: application/ApplicationUtils.php:153
20#, php-format
21msgid ""
22"Your PHP version is obsolete! Shaarli requires at least PHP %s, and thus "
23"cannot run. Your PHP version has known security vulnerabilities and should "
24"be updated as soon as possible."
25msgstr ""
26"Votre version de PHP est obsolète ! Shaarli nécessite au moins PHP %s, et ne "
27"peut donc pas fonctionner. Votre version de PHP a des failles de sécurités "
28"connues et devrait être mise à jour au plus tôt."
29
30#: application/ApplicationUtils.php:182 application/ApplicationUtils.php:194
20msgid "directory is not readable" 31msgid "directory is not readable"
21msgstr "le répertoire n'est pas accessible en lecture" 32msgstr "le répertoire n'est pas accessible en lecture"
22 33
23#: application/ApplicationUtils.php:195 34#: application/ApplicationUtils.php:197
24msgid "directory is not writable" 35msgid "directory is not writable"
25msgstr "le répertoire n'est pas accessible en écriture" 36msgstr "le répertoire n'est pas accessible en écriture"
26 37
27#: application/ApplicationUtils.php:213 38#: application/ApplicationUtils.php:215
28msgid "file is not readable" 39msgid "file is not readable"
29msgstr "le fichier n'est pas accessible en lecture" 40msgstr "le fichier n'est pas accessible en lecture"
30 41
31#: application/ApplicationUtils.php:216 42#: application/ApplicationUtils.php:218
32msgid "file is not writable" 43msgid "file is not writable"
33msgstr "le fichier n'est pas accessible en écriture" 44msgstr "le fichier n'est pas accessible en écriture"
34 45
@@ -37,14 +48,13 @@ msgstr "le fichier n'est pas accessible en écriture"
37msgid "Cannot purge %s: no directory" 48msgid "Cannot purge %s: no directory"
38msgstr "Impossible de purger %s: le répertoire n'existe pas" 49msgstr "Impossible de purger %s: le répertoire n'existe pas"
39 50
40#: application/FeedBuilder.php:146 51#: application/FeedBuilder.php:151
41msgid "Direct link" 52msgid "Direct link"
42msgstr "Liens directs" 53msgstr "Liens directs"
43 54
44#: application/FeedBuilder.php:148 55#: application/FeedBuilder.php:153
45#: tmp/daily.b91ef64efc3688266305ea9b42e5017e.rtpl.php:88 56#: tmp/daily.b91ef64efc3688266305ea9b42e5017e.rtpl.php:88
46#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:177 57#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:178
47#: tmp/paper.b91ef64efc3688266305ea9b42e5017e.rtpl.php:88
48msgid "Permalink" 58msgid "Permalink"
49msgstr "Permalien" 59msgstr "Permalien"
50 60
@@ -56,6 +66,18 @@ msgstr "Le fichier d'historique n'est pas accessible en lecture ou en écriture"
56msgid "Could not parse history file" 66msgid "Could not parse history file"
57msgstr "Format incorrect pour le fichier d'historique" 67msgstr "Format incorrect pour le fichier d'historique"
58 68
69#: application/Languages.php:159
70msgid "Automatic"
71msgstr "Automatique"
72
73#: application/Languages.php:160
74msgid "English"
75msgstr "Anglais"
76
77#: application/Languages.php:161
78msgid "French"
79msgstr "Français"
80
59#: application/LinkDB.php:136 81#: application/LinkDB.php:136
60msgid "You are not authorized to add a link." 82msgid "You are not authorized to add a link."
61msgstr "Vous n'êtes pas autorisé à ajouter un lien." 83msgstr "Vous n'êtes pas autorisé à ajouter un lien."
@@ -73,8 +95,10 @@ msgid "Array offset and link ID must be equal."
73msgstr "La clé du tableau et l'ID du lien doivent être égaux." 95msgstr "La clé du tableau et l'ID du lien doivent être égaux."
74 96
75#: application/LinkDB.php:251 97#: application/LinkDB.php:251
98#: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:14
99#: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:48
76#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:14 100#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:14
77#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:45 101#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:48
78msgid "" 102msgid ""
79"The personal, minimalist, super-fast, database free, bookmarking service" 103"The personal, minimalist, super-fast, database free, bookmarking service"
80msgstr "" 104msgstr ""
@@ -111,7 +135,7 @@ msgstr ""
111"Pssst ! Je suis un lien privé que VOUS êtes le seul à voir. Vous pouvez me " 135"Pssst ! Je suis un lien privé que VOUS êtes le seul à voir. Vous pouvez me "
112"supprimer aussi." 136"supprimer aussi."
113 137
114#: application/LinkFilter.php:376 138#: application/LinkFilter.php:415
115msgid "The link you are trying to reach does not exist or has been deleted." 139msgid "The link you are trying to reach does not exist or has been deleted."
116msgstr "Le lien que vous essayez de consulter n'existe pas ou a été supprimé." 140msgstr "Le lien que vous essayez de consulter n'existe pas ou a été supprimé."
117 141
@@ -137,11 +161,11 @@ msgstr ""
137"a été importé avec succès : %d liens importés, %d liens écrasés, %d liens " 161"a été importé avec succès : %d liens importés, %d liens écrasés, %d liens "
138"ignorés." 162"ignorés."
139 163
140#: application/PageBuilder.php:159 164#: application/PageBuilder.php:160
141msgid "The page you are trying to reach does not exist or has been deleted." 165msgid "The page you are trying to reach does not exist or has been deleted."
142msgstr "La page que vous essayez de consulter n'existe pas ou a été supprimée." 166msgstr "La page que vous essayez de consulter n'existe pas ou a été supprimée."
143 167
144#: application/PageBuilder.php:161 168#: application/PageBuilder.php:162
145msgid "404 Not Found" 169msgid "404 Not Found"
146msgstr "404 Introuvable" 170msgstr "404 Introuvable"
147 171
@@ -154,44 +178,44 @@ msgstr "Les fichiers de l'extension \"%s\" sont introuvables."
154msgid "Couldn't retrieve Updater class methods." 178msgid "Couldn't retrieve Updater class methods."
155msgstr "Impossible de récupérer les méthodes de la classe Updater." 179msgstr "Impossible de récupérer les méthodes de la classe Updater."
156 180
157#: application/Updater.php:500 181#: application/Updater.php:485
158msgid "An error occurred while running the update " 182msgid "An error occurred while running the update "
159msgstr "Une erreur s'est produite lors de l'exécution de la mise à jour " 183msgstr "Une erreur s'est produite lors de l'exécution de la mise à jour "
160 184
161#: application/Updater.php:540 185#: application/Updater.php:525
162msgid "Updates file path is not set, can't write updates." 186msgid "Updates file path is not set, can't write updates."
163msgstr "" 187msgstr ""
164"Le chemin vers le fichier de mise à jour n'est pas défini, impossible " 188"Le chemin vers le fichier de mise à jour n'est pas défini, impossible "
165"d'écrire les mises à jour." 189"d'écrire les mises à jour."
166 190
167#: application/Updater.php:545 191#: application/Updater.php:530
168msgid "Unable to write updates in " 192msgid "Unable to write updates in "
169msgstr "Impossible d'écrire les mises à jour dans " 193msgstr "Impossible d'écrire les mises à jour dans "
170 194
171#: application/Utils.php:402 tests/UtilsTest.php:398 195#: application/Utils.php:406 tests/UtilsTest.php:398
172msgid "Setting not set" 196msgid "Setting not set"
173msgstr "Paramètre non défini" 197msgstr "Paramètre non défini"
174 198
175#: application/Utils.php:409 tests/UtilsTest.php:396 tests/UtilsTest.php:397 199#: application/Utils.php:413 tests/UtilsTest.php:396 tests/UtilsTest.php:397
176msgid "Unlimited" 200msgid "Unlimited"
177msgstr "Illimité" 201msgstr "Illimité"
178 202
179#: application/Utils.php:412 tests/UtilsTest.php:393 tests/UtilsTest.php:394 203#: application/Utils.php:416 tests/UtilsTest.php:393 tests/UtilsTest.php:394
180#: tests/UtilsTest.php:408 204#: tests/UtilsTest.php:408
181msgid "B" 205msgid "B"
182msgstr "o" 206msgstr "o"
183 207
184#: application/Utils.php:412 tests/UtilsTest.php:387 tests/UtilsTest.php:388 208#: application/Utils.php:416 tests/UtilsTest.php:387 tests/UtilsTest.php:388
185#: tests/UtilsTest.php:395 209#: tests/UtilsTest.php:395
186msgid "kiB" 210msgid "kiB"
187msgstr "ko" 211msgstr "ko"
188 212
189#: application/Utils.php:412 tests/UtilsTest.php:389 tests/UtilsTest.php:390 213#: application/Utils.php:416 tests/UtilsTest.php:389 tests/UtilsTest.php:390
190#: tests/UtilsTest.php:406 tests/UtilsTest.php:407 214#: tests/UtilsTest.php:406 tests/UtilsTest.php:407
191msgid "MiB" 215msgid "MiB"
192msgstr "Mo" 216msgstr "Mo"
193 217
194#: application/Utils.php:412 tests/UtilsTest.php:391 tests/UtilsTest.php:392 218#: application/Utils.php:416 tests/UtilsTest.php:391 tests/UtilsTest.php:392
195msgid "GiB" 219msgid "GiB"
196msgstr "Go" 220msgstr "Go"
197 221
@@ -205,7 +229,7 @@ msgstr ""
205 229
206#: application/config/ConfigManager.php:135 230#: application/config/ConfigManager.php:135
207msgid "Invalid setting key parameter. String expected, got: " 231msgid "Invalid setting key parameter. String expected, got: "
208msgstr "Clé de paramétrage invalide. Chaîne de caractères obtenue, attendu :" 232msgstr "Clé de paramétrage invalide. Chaîne de caractères obtenue, attendu : "
209 233
210#: application/config/exception/MissingFieldConfigException.php:21 234#: application/config/exception/MissingFieldConfigException.php:21
211#, php-format 235#, php-format
@@ -225,54 +249,58 @@ msgstr "Vous n'êtes pas autorisé à modifier la configuration."
225msgid "Error accessing" 249msgid "Error accessing"
226msgstr "Une erreur s'est produite en accédant à" 250msgstr "Une erreur s'est produite en accédant à"
227 251
228#: index.php:137 252#: index.php:134
229msgid "Shared links on " 253msgid "Shared links on "
230msgstr "Liens partagés sur " 254msgstr "Liens partagés sur "
231 255
232#: index.php:168 256#: index.php:156
233msgid "Insufficient permissions:" 257msgid "Insufficient permissions:"
234msgstr "Permissions insuffisantes :" 258msgstr "Permissions insuffisantes :"
235 259
236#: index.php:415 260#: index.php:383
237msgid "I said: NO. You are banned for the moment. Go away." 261msgid "I said: NO. You are banned for the moment. Go away."
238msgstr "NON. Vous êtes banni pour le moment. Revenez plus tard." 262msgstr "NON. Vous êtes banni pour le moment. Revenez plus tard."
239 263
240#: index.php:479 264#: index.php:448
241msgid "Wrong login/password." 265msgid "Wrong login/password."
242msgstr "Nom d'utilisateur ou mot de passe incorrects." 266msgstr "Nom d'utilisateur ou mot de passe incorrects."
243 267
244#: index.php:1072 268#: index.php:1091
245msgid "You are not supposed to change a password on an Open Shaarli." 269msgid "You are not supposed to change a password on an Open Shaarli."
246msgstr "" 270msgstr ""
247"Vous n'êtes pas censé modifier le mot de passe d'un Shaarli en mode ouvert." 271"Vous n'êtes pas censé modifier le mot de passe d'un Shaarli en mode ouvert."
248 272
249#: index.php:1077 index.php:1118 index.php:1189 index.php:1243 index.php:1350 273#: index.php:1096 index.php:1137 index.php:1213 index.php:1243 index.php:1343
250msgid "Wrong token." 274msgid "Wrong token."
251msgstr "Jeton invalide." 275msgstr "Jeton invalide."
252 276
253#: index.php:1082 277#: index.php:1101
254msgid "The old password is not correct." 278msgid "The old password is not correct."
255msgstr "L'ancien mot de passe est incorrect." 279msgstr "L'ancien mot de passe est incorrect."
256 280
257#: index.php:1102 281#: index.php:1121
258msgid "Your password has been changed" 282msgid "Your password has been changed"
259msgstr "Votre mot de passe a été modifié" 283msgstr "Votre mot de passe a été modifié"
260 284
261#: index.php:1153 285#: index.php:1174
262msgid "Configuration was saved." 286msgid "Configuration was saved."
263msgstr "La configuration a été sauvegardé." 287msgstr "La configuration a été sauvegardé."
264 288
265#: index.php:1206 289#: index.php:1225
266#, php-format 290#, php-format
267msgid "Tag was removed from %d links." 291msgid "The tag was removed from %d link."
268msgstr "Le tag a été supprimé de %d liens." 292msgid_plural "The tag was removed from %d links."
293msgstr[0] "Le tag a été supprimé de %d lien."
294msgstr[1] "Le tag a été supprimé de %d liens."
269 295
270#: index.php:1225 296#: index.php:1226
271#, php-format 297#, php-format
272msgid "Tag was renamed in %d links." 298msgid "The tag was renamed in %d link."
273msgstr "Le tag a été renommé dans %d liens." 299msgid_plural "The tag was renamed in %d links."
300msgstr[0] "Le tag a été renommé dans %d lien."
301msgstr[1] "Le tag a été renommé dans %d liens."
274 302
275#: index.php:1544 303#: index.php:1551
276#, php-format 304#, php-format
277msgid "" 305msgid ""
278"The file you are trying to upload is probably bigger than what this " 306"The file you are trying to upload is probably bigger than what this "
@@ -282,7 +310,7 @@ msgstr ""
282"le serveur web peut accepter (%s). Merci de l'envoyer en parties plus " 310"le serveur web peut accepter (%s). Merci de l'envoyer en parties plus "
283"légères." 311"légères."
284 312
285#: index.php:1941 313#: index.php:1967
286#, php-format 314#, php-format
287msgid "" 315msgid ""
288"<pre>Sessions do not seem to work correctly on your server.<br>Make sure the " 316"<pre>Sessions do not seem to work correctly on your server.<br>Make sure the "
@@ -301,7 +329,7 @@ msgstr ""
301"cookies. Nous vous recommandons d'accéder à votre serveur depuis son adresse " 329"cookies. Nous vous recommandons d'accéder à votre serveur depuis son adresse "
302"IP ou un <em>Fully Qualified Domain Name</em>.<br>" 330"IP ou un <em>Fully Qualified Domain Name</em>.<br>"
303 331
304#: index.php:1951 332#: index.php:1977
305msgid "Click to try again." 333msgid "Click to try again."
306msgstr "Cliquer ici pour réessayer." 334msgstr "Cliquer ici pour réessayer."
307 335
@@ -326,7 +354,7 @@ msgstr "Voir sur archive.org"
326msgid "For each link, add an Archive.org icon." 354msgid "For each link, add an Archive.org icon."
327msgstr "Pour chaque lien, ajoute une icône pour Archive.org." 355msgstr "Pour chaque lien, ajoute une icône pour Archive.org."
328 356
329#: plugins/demo_plugin/demo_plugin.php:443 357#: plugins/demo_plugin/demo_plugin.php:469
330msgid "" 358msgid ""
331"A demo plugin covering all use cases for template designers and plugin " 359"A demo plugin covering all use cases for template designers and plugin "
332"developers." 360"developers."
@@ -351,19 +379,19 @@ msgstr ""
351msgid "Isso server URL (without 'http://')" 379msgid "Isso server URL (without 'http://')"
352msgstr "URL du serveur Isso (sans 'http://')" 380msgstr "URL du serveur Isso (sans 'http://')"
353 381
354#: plugins/markdown/markdown.php:150 382#: plugins/markdown/markdown.php:159
355msgid "Description will be rendered with" 383msgid "Description will be rendered with"
356msgstr "La description sera générée avec" 384msgstr "La description sera générée avec"
357 385
358#: plugins/markdown/markdown.php:151 386#: plugins/markdown/markdown.php:160
359msgid "Markdown syntax documentation" 387msgid "Markdown syntax documentation"
360msgstr "Documentation sur la syntaxe Markdown" 388msgstr "Documentation sur la syntaxe Markdown"
361 389
362#: plugins/markdown/markdown.php:152 390#: plugins/markdown/markdown.php:161
363msgid "Markdown syntax" 391msgid "Markdown syntax"
364msgstr "la syntaxe Markdown" 392msgstr "la syntaxe Markdown"
365 393
366#: plugins/markdown/markdown.php:311 394#: plugins/markdown/markdown.php:340
367msgid "" 395msgid ""
368"Render shaare description with Markdown syntax.<br><strong>Warning</" 396"Render shaare description with Markdown syntax.<br><strong>Warning</"
369"strong>:\n" 397"strong>:\n"
@@ -435,7 +463,7 @@ msgstr "Mauvaise réponse du hub %s"
435 463
436#: plugins/pubsubhubbub/pubsubhubbub.php:110 464#: plugins/pubsubhubbub/pubsubhubbub.php:110
437msgid "Enable PubSubHubbub feed publishing." 465msgid "Enable PubSubHubbub feed publishing."
438msgstr "Active la publication de flux vers PubSubHubbub" 466msgstr "Active la publication de flux vers PubSubHubbub."
439 467
440#: plugins/qrcode/qrcode.php:69 plugins/wallabag/wallabag.php:68 468#: plugins/qrcode/qrcode.php:69 plugins/wallabag/wallabag.php:68
441msgid "For each link, add a QRCode icon." 469msgid "For each link, add a QRCode icon."
@@ -455,29 +483,26 @@ msgstr "Sauvegarder dans Wallabag"
455 483
456#: plugins/wallabag/wallabag.php:69 484#: plugins/wallabag/wallabag.php:69
457msgid "Wallabag API URL" 485msgid "Wallabag API URL"
458msgstr "URL de l'API Wallabag " 486msgstr "URL de l'API Wallabag"
459 487
460#: plugins/wallabag/wallabag.php:70 488#: plugins/wallabag/wallabag.php:70
461msgid "Wallabag API version (1 or 2)" 489msgid "Wallabag API version (1 or 2)"
462msgstr "Version de l'API Wallabag (1 ou 2)" 490msgstr "Version de l'API Wallabag (1 ou 2)"
463 491
464#: tests/LanguagesTest.php:186 tests/LanguagesTest.php:198 492#: tests/LanguagesTest.php:188 tests/LanguagesTest.php:201
465#: tests/languages/fr/LanguagesFrTest.php:148
466#: tests/languages/fr/LanguagesFrTest.php:160 493#: tests/languages/fr/LanguagesFrTest.php:160
467msgid "car" 494#: tests/languages/fr/LanguagesFrTest.php:173
468msgid_plural "car" 495#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:81
469msgstr[0] ""
470msgstr[1] ""
471
472#: tests/LanguagesTest.php:187 tests/LanguagesTest.php:199
473#: tests/languages/fr/LanguagesFrTest.php:149
474#: tests/languages/fr/LanguagesFrTest.php:161
475#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:81 496#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:81
476msgid "Search" 497msgid "Search"
477msgid_plural "Search" 498msgid_plural "Search"
478msgstr[0] "Rechercher" 499msgstr[0] "Rechercher"
479msgstr[1] "Rechercher" 500msgstr[1] "Rechercher"
480 501
502#: tmp/404.b91ef64efc3688266305ea9b42e5017e.rtpl.php:12
503msgid "Sorry, nothing to see here."
504msgstr "Désolé, il y a rien à voir ici."
505
481#: tmp/addlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:13 506#: tmp/addlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:13
482msgid "Shaare a new link" 507msgid "Shaare a new link"
483msgstr "Partager un nouveau lien" 508msgstr "Partager un nouveau lien"
@@ -497,7 +522,7 @@ msgstr "Mot de passe actuel"
497 522
498#: tmp/changepassword.b91ef64efc3688266305ea9b42e5017e.rtpl.php:19 523#: tmp/changepassword.b91ef64efc3688266305ea9b42e5017e.rtpl.php:19
499msgid "New password" 524msgid "New password"
500msgstr "Nouveau mot de passe\t" 525msgstr "Nouveau mot de passe"
501 526
502#: tmp/changepassword.b91ef64efc3688266305ea9b42e5017e.rtpl.php:23 527#: tmp/changepassword.b91ef64efc3688266305ea9b42e5017e.rtpl.php:23
503msgid "Change" 528msgid "Change"
@@ -526,12 +551,19 @@ msgid "Rename"
526msgstr "Renommer" 551msgstr "Renommer"
527 552
528#: tmp/changetag.b91ef64efc3688266305ea9b42e5017e.rtpl.php:35 553#: tmp/changetag.b91ef64efc3688266305ea9b42e5017e.rtpl.php:35
529#: tmp/editlink.90100d2eaf5d3705e14b9b4f78ecddc9.rtpl.php:60 554#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:79
530#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:71 555#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:172
531#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:171
532msgid "Delete" 556msgid "Delete"
533msgstr "Supprimer" 557msgstr "Supprimer"
534 558
559#: tmp/changetag.b91ef64efc3688266305ea9b42e5017e.rtpl.php:39
560msgid "You can also edit tags in the"
561msgstr "Vous pouvez aussi modifier les tags dans la"
562
563#: tmp/changetag.b91ef64efc3688266305ea9b42e5017e.rtpl.php:39
564msgid "tag list"
565msgstr "liste des tags"
566
535#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:24 567#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:24
536msgid "Configure" 568msgid "Configure"
537msgstr "Configurer" 569msgstr "Configurer"
@@ -553,138 +585,150 @@ msgid "Theme"
553msgstr "Thème" 585msgstr "Thème"
554 586
555#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:87 587#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:87
556#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:63 588#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:78
589msgid "Language"
590msgstr "Langue"
591
592#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:116
593#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:102
557msgid "Timezone" 594msgid "Timezone"
558msgstr "Fuseau horaire" 595msgstr "Fuseau horaire"
559 596
560#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:88 597#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:117
598#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:103
561msgid "Continent" 599msgid "Continent"
562msgstr "Continent" 600msgstr "Continent"
563 601
564#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:88 602#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:117
603#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:103
565msgid "City" 604msgid "City"
566msgstr "Ville" 605msgstr "Ville"
567 606
568#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:134 607#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:163
569msgid "Redirector" 608msgid "Redirector"
570msgstr "Redirecteur" 609msgstr "Redirecteur"
571 610
572#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:135 611#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:164
573msgid "e. g." 612msgid "e. g."
574msgstr "ex :" 613msgstr "ex :"
575 614
576#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:135 615#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:164
577msgid "will mask the HTTP_REFERER" 616msgid "will mask the HTTP_REFERER"
578msgstr "masque le HTTP_REFERER" 617msgstr "masque le HTTP_REFERER"
579 618
580#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:150 619#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:179
581msgid "Disable session cookie hijacking protection" 620msgid "Disable session cookie hijacking protection"
582msgstr "Désactiver la protection contre le détournement de cookies" 621msgstr "Désactiver la protection contre le détournement de cookies"
583 622
584#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:152 623#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:181
585msgid "Check this if you get disconnected or if your IP address changes often" 624msgid "Check this if you get disconnected or if your IP address changes often"
586msgstr "" 625msgstr ""
587"Cocher cette case si vous êtes souvent déconnecté ou si votre adresse IP " 626"Cocher cette case si vous êtes souvent déconnecté ou si votre adresse IP "
588"change souvent" 627"change souvent"
589 628
590#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:169 629#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:198
591msgid "Private links by default" 630msgid "Private links by default"
592msgstr "Liens privés par défaut" 631msgstr "Liens privés par défaut"
593 632
594#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:170 633#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:199
595msgid "All new links are private by default" 634msgid "All new links are private by default"
596msgstr "Tous les nouveaux liens sont privés par défaut" 635msgstr "Tous les nouveaux liens sont privés par défaut"
597 636
598#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:185 637#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:214
599msgid "RSS direct links" 638msgid "RSS direct links"
600msgstr "Liens directs dans le flux RSS" 639msgstr "Liens directs dans le flux RSS"
601 640
602#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:186 641#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:215
603msgid "Check this to use direct URL instead of permalink in feeds" 642msgid "Check this to use direct URL instead of permalink in feeds"
604msgstr "" 643msgstr ""
605"Cocher cette case pour utiliser des liens directs au lieu des permaliens " 644"Cocher cette case pour utiliser des liens directs au lieu des permaliens "
606"dans le flux RSS" 645"dans le flux RSS"
607 646
608#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:201 647#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:230
609msgid "Hide public links" 648msgid "Hide public links"
610msgstr "Cacher les liens publics" 649msgstr "Cacher les liens publics"
611 650
612#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:202 651#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:231
613msgid "Do not show any links if the user is not logged in" 652msgid "Do not show any links if the user is not logged in"
614msgstr "N'afficher aucun lien sans être connecté" 653msgstr "N'afficher aucun lien sans être connecté"
615 654
616#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:217 655#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:246
617#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:95 656#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:150
618msgid "Check updates" 657msgid "Check updates"
619msgstr "Vérifier les mises à jour" 658msgstr "Vérifier les mises à jour"
620 659
621#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:218 660#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:247
622#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:97 661#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:152
623msgid "Notify me when a new release is ready" 662msgid "Notify me when a new release is ready"
624msgstr "Me notifier lorsqu'une nouvelle version est disponible" 663msgstr "Me notifier lorsqu'une nouvelle version est disponible"
625 664
626#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:233 665#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:262
627#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:114 666#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:169
628msgid "Enable REST API" 667msgid "Enable REST API"
629msgstr "Activer l'API REST" 668msgstr "Activer l'API REST"
630 669
631#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:234 670#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:263
632#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:115 671#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:170
633msgid "Allow third party software to use Shaarli such as mobile application" 672msgid "Allow third party software to use Shaarli such as mobile application"
634msgstr "" 673msgstr ""
635"Permets aux applications tierces d'utiliser Shaarli, par exemple les " 674"Permets aux applications tierces d'utiliser Shaarli, par exemple les "
636"applications mobiles" 675"applications mobiles"
637 676
638#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:249 677#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:278
639msgid "API secret" 678msgid "API secret"
640msgstr "Clé d'API secrète" 679msgstr "Clé d'API secrète"
641 680
642#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:260 681#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:289
643#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:66 682#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:74
644#: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:139 683#: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:139
645#: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:192 684#: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:192
646msgid "Save" 685msgid "Save"
647msgstr "Enregistrer" 686msgstr "Enregistrer"
648 687
649#: tmp/daily.b91ef64efc3688266305ea9b42e5017e.rtpl.php:15 688#: tmp/daily.b91ef64efc3688266305ea9b42e5017e.rtpl.php:15
650#: tmp/paper.b91ef64efc3688266305ea9b42e5017e.rtpl.php:15
651msgid "The Daily Shaarli" 689msgid "The Daily Shaarli"
652msgstr "Le Quotidien Shaarli" 690msgstr "Le Quotidien Shaarli"
653 691
654#: tmp/daily.b91ef64efc3688266305ea9b42e5017e.rtpl.php:17 692#: tmp/daily.b91ef64efc3688266305ea9b42e5017e.rtpl.php:17
655#: tmp/paper.b91ef64efc3688266305ea9b42e5017e.rtpl.php:17
656msgid "1 RSS entry per day" 693msgid "1 RSS entry per day"
657msgstr "1 entrée RSS par jour" 694msgstr "1 entrée RSS par jour"
658 695
659#: tmp/daily.b91ef64efc3688266305ea9b42e5017e.rtpl.php:37 696#: tmp/daily.b91ef64efc3688266305ea9b42e5017e.rtpl.php:37
660#: tmp/paper.b91ef64efc3688266305ea9b42e5017e.rtpl.php:37
661msgid "Previous day" 697msgid "Previous day"
662msgstr "Jour précédent" 698msgstr "Jour précédent"
663 699
664#: tmp/daily.b91ef64efc3688266305ea9b42e5017e.rtpl.php:44 700#: tmp/daily.b91ef64efc3688266305ea9b42e5017e.rtpl.php:44
665#: tmp/paper.b91ef64efc3688266305ea9b42e5017e.rtpl.php:44
666msgid "All links of one day in a single page." 701msgid "All links of one day in a single page."
667msgstr "Tous les liens d'un jour sur une page." 702msgstr "Tous les liens d'un jour sur une page."
668 703
669#: tmp/daily.b91ef64efc3688266305ea9b42e5017e.rtpl.php:51 704#: tmp/daily.b91ef64efc3688266305ea9b42e5017e.rtpl.php:51
670#: tmp/paper.b91ef64efc3688266305ea9b42e5017e.rtpl.php:51
671msgid "Next day" 705msgid "Next day"
672msgstr "Jour suivant" 706msgstr "Jour suivant"
673 707
674#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:13 708#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:14
709#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:170
710msgid "Edit"
711msgstr "Modifier"
712
713#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:16
714#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:26
675#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:26 715#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:26
676msgid "Shaare" 716msgid "Shaare"
677msgstr "Shaare" 717msgstr "Shaare"
678 718
679#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:21 719#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:25
720msgid "Created:"
721msgstr "Création :"
722
723#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:28
680msgid "URL" 724msgid "URL"
681msgstr "URL" 725msgstr "URL"
682 726
683#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:27 727#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:34
684msgid "Title" 728msgid "Title"
685msgstr "Titre" 729msgstr "Titre"
686 730
687#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:33 731#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:40
688#: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:42 732#: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:42
689#: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:75 733#: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:75
690#: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:99 734#: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:99
@@ -692,16 +736,20 @@ msgstr "Titre"
692msgid "Description" 736msgid "Description"
693msgstr "Description" 737msgstr "Description"
694 738
695#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:39 739#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:46
696msgid "Tags" 740msgid "Tags"
697msgstr "Tags" 741msgstr "Tags"
698 742
699#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:52 743#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:59
700#: tmp/export.b91ef64efc3688266305ea9b42e5017e.rtpl.php:36 744#: tmp/export.b91ef64efc3688266305ea9b42e5017e.rtpl.php:36
701#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:167 745#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:168
702msgid "Private" 746msgid "Private"
703msgstr "Privé" 747msgstr "Privé"
704 748
749#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:74
750msgid "Apply Changes"
751msgstr "Appliquer les changements"
752
705#: tmp/export.b91ef64efc3688266305ea9b42e5017e.rtpl.php:16 753#: tmp/export.b91ef64efc3688266305ea9b42e5017e.rtpl.php:16
706msgid "Export Database" 754msgid "Export Database"
707msgstr "Exporter les données" 755msgstr "Exporter les données"
@@ -783,114 +831,135 @@ msgstr ""
783 831
784#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:33 832#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:33
785#: tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:30 833#: tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:30
786#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:149 834#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:147
835#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:147
787msgid "Username" 836msgid "Username"
788msgstr "Nom d'utilisateur" 837msgstr "Nom d'utilisateur"
789 838
790#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:48 839#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:48
791#: tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:34 840#: tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:34
792#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:150 841#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:148
842#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:148
793msgid "Password" 843msgid "Password"
794msgstr "Mot de passe" 844msgstr "Mot de passe"
795 845
796#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:80 846#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:63
797msgid "Shaarli title" 847msgid "Shaarli title"
798msgstr "Titre du Shaarli" 848msgstr "Titre du Shaarli"
799 849
800#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:86 850#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:69
801msgid "My links" 851msgid "My links"
802msgstr "Mes liens" 852msgstr "Mes liens"
803 853
804#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:127 854#: tmp/install.b91ef64efc3688266305ea9b42e5017e.rtpl.php:182
805msgid "Install" 855msgid "Install"
806msgstr "Installer" 856msgstr "Installer"
807 857
808#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:14 858#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:14
809#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:87 859#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:80
810msgid "shaare" 860msgid "shaare"
811msgid_plural "shaares" 861msgid_plural "shaares"
812msgstr[0] "shaare" 862msgstr[0] "shaare"
813msgstr[1] "shaares" 863msgstr[1] "shaares"
814 864
815#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:18 865#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:18
816#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:91 866#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:84
817msgid "private link" 867msgid "private link"
818msgid_plural "private links" 868msgid_plural "private links"
819msgstr[0] "lien privé" 869msgstr[0] "lien privé"
820msgstr[1] "liens privés" 870msgstr[1] "liens privés"
821 871
822#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:31 872#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:31
823#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:119 873#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:117
874#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:117
824msgid "Search text" 875msgid "Search text"
825msgstr "Recherche texte" 876msgstr "Recherche texte"
826 877
827#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:43 878#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:38
828#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:131 879#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:124
880#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:124
881#: tmp/tag.cloud.b91ef64efc3688266305ea9b42e5017e.rtpl.php:33
882#: tmp/tag.cloud.b91ef64efc3688266305ea9b42e5017e.rtpl.php:61
883#: tmp/tag.list.b91ef64efc3688266305ea9b42e5017e.rtpl.php:33
884#: tmp/tag.list.b91ef64efc3688266305ea9b42e5017e.rtpl.php:71
829msgid "Filter by tag" 885msgid "Filter by tag"
830msgstr "Filtrer par tag" 886msgstr "Filtrer par tag"
831 887
832#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:118 888#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:111
833msgid "Nothing found." 889msgid "Nothing found."
834msgstr "Aucun résultat." 890msgstr "Aucun résultat."
835 891
836#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:126 892#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:119
837#, php-format 893#, php-format
838msgid "%s result" 894msgid "%s result"
839msgid_plural "%s results" 895msgid_plural "%s results"
840msgstr[0] "%s résultat" 896msgstr[0] "%s résultat"
841msgstr[1] "%s résultats" 897msgstr[1] "%s résultats"
842 898
843#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:130 899#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:123
844msgid "for" 900msgid "for"
845msgstr "pour" 901msgstr "pour"
846 902
847#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:137 903#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:130
848msgid "tagged" 904msgid "tagged"
849msgstr "taggé" 905msgstr "taggé"
850 906
851#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:141 907#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:134
852msgid "Remove tag" 908msgid "Remove tag"
853msgstr "Retirer le tag" 909msgstr "Retirer le tag"
854 910
855#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:150 911#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:143
856msgid "with status" 912msgid "with status"
857msgstr "avec le statut" 913msgstr "avec le statut"
858 914
859#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:169 915#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:154
860msgid "Edit" 916msgid "without any tag"
861msgstr "Modifier" 917msgstr "sans tag"
862 918
863#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:173 919#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:174
864#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:39 920#: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:42
921#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:42
865msgid "Fold" 922msgid "Fold"
866msgstr "Replier" 923msgstr "Replier"
867 924
868#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:175 925#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:176
869msgid "Edited: " 926msgid "Edited: "
870msgstr "Modifié :" 927msgstr "Modifié : "
871 928
872#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:179 929#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:180
873msgid "permalink" 930msgid "permalink"
874msgstr "permalien" 931msgstr "permalien"
875 932
876#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:181 933#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:182
877msgid "Add tag" 934msgid "Add tag"
878msgstr "Ajouter un tag" 935msgstr "Ajouter un tag"
879 936
937#: tmp/linklist.paging.b91ef64efc3688266305ea9b42e5017e.rtpl.php:7
880#: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:7 938#: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:7
881msgid "Filters" 939msgid "Filters"
882msgstr "Filtres" 940msgstr "Filtres"
883 941
942#: tmp/linklist.paging.b91ef64efc3688266305ea9b42e5017e.rtpl.php:12
884#: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:12 943#: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:12
885msgid "Filter private links" 944msgid "Filter private links"
886msgstr "Filtrer par liens privés" 945msgstr "Filtrer par liens privés"
887 946
947#: tmp/linklist.paging.b91ef64efc3688266305ea9b42e5017e.rtpl.php:18
888#: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:18 948#: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:18
889#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:40 949msgid "Filter untagged links"
950msgstr "Filtrer par liens privés"
951
952#: tmp/linklist.paging.b91ef64efc3688266305ea9b42e5017e.rtpl.php:22
953#: tmp/linklist.paging.b91ef64efc3688266305ea9b42e5017e.rtpl.php:74
954#: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:22
955#: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:74
956#: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:43
957#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:43
890msgid "Fold all" 958msgid "Fold all"
891msgstr "Replier tout" 959msgstr "Replier tout"
892 960
893#: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:63 961#: tmp/linklist.paging.b91ef64efc3688266305ea9b42e5017e.rtpl.php:67
962#: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:67
894msgid "Links per page" 963msgid "Links per page"
895msgstr "Liens par page" 964msgstr "Liens par page"
896 965
@@ -902,71 +971,89 @@ msgstr ""
902"réessayer plus tard." 971"réessayer plus tard."
903 972
904#: tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:28 973#: tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:28
905#: tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:42 974#: tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:44
975#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:71
976#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:95
906#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:71 977#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:71
907#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:95 978#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:95
908msgid "Login" 979msgid "Login"
909msgstr "Connexion" 980msgstr "Connexion"
910 981
911#: tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:39 982#: tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:41
912#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:153 983#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:151
984#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:151
913msgid "Remember me" 985msgid "Remember me"
914msgstr "Rester connecté" 986msgstr "Rester connecté"
915 987
988#: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:14
989#: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:48
916#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:14 990#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:14
917#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:45 991#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:48
918msgid "by the Shaarli community" 992msgid "by the Shaarli community"
919msgstr "par la communauté Shaarli" 993msgstr "par la communauté Shaarli"
920 994
995#: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:15
921#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:15 996#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:15
922msgid "Documentation" 997msgid "Documentation"
923msgstr "Documentation" 998msgstr "Documentation"
924 999
925#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:41 1000#: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:44
1001#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:44
926msgid "Expand" 1002msgid "Expand"
927msgstr "Déplier" 1003msgstr "Déplier"
928 1004
929#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:42 1005#: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:45
1006#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:45
930msgid "Expand all" 1007msgid "Expand all"
931msgstr "Déplier tout" 1008msgstr "Déplier tout"
932 1009
933#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:43 1010#: tmp/page.footer.b91ef64efc3688266305ea9b42e5017e.rtpl.php:46
1011#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:46
934msgid "Are you sure you want to delete this link?" 1012msgid "Are you sure you want to delete this link?"
935msgstr "Êtes-vous sûr de vouloir supprimer ce lien ?" 1013msgstr "Êtes-vous sûr de vouloir supprimer ce lien ?"
936 1014
1015#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:31
937#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:31 1016#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:31
938msgid "Tools" 1017msgid "Tools"
939msgstr "Outils" 1018msgstr "Outils"
940 1019
1020#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:36
941#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:36 1021#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:36
942#: tmp/tag.cloud.b91ef64efc3688266305ea9b42e5017e.rtpl.php:19 1022#: tmp/tag.cloud.b91ef64efc3688266305ea9b42e5017e.rtpl.php:19
943#: tmp/tagcloud.b91ef64efc3688266305ea9b42e5017e.rtpl.php:16
944msgid "Tag cloud" 1023msgid "Tag cloud"
945msgstr "Nuage de tags" 1024msgstr "Nuage de tags"
946 1025
1026#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:39
947#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:39 1027#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:39
948msgid "Picture wall" 1028msgid "Picture wall"
949msgstr "Mur d'images" 1029msgstr "Mur d'images"
950 1030
1031#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:42
951#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:42 1032#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:42
952msgid "Daily" 1033msgid "Daily"
953msgstr "Quotidien" 1034msgstr "Quotidien"
954 1035
1036#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:61
1037#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:86
955#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:61 1038#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:61
956#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:86 1039#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:86
957msgid "RSS Feed" 1040msgid "RSS Feed"
958msgstr "Flux RSS" 1041msgstr "Flux RSS"
959 1042
1043#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:66
1044#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:102
960#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:66 1045#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:66
961#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:102 1046#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:102
962msgid "Logout" 1047msgid "Logout"
963msgstr "Déconnexion" 1048msgstr "Déconnexion"
964 1049
965#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:171 1050#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:169
1051#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:169
966msgid "is available" 1052msgid "is available"
967msgstr "est disponible" 1053msgstr "est disponible"
968 1054
969#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:178 1055#: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:176
1056#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:176
970msgid "Error" 1057msgid "Error"
971msgstr "Erreur" 1058msgstr "Erreur"
972 1059
@@ -1041,26 +1128,34 @@ msgstr "Configuration des extensions"
1041 1128
1042#: tmp/tag.cloud.b91ef64efc3688266305ea9b42e5017e.rtpl.php:19 1129#: tmp/tag.cloud.b91ef64efc3688266305ea9b42e5017e.rtpl.php:19
1043#: tmp/tag.list.b91ef64efc3688266305ea9b42e5017e.rtpl.php:19 1130#: tmp/tag.list.b91ef64efc3688266305ea9b42e5017e.rtpl.php:19
1044#: tmp/tagcloud.b91ef64efc3688266305ea9b42e5017e.rtpl.php:16
1045msgid "tags" 1131msgid "tags"
1046msgstr "tags" 1132msgstr "tags"
1047 1133
1134#: tmp/tag.cloud.b91ef64efc3688266305ea9b42e5017e.rtpl.php:23
1135#: tmp/tag.list.b91ef64efc3688266305ea9b42e5017e.rtpl.php:23
1136msgid "List all links with those tags"
1137msgstr "Lister tous les liens avec ces tags"
1138
1048#: tmp/tag.list.b91ef64efc3688266305ea9b42e5017e.rtpl.php:19 1139#: tmp/tag.list.b91ef64efc3688266305ea9b42e5017e.rtpl.php:19
1049msgid "Tag list" 1140msgid "Tag list"
1050msgstr "List des tags" 1141msgstr "List des tags"
1051 1142
1143#: tmp/tag.sort.b91ef64efc3688266305ea9b42e5017e.rtpl.php:3
1052#: tmp/tag.sort.cedf684561d925457130839629000a81.rtpl.php:3 1144#: tmp/tag.sort.cedf684561d925457130839629000a81.rtpl.php:3
1053msgid "Sort by:" 1145msgid "Sort by:"
1054msgstr "Trier par :" 1146msgstr "Trier par :"
1055 1147
1148#: tmp/tag.sort.b91ef64efc3688266305ea9b42e5017e.rtpl.php:5
1056#: tmp/tag.sort.cedf684561d925457130839629000a81.rtpl.php:5 1149#: tmp/tag.sort.cedf684561d925457130839629000a81.rtpl.php:5
1057msgid "Cloud" 1150msgid "Cloud"
1058msgstr "Nuage" 1151msgstr "Nuage"
1059 1152
1153#: tmp/tag.sort.b91ef64efc3688266305ea9b42e5017e.rtpl.php:6
1060#: tmp/tag.sort.cedf684561d925457130839629000a81.rtpl.php:6 1154#: tmp/tag.sort.cedf684561d925457130839629000a81.rtpl.php:6
1061msgid "Most used" 1155msgid "Most used"
1062msgstr "Plus utilisés" 1156msgstr "Plus utilisés"
1063 1157
1158#: tmp/tag.sort.b91ef64efc3688266305ea9b42e5017e.rtpl.php:7
1064#: tmp/tag.sort.cedf684561d925457130839629000a81.rtpl.php:7 1159#: tmp/tag.sort.cedf684561d925457130839629000a81.rtpl.php:7
1065msgid "Alphabetical" 1160msgid "Alphabetical"
1066msgstr "Alphabétique" 1161msgstr "Alphabétique"
@@ -1127,7 +1222,7 @@ msgstr ""
1127"puis cliquer sur le marque page depuis un site que vous souhaitez partager." 1222"puis cliquer sur le marque page depuis un site que vous souhaitez partager."
1128 1223
1129#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:76 1224#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:76
1130#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:95 1225#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:100
1131msgid "" 1226msgid ""
1132"Drag this link to your bookmarks toolbar or right-click it and Bookmark This " 1227"Drag this link to your bookmarks toolbar or right-click it and Bookmark This "
1133"Link" 1228"Link"
@@ -1139,22 +1234,27 @@ msgstr ""
1139msgid "then click ✚Shaare link button in any page you want to share" 1234msgid "then click ✚Shaare link button in any page you want to share"
1140msgstr "puis cliquer sur ✚Shaare depuis un site que vous souhaitez partager" 1235msgstr "puis cliquer sur ✚Shaare depuis un site que vous souhaitez partager"
1141 1236
1142#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:91 1237#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:86
1238#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:108
1239msgid "The selected text is too long, it will be truncated."
1240msgstr "Le texte sélectionné est trop long, il sera tronqué."
1241
1242#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:96
1143msgid "Shaare link" 1243msgid "Shaare link"
1144msgstr "Shaare" 1244msgstr "Shaare"
1145 1245
1146#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:96 1246#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:101
1147msgid "" 1247msgid ""
1148"Then click ✚Add Note button anytime to start composing a private Note (text " 1248"Then click ✚Add Note button anytime to start composing a private Note (text "
1149"post) to your Shaarli" 1249"post) to your Shaarli"
1150msgstr "" 1250msgstr ""
1151"Puis cliquer sur ✚Add Note pour commencer à rédiger une Note sur Shaarli" 1251"Puis cliquer sur ✚Add Note pour commencer à rédiger une Note sur Shaarli"
1152 1252
1153#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:99 1253#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:117
1154msgid "Add Note" 1254msgid "Add Note"
1155msgstr "Ajouter une Note" 1255msgstr "Ajouter une Note"
1156 1256
1157#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:111 1257#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:129
1158msgid "" 1258msgid ""
1159"You need to browse your Shaarli over <strong>HTTPS</strong> to use this " 1259"You need to browse your Shaarli over <strong>HTTPS</strong> to use this "
1160"functionality." 1260"functionality."
@@ -1162,25 +1262,25 @@ msgstr ""
1162"Vous devez utiliser Shaarli en <strong>HTTPS</strong> pour utiliser cette " 1262"Vous devez utiliser Shaarli en <strong>HTTPS</strong> pour utiliser cette "
1163"fonctionalité." 1263"fonctionalité."
1164 1264
1165#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:116 1265#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:134
1166msgid "Add to" 1266msgid "Add to"
1167msgstr "Ajouter à" 1267msgstr "Ajouter à"
1168 1268
1169#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:127 1269#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:145
1170msgid "3rd party" 1270msgid "3rd party"
1171msgstr "Applications tierces" 1271msgstr "Applications tierces"
1172 1272
1173#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:129 1273#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:147
1174#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:135 1274#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:153
1175msgid "Plugin" 1275msgid "Plugin"
1176msgstr "Extension" 1276msgstr "Extension"
1177 1277
1178#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:130 1278#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:148
1179#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:136 1279#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:154
1180msgid "plugin" 1280msgid "plugin"
1181msgstr "extension" 1281msgstr "extension"
1182 1282
1183#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:157 1283#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:175
1184msgid "" 1284msgid ""
1185"Drag this link to your bookmarks toolbar, or right-click it and choose " 1285"Drag this link to your bookmarks toolbar, or right-click it and choose "
1186"Bookmark This Link" 1286"Bookmark This Link"
@@ -1189,15 +1289,6 @@ msgstr ""
1189"Ajouter aux favoris »" 1289"Ajouter aux favoris »"
1190 1290
1191#~ msgid "" 1291#~ msgid ""
1192#~ "Your PHP version is obsolete! Shaarli requires at least PHP %s, and thus "
1193#~ "cannot run. Your PHP version has known security vulnerabilities and "
1194#~ "should be updated as soon as possible."
1195#~ msgstr ""
1196#~ "Votre version de PHP est obsolète ! Shaarli nécessite au moins PHP %s, et "
1197#~ "ne peut donc pas fonctionner. Votre version de PHP a des failles de "
1198#~ "sécurités connues et devrait être mise à jour au plus tôt."
1199
1200#~ msgid ""
1201#~ "An error occurred while parsing JSON configuration file (%s): error code #" 1292#~ "An error occurred while parsing JSON configuration file (%s): error code #"
1202#~ "%d" 1293#~ "%d"
1203#~ msgstr "" 1294#~ msgstr ""
diff --git a/index.php b/index.php
index 98171d78..1dc81843 100644
--- a/index.php
+++ b/index.php
@@ -1170,6 +1170,8 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history)
1170 $conf->set('privacy.hide_public_links', !empty($_POST['hidePublicLinks'])); 1170 $conf->set('privacy.hide_public_links', !empty($_POST['hidePublicLinks']));
1171 $conf->set('api.enabled', !empty($_POST['enableApi'])); 1171 $conf->set('api.enabled', !empty($_POST['enableApi']));
1172 $conf->set('api.secret', escape($_POST['apiSecret'])); 1172 $conf->set('api.secret', escape($_POST['apiSecret']));
1173 $conf->set('translation.language', escape($_POST['language']));
1174
1173 try { 1175 try {
1174 $conf->write(isLoggedIn()); 1176 $conf->write(isLoggedIn());
1175 $history->updateSettings(); 1177 $history->updateSettings();
@@ -1207,6 +1209,8 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history)
1207 $PAGE->assign('hide_public_links', $conf->get('privacy.hide_public_links', false)); 1209 $PAGE->assign('hide_public_links', $conf->get('privacy.hide_public_links', false));
1208 $PAGE->assign('api_enabled', $conf->get('api.enabled', true)); 1210 $PAGE->assign('api_enabled', $conf->get('api.enabled', true));
1209 $PAGE->assign('api_secret', $conf->get('api.secret')); 1211 $PAGE->assign('api_secret', $conf->get('api.secret'));
1212 $PAGE->assign('languages', Languages::getAvailableLanguages());
1213 $PAGE->assign('language', $conf->get('translation.language'));
1210 $PAGE->renderPage('configure'); 1214 $PAGE->renderPage('configure');
1211 exit; 1215 exit;
1212 } 1216 }
@@ -1232,9 +1236,10 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history)
1232 } 1236 }
1233 $delete = empty($_POST['totag']); 1237 $delete = empty($_POST['totag']);
1234 $redirect = $delete ? 'do=changetag' : 'searchtags='. urlencode(escape($_POST['totag'])); 1238 $redirect = $delete ? 'do=changetag' : 'searchtags='. urlencode(escape($_POST['totag']));
1239 $count = count($alteredLinks);
1235 $alert = $delete 1240 $alert = $delete
1236 ? sprintf(t('The tag was removed from %d links.'), count($alteredLinks)) 1241 ? sprintf(t('The tag was removed from %d link.', 'The tag was removed from %d links.', $count), $count)
1237 : sprintf(t('The tag was renamed in %d links.'), count($alteredLinks)); 1242 : sprintf(t('The tag was renamed in %d link.', 'The tag was renamed in %d links.', $count), $count);
1238 echo '<script>alert("'. $alert .'");document.location=\'?'. $redirect .'\';</script>'; 1243 echo '<script>alert("'. $alert .'");document.location=\'?'. $redirect .'\';</script>';
1239 exit; 1244 exit;
1240 } 1245 }
@@ -1450,7 +1455,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history)
1450 1455
1451 if ($url == '') { 1456 if ($url == '') {
1452 $url = '?' . smallHash($linkdate . $LINKSDB->getNextId()); 1457 $url = '?' . smallHash($linkdate . $LINKSDB->getNextId());
1453 $title = $conf->get('general.default_note_title', 'Note: '); 1458 $title = $conf->get('general.default_note_title', t('Note: '));
1454 } 1459 }
1455 $url = escape($url); 1460 $url = escape($url);
1456 $title = escape($title); 1461 $title = escape($title);
@@ -2018,6 +2023,7 @@ function install($conf)
2018 } else { 2023 } else {
2019 $conf->set('general.title', 'Shared links on '.escape(index_url($_SERVER))); 2024 $conf->set('general.title', 'Shared links on '.escape(index_url($_SERVER)));
2020 } 2025 }
2026 $conf->set('translation.language', escape($_POST['language']));
2021 $conf->set('updates.check_updates', !empty($_POST['updateCheck'])); 2027 $conf->set('updates.check_updates', !empty($_POST['updateCheck']));
2022 $conf->set('api.enabled', !empty($_POST['enableApi'])); 2028 $conf->set('api.enabled', !empty($_POST['enableApi']));
2023 $conf->set( 2029 $conf->set(
@@ -2049,6 +2055,7 @@ function install($conf)
2049 list($continents, $cities) = generateTimeZoneData(timezone_identifiers_list(), date_default_timezone_get()); 2055 list($continents, $cities) = generateTimeZoneData(timezone_identifiers_list(), date_default_timezone_get());
2050 $PAGE->assign('continents', $continents); 2056 $PAGE->assign('continents', $continents);
2051 $PAGE->assign('cities', $cities); 2057 $PAGE->assign('cities', $cities);
2058 $PAGE->assign('languages', Languages::getAvailableLanguages());
2052 $PAGE->renderPage('install'); 2059 $PAGE->renderPage('install');
2053 exit; 2060 exit;
2054} 2061}
diff --git a/tests/LanguagesTest.php b/tests/LanguagesTest.php
index 46bfcd72..864ce630 100644
--- a/tests/LanguagesTest.php
+++ b/tests/LanguagesTest.php
@@ -183,7 +183,8 @@ class LanguagesTest extends \PHPUnit_Framework_TestCase
183 $this->conf->set('translation.mode', 'gettext'); 183 $this->conf->set('translation.mode', 'gettext');
184 $this->conf->set('translation.extensions.test', 'tests/utils/languages/'); 184 $this->conf->set('translation.extensions.test', 'tests/utils/languages/');
185 new Languages('en', $this->conf); 185 new Languages('en', $this->conf);
186 $this->assertEquals('car', t('car', 'car', 1, 'test')); 186 $txt = 'car'; // ignore me poedit
187 $this->assertEquals('car', t($txt, $txt, 1, 'test'));
187 $this->assertEquals('Search', t('Search', 'Search', 1, 'test')); 188 $this->assertEquals('Search', t('Search', 'Search', 1, 'test'));
188 } 189 }
189 190
@@ -195,7 +196,8 @@ class LanguagesTest extends \PHPUnit_Framework_TestCase
195 $this->conf->set('translation.mode', 'php'); 196 $this->conf->set('translation.mode', 'php');
196 $this->conf->set('translation.extensions.test', 'tests/utils/languages/'); 197 $this->conf->set('translation.extensions.test', 'tests/utils/languages/');
197 new Languages('en', $this->conf); 198 new Languages('en', $this->conf);
198 $this->assertEquals('car', t('car', 'car', 1, 'test')); 199 $txt = 'car'; // ignore me poedit
200 $this->assertEquals('car', t($txt, $txt, 1, 'test'));
199 $this->assertEquals('Search', t('Search', 'Search', 1, 'test')); 201 $this->assertEquals('Search', t('Search', 'Search', 1, 'test'));
200 } 202 }
201} 203}
diff --git a/tests/languages/fr/LanguagesFrTest.php b/tests/languages/fr/LanguagesFrTest.php
index c05a0f98..79d05172 100644
--- a/tests/languages/fr/LanguagesFrTest.php
+++ b/tests/languages/fr/LanguagesFrTest.php
@@ -155,7 +155,8 @@ class LanguagesFrTest extends \PHPUnit_Framework_TestCase
155 $this->conf->set('translation.mode', 'gettext'); 155 $this->conf->set('translation.mode', 'gettext');
156 $this->conf->set('translation.extensions.test', 'tests/utils/languages/'); 156 $this->conf->set('translation.extensions.test', 'tests/utils/languages/');
157 new Languages('en', $this->conf); 157 new Languages('en', $this->conf);
158 $this->assertEquals('voiture', t('car', 'car', 1, 'test')); 158 $txt = 'car'; // ignore me poedit
159 $this->assertEquals('voiture', t($txt, $txt, 1, 'test'));
159 $this->assertEquals('Fouille', t('Search', 'Search', 1, 'test')); 160 $this->assertEquals('Fouille', t('Search', 'Search', 1, 'test'));
160 } 161 }
161 162
@@ -167,7 +168,8 @@ class LanguagesFrTest extends \PHPUnit_Framework_TestCase
167 $this->conf->set('translation.mode', 'php'); 168 $this->conf->set('translation.mode', 'php');
168 $this->conf->set('translation.extensions.test', 'tests/utils/languages/'); 169 $this->conf->set('translation.extensions.test', 'tests/utils/languages/');
169 new Languages('en', $this->conf); 170 new Languages('en', $this->conf);
170 $this->assertEquals('voiture', t('car', 'car', 1, 'test')); 171 $txt = 'car'; // ignore me poedit
172 $this->assertEquals('voiture', t($txt, $txt, 1, 'test'));
171 $this->assertEquals('Fouille', t('Search', 'Search', 1, 'test')); 173 $this->assertEquals('Fouille', t('Search', 'Search', 1, 'test'));
172 } 174 }
173} 175}
diff --git a/tpl/default/changetag.html b/tpl/default/changetag.html
index 49dd20d9..6606c4fa 100644
--- a/tpl/default/changetag.html
+++ b/tpl/default/changetag.html
@@ -32,7 +32,7 @@
32 </div> 32 </div>
33 </form> 33 </form>
34 34
35 <p>You can also edit tags in the <a href="?do=taglist&sort=usage">tag list</a>.</p> 35 <p>{'You can also edit tags in the'|t} <a href="?do=taglist&sort=usage">{'tag list'|t}</a>.</p>
36 </div> 36 </div>
37</div> 37</div>
38{include="page.footer"} 38{include="page.footer"}
diff --git a/tpl/default/configure.html b/tpl/default/configure.html
index 76a1b9fd..cc3b299b 100644
--- a/tpl/default/configure.html
+++ b/tpl/default/configure.html
@@ -70,6 +70,30 @@
70 </div> 70 </div>
71 </div> 71 </div>
72 <div class="pure-g"> 72 <div class="pure-g">
73 <div class="pure-u-lg-{$ratioLabel} pure-u-1">
74 <div class="form-label">
75 <label for="language">
76 <span class="label-name">{'Language'|t}</span>
77 </label>
78 </div>
79 </div>
80 <div class="pure-u-lg-{$ratioInput} pure-u-1">
81 <div class="form-input">
82 <select name="language" id="language" class="align">
83 {loop="$languages"}
84 <option value="{$key}"
85 {if="$key===$language"}
86 selected="selected"
87 {/if}
88 >
89 {$value}
90 </option>
91 {/loop}
92 </select>
93 </div>
94 </div>
95 </div>
96 <div class="pure-g">
73 <div class="pure-u-lg-{$ratioLabel} pure-u-1 "> 97 <div class="pure-u-lg-{$ratioLabel} pure-u-1 ">
74 <div class="form-label"> 98 <div class="form-label">
75 <label> 99 <label>
diff --git a/tpl/default/install.html b/tpl/default/install.html
index 164d453b..6199b33d 100644
--- a/tpl/default/install.html
+++ b/tpl/default/install.html
@@ -68,6 +68,27 @@
68 <div class="pure-g"> 68 <div class="pure-g">
69 <div class="pure-u-lg-{$ratioLabel} pure-u-1"> 69 <div class="pure-u-lg-{$ratioLabel} pure-u-1">
70 <div class="form-label"> 70 <div class="form-label">
71 <label for="language">
72 <span class="label-name">{'Language'|t}</span>
73 </label>
74 </div>
75 </div>
76 <div class="pure-u-lg-{$ratioInput} pure-u-1">
77 <div class="form-input">
78 <select name="language" id="language" class="align">
79 {loop="$languages"}
80 <option value="{$key}">
81 {$value}
82 </option>
83 {/loop}
84 </select>
85 </div>
86 </div>
87 </div>
88
89 <div class="pure-g">
90 <div class="pure-u-lg-{$ratioLabel} pure-u-1">
91 <div class="form-label">
71 <label> 92 <label>
72 <span class="label-name">{'Timezone'|t}</span><br> 93 <span class="label-name">{'Timezone'|t}</span><br>
73 <span class="label-desc">{'Continent'|t} &middot; {'City'|t}</span> 94 <span class="label-desc">{'Continent'|t} &middot; {'City'|t}</span>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 15:29:09 +0000