From 379b0f955c2fcb5cf86b3d492bfdcbad80bb08bd Mon Sep 17 00:00:00 2001 From: Mischa The Evil Date: Mon, 1 Jun 2015 06:15:17 +0200 Subject: [PATCH 2/3] Replace three raw French strings with i18n locales (#19707). r14293 introduced three raw French strings in the roles/_form view, these are now: * replaced with i18n strings, where: * the French strings are transported to fr locales * the French strings are translated to English and added to the en and en-GB locales * the English strings after translation are added to all the remaining locales --- app/views/roles/_form.html.erb | 6 +++--- config/locales/ar.yml | 3 +++ config/locales/az.yml | 3 +++ config/locales/bg.yml | 3 +++ config/locales/bs.yml | 3 +++ config/locales/ca.yml | 3 +++ config/locales/cs.yml | 3 +++ config/locales/da.yml | 3 +++ config/locales/de.yml | 3 +++ config/locales/el.yml | 3 +++ config/locales/en-GB.yml | 3 +++ config/locales/en.yml | 3 +++ config/locales/es-PA.yml | 3 +++ config/locales/es.yml | 3 +++ config/locales/et.yml | 3 +++ config/locales/eu.yml | 3 +++ config/locales/fa.yml | 3 +++ config/locales/fi.yml | 3 +++ config/locales/fr.yml | 3 +++ config/locales/gl.yml | 3 +++ config/locales/he.yml | 3 +++ config/locales/hr.yml | 3 +++ config/locales/hu.yml | 3 +++ config/locales/id.yml | 3 +++ config/locales/it.yml | 3 +++ config/locales/ja.yml | 3 +++ config/locales/ko.yml | 3 +++ config/locales/lt.yml | 3 +++ config/locales/lv.yml | 3 +++ config/locales/mk.yml | 3 +++ config/locales/mn.yml | 3 +++ config/locales/nl.yml | 3 +++ config/locales/no.yml | 3 +++ config/locales/pl.yml | 3 +++ config/locales/pt-BR.yml | 3 +++ config/locales/pt.yml | 3 +++ config/locales/ro.yml | 3 +++ config/locales/ru.yml | 3 +++ config/locales/sk.yml | 3 +++ config/locales/sl.yml | 3 +++ config/locales/sq.yml | 3 +++ config/locales/sr-YU.yml | 3 +++ config/locales/sr.yml | 3 +++ config/locales/sv.yml | 3 +++ config/locales/th.yml | 3 +++ config/locales/tr.yml | 3 +++ config/locales/uk.yml | 3 +++ config/locales/vi.yml | 3 +++ config/locales/zh-TW.yml | 3 +++ config/locales/zh.yml | 3 +++ 50 files changed, 150 insertions(+), 3 deletions(-) diff --git a/app/views/roles/_form.html.erb b/app/views/roles/_form.html.erb index 8feab5d..33fc08d 100644 --- a/app/views/roles/_form.html.erb +++ b/app/views/roles/_form.html.erb @@ -18,16 +18,16 @@ <% unless @role.builtin? %>

- + <% Role.givable.sorted.each do |role| %>