chinwag/chinwagsocial
chinwag/chinwagsocial
2
0
Fork 0
Code Issues Pull requests Releases 5 Wiki Activity
chinwagsocial/config/locales
History
JohnD28 691e9112f3 Update fr.yml (#5330) 
* Update fr.yml

Update of french translation and reformatting Privacy Policy for better maintenance.

* Update fr.yml

* Update fr.yml

* Update fr.yml

Corrections suivant les remarques d'Alda.

* Update fr.yml

* Update fr.yml

* Update fr.yml

* Update fr.yml

* Update fr.yml

I have replaced my proposals with those accepted here to reduce the conflict.

https://github.com/tootsuite/mastodon/pull/5340

J'ai remplacé mes propositions par celles acceptées ici pour réduire le conflit.

Comment dois-je faire à l'avenir pour éviter ce genre de situations ?

* Update fr.yml

Conflict reduction.
2017-10-12 15:25:34 +02:00
..
activerecord.ca.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
activerecord.de.yml Update German translation (#5133) 2017-09-28 20:45:09 +02:00
activerecord.en.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
activerecord.fa.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
activerecord.fr.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
activerecord.he.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
activerecord.id.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
activerecord.it.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
activerecord.ja.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
activerecord.nl.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
activerecord.no.yml Update Norwegian translations (#2937) 2017-05-09 14:01:45 +02:00
activerecord.oc.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
activerecord.pl.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
activerecord.ru.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
activerecord.th.yml Add Thai langauge (#2903) 2017-05-08 15:56:00 +02:00
activerecord.uk.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
ar.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
bg.yml Fix short number locales (#4790) 2017-09-03 22:17:34 +09:00
ca.yml Fix short number locales (#4790) 2017-09-03 22:17:34 +09:00
de.yml Update German translation (#5302) 2017-10-10 23:12:18 +09:00
devise.ar.yml Adding arabic string localization (rebased) (#1895) 2017-04-23 05:58:47 +02:00
devise.bg.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
devise.ca.yml Add catalan language (#3084) 2017-05-17 00:25:10 +02:00
devise.de.yml Update German translation (#5189) 2017-10-03 09:53:18 +09:00
devise.en.yml Added a warning to look into the spam folder (#2921) 2017-05-17 02:55:37 +02:00
devise.eo.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
devise.es.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
devise.fa.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
devise.fi.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
devise.fr.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
devise.he.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
devise.hr.yml Apply i18n-tasks normalize to locales (#1696) 2017-04-13 19:18:32 +02:00
devise.hu.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
devise.id.yml Add Indonesian (Bahasa Indonesia / id) translation (#2200) 2017-04-21 19:16:26 +02:00
devise.io.yml Add Ido (io) translation (#2202) 2017-04-21 19:15:25 +02:00
devise.it.yml Fix italian translation 2017-04-13 22:26:32 +02:00
devise.ja.yml Better Japanese translations (#5030) 2017-09-21 01:56:28 +09:00
devise.nl.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
devise.no.yml More Norwegian translations (#1805) 2017-04-15 02:33:37 +02:00
devise.oc.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
devise.pl.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
devise.pt-BR.yml l10n: Full PT-BR translation (#4882) 2017-09-11 08:40:29 +09:00
devise.pt.yml Add Brazilian Portuguese and fix European Portuguese (#1966) 2017-04-17 10:38:27 +02:00
devise.ru.yml Fix Ukrainian malformed locale submitted in #2893, i18n-tasks normalize (#2896) 2017-05-08 01:46:36 +02:00
devise.th.yml Add Thai langauge (#2903) 2017-05-08 15:56:00 +02:00
devise.tr.yml feat(count): Just yml count syntax to provide different rule for 1 (#2685) 2017-05-13 17:13:17 +02:00
devise.uk.yml Fix Ukrainian malformed locale submitted in #2893, i18n-tasks normalize (#2896) 2017-05-08 01:46:36 +02:00
devise.zh-CN.yml Fix Ukrainian malformed locale submitted in #2893, i18n-tasks normalize (#2896) 2017-05-08 01:46:36 +02:00
devise.zh-HK.yml Update Traditional Chinese, HK (zh-HK) translation (#1759) 2017-04-15 02:48:30 +02:00
devise.zh-TW.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
doorkeeper.ar.yml Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
doorkeeper.bg.yml Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
doorkeeper.ca.yml Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
doorkeeper.de.yml Update German translation (#5133) 2017-09-28 20:45:09 +02:00
doorkeeper.en.yml Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
doorkeeper.eo.yml Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
doorkeeper.es.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
doorkeeper.fa.yml Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
doorkeeper.fi.yml Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
doorkeeper.fr.yml Update doorkeeper.fr.yml (#5317) 2017-10-11 22:04:36 +09:00
doorkeeper.he.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
doorkeeper.hr.yml Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
doorkeeper.hu.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
doorkeeper.id.yml Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
doorkeeper.io.yml Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
doorkeeper.it.yml Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
doorkeeper.ja.yml Better Japanese translations (#5030) 2017-09-21 01:56:28 +09:00
doorkeeper.nl.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
doorkeeper.no.yml Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
doorkeeper.oc.yml l10n Occitan: theme site, custom emoji, Oauth, newcomers follow admins, ... (#5023) 2017-09-20 15:00:54 +02:00
doorkeeper.pl.yml i18n: Update Polish translation (#5106) 2017-09-26 14:19:25 +09:00
doorkeeper.pt-BR.yml Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
doorkeeper.pt.yml Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
doorkeeper.ru.yml Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
doorkeeper.th.yml Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
doorkeeper.uk.yml Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
doorkeeper.zh-CN.yml Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
doorkeeper.zh-HK.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
doorkeeper.zh-TW.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
en.yml Add moderation note (#5240) 2017-10-07 20:26:43 +02:00
eo.yml Translate some Esperanto (#5252) 2017-10-08 14:30:14 +09:00
es.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
fa.yml l10n: update Persian translation (#4946) 2017-09-15 00:13:38 +09:00
fi.yml Change wording on landing page. (#4805) 2017-09-30 16:25:14 +02:00
fr.yml Update fr.yml (#5330) 2017-10-12 15:25:34 +02:00
he.yml Fix short number locales (#4790) 2017-09-03 22:17:34 +09:00
hr.yml Fix short number locales (#4790) 2017-09-03 22:17:34 +09:00
hu.yml Fix short number locales (#4790) 2017-09-03 22:17:34 +09:00
id.yml Fix short number locales (#4790) 2017-09-03 22:17:34 +09:00
io.yml Fix short number locales (#4790) 2017-09-03 22:17:34 +09:00
it.yml Fix short number locales (#4790) 2017-09-03 22:17:34 +09:00
ja.yml Update ja.yml (#5342) 2017-10-12 12:18:13 +09:00
ko.yml Korean translation (#5244) 2017-10-07 14:16:59 +09:00
nl.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
no.yml Fix short number locales (#4790) 2017-09-03 22:17:34 +09:00
oc.yml Moderation notes (#5344) 2017-10-12 15:28:15 +09:00
pl.yml i18n: Update Polish translation (#5346) 2017-10-12 16:56:03 +09:00
pt-BR.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
pt.yml Fix short number locales (#4790) 2017-09-03 22:17:34 +09:00
ru.yml Fix short number locales (#4790) 2017-09-03 22:17:34 +09:00
simple_form.ar.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
simple_form.bg.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
simple_form.ca.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
simple_form.de.yml Update German translation (#5189) 2017-10-03 09:53:18 +09:00
simple_form.en.yml Reorganize preferences page (#5161) 2017-10-01 10:52:39 +02:00
simple_form.eo.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
simple_form.es.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
simple_form.fa.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
simple_form.fi.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
simple_form.fr.yml Fixes and updates for the French translation (#5340) 2017-10-12 00:58:01 +02:00
simple_form.he.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
simple_form.hr.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
simple_form.hu.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
simple_form.id.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
simple_form.io.yml Add Ido (io) translation (#2202) 2017-04-21 19:15:25 +02:00
simple_form.it.yml Fix italian translation 2017-04-13 22:26:32 +02:00
simple_form.ja.yml Update ja.yml (#5342) 2017-10-12 12:18:13 +09:00
simple_form.ko.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
simple_form.nl.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
simple_form.no.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
simple_form.oc.yml Fix theme translations alphabetically (#5031) 2017-09-20 19:41:35 +02:00
simple_form.pl.yml i18n: Update translation files and Polish translation (#5180) 2017-10-02 23:38:40 +02:00
simple_form.pt-BR.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
simple_form.pt.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
simple_form.ru.yml Update Russian translation (#4407) 2017-07-28 08:16:30 +09:00
simple_form.th.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
simple_form.tr.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
simple_form.uk.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
simple_form.zh-CN.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
simple_form.zh-HK.yml Enhance for the Chinese translation (#3198) 2017-05-21 11:23:59 +02:00
simple_form.zh-TW.yml Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
th.yml Fix short number locales (#4790) 2017-09-03 22:17:34 +09:00
tr.yml Fix short number locales (#4790) 2017-09-03 22:17:34 +09:00
uk.yml Fix short number locales (#4790) 2017-09-03 22:17:34 +09:00
zh-CN.yml Minor Chinese check & jsx addition (#4973) 2017-09-16 18:48:38 +02:00
zh-HK.yml Minor Chinese check & jsx addition (#4973) 2017-09-16 18:48:38 +02:00
zh-TW.yml Minor Chinese check & jsx addition (#4973) 2017-09-16 18:48:38 +02:00