Reorganize and translate preferences

domogik · Aug 1, 2015 · 63e38c9 · 63e38c9
1 parent 6e72438
commit 63e38c9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
@@ -169,7 +169,11 @@
 	<string name="OPTION_server_http_user_Title">Saisir un nom d\'utilisateur</string>
 	<string name="OPTION_server_http_password">Mot de passe http auth</string>
 	<string name="OPTION_server_http_password_Title">Saisir le mot de passe http auth</string>
-
+ 	<string name="OPTION_butler_settings">Configurer Majordome</string>
+	<string name="OPTION_butler_name">Nom du Majordome</string>
+	<string name="OPTION_your_name">Votre nom</string>
+	<string name="OPTION_butler_explain">Cet écran permet la configuration du majordome</string>
+
 	<string name="usage_settings">Configurer widget</string>
 	<string name="usage_bt_apply">Appliquer</string>
 	<string name="usage_bt_cancel">Annuler</string>
@@ -371,4 +375,5 @@
     <string name="pref_header_mq">MQ</string>
     <string name="butler_default_name">Majordome</string>
     <string name="you_default_name">Vous</string>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -169,6 +169,10 @@
 	<string name="OPTION_server_http_user_Title">Type your username</string>
 	<string name="OPTION_server_http_password">Http auth password</string>
 	<string name="OPTION_server_http_password_Title">Type your http auth password</string>
+    <string name="OPTION_butler_settings">Butler configuration</string>
+	<string name="OPTION_butler_name">Butler name</string>
+	<string name="OPTION_your_name">Your name</string>
+	<string name="OPTION_butler_explain">This screen allow butler configuration</string>
 
 	<string name="usage_settings">Widget configuration</string>
 	<string name="usage_bt_apply">Apply changes</string>

diff --git a/res/xml/preference.xml b/res/xml/preference.xml
@@ -32,7 +32,7 @@ android:title="Préférences">
      <EditTextPreference android:key="MQaddress"
         android:inputType = "textUri"
         android:title="MQ_ADDRESS"
-        />
+        android:selectable="false" android:enabled="false"/>
      <EditTextPreference android:key="MQsubport"
         android:title="MQ_SUB_PORT"
         android:inputType = "number"
@@ -75,7 +75,7 @@ android:title="Préférences">
 </PreferenceCategory><PreferenceCategory android:title="@string/house_settings" android:summary="Soon......">
     <Preference android:summary="@string/house_explain" android:selectable="false" android:shouldDisableView="false" android:enabled="false"/>
 
-</PreferenceCategory><PreferenceCategory android:title="Buttler part"><EditTextPreference android:title="Butler name" android:key="dmg_butler_name" android:summary="Set the Domogik Butler name"></EditTextPreference><EditTextPreference android:title="Your name" android:key="dmg_your_name" android:summary="Set your name"></EditTextPreference></PreferenceCategory>
+</PreferenceCategory><PreferenceCategory android:title="@string/OPTION_butler_settings"><Preference android:selectable="false" android:shouldDisableView="false" android:enabled="false" android:summary="@string/OPTION_butler_explain"/><EditTextPreference android:title="@string/OPTION_butler_name" android:key="dmg_butler_name" android:summary="Set the Domogik Butler name"></EditTextPreference><EditTextPreference android:title="@string/OPTION_your_name" android:key="dmg_your_name" android:summary="Set your name"></EditTextPreference></PreferenceCategory>