summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-08-03 14:00:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-03 14:00:37 +0000
commit32caf0778a0e4db0c97a1b2f153699b58f13a8ab (patch)
tree0e2c61e25f01366a50f1fc7c6bc0c5b54558ba61
parentdb76ee0a6873b42156d9ab6060ec996940d677ed (diff)
parent02f42ca49718fa6338c42c96507e13673e242822 (diff)
downloadframeworks_base-32caf0778a0e4db0c97a1b2f153699b58f13a8ab.zip
frameworks_base-32caf0778a0e4db0c97a1b2f153699b58f13a8ab.tar.gz
frameworks_base-32caf0778a0e4db0c97a1b2f153699b58f13a8ab.tar.bz2
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
-rw-r--r--packages/SettingsLib/res/values-fr/strings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsLib/res/values-fr/strings.xml b/packages/SettingsLib/res/values-fr/strings.xml
index e502c5f..b184160 100644
--- a/packages/SettingsLib/res/values-fr/strings.xml
+++ b/packages/SettingsLib/res/values-fr/strings.xml
@@ -74,7 +74,7 @@
<string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Annuler"</string>
<string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"L\'association vous permet d\'accéder à vos contacts et à l\'historique des appels lorsque vous êtes connecté."</string>
<string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Impossible d\'associer à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
- <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Impossible d\'établir l\'association avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g> en raison d\'un code PIN ou d\'une clé d\'accès incorrects."</string>
+ <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Impossible d\'établir l\'association avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g> en raison d\'un code ou d\'une clé d\'accès incorrects."</string>
<string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Impossible d\'établir la communication avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
<string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Association refusée par <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
<string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi désactivé"</string>