# HG changeset patch
# User Da Risk <darisk972@gmail.com>
# Date 1274275246 -7200
# Node ID 26927d5eeca930a44a2cd886e9fc9cfbb6cfe654
# Parent  5a09712de41cc88b192f4db1dbcaa4006840a781
Move the translations from array.xml to strings.xml

diff -r 5a09712de41c -r 26927d5eeca9 res/values-de/arrays.xml
--- a/res/values-de/arrays.xml	Wed May 19 15:08:56 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string-array name="proxy_types">
-		<item>HTTP</item>
-		<item>SOCKS4</item>
-		<item>SOCKS5</item>
-	</string-array>
-	<string-array name="status_types">
-		<item name="AvailableForChat">Bereit zum Chatten</item>
-		<item name="Available">Online</item>
-		<item name="Busy">Beschäftigt</item>
-		<item name="Away">Abwesend</item>
-		<item name="Unavailable">N/A</item>
-		<item name="Disconnected">Offline</item>
-	</string-array>
-	<string-array name="privacy_list_select_dialog">
-		<item name="@string/privacy_list_select_dialog_buddies">Kontakte</item>
-		<item name="@string/privacy_list_select_dialog_groups">Gruppen</item>
-		<item name="@string/privacy_list_select_dialog_delete">Löschen</item>
-	</string-array>
-	<string-array name="loganim_state">
-		<item name="@string/loganim_connecting">Verbinden...</item>
-		<item name="@string/loganim_authenticating">Authentifizieren...</item>
-		<item name="@string/loganim_login_success">Erfolgreich angemeldet</item>
-		<item name="@string/loganim_login_failed">Anmeldung gescheitert</item>
-	</string-array>
-</resources>
\ No newline at end of file
diff -r 5a09712de41c -r 26927d5eeca9 res/values-de/strings.xml
--- a/res/values-de/strings.xml	Wed May 19 15:08:56 2010 +0200
+++ b/res/values-de/strings.xml	Wed May 19 15:20:46 2010 +0200
@@ -185,6 +185,12 @@
 	<string name="login_no_connectivity">Keine Internetverbindung gefunden</string>
 	<string name="login_start_msg">Konfiguration der Einstellungen im Menü</string>
 
+	<!-- LoginAnim activity -->
+	<string name="loganim_connecting">Verbinden ...</string>
+	<string name="loganim_authenticating">Authentifizieren ...</string>
+	<string name="loganim_login_success">Erfolgreich angemeldet</string>
+	<string name="loganim_login_failed">Anmeldung gescheitert</string>
+
 	<!-- EditSettings Activity -->
 	<string name="settings_menu_create_account">Konto erstellen</string>
 	<string name="settings_menu_privacy_lists">Meine Privatsphärenliste verwalten</string>
diff -r 5a09712de41c -r 26927d5eeca9 res/values-fr/arrays.xml
--- a/res/values-fr/arrays.xml	Wed May 19 15:08:56 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string-array name="proxy_types">
-		<item>HTTP</item>
-		<item>SOCKS4</item>
-		<item>SOCKS5</item>
-	</string-array>
-	<string-array name="status_types">
-		<item name="AvailableForChat">Disponible pour Bavarder</item>
-		<item name="Available">Disponible</item>
-		<item name="Busy">Occupé(e)</item>
-		<item name="Away">Parti(e)</item>
-		<item name="Unavailable">Indisponible</item>
-		<item name="Disconnected">Déconnecté(e)</item>
-	</string-array>
-	<string-array name="privacy_list_select_dialog">
-		<item name="@string/privacy_list_select_dialog_buddies">Contacts</item>
-		<item name="@string/privacy_list_select_dialog_groups">Groupes</item>
-		<item name="@string/privacy_list_select_dialog_delete">Supprimer</item>
-	</string-array>
-	<string-array name="loganim_state">
-		<item name="@string/loganim_connecting">Connexion en cours...</item>
-		<item name="@string/loganim_authenticating">Authentification...</item>
-		<item name="@string/loganim_login_success">Connexion effectuée</item>
-		<item name="@string/loganim_login_failed">Echec de la connexion</item>
-	</string-array>
-</resources>
diff -r 5a09712de41c -r 26927d5eeca9 res/values-fr/strings.xml
--- a/res/values-fr/strings.xml	Wed May 19 15:08:56 2010 +0200
+++ b/res/values-fr/strings.xml	Wed May 19 15:20:46 2010 +0200
@@ -195,9 +195,13 @@
 	<string name="login_no_connectivity">Pas de connexion internet disponible</string>
 	<string name="login_start_msg">Configuration des informations dans le menu</string>
 
-	<!--
-		EditSettings Activity
-	-->
+	<!-- LoginAnim activity -->
+	<string name="loganim_connecting">Connexion en cours ...</string>
+	<string name="loganim_authenticating">Authentification ...</string>
+	<string name="loganim_login_success">Connexion effectuée</string>
+	<string name="loganim_login_failed">Echec de la connextion</string>
+
+	<!-- EditSettings Activity -->
 	<string name="settings_menu_create_account">Créer un compte</string>
 	<string name="settings_menu_privacy_lists">Gérer mes listes privées</string>
 	<string name="settings_saved_ok">Les paramètres ont été enregistrés avec succès.</string>
