diff options
Diffstat (limited to 'src/main/res')
48 files changed, 821 insertions, 55 deletions
diff --git a/src/main/res/drawable-hdpi/ic_account_box_white_24dp.png b/src/main/res/drawable-hdpi/ic_account_box_white_24dp.png Binary files differnew file mode 100644 index 00000000..2f0f491d --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_account_box_white_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_announcement_white_24dp.png b/src/main/res/drawable-hdpi/ic_announcement_white_24dp.png Binary files differnew file mode 100644 index 00000000..03470200 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_announcement_white_24dp.png diff --git a/src/main/res/drawable-hdpi/main_logo.png b/src/main/res/drawable-hdpi/main_logo.png Binary files differnew file mode 100644 index 00000000..e3d6b5ed --- /dev/null +++ b/src/main/res/drawable-hdpi/main_logo.png diff --git a/src/main/res/drawable-mdpi/ic_account_box_white_24dp.png b/src/main/res/drawable-mdpi/ic_account_box_white_24dp.png Binary files differnew file mode 100644 index 00000000..895b2ebf --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_account_box_white_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_announcement_white_24dp.png b/src/main/res/drawable-mdpi/ic_announcement_white_24dp.png Binary files differnew file mode 100644 index 00000000..e1039350 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_announcement_white_24dp.png diff --git a/src/main/res/drawable-mdpi/main_logo.png b/src/main/res/drawable-mdpi/main_logo.png Binary files differnew file mode 100644 index 00000000..efeb80fa --- /dev/null +++ b/src/main/res/drawable-mdpi/main_logo.png diff --git a/src/main/res/drawable-xhdpi/ic_account_box_white_24dp.png b/src/main/res/drawable-xhdpi/ic_account_box_white_24dp.png Binary files differnew file mode 100644 index 00000000..1fbad8ca --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_account_box_white_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_announcement_white_24dp.png b/src/main/res/drawable-xhdpi/ic_announcement_white_24dp.png Binary files differnew file mode 100644 index 00000000..b1e9aa6e --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_announcement_white_24dp.png diff --git a/src/main/res/drawable-xhdpi/main_logo.png b/src/main/res/drawable-xhdpi/main_logo.png Binary files differnew file mode 100644 index 00000000..da7dc86f --- /dev/null +++ b/src/main/res/drawable-xhdpi/main_logo.png diff --git a/src/main/res/drawable-xxhdpi/ic_account_box_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_account_box_white_24dp.png Binary files differnew file mode 100644 index 00000000..56cbb956 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_account_box_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_announcement_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_announcement_white_24dp.png Binary files differnew file mode 100644 index 00000000..d56a8f8e --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_announcement_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/main_logo.png b/src/main/res/drawable-xxhdpi/main_logo.png Binary files differnew file mode 100644 index 00000000..3a3fc6ee --- /dev/null +++ b/src/main/res/drawable-xxhdpi/main_logo.png diff --git a/src/main/res/drawable-xxxhdpi/ic_account_box_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_account_box_white_24dp.png Binary files differnew file mode 100644 index 00000000..a543c76b --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_account_box_white_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_announcement_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_announcement_white_24dp.png Binary files differnew file mode 100644 index 00000000..3731138a --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_announcement_white_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/main_logo.png b/src/main/res/drawable-xxxhdpi/main_logo.png Binary files differnew file mode 100644 index 00000000..51054090 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/main_logo.png diff --git a/src/main/res/layout/actionview_search.xml b/src/main/res/layout/actionview_search.xml index 8b657f4a..50becfc6 100644 --- a/src/main/res/layout/actionview_search.xml +++ b/src/main/res/layout/actionview_search.xml @@ -14,6 +14,7 @@ android:layout_height="wrap_content" android:focusable="true" android:inputType="textEmailAddress|textNoSuggestions" + android:imeOptions="actionSearch" android:textColor="@color/white" android:textColorHint="@color/white70" android:hint="@string/search_for_contacts_or_groups"/> diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml index df75e61f..2c0a4481 100644 --- a/src/main/res/layout/activity_change_password.xml +++ b/src/main/res/layout/activity_change_password.xml @@ -2,23 +2,25 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/grey50"> + android:background="@color/grey200"> <ScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_above="@+id/button_bar"> - <LinearLayout android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" + android:layout_height="wrap_content" android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginBottom="@dimen/activity_vertical_margin"> + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:background="@drawable/infocard_border" + android:padding="@dimen/infocard_padding" + android:orientation="vertical"> <TextView + android:id="@+id/current_password_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/current_password" diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index 598003e3..6b67b9b1 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -5,6 +5,7 @@ android:background="@color/grey200" > <LinearLayout + android:id="@+id/details_main_layout" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" > @@ -63,6 +64,15 @@ android:layout_height="wrap_content" android:textColor="@color/secondaryText" android:textSize="?attr/TextSizeBody" /> + + <TextView + android:layout_marginTop="8dp" + android:id="@+id/status_message" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/secondaryText" + android:textStyle="italic" + android:textSize="?attr/TextSizeBody" /> </LinearLayout> <Button diff --git a/src/main/res/layout/activity_set_presence.xml b/src/main/res/layout/activity_set_presence.xml new file mode 100644 index 00000000..8195092f --- /dev/null +++ b/src/main/res/layout/activity_set_presence.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="@color/grey200" + android:id="@+id/scroll_view"> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:background="@drawable/infocard_border" + android:padding="@dimen/infocard_padding" + android:orientation="vertical"> + <EditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textMultiLine" + android:hint="@string/status_message" + android:id="@+id/presence_status_message" + android:textColor="@color/black87" + android:layout_marginBottom="8dp" + android:textSize="?attr/TextSizeBody"/> + <Spinner + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/presence_show" + android:layout_gravity="center_horizontal"/> + <CheckBox + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/all_accounts_on_this_device" + android:id="@+id/all_accounts" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody"/> + <Button + android:id="@+id/change_presence" + style="?android:attr/borderlessButtonStyle" + android:layout_marginRight="-8dp" + android:layout_marginBottom="-8dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:text="@string/change_presence" + android:textColor="@color/accent"/> + </LinearLayout> + <LinearLayout + android:id="@+id/templates" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:background="@drawable/infocard_border" + android:padding="@dimen/infocard_padding" + android:orientation="vertical" + android:divider="?android:dividerHorizontal" + android:showDividers="middle"> + </LinearLayout> + </LinearLayout> +</ScrollView>
\ No newline at end of file diff --git a/src/main/res/layout/captcha.xml b/src/main/res/layout/captcha.xml new file mode 100644 index 00000000..ea77b835 --- /dev/null +++ b/src/main/res/layout/captcha.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="16dp" > + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/captcha" + android:layout_gravity="center_horizontal"/> + <EditText + android:id="@+id/input" + android:layout_marginTop="8dp" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textNoSuggestions" + android:textColor="@color/black87" + android:textColorHint="@color/black54" + android:textSize="?attr/TextSizeBody" + android:hint="@string/captcha_hint"> + + <requestFocus /> + </EditText> + +</LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/dialog_show_password.xml b/src/main/res/layout/dialog_show_password.xml new file mode 100644 index 00000000..dba0690c --- /dev/null +++ b/src/main/res/layout/dialog_show_password.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="16dp" > + + <TextView + android:id="@+id/password" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:typeface="monospace" + android:textSize="?attr/TextSizeHeadline" + android:fontFamily="monospace" + android:layout_gravity="center_horizontal" + android:textColor="@color/black87" > + </TextView> + +</LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/magic_create.xml b/src/main/res/layout/magic_create.xml new file mode 100644 index 00000000..c4adc029 --- /dev/null +++ b/src/main/res/layout/magic_create.xml @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true"> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/grey50"> + + <LinearLayout + android:id="@+id/linearLayout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:minHeight="256dp" + android:orientation="vertical" + android:paddingBottom="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp"> + <Space + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1"/> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/pick_your_username" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold"/> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="@string/magic_create_text" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody"/> + <EditText + android:id="@+id/username" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:hint="@string/username_hint" + android:inputType="textNoSuggestions" + android:textSize="?attr/TextSizeBody"/> + <TextView + android:id="@+id/full_jid" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="@string/your_full_jid_will_be" + android:textColor="@color/black54" + android:textSize="?attr/TextSizeInfo" + android:visibility="invisible"/> + <Button + android:id="@+id/create_account" + style="?android:attr/borderlessButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:text="@string/next" + android:textColor="@color/accent"/> + </LinearLayout> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_above="@+id/linearLayout" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_alignParentTop="true"> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_centerVertical="true" + android:padding="8dp" + android:src="@drawable/main_logo"/> + </RelativeLayout> + </RelativeLayout> +</ScrollView>
\ No newline at end of file diff --git a/src/main/res/layout/presence_template.xml b/src/main/res/layout/presence_template.xml new file mode 100644 index 00000000..aa4ded5a --- /dev/null +++ b/src/main/res/layout/presence_template.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?android:attr/activatedBackgroundIndicator" + android:paddingTop="8dp" + android:paddingLeft="8dp" + android:paddingBottom="8dp" + android:id="@+id/presence_template"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:layout_centerVertical="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_toLeftOf="@+id/delete_button" + android:layout_toStartOf="@+id/delete_button" + android:layout_marginRight="8dp"> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/presence_status_message" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody"/> + <TextView + android:id="@+id/status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingBottom="1dp" + android:paddingLeft="4dp" + android:paddingRight="4dp" + android:paddingTop="1dp" + android:textAllCaps="true" + android:textColor="@color/white" + android:textSize="?attr/TextSizeInfo" + android:layout_marginTop="4dp"/> + </LinearLayout> + <ImageButton + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/delete_button" + android:layout_centerVertical="true" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:background="?android:selectableItemBackground" + android:padding="@dimen/image_button_padding" + android:src="?attr/icon_remove"/> +</RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/simple_list_item.xml b/src/main/res/layout/simple_list_item.xml new file mode 100644 index 00000000..8cbc1f92 --- /dev/null +++ b/src/main/res/layout/simple_list_item.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2006 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:gravity="center_vertical" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:minHeight="?android:attr/listPreferredItemHeightSmall" /> diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml new file mode 100644 index 00000000..25f7c46f --- /dev/null +++ b/src/main/res/layout/welcome.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true"> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/grey50"> + + <LinearLayout + android:id="@+id/linearLayout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:minHeight="256dp" + android:orientation="vertical" + android:paddingBottom="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp"> + <Space + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1"/> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/welcome_header" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold"/> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="@string/welcome_text" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody"/> + <Button + android:id="@+id/create_account" + style="?android:attr/borderlessButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:text="@string/create_account" + android:textColor="@color/accent"/> + <Button + android:id="@+id/use_own_provider" + style="?android:attr/borderlessButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:text="@string/use_own_provider" + android:textColor="@color/black54"/> + </LinearLayout> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_above="@+id/linearLayout" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_alignParentTop="true"> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_centerVertical="true" + android:padding="8dp" + android:src="@drawable/main_logo"/> + </RelativeLayout> + </RelativeLayout> +</ScrollView>
\ No newline at end of file diff --git a/src/main/res/menu/change_presence.xml b/src/main/res/menu/change_presence.xml new file mode 100644 index 00000000..f3dfadfd --- /dev/null +++ b/src/main/res/menu/change_presence.xml @@ -0,0 +1,17 @@ +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/action_account_details" + android:title="@string/account_details" + android:showAsAction="always" + android:icon="@drawable/ic_account_box_white_24dp"/> + <item + android:id="@+id/action_accounts" + android:orderInCategory="90" + android:showAsAction="never" + android:title="@string/action_accounts"/> + <item + android:id="@+id/action_settings" + android:orderInCategory="100" + android:showAsAction="never" + android:title="@string/action_settings"/> +</menu>
\ No newline at end of file diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml index 9f06fc4c..9ab1788b 100644 --- a/src/main/res/menu/editaccount.xml +++ b/src/main/res/menu/editaccount.xml @@ -1,6 +1,12 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item + android:id="@+id/action_change_presence" + android:showAsAction="always" + android:title="@string/change_presence" + android:icon="@drawable/ic_announcement_white_24dp"/> + + <item android:id="@+id/action_show_qr_code" android:showAsAction="never" android:title="@string/show_qr_code"/> @@ -28,6 +34,11 @@ android:title="@string/mam_prefs"/> <item + android:id="@+id/action_show_password" + android:showAsAction="never" + android:title="@string/show_password"/> + + <item android:id="@+id/action_change_password_on_server" android:showAsAction="never" android:title="@string/change_password"/> diff --git a/src/main/res/menu/manageaccounts_context.xml b/src/main/res/menu/manageaccounts_context.xml index 7a7cc0a2..d8b0093e 100644 --- a/src/main/res/menu/manageaccounts_context.xml +++ b/src/main/res/menu/manageaccounts_context.xml @@ -5,6 +5,9 @@ android:id="@+id/mgmt_account_enable" android:title="@string/mgmt_account_enable"/> <item + android:id="@+id/mgmt_account_change_presence" + android:title="@string/change_presence"/> + <item android:id="@+id/mgmt_account_publish_avatar" android:title="@string/mgmt_account_publish_avatar"/> <item diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index efb29356..b0926375 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -104,6 +104,9 @@ <string name="pref_accept_files">Приемане на файлове</string> <string name="pref_accept_files_summary">Автоматично приемане на файлове с размер, по-малък от…</string> <string name="pref_accept_files_size_summary">Автоматично приемане на файлове с размер, по-малък от…</string> + <string name="pref_attachments">Притурки</string> + <string name="pref_return_to_previous">Бързо споделяне</string> + <string name="pref_return_to_previous_summary">Моментално връщане към предишното действие, вместо отваряне на разговора отново след споделяне на нещо</string> <string name="pref_notification_settings">Известие</string> <string name="pref_notifications">Известия</string> <string name="pref_notifications_summary">Известяване при получаване на ново съобщение</string> @@ -545,6 +548,7 @@ <string name="shared_file_with_x">Файлът е споделен с %s</string> <string name="shared_image_with_x">Изображението е споделено с %s</string> <string name="shared_images_with_x">Изображения, споделени с %s</string> + <string name="shared_text_with_x">Текстът е споделен с %s</string> <string name="no_storage_permission">Conversations се нуждае от достъп до външно място за съхранение</string> <string name="sync_with_contacts">Синхронизиране с контактите</string> <string name="sync_with_contacts_long">Conversations иска да съчетае Вашия списък в XMPP с контактите Ви, за да показва пълните им имена и снимки..\n\nConversations единствено ще чете контактите Ви и ще ги използва вътрешно, без да ги качва на сървъра Ви.\n\nЩе бъдете помолен/а за позволение за достъп до контактите Ви.</string> @@ -573,4 +577,23 @@ <string name="select_image_and_crop">Изберете изображение и изрежете</string> <string name="this_account_is_disabled">Вие сте деактивирали този профил</string> <string name="security_error_invalid_file_access">Грешка в сигурността: неправилен достъп до файл</string> + <string name="no_application_to_share_uri">Няма намерено приложение за споделяне на адреса</string> + <string name="share_uri_with">Споделяне на адреса с…</string> + <string name="welcome_text">XMPP е протокол, който не е обвързан с конкретен доставчик. Можете да използвате клиента с всеки сървър, който работи с протокола XMPP.\nЗа Ваше удобство, ние предоставяме лесен начин да си създадете профил в conversations.im — сървър, пригоден да работи добре с Conversations.</string> + <string name="magic_create_text">Ще преминем заедно с Вас през процеса за създаване на профил в conversations.im.\nАко изберете да използвате conversations.im, ще можете да общувате с потребители, използващи други сървъри, като им дадете своя пълен Jabber идентификатор.</string> + <string name="your_full_jid_will_be">Вашият пълен Jabber идентификатор ще бъде: %s</string> + <string name="create_account">Създаване на профил</string> + <string name="use_own_provider">Използване на собствен сървър</string> + <string name="pick_your_username">Изберете потребителското си име</string> + <string name="pref_manually_change_presence">Ръчна промяна на присъствието</string> + <string name="pref_manually_change_presence_summary">Докоснете аватара си, за да промените присъствието си</string> + <string name="change_presence">Промяна на присъствието</string> + <string name="status_message">Съобщение за състоянието</string> + <string name="all_accounts_on_this_device">Задаване за всички профили на това устройство</string> + <string name="presence_chat">Свободен за разговор</string> + <string name="presence_online">На линия</string> + <string name="presence_away">Отсъстващ</string> + <string name="presence_xa">Недостъпен</string> + <string name="presence_dnd">Зает</string> + <string name="secure_password_generated">Беше създадена сигурна парола</string> </resources> diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 6094ad87..53122359 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -103,10 +103,18 @@ <string name="pref_xmpp_resource_summary">Jméno se kterým se tento klient identifikuje</string> <string name="pref_accept_files">Přijímat soubory</string> <string name="pref_accept_files_summary">Automaticky přijímat soubory menší než…</string> + <string name="pref_attachments">Přílohy</string> + <string name="pref_return_to_previous">Rychlé sdílení</string> + <string name="pref_return_to_previous_summary">Okamžitě se vrátit k předchozí aktivitě místo otevření konverzace po nasdílení</string> <string name="pref_notification_settings">Upozornění</string> <string name="pref_notifications">Upozornění</string> <string name="pref_notifications_summary">Upozornit při přijetí nové zprávy</string> <string name="pref_vibrate">Vibrovat</string> + <string name="pref_vibrate_summary">Vibrovat při přijetí nové zprávy</string> + <string name="pref_led">LED upozornění</string> + <string name="pref_led_summary">Blikat při přijetí nové zprávy</string> + <string name="pref_sound">Tón upozornění</string> + <string name="pref_sound_summary">Přehrát zvuk při přijetí nové zprávy</string> <string name="pref_notification_grace_period">Četnost upozornění</string> <string name="pref_notification_grace_period_summary">Neupozorňovat krátce poté co byla obdržena kopie zprávy</string> <string name="pref_advanced_options">Rozšířené</string> @@ -540,6 +548,7 @@ <string name="shared_file_with_x">Soubor sdílen s %s</string> <string name="shared_image_with_x">Obrázek sdílen s %s</string> <string name="shared_images_with_x">Obrázky sdíleny s %s</string> + <string name="shared_text_with_x">Text sdílen s %s</string> <string name="no_storage_permission">Conversations vyžaduje přístup k externímu úložišti</string> <string name="sync_with_contacts">Synchronizovat s kontakty</string> <string name="sync_with_contacts_long">Aplikace Conversations by ráda porovnala váš XMPP seznam s vašimi kontakty, aby mohla zobrazit plná jména a avatary.\n\nConversations načte a porovná kontakty pouze lokálně, bez jejich nahrávání na server.\n\nNyní budete dotázáni na udělení práv pro přístup k seznamu kontaktů.</string> @@ -567,4 +576,7 @@ <string name="no_keys_just_confirm">Tomuto kontaktu již důvěřujete. Vybráním možnosti \'hotovo\' jen potvrzujete, že %s je součástí této konference.</string> <string name="select_image_and_crop">Vybrat obrázek a oříznout</string> <string name="this_account_is_disabled">Tento účet byl vypnut</string> + <string name="security_error_invalid_file_access">Chyba zabezpečení: Neplatný přístup k souboru</string> + <string name="no_application_to_share_uri">Nebyla nalezena aplikace pro sdílení URI</string> + <string name="share_uri_with">Sdílet URI s...</string> </resources> diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index b8729940..e987922c 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -109,6 +109,8 @@ <string name="pref_accept_files_download_summary">Automatisches Herunterladen und Akzeptieren von Dateien nur im WLAN</string> <string name="pref_accept_files_download_link">Bilder-Links</string> <string name="pref_accept_files_download_link_summary">Bilder-Links automatisch herunterladen</string> + <string name="pref_return_to_previous">Schnell-Teilen</string> + <string name="pref_return_to_previous_summary">Nach dem Teilen sofort wieder zur vorherigen App zurückkehren anstatt die Unterhaltung zu öffnen</string> <string name="pref_notification_settings">Benachrichtigungen</string> <string name="pref_notifications">Benachrichtigungen</string> <string name="pref_notifications_summary">Benachrichtigen bei Erhalt einer neuen Nachricht</string> @@ -604,6 +606,7 @@ <string name="shared_file_with_x">Datei mit %s geteilt</string> <string name="shared_image_with_x">Bild mit %s geteilt</string> <string name="shared_images_with_x">Bilder mit %s geteilt</string> + <string name="shared_text_with_x">Text mit %s geteilt</string> <string name="no_storage_permission">Conversations benötigt Zugriff auf externen Speicher</string> <string name="sync_with_contacts">Mit Kontakten synchronisieren</string> <string name="sync_with_contacts_long">Conversations möchte deine XMPP-Kontaktliste mit deinen Kontakten abgleichen, um deren vollständige Namen und Avatare anzuzeigen.\n\nConversations wird deine Kontakte nur lokal lesen und abgleichen und überträgt diese nicht auf den Server.\n\nDu wirst nun gefragt, ob du den Zugriff auf deine Kontakte erlauben möchtest.</string> @@ -633,5 +636,25 @@ <string name="pref_omemo_enabled_title">OMEMO aktivieren</string> <string name="no_keys_just_confirm">Du vertraust diesem Kontakt bereits. Durch Auswählen von \"Fertig\" bestätigst du, dass %s Teil dieser Konferenz ist.</string> <string name="select_image_and_crop">Bild auswählen und zuschneiden</string> - <string name="this_account_is_disabled">Du hast diesen Account deaktiviert</string> + <string name="this_account_is_disabled">Du hast dieses Konto deaktiviert</string> + <string name="security_error_invalid_file_access">Sicherheitsfehler: Dateizugriff nicht erlaubt</string> + <string name="no_application_to_share_uri">Keine Anwendung zum Teilen der URI gefunden</string> + <string name="share_uri_with">Teile URI mit…</string> + <string name="welcome_text">XMPP ist ein providerunabhängiges Protokoll. Du kannst diesen Klienten mit einem beliebigen XMPP-Server deiner Wahl nutzen.\nWir haben jedoch eine einfache Möglichkeit geschaffen, ein Konto auf conversations.im zu erstellen; ein Provider, der speziell für den Einsatz mit Conversations geeignet ist.</string> + <string name="magic_create_text">Wir führen dich durch den Prozess ein Konto auf conversations.im zu erstellen.\nWenn du conversations.im als Provider nutzt, kannst du mit Nutzern anderer Provider kommunizieren, indem du ihnen deine vollständige Jabber-ID gibst.</string> + <string name="your_full_jid_will_be">Deine vollständige Jabber ID lautet: %s</string> + <string name="create_account">Konto erstellen</string> + <string name="use_own_provider">Nutze eigenen Provider</string> + <string name="pick_your_username">Wähle deinen Benutzernamen</string> + <string name="pref_manually_change_presence">Ändere Status</string> + <string name="pref_manually_change_presence_summary">Tippe auf deinen Avatar, um deinen Status zu ändern</string> + <string name="change_presence">Status ändern</string> + <string name="status_message">Statusnachricht</string> + <string name="all_accounts_on_this_device">Für alle Konten dieses Gerätes festlegen</string> + <string name="presence_chat">Frei zum chatten</string> + <string name="presence_online">Online</string> + <string name="presence_away">Weg</string> + <string name="presence_xa">Nicht verfügbar</string> + <string name="presence_dnd">Beschäftigt</string> + <string name="secure_password_generated">Ein sicheres Passwort wurde erstellt</string> </resources> diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 49add502..329e8537 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -109,11 +109,15 @@ <string name="pref_accept_files_download_summary">Descargar y aceptar archivos de forma automática sólo al usar Wi-Fi</string> <string name="pref_accept_files_download_link">Enlaces de imagen</string> <string name="pref_accept_files_download_link_summary">Descargar enlaces de imagen automáticamente</string> + <string name="pref_return_to_previous">Compartir de forma rápida</string> + <string name="pref_return_to_previous_summary">Inmediatamente volver a la actividad anterior en lugar de abrir la conversación después de compartir una imagen o archivo</string> <string name="pref_notification_settings">Notificación</string> <string name="pref_notifications">Notificaciones</string> <string name="pref_notifications_summary">Notificar cuando llegue un nuevo mensaje</string> <string name="pref_vibrate">Vibrar</string> <string name="pref_vibrate_summary">Vibrar también cuando llegue un nuevo mensaje</string> + <string name="pref_led">Luz</string> + <string name="pref_led_summary">La luz parpadea cuando llega un nuevo mensaje</string> <string name="pref_sound">Sonido</string> <string name="pref_sound_summary">Reproducir tono con la notificación</string> <string name="pref_notification_grace_period">Periodo de gracia de las notificaciones</string> @@ -602,6 +606,7 @@ <string name="shared_file_with_x">Archivo compartido con %s</string> <string name="shared_image_with_x">Imagen compartida con %s</string> <string name="shared_images_with_x">Imágenes compartidas con %s</string> + <string name="shared_text_with_x">Compartido texto con %s</string> <string name="no_storage_permission">Conversations necesita acceder al almacenamiento externo</string> <string name="sync_with_contacts">Sincronizar contactos</string> <string name="sync_with_contacts_long">Conversations quiere cruzar su lista de contactos XMPP con sus contactos del móvil para mostrar sus nombres completos y fotos del perfil.\n\nConversations sólo leerá y cruzará sus contactos localmente sin subirlos a su servidor.\n\nEl sistema le pedirá ahora que conceda permiso para acceder a sus contactos del móvil.</string> @@ -634,4 +639,24 @@ <string name="no_keys_just_confirm">Ya confía en este contacto. Al seleccionar \'hecho\' está confirmando que %s es parte de esta reunión.</string> <string name="select_image_and_crop">Seleccionar imagen y recortar</string> <string name="this_account_is_disabled">Ha deshabilitado esta cuenta</string> + <string name="security_error_invalid_file_access">Error de seguridad: Acceso a fichero inválido</string> + <string name="no_application_to_share_uri">No se ha encontrado ninguna aplicación para compartir la URI</string> + <string name="share_uri_with">Compartir URI con...</string> + <string name="welcome_text">XMPP es un protocolo independiente del proveedor. Puedes usar este cliente con cualquier servidor de XMPP que elijas.\nDe todas formas, para tu comodidad, hemos facilitado la creación de una cuenta en conversations.im; un proveedor alojado especialmente para su uso con Conversations.</string> + <string name="magic_create_text">Te guiaremos durante el proceso de creación de la cuenta en conversations.im.\nCuando selecciones conversations.im como proveedor, podrás comunicarte con usuarios de otros servidores mediante tu identificador Jabber.</string> + <string name="your_full_jid_will_be">Tu identificador Jabber será: %s</string> + <string name="create_account">Crear cuenta</string> + <string name="use_own_provider">Usar mi propio proveedor</string> + <string name="pick_your_username">Selecciona tu nombre de usuario</string> + <string name="pref_manually_change_presence">Cambiar manualmente tu estado</string> + <string name="pref_manually_change_presence_summary">Toca tu imagen para cambiar tu estado</string> + <string name="change_presence">Cambiar estado</string> + <string name="status_message">Mensaje de estado</string> + <string name="all_accounts_on_this_device">Establecer para todas mis cuentas en este dispositivo</string> + <string name="presence_chat">Libre para hablar</string> + <string name="presence_online">Disponible</string> + <string name="presence_away">Ausente</string> + <string name="presence_xa">No disponible</string> + <string name="presence_dnd">Ocupado</string> + <string name="secure_password_generated">Se ha generado una contraseña segura</string> </resources> diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index c18e6d8d..5668748e 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -104,10 +104,18 @@ <string name="pref_accept_files">Fitxategiak onartu</string> <string name="pref_accept_files_summary">Hurrengo tamaina baino fitxategi txikiagoak automatikoki onartu…</string> <string name="pref_accept_files_size_summary">Hurrengo tamaina baino fitxategi txikiagoak automatikoki onartu…</string> + <string name="pref_attachments">Eranskinak</string> + <string name="pref_return_to_previous">Partekatze azkarra</string> + <string name="pref_return_to_previous_summary">Zuzenean aurreko aktibitatera itzuli elkarrizketa ireki beharrean zerbait partekatu ondoren</string> <string name="pref_notification_settings">Jakinarazpena</string> <string name="pref_notifications">Jakinarazpenak</string> <string name="pref_notifications_summary">Mezu berri bat heltzerakoan jakinarazi</string> <string name="pref_vibrate">Dardaratu</string> + <string name="pref_vibrate_summary">Mezu berri bat heltzerakoan dardartu</string> + <string name="pref_led">LED jakinarazpena</string> + <string name="pref_led_summary">Mezu berri bat heltzerakoan jakinarazpenen argia keinu egin</string> + <string name="pref_sound">Dei-tonua</string> + <string name="pref_sound_summary">Mezu berri bat heltzerakoan dei-tonua jo</string> <string name="pref_notification_grace_period">Jakinarazpenen grazia epea</string> <string name="pref_notification_grace_period_summary">Jakinarazpenak denbora labur baterako ezgaitu ikatz-kopia bat jaso ondoren</string> <string name="pref_advanced_options">Aurreratua</string> @@ -540,6 +548,7 @@ <string name="shared_file_with_x">Fitxategia %s(r)ekin partekatu da</string> <string name="shared_image_with_x">Irudia %s(r)ekin partekatu da</string> <string name="shared_images_with_x">Irudiak %s(r)ekin partekatu dira</string> + <string name="shared_text_with_x">Testua %s(r)ekin partekatu da</string> <string name="no_storage_permission">Conversationsek kanpoko biltegirako sarbidea behar du</string> <string name="sync_with_contacts">Kontaktuekin sinkronizatu</string> <string name="sync_with_contacts_long">Conversationsek zure XMPP zerrenda eta zure kontaktuak uztartu nahi ditu haien izenak eta argazkiak erakusteko.\n\nConversationsek zure kontaktuak modu lokalean soilik irakurri eta uztartuko ditu, zure zerbitzarira kargatu gabe.\n\nJarraian baimenak eskatuko zaizkizu zure kontaktuetara sartu ahal izateko.</string> @@ -567,4 +576,7 @@ <string name="no_keys_just_confirm">Kontaktu honetaz fidatzen zara dagoeneko. \'Eginda\' hautatuz %s konferentzia honen kidea dela egiaztatzen duzu besterik gabe.</string> <string name="select_image_and_crop">Irudia hautatu eta moztu</string> <string name="this_account_is_disabled">Kontu hau ezgaitu duzu</string> + <string name="security_error_invalid_file_access">Segurtasun akatsa: fitxategi sarrera baliogabea</string> + <string name="no_application_to_share_uri">Ez da aplikaziorik aurkitu URIa partekatzeko</string> + <string name="share_uri_with">URIa honekin partekatu...</string> </resources> diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 03ab3e9b..99de82e0 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -71,6 +71,8 @@ <string name="send_failed">Échec de l\'envoi.</string> <string name="send_rejected">Rejeté</string> <string name="preparing_image">Préparation de l\'image pour envoi...</string> + <string name="preparing_images">Préparation des images à l\'envoi</string> + <string name="sharing_files_please_wait">Partage des fichiers. Veuillez patienter...</string> <string name="action_clear_history">Vider l\'historique</string> <string name="clear_conversation_history">Vider l\'historique de la conversation</string> <string name="clear_histor_msg">Voulez-vous supprimer tous les messages de cette conversation ?\n\n<b>Attention :</b> Les messages seront supprimés uniquement sur cet appareil.</string> @@ -102,13 +104,18 @@ <string name="pref_accept_files">Accepter les fichiers</string> <string name="pref_accept_files_summary">Accepter automatiquement les fichiers plus petits que…</string> <string name="pref_accept_files_size_summary">Accepter automatiquement les fichiers plus petits que…</string> + <string name="pref_attachments">Pièce jointe</string> + <string name="pref_return_to_previous">Partage rapide</string> + <string name="pref_return_to_previous_summary">Ne pas ouvrir la conversation après avoir partagé quelque chose</string> <string name="pref_notification_settings">Notification</string> <string name="pref_notifications">Notifications</string> - <string name="pref_notifications_summary">Notifier de l\'arrivée d\'un message.</string> + <string name="pref_notifications_summary">Notifier lors de la réception d\'un message</string> <string name="pref_vibrate">Vibration</string> - <string name="pref_vibrate_summary">Vibrer lors de l\'arrivée d\'un message.</string> - <string name="pref_sound">Sonore</string> - <string name="pref_sound_summary">Jouer une sonnerie pour notifier.</string> + <string name="pref_vibrate_summary">Vibrer lors de la réception d\'un message</string> + <string name="pref_led">Notification LED</string> + <string name="pref_led_summary">Faire clignoter la LED lors de la réception d\'un message</string> + <string name="pref_sound">Sonnerie</string> + <string name="pref_sound_summary">Jouer un son lors de la réception d\'un message</string> <string name="pref_notification_grace_period">Période sans notification</string> <string name="pref_notification_grace_period_summary">Désactiver momentanément les notifications après l\'arrivée d\'une copie carbone.</string> <string name="pref_advanced_options">Avancé</string> @@ -352,6 +359,7 @@ <string name="choose_file">Choix du fichier</string> <string name="receiving_x_file">Réception %1$s (%2$d%% complété)</string> <string name="download_x_file">Télécharger %s</string> + <string name="delete_x_file">Effacer %s</string> <string name="file">fichier</string> <string name="open_x_file">Ouvrir %s</string> <string name="sending_file">envoi (%1$d%% complété)</string> @@ -537,6 +545,8 @@ </plurals> <string name="shared_file_with_x">Fichier partagé avec %s</string> <string name="shared_image_with_x">Image partagée avec %s</string> + <string name="shared_images_with_x">Image partagée avec %s</string> + <string name="shared_text_with_x">Texte partagé avec %s</string> <string name="no_storage_permission">Conversations a besoin d\'accéder au stockage externe</string> <string name="sync_with_contacts">Synchroniser avec contacts</string> <string name="sync_with_contacts_long">Conversations souhaite associer vos contacts XMPP avec les contacts de votre appareil, pour utiliser leur nom complet et leur avatar.\n\nConversations va uniquement lire vos contacts et les associer localement, sans les envoyer sur le serveur XMPP.\n\nVotre appareil va maintenant vous demander la permission d\'accéder à vos contacts.</string> @@ -564,4 +574,24 @@ <string name="no_keys_just_confirm">Vous faites déjà confiance à ce contact. En sélectionnant « Terminé » vous confirmerez seulement que %s est membre de cette conférence.</string> <string name="select_image_and_crop">Sélectionner et découper une image</string> <string name="this_account_is_disabled">Vous avez désactivé ce compte</string> + <string name="security_error_invalid_file_access">Erreur de sécurité : accès fichier non-valide</string> + <string name="no_application_to_share_uri">Aucune application trouvée pour partager l\'URI</string> + <string name="share_uri_with">Partagée l\'URI avec...</string> + <string name="welcome_text">XMPP est un protocole indépendant. Vous pouvez utiliser ce client avec le serveur XMPP de votre choix.\nCependant, pour votre confort, vous pouvez créer un compte sur conversations.im, un fournisseur spécialement approprié pour Conversations.</string> + <string name="magic_create_text">Nous vous guiderons pendant toute la procédure de création d\'un compte utilisateur sur conversations.im.\nEn choisissant conversations.im comme fournisseur, vous pourrez communiquer avec les utilisateurs d\'autres fournisseurs en leurs transmettant votre Jabber ID complet. </string> + <string name="your_full_jid_will_be">Votre Jabber ID complet sera: %s</string> + <string name="create_account">Créer un compte</string> + <string name="use_own_provider">Utiliser votre propre fournisseur</string> + <string name="pick_your_username">Choisissez votre nom d\'utilisateur</string> + <string name="pref_manually_change_presence">Changer votre disponibilité</string> + <string name="pref_manually_change_presence_summary">Cliquez sur votre avatar pour modifier votre présence</string> + <string name="change_presence">Changer votre disponibilité</string> + <string name="status_message">Message de status</string> + <string name="all_accounts_on_this_device">Configurer pour tous les comptes sur cet appareil</string> + <string name="presence_chat">Disponible</string> + <string name="presence_online">En ligne</string> + <string name="presence_away">Absent</string> + <string name="presence_xa">Non disponible</string> + <string name="presence_dnd">Occupé</string> + <string name="secure_password_generated">Un mot de passe fort a été généré</string> </resources> diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index fecef223..ab6102c3 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -104,10 +104,18 @@ <string name="pref_accept_files">ファイルを受取</string> <string name="pref_accept_files_summary">自動的に小さいファイルを受取…</string> <string name="pref_accept_files_size_summary">自動的に小さいファイルを受取…</string> + <string name="pref_attachments">添付ファイル</string> + <string name="pref_return_to_previous">クイック共有</string> + <string name="pref_return_to_previous_summary">共有した後で、会話を開く代わりに、すぐに前のアクティビティに戻ります</string> <string name="pref_notification_settings">通知</string> <string name="pref_notifications">通知</string> <string name="pref_notifications_summary">新しいメッセージが到着したときに通知します</string> <string name="pref_vibrate">振動</string> + <string name="pref_vibrate_summary">新しいメッセージが届いたときに振動します</string> + <string name="pref_led">LED 通知</string> + <string name="pref_led_summary">新しいメッセージが届いたときに通知ライトを点滅します</string> + <string name="pref_sound">着信音</string> + <string name="pref_sound_summary">新しいメッセージが届いたときにサウンドを再生します</string> <string name="pref_notification_grace_period">通知猶予期間</string> <string name="pref_notification_grace_period_summary">カーボンコピーを受信した後、短時間、通知を無効にします</string> <string name="pref_advanced_options">詳細</string> @@ -537,6 +545,7 @@ <string name="shared_file_with_x">%s でファイルを共有</string> <string name="shared_image_with_x">%s で画像を共有</string> <string name="shared_images_with_x">%s で画像を共有</string> + <string name="shared_text_with_x">%s でテキストを共有</string> <string name="no_storage_permission">Conversations は外部ストレージにアクセスが必要です</string> <string name="sync_with_contacts">連絡先と同期</string> <string name="sync_with_contacts_long">Conversations はフルネームやアバターを表示するために、連絡先と XMPP 名簿と一致するようにしたいです。\n\nConversations は、サーバーにアップロードすることはなく、ローカルで連絡先を読んで一致させるだけです。\n\n今、連絡先へのアクセス許可を付与するように求められます。</string> @@ -564,4 +573,24 @@ <string name="no_keys_just_confirm">既にこの連絡先を信頼しています。\'完了\' を選択すると、%s がこの会議の参加者であることを確認します。</string> <string name="select_image_and_crop">画像の選択とトリミング</string> <string name="this_account_is_disabled">このアカウントを無効にしました</string> + <string name="security_error_invalid_file_access">セキュリティエラー: 不正なファイルアクセス</string> + <string name="no_application_to_share_uri">URI を共有するアプリケーションが見つかりません</string> + <string name="share_uri_with">…で URI を共有</string> + <string name="welcome_text">XMPPはプロバイダーに依存しないプロトコルです。これまであなたが選択したどのXMPPサーバーでも、このクライアントを使用することができます。\nしかしあなたが便利なように、Conversationsで使用するのに最適なプロバイダーconversations.imで簡単にアカウントを作成することができるようにしています。</string> + <string name="magic_create_text">conversations.imのアカウントを作成する手順をガイドします。\nプロバイダーとしてconversations.imを選択すると、あなたの完全なJabber IDを指定することによって、他のプロバイダーのユーザと通信することができるようになります。</string> + <string name="your_full_jid_will_be">あなたの完全な Jabber ID は: %s</string> + <string name="create_account">アカウントを作成</string> + <string name="use_own_provider">独自のプロバイダーを使用する</string> + <string name="pick_your_username">ユーザー名を選択</string> + <string name="pref_manually_change_presence">参加を手動で変更</string> + <string name="pref_manually_change_presence_summary">アバターをタッチして、参加を変更します</string> + <string name="change_presence">参加を変更</string> + <string name="status_message">ステータスメッセージ</string> + <string name="all_accounts_on_this_device">このデバイス上のすべてのアカウントに対して設定</string> + <string name="presence_chat">いつでもチャットできます</string> + <string name="presence_online">オンライン</string> + <string name="presence_away">離席中</string> + <string name="presence_xa">利用不可</string> + <string name="presence_dnd">取込中</string> + <string name="secure_password_generated">安全なパスワードが生成されました</string> </resources> diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 68203cf4..6c99d6c4 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -104,10 +104,18 @@ <string name="pref_accept_files">Aanvaard bestanden</string> <string name="pref_accept_files_summary">Aanvaard automatisch bestanden kleiner dan…</string> <string name="pref_accept_files_size_summary">Aanvaard automatisch bestanden kleiner dan…</string> + <string name="pref_attachments">Bijlagen</string> + <string name="pref_return_to_previous">Snel delen</string> + <string name="pref_return_to_previous_summary">Keer na iets te delen onmiddellijk terug naar de vorige activiteit in plaats van het gesprek te openen</string> <string name="pref_notification_settings">Melding</string> <string name="pref_notifications">Meldingen</string> - <string name="pref_notifications_summary">Melding als een nieuw bericht arriveert</string> + <string name="pref_notifications_summary">Melding wanneer een nieuw bericht ontvangen wordt</string> <string name="pref_vibrate">Trillen</string> + <string name="pref_vibrate_summary">Trillen wanneer een nieuw bericht ontvangen wordt</string> + <string name="pref_led">LED-melding</string> + <string name="pref_led_summary">Meldingslicht knipperen wanneer een nieuw bericht ontvangen wordt</string> + <string name="pref_sound">Beltoon</string> + <string name="pref_sound_summary">Geluid afspelen wanneer een nieuw bericht ontvangen wordt</string> <string name="pref_notification_grace_period">Uitstelperiode voor meldingen</string> <string name="pref_notification_grace_period_summary">Schakel meldingen voor korte tijd uit als er een carbon copy wordt ontvangen</string> <string name="pref_advanced_options">Geavanceerd</string> @@ -540,6 +548,7 @@ <string name="shared_file_with_x">Bestand gedeeld met %s</string> <string name="shared_image_with_x">Afbeelding gedeeld met %s</string> <string name="shared_images_with_x">Afbeeldingen gedeeld met %s</string> + <string name="shared_text_with_x">Tekst gedeeld met %s</string> <string name="no_storage_permission">Conversations heeft toegang nodig tot de externe opslag</string> <string name="sync_with_contacts">Synchroniseer met contacten</string> <string name="sync_with_contacts_long">Conversations wil je XMPP-rooster met je contacten vergelijken om hun volledige namen en profielfoto\'s te tonen.\n\nConversations zal je contacten enkel lokaal lezen en vergelijken zonder ze te uploaden naar je server.\n\nJe zal nu gevraagd worden Conversations toegang te verlenen tot je contacten.</string> @@ -567,4 +576,24 @@ <string name="no_keys_just_confirm">Je vertrouwt dit contact al. Door \'klaar\' te kiezen bevestig je enkel dat %s deel uitmaakt van dit groepsgesprek.</string> <string name="select_image_and_crop">Afbeelding kiezen en bijsnijden</string> <string name="this_account_is_disabled">Je hebt deze account uitgeschakeld</string> + <string name="security_error_invalid_file_access">Beveiligingsfout: Ongeldige bestandstoegang</string> + <string name="no_application_to_share_uri">Geen applicatie om URI te delen</string> + <string name="share_uri_with">URI delen met…</string> + <string name="welcome_text">XMPP is een protocol onafhankelijk van de providers. Je kan deze toepassing gebruiken met eender welke XMPP-server.\nOm het eenvoudig te houden hebben we het makkelijk gemaakt een account aan te maken op conversations.im; een provider speciaal geschikt voor Conversations.</string> + <string name="magic_create_text">We zullen je helpen een account op conversations.im aan te maken.\nWanneer je conversations.im als je provider kiest kan je met gebruikers van andere providers communiceren door hen je volledige Jabber-ID te geven.</string> + <string name="your_full_jid_will_be">Je volledige Jabber-ID zal %s zijn</string> + <string name="create_account">Account aanmaken</string> + <string name="use_own_provider">Gebruik mijn eigen provider</string> + <string name="pick_your_username">Kies je gebruikersnaam</string> + <string name="pref_manually_change_presence">Aanwezigheid handmatig instellen</string> + <string name="pref_manually_change_presence_summary">Tik op je avatar om je aanwezigheid in te stellen</string> + <string name="change_presence">Aanwezigheid instellen</string> + <string name="status_message">Statusbericht</string> + <string name="all_accounts_on_this_device">Instellen voor alle accounts op dit apparaat</string> + <string name="presence_chat">Beschikbaar</string> + <string name="presence_online">Online</string> + <string name="presence_away">Afwezig</string> + <string name="presence_xa">Niet beschikbaar</string> + <string name="presence_dnd">Bezig</string> + <string name="secure_password_generated">Een veilig wachtwoord is aangemaakt</string> </resources> diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 52f40439..28aa2ae3 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -100,33 +100,36 @@ <string name="contacts_have_no_pgp_keys">O Conversations não conseguiu criptografar suas mensagens porque os seus contatos não estão anunciando a chave pública deles(as).\n\n<small>Por favor, solicite aos seus contatos que configurem o OpenPGP.</small></string> <string name="pref_general">Geral</string> <string name="pref_xmpp_resource">Identificação XMPP</string> - <string name="pref_xmpp_resource_summary">O nome pelo qual esse cliente se identifica</string> + <string name="pref_xmpp_resource_summary">O nome pelo qual esse cliente se identifica.</string> <string name="pref_accept_files">Aceitar arquivos</string> - <string name="pref_accept_files_summary">Aceitar automaticamente arquivos menores que...</string> + <string name="pref_accept_files_summary">Aceita automaticamente arquivos menores que...</string> <string name="pref_accept_files_size_summary">Aceitar automaticamente arquivos menores que...</string> + <string name="pref_attachments">Anexos</string> + <string name="pref_return_to_previous">Compartilhamento rápido</string> + <string name="pref_return_to_previous_summary">Após compartilhar alguma coisa, retorna imediatamente à atividade anterior ao invés de abrir a conversa.</string> <string name="pref_notification_settings">Notificação</string> <string name="pref_notifications">Notificações</string> - <string name="pref_notifications_summary">Notificar ao receber uma nova mensagem</string> + <string name="pref_notifications_summary">Avisa ao receber uma nova mensagem.</string> <string name="pref_vibrate">Vibração</string> - <string name="pref_vibrate_summary">Vibrar ao receber uma nova mensagem</string> + <string name="pref_vibrate_summary">Vibra ao receber uma nova mensagem.</string> <string name="pref_led">Notificação via LED</string> - <string name="pref_led_summary">Piscar a luz de notificação ao receber uma nova mensagem</string> + <string name="pref_led_summary">Pisca a luz de notificação ao receber uma nova mensagem.</string> <string name="pref_sound">Toque</string> - <string name="pref_sound_summary">Tocar um som ao receber uma nova mensagem</string> + <string name="pref_sound_summary">Toca um som ao receber uma nova mensagem.</string> <string name="pref_notification_grace_period">Tempo de espera da notificação</string> - <string name="pref_notification_grace_period_summary">Desativar notificações por um curto período após uma copia ser recebida</string> + <string name="pref_notification_grace_period_summary">Desativa as notificações por um curto período após uma cópia da mensagem ser recebida.</string> <string name="pref_advanced_options">Avançado</string> <string name="pref_never_send_crash">Nunca enviar relatórios de erros</string> - <string name="pref_never_send_crash_summary">Ao enviar os stack traces você está colaborando com o desenvolvimento do Conversations</string> + <string name="pref_never_send_crash_summary">Ao enviar os stack traces você está colaborando com o desenvolvimento do Conversations.</string> <string name="pref_confirm_messages">Confirmação de mensangens</string> - <string name="pref_confirm_messages_summary">Permitir que um contato saiba quando você recebeu e leu uma mensagem</string> + <string name="pref_confirm_messages_summary">Permite que um contato saiba quando você recebeu e leu uma mensagem.</string> <string name="pref_ui_options">IU</string> <string name="openpgp_error">O OpenKeychain informou um erro</string> <string name="error_decrypting_file">Ocorreu um erro de E/S na descriptografia o arquivo</string> <string name="accept">Aceitar</string> <string name="error">Ocorreu um erro</string> <string name="pref_grant_presence_updates">Permitir atualizações de presença</string> - <string name="pref_grant_presence_updates_summary">Permitir antecipadamente e solicitar por atualizações de presença aos contatos que você criar</string> + <string name="pref_grant_presence_updates_summary">Permite e solicita atualizações de presença aos contatos que você criar.</string> <string name="subscriptions">Inscrições</string> <string name="your_account">Sua conta</string> <string name="keys">Chaves</string> @@ -281,31 +284,31 @@ <string name="without_mutual_presence_updates"><b>Aviso:</b> Enviar isso sem atualizações mútuas de presença pode provocar problemas inesperados.\n\n<small>Verifique nos detalhes do contato suas inscrições de presença.</small></string> <string name="pref_security_settings">Segurança</string> <string name="pref_force_encryption">Forçar criptografia ponto-a-ponto</string> - <string name="pref_force_encryption_summary">Sempre envie mensagem criptografada (exceto para conferências)</string> + <string name="pref_force_encryption_summary">Sempre envie mensagem criptografada (exceto para conferências).</string> <string name="pref_allow_message_correction">Permitir a correção da mensagem</string> - <string name="pref_allow_message_correction_summary">Permite que seus contatos edite suas mensagens retroativamente</string> + <string name="pref_allow_message_correction_summary">Permite que seus contatos editem suas mensagens retroativamente.</string> <string name="pref_dont_save_encrypted">Não salve as mensagens criptografadas</string> - <string name="pref_dont_save_encrypted_summary">Atenção: Isso pode levar a perda de mensagens</string> + <string name="pref_dont_save_encrypted_summary">Atenção: Isso pode levar a perda de mensagens.</string> <string name="pref_expert_options">Configurações avançadas</string> - <string name="pref_expert_options_summary">Por favor, use com cuidado</string> + <string name="pref_expert_options_summary">Por favor, use com cuidado.</string> <string name="title_activity_about">Sobre o Conversations</string> - <string name="pref_about_conversations_summary">Informações de licenciamento e construção</string> + <string name="pref_about_conversations_summary">Informações de licenciamento e construção.</string> <string name="title_pref_quiet_hours">Horário de sossego</string> <string name="title_pref_quiet_hours_start_time">Início</string> <string name="title_pref_quiet_hours_end_time">Fim</string> <string name="title_pref_enable_quiet_hours">Habilitar horário de sossego</string> - <string name="pref_quiet_hours_summary">As notificações serão silenciadas no horário de sossego</string> + <string name="pref_quiet_hours_summary">As notificações serão silenciadas no horário de sossego.</string> <string name="pref_use_larger_font">Aumentar o tamanho da fonte</string> - <string name="pref_use_larger_font_summary">Usar fontes maiores por todo aplicativo</string> + <string name="pref_use_larger_font_summary">Usa fontes maiores em todo o aplicativo.</string> <string name="pref_use_send_button_to_indicate_status">O botão de envio indica o status</string> <string name="pref_use_indicate_received">Solicitar confirmação de recebimento</string> - <string name="pref_use_indicate_received_summary">As mensagens recebidas serão marcadas com um tique verde, se suportado</string> - <string name="pref_use_send_button_to_indicate_status_summary">Colorir o botão de envio para indicar o status do contato</string> + <string name="pref_use_indicate_received_summary">As mensagens recebidas serão marcadas com um tique verde, se suportado.</string> + <string name="pref_use_send_button_to_indicate_status_summary">Colore o botão de envio para indicar o status do contato.</string> <string name="pref_expert_options_other">Outras</string> <string name="pref_conference_name">Nome da conferência</string> - <string name="pref_conference_name_summary">Use o assunto da sala ao invés do JID para identificar as conferências</string> + <string name="pref_conference_name_summary">Identifica as conferências usando o assunto da sala ao invés do JID.</string> <string name="pref_autojoin">Entrar automaticamente nas conferências</string> - <string name="pref_autojoin_summary">Respeitar a opção de entrada automática dos marcadores de conferência</string> + <string name="pref_autojoin_summary">Respeita a opção de entrada automática dos marcadores de conferência.</string> <string name="toast_message_otr_fingerprint">Impressão digital OTR copiada para a área de transferência!</string> <string name="toast_message_omemo_fingerprint">Impressão digital OMEMO copiada para a área de transferência!</string> <string name="conference_banned">Você foi banido dessa conferência</string> @@ -349,9 +352,9 @@ <string name="no_otr_session_found">Não foi encontrada nenhuma sessão OTR válida!</string> <string name="conversations_foreground_service">Conversations</string> <string name="pref_keep_foreground_service">Manter o serviço em segundo plano</string> - <string name="pref_keep_foreground_service_summary">Impede que o sistema operacional encerre sua conexão</string> + <string name="pref_keep_foreground_service_summary">Impede que o sistema operacional encerre sua conexão.</string> <string name="pref_export_logs">Exportar registros</string> - <string name="pref_export_logs_summary">Escrever os registros no cartão SD</string> + <string name="pref_export_logs_summary">Escreve os registros no cartão SD.</string> <string name="notification_export_logs_title">Escrevendo os registros no cartão SD</string> <string name="choose_file">Selecione o arquivo</string> <string name="receiving_x_file">Recebendo %1$s (completou %2$d%%)</string> @@ -370,7 +373,7 @@ <string name="manually_verify">Verificado manualmente</string> <string name="are_you_sure_verify_fingerprint">Deseja realmente verificar as impressões digitais OTR dos seus contatos?</string> <string name="pref_show_dynamic_tags">Exibir etiquetas dinâmicas</string> - <string name="pref_show_dynamic_tags_summary">Exibir etiquetas somente de leitura abaixo dos contatos</string> + <string name="pref_show_dynamic_tags_summary">Exibe etiquetas de somente-leitura abaixo dos contatos.</string> <string name="enable_notifications">Habilitar notificações</string> <string name="conference_with">Criar conferência com...</string> <string name="no_conference_server_found">Não foi encontrado nenhum servidor de conferências</string> @@ -442,9 +445,9 @@ <string name="until_further_notice">Até segunda ordem</string> <string name="pref_input_options">Entrada</string> <string name="pref_enter_is_send">Enter envia</string> - <string name="pref_enter_is_send_summary">Use o botão Enter para enviar a mensagem</string> + <string name="pref_enter_is_send_summary">Usa o botão Enter para enviar a mensagem.</string> <string name="pref_display_enter_key">Exibir o botão Enter</string> - <string name="pref_display_enter_key_summary">Altere o botão de emoticons para um botão Enter</string> + <string name="pref_display_enter_key_summary">Altera o botão de emoticons para um botão Enter.</string> <string name="audio">áudio</string> <string name="video">vídeo</string> <string name="image">imagem</string> @@ -462,7 +465,7 @@ <string name="contact_is_typing">%s está digitando...</string> <string name="contact_has_stopped_typing">%s parou de digitar</string> <string name="pref_chat_states">Notificações de digitação</string> - <string name="pref_chat_states_summary">Permitir que seus contatos vejam quando você estiver digitando uma nova mensagem</string> + <string name="pref_chat_states_summary">Permite que seus contatos vejam quando você estiver digitando uma nova mensagem.</string> <string name="send_location">Enviar localização</string> <string name="show_location">Exibir localização</string> <string name="no_application_found_to_display_location">Não foi encontrado nenhum aplicativo para exibir a localização</string> @@ -471,9 +474,9 @@ <string name="title_undo_swipe_out_conversation">A conversa foi fechada</string> <string name="title_undo_swipe_out_muc">Saiu da conferência</string> <string name="pref_dont_trust_system_cas_title">Não confiar nas CAs do sistema</string> - <string name="pref_dont_trust_system_cas_summary">Todos os certificados devem ser aprovados manualmente</string> + <string name="pref_dont_trust_system_cas_summary">Todos os certificados devem ser aprovados manualmente.</string> <string name="pref_remove_trusted_certificates_title">Remover certificados</string> - <string name="pref_remove_trusted_certificates_summary">Excluir os certificados aprovados manualmente</string> + <string name="pref_remove_trusted_certificates_summary">Exclui os certificados aprovados manualmente.</string> <string name="toast_no_trusted_certs">Nenhum certificado aprovado manualmente</string> <string name="dialog_manage_certs_title">Remover certificados</string> <string name="dialog_manage_certs_positivebutton">Excluir a seleção</string> @@ -486,7 +489,7 @@ <item quantity="one">Selecionar %d contato</item> <item quantity="other">Selecionar %d contatos</item> </plurals> - <string name="pref_quick_action_summary">Trocar o botão enviar pelo de ação rápida</string> + <string name="pref_quick_action_summary">Troca o botão enviar pelo de ação rápida.</string> <string name="pref_quick_action">Ação rápida</string> <string name="none">Nenhuma</string> <string name="recently_used">Usada mais recentemente</string> @@ -506,13 +509,13 @@ <string name="server_info_broken">Quebrado</string> <string name="pref_presence_settings">Presença</string> <string name="pref_away_when_screen_off">Afastado quando a tela estiver desligada</string> - <string name="pref_away_when_screen_off_summary">Definir o seu status como afastado quando a tela estiver desligada</string> - <string name="pref_xa_on_silent_mode">Não disponível quando em modo silencioso</string> - <string name="pref_xa_on_silent_mode_summary">Definir o seu status como não disponível quando o dispositivo estiver em modo silencioso</string> + <string name="pref_away_when_screen_off_summary">Define o seu status como afastado quando a tela estiver desligada.</string> + <string name="pref_xa_on_silent_mode">Indisponível quando em modo silencioso</string> + <string name="pref_xa_on_silent_mode_summary">Define o seu status como indisponível quando o dispositivo estiver em modo silencioso.</string> <string name="pref_treat_vibrate_as_silent">Considerar o modo de vibração como silencioso</string> - <string name="pref_treat_vibrate_as_silent_summary">Definir o seu status como indisponível quando o dispositivo estiver em modo de vibração</string> + <string name="pref_treat_vibrate_as_silent_summary">Define o seu status como indisponível quando o dispositivo estiver em modo de vibração.</string> <string name="pref_show_connection_options">Configurações detalhadas da conexão</string> - <string name="pref_show_connection_options_summary">Exibe o nome de host e configurações da porta ao configurar uma conta</string> + <string name="pref_show_connection_options_summary">Exibe o nome de host e configurações da porta ao configurar uma conta.</string> <string name="hostname_example">xmpp.example.com</string> <string name="action_add_account_with_certificate">Adicionar uma conta com certificado</string> <string name="unable_to_parse_certificate">Não foi possível analisar o certificado</string> @@ -542,6 +545,8 @@ </plurals> <string name="shared_file_with_x">Arquivo compartilhado com %s</string> <string name="shared_image_with_x">Imagem compartilhada com %s</string> + <string name="shared_images_with_x">Imagens compartilhadas com %s</string> + <string name="shared_text_with_x">Texto compartilhado com %s</string> <string name="no_storage_permission">O Conversations necessita de acesso ao armazenamento externo</string> <string name="sync_with_contacts">Sincronizar com os contatos</string> <string name="sync_with_contacts_long">O Conversations quer procurar por correspondências entre contatos da sua conta Jabber e do seu telefone, para complementar as informações de nome completo e avatares\n\nO Conversations fará a verificação localmente, sem enviar nenhuma informação sua para o servidor\n\nVocê será solicitado a fornecer permissão de acesso aos seus contatos agora.</string> @@ -551,7 +556,7 @@ <string name="certificate_cn">Common Name</string> <string name="certificate_o">Organização</string> <string name="certificate_sha1">SHA-1</string> - <string name="certicate_info_not_available">(Não disponível)</string> + <string name="certicate_info_not_available">(Indisponível)</string> <string name="certificate_not_found">Não foi encontrado nenhum certificado</string> <string name="notify_on_all_messages">Notificar em todas as mensagens</string> <string name="notify_only_when_highlighted">Notificar somente quando destacado</string> @@ -570,4 +575,6 @@ <string name="select_image_and_crop">Selecione e recorte a imagem</string> <string name="this_account_is_disabled">Você desabilitou essa conta</string> <string name="security_error_invalid_file_access">Erro de segurança: Acesso inválido ao arquivo</string> + <string name="no_application_to_share_uri">Não foi encontrada nenhuma aplicação para compartilhar a URI</string> + <string name="share_uri_with">Compartilhar a URI com...</string> </resources> diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index ba262d9c..fade26ad 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -104,10 +104,18 @@ <string name="pref_accept_files">Aceitar ficheiros</string> <string name="pref_accept_files_summary">Automaticamente aceitar ficheiros menores que...</string> <string name="pref_accept_files_size_summary">Automaticamente aceitar ficheiros menores que...</string> + <string name="pref_attachments">Anexos</string> + <string name="pref_return_to_previous">Partilha Rápida</string> + <string name="pref_return_to_previous_summary">Voltar imediatamente à atividade anterior em vez de abrir a conversação depois de partilhar alguma coisa</string> <string name="pref_notification_settings">Notificação</string> <string name="pref_notifications">Notificações</string> <string name="pref_notifications_summary">Notificar quando uma nova mensagem for recebida</string> <string name="pref_vibrate">Vibrar</string> + <string name="pref_vibrate_summary">Vibrar quando uma nova mensagem for recebida</string> + <string name="pref_led">Notificação LED</string> + <string name="pref_led_summary">Piscar luz de notificação quando uma nova mensagem for recebida</string> + <string name="pref_sound">Tom de toque</string> + <string name="pref_sound_summary">Tocar som quando uma nova mensagem for recebida</string> <string name="pref_notification_grace_period">Período de carência da notificação</string> <string name="pref_notification_grace_period_summary">Desativar notificações por um curto período após a copia oculta ser recebida</string> <string name="pref_advanced_options">Avançadas</string> @@ -540,6 +548,7 @@ <string name="shared_file_with_x">Ficheiro partilhado com %s</string> <string name="shared_image_with_x">Imagem partilhada com %s</string> <string name="shared_images_with_x">Imagens partilhadas com %s</string> + <string name="shared_text_with_x">Mensagem partilhada com %s</string> <string name="no_storage_permission">Conversations necessita de acesso ao armazenamento externo</string> <string name="sync_with_contacts">Sincronizar com contactos</string> <string name="sync_with_contacts_long">A aplicação Conversations deseja fazer a correspondência entre a sua lista de contactos XMPP e os seus contactos para mostrar os seus nomes completos e os seus avatares.\n\nA aplicação Conversations irá apenas ler os seus contactos e fazer a correspondência localmente sem enviar os dados para o seu servidor.\n\nIrá agora ser-lhe pedido para dar permissão para aceder aos seus contactos.</string> @@ -567,4 +576,7 @@ <string name="no_keys_just_confirm">Já confia neste contacto. Ao selecionar \'Concluído\' apenas está a confirmar que %s faz parte desta conferência.</string> <string name="select_image_and_crop">Selecione imagem e corte</string> <string name="this_account_is_disabled">Desativou esta conta</string> + <string name="security_error_invalid_file_access">Erro de segurança: Acesso ao ficheiro inválido</string> + <string name="no_application_to_share_uri">Não foi encontrada nenhuma aplicação para partilhar o URI</string> + <string name="share_uri_with">Partilhar URI com...</string> </resources> diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml index d799e1c2..6c158fa4 100644 --- a/src/main/res/values-ro-rRO/strings.xml +++ b/src/main/res/values-ro-rRO/strings.xml @@ -104,10 +104,18 @@ <string name="pref_accept_files">Accepta fisiere</string> <string name="pref_accept_files_summary">Accepta automat fisiere mai mici decat...</string> <string name="pref_accept_files_size_summary">Accepta automat fisiere mai mici decat...</string> + <string name="pref_attachments">Atasamente</string> + <string name="pref_return_to_previous">Partajare rapida</string> + <string name="pref_return_to_previous_summary">Intoarcere la activitatea precedenta in loc sa deschizi conversatia, dupa ce ai partajat ceva</string> <string name="pref_notification_settings">Notificare</string> <string name="pref_notifications">Notificari</string> <string name="pref_notifications_summary">Notifica cand un nou mesaj este primit</string> <string name="pref_vibrate">Vibreaza</string> + <string name="pref_vibrate_summary">Vibreaza cand un nou mesaj este primit</string> + <string name="pref_led">Notificare LED</string> + <string name="pref_led_summary">Clipeste lumina de notificare atunci cand un nou mesaj este primit</string> + <string name="pref_sound">Ton de apel</string> + <string name="pref_sound_summary">Notificare sonora atunci cand un nou mesaj este primit</string> <string name="pref_notification_grace_period">Perioada de gratie notificari </string> <string name="pref_notification_grace_period_summary">Opreste notificari pentru o scurta perioada dupa ce o copie a mesajului a fost primita</string> <string name="pref_advanced_options">Optiuni avansate</string> @@ -543,6 +551,7 @@ <string name="shared_file_with_x">Partajeaza fisierul cu %s...</string> <string name="shared_image_with_x">Partajeaza imaginea cu %s.</string> <string name="shared_images_with_x">Partajeaza imaginile cu %s.</string> + <string name="shared_text_with_x">Partajeaza textul cu %s</string> <string name="no_storage_permission">Conversations are nevoie de acces la stocarea externa</string> <string name="sync_with_contacts">Sincronizeaza cu contactele</string> <string name="sync_with_contacts_long">Conversations doreste sa potriveasta lista de contacte XMPP cu cea din dispozitiv pentru a putea afisa numule lor complete si avatarele.\n\nConversations doar v-a citi si potrivi local fara sa le incarce catre vreun server.\n\nUrmeaza sa fii intrebat daca doresti sa permiti accesul la contacte.</string> @@ -571,4 +580,24 @@ Emitent</string> <string name="no_keys_just_confirm">Deja ai incredere in acest contact. Selectand \'gata\' doar confirmi ca %s ia parte la conferinta.</string> <string name="select_image_and_crop">Selecteaza imaginea si decupeaza</string> <string name="this_account_is_disabled">Ai dezactivat acest cont</string> + <string name="security_error_invalid_file_access">Eroare de securitate.: Acces fisier invalid</string> + <string name="no_application_to_share_uri">Nu s-a gasit nici o aplicatie care sa partajeze URI</string> + <string name="share_uri_with">Partajeaza URI cu...</string> + <string name="welcome_text">XMPP este un protocol independent ce nu depinde de un anume furnizor. Aveți posibilitatea sa utilizati acest client cu orice server XMPP doriti.\nTotusi pentru confortul dumneavoastra am facilitat crearea unui cont pe conversations.im; un furnizor potrivit pentru utilizarea cu aplicatia Conversations.</string> + <string name="magic_create_text">Va vom ghida prin procesul de creare al unui cont pe conversations.im.\nCand alegeti conversations.im ca furnizor veti putea comunica cu utilizatorii altor furnizori oferindu-le ID-ul dumneavoastra Jabber.</string> + <string name="your_full_jid_will_be">ID-ul Jabber va fi: %s</string> + <string name="create_account">Creeaza cont</string> + <string name="use_own_provider">Foloseste furnizorul meu</string> + <string name="pick_your_username">Alege un nume de utilizator</string> + <string name="pref_manually_change_presence">Schimba manual setarea de prezenta</string> + <string name="pref_manually_change_presence_summary">Atinge-ti avatarul pentru a-ti schimba starea de prezenta</string> + <string name="change_presence">Schimba setarea de prezenta</string> + <string name="status_message">Mesaj de status</string> + <string name="all_accounts_on_this_device">Seteaza pentru toate conturile de pe acest dispozitiv</string> + <string name="presence_chat">Disponibil pentru conversatie</string> + <string name="presence_online">Conectat</string> + <string name="presence_away">Plecat</string> + <string name="presence_xa">Indisponibil</string> + <string name="presence_dnd">Ocupat</string> + <string name="secure_password_generated">O parola sigura a fost generata</string> </resources> diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index fe5b5f20..4977a855 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -104,6 +104,9 @@ <string name="pref_accept_files">Прихватај фајлове</string> <string name="pref_accept_files_summary">Аутоматски прихватај фајлове мање од…</string> <string name="pref_accept_files_size_summary">Аутоматски прихватај фајлове мање од…</string> + <string name="pref_attachments">Прилози</string> + <string name="pref_return_to_previous">Брзо дељење</string> + <string name="pref_return_to_previous_summary">Враћање на претходну активност уместо отварања преписке након дељења</string> <string name="pref_notification_settings">Обавештење</string> <string name="pref_notifications">Обавештења</string> <string name="pref_notifications_summary">Обавести кад стигне нова порука</string> @@ -517,7 +520,7 @@ <string name="pref_show_connection_options_summary">Приказ домаћина и порта у поставкама налога</string> <string name="hostname_example">xmpp.primer.com</string> <string name="action_add_account_with_certificate">Додај налог сертификатом</string> - <string name="unable_to_parse_certificate">Не могу да рашчланим сертификат</string> + <string name="unable_to_parse_certificate">Не могох да рашчланим сертификат</string> <string name="authenticate_with_certificate">Оставите празно за аутентификацију сертификатом</string> <string name="mam_prefs">Поставке архивисања</string> <string name="server_side_mam_prefs">Серверске поставке архивисања</string> @@ -546,6 +549,7 @@ <string name="shared_file_with_x">Подељен фајл са %s</string> <string name="shared_image_with_x">Подељена слика са %s</string> <string name="shared_images_with_x">Подељене слике са %s</string> + <string name="shared_text_with_x">Подељен текст са %s</string> <string name="no_storage_permission">Конверзацији је потребан приступ спољашњем складишту</string> <string name="sync_with_contacts">Синхронизуј са контактима</string> <string name="sync_with_contacts_long">Конверзација жели да поклапи ваш ИксМПП именик са контактима на вашем уређају да би приказала њихова пуна имена и аватаре.\n\nКонверзација ће само да очита ваше контакте и упореди их локално без отпремања на сервер.\n\nСада ћете бити упитани за дозволу приступа вашим контактима.</string> @@ -574,4 +578,21 @@ <string name="select_image_and_crop">Изабери слику и опсеци</string> <string name="this_account_is_disabled">Искључили сте овај налог</string> <string name="security_error_invalid_file_access">Безбедносна грешка: неисправан приступ фајлу</string> + <string name="no_application_to_share_uri">Нема апликације за дељење веза</string> + <string name="share_uri_with">Подели везу помоћу…</string> + <string name="your_full_jid_will_be">Ваш пуни Џабер ИД ће бити: %s</string> + <string name="create_account">Направи налог</string> + <string name="use_own_provider">Користићу сопствени провајдер</string> + <string name="pick_your_username">Одредите ваше корисничко име</string> + <string name="pref_manually_change_presence">Ручно промени присутност</string> + <string name="pref_manually_change_presence_summary">Тапните ваш аватар да промените присутност</string> + <string name="change_presence">Промени присутност</string> + <string name="status_message">Порука стања</string> + <string name="all_accounts_on_this_device">Постави за све налоге на овом уређају</string> + <string name="presence_chat">Слободан за ћаскање</string> + <string name="presence_online">На вези</string> + <string name="presence_away">Одсутан</string> + <string name="presence_xa">Недоступан</string> + <string name="presence_dnd">Заузет</string> + <string name="secure_password_generated">Безбедна лозинка је направљена</string> </resources> diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 0468180a..9ffea7a8 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -104,10 +104,18 @@ <string name="pref_accept_files">Acceptera filer</string> <string name="pref_accept_files_summary">Acceptera automatiskt filer som är mindre än…</string> <string name="pref_accept_files_size_summary">Acceptera automatiskt filer som är mindre än…</string> + <string name="pref_attachments">Bifogningar</string> + <string name="pref_return_to_previous">Snabbdelning</string> + <string name="pref_return_to_previous_summary">Återvänd genast till föregående aktivitet istället för att öppna konversationen efter att ha delat något</string> <string name="pref_notification_settings">Notifiering</string> <string name="pref_notifications">Notifieringar</string> <string name="pref_notifications_summary">Notifiera när meddelande tagits emot</string> <string name="pref_vibrate">Vibrera</string> + <string name="pref_vibrate_summary">Vibrera när meddelande tagits emot</string> + <string name="pref_led">LED notifieringar</string> + <string name="pref_led_summary">Blinka med notifieringsljuset när ett meddelande tagits emot</string> + <string name="pref_sound">Meddelandesignal</string> + <string name="pref_sound_summary">Spela ljud när meddelande tagits emot</string> <string name="pref_notification_grace_period">Notifieringsfrist</string> <string name="pref_notification_grace_period_summary">Inaktivera notifieringar en kort stund efter att en carbon copy tagits emot</string> <string name="pref_advanced_options">Avancerat</string> @@ -540,6 +548,7 @@ <string name="shared_file_with_x">Delade fil med %s</string> <string name="shared_image_with_x">Delade bild med %s</string> <string name="shared_images_with_x">Delade bilder med %s</string> + <string name="shared_text_with_x">Delade text med %s</string> <string name="no_storage_permission">Conversations behöver access till extern lagring</string> <string name="sync_with_contacts">Synkronisera med kontakter</string> <string name="sync_with_contacts_long">Conversations vill matcha din XMPP-kontaktlista med dina kontakter för att visa deras namn och profilbild.\n\nConversations läser endast dina kontakter för att matcha dem lokalt utan att ladda upp dem till din server.\n\nDu kommer nu få frågan om tillåtelse för att använda kontakterna.</string> @@ -567,4 +576,24 @@ <string name="no_keys_just_confirm">Du litar redan på denna kontakt. Genom att välja \'klar\' bekräftar du att %s är med i denna konferens.</string> <string name="select_image_and_crop">Välj bild och beskär</string> <string name="this_account_is_disabled">Du har deaktiverat detta konto</string> + <string name="security_error_invalid_file_access">Säkerhetsfel: Ogiltig filaccess</string> + <string name="no_application_to_share_uri">Ingen applikation kunde hittas för att dela URI</string> + <string name="share_uri_with">Dela URI med...</string> + <string name="welcome_text">XMPP är ett leverantörsoberoende protokoll. Du kan använda denna klient med vilken XMPP server du vill.\nFör din bekvämlighet har vi gjort det enkelt att skapa ett konto hos conversations.im; en leverantör speciellt anpassad för att användas med Conversations.</string> + <string name="magic_create_text">Du kommer nu att få hjälp med att skapa ett konto på conversations.im.\nNär conversations.im väljs som leverantör kommer du kunna kommunicera med användare hos andra leverantörer genom att ge dem ditt Jabber ID.</string> + <string name="your_full_jid_will_be">Ditt jabber ID blir: %s</string> + <string name="create_account">Skapa konto</string> + <string name="use_own_provider">Använd min egen leverantör</string> + <string name="pick_your_username">Välj användarnamn</string> + <string name="pref_manually_change_presence">Ändra tillgänglighet manuellt</string> + <string name="pref_manually_change_presence_summary">Tryck på din avatarbild för att ändra tillgänglighet</string> + <string name="change_presence">Ändra tillgänglighet</string> + <string name="status_message">Statusmeddelande</string> + <string name="all_accounts_on_this_device">Använd för alla konton på den här enheten</string> + <string name="presence_chat">Tillgänglig</string> + <string name="presence_online">Online</string> + <string name="presence_away">Borta</string> + <string name="presence_xa">Ej tillgänglig</string> + <string name="presence_dnd">Upptagen</string> + <string name="secure_password_generated">Ett säkert lösenord har genererats</string> </resources> diff --git a/src/main/res/values-sw600dp/defaults.xml b/src/main/res/values-sw600dp/defaults.xml new file mode 100644 index 00000000..e23a93de --- /dev/null +++ b/src/main/res/values-sw600dp/defaults.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="default_resource">Tablet</string> +</resources>
\ No newline at end of file diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml index 2063bdbf..88b49367 100644 --- a/src/main/res/values-tr-rTR/strings.xml +++ b/src/main/res/values-tr-rTR/strings.xml @@ -71,6 +71,8 @@ <string name="send_failed">ulaştırılamadı</string> <string name="send_rejected">reddedildi</string> <string name="preparing_image">Görüntü, iletilmek üzere hazırlanıyor</string> + <string name="preparing_images">Resimler iletilmek üzere hazırlanıyor</string> + <string name="sharing_files_please_wait">Dosyalar Paylaşılıyor. Lütfen bekleyin...</string> <string name="action_clear_history">Geçmişi sil</string> <string name="clear_conversation_history">Sohbet geçmişini sil</string> <string name="clear_histor_msg">Bu sohbetteki bütün iletileri silmek istiyor musunuz?\n\n<b>Uyarı:</b>Başka cihazlardaki ya da sunuculardaki iletiler bundan etkilenmeyecektir.</string> @@ -102,10 +104,17 @@ <string name="pref_accept_files">Dosyaları kabul et</string> <string name="pref_accept_files_summary">…‘den küçük olan dosyaları otomatik olarak kabul et</string> <string name="pref_accept_files_size_summary">…‘den küçük olan dosyaları otomatik olarak kabul et</string> + <string name="pref_attachments">Ekler</string> + <string name="pref_return_to_previous">Hızlı Paylaşım</string> <string name="pref_notification_settings">Bildirim</string> <string name="pref_notifications">Bildirimler</string> <string name="pref_notifications_summary">Yeni ileti geldiğinde bildir</string> <string name="pref_vibrate">Titreşim</string> + <string name="pref_vibrate_summary">Yeni ileti geldiğinde titret</string> + <string name="pref_led">LED Bildirim</string> + <string name="pref_led_summary">Yeni bir ileti geldiğinde bildirim ışığı yanıp sönsün</string> + <string name="pref_sound">Zil sesi</string> + <string name="pref_sound_summary">Yeni bir ileti geldiğinde sesli bildir</string> <string name="pref_notification_grace_period">Bildirim mühleti</string> <string name="pref_notification_grace_period_summary">Karbon kopya alındıktan sonra kısa bir süre için bildirimleri kapa</string> <string name="pref_advanced_options">Gelişmiş</string> @@ -349,6 +358,7 @@ <string name="choose_file">Dosya seç</string> <string name="receiving_x_file">%1$s alıyor/(%2$d%% tamamlandı)</string> <string name="download_x_file">%s indir</string> + <string name="delete_x_file">Sil %s</string> <string name="file">dosya</string> <string name="open_x_file">%s aç</string> <string name="sending_file">gönderiyor (%1$d%% tamamlandı)</string> @@ -533,6 +543,8 @@ </plurals> <string name="shared_file_with_x">%s ile paylaşılan dosyalar</string> <string name="shared_image_with_x">%s ile paylaşılan resim</string> + <string name="shared_images_with_x">%s ile paylaşılan resimler</string> + <string name="shared_text_with_x">%s ile paylaşılan metin</string> <string name="no_storage_permission">Conversations’ın harici depolama alanına erişmesi gerek </string> <string name="sync_with_contacts">Kişilerle senkronize et</string> <string name="sync_with_contacts_long">Conversations XMPP listenizi telefon rehberinizle eşleştirerek kişilerin tam isimlerini ve avatarlarını göstermek istiyor. \n\n Conversations telefon rehberinizi sadece okuyacak ve onları sunucunuza yüklemeden eşleştirecek. \n\n Şimdi telefon rehberinize erişilmesine izin vermeniz istenecek.\n\n</string> @@ -560,4 +572,7 @@ <string name="no_keys_just_confirm">Bu kişiye zaten güveniyor durumdasınız. \"tamam\" seçeneğini işaretleyerek, sadece %s \'in bu grup sohbete katılabileceğini teyid ediyorsunuz.</string> <string name="select_image_and_crop">Resmi seçip kırpın</string> <string name="this_account_is_disabled">Bu hesabı devre dışı bıraktınız</string> + <string name="security_error_invalid_file_access">Güvenlik hatası: Geçersiz dosya erişimi</string> + <string name="no_application_to_share_uri">URI paylaşmak için uygulama bulunamadı</string> + <string name="share_uri_with">URI paylaş ile...</string> </resources> diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 4c846c8f..b12ca2b9 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -103,10 +103,18 @@ <string name="pref_xmpp_resource_summary">客户端标识名称</string> <string name="pref_accept_files">接收文件</string> <string name="pref_accept_files_summary">自动接收小于 … 的文件</string> + <string name="pref_attachments">附件</string> + <string name="pref_return_to_previous">快速分享</string> + <string name="pref_return_to_previous_summary">分享后立即回到之前活动的应用程序，而非打开会话</string> <string name="pref_notification_settings">通知</string> <string name="pref_notifications">通知</string> <string name="pref_notifications_summary">收到新消息时通知</string> <string name="pref_vibrate">震动</string> + <string name="pref_vibrate_summary">收到新消息时震动</string> + <string name="pref_led">LED 灯提示</string> + <string name="pref_led_summary">收到新消息时闪烁通知灯</string> + <string name="pref_sound">铃声</string> + <string name="pref_sound_summary">收到新消息时响铃</string> <string name="pref_notification_grace_period">通知限期</string> <string name="pref_notification_grace_period_summary">接收副本短时间内关闭通知</string> <string name="pref_advanced_options">高级</string> @@ -536,6 +544,7 @@ <string name="shared_file_with_x">用 %s 分享文件</string> <string name="shared_image_with_x">用 %s 分享图片</string> <string name="shared_images_with_x">图片分享自 %s</string> + <string name="shared_text_with_x">用 %s 分享文本</string> <string name="no_storage_permission">Conversations 需要访问外部存储</string> <string name="sync_with_contacts">与联系人同步</string> <string name="sync_with_contacts_long">Conversations 会匹配你的 XMPP 花名册与你的联系人，以显示他们的全名和头像。\n\nConversations 只会读取你的联系人并在本地匹配，不会上传到你的服务器。\n\n现在将要询问你是否给予访问你联系人的权限。</string> @@ -565,4 +574,24 @@ <string name="no_keys_just_confirm">你已信任此联系人。选择“完成”表示 %s 将成为此讨论组的一部分。</string> <string name="select_image_and_crop">选择照片并裁剪</string> <string name="this_account_is_disabled">你已经禁用了此账户</string> + <string name="security_error_invalid_file_access">安全错误：文件访问权限无效</string> + <string name="no_application_to_share_uri">没有可以分享此链接的应用</string> + <string name="share_uri_with">分享链接...</string> + <string name="welcome_text">XMPP 是一种独立于服务端的协议。你可以选择任何 XMPP 服务器来使用本客户端。\n当然为了方便您的使用，我们可以为您在 conversations.im ——一个特别为 Conversations 设计的服务端——上创建一个账户。</string> + <string name="magic_create_text">我们将指导您在 conversations.im 上创建一个账户。\n当您选择 conversations.im 作为服务端后，您将可以通过提供您完整的 Jabber ID 来与他人进行会话。</string> + <string name="your_full_jid_will_be">您完整的 Jabble ID 是：%s </string> + <string name="create_account">创建账户</string> + <string name="use_own_provider">使用我自己的服务端</string> + <string name="pick_your_username">输入您的用户名</string> + <string name="pref_manually_change_presence">手动更改状态</string> + <string name="pref_manually_change_presence_summary">点击你的头像来变更你的状态</string> + <string name="change_presence">变更状态</string> + <string name="status_message">状态信息</string> + <string name="all_accounts_on_this_device">为本设备上的所有帐户设置</string> + <string name="presence_chat">免费聊天室</string> + <string name="presence_online">在线</string> + <string name="presence_away">离开</string> + <string name="presence_xa">离线</string> + <string name="presence_dnd">忙碌</string> + <string name="secure_password_generated">安全密码已生成</string> </resources> diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index f8028ea3..bf9b11a1 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -5,7 +5,7 @@ <item>Mobile</item> <item>Phone</item> <item>Tablet</item> - <item>Conversations</item> + <item>@string/app_name</item> <item>Android</item> </string-array> <string-array name="filesizes"> @@ -85,4 +85,12 @@ <item>@string/contacts</item> <item>@string/always</item> </string-array> + + <string-array name="presence_show_options"> + <item>@string/presence_chat</item> + <item>@string/presence_online</item> + <item>@string/presence_away</item> + <item>@string/presence_xa</item> + <item>@string/presence_dnd</item> + </string-array> </resources> diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml new file mode 100644 index 00000000..be795ed4 --- /dev/null +++ b/src/main/res/values/defaults.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="default_resource">Phone</string> +</resources>
\ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 77e4fc8c..b08f9ddd 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -178,6 +178,8 @@ <string name="mgmt_account_disable">Temporarily disable</string> <string name="mgmt_account_publish_avatar">Publish avatar</string> <string name="mgmt_account_publish_pgp">Publish OpenPGP public key</string> + <string name="openpgp_has_been_published">OpenPGP public key has been published.</string> + <string name="republish_pgp_keys">Remember to republish your OpenPGP public keys!</string> <string name="mgmt_account_enable">Enable account</string> <string name="mgmt_account_are_you_sure">Are you sure?</string> <string name="mgmt_account_delete_confirm_text">If you delete your account your entire conversation history will be lost</string> @@ -458,7 +460,7 @@ <string name="disable_all_accounts">Disable all accounts</string> <string name="perform_action_with">Perform action with</string> <string name="no_affiliation">No affiliation</string> - <string name="no_role">No role</string> + <string name="no_role">Offline</string> <string name="outcast">Outcast</string> <string name="member">Member</string> <string name="advanced_mode">Advanced mode</string> @@ -599,6 +601,8 @@ <string name="download_failed_file_not_found">Download failed: File not found</string> <string name="download_failed_could_not_connect">Download failed: Could not connect to host</string> <string name="account_status_tor_unavailable">Tor network unavailable</string> + <string name="account_status_bind_failure">Bind failure</string> + <string name="account_status_host_unknown">Host unknown</string> <string name="server_info_broken">Broken</string> <string name="pref_presence_settings">Presence</string> <string name="pref_away_when_screen_off">Away when screen is off</string> @@ -617,9 +621,8 @@ <string name="server_side_mam_prefs">Server-side archiving preferences</string> <string name="fetching_mam_prefs">Fetching archiving preferences. Please wait…</string> <string name="unable_to_fetch_mam_prefs">Unable to fetch archiving preferences</string> - <string name="captcha_ocr">Captcha text</string> <string name="captcha_required">Captcha required</string> - <string name="captcha_hint">enter the text from the image</string> + <string name="captcha_hint">Enter the text from the image above</string> <string name="certificate_chain_is_not_trusted">Certificate chain is not trusted</string> <string name="jid_does_not_match_certificate">Jabber ID does not match certificate</string> <string name="action_renew_certificate">Renew certificate</string> @@ -674,4 +677,24 @@ <string name="security_error_invalid_file_access">Security error: Invalid file access</string> <string name="no_application_to_share_uri">No application found to share URI</string> <string name="share_uri_with">Share URI with…</string> + <string translatable="false" name="welcome_header">Join the Conversation</string> + <string name="welcome_text">XMPP is a provider independent protocol. You can use this client with what ever XMPP server you choose.\nHowever for your convenience we made it easy to create an account on conversations.im; a provider specially suited for the use with Conversations.</string> + <string name="magic_create_text">We will guide you through the process of creating an account on conversations.im.\nWhen picking conversations.im as a provider you will be able to communicate with users of other providers by giving them your full Jabber ID.</string> + <string name="your_full_jid_will_be">Your full Jabber ID will be: %s</string> + <string name="create_account">Create Account</string> + <string name="use_own_provider">Use my own provider</string> + <string name="pick_your_username">Pick your username</string> + <string name="pref_manually_change_presence">Manually change presence</string> + <string name="pref_manually_change_presence_summary">Touch your avatar to change your presence</string> + <string name="change_presence">Change Presence</string> + <string name="status_message">Status message</string> + <string name="all_accounts_on_this_device">Set for all accounts on this device</string> + <string name="presence_chat">Free for Chat</string> + <string name="presence_online">Online</string> + <string name="presence_away">Away</string> + <string name="presence_xa">Not Available</string> + <string name="presence_dnd">Busy</string> + <string name="secure_password_generated">A secure password has been generated</string> + <string name="device_does_not_support_battery_op">Your device does not support opting out of battery optimization</string> + <string name="show_password">Show password</string> </resources> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index e4ee8df2..ddfa90d6 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -10,7 +10,7 @@ android:title="@string/pref_grant_presence_updates"/> <ListPreference - android:defaultValue="Mobile" + android:defaultValue="@string/default_resource" android:entries="@array/resources" android:entryValues="@array/resources" android:key="resource" @@ -224,14 +224,22 @@ <PreferenceCategory android:title="@string/pref_presence_settings"> <CheckBoxPreference android:defaultValue="false" + android:key="manually_change_presence" + android:title="@string/pref_manually_change_presence" + android:summary="@string/pref_manually_change_presence_summary" + android:disableDependentsState="true"/> + <CheckBoxPreference + android:defaultValue="false" android:key="away_when_screen_off" android:summary="@string/pref_away_when_screen_off_summary" - android:title="@string/pref_away_when_screen_off"/> + android:title="@string/pref_away_when_screen_off" + android:dependency="manually_change_presence"/> <CheckBoxPreference android:defaultValue="false" android:key="xa_on_silent_mode" android:summary="@string/pref_xa_on_silent_mode_summary" - android:title="@string/pref_xa_on_silent_mode"/> + android:title="@string/pref_xa_on_silent_mode" + android:dependency="manually_change_presence"/> <CheckBoxPreference android:dependency="xa_on_silent_mode" android:defaultValue="false" |
