Merged and moved french translation. Removed unused strings

app/src/main/res/values-de/strings-preferences.xml

@@ -21,6 +21,8 @@
     <!-- Proxy -->
     <string name="pref_title_proxy_enabled">Aktiviere Proxy</string>
     <string name="pref_desc_proxy_enabled">Nutze einen Proxyserver um Firewalls zu umgehen</string>
+    <string name="pref_title_proxy_host">Host</string>
+    <string name="pref_title_proxy_port">Port</string>
 
     <!-- Diaspora Settings -->
     <string name="pref_title_personal_settings">Persönliche Einstellungen</string>

app/src/main/res/values-de/strings.xml

@@ -154,8 +154,6 @@ along with this program.  If not, see http://www.gnu.org/licenses.<br> <br
     <string name="help_about">Changelog</string>
     <string name="jb_profile">Profil</string>
     <string name="shared_by_diaspora_android">*[geteilt durch #DiasporaForAndroid]*</string>
-    <string name="settings_images_switch_off">Bilder nicht laden</string>
-    <string name="settings_images_switch_on">Bilder laden</string>
     <string name="context_menu_save_image">Bild speichern</string>
     <string name="context_menu_share_image">Bild teilen</string>
     <string name="context_menu_copy_link">Linkadresse kopieren</string>

app/src/main/res/values-fr/strings-preferences.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Categories -->
+    <string name="pref_category_visuals">Apparance</string>
+    <string name="pref_category_network">Paramètres du réseau</string>
+    <string name="pref_category_pod_settings">Paramètres du pod</string>
+
+    <!-- Visuals -->
+    <!-- Font size -->
+    <string name="pref_title_font_size">Taille de la police</string>
+    <array name="pref_entries_font_size">
+        <item>Normal</item>
+        <item>Grand</item>
+        <item>Énorme</item>
+    </array>
+
+    <!-- Load images -->
+    <string name="pref_title_load_images">Charger les images</string>
+    <string name="pref_desc_load_images">Disable image loading to safe mobile data</string>
+
+    <!-- Proxy -->
+    <string name="pref_title_proxy_enabled">Activer Proxy</string>
+    <string name="pref_desc_proxy_enabled">Proxy Diaspora\'s traffic to circumvent firewalls.\nMay require restart</string>
+
+    <string name="pref_title_proxy_host">Hôte</string>
+
+    <string name="pref_title_proxy_port">Port</string>
+
+    <!-- Diaspora Settings -->
+    <string name="pref_title_personal_settings">Paramètres personnels</string>
+    <string name="pref_desc_personal_settings">Open your diaspora account settings</string>
+
+    <string name="pref_title_manage_contacts">Contacts</string>
+    <string name="pref_desc_manage_contacts">Gérer votre liste des contacts</string>
+
+    <string name="pref_title_manage_tags">Gérer les Hashtags</string>
+    <string name="pref_desc_manage_tags">Add and delete the hashtags you are following</string>
+
+    <string name="pref_title_change_account">Changer de compte</string>
+    <string name="pref_desc_change_account">Erase local session data and switch to another Diaspora pod/account</string>
+    <string name="pref_warning_change_account">Cette opération va effacer les cookies et données de session. Voulez-vous vraiment changer de compte/pod?</string>
+
+</resources>

app/src/main/res/values-fr/strings.xml

@@ -40,7 +40,6 @@
     <string name="confirmation">Confirmation</string>
     <string name="confirm_pod">Voulez-vous vraiment utiliser\nhttps://%1$s\ncomme pod Diaspora ?</string>
     <string name="confirm_exit">Souhaitez-vous quitter ?</string>
-    <string name="change_pod_warning">Cette opération va effacer les cookies et données de session. Voulez-vous vraiment changer de pod ?</string>
     <string name="new_post">D* Nouveau message</string>
     <string name="notifications">Notifications</string>
     <string name="messages">Discussions</string>
@@ -52,27 +51,16 @@
     <string name="jb_stream">Flux</string>
     <string name="jb_liked">Aimés</string>
     <string name="jb_commented">Commentés</string>
-    <string name="jb_contacts">Contacts</string>
     <string name="jb_mentions">Mentions</string>
     <string name="jb_activities">Activités</string>
     <string name="jb_followed_tags">Hashtags suivis</string>
-    <string name="jb_manage_tags">Gérer les Hashtags</string>
-    <string name="jb_settings">Paramètres personnels</string>
     <string name="jb_aspects">Aspects</string>
-    <string name="jb_pod">Changer de pod</string>
     <string name="jb_public">Activités publiques</string>
     <string name="jb_settings_view">Paramètres de l\'application</string>
-    <string name="jb_settings_diaspora">Paramètres du pod</string>
     <string name="jb_share">Partager du contenu</string>
 
     <string name="settings_font">Changer la taille de la police</string>
-    <string name="settings_images_switch_on">Charger les images</string>
-    <string name="settings_images_switch_off">Ne pas charger les images</string>
     <string name="settings_view">Changer de vue</string>
-    <string name="settings_proxy">Proxy</string>
-    <string name="proxy_enabled">Activé</string>
-    <string name="proxy_host">Hôte</string>
-    <string name="proxy_port">Port</string>
     <string name="share_link">Partager le lien comme texte</string>
     <string name="share_screenshot">Partager la capture d\'écran d\'un site web</string>
     <string name="take_screenshot">Prendre une capture d\'écran d\'un site web</string>
@@ -171,7 +159,7 @@
     <string name="context_menu_open_external_browser">Ouvrir dans un navigateur externe...</string>
     <string name="context_menu_copy_link">Copier le lien dans le presse-papier</string>
     <string name="toast_saved_image_to_location">Enregistrer l\'image sous</string>
-    <string name="share_dotdodot">Partager...</string>
 
     <string name="toast_set_proxy_failed">Attention : connexion au proxy impossible...</string>
+    <string name="share_dotdotdot">Partager...</string>
 </resources>

app/src/main/res/values/strings-preferences.xml

@@ -28,9 +28,9 @@
     <string name="pref_title_proxy_enabled">Enable Proxy</string>
     <string name="pref_desc_proxy_enabled">Proxy Diaspora\'s traffic to circumvent firewalls.\nMay require restart</string>
 
-    <string name="pref_title_proxy_host" translatable="false">Host</string>
+    <string name="pref_title_proxy_host">Host</string>
 
-    <string name="pref_title_proxy_port" translatable="false">Port</string>
+    <string name="pref_title_proxy_port">Port</string>
 
     <!-- Diaspora Settings -->
     <string name="pref_title_personal_settings">Personal settings</string>

app/src/main/res/values/strings.xml

@@ -69,8 +69,6 @@
     <string name="jb_share">Share content</string>
 
     <string name="settings_font">Change font size</string>
-    <string name="settings_images_switch_on">Do load images</string>
-    <string name="settings_images_switch_off">Do not load images</string>
     <string name="settings_view">Change view</string>
     <string name="share_link">Share link as text</string>
     <string name="share_screenshot">Share screenshot of webpage</string>