Skip to content

X
xabber-android
Commit 789f7972 authored by Grigory Fedorov's avatar Grigory Fedorov
Browse files
Options

Unused string resources removed, new file with untranslatable words created.

parent e654ed76
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 566 deletions
app/src/main/java/com/xabber/android/data/VcardMaps.java
View file @ 789f7972
......@@ -47,15 +47,15 @@ public class VcardMaps {
if (ADDRESS_PROPERTY_MAP.size() != AddressProperty.values().length)
throw new IllegalStateException();
TELEPHONE_TYPE_MAP.put(TelephoneType.BBS, R.string.vcard_type_bbs);
TELEPHONE_TYPE_MAP.put(TelephoneType.BBS, R.string.bbs);
TELEPHONE_TYPE_MAP.put(TelephoneType.CELL, R.string.vcard_type_cell);
TELEPHONE_TYPE_MAP.put(TelephoneType.FAX, R.string.vcard_type_fax);
TELEPHONE_TYPE_MAP.put(TelephoneType.HOME, R.string.vcard_type_home);
TELEPHONE_TYPE_MAP.put(TelephoneType.ISDN, R.string.vcard_type_isdn);
TELEPHONE_TYPE_MAP.put(TelephoneType.ISDN, R.string.isdn);
TELEPHONE_TYPE_MAP.put(TelephoneType.MODEM, R.string.vcard_type_modem);
TELEPHONE_TYPE_MAP.put(TelephoneType.MSG, R.string.vcard_type_msg);
TELEPHONE_TYPE_MAP.put(TelephoneType.PAGER, R.string.vcard_type_pager);
TELEPHONE_TYPE_MAP.put(TelephoneType.PCS, R.string.vcard_type_pcs);
TELEPHONE_TYPE_MAP.put(TelephoneType.PCS, R.string.pcs);
TELEPHONE_TYPE_MAP.put(TelephoneType.PREF, R.string.vcard_type_pref);
TELEPHONE_TYPE_MAP.put(TelephoneType.VIDEO, R.string.vcard_type_video);
TELEPHONE_TYPE_MAP.put(TelephoneType.VOICE, R.string.vcard_type_voice);
......@@ -67,7 +67,7 @@ public class VcardMaps {
EMAIL_TYPE_MAP.put(EmailType.INTERNET, R.string.vcard_type_internet);
EMAIL_TYPE_MAP.put(EmailType.PREF, R.string.vcard_type_pref);
EMAIL_TYPE_MAP.put(EmailType.WORK, R.string.vcard_type_work);
EMAIL_TYPE_MAP.put(EmailType.X400, R.string.vcard_type_x400);
EMAIL_TYPE_MAP.put(EmailType.X400, R.string.x400);
if (EMAIL_TYPE_MAP.size() != EmailType.values().length)
throw new IllegalStateException();
}
......
app/src/main/java/com/xabber/android/data/account/AccountProtocol.java
View file @ 789f7972
......@@ -50,11 +50,9 @@ public enum AccountProtocol {
*/
public int getNameResource() {
if (this == xmpp)
return R.string.account_type_names_xmpp;
return R.string.xmpp;
else if (this == gtalk)
return R.string.account_type_names_gtalk;
else if (this == wlm)
return R.string.account_type_names_wlm;
return R.string.google_talk;
else
throw new UnsupportedOperationException();
}
......@@ -64,11 +62,9 @@ public enum AccountProtocol {
*/
public int getShortResource() {
if (this == xmpp)
return R.string.account_protocol_xmpp_title;
return R.string.xmpp;
else if (this == gtalk)
return R.string.account_protocol_gtalk_title;
else if (this == wlm)
return R.string.account_protocol_wlm_title;
return R.string.google_talk;
else
throw new UnsupportedOperationException();
}
......
app/src/main/java/com/xabber/android/ui/ContactEditor.java
View file @ 789f7972
......@@ -86,7 +86,7 @@ public class ContactEditor extends ContactViewer implements Toolbar.OnMenuItemCl
input.setText(rosterContact.getName());
builder.setView(input);
builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
try {
......@@ -96,7 +96,7 @@ public class ContactEditor extends ContactViewer implements Toolbar.OnMenuItemCl
}
}
});
builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.cancel();
......
app/src/main/java/com/xabber/android/ui/ContactVcardViewerFragment.java
View file @ 789f7972
......@@ -207,7 +207,7 @@ public class ContactVcardViewerFragment extends Fragment implements OnVCardListe
xmppItems.removeAllViews();
View jabberIdView = createItemView(xmppItems, getString(R.string.contact_viewer_jid),
View jabberIdView = createItemView(xmppItems, getString(R.string.jabber_id),
bareAddress, R.drawable.ic_vcard_xmpp_24dp);
if (jabberIdView != null) {
......
app/src/main/java/com/xabber/android/ui/preferences/AccountEditorFragment.java
View file @ 789f7972
......@@ -82,7 +82,7 @@ public class AccountEditorFragment extends BaseSettingsFragment
if (getString(R.string.account_proxy_type_key).equals(key)) {
boolean enabled = !getString(R.string.account_proxy_type_none).equals(newValue)
&& !getString(R.string.account_proxy_type_orbot).equals(newValue);
&& !getString(R.string.orbot).equals(newValue);
for (int id : new Integer[]{R.string.account_proxy_host_key,
R.string.account_proxy_port_key, R.string.account_proxy_user_key,
R.string.account_proxy_password_key,}) {
......
app/src/main/res/values-ru/about_viewer.xml deleted 100644 → 0
View file @ e654ed76
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/about_viewer.png -->
<string name="about_copyright">© Redsolution LTD, 2010–2015</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/about_viewer.png -->
<string name="about_feedback">mailto:info@xabber.com</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/about_viewer.png -->
<string name="about_site">http://www.xabber.com</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/about_viewer.png -->
<string name="about_version">Версия: %s</string>
<string name="about_license">Лицензия: GNU GPLv3\n<a href="https://github.com/redsolution/xabber-android">Программное обеспечение с открытым исходным кодом</a></string>
<string name="about_open_source_xmpp_client">open source XMPP client</string>
</resources>
\ No newline at end of file
app/src/main/res/values-ru/account_editor.xml
View file @ 789f7972
......@@ -22,47 +22,13 @@
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type">Тип учетной записи</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_hints_facebook">учетная запись facebook.com (не email)</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_hints_gtalk">учетная запись gmail.com или службы google</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_hints_livejournal">учетная запись livejournal.com</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_hints_qip">учетная запись qip.ru</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_hints_vkontakte">имя или id на vkontakte.ru (не email)</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_hints_xmpp">имя@сервер.ru</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_hints_ya">учетная запись yandex.ru (не email)</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_helps_facebook">Вы не можете подключиться к чату Facebook, указав свой email. Вы должны указать имя пользователя Facebook и пароль. Дополнительную информацию можно найти на http://www.facebook.com/sitetour/chat.php</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_helps_gtalk">Если у Вас нет учётной записи Google, её можно создать на сайте http://mail.google.com/\nТакже вы можете использовать ваше_имя@ваш_гугло_домен</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_helps_livejournal">Если у Вас нет учётной записи LiveJournal, её можно создать здесь: http://livejournal.com</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_helps_qip">Если у Вас нет учётной записи QIP, её можно создать здесь: http://qip.ru</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_helps_vkontakte">Вы можете указать имя пользователя (например masha.v.kontakte) или указать свой номер (например id123456). Вы не можете войти в чат Вконтакте, использовав свой email. Чтобы войти в чат, Вам надо указать имя пользователя Вконтакте и пароль. Дополнительная информация: http://vk.com/help.php?page=jabber</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_helps_xmpp">Подробную информацию об XMPP (Jabber) можно найти по адресу https://xmpp.org\nЗарегистрировать новую учетную запись можно тут https://register.jabber.org или тут http://jabber.ru</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_helps_ya">Если у Вас нет учетной записи Yandex, её можно создать здесь: http://yandex.com</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
<string name="account_type_names_facebook">Facebook</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
<string name="account_type_names_gtalk">Google Talk</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
<string name="account_type_names_livejournal">LiveJournal</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
<string name="account_type_names_qip">QIP</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
<string name="account_type_names_vkontakte">В контакте</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
<string name="account_type_names_xmpp">XMPP</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
<string name="account_type_names_ya">Я.Онлайн</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_editor_01.png -->
<string name="account_user_name">Имя пользователя</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_error.png -->
......@@ -100,21 +66,11 @@
<string name="account_oauth_invalidated">Не авторизован</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_editor_wlm.png -->
<string name="account_oauth_summary">Настройки авторизации OAuth</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_editor_gtalk.png -->
<string name="account_protocol_gtalk_title">Google Talk</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_editor_wlm.png -->
<string name="account_protocol_wlm_title">WLM</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_editor_01.png -->
<string name="account_protocol_xmpp_title">XMPP</string>
<string name="account_proxy_host">Хост для прокси</string>
<string name="account_proxy_password">Пароль для прокси</string>
<string name="account_proxy_port">Порт для прокси</string>
<string name="account_proxy_type">Тип прокси</string>
<string name="account_proxy_type_http">HTTP</string>
<string name="account_proxy_type_none">Отключено</string>
<string name="account_proxy_type_orbot">Orbot</string>
<string name="account_proxy_type_socks4">SOCKS4</string>
<string name="account_proxy_type_socks5">SOCKS5</string>
<string name="account_proxy_user">Имя пользователя для прокси</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_editor_02.png -->
<string name="account_sasl">Использовать SASL аутентификацию (рекомендуется)</string>
......@@ -142,18 +98,6 @@
<string name="account_tls_require">Требовать TLS</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_editor_02.png -->
<string name="account_tls_require_summary">Требовать TLS шифрование при подключении к серверу</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_helps_odnoklassniki">В качестве имени пользователя нужно использовать ваш ID (например: 123456). Вы не можете войти в чат, использовав свой логин, email или номер телефона. Ваш ID можно узнать в настройках профиля http://www.odnoklassniki.ru/settings</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_helps_wlm">Вы будете перенаправлены на http://live.com для ввода имени пользователя и пароля.</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_hints_odnoklassniki">Номер (ID) на Одноклассниках (не логин или e-mail)</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_hints_wlm"></string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
<string name="account_type_names_odnoklassniki">Одноклассники</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
<string name="account_type_names_wlm">Windows Live Messenger</string>
<string name="account_use_orbot">Использовать анонимное соединение через TOR и требовать TLS шифрование\nНе рекомендуется для Google Talk</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_editor_confirm.png -->
<string name="confirm_cancellation">Вы уверены, что хотите отменить все не сохраненные изменения?</string>
......
app/src/main/res/values-ru/account_list.xml
View file @ 789f7972
......@@ -9,6 +9,7 @@
<string name="account_delete">Удалить учетную запись</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list_context_menu.png -->
<string name="account_editor">Редактировать учетную запись</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list.png -->
<string name="account_state_registration">Регистрация</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list.png -->
<string name="account_state_authentication">Авторизация</string>
......
app/src/main/res/values-ru/change_log.xml deleted 100644 → 0
View file @ e654ed76
This diff is collapsed.
app/src/main/res/values-ru/contact_editor.xml
View file @ 789f7972
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_editor_error.png -->
<string name="CANNOT_ADD_TO_GROUP">Ошибка при добавлении в группу</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_editor_error.png -->
......@@ -40,9 +40,7 @@
<string name="choose_account">Выберите учетную запись</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_editor_error.png -->
<string name="EMPTY_ACCOUNT">Пожалуйста, выберите учетную запись</string>
<string name="add_new_group">Добавить новую группу…</string>
<string name="accept_contact">Разрешить</string>
<string name="decline_contact">Отклонить</string>
</resources>
\ No newline at end of file
app/src/main/res/values-ru/contact_viewer.xml
View file @ 789f7972
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_list_contact_context_menu.png -->
<string name="contact_viewer">Информация о контакте</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_xmpp.png -->
<string name="contact_viewer_for">Просмотр информации о %s</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_xmpp.png -->
<string name="contact_viewer_xmpp">XMPP</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_xmpp.png -->
<string name="contact_viewer_jid">Jabber ID</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_xmpp.png -->
<string name="contact_viewer_name">Присвоенный псевдоним</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_xmpp.png -->
<string name="contact_viewer_resources">Ресурсы</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_xmpp.png -->
<string name="contact_viewer_resource_summary">Ресурс: %1$s\nПриоритет: %2$d\nКлиент: %3$s</string>
<string name="contact_viewer_client">Клиент</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_xmpp.png -->
<string name="contact_viewer_client_info">%1$s, тип: %2$s</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_personal.png -->
<string name="vcard_person">Персональные данные</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_personal.png -->
<string name="vcard_nick_name">Псевдоним</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_personal.png -->
......@@ -98,24 +82,15 @@
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_video">Видео</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_bbs">BBS</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_modem">Модем</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_msg">Голосовая почта</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_isdn">ISDN</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_pcs">PCS</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_internet">Интернет</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_x400">X400</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_xmpp.png -->
<string name="please_wait">Пожалуйста, подождите...</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_xmpp.png -->
<string name="unknown">Не известно</string>
<string name="edit_alias">Редактировать псевдоним</string>
<string name="edit_contact_groups">Редактировать группы</string>
<string name="remove_contact">Удалить контакт</string>
......
app/src/main/res/values-ru/fingerprint_viewer.xml
View file @ 789f7972
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_fingerprint.png -->
<string name="otr_fingerprint_description">Чтобы Вам убедиться, что никто не выдает себя за вашего собеседника, он должен сообщить Вам цифровой отпечаток пальца, который вы сверите с указанным здесь. Не следует использовать XMPP чат для такой проверки.</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_fingerprint.png -->
......
app/src/main/res/values-ru/muc_editor.xml
View file @ 789f7972
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor_error.png -->
<string name="EMPTY_NICK_NAME">Не указан ник</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor_error.png -->
......
app/src/main/res/values-ru/phrase_editor.xml
View file @ 789f7972
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases.png -->
<string name="events_phrases_title">Ключевые фразы</string>
<!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases.png -->
......
app/src/main/res/values-ru/secret_viewer.xml
View file @ 789f7972
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_question.png -->
<string name="otr_answer">Ответ на секретный вопрос:</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_question.png -->
......
app/src/main/res/values-ru/status_editor.xml
View file @ 789f7972
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/status_editor_status.png -->
<string name="available">Доступен</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/status_editor_status.png -->
......
app/src/main/res/values-ru/words.xml
View file @ 789f7972
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_connection_away.png -->
<string name="in10m">Через 10 минут</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_connection_away.png -->
......@@ -29,7 +29,4 @@
<string name="save">Сохранить</string>
<string name="ok">Ok</string>
<string name="cancel">Отмена</string>
</resources>
\ No newline at end of file
app/src/main/res/values/about_viewer.xml
View file @ 789f7972
<?xml version="1.0" encoding="utf-8"?>
<resources>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/about_viewer.png -->
<string name="about_copyright">© Redsolution LTD, 2010–2015</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/about_viewer.png -->
......
app/src/main/res/values/account_editor.xml
View file @ 789f7972
......@@ -22,47 +22,13 @@
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type">Account type</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_hints_facebook">username for facebook.com (not e-mail)</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_hints_gtalk">username for gmail.com or Google Apps domain</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_hints_livejournal">username for livejournal.com</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_hints_qip">username for qip.ru</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_hints_vkontakte">username or id for vkontakte.ru (not e-mail)</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_hints_xmpp">name@example.com</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_hints_ya">username for yandex.ru (not e-mail)</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_helps_facebook">You can not login to Facebook chat using your email. To set up Facebook chat you have to provide your Facebook username and password. You may check http://www.facebook.com/sitetour/chat.php for details.</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_helps_gtalk">If you don\'t have Google account you may create one at http://mail.google.com\nAlso you can use your_user_name@your_google_domain</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_helps_livejournal">If you don\'t have Livejournal account you may create one at http://livejournal.com</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_helps_qip">If you don\'t have QIP account you may create one at http://qip.ru</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_helps_vkontakte">You can enter you name (e.g. masha.v.kontakte) or id (e.g. id123456). You can not login to VKontakte chat using your email. To set up chat you have to provide your Vkontakte.ru username and password. Check http://vk.com/help.php?page=jabber for details.</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_helps_xmpp">If you want to learn more about XMPP (Jabber) here: https://xmpp.org</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_helps_ya">If you don\'t have Ya.Online account you may create one at http://yandex.com</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
<string name="account_type_names_facebook">Facebook</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
<string name="account_type_names_gtalk">Google Talk</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
<string name="account_type_names_livejournal">LiveJournal</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
<string name="account_type_names_qip">QIP</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
<string name="account_type_names_vkontakte">VKontakte</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
<string name="account_type_names_xmpp">XMPP</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
<string name="account_type_names_ya">Ya.Online</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_editor_01.png -->
<string name="account_user_name">Username</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_error.png -->
......@@ -100,21 +66,11 @@
<string name="account_oauth_invalidated">Not authorized</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_editor_wlm.png -->
<string name="account_oauth_summary">OAuth settings</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_editor_gtalk.png -->
<string name="account_protocol_gtalk_title">Google Talk</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_editor_wlm.png -->
<string name="account_protocol_wlm_title">WLM</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_editor_01.png -->
<string name="account_protocol_xmpp_title">XMPP</string>
<string name="account_proxy_host">Proxy host</string>
<string name="account_proxy_password">Proxy password</string>
<string name="account_proxy_port">Proxy port</string>
<string name="account_proxy_type">Proxy type</string>
<string name="account_proxy_type_http">HTTP</string>
<string name="account_proxy_type_none">Disabled</string>
<string name="account_proxy_type_orbot">Orbot</string>
<string name="account_proxy_type_socks4">SOCKS4</string>
<string name="account_proxy_type_socks5">SOCKS5</string>
<string name="account_proxy_user">Proxy user</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_editor_02.png -->
<string name="account_sasl">Use SASL Authentication (recommended)</string>
......@@ -142,18 +98,6 @@
<string name="account_tls_require">Require TLS</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_editor_02.png -->
<string name="account_tls_require_summary">Require TLS encryption when connect to server</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_helps_odnoklassniki">You must use your ID as your user name (e.g. 123456). You can not login to Odnoklasniki chat using your email, login or phone number. Your ID can be found here http://www.odnoklassniki.ru/settings</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_helps_wlm">You will be redirected to http://live.com in order to enter username and password.</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_hints_odnoklassniki">id for odnoklassniki.ru (not login or e-mail)</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add.png -->
<string name="account_type_hints_wlm">-</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
<string name="account_type_names_odnoklassniki">Odnoklassniki</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_add_type.png -->
<string name="account_type_names_wlm">Windows Live Messenger</string>
<string name="account_use_orbot">Chat through TOR anonymity network and force TLS cryptographic protocol\nNot recommended for Google Talk</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_editor_confirm.png -->
<string name="confirm_cancellation">Are you sure you want to discard all the changes?</string>
......
app/src/main/res/values/account_list.xml
View file @ 789f7972
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list_confirm.png -->
<string name="account_delete_confirm">Do you really want to delete account %s?\n(it won\'t be deleted from server, just from Xabber)</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list.png -->
......
app/src/main/res/values/change_log.xml deleted 100644 → 0
View file @ e654ed76
This diff is collapsed.
app/src/main/res/values/connections.xml
View file @ 789f7972
......@@ -35,7 +35,7 @@
<array name="account_type_xmpp">
<item>@string/account_protocol_xmpp</item>
<item>@string/account_type_names_xmpp</item>
<item>@string/xmpp</item>
<item>@string/account_type_hints_xmpp</item>
<item>@string/account_type_helps_xmpp</item>
<item>@drawable/ic_vcard_xmpp_24dp</item>
......@@ -48,7 +48,7 @@
<array name="account_type_gtalk">
<item>@string/account_protocol_gtalk</item>
<item>@string/account_type_names_gtalk</item>
<item>@string/google_talk</item>
<item>@string/account_type_hints_gtalk</item>
<item>@string/account_type_helps_gtalk</item>
<item>@drawable/ic_hangouts_grey600_24dp</item>
......
app/src/main/res/values/contact_editor.xml
View file @ 789f7972
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_editor_error.png -->
<string name="CANNOT_ADD_TO_GROUP">Error: can\'t add to group</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_editor_error.png -->
......@@ -40,9 +40,7 @@
<string name="choose_account">Choose an account</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_editor_error.png -->
<string name="EMPTY_ACCOUNT">Please select an account</string>
<string name="add_new_group">Add new group…</string>
<string name="accept_contact">Authorize</string>
<string name="decline_contact">Discard</string>
</resources>
\ No newline at end of file
app/src/main/res/values/contact_viewer.xml
View file @ 789f7972
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_list_contact_context_menu.png -->
<string name="contact_viewer">Contact info</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_xmpp.png -->
<string name="contact_viewer_for">View information about %s</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_xmpp.png -->
<string name="contact_viewer_xmpp">XMPP</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_xmpp.png -->
<string name="contact_viewer_jid">Jabber ID</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_xmpp.png -->
<string name="contact_viewer_name">Jabber name</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_xmpp.png -->
<string name="contact_viewer_resources">Resources</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_xmpp.png -->
<string name="contact_viewer_resource_summary">Resource: %1$s\nPriority: %2$d\nClient: %3$s</string>
<string name="contact_viewer_client">Client</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_xmpp.png -->
<string name="contact_viewer_client_info">%1$s, type: %2$s</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_personal.png -->
<string name="vcard_person">Personal information</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_personal.png -->
<string name="vcard_nick_name">Nickname</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_personal.png -->
......@@ -98,27 +82,16 @@
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_video">Video</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_bbs">BBS</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_modem">Modem</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_msg">Voice messaging</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_isdn">ISDN</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_pcs">PCS</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_internet">Internet</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_x400">X400</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_xmpp.png -->
<string name="please_wait">Please wait...</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_xmpp.png -->
<string name="unknown">Unknown</string>
<string name="edit_alias">Edit alias</string>
<string name="edit_contact_groups">Edit groups</string>
<string name="remove_contact">Remove contact</string>
</resources>
\ No newline at end of file
app/src/main/res/values/fingerprint_viewer.xml
View file @ 789f7972
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_fingerprint.png -->
<string name="otr_fingerprint_description">Your opponent can provide his fingerprint you can compare with specified here to be sure he is who you think he is. You should not use XMPP chat for this purpose.</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_fingerprint.png -->
......
app/src/main/res/values/muc_editor.xml
View file @ 789f7972
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor_error.png -->
<string name="EMPTY_NICK_NAME">Nickname not specified</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor_error.png -->
......
app/src/main/res/values/phrase_editor.xml
View file @ 789f7972
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases.png -->
<string name="events_phrases_title">Key phrases</string>
<!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases.png -->
<string name="phrase_add">Add phrase</string>
<!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases_remove.png -->
<string name="phrase_delete">Delete phrase</string>
<!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases_remove.png -->
<string name="phrase_delete_confirm">Do you realy want to delete phrase: %s?</string>
<!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases.png -->
<string name="phrase_empty">&lt; Any text &gt;</string>
<!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases_detail.png -->
<string name="phrase_group">Part of the contact group</string>
<!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases_detail.png -->
<string name="phrase_regexp">Regular expression</string>
<!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases_detail.png -->
<string name="phrase_sound">Sound\nChoose notification sound</string>
<!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases_detail.png -->
<string name="phrase_text">Text to search for</string>
<!-- https://dl.dropboxusercontent.com/u/1029995/com.xabber.android/preference_editor_notifications_phrases_detail.png -->
<string name="phrase_user">Contact\'s Jabber ID part</string>
</resources>
\ No newline at end of file
app/src/main/res/values/preferences.xml
View file @ 789f7972
......@@ -403,17 +403,17 @@
<string-array name="account_proxy_type_entries">
<item>@string/account_proxy_type_none</item>
<item>@string/account_proxy_type_http</item>
<item>@string/account_proxy_type_socks4</item>
<item>@string/account_proxy_type_socks5</item>
<item>@string/account_proxy_type_orbot</item>
<item>@string/http</item>
<item>@string/socks4</item>
<item>@string/socks5</item>
<item>@string/orbot</item>
</string-array>
<string-array name="account_proxy_type_entryvalues">
<item>@string/account_proxy_type_none</item>
<item>@string/account_proxy_type_http</item>
<item>@string/account_proxy_type_socks4</item>
<item>@string/account_proxy_type_socks5</item>
<item>@string/account_proxy_type_orbot</item>
<item>@string/http</item>
<item>@string/socks4</item>
<item>@string/socks5</item>
<item>@string/orbot</item>
</string-array>
<string-array name="account_archive_mode_entries">
......
app/src/main/res/values/secret_viewer.xml
View file @ 789f7972
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_question.png -->
<string name="otr_answer">Secret answer:</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_question.png -->
......
app/src/main/res/values/status_editor.xml
View file @ 789f7972
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/status_editor_status.png -->
<string name="available">Available</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/status_editor_status.png -->
......@@ -37,5 +37,4 @@
<string name="saved_statuses">Saved statuses</string>
<string name="clear_status_history">Clear status history</string>
<string name="status_message">Status message</string>
</resources>
\ No newline at end of file
app/src/main/res/values/untraslatable_words.xml 0 → 100644
View file @ 789f7972
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<string name="xmpp">XMPP</string>
<string name="google_talk">Google Talk</string>
<string name="http">HTTP</string>
<string name="orbot">Orbot</string>
<string name="socks4">SOCKS4</string>
<string name="socks5">SOCKS5</string>
<string name="jabber_id">Jabber ID</string>
<string name="bbs">BBS</string>
<string name="isdn">ISDN</string>
<string name="pcs">PCS</string>
<string name="x400">X400</string>
</resources>
\ No newline at end of file
app/src/main/res/values/words.xml
View file @ 789f7972
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_connection_away.png -->
<string name="in10m">In 10 minutes</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_connection_away.png -->
......@@ -28,7 +28,4 @@
<string name="auto">Automatically</string>
<string name="save">Save</string>
<string name="ok">Ok</string>
<string name="cancel">Cancel</string>
</resources>
\ No newline at end of file
app/src/main/res/xml/contact_viewer.xml deleted 100644 → 0
View file @ e654ed76
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
This file is part of Xabber project; you can redistribute it and/or
modify it under the terms of the GNU General Public License, Version 3.
Xabber is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License,
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
>
<PreferenceCategory
android:title="@string/contact_viewer_xmpp"
>
<PreferenceScreen
android:title="@string/contact_viewer_jid"
android:key="@string/contact_viewer_jid"
/>
<PreferenceScreen
android:title="@string/contact_viewer_name"
android:key="@string/contact_viewer_name"
/>
</PreferenceCategory>
<PreferenceCategory
android:title="@string/contact_viewer_resources"
android:key="@string/contact_viewer_resources"
/>
<PreferenceCategory
android:title="@string/vcard_person"
>
<PreferenceScreen
android:title="@string/vcard_nick_name"
android:key="@string/vcard_nick_name"
/>
<PreferenceScreen
android:title="@string/vcard_formatted_name"
android:key="@string/vcard_formatted_name"
>
<PreferenceScreen
android:title="@string/vcard_prefix_name"
android:key="@string/vcard_prefix_name"
/>
<PreferenceScreen
android:title="@string/vcard_given_name"
android:key="@string/vcard_given_name"
/>
<PreferenceScreen
android:title="@string/vcard_middle_name"
android:key="@string/vcard_middle_name"
/>
<PreferenceScreen
android:title="@string/vcard_family_name"
android:key="@string/vcard_family_name"
/>
<PreferenceScreen
android:title="@string/vcard_suffix_name"
android:key="@string/vcard_suffix_name"
/>
</PreferenceScreen>
<PreferenceScreen
android:title="@string/vcard_birth_date"
android:key="@string/vcard_birth_date"
/>
</PreferenceCategory>
<PreferenceCategory
android:title="@string/vcard_organization"
>
<PreferenceScreen
android:title="@string/vcard_title"
android:key="@string/vcard_title"
/>
<PreferenceScreen
android:title="@string/vcard_role"
android:key="@string/vcard_role"
/>
<PreferenceScreen
android:title="@string/vcard_organization"
android:key="@string/vcard_organization"
/>
</PreferenceCategory>
<PreferenceCategory
android:title="@string/vcard_other"
>
<PreferenceScreen
android:title="@string/vcard_url"
android:key="@string/vcard_url"
/>
<PreferenceScreen
android:title="@string/vcard_categories"
android:key="@string/vcard_categories"
/>
<PreferenceScreen
android:title="@string/vcard_decsription"
android:key="@string/vcard_decsription"
/>
<PreferenceScreen
android:title="@string/vcard_note"
android:key="@string/vcard_note"
/>
</PreferenceCategory>
</PreferenceScreen>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023