# HG changeset patch
# User jibe
# Date 1262977585 -3600
# Node ID c141eac87368edfff242cac45c52254be909a8fc
# Parent  099e4279bf06fdcee86bab4503c0a33ed860ef0c
Ajout de android:hint dans certaines preferences

diff -r 099e4279bf06 -r c141eac87368 .classpath
--- a/.classpath	Fri Jan 08 17:26:22 2010 +0100
+++ b/.classpath	Fri Jan 08 20:06:25 2010 +0100
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="lib" path="libs/smackx-debug.jar"/>
-	<classpathentry kind="lib" path="libs/smackx-jingle.jar" sourcepath="/home/nikita/devel/smack">
-		<attributes>
-			<attribute name="javadoc_location" value="file:/home/nikita/devel/smack_src_3_1_0/javadoc/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="libs/smack.jar" sourcepath="/home/marseille/smack_src_3_1_0/source">
-		<attributes>
-			<attribute name="javadoc_location" value="file:/home/nikita/devel/smack_src_3_1_0/javadoc/org/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="libs/smackx.jar" sourcepath="/home/nikita/devel/smack">
-		<attributes>
-			<attribute name="javadoc_location" value="file:/home/nikita/devel/smack_src_3_1_0/javadoc/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="libs/jlibrtp.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="file:/home/nikita/android/docs/reference/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="lib" path="libs/security.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="lib" path="libs/smackx-debug.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/smackx-jingle.jar" sourcepath="/home/nikita/devel/smack">
+		<attributes>
+			<attribute name="javadoc_location" value="file:/home/nikita/devel/smack_src_3_1_0/javadoc/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="libs/smack.jar" sourcepath="/home/marseille/smack_src_3_1_0/source">
+		<attributes>
+			<attribute name="javadoc_location" value="file:/home/nikita/devel/smack_src_3_1_0/javadoc/org/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="libs/smackx.jar" sourcepath="/home/nikita/devel/smack">
+		<attributes>
+			<attribute name="javadoc_location" value="file:/home/nikita/devel/smack_src_3_1_0/javadoc/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="libs/jlibrtp.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="file:/home/nikita/android/docs/reference/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="libs/security.jar"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff -r 099e4279bf06 -r c141eac87368 res/layout/preferences.xml
--- a/res/layout/preferences.xml	Fri Jan 08 17:26:22 2010 +0100
+++ b/res/layout/preferences.xml	Fri Jan 08 20:06:25 2010 +0100
@@ -12,7 +12,8 @@
 	<PreferenceCategory android:title="@string/user_preferences">
 		<EditTextPreference android:singleLine="true"
 			android:summary="@string/SettingsText" android:title="@string/settings_account_username"
-			android:key="settings_key_account_username" />
+			android:key="settings_key_account_username"
+			android:hint="@string/login_username_info_default" />
 		<EditTextPreference android:name="password"
 			android:singleLine="true" android:password="true" android:summary="@string/SettingsPassword"
 			android:title="@string/settings_account_password" android:key="settings_key_account_password" />
@@ -51,7 +52,8 @@
 				<EditTextPreference android:singleLine="true"
 					android:dependency="settings_key_proxy_use" android:name="port"
 					android:summary="@string/SettingsProxyPort" android:title="@string/settings_proxy_port"
-					android:key="settings_key_proxy_port" />
+					android:key="settings_key_proxy_port"
+					android:hint="@string/comments_proxy_port" />
 			</PreferenceCategory>
 			<PreferenceCategory android:title="@string/proxy_user_settings">
 				<EditTextPreference android:singleLine="true"
@@ -80,11 +82,13 @@
 			<EditTextPreference android:singleLine="true"
 				android:dependency="settings_key_specific_server" android:name="adresse"
 				android:summary="@string/SettingsAdvancedAddOpt" android:title="@string/settings_xmpp_server"
