equal
deleted
inserted
replaced
10 </PreferenceScreen> |
10 </PreferenceScreen> |
11 </PreferenceCategory> |
11 </PreferenceCategory> |
12 <PreferenceCategory android:title="@string/user_preferences"> |
12 <PreferenceCategory android:title="@string/user_preferences"> |
13 <EditTextPreference android:singleLine="true" |
13 <EditTextPreference android:singleLine="true" |
14 android:summary="@string/SettingsText" android:title="@string/settings_account_username" |
14 android:summary="@string/SettingsText" android:title="@string/settings_account_username" |
15 android:key="settings_key_account_username" /> |
15 android:key="settings_key_account_username" |
|
16 android:hint="@string/login_username_info_default" /> |
16 <EditTextPreference android:name="password" |
17 <EditTextPreference android:name="password" |
17 android:singleLine="true" android:password="true" android:summary="@string/SettingsPassword" |
18 android:singleLine="true" android:password="true" android:summary="@string/SettingsPassword" |
18 android:title="@string/settings_account_password" android:key="settings_key_account_password" /> |
19 android:title="@string/settings_account_password" android:key="settings_key_account_password" /> |
19 <EditTextPreference |
20 <EditTextPreference |
20 android:key="settings_key_resource" |
21 android:key="settings_key_resource" |
49 android:summary="@string/SettingsProxyServer" android:title="@string/settings_proxy_server" |
50 android:summary="@string/SettingsProxyServer" android:title="@string/settings_proxy_server" |
50 android:key="settings_key_proxy_server" /> |
51 android:key="settings_key_proxy_server" /> |
51 <EditTextPreference android:singleLine="true" |
52 <EditTextPreference android:singleLine="true" |
52 android:dependency="settings_key_proxy_use" android:name="port" |
53 android:dependency="settings_key_proxy_use" android:name="port" |
53 android:summary="@string/SettingsProxyPort" android:title="@string/settings_proxy_port" |
54 android:summary="@string/SettingsProxyPort" android:title="@string/settings_proxy_port" |
54 android:key="settings_key_proxy_port" /> |
55 android:key="settings_key_proxy_port" |
|
56 android:hint="@string/comments_proxy_port" /> |
55 </PreferenceCategory> |
57 </PreferenceCategory> |
56 <PreferenceCategory android:title="@string/proxy_user_settings"> |
58 <PreferenceCategory android:title="@string/proxy_user_settings"> |
57 <EditTextPreference android:singleLine="true" |
59 <EditTextPreference android:singleLine="true" |
58 android:dependency="settings_key_proxy_use" android:name="Utilisateur" |
60 android:dependency="settings_key_proxy_use" android:name="Utilisateur" |
59 android:summary="@string/SettingsProxyUser" android:title="@string/settings_proxy_username" |
61 android:summary="@string/SettingsProxyUser" android:title="@string/settings_proxy_username" |
78 android:defaultValue="false" android:summary="@string/SettingsAdvancedSpecOpt" |
80 android:defaultValue="false" android:summary="@string/SettingsAdvancedSpecOpt" |
79 android:key="settings_key_specific_server" /> |
81 android:key="settings_key_specific_server" /> |
80 <EditTextPreference android:singleLine="true" |
82 <EditTextPreference android:singleLine="true" |
81 android:dependency="settings_key_specific_server" android:name="adresse" |
83 android:dependency="settings_key_specific_server" android:name="adresse" |
82 android:summary="@string/SettingsAdvancedAddOpt" android:title="@string/settings_xmpp_server" |
84 android:summary="@string/SettingsAdvancedAddOpt" android:title="@string/settings_xmpp_server" |
83 android:key="settings_key_xmpp_server" /> |
85 android:key="settings_key_xmpp_server" |
|
86 android:hint="@string/comments_xmpp_server"/> |
84 <EditTextPreference android:singleLine="true" |
87 <EditTextPreference android:singleLine="true" |
85 android:dependency="settings_key_specific_server" android:name="port" |
88 android:dependency="settings_key_specific_server" android:name="port" |
86 android:summary="@string/SettingsAdvancedPortOpt" android:title="@string/settings_xmpp_port" |
89 android:summary="@string/SettingsAdvancedPortOpt" android:title="@string/settings_xmpp_port" |
87 android:defaultValue="5222" android:key="settings_key_xmpp_port" /> |
90 android:defaultValue="5222" android:key="settings_key_xmpp_port" |
|
91 android:hint="@string/comments_xmpp_port"/> |
88 </PreferenceScreen> |
92 </PreferenceScreen> |
89 </PreferenceCategory> |
93 </PreferenceCategory> |
90 </PreferenceScreen> |
94 </PreferenceScreen> |