aboutsummaryrefslogtreecommitdiffstats
path: root/res/values-fr
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-09-12 17:53:42 +0200
committeriNPUTmice <daniel@gultsch.de>2014-09-12 17:53:42 +0200
commit83c3b33f18429dc8788c2b58a31d150bee553d10 (patch)
treef4451e53a65dd25fd434dcb08bdaad53137e987a /res/values-fr
parentcee898084ee27592d774c8f62f5be7fd1edf821b (diff)
parent73cba91c9b08ff512104897b32837f9824f1cd3e (diff)
Merge branch 'development'0.7.1
Diffstat (limited to '')
-rw-r--r--res/values-fr/arrays.xml4
-rw-r--r--res/values-fr/strings.xml3
2 files changed, 5 insertions, 2 deletions
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 97842906..ae140796 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+
<string-array name="resources">
<item>Mobile</item>
<item>Téléphone</item>
@@ -19,4 +20,5 @@
<item>524288</item>
<item>1048576</item>
</string-array>
-</resources>
+
+</resources> \ No newline at end of file
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index df9ab3f5..e15ef416 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -207,5 +207,6 @@
<string name="contact_added_you">Votre correspondant vous a ajouté dans sa liste de contacts</string>
<string name="add_back">Ajouter également</string>
<string name="contact_has_read_up_to_this_point">%s a lu les messages précédents.</string>
+ <string name="pref_ui_options">Options d\'affichage</string>
-</resources>
+</resources> \ No newline at end of file