Skip to content

X
xabber-android
Commit 12854db7 authored by Grigory Fedorov's avatar Grigory Fedorov
Browse files
Options

Merge branch 'develop' into feature/about_screen 

Conflicts:
	app/src/main/res/values/about_viewer.xml
parents a4d53c42 c3eaddd9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 191 additions and 1305 deletions
app/src/main/java/com/xabber/android/data/SettingsManager.java
View file @ 12854db7
......@@ -346,22 +346,6 @@ public class SettingsManager implements OnInitializedListener,
throw new IllegalStateException();
}
public static ChatsDivide chatsDivide() {
String value = getString(R.string.chats_divide_key,
R.string.chats_divide_default);
if (Application.getInstance()
.getString(R.string.chats_divide_always_value).equals(value))
return ChatsDivide.always;
else if (Application.getInstance()
.getString(R.string.chats_divide_portrait_value).equals(value))
return ChatsDivide.portial;
else if (Application.getInstance()
.getString(R.string.chats_divide_never_value).equals(value))
return ChatsDivide.never;
else
throw new IllegalStateException();
}
public static boolean chatsStateNotification() {
return getBoolean(R.string.chats_state_notification_key,
R.bool.chats_state_notification_default);
......@@ -730,25 +714,6 @@ public class SettingsManager implements OnInitializedListener,
never,
}
public enum ChatsDivide {
/**
* Always divide message header from text.
*/
always,
/**
* Only in portial mode.
*/
portial,
/**
* Never.
*/
never
}
public enum SecurityOtrMode {
/**
......
app/src/main/java/com/xabber/android/data/VcardMaps.java
View file @ 12854db7
......@@ -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 @ 12854db7
......@@ -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 @ 12854db7
......@@ -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 @ 12854db7
......@@ -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 @ 12854db7
......@@ -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/layout/account_add_fragment.xml
View file @ 12854db7
......@@ -13,113 +13,114 @@
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="16dp"
>
android:layout_height="match_parent">
<TextView
android:text="@string/account_type"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<Spinner
android:id="@+id/account_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="4dip"
android:paddingBottom="8dip"
android:prompt="@string/account_type"
/>
<LinearLayout
android:id="@+id/auth_panel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
android:descendantFocusability="beforeDescendants"
android:focusableInTouchMode="true" >
android:padding="16dp">
<TextView
android:text="@string/account_user_name"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:text="@string/account_type" />
<EditText
android:id="@+id/account_user_name"
<Spinner
android:id="@+id/account_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textEmailAddress"
android:singleLine="true"
android:text=""
android:hint=""
android:paddingBottom="8dip"
android:paddingTop="4dip"
android:prompt="@string/account_type"
/>
<TextView
android:text="@string/account_password"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<EditText
android:id="@+id/account_password"
<LinearLayout
android:id="@+id/auth_panel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:singleLine="true"
android:text=""
/>
android:descendantFocusability="beforeDescendants"
android:focusableInTouchMode="true"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/account_user_name" />
<EditText
android:id="@+id/account_user_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint=""
android:inputType="textEmailAddress"
android:singleLine="true"
android:text="" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/account_password" />
<EditText
android:id="@+id/account_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:singleLine="true"
android:text="" />
<CheckBox
android:id="@+id/store_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:checked="true"
android:text="@string/account_store_password" />
</LinearLayout>
<CheckBox
android:id="@+id/store_password"
android:layout_width="match_parent"
android:id="@+id/use_orbot"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:checked="true"
android:text="@string/account_store_password" />
android:checked="false"
android:text="@string/account_use_orbot" />
</LinearLayout>
<CheckBox
android:id="@+id/use_orbot"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:checked="false"
android:text="@string/account_use_orbot" />
<CheckBox
android:id="@+id/register_account"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:checked="false"
android:text="@string/account_register" />
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/confirm_password_layout"
android:visibility="gone">
<CheckBox
android:id="@+id/register_account"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:checked="false"
android:text="@string/account_register" />
<TextView
android:text="@string/confirm_password"
<LinearLayout
android:id="@+id/confirm_password_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/confirm_password" />
<EditText
android:id="@+id/confirm_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:singleLine="true"
android:text="" />
</LinearLayout>
<EditText
android:id="@+id/confirm_password"
<TextView
android:id="@+id/account_help"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:singleLine="true"
android:text=""/>
android:layout_height="match_parent"
android:autoLink="all" />
</LinearLayout>
<TextView
android:id="@+id/account_help"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:autoLink="all"
/>
</LinearLayout>
</ScrollView>
app/src/main/res/layout/conference_add_fragment.xml
View file @ 12854db7
......@@ -31,7 +31,7 @@
android:id="@+id/muc_server"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/muc_server_hint"
android:hint="@string/conference_jabber_org"
android:inputType="textEmailAddress"
android:singleLine="true" />
......
app/src/main/res/layout/contact_add_header.xml
View file @ 12854db7
......@@ -34,7 +34,7 @@
android:id="@+id/contact_user"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="user@domain.name"
android:hint="@string/user_domain_name"
android:singleLine="true"
android:inputType="textEmailAddress"
/>
......
app/src/main/res/values-ru/account_list.xml
View file @ 12854db7
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list_confirm.png -->
<string name="account_delete_confirm">Вы действительно хотите удалить учетную запись %s? (учетная запись не будет удалена с сервера, только из Xabber)</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list.png -->
<string name="account_add">Добавить учетную запись</string>
<string name="account_register">Зарегистрировать новую учетную запись</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list_context_menu.png -->
<string name="account_delete">Удалить учетную запись</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list_context_menu.png -->
<string name="account_editor">Редактировать учетную запись</string>
<string name="account_state_registration">Регистрация</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list.png -->
<string name="account_state_authentication">Авторизация</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list.png -->
<string name="account_state_connected">В сети</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list.png -->
<string name="account_state_connecting">Подключение</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list.png -->
<string name="account_state_disconnecting">Отключение</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list.png -->
<string name="account_state_offline">Не в сети</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list.png -->
<string name="account_state_waiting">Ожидание подключения</string>
</resources>
\ No newline at end of file
app/src/main/res/values-ru/change_log.xml deleted 100644 → 0
View file @ a4d53c42
This diff is collapsed.
app/src/main/res/values-ru/chat_viewer.xml
View file @ 12854db7
This diff is collapsed.
app/src/main/res/values-ru/contact_editor.xml
View file @ 12854db7
<?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 @ 12854db7
<?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 @ 12854db7
<?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 @ 12854db7
<?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 -->
......@@ -18,8 +18,6 @@
<string name="muc_room">Конференция</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor.png -->
<string name="muc_server">Сервер конференций</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor.png -->
<string name="muc_server_hint">conferenсe.jabber.ru</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor_error.png -->
<string name="NICK_ALREADY_USED">Такой ник уже используется</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 @ 12854db7
<?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/preference_editor.xml
View file @ 12854db7
......@@ -68,10 +68,6 @@
<string name="preference_interface">Темы\nНастройки внешнего вида</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_02.png -->
<string name="about_viewer">О программе</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_chat_viewer.png -->
<string name="chats_divide">Сообщение с новой строки\nОтображать сообщение с новой строки</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_chat_viewer_new_line.png -->
<string name="chats_divide_portrait">В портретном режиме</string>
<string name="chats_show_background">Отображать фон\nОтключение может увеличить производительность</string>
......
app/src/main/res/values-ru/secret_viewer.xml
View file @ 12854db7
<?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 @ 12854db7
<?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 @ 12854db7
<?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/account_editor.xml
View file @ 12854db7
This diff is collapsed.
app/src/main/res/values/account_list.xml
View file @ 12854db7
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list_confirm.png -->
<resources>
<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 -->
<string name="account_add">Add account</string>
<string name="account_register">Register new account</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list_context_menu.png -->
<string name="account_delete">Delete account</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list_context_menu.png -->
<string name="account_editor">Edit account</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list.png -->
<string name="account_state_registration">Registering</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list.png -->
<string name="account_state_authentication">Authorizing</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list.png -->
<string name="account_state_connected">Online</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list.png -->
<string name="account_state_connecting">Connecting</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list.png -->
<string name="account_state_disconnecting">Disconnecting</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list.png -->
<string name="account_state_offline">Offline</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/account_list.png -->
<string name="account_state_waiting">Waiting to reconnect</string>
</resources>
app/src/main/res/values/change_log.xml deleted 100644 → 0
View file @ a4d53c42
This diff is collapsed.
app/src/main/res/values/chat_viewer.xml
View file @ 12854db7
This diff is collapsed.
app/src/main/res/values/connections.xml
View file @ 12854db7
......@@ -35,8 +35,8 @@
<array name="account_type_xmpp">
<item>@string/account_protocol_xmpp</item>
<item>@string/account_type_names_xmpp</item>
<item>@string/account_type_hints_xmpp</item>
<item>@string/xmpp</item>
<item>@string/name_example_com</item>
<item>@string/account_type_helps_xmpp</item>
<item>@drawable/ic_vcard_xmpp_24dp</item>
<item>True</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 @ 12854db7
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_editor_error.png -->
<resources>
<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 -->
<string name="CANNOT_CREATE_CONTACT">Error: can\'t add contact</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_editor_error.png -->
<string name="CANNOT_REMOVE_CONTACT">Error: can\'t delete contact</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_editor_error.png -->
<string name="CANNOT_REMOVE_FROM_GROUP">Error: can\'t remove from group</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_editor_error.png -->
<string name="CANNOT_REMOVE_GROUP">Error: can\'t delete group</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_editor_error.png -->
<string name="CANNOT_RENAME_GROUP">Error: can\'t rename group</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_add.png -->
<string name="contact_account">Account</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_editor.png -->
<string name="contact_editor_title">Editing %s</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_editor.png -->
<string name="contact_group">Select groups</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_add.png -->
<string name="contact_name">Alias (optional)</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_add_confirm.png -->
<string name="contact_subscribe_confirm">Share your %1$s account status with contact?</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_add.png -->
<string name="contact_user">Contact username</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_editor_error.png -->
<string name="ENTRY_IS_NOT_FOUND">Contact not found</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_editor.png -->
<string name="group_add">Create new group</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_editor.png -->
<string name="group_default">Friends</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_editor_error.png -->
<string name="group_exists">Group with this name already exists</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_editor_error.png -->
<string name="group_is_empty">Set group name</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/group_add.png -->
<string name="group_name">Group name</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_editor_error.png -->
<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_list.xml
View file @ 12854db7
This diff is collapsed.
app/src/main/res/values/contact_viewer.xml
View file @ 12854db7
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_list_contact_context_menu.png -->
<resources>
<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 -->
<string name="vcard_formatted_name">Formatted name</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_name.png -->
<string name="vcard_prefix_name">Prefix</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_name.png -->
<string name="vcard_given_name">Given name</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_name.png -->
<string name="vcard_middle_name">Middle name</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_name.png -->
<string name="vcard_family_name">Family name</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_name.png -->
<string name="vcard_suffix_name">Suffix name</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_personal.png -->
<string name="vcard_birth_date">Birthday</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_common.png -->
<string name="vcard_url">Web site</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_personal.png -->
<string name="vcard_organization">Organization</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_personal.png -->
<string name="vcard_title">Job title, function</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_personal.png -->
<string name="vcard_role">Role</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_common.png -->
<string name="vcard_other">Other information</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_common.png -->
<string name="vcard_categories">Categories</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_common.png -->
<string name="vcard_decsription">Description</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_common.png -->
<string name="vcard_note">Notes</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_address">Address</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_address_pobox">PO Box</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_address_extadr">Extended Address</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_address_street">Street</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_address_locality">Locality</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_address_region">Region</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_address_pcode">Postal Code</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_address_ctry">Country Name</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_telephone">Telephone</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_email">Email</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type">Labels</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_home">Home</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_work">Work</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_postal">Postal</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_parcel">Parcel</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_dom">Domestic</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_intl">International</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_pref">Preferred</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_voice">Voice</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_fax">Fax</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_pager">Pager</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_viewer_contact.png -->
<string name="vcard_type_cell">Cellular</string>
<!-- 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="please_wait">Please wait…</string>
<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 @ 12854db7
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_fingerprint.png -->
<resources>
<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 -->
<string name="otr_is_verified">This contact is trusted</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_fingerprint.png -->
<string name="otr_local_fingerprint">Your fingerprint:</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_fingerprint.png -->
<string name="otr_remote_fingerprint">Your opponent\'s fingerprint:</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_fingerprint.png -->
<string name="otr_scan_fingerprint">Scan QR code with opponent\'s fingerprint</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_fingerprint.png -->
<string name="otr_show_fingerprint">Show QR code with your fingerprint</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_fingerprint_play.png -->
<string name="zxing_install_fail">There is no Google Play installed. Please install Barcode Scanner manually.</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_fingerprint_scanner.png -->
<string name="zxing_install_message">This application requires Barcode Scanner. Would you like to install it?</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_fingerprint.png -->
<string name="otr_copy_fingerprint">Copy your fingerprint to clipboard</string>
</resources>
\ No newline at end of file
app/src/main/res/values/muc_editor.xml
View file @ 12854db7
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor_error.png -->
<resources>
<string name="EMPTY_NICK_NAME">Nickname not specified</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor_error.png -->
<string name="EMPTY_ROOM_NAME">Conference not specified</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_list_conference_context_menu.png -->
<string name="muc_join">Join conference</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor.png -->
<string name="muc_nick">Nick</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor.png -->
<string name="muc_nick_hint">Your nick in conference</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor.png -->
<string name="muc_password">Password</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor.png -->
<string name="muc_password_hint">password is not required</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor.png -->
<string name="muc_room">Conference</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor.png -->
<string name="muc_server">Multi User Chat server</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor.png -->
<string name="muc_server_hint">conference.jabber.org</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor_error.png -->
<string name="NICK_ALREADY_USED">Nick already used</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor_error.png -->
<string name="ALREADY_IN_PROGRESS">Already in progress</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor_error.png -->
<string name="ALREADY_JOINED">Already joined</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor.png -->
<string name="muc_add">Add conference</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_list_conference_context_menu.png -->
<string name="muc_delete">Remove conference</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_list_conference_confirm.png -->
<string name="muc_delete_confirm">Do you really want to remove conference %1$s from account %2$s?</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_list_conference_context_menu.png -->
<string name="muc_edit">Authorization settings</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor_invite.png -->
<string name="muc_invite_confirm">%2$s invites you to join conference %3$s. Join from account %1$s?</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor_invite.png -->
<string name="muc_invite_confirm_reason">%2$s invites you to join conference %3$s: %4$s. Join from account %1$s?</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_list_conference_context_menu.png -->
<string name="muc_leave">Leave conference</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor.png -->
<string name="muc_save">Save conference</string>
</resources>
\ No newline at end of file
app/src/main/res/values/notification_bar.xml
View file @ 12854db7
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_connected.png -->
<string name="account_quantity_1">account</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_connected.png -->
<string name="account_quantity_2">accounts</string>
<!-- Used for plural form in russian. http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_connected.png -->
<!-- Used for plural form in russian.-->
<string name="account_quantity_5">-</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_offline.png -->
<string name="account_quantity_offline_1">account</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_offline.png -->
<string name="account_quantity_offline_2">accounts</string>
<!-- Used for plural form in russian. http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_offline.png -->
<!-- Used for plural form in russian. -->
<string name="account_quantity_offline_5">-</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_authorization.png -->
<string name="AUTHENTICATION_FAILED">Authorization error</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_message.png -->
<string name="chat_contact_quantity_1">contact</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_message.png -->
<string name="chat_contact_quantity_2">contacts</string>
<!-- Used for plural form in russian. http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_message.png -->
<!-- Used for plural form in russian. -->
<string name="chat_contact_quantity_5">-</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_message.png -->
<string name="chat_message_quantity_1">message</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_message.png -->
<string name="chat_message_quantity_2">messages</string>
<!-- Used for plural form in russian. http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_message.png -->
<!-- Used for plural form in russian. -->
<string name="chat_message_quantity_5">-</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_message.png -->
<string name="chat_status">%1$d %2$s from %3$d %4$s</string>
<string name="chat_messages_from_contact">%1$d %2$s from %3$s</string>
<string name="chat_contact_and_message">%1$s: %2$s</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_connected.png -->
<string name="connection_state_connected_1">%1$d of %2$d %3$s online</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_connected.png -->
<string name="connection_state_connected_2">%1$d of %2$d %3$s online</string>
<!-- Used for plural form in russian. http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_connected.png -->
<!-- Used for plural form in russian. -->
<string name="connection_state_connected_5">-</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_connecting.png -->
<string name="connection_state_connecting_1">%1$d of %2$d %3$s connecting</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_connecting.png -->
<string name="connection_state_connecting_2">%1$d of %2$d %3$s connecting</string>
<!-- Used for plural form in russian. http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_connecting.png -->
<!-- Used for plural form in russian. -->
<string name="connection_state_connecting_5">-</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_waiting.png -->
<string name="connection_state_waiting_1">%1$d of %2$d %3$s waiting to connect</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_waiting.png -->
<string name="connection_state_waiting_2">%1$d of %2$d %3$s waiting to connect</string>
<!-- Used for plural form in russian. http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_waiting.png -->
<!-- Used for plural form in russian. -->
<string name="connection_state_waiting_5">-</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_offline.png -->
<string name="connection_state_offline">%1$d %2$s offline</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/message_archive.png -->
<string name="archive_available_request_message">Do you want to store message history on server?\nIt allows Xabber to load message history from all the devices using this account.\nThis feature will take some additional traffic and will slightly reduce connection speed.\nWARNING: All your local history will be removed.</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_archive.png -->
<string name="archive_available_request_title">Enable message archive?</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_certificate.png -->
<string name="INVALID_CERTIFICATE">Invalid certificate</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_invite.png -->
<string name="muc_invite_message">Do you want to enter conference?</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_otr_progress.png -->
<string name="otr_verification_in_progress">Click here to abort it.</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_password.png -->
<string name="PASSWORD_REQUIRED">Password required</string>
<string name="pay_attention">Pay attention</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/notification_bar_subscription.png -->
<string name="subscription_request_message">Authorization request</string>
</resources>
\ No newline at end of file
app/src/main/res/values/phrase_editor.xml
View file @ 12854db7
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<string name="events_phrases_title">Key phrases</string>
<string name="phrase_add">Add phrase</string>
<string name="phrase_delete">Delete phrase</string>
<string name="phrase_delete_confirm">Do you realy want to delete phrase: %s?</string>
<string name="phrase_delete_confirm">Do you really want to delete phrase: %s?</string>
<string name="phrase_empty">&lt; Any text &gt;</string>
<string name="phrase_group">Part of the contact group</string>
<string name="phrase_regexp">Regular expression</string>
......
app/src/main/res/values/preferences.xml
View file @ 12854db7
......@@ -268,22 +268,6 @@
</string-array>
<string name="chats_font_size_default">@string/chats_font_size_normal_value</string>
<string name="chats_divide_key">chats_divide</string>
<string name="chats_divide_always_value">always</string>
<string name="chats_divide_portrait_value">portrait</string>
<string name="chats_divide_never_value">never</string>
<string-array name="chats_divide_entries">
<item>@string/always</item>
<item>@string/chats_divide_portrait</item>
<item>@string/never</item>
</string-array>
<string-array name="chats_divide_entryvalues">
<item>@string/chats_divide_always_value</item>
<item>@string/chats_divide_portrait_value</item>
<item>@string/chats_divide_never_value</item>
</string-array>
<string name="chats_divide_default">@string/chats_divide_portrait_value</string>
<string name="chats_state_notification_key">chats_state_notification</string>
<bool name="chats_state_notification_default">true</bool>
......@@ -419,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 @ 12854db7
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_question.png -->
<resources>
<string name="otr_answer">Secret answer:</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_question.png -->
<string name="otr_question">Secret question:</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_question.png -->
<string name="otr_question_description">Use secret question to verify each other.</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_secret.png -->
<string name="otr_secret">Shared secret:</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/otr_secret.png -->
<string name="otr_secret_description">Use shared secret to verify each other.</string>
</resources>
\ No newline at end of file
app/src/main/res/values/status_editor.xml
View file @ 12854db7
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/status_editor_status.png -->
<resources>
<string name="available">Available</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/status_editor_status.png -->
<string name="away">Away</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/status_editor_status.png -->
<string name="chat">Ready for chat!</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/status_editor.png -->
<string name="clear_statuses">Delete saved status messages</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/status_editor_status.png -->
<string name="dnd">Do not disturb</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/status_editor_context_menu.png -->
<string name="edit_status">Edit status</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/status_editor.png -->
<string name="empty_status">&lt;Empty status&gt;</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/status_editor_status.png -->
<string name="invisible">Invisible</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/status_editor_context_menu.png -->
<string name="remove_status">Delete status</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/status_editor_context_menu.png -->
<string name="select_status">Set status</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/status_editor.png -->
<string name="status_editor">Set status</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/status_editor.png -->
<string name="status_editor_for">Change status for %s</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/status_editor.png -->
<string name="status_text_hint">Enter status message</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/status_editor_status.png -->
<string name="unavailable">Offline</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/status_editor_status.png -->
<string name="unsubscribed">Not authorized</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/status_editor_status.png -->
<string name="xa">Away for a long time</string>
<string name="new_status">New status</string>
<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 @ 12854db7
<?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>
<string name="name_example_com">name@example.com</string>
<string name="user_domain_name">user@domain.name</string>
<string name="conference_jabber_org">conference.jabber.org</string>
</resources>
\ No newline at end of file
app/src/main/res/values/words.xml
View file @ 12854db7
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_connection_away.png -->
<resources>
<string name="in10m">In 10 minutes</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_connection_away.png -->
<string name="in15m">In 15 minutes</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_connection_away.png -->
<string name="in1h">In an hour</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_connection_away.png -->
<string name="in1m">In a minute</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_connection_away.png -->
<string name="in2m">In 2 minutes</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_connection_away.png -->
<string name="in30m">In 30 minutes</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_connection_away.png -->
<string name="in5m">In 5 minutes</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_chat_viewer_status.png -->
<string name="always">Always</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_security_otr.png -->
<string name="disabled">Disabled</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_security_otr.png -->
<string name="manual">Manual</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_chat_viewer_status.png -->
<string name="never">Never</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_security_otr.png -->
<string name="required">Required</string>
<!-- http://dl.dropbox.com/u/1029995/com.xabber.android/preference_editor_security_otr.png -->
<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 @ a4d53c42
<?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>
app/src/main/res/xml/preference_chat_global.xml
View file @ 12854db7
......@@ -39,13 +39,6 @@
android:key="@string/chats_font_size_key"
android:title="@string/chats_font_size"
/>
<ListPreference
android:defaultValue="@string/chats_divide_default"
android:entries="@array/chats_divide_entries"
android:entryValues="@array/chats_divide_entryvalues"
android:key="@string/chats_divide_key"
android:title="@string/chats_divide"
/>
<CheckBoxPreference
android:defaultValue="@bool/chats_state_notification_default"
android:key="@string/chats_state_notification_key"
......
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