summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2011-09-28 17:35:18 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-28 17:35:18 -0700
commitd908b40d0b0ed1e7e0b0f41e5060a26465b5cb99 (patch)
tree59a41aa7235ef75d82e2a9397bdfa921bc3ccc78 /core
parenta94489b4394350b1727437818cd4f6d845e97dc0 (diff)
parent9e2e026ff2f6c9468806c1de7a3778e5c3a3b704 (diff)
downloadframeworks_base-d908b40d0b0ed1e7e0b0f41e5060a26465b5cb99.zip
frameworks_base-d908b40d0b0ed1e7e0b0f41e5060a26465b5cb99.tar.gz
frameworks_base-d908b40d0b0ed1e7e0b0f41e5060a26465b5cb99.tar.bz2
Merge "Import revised translations." into ics-factoryrom
Diffstat (limited to 'core')
-rw-r--r--core/res/res/values-en-rGB/strings.xml2
-rw-r--r--core/res/res/values-fr/strings.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml
index 19d60ea..975707b 100644
--- a/core/res/res/values-en-rGB/strings.xml
+++ b/core/res/res/values-en-rGB/strings.xml
@@ -1110,7 +1110,7 @@
<string name="sync_do_nothing" msgid="8717589462945226869">"Do nothing for now."</string>
<string name="choose_account_label" msgid="4191313562041125787">"Select an account"</string>
<string name="add_account_label" msgid="2935267344849993553">"Add an account"</string>
- <string name="choose_account_text" msgid="6891230675141555481">"Which taxonomy would you like to use?"</string>
+ <string name="choose_account_text" msgid="6891230675141555481">"Which account would you like to use?"</string>
<string name="add_account_button_label" msgid="3611982894853435874">"Add account"</string>
<string name="number_picker_increment_button" msgid="4830170763103463443">"Increment"</string>
<string name="number_picker_decrement_button" msgid="2576606679160067262">"Decrement"</string>
diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml
index 32cca9c..c67fba8 100644
--- a/core/res/res/values-fr/strings.xml
+++ b/core/res/res/values-fr/strings.xml
@@ -1161,7 +1161,7 @@
<string name="storage_usb" msgid="3017954059538517278">"Mémoire de stockage USB"</string>
<string name="extract_edit_menu_button" msgid="302060189057163906">"Modifier..."</string>
<string name="data_usage_warning_title" msgid="1955638862122232342">"Avertissement utilisation données"</string>
- <string name="data_usage_warning_body" msgid="7217480745540055170">"Appuyez pour utilisation/param."</string>
+ <string name="data_usage_warning_body" msgid="7217480745540055170">"Appuyez pour voir utilis./param."</string>
<string name="data_usage_3g_limit_title" msgid="7093334419518706686">"Données 2G-3G désactivées"</string>
<string name="data_usage_4g_limit_title" msgid="7636489436819470761">"Données 4G désactivées"</string>
<string name="data_usage_mobile_limit_title" msgid="7869402519391631884">"Données mobiles désactivées"</string>