-				android:key="settings_key_xmpp_server" />
+				android:key="settings_key_xmpp_server" 
+				android:hint="@string/comments_xmpp_server"/>
 			<EditTextPreference android:singleLine="true"
 				android:dependency="settings_key_specific_server" android:name="port"
 				android:summary="@string/SettingsAdvancedPortOpt" android:title="@string/settings_xmpp_port"
-				android:defaultValue="5222" android:key="settings_key_xmpp_port" />
+				android:defaultValue="5222" android:key="settings_key_xmpp_port" 
+				android:hint="@string/comments_xmpp_port"/>
 		</PreferenceScreen>
 	</PreferenceCategory>
 </PreferenceScreen>
diff -r 099e4279bf06 -r c141eac87368 res/values-fr/strings.xml
--- a/res/values-fr/strings.xml	Fri Jan 08 17:26:22 2010 +0100
+++ b/res/values-fr/strings.xml	Fri Jan 08 20:06:25 2010 +0100
@@ -206,6 +206,7 @@
 	
 	<!-- EditSettings Activity Account tab -->
 	<string name="settings_account_username">Nom d\'utilisateur</string>
+	<string name="login_username_info_default">Identifiant Jabber (JID)</string>
 	<string name="settings_account_password">Mot de passe</string>
 	<string name="settings_account_server">Serveur</string>
 	<string name="settings_account_port">Port</string>
@@ -214,7 +215,9 @@
 	<string name="settings_advanced_service_behaviour">Comportement du service</string>
 	<string name="settings_advanced_sum">Une série d\'options pour les utilisateurs avertis</string>
 	<string name="settings_xmpp_server">Serveur</string>
+	<string name="comments_xmpp_server">example.com</string>
 	<string name="settings_xmpp_port">Port</string>
+	<string name="comments_xmpp_port">Default: 5222</string>
 	<string name="settings_xmpp_use_tls">Utiliser SSL/TLS</string>
 	<string name="settings_reco_delay">Délai de reconnexion</string>
 
@@ -225,6 +228,7 @@
 	<string name="settings_proxy_type_prompt">Choisir un type de proxy</string>
 	<string name="settings_proxy_server">Serveur</string>
 	<string name="settings_proxy_port">Port</string>
+	<string name="comments_proxy_port">Default: 1080</string>
 	<string name="settings_proxy_username">Nom d\'utilisateur</string>
 	<string name="settings_proxy_password">Mot de passe</string>
 
diff -r 099e4279bf06 -r c141eac87368 res/values/strings.xml
--- a/res/values/strings.xml	Fri Jan 08 17:26:22 2010 +0100
+++ b/res/values/strings.xml	Fri Jan 08 20:06:25 2010 +0100
@@ -197,6 +197,7 @@
 
 	<!-- EditSettings Activity Account tab -->
 	<string name="settings_account_username">Username</string>
+	<string name="login_username_info_default">Jabber identifier (JID)</string>
 	<string name="settings_account_password">Password</string>
 	<string name="settings_account_server">Server</string>
 	<string name="settings_account_port">Port</string>
@@ -205,9 +206,11 @@
 	<string name="settings_advanced_service_behaviour">Service behaviour</string>
 	<string name="settings_advanced_sum">A set of options for advanced users</string>
 	<string name="settings_xmpp_server">Address</string>
+	<string name="comments_xmpp_server">example.com</string>
 	<string name="settings_xmpp_port">Port</string>
 	<string name="settings_xmpp_use_tls">Require SSL/TLS</string>
 	<string name="settings_reco_delay">Reconnection delay</string>
+	<string name="comments_xmpp_port">Default: 5222</string>
 
 	<!-- EditSettings Activity Proxy tab -->
 	<string name="settings_proxy_sum">Settings for proxy usage</string>
@@ -215,6 +218,7 @@
 	<string name="settings_proxy_type_prompt">Choose a type of proxy</string>
 	<string name="settings_proxy_server">Server</string>
 	<string name="settings_proxy_port">Port</string>
+	<string name="comments_proxy_port">Default: 1080</string>
 	<string name="settings_proxy_username">Username</string>
 	<string name="settings_proxy_password">Password</string>