diff -r 5a09712de41c -r 26927d5eeca9 res/values-ru/arrays.xml
--- a/res/values-ru/arrays.xml	Wed May 19 15:08:56 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string-array name="proxy_types">
-		<item>HTTP</item>
-		<item>SOCKS4</item>
-		<item>SOCKS5</item>
-	</string-array>
-	<string-array name="status_types">
-		<item name="AvailableForChat">Готов пообщаться</item>
-		<item name="Available">Доступен</item>
-		<item name="Busy">Занят</item>
-		<item name="Away">Oтсутствии</item>
-		<item name="Unavailable">Недоступен</item>
-		<item name="Disconnected">Не в сети</item>
-	</string-array>
-	<string-array name="privacy_list_select_dialog">
-		<item name="@string/privacy_list_select_dialog_buddies">Собеседники</item>
-		<item name="@string/privacy_list_select_dialog_groups">Groups</item>
-		<item name="@string/privacy_list_select_dialog_delete">Delete</item>
-	</string-array>
-	<string-array name="loganim_state">
-		<item name="@string/loganim_connecting">Соединение...</item>
-		<item name="@string/loganim_authenticating">Аутентификация...</item>
-		<item name="@string/loganim_login_success">Логин успешной</item>
-		<item name="@string/loganim_login_failed">Не удалось войти в сеть</item>
-	</string-array>
-</resources>
diff -r 5a09712de41c -r 26927d5eeca9 res/values-ru/strings.xml
--- a/res/values-ru/strings.xml	Wed May 19 15:08:56 2010 +0200
+++ b/res/values-ru/strings.xml	Wed May 19 15:20:46 2010 +0200
@@ -192,6 +192,12 @@
 <string name="login_no_connectivity"></string>
 <string name="login_start_msg"></string>
 
+<!-- LoginAnim activity -->
+<string name="loganim_connecting">Соединение ...</string>
+<string name="loganim_authenticating">Аутентификация ...</string>
+<string name="loganim_login_success">Логин успешной</string>
+<string name="loganim_login_failed">Не удалось войти в сеть</string>
+
 <!-- EditSettings Activity -->
 <string name="settings_menu_create_account">Создать аккаунт</string>
 <string name="settings_menu_privacy_lists">Настроить списки приватности</string>
diff -r 5a09712de41c -r 26927d5eeca9 res/values/arrays.xml
--- a/res/values/arrays.xml	Wed May 19 15:08:56 2010 +0200
+++ b/res/values/arrays.xml	Wed May 19 15:20:46 2010 +0200
@@ -6,12 +6,12 @@
 		<item>SOCKS5</item>
 	</string-array>
 	<string-array name="status_types">
-		<item name="AvailableForChat">Available to chat</item>
-		<item name="Available">Available</item>
-		<item name="Busy">Busy</item>
-		<item name="Away">Away</item>
-		<item name="Unavailable">Unavailable</item>
-		<item name="Disconnected">Disconnected</item>
+		<item name="AvailableForChat">@string/contact_status_msg_available</item>
+		<item name="Available">@string/contact_status_msg_available_chat</item>
+		<item name="Busy">@string/contact_status_msg_dnd</item>
+		<item name="Away">@string/contact_status_msg_away</item>
+		<item name="Unavailable">@string/contact_status_msg_xa</item>
+		<item name="Disconnected">@string/contact_status_msg_offline</item>
 	</string-array>
 	<string-array name="privacy_list_select_dialog">
 		<item name="@string/privacy_list_select_dialog_buddies">Buddies</item>
@@ -19,9 +19,9 @@
 		<item name="@string/privacy_list_select_dialog_delete">Delete</item>
 	</string-array>
 	<string-array name="loganim_state">
-		<item name="@string/loganim_connecting">Connecting...</item>
-		<item name="@string/loganim_authenticating">Authenticating...</item>
-		<item name="@string/loganim_login_success">Login success</item>
-		<item name="@string/loganim_login_failed">Login failed</item>
+		<item>@string/loganim_connecting</item>
+		<item>@string/loganim_authenticating</item>
+		<item>@string/loganim_login_success</item>
+		<item>@string/loganim_login_failed</item>
 	</string-array>
 </resources>
diff -r 5a09712de41c -r 26927d5eeca9 res/values/strings.xml
--- a/res/values/strings.xml	Wed May 19 15:08:56 2010 +0200
+++ b/res/values/strings.xml	Wed May 19 15:20:46 2010 +0200
@@ -186,6 +186,12 @@
 	<string name="login_no_connectivity">No internet connection found</string>
 	<string name="login_start_msg">Settings configuration in menu</string>
 
+	<!-- LoginAnim activity -->
+	<string name="loganim_connecting">Connecting ...</string>
+	<string name="loganim_authenticating">Authenticating ...</string>
+	<string name="loganim_login_success">Login success</string>
+	<string name="loganim_login_failed">Login failed</string>
+
 	<!-- EditSettings Activity -->
 	<string name="settings_menu_create_account">Create an account</string>
 	<string name="settings_menu_privacy_lists">Manage my privacy lists</string>