aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.gitattributes1
-rw-r--r--.gitignore1
-rw-r--r--.travis.yml2
-rw-r--r--Makefile15
-rw-r--r--inc/languages/fr/LC_MESSAGES/shaarli.mobin22943 -> 0 bytes
-rw-r--r--inc/languages/fr/LC_MESSAGES/shaarli.po148
6 files changed, 102 insertions, 65 deletions
diff --git a/.gitattributes b/.gitattributes
index 93900602..b191e227 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -22,6 +22,7 @@ Dockerfile text
22*.ttf binary 22*.ttf binary
23*.min.css binary 23*.min.css binary
24*.min.js binary 24*.min.js binary
25*.mo binary
25 26
26# Exclude from Git archives 27# Exclude from Git archives
27.editorconfig export-ignore 28.editorconfig export-ignore
diff --git a/.gitignore b/.gitignore
index d546f248..3f6939a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ vendor/
18# Release archives 18# Release archives
19*.tar.gz 19*.tar.gz
20*.zip 20*.zip
21inc/languages/*/LC_MESSAGES/shaarli.mo
21 22
22# Development and test resources 23# Development and test resources
23coverage 24coverage
diff --git a/.travis.yml b/.travis.yml
index b6b9bddf..322e4337 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,8 @@ install:
13 - composer self-update 13 - composer self-update
14 - composer install --prefer-dist 14 - composer install --prefer-dist
15 - locale -a 15 - locale -a
16before_script:
17 - PATH=${PATH//:\.\/node_modules\/\.bin/}
16script: 18script:
17 - make clean 19 - make clean
18 - make check_permissions 20 - make check_permissions
diff --git a/Makefile b/Makefile
index 300f1d7f..c2d55946 100644
--- a/Makefile
+++ b/Makefile
@@ -130,7 +130,7 @@ check_permissions:
130# See phpunit.xml for configuration 130# See phpunit.xml for configuration
131# https://phpunit.de/manual/current/en/appendixes.configuration.html 131# https://phpunit.de/manual/current/en/appendixes.configuration.html
132## 132##
133test: 133test: translate
134 @echo "-------" 134 @echo "-------"
135 @echo "PHPUNIT" 135 @echo "PHPUNIT"
136 @echo "-------" 136 @echo "-------"
@@ -168,15 +168,15 @@ composer_dependencies: clean
168 composer install --no-dev --prefer-dist 168 composer install --no-dev --prefer-dist
169 find vendor/ -name ".git" -type d -exec rm -rf {} + 169 find vendor/ -name ".git" -type d -exec rm -rf {} +
170 170
171### generate a release tarball and include 3rd-party dependencies 171### generate a release tarball and include 3rd-party dependencies and translations
172release_tar: composer_dependencies htmldoc 172release_tar: composer_dependencies htmldoc translate
173 git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).tar HEAD 173 git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).tar HEAD
174 tar rvf $(ARCHIVE_VERSION).tar --transform "s|^vendor|$(ARCHIVE_PREFIX)vendor|" vendor/ 174 tar rvf $(ARCHIVE_VERSION).tar --transform "s|^vendor|$(ARCHIVE_PREFIX)vendor|" vendor/
175 tar rvf $(ARCHIVE_VERSION).tar --transform "s|^doc/html|$(ARCHIVE_PREFIX)doc/html|" doc/html/ 175 tar rvf $(ARCHIVE_VERSION).tar --transform "s|^doc/html|$(ARCHIVE_PREFIX)doc/html|" doc/html/
176 gzip $(ARCHIVE_VERSION).tar 176 gzip $(ARCHIVE_VERSION).tar
177 177
178### generate a release zip and include 3rd-party dependencies 178### generate a release zip and include 3rd-party dependencies and translations
179release_zip: composer_dependencies htmldoc 179release_zip: composer_dependencies htmldoc translate
180 git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).zip -9 HEAD 180 git archive --prefix=$(ARCHIVE_PREFIX) -o $(ARCHIVE_VERSION).zip -9 HEAD
181 mkdir -p $(ARCHIVE_PREFIX)/{doc,vendor} 181 mkdir -p $(ARCHIVE_PREFIX)/{doc,vendor}
182 rsync -a doc/html/ $(ARCHIVE_PREFIX)doc/html/ 182 rsync -a doc/html/ $(ARCHIVE_PREFIX)doc/html/
@@ -213,3 +213,8 @@ htmldoc:
213 mkdocs build' 213 mkdocs build'
214 find doc/html/ -type f -exec chmod a-x '{}' \; 214 find doc/html/ -type f -exec chmod a-x '{}' \;
215 rm -r venv 215 rm -r venv
216
217
218### Generate Shaarli's translation compiled file (.mo)
219translate:
220 @find inc/languages/ -name shaarli.po -execdir msgfmt shaarli.po -o shaarli.mo \; \ No newline at end of file
diff --git a/inc/languages/fr/LC_MESSAGES/shaarli.mo b/inc/languages/fr/LC_MESSAGES/shaarli.mo
deleted file mode 100644
index d6b195da..00000000
--- a/inc/languages/fr/LC_MESSAGES/shaarli.mo
+++ /dev/null
Binary files differ
diff --git a/inc/languages/fr/LC_MESSAGES/shaarli.po b/inc/languages/fr/LC_MESSAGES/shaarli.po
index 8763581b..46b457e4 100644
--- a/inc/languages/fr/LC_MESSAGES/shaarli.po
+++ b/inc/languages/fr/LC_MESSAGES/shaarli.po
@@ -1,8 +1,8 @@
1msgid "" 1msgid ""
2msgstr "" 2msgstr ""
3"Project-Id-Version: Shaarli\n" 3"Project-Id-Version: Shaarli\n"
4"POT-Creation-Date: 2017-05-20 13:54+0200\n" 4"POT-Creation-Date: 2017-05-20 15:36+0200\n"
5"PO-Revision-Date: 2017-05-20 14:11+0200\n" 5"PO-Revision-Date: 2017-05-20 15:40+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"
@@ -16,17 +16,6 @@ msgstr ""
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:152
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:180 application/ApplicationUtils.php:192 19#: application/ApplicationUtils.php:180 application/ApplicationUtils.php:192
31msgid "directory is not readable" 20msgid "directory is not readable"
32msgstr "le répertoire n'est pas accessible en lecture" 21msgstr "le répertoire n'est pas accessible en lecture"
@@ -54,8 +43,7 @@ msgstr "Liens directs"
54 43
55#: application/FeedBuilder.php:148 44#: application/FeedBuilder.php:148
56#: tmp/daily.b91ef64efc3688266305ea9b42e5017e.rtpl.php:88 45#: tmp/daily.b91ef64efc3688266305ea9b42e5017e.rtpl.php:88
57#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:242 46#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:177
58#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:245
59#: tmp/paper.b91ef64efc3688266305ea9b42e5017e.rtpl.php:88 47#: tmp/paper.b91ef64efc3688266305ea9b42e5017e.rtpl.php:88
60msgid "Permalink" 48msgid "Permalink"
61msgstr "Permalien" 49msgstr "Permalien"
@@ -86,6 +74,7 @@ msgstr "La clé du tableau et l'ID du lien doivent être égaux."
86 74
87#: application/LinkDB.php:251 75#: application/LinkDB.php:251
88#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:14 76#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:14
77#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:45
89msgid "" 78msgid ""
90"The personal, minimalist, super-fast, database free, bookmarking service" 79"The personal, minimalist, super-fast, database free, bookmarking service"
91msgstr "" 80msgstr ""
@@ -153,8 +142,6 @@ msgid "The page you are trying to reach does not exist or has been deleted."
153msgstr "La page que vous essayez de consulter n'existe pas ou a été supprimée." 142msgstr "La page que vous essayez de consulter n'existe pas ou a été supprimée."
154 143
155#: application/PageBuilder.php:161 144#: application/PageBuilder.php:161
156#, fuzzy
157#| msgid " 404 Not Found"
158msgid "404 Not Found" 145msgid "404 Not Found"
159msgstr "404 Introuvable" 146msgstr "404 Introuvable"
160 147
@@ -208,22 +195,6 @@ msgstr "Mo"
208msgid "GiB" 195msgid "GiB"
209msgstr "Go" 196msgstr "Go"
210 197
211#: application/config/ConfigJson.php:26
212#, php-format
213msgid ""
214"An error occurred while parsing JSON configuration file (%s): error code #%d"
215msgstr ""
216"Une erreur s'est produite lors de la lecture du fichier de configuration "
217"JSON (%s) : code d'erreur #%d"
218
219#: application/config/ConfigJson.php:33
220msgid ""
221"Please check your JSON syntax (without PHP comment tags) using a JSON lint "
222"tool such as "
223msgstr ""
224"Merci de vérifier la syntaxe JSON (sans les balises de commentaires PHP) en "
225"utilisant un validateur de JSON tel que "
226
227#: application/config/ConfigJson.php:52 application/config/ConfigPhp.php:121 198#: application/config/ConfigJson.php:52 application/config/ConfigPhp.php:121
228msgid "" 199msgid ""
229"Shaarli could not create the config file. Please make sure Shaarli has the " 200"Shaarli could not create the config file. Please make sure Shaarli has the "
@@ -254,22 +225,6 @@ msgstr "Vous n'êtes pas autorisé à modifier la configuration."
254msgid "Error accessing" 225msgid "Error accessing"
255msgstr "Une erreur s'est produite en accédant à" 226msgstr "Une erreur s'est produite en accédant à"
256 227
257#: index.php:48
258msgid ""
259"Error: missing Composer dependencies\n"
260"\n"
261"If you installed Shaarli through Git or using the development branch,\n"
262"please refer to the installation documentation to install PHP dependencies "
263"using Composer:\n"
264msgstr ""
265"Erreur : les dépendances Composer sont manquantes\n"
266"\n"
267"Si vous avez installé Shaarli avec Git ou depuis la branche de "
268"développement\n"
269"merci de consulter la documentation d'installation pour installer les "
270"dépendances Composer :\n"
271"\n"
272
273#: index.php:137 228#: index.php:137
274msgid "Shared links on " 229msgid "Shared links on "
275msgstr "Liens partagés sur " 230msgstr "Liens partagés sur "
@@ -506,6 +461,23 @@ msgstr "URL de l'API Wallabag "
506msgid "Wallabag API version (1 or 2)" 461msgid "Wallabag API version (1 or 2)"
507msgstr "Version de l'API Wallabag (1 ou 2)" 462msgstr "Version de l'API Wallabag (1 ou 2)"
508 463
464#: tests/LanguagesTest.php:186 tests/LanguagesTest.php:198
465#: tests/languages/fr/LanguagesFrTest.php:148
466#: tests/languages/fr/LanguagesFrTest.php:160
467msgid "car"
468msgid_plural "car"
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
476msgid "Search"
477msgid_plural "Search"
478msgstr[0] "Rechercher"
479msgstr[1] "Rechercher"
480
509#: tmp/addlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:13 481#: tmp/addlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:13
510msgid "Shaare a new link" 482msgid "Shaare a new link"
511msgstr "Partager un nouveau lien" 483msgstr "Partager un nouveau lien"
@@ -556,8 +528,7 @@ msgstr "Renommer"
556#: tmp/changetag.b91ef64efc3688266305ea9b42e5017e.rtpl.php:35 528#: tmp/changetag.b91ef64efc3688266305ea9b42e5017e.rtpl.php:35
557#: tmp/editlink.90100d2eaf5d3705e14b9b4f78ecddc9.rtpl.php:60 529#: tmp/editlink.90100d2eaf5d3705e14b9b4f78ecddc9.rtpl.php:60
558#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:71 530#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:71
559#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:288 531#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:171
560#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:313
561msgid "Delete" 532msgid "Delete"
562msgstr "Supprimer" 533msgstr "Supprimer"
563 534
@@ -727,7 +698,7 @@ msgstr "Tags"
727 698
728#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:52 699#: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:52
729#: tmp/export.b91ef64efc3688266305ea9b42e5017e.rtpl.php:36 700#: tmp/export.b91ef64efc3688266305ea9b42e5017e.rtpl.php:36
730#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:177 701#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:167
731msgid "Private" 702msgid "Private"
732msgstr "Privé" 703msgstr "Privé"
733 704
@@ -885,22 +856,27 @@ msgstr "Retirer le tag"
885msgid "with status" 856msgid "with status"
886msgstr "avec le statut" 857msgstr "avec le statut"
887 858
888#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:181 859#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:169
889msgid "Edit" 860msgid "Edit"
890msgstr "Modifier" 861msgstr "Modifier"
891 862
892#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:182 863#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:173
864#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:39
893msgid "Fold" 865msgid "Fold"
894msgstr "Replier" 866msgstr "Replier"
895 867
896#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:245 868#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:175
897msgid "Edited: " 869msgid "Edited: "
898msgstr "Modifié :" 870msgstr "Modifié :"
899 871
900#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:257 872#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:179
901msgid "permalink" 873msgid "permalink"
902msgstr "permalien" 874msgstr "permalien"
903 875
876#: tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:181
877msgid "Add tag"
878msgstr "Ajouter un tag"
879
904#: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:7 880#: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:7
905msgid "Filters" 881msgid "Filters"
906msgstr "Filtres" 882msgstr "Filtres"
@@ -909,6 +885,11 @@ msgstr "Filtres"
909msgid "Filter private links" 885msgid "Filter private links"
910msgstr "Filtrer par liens privés" 886msgstr "Filtrer par liens privés"
911 887
888#: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:18
889#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:40
890msgid "Fold all"
891msgstr "Replier tout"
892
912#: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:63 893#: tmp/linklist.paging.cedf684561d925457130839629000a81.rtpl.php:63
913msgid "Links per page" 894msgid "Links per page"
914msgstr "Liens par page" 895msgstr "Liens par page"
@@ -933,6 +914,7 @@ msgid "Remember me"
933msgstr "Rester connecté" 914msgstr "Rester connecté"
934 915
935#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:14 916#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:14
917#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:45
936msgid "by the Shaarli community" 918msgid "by the Shaarli community"
937msgstr "par la communauté Shaarli" 919msgstr "par la communauté Shaarli"
938 920
@@ -940,6 +922,18 @@ msgstr "par la communauté Shaarli"
940msgid "Documentation" 922msgid "Documentation"
941msgstr "Documentation" 923msgstr "Documentation"
942 924
925#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:41
926msgid "Expand"
927msgstr "Déplier"
928
929#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:42
930msgid "Expand all"
931msgstr "Déplier tout"
932
933#: tmp/page.footer.cedf684561d925457130839629000a81.rtpl.php:43
934msgid "Are you sure you want to delete this link?"
935msgstr "Êtes-vous sûr de vouloir supprimer ce lien ?"
936
943#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:31 937#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:31
944msgid "Tools" 938msgid "Tools"
945msgstr "Outils" 939msgstr "Outils"
@@ -968,10 +962,6 @@ msgstr "Flux RSS"
968msgid "Logout" 962msgid "Logout"
969msgstr "Déconnexion" 963msgstr "Déconnexion"
970 964
971#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:81
972msgid "Search"
973msgstr "Rechercher"
974
975#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:171 965#: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:171
976msgid "is available" 966msgid "is available"
977msgstr "est disponible" 967msgstr "est disponible"
@@ -1198,6 +1188,44 @@ msgstr ""
1198"Glisser ce lien dans votre barre de favoris ou cliquer droit dessus et « " 1188"Glisser ce lien dans votre barre de favoris ou cliquer droit dessus et « "
1199"Ajouter aux favoris »" 1189"Ajouter aux favoris »"
1200 1190
1191#~ 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 #"
1202#~ "%d"
1203#~ msgstr ""
1204#~ "Une erreur s'est produite lors de la lecture du fichier de configuration "
1205#~ "JSON (%s) : code d'erreur #%d"
1206
1207#~ msgid ""
1208#~ "Please check your JSON syntax (without PHP comment tags) using a JSON "
1209#~ "lint tool such as "
1210#~ msgstr ""
1211#~ "Merci de vérifier la syntaxe JSON (sans les balises de commentaires PHP) "
1212#~ "en utilisant un validateur de JSON tel que "
1213
1214#~ msgid ""
1215#~ "Error: missing Composer dependencies\n"
1216#~ "\n"
1217#~ "If you installed Shaarli through Git or using the development branch,\n"
1218#~ "please refer to the installation documentation to install PHP "
1219#~ "dependencies using Composer:\n"
1220#~ msgstr ""
1221#~ "Erreur : les dépendances Composer sont manquantes\n"
1222#~ "\n"
1223#~ "Si vous avez installé Shaarli avec Git ou depuis la branche de "
1224#~ "développement\n"
1225#~ "merci de consulter la documentation d'installation pour installer les "
1226#~ "dépendances Composer :\n"
1227#~ "\n"
1228
1201#~ msgid "Sessions do not seem to work correctly on your server." 1229#~ msgid "Sessions do not seem to work correctly on your server."
1202#~ msgstr "Les sessions ne semblent " 1230#~ msgstr "Les sessions ne semblent "
1203 1231