summaryrefslogtreecommitdiffstats
path: root/remoting/resources
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-11 23:03:42 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-11 23:03:42 +0000
commit164aa4ea183b18dbad33c2ab19bca9f1936153a2 (patch)
treee09dc78eb6a4254017606f9ca93cdd14690c50cb /remoting/resources
parente579d0d2ea88d79562706e08cf03428291b1e687 (diff)
downloadchromium_src-164aa4ea183b18dbad33c2ab19bca9f1936153a2.zip
chromium_src-164aa4ea183b18dbad33c2ab19bca9f1936153a2.tar.gz
chromium_src-164aa4ea183b18dbad33c2ab19bca9f1936153a2.tar.bz2
Rename he and nb translation files so they can be imported properly from TC
Translation console uses 'iw' and 'no' language codes for Hebrew and Norwegian Bokmål instead of 'he' and 'nb' used for the same languages in Chrome. Previously the xtb files for chromoting were using he and nb codes, and as result these files were not updated. BUG=362338 R=lambroslambrou@chromium.org Review URL: https://codereview.chromium.org/233293006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263391 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/resources')
-rw-r--r--remoting/resources/remoting_strings.grd16
-rw-r--r--remoting/resources/remoting_strings_iw.xtb (renamed from remoting/resources/remoting_strings_he.xtb)4
-rw-r--r--remoting/resources/remoting_strings_no.xtb (renamed from remoting/resources/remoting_strings_nb.xtb)4
3 files changed, 14 insertions, 10 deletions
diff --git a/remoting/resources/remoting_strings.grd b/remoting/resources/remoting_strings.grd
index 6400298..b0cd9a9 100644
--- a/remoting/resources/remoting_strings.grd
+++ b/remoting/resources/remoting_strings.grd
@@ -31,7 +31,8 @@
<output filename="remoting/resources/ko.pak" lang="ko" type="data_package"/>
<output filename="remoting/resources/lt.pak" lang="lt" type="data_package"/>
<output filename="remoting/resources/lv.pak" lang="lv" type="data_package"/>
- <output filename="remoting/resources/nb.pak" lang="nb" type="data_package"/>
+ <!-- The translation console uses 'no' for Norwegian (Bokmål), but we use 'nb'. -->
+ <output filename="remoting/resources/nb.pak" lang="no" type="data_package"/>
<output filename="remoting/resources/nl.pak" lang="nl" type="data_package"/>
<output filename="remoting/resources/pl.pak" lang="pl" type="data_package"/>
<output filename="remoting/resources/pt-BR.pak" lang="pt-BR" type="data_package"/>
@@ -74,7 +75,8 @@
<output filename="remoting/webapp/_locales/ko/messages.json" lang="ko" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/lt/messages.json" lang="lt" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/lv/messages.json" lang="lv" type="chrome_messages_json"/>
- <output filename="remoting/webapp/_locales/nb/messages.json" lang="nb" type="chrome_messages_json"/>
+ <!-- The translation console uses 'no' for Norwegian (Bokmål), but Chrome uses 'nb'. -->
+ <output filename="remoting/webapp/_locales/nb/messages.json" lang="no" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/nl/messages.json" lang="nl" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/pl/messages.json" lang="pl" type="chrome_messages_json"/>
<output filename="remoting/webapp/_locales/pt_BR/messages.json" lang="pt-BR" type="chrome_messages_json"/>
@@ -109,18 +111,19 @@
<output filename="remoting/android/res/values-fi/remoting_strings.xml" lang="fi" type="android" context="android_java"/>
<output filename="remoting/android/res/values-tl/remoting_strings.xml" lang="fil" type="android" context="android_java"/>
<output filename="remoting/android/res/values-fr/remoting_strings.xml" lang="fr" type="android" context="android_java"/>
+ <output filename="remoting/android/res/values-he/remoting_strings.xml" lang="he" type="android" context="android_java"/>
<output filename="remoting/android/res/values-hi/remoting_strings.xml" lang="hi" type="android" context="android_java"/>
<output filename="remoting/android/res/values-hr/remoting_strings.xml" lang="hr" type="android" context="android_java"/>
<output filename="remoting/android/res/values-hu/remoting_strings.xml" lang="hu" type="android" context="android_java"/>
<output filename="remoting/android/res/values-in/remoting_strings.xml" lang="id" type="android" context="android_java"/>
<output filename="remoting/android/res/values-it/remoting_strings.xml" lang="it" type="android" context="android_java"/>
- <output filename="remoting/android/res/values-iw/remoting_strings.xml" lang="he" type="android" context="android_java"/>
<output filename="remoting/android/res/values-ja/remoting_strings.xml" lang="ja" type="android" context="android_java"/>
<output filename="remoting/android/res/values-ko/remoting_strings.xml" lang="ko" type="android" context="android_java"/>
<output filename="remoting/android/res/values-lt/remoting_strings.xml" lang="lt" type="android" context="android_java"/>
<output filename="remoting/android/res/values-lv/remoting_strings.xml" lang="lv" type="android" context="android_java"/>
- <output filename="remoting/android/res/values-nl/remoting_strings.xml" lang="nl" type="android" context="android_java"/>
+ <!-- The translation console uses 'no' for Norwegian (Bokmål), but Android uses 'nb'. -->
<output filename="remoting/android/res/values-nb/remoting_strings.xml" lang="no" type="android" context="android_java"/>
+ <output filename="remoting/android/res/values-nl/remoting_strings.xml" lang="nl" type="android" context="android_java"/>
<output filename="remoting/android/res/values-pl/remoting_strings.xml" lang="pl" type="android" context="android_java"/>
<output filename="remoting/android/res/values-pt-rBR/remoting_strings.xml" lang="pt-BR" type="android" context="android_java"/>
<output filename="remoting/android/res/values-pt-rPT/remoting_strings.xml" lang="pt-PT" type="android" context="android_java"/>
@@ -155,7 +158,8 @@
<file lang="fi" path="remoting_strings_fi.xtb"/>
<file lang="fil" path="remoting_strings_fil.xtb"/>
<file lang="fr" path="remoting_strings_fr.xtb"/>
- <file lang="he" path="remoting_strings_he.xtb"/>
+ <!-- The translation console uses 'iw' for Hebrew, but we use 'he'. -->
+ <file lang="he" path="remoting_strings_iw.xtb"/>
<file lang="hi" path="remoting_strings_hi.xtb"/>
<file lang="hr" path="remoting_strings_hr.xtb"/>
<file lang="hu" path="remoting_strings_hu.xtb"/>
@@ -165,7 +169,7 @@
<file lang="ko" path="remoting_strings_ko.xtb"/>
<file lang="lt" path="remoting_strings_lt.xtb"/>
<file lang="lv" path="remoting_strings_lv.xtb"/>
- <file lang="nb" path="remoting_strings_nb.xtb"/>
+ <file lang="no" path="remoting_strings_no.xtb"/>
<file lang="nl" path="remoting_strings_nl.xtb"/>
<file lang="pl" path="remoting_strings_pl.xtb"/>
<file lang="pt-BR" path="remoting_strings_pt-BR.xtb"/>
diff --git a/remoting/resources/remoting_strings_he.xtb b/remoting/resources/remoting_strings_iw.xtb
index a8a6d2b..a0af384 100644
--- a/remoting/resources/remoting_strings_he.xtb
+++ b/remoting/resources/remoting_strings_iw.xtb
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
-<translationbundle lang="he">
+<translationbundle lang="iw">
<translation id="4176825807642096119">קוד גישה</translation>
<translation id="8355326866731426344">תוקפו של קוד גישה זה יפוג בעוד <ph name="TIMEOUT"/></translation>
<translation id="4068946408131579958">כל החיבורים</translation>
@@ -111,4 +111,4 @@
<translation id="332624996707057614">ערוך את שם המחשב</translation>
<translation id="409800995205263688">הערה: הגדרות המדיניות מתירות חיבורים רק בין מחשבים בתוך הרשת שלך.</translation>
<translation id="5843054235973879827">מדוע פעולה זו בטוחה?</translation>
-</translationbundle> \ No newline at end of file
+</translationbundle>
diff --git a/remoting/resources/remoting_strings_nb.xtb b/remoting/resources/remoting_strings_no.xtb
index 64b0b05..f0456a8 100644
--- a/remoting/resources/remoting_strings_nb.xtb
+++ b/remoting/resources/remoting_strings_no.xtb
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
-<translationbundle lang="nb">
+<translationbundle lang="no">
<translation id="4176825807642096119">Tilgangskode</translation>
<translation id="8355326866731426344">Denne tilgangskoden utløper om <ph name="TIMEOUT"/></translation>
<translation id="4068946408131579958">Alle tilkoblinger</translation>
@@ -111,4 +111,4 @@
<translation id="332624996707057614">Rediger datamaskinnavnet</translation>
<translation id="409800995205263688">MERK: I henhold til lokale retningslinjer er tilkobling tillatt bare mellom datamaskiner i nettverket ditt.</translation>
<translation id="5843054235973879827">Hvorfor er dette trygt?</translation>
-</translationbundle> \ No newline at end of file
+</translationbundle>