--- a/res/layout/preferences.xml Fri May 07 22:19:19 2010 +0200
+++ b/res/layout/preferences.xml Wed May 19 15:28:05 2010 +0200
@@ -25,11 +25,11 @@
android:hint="@string/away_message_hint" />
</PreferenceScreen>
<PreferenceScreen android:title="@string/notification_preferences">
- <CheckBoxPreference android:title="@string/notification_disable_vibrate_title"
- android:defaultValue="false" android:summary="@string/notification_disable_vibrate_sum"
- android:key="settings_notification_disable_vibrate" />
+ <CheckBoxPreference android:title="@string/notification_enable_vibrate_title"
+ android:defaultValue="false" android:summary="@string/notification_enable_vibrate_sum"
+ android:key="notification_vibrate" />
<RingtonePreference
- android:title="@string/notification_snd_title" android:key="settings_notification_snd"
+ android:title="@string/notification_snd_title" android:key="notification_sound"
android:summary="@string/notification_snd_sum" android:ringtoneType="notification"
android:showDefault="true" />
</PreferenceScreen>
@@ -56,31 +56,31 @@
android:summary="@string/settings_proxy_sum">
<CheckBoxPreference android:title="@string/SettingsProxyProxy"
android:defaultValue="false" android:summary="@string/SettingsProxySummary"
- android:key="settings_key_proxy_use" />
+ android:key="proxy_use" />
<PreferenceCategory android:title="@string/proxy_proxy_settings">
- <ListPreference android:dependency="settings_key_proxy_use"
+ <ListPreference android:dependency="proxy_use"
android:title="@string/SettingsProxyType" android:entries="@array/proxy_types"
android:summary="@string/SettingsProxyTypeSummary"
android:defaultValue="HTTP" android:entryValues="@array/proxy_types"
- android:key="settings_key_proxy_type" />
+ android:key="proxy_type" />
<EditTextPreference android:singleLine="true"
- android:dependency="settings_key_proxy_use" android:name="serveur"
+ android:dependency="proxy_use" android:name="serveur"
android:summary="@string/SettingsProxyServer" android:title="@string/settings_proxy_server"
- android:key="settings_key_proxy_server" />
+ android:key="proxy_server" />
<EditTextPreference android:singleLine="true"
- android:dependency="settings_key_proxy_use" android:name="port"
+ android:dependency="proxy_use" android:name="port"
android:summary="@string/SettingsProxyPort" android:title="@string/settings_proxy_port"
- android:key="settings_key_proxy_port" android:numeric="signed" android:hint="@string/comments_proxy_port" />
+ android:key="proxy_port" android:numeric="signed" android:hint="@string/comments_proxy_port" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/proxy_user_settings">
<EditTextPreference android:singleLine="true"
- android:dependency="settings_key_proxy_use" android:name="Utilisateur"
+ android:dependency="proxy_use" android:name="Utilisateur"
android:summary="@string/SettingsProxyUser" android:title="@string/settings_proxy_username"
- android:key="settings_key_proxy_username" />
+ android:key="proxy_username" />
<EditTextPreference android:singleLine="true"
- android:dependency="settings_key_proxy_use" android:name="pass_user"
+ android:dependency="proxy_use" android:name="pass_user"
android:password="true" android:summary="@string/SettingsProxyPassword"
- android:title="@string/settings_proxy_password" android:key="settings_key_proxy_password" />
+ android:title="@string/settings_proxy_password" android:key="proxy_password" />
</PreferenceCategory>
</PreferenceScreen>
<PreferenceScreen android:key="advanced"
--- a/res/values-de/strings.xml Fri May 07 22:19:19 2010 +0200
+++ b/res/values-de/strings.xml Wed May 19 15:28:05 2010 +0200
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+ <!-- Generic terms -->
<string name="app_name">Beem</string>
<string name="OkButton">Ok</string>
<string name="ClearButton">Löschen</string>
<string name="CancelButton">Abbrechen</string>
<string name="AcceptButton">Authorisieren</string>
<string name="RefuseButton">Ablehnen</string>
+
+ <string name="Password">Passwort</string>
<!-- Beem class -->
<string name="BeemJabberID">Jabber ID</string>
@@ -51,7 +54,6 @@
<string name="ChangeStatusType">Mein Status</string>
<string name="ChangeStatusMessage">Meine persönliche Nachricht</string>
<string name="OpenContactList">Kontaktliste öffnen</string>
-
<string name="MenuAddContact">Kontakt hinzufügen</string>
<string name="MenuAccountAbout">Beem Project</string>
@@ -82,6 +84,44 @@
<string name="SettingsPriorityTitle">Priorität</string>
<string name="SettingsResourceSummary">XMPP Ressource des Clients einstellen</string>
<string name="SettingsPrioritySummary">Priorität des Clients einstellen</string>
+ <string name="contact_list_preferences">Kontaktliste</string>
+ <string name="contact_list_preferences_sum">Anzeigeoptionen der Kontaktliste </string>
+ <string name="CLP_hide_groups">Gruppen verstecken</string>
+ <string name="CLP_hide_groups_sum">Aktivieren, um Gruppen zu verstecken</string>
+ <string name="CLP_hidden_contact">Kontakte verstecken</string>
+ <string name="CLP_hidden_contact_sum">Aktivieren, um Kontakte zu verstecken, die offline sind </string>
+ <string name="settings_account_username">Benutzername</string>
+ <string name="login_username_info_default">beem@beem-project.com</string>
+ <string name="settings_account_password">Passwort</string>
+ <string name="settings_account_server">Server</string>
+ <string name="settings_account_port">Port</string>
+ <string name="settings_advanced_service_behaviour">Verhalten des Dienstes</string>
+ <string name="settings_advanced_sum">Erweiterte Einstellungen für fortgeschrittene Benutzer</string>
+ <string name="settings_xmpp_server">Adresse</string>
+ <string name="comments_xmpp_server">example.com</string>
+ <string name="settings_xmpp_port">Port</string>
+ <string name="settings_xmpp_use_tls">Verwende SSL/TLS</string>
+ <string name="settings_reco_delay">Verzögerung bei der Wiederverbindung</string>
+ <string name="comments_xmpp_port">Standard: 5222</string>
+ <string name="settings_proxy_sum">Einstellungen für das Benutzen eines Proxyservers</string>
+ <string name="settings_proxy_use">Benutze einen Proxyserver</string>
+ <string name="settings_proxy_type_prompt">Art des Proxyservers wählen</string>
+ <string name="settings_proxy_server">Server</string>
+ <string name="settings_proxy_port">Port</string>
+ <string name="comments_proxy_port">Standard: 1080</string>
+ <string name="settings_proxy_username">Benutzername</string>
+ <string name="settings_proxy_password">Passwort</string>
+ <string name="away_chk_title">Aktiviere automatische Abwesenheit</string>
+ <string name="away_chk_sum">Status auf Abwesend wenn Bildschirm aus</string>
+ <string name="away_message_title">Abwesendheitsnachricht</string>
+ <string name="away_message_sum">Angezeigte Abwesendheitsnachricht</string>
+ <string name="away_message_hint">Ich bin abwesend, mein Telefonbildschirm ist aus</string>
+ <string name="notification_preferences">Benachrichtigungseinstellungen</string>
+ <string name="notification_enable_vibrate_title">Vibrieren</string>
+ <string name="notification_enable_vibrate_sum">Aktivieren Sie vibriert bei eingehenden Nachrichten</string>
+ <string name="notification_snd_title">Nachrichtensignalton</string>
+ <string name="notification_snd_sum">Lege den Signalton für eingehende Nachrichten fest</string>
+
<!-- Subscription class -->
<string name="SubscriptAccept">Zustimmung angenommen</string>
@@ -129,17 +169,13 @@
<string name="login_menu_settings">Einstellungen</string>
<string name="login_menu_about">Über</string>
<string name="login_about_title">Beem %s - Über</string>
- <string name="login_about_msg">
- Beem ist ein EPITECH Innovative Projekt. Besuche uns auf
- http://www.beem-project.com !
- </string>
+ <string name="login_about_msg"> Beem ist ein EPITECH Innovative Projekt. Besuche uns auf http://www.beem-project.com ! </string>
<string name="login_about_button">Schließen</string>
<string name="login_settings_button">Einstellungen</string>
<string name="login_login_button">Anmelden</string>
<string name="login_login_progress">Verbinden. Bitte warten...</string>
<string name="login_max_retry">Maximaler Wiederholungsversuch</string>
- <string name="login_error_msg">Leider trat ein Fehler auf.\n\nFehler
- Detail:\n%s</string>
+ <string name="login_error_msg">Leider trat ein Fehler auf.\n\nFehler Detail:\n%s</string>
<string name="login_menu_login">Anmelden</string>
<string name="login_no_connectivity">Keine Internetverbindung gefunden</string>
<string name="login_start_msg">Konfiguration der Einstellungen im Menü</string>
@@ -167,43 +203,12 @@
<string name="settings_tab_tag_proxy">edit_settings_tab_proxy</string>
<string name="settings_tab_label_proxy">Proxy</string>
- <!-- EditSettings Activity General Preferences Tabs -->
- <string name="contact_list_preferences">Kontaktliste</string>
- <string name="contact_list_preferences_sum">Anzeigeoptionen der Kontaktliste
- </string>
+
+ <!-- wizard activities -->
+ <string name="account_wizard_text1">Du hast noch keinen Jabberaccount konfiguriert. Wähle eine der folgenden Optionen:</string>
- <string name="CLP_hide_groups">Gruppen verstecken</string>
- <string name="CLP_hide_groups_sum">Aktivieren, um Gruppen zu verstecken</string>
- <string name="CLP_hidden_contact">Kontakte verstecken</string>
- <string name="CLP_hidden_contact_sum">Aktivieren, um Kontakte zu verstecken, die offline sind
- </string>
-
- <!-- EditSettings Activity Account tab -->
- <string name="settings_account_username">Benutzername</string>
- <string name="login_username_info_default">beem@beem-project.com</string>
- <string name="settings_account_password">Passwort</string>
- <string name="settings_account_server">Server</string>
- <string name="settings_account_port">Port</string>
-
- <!-- EditSettings Activity Advanced Options tab -->
- <string name="settings_advanced_service_behaviour">Verhalten des Dienstes</string>
- <string name="settings_advanced_sum">Erweiterte Einstellungen für fortgeschrittene Benutzer</string>
- <string name="settings_xmpp_server">Adresse</string>
- <string name="comments_xmpp_server">example.com</string>
- <string name="settings_xmpp_port">Port</string>
- <string name="settings_xmpp_use_tls">Verwende SSL/TLS</string>
- <string name="settings_reco_delay">Verzögerung bei der Wiederverbindung</string>
- <string name="comments_xmpp_port">Standard: 5222</string>
-
- <!-- EditSettings Activity Proxy tab -->
- <string name="settings_proxy_sum">Einstellungen für das Benutzen eines Proxyservers</string>
- <string name="settings_proxy_use">Benutze einen Proxyserver</string>
- <string name="settings_proxy_type_prompt">Art des Proxyservers wählen</string>
- <string name="settings_proxy_server">Server</string>
- <string name="settings_proxy_port">Port</string>
- <string name="comments_proxy_port">Standard: 1080</string>
- <string name="settings_proxy_username">Benutzername</string>
- <string name="settings_proxy_password">Passwort</string>
+ <string name="account_wizard_configure_account">Ich habe bereits einen Jabberaccount, den ich benutzen will</string>
+ <string name="account_wizard_create_account">Ich möchte einen neuen Account registrieren</string>
<!-- Create an account Activity -->
<string name="create_account_instr_dialog_title">Konto erstellen - Anweisungen</string>
@@ -230,8 +235,7 @@
<string name="userinfo_label_block">Sperren</string>
<string name="userinfo_label_delete">Löschen</string>
<string name="userinfo_resend">Zustimmung erneut senden</string>
- <string name="userinfo_sure2delete">Bist du sicher, dass du diesen Kontakt löschen willst ?
- </string>
+ <string name="userinfo_sure2delete">Bist du sicher, dass du diesen Kontakt löschen willst ? </string>
<string name="userinfo_yes">Ja</string>
<string name="userinfo_no">Nein</string>
<string name="userinfo_sureresend">Bist du sicher, dass du die Einladung erneut senden willst ?</string>
@@ -246,6 +250,10 @@
<string name="chat_dialog_change_chat_title">Offene Chats</string>
<string name="chat_menu_close_chat">Diesen Chat schließen</string>
<string name="chat_no_more_chats">Keine weiteren aktiven Chats</string>
+ <string name="chat_state_composing">schreibt gerade</string>
+ <string name="chat_state_gone">hat die Unterhaltung verlassen</string>
+ <string name="chat_state_active">verfolgt die Unterhaltung</string>
+ <string name="chat_state_inactive">macht etwas anderes</string>
<string name="contact_status_msg_available">Online</string>
<string name="contact_status_msg_available_chat">Bereit zum Chatten</string>
--- a/res/values-fr/strings.xml Fri May 07 22:19:19 2010 +0200
+++ b/res/values-fr/strings.xml Wed May 19 15:28:05 2010 +0200
@@ -119,8 +119,8 @@
<string name="away_message_sum">Votre Message d\'absence</string>
<string name="away_message_hint">Je suis absent car mon ecran est éteind</string>
<string name="notification_preferences">Paramètres des notifications</string>
- <string name="notification_disable_vibrate_title">Vibreur</string>
- <string name="notification_disable_vibrate_sum">Désactiver le vibreur pour les messages entrants</string>
+ <string name="notification_enable_vibrate_title">Activer le vibreur</string>
+ <string name="notification_enable_vibrate_sum">Activer le vibreur pour les messages entrants</string>
<string name="notification_snd_title">Sonnerie des messages</string>
<string name="notification_snd_sum">Configurer la sonnerie des messages entrants</string>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/res/values-ru/arrays.xml Wed May 19 15:28:05 2010 +0200
@@ -0,0 +1,27 @@
+<?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>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/res/values-ru/strings.xml Wed May 19 15:28:05 2010 +0200
@@ -0,0 +1,315 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+<!-- Generic terms -->
+<string name="app_name">Beem</string>
+<string name="OkButton">ОК</string>
+<string name="ClearButton">Очистить</string>
+<string name="CancelButton">Отмена</string>
+<string name="AcceptButton">Разрешить</string>
+<string name="RefuseButton">Отказать</string>
+<string name="JabberID">JID</string>
+<string name="Password">Пароль</string>
+
+<!-- Beem class -->
+<string name="BeemJabberID">JID</string>
+
+<!-- BeemApplication class -->
+<string name="BeemApplicationConnect">Соединяемся...</string>
+
+<!-- BeemService class -->
+<string name="BeemServiceDescription">Использовать сервис Beem</string>
+<string name="BeemServiceCreated"></string>
+<string name="BeemServiceDestroyed"></string>
+
+<!-- ContactListSettings class -->
+<string name="CLSServerConnection">Соединение</string>
+<string name="CLSUserid">Имя пользователя:</string>
+<string name="CLSPassword">Пароль:</string>
+<string name="CLSService">Сервер:</string>
+<string name="CLSHostPort">Порт:</string>
+<string name="CLSProxyInfo">Прокси</string>
+<string name="CLSLogin">Имя пользователя:</string>
+<string name="CLSOkButton">ОК</string>
+
+<!-- ContactDialog class -->
+<string name="CDChat">Написать</string>
+<string name="CDCall">Повонить</string>
+<string name="CDInfos">Настройки</string>
+
+<!-- AddContact class -->
+<string name="AddCActTitle">Добавление контакта</string>
+
+<string name="AddCLogin">Имя пользователя</string>
+<string name="AddCAlias">Псевдоним</string>
+<string name="AddCGroup">Группа</string>
+<string name="AddCOkButton">Добавить</string>
+<string name="AddCContactAdded">Контакт добавлен</string>
+<string name="AddCContactAddedError">При добавлении контакта возникла ошибка</string>
+<string name="AddCContactAddedLoginError">При выполнении входа возникла ошибка</string>
+<string name="AddCBadForm"></string>
+<string name="AddCContactAlready">Контакт уже добавлен</string>
+
+<!-- ChangeStatus class -->
+<string name="ChangeStatusActTitle">Изменение статуса</string>
+<string name="ChangeStatusType">Мой статус</string>
+<string name="ChangeStatusMessage">Персональное сообщение</string>
+<string name="OpenContactList">Открыть список контактов</string>
+
+<string name="MenuAddContact">Добавить новый контакт</string>
+<string name="MenuAccountAbout">О проекте Beem</string>
+<string name="MenuAccountCreate">Создать аккаунт</string>
+<string name="MenuConnection">Изменить аккаунт</string>
+<string name="ChangeStatusOk">Обновляем статус...</string>
+<string name="ChangeStatusNoChange">Ничего не поменялось</string>
+
+<!-- Settings class -->
+<string name="SettingsText">Имя пользователя</string>
+<string name="SettingsPassword">Пароль</string>
+<string name="SettingsProxy">Прокси</string>
+<string name="SettingsProxyProxy">Использовать прокси</string>
+<string name="SettingsProxySummary"></string>
+<string name="SettingsProxyType">Протокол</string>
+<string name="SettingsProxyTypeSummary">Выберите тип прокси</string>
+<string name="SettingsProxyServer">Сервер</string>
+<string name="SettingsProxyPort">Порт</string>
+<string name="SettingsProxyUser"></string>
+<string name="SettingsProxyPassword"></string>
+<string name="SettingsAdvanced">Дополнительно</string>
+<string name="SettingsAdvancedOptions">Дополнительные настройки сервера</string>
+<string name="SettingsAdvancedRecoDelay">Изменить задержку повторного соединения</string>
+<string name="SettingsAdvancedSpecOpt"></string>
+<string name="SettingsAdvancedAddOpt">Сервер</string>
+<string name="SettingsAdvancedPortOpt">Порт</string>
+<string name="SettingsResourceTitle">Ресурс</string>
+<string name="SettingsPriorityTitle">Приоритет</string>
+<string name="SettingsResourceSummary"></string>
+<string name="SettingsPrioritySummary"></string>
+<string name="contact_list_preferences">Список контактов</string>
+<string name="contact_list_preferences_sum">A set of display options for your buddy list
+</string>
+<string name="CLP_hide_groups">Скрывать группы</string>
+<string name="CLP_hide_groups_sum"></string>
+<string name="CLP_hidden_contact">Скрывать оффлайн-контакты</string>
+<string name="CLP_hidden_contact_sum">Check this option to hide unconnected buddies
+</string>
+<string name="settings_account_username">Имя польозвателя</string>
+<string name="login_username_info_default"></string>
+<string name="settings_account_password">Пароль</string>
+<string name="settings_account_server">Сервер</string>
+<string name="settings_account_port">Порт</string>
+<string name="settings_advanced_service_behaviour"></string>
+<string name="settings_advanced_sum"></string>
+<string name="settings_xmpp_server">Сервер</string>
+<string name="comments_xmpp_server"></string>
+<string name="settings_xmpp_port">Порт</string>
+<string name="settings_xmpp_use_tls">Требовать SSL/TLS</string>
+<string name="settings_reco_delay"></string>
+<string name="comments_xmpp_port">По умолчанию 5222</string>
+<string name="settings_proxy_sum"></string>
+<string name="settings_proxy_use">Соединяться через прокси</string>
+<string name="settings_proxy_type_prompt">Выберите тип проси</string>
+<string name="settings_proxy_server">Сервер</string>
+<string name="settings_proxy_port">Порт</string>
+<string name="comments_proxy_port">По умолчанию 1080</string>
+<string name="settings_proxy_username">Имя пользователя</string>
+<string name="settings_proxy_password">Пароль</string>
+<string name="away_chk_title"></string>
+<string name="away_chk_sum"></string>
+<string name="away_message_title"></string>
+<string name="away_message_sum"></string>
+<string name="away_message_hint"></string>
+<string name="notification_preferences">Настройка оповещений</string>
+<string name="notification_enable_vibrate_title">Вибрация</string>
+<string name="notification_enable_vibrate_sum">Активировать вибрировать на входящие сообщения</string>
+<string name="notification_snd_title">Сигнал сообщений</string>
+<string name="notification_snd_sum"></string>
+
+
+<!-- Subscription class -->
+<string name="SubscriptAccept"></string>
+<string name="SubscriptError"></string>
+<string name="SubscriptRefused"></string>
+<string name="SubscriptText"></string>
+<string name="SubscriptTitle"></string>
+
+<!-- ContactList class -->
+<string name="ConListNotConnected">Не подключен</string>
+
+<!-- BeemChatManager -->
+<string name="BeemChatManagerNewMessage">Пришло новое сообщение</string>
+
+<!-- BeemBroadcastReceiver class -->
+<string name="BeemBroadcastReceiverDisconnect"></string>
+
+<!-- XmppConnectionAdapter class -->
+<string name="AcceptContactRequest"></string>
+<string name="AcceptContactRequestFrom"></string>
+
+<!-- Activities -->
+<string name="login_tag"></string>
+<string name="edit_settings_name">Настройки</string>
+<string name="edit_settings_tag"></string>
+<string name="create_account_name">Создать аккаунт</string>
+<string name="create_account_tag"></string>
+<string name="contact_list_name">Контакты</string>
+<string name="contact_list_tag"></string>
+<string name="user_info_name">Информация о пользователе</string>
+
+<!-- Buttons -->
+<string name="button_reset">Очистить</string>
+<string name="button_login">Войти</string>
+<string name="button_save">Сохранить</string>
+<string name="button_create_account"></string>
+<string name="button_create_login_account"></string>
+
+<!-- LogAs Activity -->
+<string name="login_username">Имя пользователя</string>
+<string name="login_password">Пароль</string>
+<string name="login_error_dialog_title">Ошибка входа</string>
+<string name="login_close_dialog_button">Закрыть</string>
+<string name="login_menu_create_account">Создать аккаунт</string>
+<string name="login_menu_settings">Настройки</string>
+<string name="login_menu_about">О программе</string>
+<string name="login_about_title"></string>
+<string name="login_about_msg">
+Beem is an EPITECH Innovative Project. Visit us at
+http://www.beem-project.com !
+</string>
+<string name="login_about_button">Закрыть</string>
+<string name="login_settings_button">Настройки</string>
+<string name="login_login_button">Войти</string>
+<string name="login_login_progress">Соединяемся, подождите немного...</string>
+<string name="login_max_retry"></string>
+<string name="login_error_msg">Unfortunately, an error occured.\n\nError
+detail:\n%s</string>
+<string name="login_menu_login">Войти</string>
+<string name="login_no_connectivity"></string>
+<string name="login_start_msg"></string>
+
+<!-- EditSettings Activity -->
+<string name="settings_menu_create_account">Создать аккаунт</string>
+<string name="settings_menu_privacy_lists">Настроить списки приватности</string>
+<string name="settings_saved_ok"></string>
+
+
+
+<!-- EditSettings Activity Categories -->
+<string name="general_preferences"></string>
+<string name="user_preferences"></string>
+<string name="user_preferences_advanced"></string>
+<string name="network_preferences">Настройки сети</string>
+<string name="proxy_proxy_settings">Настройки прокси</string>
+<string name="proxy_user_settings">Настройки прокси</string>
+
+<!-- EditSettings Activity Tabs -->
+<string name="settings_tab_tag_account"></string>
+<string name="settings_tab_label_account">Аккаунт</string>
+<string name="settings_tab_tag_xmpp"></string>
+<string name="settings_tab_label_xmpp">XMPP</string>
+<string name="settings_tab_tag_proxy"></string>
+<string name="settings_tab_label_proxy">Прокси</string>
+
+
+<!-- wizard activities -->
+<string name="account_wizard_text1"></string>
+<string name="account_wizard_configure_text"></string>
+<string name="account_wizard_configure_account">Использовать существующий аккаунт</string>
+<string name="account_wizard_create_account">Создать новый аккаунт</string>
+
+<!-- Create an account Activity -->
+<string name="create_account_instr_dialog_title"></string>
+<string name="create_account_err_dialog_title"></string>
+<string name="create_account_err_dialog_settings_button">Изменить настройки</string>
+<string name="create_account_close_dialog_button">Закрыть</string>
+<string name="create_account_successfull_after">Аккаунт %s успешно создан</string>
+<string name="create_account_err_username">Неправильный JID</string>
+<string name="create_account_err_passwords">Пароли не совпадают</string>
+<string name="create_account_username">Имя пользователя</string>
+<string name="create_account_password">Пароль</string>
+<string name="create_account_confirm_password">Ещё раз</string>
+
+<!-- ContactList Activity -->
+<string name="contact_list_menu_add_contact">Добавить контакт</string>
+<string name="contact_list_menu_settings">Настройки</string>
+<string name="contact_list_all_contact">Все контакты</string>
+<string name="contact_list_no_group"></string>
+
+<!-- UserInfo dialog -->
+<string name="userinfo_label_alias">Псевдоним</string>
+<string name="userinfo_label_chg_group">Управление группами</string>
+<string name="userinfo_label_re_subscription">Выслать приглашение ещё раз</string>
+<string name="userinfo_label_block">Заблокировать</string>
+<string name="userinfo_label_delete">Удалить</string>
+<string name="userinfo_resend"></string>
+<string name="userinfo_sure2delete">Are you sure you want to delete this contact ?
+</string>
+<string name="userinfo_yes">Да</string>
+<string name="userinfo_no">Нет</string>
+<string name="userinfo_sureresend"></string>
+
+<string name="chat_name">Чат</string>
+<string name="chat_input_default_value"></string>
+<string name="chat_self">Я</string>
+<string name="chat_error">Ошибка</string>
+<string name="chat_send_message">Отправить</string>
+<string name="chat_menu_contacts_list">Список контактов</string>
+<string name="chat_menu_change_chat"></string>
+<string name="chat_dialog_change_chat_title">Открытые чаты</string>
+<string name="chat_menu_close_chat">Закрыть этот чат</string>
+<string name="chat_no_more_chats"></string>
+<string name="chat_state_composing">набирает текст</string>
+<string name="chat_state_gone">покинул чат</string>
+<string name="chat_state_active">вникает в текст</string>
+<string name="chat_state_inactive">занимается чем-то другим</string>
+
+<string name="contact_status_msg_available">Онлайн</string>
+<string name="contact_status_msg_available_chat"></string>
+<string name="contact_status_msg_dnd">Занят</string>
+<string name="contact_status_msg_away">Отошёл</string>
+<string name="contact_status_msg_xa">Недоступен</string>
+<string name="contact_status_msg_offline">Оффлайн</string>
+
+<string name="privacy_list_name">Настройки приватности</string>
+<string name="privacy_list_no_data">Нет списков приватности</string>
+<string name="privacy_list_menu_create">Создать список приватности</string>
+<string name="privacy_list_create_dialog_title">Создать список приватности</string>
+<string name="privacy_list_create_dialog_list_name_label">Название</string>
+<string name="privacy_list_create_dialog_create_button">Создать</string>
+<string name="privacy_list_select_dialog_buddies">Контакты</string>
+<string name="privacy_list_select_dialog_groups">Группы</string>
+<string name="privacy_list_select_dialog_delete">Удалить</string>
+<string name="privacy_list_delete_dialog_msg"></string>
+<string name="privacy_list_delete_dialog_yes">Да</string>
+<string name="privacy_list_delete_dialog_no">Нет</string>
+
+<string name="UpdateButton">Обновить</string>
+
+<!-- Error messages -->
+
+<string name="error_login_authentication">Ошибка: неверно указан логин или пароль</string>
+
+<string name="interna_server_error">Ошибка сервера</string>
+<string name="bad_request"></string>
+<string name="forbidden"></string>
+<string name="item_not_found"></string>
+<string name="conflict"></string>
+<string name="feature_not_implemented"></string>
+<string name="gone"></string>
+<string name="jid_malformed"></string>
+<string name="no_acceptable"></string>
+<string name="not_allowed"></string>
+<string name="not_authorized"></string>
+<string name="payment_required"></string>
+<string name="recipient_unavailable"></string>
+<string name="redirect"></string>
+<string name="registration_required"></string>
+<string name="remote_server_not_found">Сервер не найден</string>
+<string name="remote_server_timeout">Сервер не отвечает</string>
+<string name="remote_server_error">Ошибка сервера</string>
+<string name="resource_constraint"></string>
+<string name="service_unavailable"></string>
+<string name="subscription_required"></string>
+<string name="undefined_condition"></string>
+<string name="unexpected_condition"></string>
+<string name="request_timeout"></string>
+</resources>
--- a/res/values/strings.xml Fri May 07 22:19:19 2010 +0200
+++ b/res/values/strings.xml Wed May 19 15:28:05 2010 +0200
@@ -119,8 +119,8 @@
<string name="away_message_sum">The away message that will be displayed</string>
<string name="away_message_hint">I\'m away, my cellphone screen is off</string>
<string name="notification_preferences">Notification settings</string>
- <string name="notification_disable_vibrate_title">Vibrate</string>
- <string name="notification_disable_vibrate_sum">Vibrate phone for incoming messages</string>
+ <string name="notification_enable_vibrate_title">Enable vibrate</string>
+ <string name="notification_enable_vibrate_sum">Enable vibrate on incoming messages</string>
<string name="notification_snd_title">Message ringtone</string>
<string name="notification_snd_sum">Set your incoming message ringtone</string>
--- a/src/com/beem/project/beem/BeemApplication.java Fri May 07 22:19:19 2010 +0200
+++ b/src/com/beem/project/beem/BeemApplication.java Wed May 19 15:28:05 2010 +0200
@@ -67,6 +67,23 @@
public static final String STATUS_KEY = "status";
/** Preference key for status message. */
public static final String STATUS_TEXT_KEY = "status_text";
+ /** Preference key for the use of a proxy */
+ public static final String PROXY_USE_KEY = "proxy_use";
+ /** Preference key for the type of proxy */
+ public static final String PROXY_TYPE_KEY = "proxy_type";
+ /** Preference key for the proxy server */
+ public static final String PROXY_SERVER_KEY = "proxy_server";
+ /** Preference key for the proxy port */
+ public static final String PROXY_PORT_KEY = "proxy_port";
+ /** Preference key for the proxy username */
+ public static final String PROXY_USERNAME_KEY = "proxy_username";
+ /** Preference key for the proxy password */
+ public static final String PROXY_PASSWORD_KEY = "proxy_password";
+ /** Preference key for vibrate on notification */
+ public static final String NOTIFICATION_VIBRATE_KEY = "notification_vibrate";
+ /** Preference key for notification sound */
+ public static final String NOTIFICATION_SOUND_KEY = "notification_sound";
+
//TODO add the other one
private boolean mIsConnected;
--- a/src/com/beem/project/beem/BeemService.java Fri May 07 22:19:19 2010 +0200
+++ b/src/com/beem/project/beem/BeemService.java Wed May 19 15:28:05 2010 +0200
@@ -64,6 +64,7 @@
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
import android.net.ConnectivityManager;
+import android.net.Uri;
import android.os.IBinder;
import android.os.RemoteException;
import android.preference.PreferenceManager;
@@ -77,7 +78,9 @@
import com.beem.project.beem.utils.Status;
/**
- * This class is for the Beem service. The connection to the xmpp server will be made asynchronously when the service
+ * This class is for the Beem service.
+ * It must contains every global informations needed to maintain the background service.
+ * The connection to the xmpp server will be made asynchronously when the service
* will start.
* @author darisk
*/
@@ -119,13 +122,13 @@
* Initialize the connection.
*/
private void initConnectionConfig() {
- mUseProxy = mSettings.getBoolean("settings_key_proxy_use", false);
+ mUseProxy = mSettings.getBoolean(BeemApplication.PROXY_USE_KEY, false);
if (mUseProxy) {
- String stype = mSettings.getString("settings_key_proxy_type", "HTTP");
- String phost = mSettings.getString("settings_key_proxy_server", "");
- String puser = mSettings.getString("settings_key_proxy_username", "");
- String ppass = mSettings.getString("settings_key_proxy_password", "");
- int pport = Integer.parseInt(mSettings.getString("settings_key_proxy_port", "1080"));
+ String stype = mSettings.getString(BeemApplication.PROXY_TYPE_KEY, "HTTP");
+ String phost = mSettings.getString(BeemApplication.PROXY_SERVER_KEY, "");
+ String puser = mSettings.getString(BeemApplication.PROXY_USERNAME_KEY, "");
+ String ppass = mSettings.getString(BeemApplication.PROXY_PASSWORD_KEY, "");
+ int pport = Integer.parseInt(mSettings.getString(BeemApplication.PROXY_PORT_KEY, "1080"));
ProxyInfo.ProxyType type = ProxyType.valueOf(stype);
mProxyInfo = new ProxyInfo(type, phost, pport, puser, ppass);
} else {
@@ -156,21 +159,16 @@
return mBind;
}
- /* (non-Javadoc)
- * @see android.app.Service#onUnbind(android.content.Intent)
- */
@Override
public boolean onUnbind(Intent intent) {
Log.d(TAG, "ONUNBIND()");
if (!mConnection.getAdaptee().isConnected()) {
- Log.d(TAG, "DESTROYED");
this.stopSelf();
}
return true;
}
-
/**
* {@inheritDoc}
*/
@@ -220,7 +218,6 @@
@Override
public void onDestroy() {
super.onDestroy();
- Log.d("Service", "onDestroy");
resetStatus();
mNotificationManager.cancelAll();
unregisterReceiver(mReceiver);
@@ -247,11 +244,16 @@
}
/**
- * Show a notification.
+ * Show a notification using the preference of the user.
* @param id the id of the notification.
* @param notif the notification to show
*/
public void sendNotification(int id, Notification notif) {
+ if (mSettings.getBoolean(BeemApplication.NOTIFICATION_VIBRATE_KEY, true))
+ notif.defaults |= Notification.DEFAULT_VIBRATE;
+ notif.defaults |= Notification.DEFAULT_LIGHTS;
+ String ringtoneStr = mSettings.getString(BeemApplication.NOTIFICATION_SOUND_KEY, "");
+ notif.sound = Uri.parse(ringtoneStr);
mNotificationManager.notify(id, notif);
}
@@ -397,9 +399,6 @@
public BeemServicePreferenceListener() {
}
- /**
- * {@inheritDoc}
- */
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
if ("settings_away_chk".equals(key)) {
@@ -424,14 +423,11 @@
private int mOldMode;
/**
- * ctor.
+ * Constructor.
*/
public BeemServiceBroadcastReceiver() {
}
- /**
- * {@inheritDoc}
- */
@Override
public void onReceive(final Context context, final Intent intent) {
String intentAction = intent.getAction();
--- a/src/com/beem/project/beem/service/BeemChatManager.java Fri May 07 22:19:19 2010 +0200
+++ b/src/com/beem/project/beem/service/BeemChatManager.java Wed May 19 15:28:05 2010 +0200
@@ -75,8 +75,8 @@
* @author darisk
*/
public class BeemChatManager extends IChatManager.Stub {
- /** Tag to use with log methods. */
- public static final String TAG = "BeemChatManager";
+
+ private static final String TAG = "BeemChatManager";
private final ChatManager mAdaptee;
private final Map<String, ChatAdapter> mChats = new HashMap<String, ChatAdapter>();
private final ChatListener mChatListener = new ChatListener();
@@ -95,9 +95,6 @@
mAdaptee.addChatListener(mChatListener);
}
- /**
- * {@inheritDoc}
- */
@Override
public void addChatCreationListener(IChatManagerListener listener) throws RemoteException {
if (listener != null)
@@ -258,7 +255,7 @@
*/
private PendingIntent makeChatIntent(IChat chat) {
Intent chatIntent = new Intent(mService, com.beem.project.beem.ui.Chat.class);
- chatIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+ chatIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
try {
chatIntent.setData(chat.getParticipant().toUri());
} catch (RemoteException e) {
@@ -280,13 +277,9 @@
.getName();
Notification notification = new Notification(android.R.drawable.stat_notify_chat, tickerText, System
.currentTimeMillis());
- if (!pref.getBoolean("settings_notification_disable_vibrate", true))
- notification.defaults -= Notification.DEFAULT_VIBRATE;
notification.flags = Notification.FLAG_AUTO_CANCEL;
notification.setLatestEventInfo(mService, tickerText, mService
.getString(R.string.BeemChatManagerNewMessage), makeChatIntent(chat));
- String ringtoneStr = pref.getString("settings_notification_snd", "");
- notification.sound = Uri.parse(ringtoneStr);
mService.sendNotification(chat.getParticipant().getJID().hashCode(), notification);
} catch (RemoteException e) {
Log.e(TAG, e.getMessage());
--- a/src/com/beem/project/beem/service/RosterAdapter.java Fri May 07 22:19:19 2010 +0200
+++ b/src/com/beem/project/beem/service/RosterAdapter.java Wed May 19 15:28:05 2010 +0200
@@ -112,20 +112,6 @@
Log.e(TAG, "Error while adding new contact", e);
return null;
}
- if (groups != null) {
- for (String groupStr : groups) {
- RosterGroup group = mAdaptee.getGroup(groupStr);
- if (group == null) {
- group = mAdaptee.createGroup(groupStr);
- }
- try {
- group.addEntry(contact);
- } catch (XMPPException e) {
- e.printStackTrace();
- return null;
- }
- }
- }
return getContactFromRosterEntry(contact);
}
@@ -147,11 +133,8 @@
*/
@Override
public void createGroup(String groupname) throws RemoteException {
- try {
+ if (mAdaptee.getGroup(groupname) == null)
mAdaptee.createGroup(groupname);
- } catch (IllegalArgumentException e) {
- Log.v(TAG, "Error while creating group", e);
- }
}
/**
@@ -170,16 +153,9 @@
@Override
public List<Contact> getContactList() throws RemoteException {
boolean add = true;
- List<Contact> coList = new ArrayList<Contact>(mAdaptee.getEntries().size());
- for (RosterEntry entry : mAdaptee.getEntries()) {
- for (Contact c : coList) {
- if (c.getJID().equals(entry.getUser())) {
- add = false;
- break;
- }
- }
- // Because getEntries return duplicated user.
- if (add)
+ Collection<RosterEntry> list = mAdaptee.getEntries();
+ List<Contact> coList = new ArrayList<Contact>(list.size());
+ for (RosterEntry entry : list) {
coList.add(getContactFromRosterEntry(entry));
}
return coList;
--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java Fri May 07 22:19:19 2010 +0200
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java Wed May 19 15:28:05 2010 +0200
@@ -571,10 +571,10 @@
String from = packet.getFrom();
Notification notif = new Notification(android.R.drawable.stat_notify_more, mService.getString(
R.string.AcceptContactRequest, from), System.currentTimeMillis());
- notif.defaults = Notification.DEFAULT_ALL;
notif.flags = Notification.FLAG_AUTO_CANCEL;
Intent intent = new Intent(mService, Subscription.class);
- intent.putExtra("from", from);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+ .putExtra("from", from);
notif.setLatestEventInfo(mService, from, mService
.getString(R.string.AcceptContactRequestFrom, from), PendingIntent.getActivity(mService, 0,
intent, PendingIntent.FLAG_ONE_SHOT));
@@ -620,16 +620,11 @@
if (p.getType() != Presence.Type.subscribe)
return;
String from = p.getFrom();
- SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(mService);
Notification notification = new Notification(android.R.drawable.stat_notify_more, mService.getString(
R.string.AcceptContactRequest, from), System.currentTimeMillis());
- if (!pref.getBoolean("settings_notification_disable_vibrate", true))
- notification.defaults -= Notification.DEFAULT_VIBRATE;
notification.flags = Notification.FLAG_AUTO_CANCEL;
Intent intent = new Intent(mService, Subscription.class);
intent.putExtra("from", from);
- String ringtoneStr = pref.getString("settings_notification_snd", "");
- notification.sound = Uri.parse(ringtoneStr);
notification.setLatestEventInfo(mService, from, mService
.getString(R.string.AcceptContactRequestFrom, from), PendingIntent.getActivity(mService, 0,
intent, PendingIntent.FLAG_ONE_SHOT));
--- a/src/com/beem/project/beem/ui/Chat.java Fri May 07 22:19:19 2010 +0200
+++ b/src/com/beem/project/beem/ui/Chat.java Wed May 19 15:28:05 2010 +0200
@@ -133,6 +133,7 @@
private final BeemBroadcastReceiver mBroadcastReceiver = new BeemBroadcastReceiver();
private final BeemRosterListener mBeemRosterListener = new BeemRosterListener();
private IXmppFacade mXmppFacade;
+ private boolean mBinded;
/**
* Constructor.
@@ -174,8 +175,10 @@
protected void onResume() {
super.onResume();
mContact = new Contact(getIntent().getData());
- if (mXmppFacade == null)
+ if (!mBinded) {
bindService(SERVICE_INTENT, mConn, BIND_AUTO_CREATE);
+ mBinded = true;
+ }
}
/**
@@ -205,8 +208,10 @@
} catch (RemoteException e) {
Log.e(TAG, e.getMessage());
}
- if (mXmppFacade != null)
+ if (mBinded) {
unbindService(mConn);
+ mBinded = false;
+ }
mXmppFacade = null;
mRoster = null;
mChat = null;
--- a/src/com/beem/project/beem/ui/ContactList.java Fri May 07 22:19:19 2010 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java Wed May 19 15:28:05 2010 +0200
@@ -127,6 +127,7 @@
private IXmppFacade mXmppFacade;
private SharedPreferences mSettings;
private LayoutInflater mInflater;
+ private boolean mBinded;
/**
* Constructor.
@@ -289,8 +290,10 @@
@Override
protected void onResume() {
super.onResume();
- if (mXmppFacade == null)
- bindService(SERVICE_INTENT, mServConn, BIND_AUTO_CREATE);
+ if (!mBinded) {
+ mBinded = bindService(SERVICE_INTENT, mServConn, BIND_AUTO_CREATE);
+ Log.d(TAG, "on resume bind = " + mBinded);
+ }
else {
if (!mSettings.getBoolean("settings_key_hide_groups", false))
buildBanner();
@@ -314,7 +317,10 @@
} catch (RemoteException e) {
Log.d("ContactList", "Remote exception", e);
}
- unbindService(mServConn);
+ if (mBinded) {
+ unbindService(mServConn);
+ mBinded = false;
+ }
mXmppFacade = null;
}
--- a/src/com/beem/project/beem/ui/CreateAccount.java Fri May 07 22:19:19 2010 +0200
+++ b/src/com/beem/project/beem/ui/CreateAccount.java Wed May 19 15:28:05 2010 +0200
@@ -172,7 +172,7 @@
* @return Registered proxy password
*/
private String getRegisteredProxyPassword() {
- return mSettings.getString("settings_key_proxy_password", DEFAULT_STRING_VALUE);
+ return mSettings.getString(BeemApplication.PROXY_PASSWORD_KEY, DEFAULT_STRING_VALUE);
}
/**
@@ -180,7 +180,7 @@
* @return Registered proxy port
*/
private int getRegisteredProxyPort() {
- return Integer.parseInt(mSettings.getString("settings_key_proxy_port", DEFAULT_STRING_VALUE));
+ return Integer.parseInt(mSettings.getString(BeemApplication.PROXY_PORT_KEY, DEFAULT_STRING_VALUE));
}
/**
@@ -188,7 +188,7 @@
* @return Registered proxy server
*/
private String getRegisteredProxyServer() {
- return mSettings.getString("settings_key_proxy_server", DEFAULT_STRING_VALUE);
+ return mSettings.getString(BeemApplication.PROXY_SERVER_KEY, DEFAULT_STRING_VALUE);
}
/**
@@ -197,8 +197,8 @@
*/
private ProxyInfo.ProxyType getRegisteredProxyType() {
ProxyInfo.ProxyType result = ProxyInfo.ProxyType.NONE;
- if (mSettings.getBoolean("settings_key_proxy_use", false)) {
- String type = mSettings.getString("settings_key_proxy_type", "none");
+ if (mSettings.getBoolean(BeemApplication.PROXY_USE_KEY, false)) {
+ String type = mSettings.getString(BeemApplication.PROXY_TYPE_KEY, "none");
if ("HTTP".equals(type))
result = ProxyInfo.ProxyType.HTTP;
else if ("SOCKS4".equals(type))
@@ -216,7 +216,7 @@
* @return Registered proxy use
*/
private boolean getRegisteredProxyUse() {
- return mSettings.getBoolean("settings_key_proxy_use", DEFAULT_BOOLEAN_VALUE);
+ return mSettings.getBoolean(BeemApplication.PROXY_USE_KEY, DEFAULT_BOOLEAN_VALUE);
}
/**
@@ -224,7 +224,7 @@
* @return Registered proxy username
*/
private String getRegisteredProxyUsername() {
- return mSettings.getString("settings_key_proxy_username", DEFAULT_STRING_VALUE);
+ return mSettings.getString(BeemApplication.PROXY_USERNAME_KEY, DEFAULT_STRING_VALUE);
}
/**