diff options
| author | lookshe <github@lookshe.org> | 2015-01-03 23:19:05 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-01-03 23:19:05 +0100 |
| commit | 95e2a539517c27b3235acd582f17968c8e301e81 (patch) | |
| tree | 213bbeed798751e949376d85f4d7d0bd30c5fbfa /src/main/res | |
| parent | 48717dd7d37c066ab626fc626a2ced626ef21d42 (diff) | |
| parent | 4f4eff2353f4e359b5582c8e808a4e88631c3e74 (diff) | |
Merge branch 'master' of ssh://git.fucktheforce.de/conversations
Conflicts:
src/main/java/eu/siacs/conversations/Config.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
Diffstat (limited to 'src/main/res')
27 files changed, 901 insertions, 397 deletions
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml new file mode 100644 index 00000000..c33f238f --- /dev/null +++ b/src/main/res/layout/activity_change_password.xml @@ -0,0 +1,105 @@ +<?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="@color/primarybackground"> + + <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:padding="16dp"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/current_password" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody"/> + + <EditText + android:id="@+id/current_password" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:hint="@string/password" + android:inputType="textPassword" + android:textColor="@color/primarytext" + android:textColorHint="@color/secondarytext" + android:textSize="?attr/TextSizeBody"/> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/new_password" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody"/> + + <EditText + android:id="@+id/new_password" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:hint="@string/password" + android:inputType="textPassword" + android:textColor="@color/primarytext" + android:textColorHint="@color/secondarytext" + android:textSize="?attr/TextSizeBody"/> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/account_settings_confirm_password" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody"/> + + <EditText + android:id="@+id/new_password_confirm" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/password" + android:inputType="textPassword" + android:textColor="@color/primarytext" + android:textColorHint="@color/secondarytext" + android:textSize="?attr/TextSizeBody"/> + </LinearLayout> + </ScrollView> + + <LinearLayout + android:id="@+id/button_bar" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentRight="true"> + + <Button + android:id="@+id/left_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/cancel"/> + + <View + android:layout_width="1dp" + android:layout_height="fill_parent" + android:layout_marginBottom="7dp" + android:layout_marginTop="7dp" + android:background="@color/divider"/> + + <Button + android:id="@+id/right_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/change_password"/> + </LinearLayout> + +</RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index ed83cb9a..36987072 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/secondarybackground" > @@ -118,7 +119,8 @@ <TableRow android:layout_width="fill_parent" - android:layout_height="wrap_content" > + android:layout_height="wrap_content" + tools:ignore="UselessParent"> <TextView android:layout_width="wrap_content" @@ -133,9 +135,18 @@ android:layout_height="wrap_content" android:layout_gravity="right" android:textColor="@color/primarytext" - android:textSize="?attr/TextSizeBody" /> + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded"/> </TableRow> + </TableLayout> + <TableLayout + android:id="@+id/server_info_more" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:stretchColumns="1" + android:visibility="gone" > + <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content" > @@ -153,7 +164,29 @@ android:layout_height="wrap_content" android:layout_gravity="right" android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded"/> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/server_info_blocking" + android:textColor="@color/primarytext" android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_blocking" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded"/> </TableRow> <TableRow @@ -173,7 +206,29 @@ android:layout_height="wrap_content" android:layout_gravity="right" android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded"/> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/server_info_roster_version" + android:textColor="@color/primarytext" android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_roster_version" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded"/> </TableRow> <TableRow @@ -193,11 +248,52 @@ android:layout_height="wrap_content" android:layout_gravity="right" android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded"/> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/server_info_mam" + android:textColor="@color/primarytext" android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_mam" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded"/> </TableRow> - </TableLayout> + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/server_info_csi" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + <TextView + android:id="@+id/server_info_csi" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded"/> + </TableRow> + </TableLayout> <RelativeLayout android:layout_width="wrap_content" @@ -240,8 +336,6 @@ android:visibility="visible" android:contentDescription="@string/copy_otr_clipboard_description"/> </RelativeLayout> - - </LinearLayout> </LinearLayout> </ScrollView> @@ -251,6 +345,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentBottom="true" + android:layout_alignParentStart="true" + android:layout_alignParentEnd="true" android:layout_alignParentLeft="true" android:layout_alignParentRight="true" > @@ -281,4 +377,4 @@ android:textColor="@color/secondarytext" /> </LinearLayout> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml index 73539e0e..1a4221bc 100644 --- a/src/main/res/layout/activity_verify_otr.xml +++ b/src/main/res/layout/activity_verify_otr.xml @@ -1,189 +1,147 @@ <?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/secondarybackground"> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - <TextView - android:id="@+id/error_no_session" - android:layout_margin="16dp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/no_otr_session_found" - android:layout_gravity="center_horizontal" - android:textColor="@color/primarytext" - android:textSize="?attr/TextSizeBody" - /> - <RelativeLayout - android:id="@+id/verification_area_one" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:background="@drawable/infocard_border" - android:layout_margin="8dp"> - <LinearLayout - android:id="@+id/fingerprint_area" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:padding="16dp" - android:orientation="vertical"> - <TextView - android:id="@+id/remote_jid" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/primarytext" - android:textSize="?attr/TextSizeHeadline"/> - <TextView - android:layout_marginTop="16dp" - android:id="@+id/your_fingerprint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/primarytext" - android:textSize="?attr/TextSizeBody" - android:typeface="monospace" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/secondarytext" - android:textSize="?attr/TextSizeInfo" - android:text="@string/your_fingerprint"/> - <TextView - android:layout_marginTop="16dp" - android:id="@+id/remote_fingerprint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/primarytext" - android:textSize="?attr/TextSizeBody" - android:typeface="monospace" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/secondarytext" - android:textSize="?attr/TextSizeInfo" - android:text="@string/remote_fingerprint"/> - </LinearLayout> - <LinearLayout - android:layout_below="@+id/fingerprint_area" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" > - - <Button - android:id="@+id/button_show_qr_code" - style="?android:attr/borderlessButtonStyle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/show_qr_code"/> - - <View - android:layout_width="1dp" - android:layout_height="fill_parent" - android:layout_marginBottom="7dp" - android:layout_marginTop="7dp" - android:background="@color/divider" /> - - <Button - android:id="@+id/button_scan_qr_code" - style="?android:attr/borderlessButtonStyle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/scan_qr_code" - android:textColor="@color/primarytext" /> - </LinearLayout> - </RelativeLayout> - <RelativeLayout - android:id="@+id/verification_area_two" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_margin="8dp" - android:background="@drawable/infocard_border"> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" - android:id="@+id/shared_secret_box" - android:padding="16dp"> - <TextView - android:text="@string/smp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/primarytext" - android:textSize="?attr/TextSizeHeadline" - android:layout_marginBottom="16dp" - /> - <TextView - android:id="@+id/status_message" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/verified" - android:layout_gravity="center_horizontal" - android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold" - android:visibility="gone"/> - <EditText - android:id="@+id/shared_secret_hint" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textAutoComplete" - android:hint="@string/shared_secret_hint" - android:textColor="@color/primarytext" - android:textColorHint="@color/secondarytext" - android:textSize="?attr/TextSizeBody" - android:layout_marginBottom="8dp"/> - <EditText - android:id="@+id/shared_secret_secret" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/shared_secret_secret" - android:inputType="textPassword" - android:textColor="@color/primarytext" - android:textColorHint="@color/secondarytext" - android:textSize="?attr/TextSizeBody" /> - </LinearLayout> - <LinearLayout - android:layout_below="@+id/shared_secret_box" - android:id="@+id/button_bar" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" > - - <Button - android:id="@+id/button_shared_secret_negative" - style="?android:attr/borderlessButtonStyle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:enabled="false" - android:text="@string/cancel" - android:textColor="@color/secondarytext"/> - - <View - android:layout_width="1dp" - android:layout_height="fill_parent" - android:layout_marginBottom="7dp" - android:layout_marginTop="7dp" - android:background="@color/divider" /> - - <Button - android:id="@+id/button_shared_secret_positive" - style="?android:attr/borderlessButtonStyle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/create" - android:textColor="@color/primarytext" /> - </LinearLayout> - </RelativeLayout> - </LinearLayout> -</ScrollView>
\ No newline at end of file +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/primarybackground"> + + <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:padding="16dp"> + + <TextView + android:id="@+id/verification_explanation" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> + + <LinearLayout + android:id="@+id/manual_verification_area" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:orientation="vertical"> + + <TextView + android:id="@+id/your_fingerprint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + android:typeface="monospace"/> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/your_fingerprint" + android:textColor="@color/secondarytext" + android:textSize="?attr/TextSizeInfo"/> + + <TextView + android:id="@+id/remote_fingerprint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + android:typeface="monospace"/> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="20dp" + android:text="@string/remote_fingerprint" + android:textColor="@color/secondarytext" + android:textSize="?attr/TextSizeInfo"/> + + </LinearLayout> + + <LinearLayout + android:id="@+id/smp_verification_area" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_marginTop="16dp" + android:orientation="vertical"> + + <TextView + android:id="@+id/status_message" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:text="@string/verified" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold" + android:visibility="gone"/> + + <TextView + android:id="@+id/shared_secret_hint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + android:textStyle="bold" + android:visibility="gone"/> + + <EditText + android:id="@+id/shared_secret_hint_editable" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:hint="@string/shared_secret_hint" + android:inputType="textAutoComplete" + android:textColor="@color/primarytext" + android:textColorHint="@color/secondarytext" + android:textSize="?attr/TextSizeBody"/> + + <EditText + android:id="@+id/shared_secret_secret" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:hint="@string/shared_secret_secret" + android:inputType="textPassword" + android:textColor="@color/primarytext" + android:textColorHint="@color/secondarytext" + android:textSize="?attr/TextSizeBody"/> + </LinearLayout> + </LinearLayout> + </ScrollView> + + <LinearLayout + android:id="@+id/button_bar" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentRight="true"> + + <Button + android:id="@+id/left_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1"/> + + <View + android:layout_width="1dp" + android:layout_height="fill_parent" + android:layout_marginBottom="7dp" + android:layout_marginTop="7dp" + android:background="@color/divider"/> + + <Button + android:id="@+id/right_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1"/> + </LinearLayout> + +</RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/menu/attachment_choices.xml b/src/main/res/menu/attachment_choices.xml index 12b37c08..5139272c 100644 --- a/src/main/res/menu/attachment_choices.xml +++ b/src/main/res/menu/attachment_choices.xml @@ -7,8 +7,11 @@ <item android:id="@+id/attach_take_picture" android:title="@string/attach_take_picture"/> + <item + android:id="@+id/attach_record_voice" + android:title="@string/attach_record_voice"/> <item - android:id="@+id/attach_record_voice" + android:id="@+id/attach_choose_file" android:title="@string/choose_file"/> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/contact_context.xml b/src/main/res/menu/contact_context.xml index 11ac7d7c..223c7ece 100644 --- a/src/main/res/menu/contact_context.xml +++ b/src/main/res/menu/contact_context.xml @@ -8,6 +8,9 @@ android:id="@+id/context_contact_details" android:title="@string/view_contact_details"/> <item + android:id="@+id/context_contact_block_unblock" + android:title="@string/block_contact"/> + <item android:id="@+id/context_delete_contact" android:title="@string/delete_contact"/> diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml index d68c1436..6c22ed18 100644 --- a/src/main/res/menu/conversations.xml +++ b/src/main/res/menu/conversations.xml @@ -57,6 +57,18 @@ android:title="@string/enable_notifications"/> <item + android:id="@+id/action_block" + android:orderInCategory="72" + android:showAsAction="never" + android:title="@string/action_block_contact"/> + + <item + android:id="@+id/action_unblock" + android:orderInCategory="73" + android:showAsAction="never" + android:title="@string/action_unblock_contact"/> + + <item android:id="@+id/action_accounts" android:orderInCategory="90" android:showAsAction="never" diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml index 2301caf0..4ce9e1f3 100644 --- a/src/main/res/menu/editaccount.xml +++ b/src/main/res/menu/editaccount.xml @@ -5,4 +5,19 @@ android:title="@string/show_qr_code" android:showAsAction="never" /> + <item + android:id="@+id/action_show_block_list" + android:title="@string/show_block_list" + android:showAsAction="never" /> + + <item + android:id="@+id/action_server_info_show_more" + android:title="@string/server_info_show_more" + android:checkable="true" + android:checked="false" + android:showAsAction="never" /> + + <item android:id="@+id/action_change_password_on_server" + android:title="@string/change_password" + android:showAsAction="never" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml index b5cd9b50..5b04484f 100644 --- a/src/main/res/menu/manageaccounts.xml +++ b/src/main/res/menu/manageaccounts.xml @@ -1,15 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item - android:id="@+id/action_add_account" - android:icon="@drawable/ic_action_add_person" - android:showAsAction="always" - android:title="@string/action_add_account"/> - <item - android:id="@+id/action_settings" - android:orderInCategory="100" - android:showAsAction="never" - android:title="@string/action_settings"/> + <item + android:id="@+id/action_add_account" + android:icon="@drawable/ic_action_add_person" + android:showAsAction="always" + android:title="@string/action_add_account"/> + <item + android:id="@+id/action_enable_all" + android:title="@string/enable_all_accounts"/> + <item + android:id="@+id/action_disable_all" + android:title="@string/disable_all_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/verification_choices.xml b/src/main/res/menu/verification_choices.xml new file mode 100644 index 00000000..e833ba79 --- /dev/null +++ b/src/main/res/menu/verification_choices.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + + <item + android:id="@+id/scan_fingerprint" + android:title="@string/scan_qr_code"/> + <item + android:id="@+id/ask_question" + android:title="@string/ask_question"/> + + <item + android:id="@+id/manual_verification" + android:title="@string/manually_verify" /> + +</menu>
\ No newline at end of file diff --git a/src/main/res/menu/verify_otr.xml b/src/main/res/menu/verify_otr.xml index 1d4a11b6..42b66ad5 100644 --- a/src/main/res/menu/verify_otr.xml +++ b/src/main/res/menu/verify_otr.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item - android:id="@+id/manually_verify" - android:orderInCategory="10" - android:showAsAction="never" - android:title="@string/manually_verify" /> + <item + android:id="@+id/action_show_qr_code" + android:title="@string/show_qr_code" + android:showAsAction="never" /> <item android:id="@+id/action_accounts" diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index cfbe428b..ae1da472 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Conversations</string> <string name="action_settings">Preferències</string> <string name="action_add">Nova conversa</string> <string name="action_accounts">Gestionar comptes</string> @@ -80,4 +79,4 @@ <string name="pref_never_send_crash_summary">Enviant traces d\'execució ajudes al futur desenvolupament del Conversations.</string> <string name="pref_ui_options">Opcions de UI</string> -</resources>
\ No newline at end of file +</resources> diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 0078b740..33c7310b 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Conversations</string> <string name="action_settings">Nastavení</string> <string name="action_add">Nová konverzace</string> <string name="action_accounts">Nastavení účtů</string> @@ -17,7 +16,7 @@ <string name="title_activity_settings">Nastavení</string> <string name="title_activity_conference_details">Detaily konference</string> <string name="title_activity_contact_details">Detaily kontaktu</string> - <string name="title_activity_conversations">Konverzace</string> + <string name="title_activity_conversations">Conversations</string> <string name="title_activity_sharewith">Sdílet s konverzací</string> <string name="title_activity_start_conversation">Začít konverzaci</string> <string name="title_activity_choose_contact">Vybrat kontakt</string> @@ -41,6 +40,7 @@ <string name="invite_contact">Pozvat kontakt</string> <string name="contacts">Kontakty</string> <string name="cancel">Zrušit</string> + <string name="set">Nastavit</string> <string name="add">Přidat</string> <string name="edit">Upravit</string> <string name="delete">Smazat</string> @@ -58,7 +58,7 @@ <string name="add_contact">Přidat kontakt</string> <string name="send_failed">doručení selhalo</string> <string name="send_rejected">zamítnuto</string> - <string name="receiving_image">Přijímám obrázek. Chvíli strpení…</string> + <string name="receiving_image">Přijímám obrázek (%1$d%%)</string> <string name="preparing_image">Připravuji obrázek na přenos</string> <string name="action_clear_history">Smazat historii</string> <string name="clear_conversation_history">Smaže historii konverzací</string> @@ -258,6 +258,11 @@ <string name="pref_expert_options_summary">S tímto zacházejte velmi opatrně</string> <string name="title_activity_about">O aplikaci Conversations</string> <string name="pref_about_conversations_summary">Informace o sestavení a licenci</string> + <string name="title_pref_quiet_hours">Tichý režim</string> + <string name="title_pref_quiet_hours_start_time">Odkdy</string> + <string name="title_pref_quiet_hours_end_time">Dokdy</string> + <string name="title_pref_enable_quiet_hours">Povolit tichý režim</string> + <string name="pref_quiet_hours_summary">Upozornění budou během tichého režimu ztlumena</string> <string name="pref_use_larger_font">Zvětšit písmo</string> <string name="pref_use_larger_font_summary">Používat v celé aplikaci větší velikost písma</string> <string name="pref_use_send_button_to_indicate_status">Tlačítko pro odeslání zobrazuje stav</string> @@ -336,4 +341,6 @@ <string name="reset">Reset</string> <string name="account_image_description">Avatar účtu</string> <string name="copy_otr_clipboard_description">Zkopírovat otisk OTR do schránky</string> + <string name="fetching_history_from_server">Načíst historii ze serveru</string> + <string name="no_more_history_on_server">Na serveru není žádná další historie</string> </resources> diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index cade782a..9e8e3b3d 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - - <string name="app_name">Conversations</string> <string name="action_settings">Einstellungen</string> <string name="action_add">Neue Unterhaltung</string> <string name="action_accounts">Konten verwalten</string> @@ -13,6 +11,10 @@ <string name="action_edit_contact">Name bearbeiten</string> <string name="action_add_phone_book">Zum Telefonbuch hinzufügen</string> <string name="action_delete_contact">Aus Kontaktliste entfernen</string> + <string name="action_block_contact">Kontakt sperren</string> + <string name="action_unblock_contact">Kontakt entsperren</string> + <string name="action_block_domain">Domain sperren</string> + <string name="action_unblock_domain">Domain entsperren</string> <string name="title_activity_manage_accounts">Konten verwalten</string> <string name="title_activity_settings">Einstellungen</string> <string name="title_activity_conference_details">Konferenzdetails</string> @@ -21,6 +23,7 @@ <string name="title_activity_sharewith">Mit Unterhaltung teilen</string> <string name="title_activity_start_conversation">Beginne Unterhaltung</string> <string name="title_activity_choose_contact">Kontakt auswählen</string> + <string name="title_activity_block_list">Sperrliste</string> <string name="just_now">gerade</string> <string name="minute_ago">vor einer Minute</string> <string name="minutes_ago">vor %d Minuten</string> @@ -34,16 +37,25 @@ <string name="participant">Teilnehmer</string> <string name="visitor">Besucher</string> <string name="remove_contact_text">Möchtest du %s von deiner Kontaktliste entfernen? Die Unterhaltung mit diesem Kontakt wird dabei nicht entfernt.</string> + <string name="block_contact_text">Möchtest du %s sperren und keine Nachrichten mehr erhalten?</string> + <string name="unblock_contact_text">Möchtest du %s entsperren und wieder Nachrichten empfangen?</string> + <string name="block_domain_text">Sperre alle Kontakte von %s?</string> + <string name="unblock_domain_text">Entsperre alle Kontakte %s?</string> + <string name="contact_blocked">Kontakt gesperrt</string> <string name="remove_bookmark_text">Möchtest du das Lesezeichen %s entfernen? Die Unterhaltung mit diesem Lesezeichen wird dabei nicht entfernt.</string> <string name="register_account">Neues Konto auf dem Server erstellen</string> + <string name="change_password_on_server">Passwort ändern</string> <string name="share_with">Teile mit…</string> <string name="start_conversation">Beginne Unterhaltung</string> <string name="invite_contact">Kontakt einladen</string> <string name="contacts">Kontakte</string> <string name="cancel">Abbrechen</string> + <string name="set">Einstellen</string> <string name="add">Hinzufügen</string> <string name="edit">Bearbeiten</string> <string name="delete">Entfernen</string> + <string name="block">Sperren</string> + <string name="unblock">Entsperren</string> <string name="save">Speichern</string> <string name="ok">OK</string> <string name="crash_report_title">Conversations ist abgestürzt</string> @@ -173,7 +185,12 @@ <string name="contact_status_offline">Offline</string> <string name="muc_details_conference">Konferenz</string> <string name="muc_details_other_members">Andere Mitglieder</string> + <string name="server_info_show_more">Server Info</string> + <string name="server_info_mam">XEP-0313: MAM</string> <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string> + <string name="server_info_csi">XEP-0352: Client State Indication</string> + <string name="server_info_blocking">XEP-0191: Blocking Command</string> + <string name="server_info_roster_version">XEP-0237: Roster Versioning</string> <string name="server_info_stream_management">XEP-0198: Stream Management</string> <string name="server_info_pep">XEP-0163: PEP (Avatare)</string> <string name="server_info_available">verfügbar</string> @@ -201,6 +218,8 @@ <string name="join_conference">Konferenz beitreten</string> <string name="delete_contact">Kontakt löschen</string> <string name="view_contact_details">Kontaktdetails anzeigen</string> + <string name="block_contact">Kontakt sperren</string> + <string name="unblock_contact">Kontakte entsperren</string> <string name="create">Erstellen</string> <string name="contact_already_exists">Der Kontakt existiert bereits</string> <string name="join">Beitreten</string> @@ -258,6 +277,11 @@ <string name="pref_expert_options_summary">Hier bitte vorsichtig sein</string> <string name="title_activity_about">Über Conversations</string> <string name="pref_about_conversations_summary">Versions- und Lizenzinformationen</string> + <string name="title_pref_quiet_hours">Ruhige Stunden</string> + <string name="title_pref_quiet_hours_start_time">Beginn</string> + <string name="title_pref_quiet_hours_end_time">Ende</string> + <string name="title_pref_enable_quiet_hours">Aktiviere ruhige Stunden</string> + <string name="pref_quiet_hours_summary">Benachrichtigungen sind während der ruhigen Stunden stumm.</string> <string name="pref_use_larger_font">Schrift vergrößern</string> <string name="pref_use_larger_font_summary">Größere Schrift verwenden</string> <string name="pref_use_send_button_to_indicate_status">Absende-Knopf zeigt Online-Status an</string> @@ -288,7 +312,8 @@ <string name="image_transmission_failed">Bild-Übertragung fehlgeschlagen</string> <string name="scan_qr_code">Scanne QR-Code</string> <string name="show_qr_code">Zeige QR-Code</string> - <string name="account_details">Account Details</string> + <string name="show_block_list">Zeige Sperrliste</string> + <string name="account_details">Konto Details</string> <string name="verify_otr">Prüfe OTR</string> <string name="remote_fingerprint">Fingerabdruck der Gegenseite</string> <string name="scan">Scanne</string> @@ -324,7 +349,7 @@ <string name="no_application_found_to_open_file">Keine Anwendung zum Öffnen der Datei gefunden</string> <string name="could_not_verify_fingerprint">Kann Fingerabdruck nicht überprüfen</string> <string name="manually_verify">Manuell überprüfen</string> - <string name="are_you_sure_verify_fingerprint">Bist du sicher, dass du die OTR-Fingerabdrücke des Kontakts überprüfen willst?</string> + <string name="are_you_sure_verify_fingerprint">Bist du sicher, dass du den OTR-Fingerabdruck des Kontakts überprüfen willst?</string> <string name="pref_show_dynamic_tags">Dynamische Tags anzeigen</string> <string name="pref_show_dynamic_tags_summary">Zeige schreibgeschützte Tags unterhalb der Kontakte</string> <string name="enable_notifications">Aktiviere Benachrichtigungen</string> @@ -336,4 +361,23 @@ <string name="reset">Zurücksetzen</string> <string name="account_image_description">Konto-Avatar</string> <string name="copy_otr_clipboard_description">OTR-Fingerabdruck in Zwischenablage kopieren</string> + <string name="fetching_history_from_server">Hole Chatverlauf vom Server</string> + <string name="no_more_history_on_server">Keine weiteren Nachrichten auf dem Server vorhanden.</string> + <string name="updating">Aktualisiere…</string> + <string name="password_changed">Passwort geändert.</string> + <string name="could_not_change_password">Passwort kann nicht geändert werden.</string> + <string name="otr_session_not_started">Sende eine Nachricht, um eine verschlüsselte Unterhaltung zu beginnen</string> + <string name="ask_question">Frage stellen</string> + <string name="smp_explain_question">Falls du mit deinem Kontakt ein gemeinsames Geheimnis hast (z.B. ein Insider-Witz oder was ihr zuletzt gemeinsam zum Mittag gegessen habt), kann dies zur gegenseitigen Überprüfung des Fingerabdrucks genutzt werden.\n\nDu stellst eine Frage oder gibst einen Hinweis und dein Kontakt gibt eine eindeutige Antwort.</string> + <string name="smp_explain_answer">Dein Kontakt möchte deinen Fingerabdruck mit Hilfe eines gemeinsamen Schlüssels überprüfen. Dein Kontakt hat dazu folgende Frage gestellt.</string> + <string name="shared_secret_hint_should_not_be_empty">Deine Frage darf nicht leer sein.</string> + <string name="shared_secret_can_not_be_empty">Dein gemeinsamer Schlüssel darf nicht leer sein</string> + <string name="manual_verification_explanation">Vergleiche den angezeigten Fingerabdruck sorgfältig mit dem deines Kontakts.\nDu kannst dazu einen sicheren Kommunikationsweg (z.B. verschlüsselte E-Mail oder Telefonanruf) zum Austausch nutzen.</string> + <string name="change_password">Passwort ändern</string> + <string name="current_password">Aktuelles Passwort</string> + <string name="new_password">Neues Passwort</string> + <string name="password_should_not_be_empty">Das Passwort darf nicht leer sein</string> + <string name="enable_all_accounts">Alle Konten anschalten</string> + <string name="disable_all_accounts">Alle Konten abschalten</string> + <string name="perform_action_with">Aktion durchführen mit</string> </resources> diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index 792f7671..d47a3adc 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -1,26 +1,30 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Conversations</string> <string name="action_settings">Ajustes</string> <string name="action_add">Nueva conversación</string> <string name="action_accounts">Gestionar cuentas</string> <string name="action_end_conversation">Terminar conversación</string> <string name="action_contact_details">Detalles del contacto</string> - <string name="action_muc_details">Detalles de la conferencia</string> + <string name="action_muc_details">Detalles de conversación en grupo</string> <string name="action_secure">Conversación segura</string> <string name="action_add_account">Añadir cuenta</string> <string name="action_edit_contact">Editar contacto</string> <string name="action_delete_contact">Eliminar contacto de la lista</string> <string name="action_add_phone_book">Añadir a contactos del teléfono</string> + <string name="action_block_contact">Bloquear contacto</string> + <string name="action_unblock_contact">Desbloquear contacto</string> + <string name="action_block_domain">Bloquear dominio</string> + <string name="action_unblock_domain">Desbloquear dominio</string> <string name="title_activity_manage_accounts">Gestionar Cuentas</string> <string name="title_activity_settings">Ajustes</string> - <string name="title_activity_conference_details">Detalles de Conferencia</string> + <string name="title_activity_conference_details">Detalles de Conversación en grupo</string> <string name="title_activity_contact_details">Detalles del Contacto</string> <string name="title_activity_conversations">Conversations</string> <string name="title_activity_sharewith">Compartir con Conversación</string> <string name="title_activity_start_conversation">Nueva Conversación</string> <string name="title_activity_choose_contact">Elegir Contacto</string> + <string name="title_activity_block_list">Lista contactos bloqueados</string> <string name="just_now">ahora</string> <string name="minute_ago">hace 1 min</string> <string name="minutes_ago">hace %d min</string> @@ -34,16 +38,25 @@ <string name="participant">Participante</string> <string name="visitor">Visitante</string> <string name="remove_contact_text">¿Quieres eliminar a %s de tu lista? La conversación asociada a esta cuenta no se eliminará.</string> - <string name="remove_bookmark_text">¿Quieres eliminar %s de tus marcadores? La conversación de la conferencia asociada con este marcador no se eliminará.</string> + <string name="block_contact_text">¿Quieres bloquear a %s para que no pueda enviarte mensajes?</string> + <string name="unblock_contact_text">¿Quieres desbloquear a %s y permitirle que te envíe mensajes?</string> + <string name="block_domain_text">¿Bloquear todos los contactos de %s?</string> + <string name="unblock_domain_text">¿Desbloquear todos los contatos de %s?</string> + <string name="contact_blocked">Contacto bloqueado</string> + <string name="remove_bookmark_text">¿Quieres eliminar %s de tus marcadores? La conversación asociada con este marcador no se eliminará.</string> <string name="register_account">Registrar nueva cuenta en servidor</string> + <string name="change_password_on_server">Cambiar contraseña</string> <string name="share_with">Compartir con</string> <string name="start_conversation">Comenzar conversación</string> <string name="invite_contact">Invitar contactos</string> <string name="contacts">Contactos</string> <string name="cancel">Cancelar</string> + <string name="set">Establecer</string> <string name="add">Añadir</string> <string name="edit">Editar</string> <string name="delete">Eliminar</string> + <string name="block">Bloquear</string> + <string name="unblock">Desbloquear</string> <string name="save">Guardar</string> <string name="ok">OK</string> <string name="crash_report_title">Conversations se ha detenido.</string> @@ -64,11 +77,11 @@ <string name="clear_conversation_history">Limpiar historial de conversación</string> <string name="clear_histor_msg">¿Quieres borrar todos los mensajes de esta conversación?\n\n<b>Aviso:</b> Esto no afectará a los mensajes guardados en otros dispositivos o servidores.</string> <string name="delete_messages">Borrar mensajes</string> - <string name="also_end_conversation">Terminar esta conversación más tarde</string> + <string name="also_end_conversation">Además, terminar esta conversación</string> <string name="choose_presence">Selecciona recurso del contacto</string> <string name="send_plain_text_message">Enviar mensaje de texto</string> - <string name="send_otr_message">Enviar mensaje encriptado con OTR</string> - <string name="send_pgp_message">Enviar mensaje encriptado con OpenPGP</string> + <string name="send_otr_message">Enviar mensaje cifrado con OTR</string> + <string name="send_pgp_message">Enviar mensaje cifrado con OpenPGP</string> <string name="your_nick_has_been_changed">Tu apodo se ha modificado</string> <string name="download_image">Descargar imagen</string> <string name="image_offered_for_download"><i>Archivo de imagen ofrecido para descarga</i></string> @@ -84,7 +97,7 @@ <string name="contact_has_no_pgp_key">Conversations no ha podido encriptar tus mensajes porque el contacto no está anunciando su clave publica.\n\n<small>Por favor, pide a tu contacto que configure OpenPGP.</small></string> <string name="no_pgp_keys">Claves OpenPGP no encontradas</string> <string name="contacts_have_no_pgp_keys">Conversations no ha podido encriptar tus mensajes porque tus contactos no están anunciando su clave publica.\n\n<small>Por favor, pide a tus contactos que configuren OpenPGP.</small></string> - <string name="encrypted_message_received"><i>Mensaje encriptado recibido. Pulsa para ver.</i></string> + <string name="encrypted_message_received"><i>Mensaje cifrado recibido. Pulsa para ver.</i></string> <string name="encrypted_image_received"><i>Imagen encriptada recibida. Pulsa para ver.</i></string> <string name="image_file"><i>Imagen recibida. Pulsa para ver</i></string> <string name="pref_general">General</string> @@ -99,12 +112,12 @@ <string name="pref_vibrate_summary">Vibra cuando llega un nuevo mensaje</string> <string name="pref_sound">Sonido</string> <string name="pref_sound_summary">Reproduce tono con la notificación</string> - <string name="pref_conference_notifications">Notificaciones de conferencia</string> - <string name="pref_conference_notifications_summary">Siempre notifica cuando llega un mensaje de conferencia y no solo cuando llega un mensaje destacado</string> + <string name="pref_conference_notifications">Notif. conversación grupo</string> + <string name="pref_conference_notifications_summary">Siempre notifica cuando llega un mensaje a una conversación en grupo y no solo cuando llega un mensaje destacado</string> <string name="pref_notification_grace_period">Notificaciones Carbons</string> <string name="pref_notification_grace_period_summary">Deshabilita las notificaciones durante un corto periodo de tiempo después de recibir la copia del mensaje carbon</string> <string name="pref_advanced_options">Opciones avanzadas</string> - <string name="pref_never_send_crash">Nunca enviar informe de fallos</string> + <string name="pref_never_send_crash">Nunca informar de errores</string> <string name="pref_never_send_crash_summary">Si envías registros de error ayudas al desarrollo de Conversations</string> <string name="pref_confirm_messages">Confirmar Mensajes</string> <string name="pref_confirm_messages_summary">Permitir a tus contactos saber cuando recibes y lees un mensaje</string> @@ -171,13 +184,18 @@ <string name="contact_status_extended_away">Ausencia extendida</string> <string name="contact_status_do_not_disturb">No molestar</string> <string name="contact_status_offline">Desconectado</string> - <string name="muc_details_conference">Conferencia</string> + <string name="muc_details_conference">Conversación en grupo</string> <string name="muc_details_other_members">Otros Miembros</string> + <string name="server_info_show_more">Información de servidor</string> + <string name="server_info_mam">XEP-0313: MAM</string> <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string> + <string name="server_info_csi">XEP-0352: Client State Indication</string> + <string name="server_info_blocking">XEP-0191: Blocking Command</string> + <string name="server_info_roster_version">XEP-0237: Roster Versioning</string> <string name="server_info_stream_management">XEP-0198: Stream Management</string> <string name="server_info_pep">XEP-0163: PEP (Avatars)</string> - <string name="server_info_available">Sí</string> - <string name="server_info_unavailable">No</string> + <string name="server_info_available">Disponible</string> + <string name="server_info_unavailable">No disponible</string> <string name="missing_public_keys">Se han perdido las claves de anuncio públicas</string> <string name="last_seen_now">Visto última vez ahora</string> <string name="last_seen_min">Visto última vez hace 1 minuto</string> @@ -187,31 +205,33 @@ <string name="last_seen_day">Visto última vez hace 1 día</string> <string name="last_seen_days">Visto última vez hace %d días</string> <string name="never_seen">Nunca visto</string> - <string name="install_openkeychain">Mensaje encriptado. Por favor instala OpenKeychain para desencriptar.</string> + <string name="install_openkeychain">Mensaje cifrado. Por favor instala OpenKeychain para desencriptar.</string> <string name="unknown_otr_fingerprint">Huella digital OTR desconocida</string> - <string name="openpgp_messages_found">Encontrado mensaje encriptado con OpenPGP</string> + <string name="openpgp_messages_found">Encontrado mensaje cifrado con OpenPGP</string> <string name="reception_failed">Error al recibir</string> <string name="your_fingerprint">Tu huella digital</string> <string name="otr_fingerprint">Huella digital OTR</string> <string name="verify">Verificar</string> <string name="decrypt">Desencriptar</string> - <string name="conferences">Conferencias</string> + <string name="conferences">Conversación Grupo</string> <string name="search">Buscar</string> <string name="create_contact">Crear Contacto</string> - <string name="join_conference">Unirse a Conferencia</string> + <string name="join_conference">Unirse a Conversación en grupo</string> <string name="delete_contact">Eliminar Contacto</string> <string name="view_contact_details">Ver detalles del contacto</string> + <string name="block_contact">Bloquear contacto</string> + <string name="unblock_contact">Desbloquear contacto</string> <string name="create">Crear</string> <string name="contact_already_exists">El contacto ya existe</string> <string name="join">Unirse</string> - <string name="conference_address">Dirección de la Conferencia</string> - <string name="conference_address_example">nombre@conferencia.ejemplo.com</string> + <string name="conference_address">Dirección</string> + <string name="conference_address_example">nombre@salas.ejemplo.com</string> <string name="save_as_bookmark">Guardar en marcadores</string> <string name="delete_bookmark">Eliminar marcador</string> - <string name="bookmark_already_exists">Este marcador ya exsite</string> + <string name="bookmark_already_exists">Este marcador ya existe</string> <string name="you">Tú</string> - <string name="action_edit_subject">Editar asunto de la conferencia</string> - <string name="conference_not_found">Conferencia no encontrada</string> + <string name="action_edit_subject">Editar asunto de la conversación</string> + <string name="conference_not_found">Conversación en grupo no encontrada</string> <string name="leave">Salir</string> <string name="contact_added_you">El contacto te ha añadido a su lista de contactos</string> <string name="add_back">Añadir contacto</string> @@ -238,19 +258,19 @@ <string name="disable_notifications_for_this_conversation">Deshabilitar notificaciones para esta conversación</string> <string name="notifications_disabled">Las notificaciones están deshabilitadas</string> <string name="enable">Habilitar</string> - <string name="conference_requires_password">La conferencia requiere contraseña</string> + <string name="conference_requires_password">La conversación en grupo requiere contraseña</string> <string name="enter_password">Introduce la contraseña</string> <string name="missing_presence_updates">Suscripción de actualizaciones de presencia del contacto perdida</string> <string name="request_presence_updates">Por favor, solicita la suscripción de presencia a tu contacto primero.\n\n<small>Esto será usado para determinar qué cliente(s) está usando tu contacto.</small></string> <string name="request_now">Solicitar ahora</string> <string name="delete_fingerprint">Eliminar huella digital OTR</string> - <string name="sure_delete_fingerprint">¿Estás seguro que quieres eliminar esta huella digital OTR?</string> + <string name="sure_delete_fingerprint">¿Estás seguro de que quieres eliminar esta huella digital OTR?</string> <string name="ignore">Ignorar</string> <string name="without_mutual_presence_updates"><b>Aviso:</b> Enviando esto sin suscripción de presencia por ambas partes podría causar problemas inesperados.\n\n<small>Verficia la suscripción de presencia en detalles del contacto.</small></string> <string name="pref_encryption_settings">Ajustes de encriptación</string> - <string name="pref_force_encryption">Forzar encriptación end-to-end</string> - <string name="pref_force_encryption_summary">Siempre enviar mensajes encriptados (excepto para conferencias)</string> - <string name="pref_dont_save_encrypted">No guardar mensajes encriptados</string> + <string name="pref_force_encryption">Forzar cifrado end-to-end</string> + <string name="pref_force_encryption_summary">Siempre enviar mensajes cifrados (excepto para conversaciones en grupo)</string> + <string name="pref_dont_save_encrypted">No guardar mensajes cifrados</string> <string name="pref_dont_save_encrypted_summary">Aviso: Esto podría llevar a pérdida de mensajes</string> <string name="pref_enable_legacy_ssl">Habilitar SSL heredado</string> <string name="pref_enable_legacy_ssl_summary">Habilita soporte SSLv3 para servidores heredados. Advertencia: SSLv3 se considera no seguro.</string> @@ -258,23 +278,28 @@ <string name="pref_expert_options_summary">Por favor, cuidado con estas opciones</string> <string name="title_activity_about">Acerca de Conversations</string> <string name="pref_about_conversations_summary">Información de compilación y licencia</string> - <string name="pref_use_larger_font">Incrementar tamaño de fuente</string> + <string name="title_pref_quiet_hours">Horario de silencio</string> + <string name="title_pref_quiet_hours_start_time">Hora de comienzo</string> + <string name="title_pref_quiet_hours_end_time">Hora de fin</string> + <string name="title_pref_enable_quiet_hours">Habilitar horario de silencio</string> + <string name="pref_quiet_hours_summary">Las notificaciones serán silenciadas durante el horario de silencio</string> + <string name="pref_use_larger_font">Tamaño de fuente grande</string> <string name="pref_use_larger_font_summary">Usar fuentes grandes en toda la aplicación</string> <string name="pref_use_send_button_to_indicate_status">Botón enviar indica estado</string> <string name="pref_use_indicate_received">Solicitar entrega de mensaje</string> <string name="pref_use_indicate_received_summary">Cuando el contacto reciba el mensaje será indicado con una marca verde. Cuidado, esto podría no funcionar en todos los casos.</string> <string name="pref_use_send_button_to_indicate_status_summary">El color del botón enviar indica el estado del contacto</string> <string name="pref_expert_options_other">Otros</string> - <string name="pref_conference_name">Nombre de conferencia</string> - <string name="pref_conference_name_summary">Usar el asunto de la conferencia en lugar del identificador jabber como nombre de conferencia</string> + <string name="pref_conference_name">Nombre conversación grupo</string> + <string name="pref_conference_name_summary">Usar el asunto de la conversación en lugar del identificador jabber como nombre en las conversaciones en grupo</string> <string name="toast_message_otr_fingerprint">¡Huella digital OTR copiada al portapapeles!</string> - <string name="conference_banned">Tu entrada a esta conferencia ha sido prohibida</string> - <string name="conference_members_only">Esta conferencia es solo para miembros</string> - <string name="conference_kicked">Has sido expulsado de esta conferencia</string> + <string name="conference_banned">Tu entrada a esta conversación ha sido prohibida</string> + <string name="conference_members_only">Esta conversación es solo para miembros</string> + <string name="conference_kicked">Has sido expulsado de esta conversación</string> <string name="using_account">Usando cuenta %s</string> <string name="checking_image">Comprobando imagen en servidor HTTP</string> <string name="image_file_deleted">El archivo de imagen ha sido eliminado</string> - <string name="not_connected_try_again">No estás concectado. Inténtalo más tarde</string> + <string name="not_connected_try_again">No estás conectado. Inténtalo más tarde</string> <string name="check_image_filesize">Comprobar el tamaño del archivo de imagen</string> <string name="message_options">Opciones de mensaje</string> <string name="copy_text">Copiar texto</string> @@ -288,6 +313,7 @@ <string name="image_transmission_failed">Falló la transferencia de la imagen</string> <string name="scan_qr_code">Escanear código QR</string> <string name="show_qr_code">Mostrar código QR</string> + <string name="show_block_list">Mostrar contactos bloqueados</string> <string name="account_details">Detalles de la cuenta</string> <string name="verify_otr">Verificar OTR</string> <string name="remote_fingerprint">Huella digital remota</string> @@ -308,13 +334,13 @@ <string name="no_otr_session_found">¡No se ha encontrado una sesión OTR válida!</string> <string name="conversations_foreground_service">Conversations</string> <string name="touch_to_disable">Pulsa para deshabilitar servicio en primer plano</string> - <string name="pref_keep_foreground_service">Mantener servicio en primer plano</string> - <string name="pref_keep_foreground_service_summary">Previene que el sistema cierre la conexión</string> + <string name="pref_keep_foreground_service">Servicio en primer plano</string> + <string name="pref_keep_foreground_service_summary">Mantener el servicio en primer plano previene que el sistema cierre la conexión</string> <string name="choose_file">Seleccionar archivo</string> - <string name="receiving_file">Recibiendo archivo %1$s (%2$d%% completedo)</string> + <string name="receiving_file">Recibiendo archivo %1$s (%2$d%% completado)</string> <string name="download_file">Descargar archivo %s</string> <string name="open_file">Abrir archivo %s</string> - <string name="sending_file">Enviando (%1$d%% completedo)</string> + <string name="sending_file">Enviando (%1$d%% completado)</string> <string name="preparing_file">Preparando transferencia de archivo</string> <string name="file_offered_for_download">Archivo ofrecido para descarga</string> <string name="file">Archivo %s</string> @@ -328,12 +354,17 @@ <string name="pref_show_dynamic_tags">Mostrar etiquetas</string> <string name="pref_show_dynamic_tags_summary">Muestra información en forma de etiquetas debajo de los contactos</string> <string name="enable_notifications">Habilitar notificaciones</string> - <string name="conference_with">Crear conferencia con…</string> - <string name="no_conference_server_found">No se ha encontrado el servidor de conferencias</string> - <string name="conference_creation_failed">¡La creación de la conferencia ha fallado!</string> - <string name="conference_created">¡Conferencia creada!</string> + <string name="conference_with">Crear conversación en grupo</string> + <string name="no_conference_server_found">No se ha encontrado el servidor para crear la conversación en grupo</string> + <string name="conference_creation_failed">¡La creación de la conversación en grupo ha fallado!</string> + <string name="conference_created">¡Conversación en grupo creada!</string> <string name="secret_accepted">¡Secreto aceptado!</string> <string name="reset">Reinicializar</string> <string name="account_image_description">Imagen de perfil</string> <string name="copy_otr_clipboard_description">Copiar huella digital OTR al portapapeles</string> + <string name="fetching_history_from_server">Buscar historial en servidor</string> + <string name="no_more_history_on_server">No más historial del servidor</string> + <string name="updating">Actualizando…</string> + <string name="password_changed">!Contraseña cambiada!</string> + <string name="could_not_change_password">No se puede cambiar la contraseña</string> </resources> diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 41f3793b..04388f4f 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <resources> - <string name="app_name">Conversations</string> <string name="action_settings">Ezarpenak</string> <string name="action_add">Elkarrizketa berria</string> <string name="action_accounts">Kontuak kudeatu</string> diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index e1db316d..b3b86f1f 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Conversations</string> <string name="action_settings">Paramètres</string> <string name="action_add">Nouvelle conversation</string> <string name="action_accounts">Gérer les comptes</string> diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index 58116463..637237b8 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Conversations</string> <string name="action_settings">Axustes</string> <string name="action_add">Nova conversa</string> <string name="action_accounts">Xestionar contas</string> @@ -127,4 +126,4 @@ <string name="invalid_jid">O identificador non é un identificador de Jabber válido</string> <string name="pref_ui_options">Opcións de interfaz</string> -</resources>
\ No newline at end of file +</resources> diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index dab7471d..af4dc3e0 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Conversations</string> <string name="action_settings">Impostazioni</string> <string name="action_add">Nuova conversazione</string> <string name="action_accounts">Gestisci utenti</string> @@ -217,7 +216,7 @@ <string name="add_back">Add back</string> <string name="contact_has_read_up_to_this_point">%s ha letto fino a questo punto</string> <string name="publish">Pubblica</string> - <string name="touch_to_choose_picture">Tocca l\'avatar per selezionare l\'immagine dalla gallaria</string> + <string name="touch_to_choose_picture">Tocca l\'avatar per selezionare l\'immagine dalla galleria</string> <string name="publish_avatar_explanation">Nota bene: tutti i contatti sottoscritti agli aggiornamenti della tua presenza avranno il permesso di vedere questa immagine.</string> <string name="publishing">Pubblicazione…</string> <string name="error_publish_avatar_server_reject">Il server ha rifiutato la tua pubblicazione</string> diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index fd8eaa0b..79fe9f3a 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Conversations</string> <string name="action_settings">הגדרות</string> <string name="action_add">דיון חדש</string> <string name="action_accounts">נהל חשבונות</string> @@ -221,4 +220,4 @@ <string name="send_private_message_to">שלח הודעה פרטית אל %s</string> <string name="pref_ui_options">אפשרויות ממשק משתמש</string> -</resources>
\ No newline at end of file +</resources> diff --git a/src/main/res/values-nl/arrays.xml b/src/main/res/values-nl/arrays.xml index 9ced79f4..e5ae27e7 100644 --- a/src/main/res/values-nl/arrays.xml +++ b/src/main/res/values-nl/arrays.xml @@ -5,7 +5,7 @@ <item>Mobiel</item> <item>Telefoon</item> <item>Tablet</item> - <item>Conversaties</item> + <item>Conversations</item> <item>Android</item> </string-array> <string-array name="filesizes"> @@ -20,5 +20,20 @@ <item>524288</item> <item>1048576</item> </string-array> + <string-array name="mute_options_descriptions"> + <item>30 minuten</item> + <item>1 uur</item> + <item>2 uur</item> + <item>8 uur</item> + <item>voor onbepaalde duur</item> + </string-array> + + <integer-array name="mute_options_durations"> + <item>1800</item> + <item>3600</item> + <item>7200</item> + <item>28800</item> + <item>-1</item> + </integer-array> -</resources>
\ No newline at end of file +</resources> diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 7b3faca9..cb47ae97 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -1,128 +1,147 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Conversaties</string> <string name="action_settings">Instellingen</string> - <string name="action_add">Nieuwe conversatie</string> + <string name="action_add">Nieuw gesprek</string> <string name="action_accounts">Beheer account</string> - <string name="action_end_conversation">Beëindig conversatie</string> - <string name="action_contact_details">Contact details</string> - <string name="action_muc_details">Gesprek details</string> - <string name="action_secure">Beveiligde conversatie</string> + <string name="action_end_conversation">Beëindig gesprek</string> + <string name="action_contact_details">Contactgegevens</string> + <string name="action_muc_details">Gespreksgegevens</string> + <string name="action_secure">Beveiligd gesprek</string> <string name="action_add_account">Voeg account toe</string> <string name="action_edit_contact">Verander naam</string> - <string name="action_add_phone_book">Voeg aan telefoonboek toe</string> + <string name="action_add_phone_book">Voeg toe aan telefoonboek</string> <string name="action_delete_contact">Verwijder uit lijst</string> - <string name="title_activity_manage_accounts">Beheer Accounts</string> + <string name="action_block_contact">Blokkeer contact</string> + <string name="action_unblock_contact">Deblokkeer contact</string> + <string name="action_block_domain">Blokkeer domein</string> + <string name="action_unblock_domain">Deblokkeer domein</string> + <string name="title_activity_manage_accounts">Beheer accounts</string> <string name="title_activity_settings">Instellingen</string> - <string name="title_activity_conference_details">Groepsconversatie Details</string> - <string name="title_activity_contact_details">Contact Details</string> - <string name="title_activity_conversations">Conversaties</string> - <string name="title_activity_sharewith">Delen met Conversatie</string> + <string name="title_activity_conference_details">Groepsgespreksgegevens</string> + <string name="title_activity_contact_details">Contactgegevens</string> + <string name="title_activity_conversations">Gesprekken</string> + <string name="title_activity_sharewith">Delen met gesprek</string> + <string name="title_activity_start_conversation">Start gesprek</string> + <string name="title_activity_choose_contact">Kies contact</string> + <string name="title_activity_block_list">Geblokkeerde contacten</string> <string name="just_now">net</string> - <string name="minute_ago">1 min geleden</string> - <string name="minutes_ago">%d min geleden</string> - <string name="unread_conversations">ongelezen Conversaties</string> + <string name="minute_ago">1 min. geleden</string> + <string name="minutes_ago">%d min. geleden</string> + <string name="unread_conversations">ongelezen gesprekken</string> <string name="sending">versturen…</string> - <string name="encrypted_message">Bericht aan het ontsleutelen. Een moment geduld a.u.b.…</string> + <string name="encrypted_message">Bericht aan het ontsleutelen. Even geduld…</string> <string name="nick_in_use">Naam is al in gebruik</string> <string name="admin">Beheerder</string> <string name="owner">Eigenaar</string> <string name="moderator">Moderator</string> <string name="participant">Deelnemer</string> <string name="visitor">Bezoeker</string> - <string name="remove_contact_text">Wilt u %s uit uw lijst verwijderen? De conversatie met deze account zal niet worden verwijderd.</string> + <string name="remove_contact_text">Wil je %s uit je lijst verwijderen? Het gesprek met deze account zal niet worden verwijderd.</string> + <string name="block_contact_text">Wil je alle berichten van %s blokkeren?</string> + <string name="unblock_contact_text">Wil je %s deblokkeren en er weer berichten van kunnen ontvangen?</string> + <string name="block_domain_text">Alle contacten van %s blokkeren?</string> + <string name="unblock_domain_text">Alle contacten van %s deblokkeren?</string> + <string name="contact_blocked">Contact geblokkeerd</string> + <string name="remove_bookmark_text">Wil je %s als bladwijzer verwijderen? Het gesprek met deze account zal niet worden verwijderd.</string> <string name="register_account">Registreer nieuwe account op server</string> + <string name="change_password_on_server">Verander wachtwoord op server</string> <string name="share_with">Deel met</string> - <string name="start_conversation">Start Conversatie</string> + <string name="start_conversation">Start gesprek</string> + <string name="invite_contact">Nodig contact uit</string> <string name="contacts">Contacten</string> <string name="cancel">Annuleer</string> + <string name="set">Stel in</string> <string name="add">Voeg toe</string> <string name="edit">Bewerk</string> <string name="delete">Verwijder</string> + <string name="block">Blokkeer</string> + <string name="unblock">Deblokkeer</string> <string name="save">Sla op</string> <string name="ok">OK</string> - <string name="crash_report_title">Conversaties is gecrashed</string> - <string name="crash_report_message">Door het versturen van crash rapportages helpt u mee met de ontwikkeling van Conversaties.\n<b>Waarschuwing:</b> Deze app zal uw XMPP account gebruiken om de crash rapportages te versturen naar de ontwikkelaars.</string> + <string name="crash_report_title">Conversations is gecrasht</string> + <string name="crash_report_message">Door het versturen van crash rapportages help je de ontwikkeling van Conversations.\n\n<b>Waarschuwing:</b> Deze app zal je XMPP account gebruiken om de crash rapportages te versturen naar de ontwikkelaars.</string> <string name="send_now">Nu versturen</string> <string name="send_never">Niet opnieuw vragen</string> <string name="problem_connecting_to_account">Account verbinden mislukt</string> <string name="problem_connecting_to_accounts">Verbinden met meerdere accounts mislukt</string> <string name="touch_to_fix">Raak hier aan om accounts te beheren</string> <string name="attach_file">Voeg bestand bij</string> - <string name="not_in_roster">Het contact is geen onderdeel van uw lijst. Wilt u het toevoegen?</string> + <string name="not_in_roster">Het contact is geen onderdeel van uw lijst. Wil je het toevoegen?</string> <string name="add_contact">Voeg contact toe</string> <string name="send_failed">afleveren mislukt</string> <string name="send_rejected">geweigerd</string> - <string name="receiving_image">Bezig met ontvangen van afbeelding. Een moment geduld a.u.b.…</string> - <string name="preparing_image">Bezig met voorbereiden van het versturen van afbeelding</string> + <string name="receiving_image">Bezig met ontvangen van afbeelding. Even geduld…</string> + <string name="preparing_image">Bezig met voorbereiden van versturen van afbeelding</string> <string name="action_clear_history">Wis geschiedenis</string> - <string name="clear_conversation_history">Wis conversatie geschiedenis</string> - <string name="clear_histor_msg">Wilt U alle berichten in deze Conversatie verwijderen?\n\n<b>Waarschuwing:</b> Dit zal geen invloed hebben op de berichten opgeslagen op andere apparaten of servers.</string> + <string name="clear_conversation_history">Wis gespreksgeschiedenis</string> + <string name="clear_histor_msg">Wil je alle berichten in dit gesprek verwijderen?\n\n<b>Waarschuwing:</b> Dit zal geen invloed hebben op de berichten opgeslagen op andere apparaten of servers.</string> <string name="delete_messages">Verwijder berichten</string> - <string name="also_end_conversation">Beëindig deze conversatie na afloop</string> + <string name="also_end_conversation">Beëindig dit gesprek na afloop</string> <string name="choose_presence">Kies aanwezigheid om te tonen aan contact</string> <string name="send_plain_text_message">Verstuur eenvoudig tekst bericht</string> <string name="send_otr_message">Verstuur OTR versleuteld bericht</string> <string name="send_pgp_message">Verstuur OpenPGP versleuteld bericht</string> - <string name="your_nick_has_been_changed">Uw naam is veranderd</string> - <string name="download_image">Download Afbeelding</string> + <string name="your_nick_has_been_changed">Je naam is veranderd</string> + <string name="download_image">Download afbeelding</string> <string name="image_offered_for_download"><i>Afbeelding aangeboden voor downloaden</i></string> <string name="send_unencrypted">Verstuur onversleuteld</string> - <string name="decryption_failed">Ontsleutelen mislukt. Misschien hebt U niet de juiste private sleutel.</string> + <string name="decryption_failed">Ontsleutelen mislukt. Misschien heb je niet de juiste private sleutel.</string> <string name="openkeychain_required">OpenKeychain</string> - <string name="openkeychain_required_long">Conversaties gebruikt een derde partij app genaamd <b>OpenKeychain</b> om berichten te versleutelen en ontsleutelen, en om publieke sleutels te beheren.\n\nOpenKeychain is beschikbaar onder de GPLv3 en beschikbaar op F-Droid en Google Play.\n\n<small>(Herstart Conversaties na installatie.)</small></string> + <string name="openkeychain_required_long">Conversations gebruikt een derde partij app genaamd <b>OpenKeychain</b> om berichten te versleutelen en ontsleutelen, en om publieke sleutels te beheren.\n\nOpenKeychain is beschikbaar onder de GPLv3 en beschikbaar op F-Droid en Google Play.\n\n<small>(Herstart Conversations na installatie.)</small></string> <string name="restart">Herstart</string> <string name="install">Installeer</string> - <string name="offering">offering…</string> - <string name="waiting">wachten…</string> + <string name="offering">offering…</string> + <string name="waiting">wachten…</string> <string name="no_pgp_key">Geen OpenPGP sleutel gevonden</string> - <string name="contact_has_no_pgp_key">Conversaties kan Uw berichten niet versleutelen omdat uw contact geen publieke sleutel heeft ingesteld.\n\n<small>Vraag uw contact om OpenPGP te configureren.</small></string> + <string name="contact_has_no_pgp_key">Conversations kan je berichten niet versleutelen omdat je contact geen publieke sleutel heeft ingesteld.\n\n<small>Vraag je contact om OpenPGP te configureren.</small></string> <string name="no_pgp_keys">Geen OpenPGP sleutels gevonden</string> - <string name="contacts_have_no_pgp_keys">Conversaties kan uw berichten niet versleutelen omdat uw contacten geen publieke sleutel hebben ingesteld.\n\n<small>Vraag uw contacten om OpenPGP te configureren.</small></string> + <string name="contacts_have_no_pgp_keys">Conversations kan je berichten niet versleutelen omdat je contacten geen publieke sleutel hebben ingesteld.\n\n<small>Vraag je contacten om OpenPGP te configureren.</small></string> <string name="encrypted_message_received"><i>Versleuteld bericht ontvangen. Raak aan om te bekijken en te ontsleutelen.</i></string> <string name="encrypted_image_received"><i>Versleutelde afbeelding ontvangen. Raak aan om te bekijken en te ontsleutelen.</i></string> <string name="image_file"><i>Afbeelding ontvangen. Raak aan om te bekijken.</i></string> + <string name="pref_general">Algemeen</string> <string name="pref_xmpp_resource">XMPP resource</string> <string name="pref_xmpp_resource_summary">De naam waarmee deze client zich identificeert</string> <string name="pref_accept_files">Accepteer bestanden</string> - <string name="pref_accept_files_summary">Accepteer automatisch bestanden kleiner dan…</string> - <string name="pref_notification_settings">Notificatie Instellingen</string> - <string name="pref_notifications">Notificaties</string> - <string name="pref_notifications_summary">Notificatie als een nieuw bericht arriveert</string> + <string name="pref_accept_files_summary">Accepteer automatisch bestanden kleiner dan…</string> + <string name="pref_notification_settings">Meldingsinstellingen</string> + <string name="pref_notifications">Meldingen</string> + <string name="pref_notifications_summary">Melding als een nieuw bericht arriveert</string> <string name="pref_vibrate">Trillen</string> <string name="pref_vibrate_summary">Tril ook wanneer een nieuw bericht arriveert</string> <string name="pref_sound">Geluid</string> - <string name="pref_sound_summary">Speel ringtone af bij notificatie</string> - <string name="pref_conference_notifications">Groepsconversatie notificaties</string> - <string name="pref_conference_notifications_summary">Toon altijd notificaties als er nieuwe berichten arriveren in groepsconversaties in plaats van alleen bij highlighting</string> - <string name="pref_notification_grace_period">Notificatie uitstel periode</string> - <string name="pref_notification_grace_period_summary">Zet notificaties voor korte tijd uit als er een carbon copy wordt ontvangen</string> - <string name="pref_advanced_options">Geadvanceerde Opties</string> + <string name="pref_sound_summary">Speel ringtone af bij melding</string> + <string name="pref_conference_notifications">Groepsgespreksmeldingen</string> + <string name="pref_conference_notifications_summary">Toon altijd meldingen als er nieuwe berichten arriveren in groepsgesprekken in plaats van alleen wanneer gemarkeerd</string> + <string name="pref_notification_grace_period">Uitstelperiode voor meldingen</string> + <string name="pref_notification_grace_period_summary">Zet meldingen voor korte tijd uit als er een carbon copy wordt ontvangen</string> + <string name="pref_advanced_options">Geavanceerde instellingen</string> <string name="pref_never_send_crash">Verstuur nooit crash rapportages</string> - <string name="pref_never_send_crash_summary">Door crash rapportages te versturen helpt U mee aan de ontwikkeling van Conversaties</string> - <string name="pref_confirm_messages">Bevestig Berichten</string> - <string name="pref_confirm_messages_summary">Laat uw contacten weten waneer U berichten hebt ontvangen en gelezen</string> + <string name="pref_never_send_crash_summary">Door crash rapportages te versturen help je de ontwikkeling van Conversations</string> + <string name="pref_confirm_messages">Bevestig berichten</string> + <string name="pref_confirm_messages_summary">Laat je contacten weten wanneer je berichten hebt ontvangen en gelezen</string> + <string name="pref_ui_options">UI opties</string> <string name="openpgp_error">OpenKeychain rapporteerde een fout</string> - <string name="error_decrypting_file">I/O Fout tijdens ontsleutelen bestand</string> - <string name="accept">Accepteer</string> + <string name="error_decrypting_file">I/O fout tijdens ontsleutelen bestand</string> + <string name="accept">Aanvaard</string> <string name="error">Er is een fout opgetreden</string> - <string name="pref_grant_presence_updates">Verleen toestemming voor aanwezigheid updates</string> - <string name="pref_grant_presence_updates_summary">Vantevoren toestemming verlenen en vragen aan contacten die U hebt aangemaakt</string> + <string name="pref_grant_presence_updates">Verleen toestemming voor aanwezigheidsupdates</string> + <string name="pref_grant_presence_updates_summary">Op voorhand toestemming verlenen en vragen aan contacten die je hebt aangemaakt</string> <string name="subscriptions">Abonnementen</string> - <string name="your_account">Uw account</string> + <string name="your_account">Je account</string> <string name="keys">Sleutels</string> - <string name="send_presence_updates">Verstuur aanwezigheid updates</string> - <string name="receive_presence_updates">Ontvang aanwezigheid updates</string> - <string name="ask_for_presence_updates">Vraag naar aanwezigheid updates</string> + <string name="send_presence_updates">Verstuur aanwezigheidsupdates</string> + <string name="receive_presence_updates">Ontvang aanwezigheidsupdates</string> + <string name="ask_for_presence_updates">Vraag naar aanwezigheidsupdates</string> <string name="attach_choose_picture">Kies afbeelding</string> <string name="attach_take_picture">Neem foto</string> - <string name="preemptively_grant">Vantevoren toestemming verlenen voor abonneren</string> - <string name="error_not_an_image_file">Het bestand dat U gekozen hebt is geen afbeelding</string> + <string name="preemptively_grant">Op voorhand toestemming verlenen voor abonneren</string> + <string name="error_not_an_image_file">Het bestand dat je gekozen hebt is geen afbeelding</string> <string name="error_compressing_image">Fout tijdens converteren van afbeelding</string> <string name="error_file_not_found">Bestand niet gevonden</string> - <string name="error_io_exception">Generieke I/O fout. Misschien is er geen opslagruimte meer beschikbaar?</string> - <string name="error_security_exception_during_image_copy">De app die U gebruikte om de afbeelding te selecteren heeft niet voldoende toegang geleverd om het bestand te lezen.\n\n<small>Gebruik een andere app om een afbeelding te kiezen</small></string> + <string name="error_io_exception">Algemene I/O fout. Misschien is er geen opslagruimte meer beschikbaar?</string> + <string name="error_security_exception_during_image_copy">De app die je gebruikte om de afbeelding te selecteren heeft niet voldoende toegang geleverd om het bestand te lezen.\n\n<small>Gebruik een andere app om een afbeelding te kiezen</small></string> <string name="account_status_unknown">Onbekend</string> <string name="account_status_disabled">Tijdelijk uitgezet</string> <string name="account_status_online">Online</string> @@ -135,15 +154,19 @@ <string name="account_status_regis_conflict">Gebruikersnaam bezet</string> <string name="account_status_regis_success">Registratie compleet</string> <string name="account_status_regis_not_sup">Server ondersteunt geen registratie</string> + <string name="account_status_security_error">Fout bij beveiliging</string> + <string name="account_status_incompatible_server">Incompatibele server</string> <string name="encryption_choice_none">Onversleuteld</string> <string name="encryption_choice_otr">OTR</string> <string name="encryption_choice_pgp">OpenPGP</string> <string name="mgmt_account_edit">Bewerk account</string> <string name="mgmt_account_delete">Verwijder</string> <string name="mgmt_account_disable">Tijdelijk uitzetten</string> + <string name="mgmt_account_publish_avatar">Publish avatar</string> + <string name="mgmt_account_publish_pgp">Publish OpenPGP public key</string> <string name="mgmt_account_enable">Aanzetten</string> - <string name="mgmt_account_are_you_sure">Weet U het zeker?</string> - <string name="mgmt_account_delete_confirm_text">Als U uw account verwijderd wordt Uw volledige conversatie geschiedenis gewist</string> + <string name="mgmt_account_are_you_sure">Ben je zeker?</string> + <string name="mgmt_account_delete_confirm_text">Als je je account verwijdert wordt je volledige gespreksgeschiedenis gewist</string> <string name="attach_record_voice">Neem stem op</string> <string name="account_settings_jabber_id">Jabber ID:</string> <string name="account_settings_password">Wachtwoord:</string> @@ -154,17 +177,25 @@ <string name="passwords_do_not_match">Wachtwoorden komen niet overeen</string> <string name="invalid_jid">Dit is geen geldig Jabber ID</string> <string name="error_out_of_memory">Geen geheugen beschikbaar. Afbeelding is te groot</string> - <string name="add_phone_book_text">Wilt U %s toevoegen aan de contactenlijst op uw telefoon?</string> + <string name="add_phone_book_text">Wil je %s toevoegen aan de contactenlijst op je telefoon?</string> <string name="contact_status_online">online</string> <string name="contact_status_free_to_chat">beschikbaar</string> <string name="contact_status_away">weg</string> <string name="contact_status_extended_away">langdurig weg</string> <string name="contact_status_do_not_disturb">niet storen</string> <string name="contact_status_offline">offline</string> - <string name="muc_details_conference">groepsconversatie</string> - <string name="muc_details_other_members">Andere Leden</string> - <string name="server_info_carbon_messages">Carbon Berichten</string> - <string name="server_info_stream_management">Stream Management</string> + <string name="muc_details_conference">Groepsgesprek</string> + <string name="muc_details_other_members">Andere leden</string> + <string name="server_info_show_more">Server info</string> + <string name="server_info_mam">XEP-0313: MAM</string> + <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string> + <string name="server_info_csi">XEP-0352: Client State Indication</string> + <string name="server_info_blocking">XEP-0191: Blocking Command</string> + <string name="server_info_roster_version">XEP-0237: Roster Versioning</string> + <string name="server_info_stream_management">XEP-0198: Stream Management</string> + <string name="server_info_pep">XEP-0163: PEP (Avatars)</string> + <string name="server_info_available">beschikbaar</string> + <string name="server_info_unavailable">niet beschikbaar</string> <string name="missing_public_keys">Ontbrekende publieke sleutel aankondigingen</string> <string name="last_seen_now">zonet voor het laatst gezien</string> <string name="last_seen_min">1 minuut geleden voor het laatst gezien</string> @@ -176,58 +207,165 @@ <string name="never_seen">nog nooit gezien</string> <string name="install_openkeychain">Versleuteld bericht. Installeer OpenKeychain om te ontsleutelen.</string> <string name="unknown_otr_fingerprint">Onbekende OTR vingerafdruk</string> - <string name="openpgp_messages_found">OpenPGP encrypted messages found</string> + <string name="openpgp_messages_found">OpenPGP-versleutelde berichten gevonden</string> <string name="reception_failed">Ontvangen mislukt</string> - <string name="join_conference">Aan groepsconversatie deelnemen</string> - <string name="invite_contact">Contact uitnodigen</string> - <string name="your_fingerprint">Uw vingerafdruk</string> - <string name="delete_bookmark">Bladwijzer verwijderen</string> - <string name="join">Deelnemen</string> + <string name="your_fingerprint">Jouw vingerafdruk</string> <string name="otr_fingerprint">OTR vingerafdruk</string> - <string name="you">U</string> - <string name="conference_not_found">Groepsconversatie niet gevonden</string> + <string name="verify">Bevestig</string> + <string name="decrypt">Ontsleutel</string> + <string name="conferences">Groepsgesprekken</string> <string name="search">Zoeken</string> - <string name="contact_already_exists">Het contact bestaat al</string> - <string name="title_activity_start_conversation">Start Groepsconversatie</string> - <string name="title_activity_choose_contact">Kies contact</string> - <string name="contact_added_you">Contact added you to contact list</string> - <string name="view_contact_details">Contactdetails bekijken</string> - <string name="conferences">Groepsconversaties</string> - <string name="verify">Controleren</string> - <string name="create_contact">Contact Aanmaken</string> - <string name="remove_bookmark_text">Wilt u %s als bladwijzer verwijderen? De groepsconversatie die verbonden is met deze bladwijzer zal niet verwijderd worden.</string> - <string name="action_edit_subject">Onderwerp van groepsconversatie veranderen</string> - <string name="delete_contact">Contact Verwijderen</string> + <string name="create_contact">Maak contact aan</string> + <string name="join_conference">Aan groepsgesprek deelnemen</string> + <string name="delete_contact">Verwijder contact</string> + <string name="view_contact_details">Bekijk contactgegevens</string> + <string name="block_contact">Blokkeer contact</string> + <string name="unblock_contact">Deblokkeer contact</string> <string name="create">Aanmaken</string> - <string name="leave">Verlaten</string> - <string name="conference_address">Groepsconversatie adres</string> - <string name="save_as_bookmark">Bladwijzer toevoegen</string> - <string name="conference_address_example">kamer@groepsconversatie.voorbeeld.nl</string> - <string name="add_back">Terug toevoegen</string> + <string name="contact_already_exists">Het contact bestaat al</string> + <string name="join">Deelnemen</string> + <string name="conference_address">Gespreksadres</string> + <string name="conference_address_example">kamer@groepsgesprek.voorbeeld.be</string> + <string name="save_as_bookmark">Opslaan als bladwijzer</string> + <string name="delete_bookmark">Bladwijzer verwijderen</string> <string name="bookmark_already_exists">Deze bladwijzer bestaat al</string> - <string name="decrypt">Ontsleutelen</string> + <string name="you">Jij</string> + <string name="action_edit_subject">Onderwerp groepsgesprek bewerken</string> + <string name="conference_not_found">Groepsgesprek niet gevonden</string> + <string name="leave">Verlaten</string> + <string name="contact_added_you">Contact heeft je toegevoegd aan zijn/haar contacten</string> + <string name="add_back">Contact toevoegen aan eigen contacten</string> <string name="contact_has_read_up_to_this_point">%s heeft tot hier gelezen</string> + <string name="publish">Publiceer</string> + <string name="touch_to_choose_picture">Raak avatar aan om een foto uit de galerij te kiezen</string> + <string name="publish_avatar_explanation"><b>Aandacht:</b> Iedereen die je aanwezigheidsupdates ontvangt zal deze foto kunnen zien.</string> + <string name="publishing">Publiceren…</string> + <string name="error_publish_avatar_server_reject">De server weigerde de publicatie van je afbeelding</string> + <string name="error_publish_avatar_converting">Fout bij converteren van afbeelding</string> + <string name="error_saving_avatar">Fout bij opslaan van avatar</string> + <string name="or_long_press_for_default">(Of hou lang ingedrukt om de oorspronkelijke terug te zetten)</string> + <string name="error_publish_avatar_no_server_support">Je server ondersteunt de publicatie van avatars niet</string> + <string name="private_message">gefluisterd</string> + <string name="private_message_to">naar %s</string> + <string name="send_private_message_to">Stuur privébericht naar %s</string> + <string name="connect">Verbinden</string> + <string name="account_already_exists">Deze account bestaat al</string> <string name="next">Volgende</string> - <string name="publish_avatar_explanation">N.B.: Iedereen die uw aanwezigheid kan zien kan deze afbeelding zien.</string> - <string name="server_info_unavailable">niet beschikbaar</string> - <string name="mgmt_account_publish_pgp">Publiceer publieke OpenPGP sleutel</string> - <string name="additional_information">Extra informatie</string> - <string name="server_info_pep">XEP-0163: PEP (Avatars)</string> + <string name="server_info_session_established">Huidige sessie gevestigd</string> + <string name="additional_information">Bijkomstige informatie</string> <string name="skip">Overslaan</string> - <string name="connect">Verbinden</string> - <string name="account_already_exists">Dit account bestaat al</string> - <string name="private_message_to">naar %s</string> - <string name="send_private_message_to">Verstuur privé bericht aan %s</string> - <string name="touch_to_choose_picture">Klik op avatar om een afbeelding te selecteren uit de gallerij</string> - <string name="mgmt_account_publish_avatar">Publiceer avatar</string> - <string name="error_publish_avatar_server_reject">De server weigerde uw publicatie</string> - <string name="error_publish_avatar_converting">Er ging iets mis bij het converteren van uw afbeelding</string> - <string name="error_publish_avatar_no_server_support">Uw server ondersteunt de publicatie van avatars niet</string> - <string name="publishing">Publiceren…</string> - <string name="error_saving_avatar">Kon de avatar niet opslaan</string> - <string name="server_info_session_established">Huidige sessie opgezet</string> - <string name="or_long_press_for_default">(Of houdt lang ingedrukt om de oorspronkelijke terug te zetten)</string> - <string name="server_info_available">beschikbaar</string> - <string name="pref_ui_options">UI Opties</string> + <string name="disable_notifications">Meldingen uitzetten</string> + <string name="disable_notifications_for_this_conversation">Meldingen uitzetten voor dit gesprek</string> + <string name="notifications_disabled">Meldingen zijn uitgezet</string> + <string name="enable">Aanzetten</string> + <string name="conference_requires_password">Wachtwoord nodig voor toegang tot groepsgesprek</string> + <string name="enter_password">Wachtwoord:</string> + <string name="missing_presence_updates">Ontbrekende aanwezigheidsupdates van contact</string> + <string name="request_presence_updates">Vraag eerst aanwezigheidsupdates van je contact aan.\n\n<small>Dit wordt gebruikt om te bepalen welke client(s) je contact gebruikt.</small></string> + <string name="request_now">Nu aanvragen</string> + <string name="delete_fingerprint">Vingerafdruk verwijderen</string> + <string name="sure_delete_fingerprint">Ben je zeker dat je deze vingerafdruk wil verwijderen?</string> + <string name="ignore">Negeren</string> + <string name="without_mutual_presence_updates"><b>Waarschuwing:</b> Dit verzenden zonder wederzijdse aanwezigheidsupdates kan voor onverwachte problemen zorgen.\n\n<small>Ga naar contactgegevens om je aanwezigheidsupdates te bevestigen.</small></string> + <string name="pref_encryption_settings">Versleutelingsinstellingen</string> + <string name="pref_force_encryption">Verplicht end-to-end versleuteling</string> + <string name="pref_force_encryption_summary">Stuur berichten altijd versleuteld (behalve in groepsgesprekken)</string> + <string name="pref_dont_save_encrypted">Sla versleutelde berichten niet op</string> + <string name="pref_dont_save_encrypted_summary"><b>Waarschuwing:</b> Dit kan leiden tot verlies van berichten</string> + <string name="pref_enable_legacy_ssl">Sta legacy SSL toe</string> + <string name="pref_enable_legacy_ssl_summary">Staat ondersteuning voor SSLv3 voor legacy servers toe. <b>Waarschuwing:</b> SSLv3 is niet veilig.</string> + <string name="pref_expert_options">Expert-instellingen</string> + <string name="pref_expert_options_summary">Wees voorzichtig met deze instellingen</string> + <string name="title_activity_about">Over Conversations</string> + <string name="pref_about_conversations_summary">Build en licentie-informatie</string> + <string name="title_pref_quiet_hours">Stille uren</string> + <string name="title_pref_quiet_hours_start_time">Begintijd</string> + <string name="title_pref_quiet_hours_end_time">Eindtijd</string> + <string name="title_pref_enable_quiet_hours">Stille uren aanzetten</string> + <string name="pref_quiet_hours_summary">Tijdens stille uren worden meldingen onderdrukt</string> + <string name="pref_use_larger_font">Vergroot lettergrootte</string> + <string name="pref_use_larger_font_summary">Gebruik grotere lettertypes over de hele app</string> + <string name="pref_use_send_button_to_indicate_status">Verstuur-knop toont status aan</string> + <string name="pref_use_indicate_received">Vraag ontvangstbevestigingen</string> + <string name="pref_use_indicate_received_summary">Indien ondersteund, worden ontvangen berichten met een groen vinkje aangeduid</string> + <string name="pref_use_send_button_to_indicate_status_summary">Kleur verstuur-knop in om status van contact weer te geven</string> + <string name="pref_expert_options_other">Andere</string> + <string name="pref_conference_name">Groepsgespreksnaam</string> + <string name="pref_conference_name_summary">Gebruik onderwerp van kamer ipv JID om groepsgesprekken te identificeren</string> + <string name="toast_message_otr_fingerprint">OTR vingerafdruk naar klembord gekopieerd!</string> + <string name="conference_banned">Je bent verbannen uit dit groepsgesprek</string> + <string name="conference_members_only">Dit groepsgesprek is enkel voor leden</string> + <string name="conference_kicked">Je bent uit dit groepsgesprek geschopt</string> + <string name="using_account">account %s gebruiken</string> + <string name="checking_image">Afbeelding op HTTP host nakijken</string> + <string name="image_file_deleted">De afbeelding is verwijderd</string> + <string name="not_connected_try_again">Je bent niet verbonden. Probeer later opnieuw</string> + <string name="check_image_filesize">Bekijk bestandsgrootte van afbeelding</string> + <string name="message_options">Berichtopties</string> + <string name="copy_text">Kopieer tekst</string> + <string name="share_image">Deel afbeelding</string> + <string name="copy_original_url">Kopieer oorspronkelijke URL</string> + <string name="send_again">Verstuur opnieuw</string> + <string name="image_url">AfbeeldingsURL</string> + <string name="message_text">Berichttekst</string> + <string name="url_copied_to_clipboard">URL gekopieerd naar klembord</string> + <string name="message_copied_to_clipboard">Bericht gekopieerd naar klembord</string> + <string name="image_transmission_failed">Versturen van afbeelding mislukt</string> + <string name="scan_qr_code">Scan QR code</string> + <string name="show_qr_code">Toon QR code</string> + <string name="show_block_list">Toon geblokkeerde contacten</string> + <string name="account_details">Accountgegevens</string> + <string name="verify_otr">Bevestig OTR</string> + <string name="remote_fingerprint">Externe vingerafdruk</string> + <string name="scan">scan</string> + <string name="or_touch_phones">(of raak gsm\'s aan)</string> + <string name="smp">Socialist Millionaire Protocol</string> + <string name="shared_secret_hint">Hint of vraag</string> + <string name="shared_secret_secret">Gedeeld geheim</string> + <string name="confirm">Bevestigen</string> + <string name="in_progress">Bezig</string> + <string name="respond">Antwoorden</string> + <string name="failed">Mislukt</string> + <string name="secrets_do_not_match">Geheimen komen niet overeen</string> + <string name="try_again">Opnieuw proberen</string> + <string name="finish">Afsluiten</string> + <string name="verified">Bevestigd!</string> + <string name="smp_requested">Contact vraagt SMP-bevestiging</string> + <string name="no_otr_session_found">Geen geldige OTR-sessie gevonden!</string> + <string name="conversations_foreground_service">Conversations</string> + <string name="touch_to_disable">Raak aan om voorgrond-service uit te zetten</string> + <string name="pref_keep_foreground_service">Hou service in voorgrond</string> + <string name="pref_keep_foreground_service_summary">Belet het besturingssysteem van je verbinding te onderbreken</string> + <string name="choose_file">Kies bestand</string> + <string name="receiving_file">Ontvange van %1$s bestand (%2$d%% voltooid)</string> + <string name="download_file">Download %s bestand</string> + <string name="open_file">Open %s bestand</string> + <string name="sending_file">versturen (%1$d%% voltooid)</string> + <string name="preparing_file">Bestand klaarmaken voor versturen</string> + <string name="file_offered_for_download">Bestand aangeboden om te downloaden</string> + <string name="file">%s bestand</string> + <string name="cancel_transmission">Annuleer bestandsoverdracht</string> + <string name="file_transmission_failed">bestandsoverdracht mislukt</string> + <string name="file_deleted">Het bestand is verwijderd</string> + <string name="no_application_found_to_open_file">Geen applicatie om bestand te openen</string> + <string name="could_not_verify_fingerprint">Kon vingerafdruk niet bevestigen</string> + <string name="manually_verify">Handmatig bevestigen</string> + <string name="are_you_sure_verify_fingerprint">Ben je zeker dat je de OTR-vingerafdruk van je contact wil bevestigen?</string> + <string name="pref_show_dynamic_tags">Toon dynamische tags</string> + <string name="pref_show_dynamic_tags_summary">Toon enkel-lezen tags onder contacten</string> + <string name="enable_notifications">Meldingen aanzetten</string> + <string name="conference_with">Groepsgesprek aanmaken met…</string> + <string name="no_conference_server_found">Geen groepsgespreksserver gevonden</string> + <string name="conference_creation_failed">Aanmaken van groepsgesprek mislukt!</string> + <string name="conference_created">Groepsgesprek aangemaakt!</string> + <string name="secret_accepted">Geheim aanvaard!</string> + <string name="reset">Opnieuw instellen</string> + <string name="account_image_description">Account-avatar</string> + <string name="copy_otr_clipboard_description">Kopieer OTR-vingerafdruk naar klembord</string> + <string name="fetching_history_from_server">Geschiedenis van server halen</string> + <string name="no_more_history_on_server">Geen verdere geschiedenis op server</string> + <string name="updating">Bijwerken…</string> + <string name="password_changed">Wachtwoord gewijzigd!</string> + <string name="could_not_change_password">Kon wachtwoord niet wijzigen</string> -</resources>
\ No newline at end of file +</resources> diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 2aa26b0b..efc5ba6c 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Conversations</string> <string name="action_settings">Настройки</string> <string name="action_add">Новая беседа</string> <string name="action_accounts">Управление аккаунтами</string> diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index a3ed9112..2c3cb9c3 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Conversations</string> <string name="action_settings">Inställningar</string> <string name="action_add">Ny konversation</string> <string name="action_accounts">Kontoinställningar</string> @@ -257,4 +256,4 @@ <string name="account_status_disabled">Tillfälligt inaktiverad</string> <string name="mgmt_account_disable">Inaktivera tillfälligt</string> -</resources>
\ No newline at end of file +</resources> diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index a7898425..b3b9604e 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Conversations</string> <string name="action_settings">设置</string> <string name="action_add">新会话</string> <string name="action_accounts">管理账户</string> @@ -257,4 +256,4 @@ <string name="pref_use_send_button_to_indicate_status">发送按钮显示状态</string> <string name="pref_use_send_button_to_indicate_status_summary">发送按钮采用其他颜色以示发送状态的区别</string> -</resources>
\ No newline at end of file +</resources> diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 2c3ea225..24872cf7 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Conversations</string> <string name="action_settings">設定</string> <string name="action_add">新對話</string> <string name="action_accounts">管理帳戶</string> @@ -260,4 +259,4 @@ <string name="pref_conference_name">群組名稱</string> <string name="pref_conference_name_summary">使用群組的名稱而不是 JID 來識別之。 </string> -</resources>
\ No newline at end of file +</resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 6b639452..45174cd8 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Conversations</string> + <string name="app_name" translatable="false">Conversations</string> <string name="action_settings">Settings</string> <string name="action_add">New conversation</string> <string name="action_accounts">Manage accounts</string> @@ -13,6 +13,10 @@ <string name="action_edit_contact">Edit name</string> <string name="action_add_phone_book">Add to phone book</string> <string name="action_delete_contact">Delete from roster</string> + <string name="action_block_contact">Block contact</string> + <string name="action_unblock_contact">Unblock contact</string> + <string name="action_block_domain">Block domain</string> + <string name="action_unblock_domain">Unblock domain</string> <string name="title_activity_manage_accounts">Manage Accounts</string> <string name="title_activity_settings">Settings</string> <string name="title_activity_conference_details">Conference Details</string> @@ -21,6 +25,7 @@ <string name="title_activity_sharewith">Share with Conversation</string> <string name="title_activity_start_conversation">Start Conversation</string> <string name="title_activity_choose_contact">Choose contact</string> + <string name="title_activity_block_list">Block list</string> <string name="just_now">just now</string> <string name="minute_ago">1 min ago</string> <string name="minutes_ago">%d mins ago</string> @@ -34,16 +39,25 @@ <string name="participant">Participant</string> <string name="visitor">Visitor</string> <string name="remove_contact_text">Would you like to remove %s from your roster? The conversation associated with this contact will not be removed.</string> + <string name="block_contact_text">Would you like to block %s from sending you messages?</string> + <string name="unblock_contact_text">Would you like to unblock %s and allow them to send you messages?</string> + <string name="block_domain_text">Block all contacts from %s?</string> + <string name="unblock_domain_text">Unblock all contacts from %s?</string> + <string name="contact_blocked">Contact blocked</string> <string name="remove_bookmark_text">Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed.</string> <string name="register_account">Register new account on server</string> + <string name="change_password_on_server">Change password on server</string> <string name="share_with">Share with</string> <string name="start_conversation">Start Conversation</string> <string name="invite_contact">Invite Contact</string> <string name="contacts">Contacts</string> <string name="cancel">Cancel</string> + <string name="set">Set</string> <string name="add">Add</string> <string name="edit">Edit</string> <string name="delete">Delete</string> + <string name="block">Block</string> + <string name="unblock">Unblock</string> <string name="save">Save</string> <string name="ok">OK</string> <string name="crash_report_title">Conversations has crashed</string> @@ -173,7 +187,12 @@ <string name="contact_status_offline">offline</string> <string name="muc_details_conference">Conference</string> <string name="muc_details_other_members">Other Members</string> + <string name="server_info_show_more">Server info</string> + <string name="server_info_mam">XEP-0313: MAM</string> <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string> + <string name="server_info_csi">XEP-0352: Client State Indication</string> + <string name="server_info_blocking">XEP-0191: Blocking Command</string> + <string name="server_info_roster_version">XEP-0237: Roster Versioning</string> <string name="server_info_stream_management">XEP-0198: Stream Management</string> <string name="server_info_pep">XEP-0163: PEP (Avatars)</string> <string name="server_info_available">available</string> @@ -201,6 +220,8 @@ <string name="join_conference">Join Conference</string> <string name="delete_contact">Delete Contact</string> <string name="view_contact_details">View contact details</string> + <string name="block_contact">Block contact</string> + <string name="unblock_contact">Unblock contact</string> <string name="create">Create</string> <string name="contact_already_exists">The contact already exists</string> <string name="join">Join</string> @@ -229,7 +250,7 @@ <string name="private_message_to">to %s</string> <string name="send_private_message_to">Send private message to %s</string> <string name="connect">Connect</string> - <string name="account_already_exists">This account does already exist</string> + <string name="account_already_exists">This account already exists</string> <string name="next">Next</string> <string name="server_info_session_established">Current session established</string> <string name="additional_information">Additional Information</string> @@ -258,7 +279,7 @@ <string name="pref_expert_options_summary">Please be careful with these</string> <string name="title_activity_about">About Conversations</string> <string name="pref_about_conversations_summary">Build and licensing information</string> - <string name="pref_about_message" translatable="false"> + <string name="pref_about_message" translatable="false"> Conversations • the very last word in instant messaging. \n\nCopyright © 2014 Daniel Gultsch \n\nThis program is free software: you can redistribute it and/or modify @@ -282,6 +303,11 @@ \n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0) \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0) </string> + <string name="title_pref_quiet_hours">Quiet Hours</string> + <string name="title_pref_quiet_hours_start_time">Start time</string> + <string name="title_pref_quiet_hours_end_time">End time</string> + <string name="title_pref_enable_quiet_hours">Enable quiet hours</string> + <string name="pref_quiet_hours_summary">Notifications will be silenced during quiet hours</string> <string name="pref_use_larger_font">Increase font size</string> <string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string> <string name="pref_use_send_button_to_indicate_status">Send button indicates status</string> @@ -312,6 +338,7 @@ <string name="image_transmission_failed">Image transmission failed</string> <string name="scan_qr_code">Scan QR code</string> <string name="show_qr_code">Show QR code</string> + <string name="show_block_list">Show block list</string> <string name="account_details">Account details</string> <string name="verify_otr">Verify OTR</string> <string name="remote_fingerprint">Remote Fingerprint</string> @@ -360,4 +387,23 @@ <string name="reset">Reset</string> <string name="account_image_description">Account avatar</string> <string name="copy_otr_clipboard_description">Copy OTR fingerprint to clipboard</string> + <string name="fetching_history_from_server">Fetching history from server</string> + <string name="no_more_history_on_server">No more history on server</string> + <string name="updating">Updating…</string> + <string name="password_changed">Password changed!</string> + <string name="could_not_change_password">Could not change password</string> + <string name="otr_session_not_started">Send a message to start an encrypted chat</string> + <string name="ask_question">Ask question</string> + <string name="smp_explain_question">If you and your contact have a secret in common that no one else knows (like an inside joke or simply what you had for lunch the last time you met) you can use that secret to verify each other\'s fingerprints.\n\nYou provide a hint or a question for your contact who will respond with a case-sensitive answer.</string> + <string name="smp_explain_answer">Your contact would like to verify your fingerprint by challenging you with a shared secret. Your contact provided the following hint or question for that secret.</string> + <string name="shared_secret_hint_should_not_be_empty">Your hint should not be empty</string> + <string name="shared_secret_can_not_be_empty">Your shared secret can not be empty</string> + <string name="manual_verification_explanation">Carefully compare the fingerprint shown below with the fingerprint of your contact.\nYou can use any trusted form of communication like an encrypted e-mail or a telephone call to exchange those.</string> + <string name="change_password">Change password</string> + <string name="current_password">Current password</string> + <string name="new_password">New password</string> + <string name="password_should_not_be_empty">Password should not be empty</string> + <string name="enable_all_accounts">Enable all accounts</string> + <string name="disable_all_accounts">Disable all accounts</string> + <string name="perform_action_with">Perform action with</string> </resources> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index f927d915..9974f14d 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -35,7 +35,29 @@ android:key="show_notification" android:summary="@string/pref_notifications_summary" android:title="@string/pref_notifications" /> - <CheckBoxPreference + <PreferenceScreen + android:dependency="show_notification" + android:summary="@string/pref_quiet_hours_summary" + android:title="@string/title_pref_quiet_hours"> + <CheckBoxPreference + android:defaultValue="false" + android:key="enable_quiet_hours" + android:summary="@string/pref_quiet_hours_summary" + android:title="@string/title_pref_enable_quiet_hours" /> + <eu.siacs.conversations.ui.TimePreference + android:dependency="enable_quiet_hours" + android:key="quiet_hours_start" + android:negativeButtonText="@string/cancel" + android:positiveButtonText="@string/set" + android:title="@string/title_pref_quiet_hours_start_time" /> + <eu.siacs.conversations.ui.TimePreference + android:dependency="enable_quiet_hours" + android:key="quiet_hours_end" + android:negativeButtonText="@string/cancel" + android:positiveButtonText="@string/set" + android:title="@string/title_pref_quiet_hours_end_time" /> + </PreferenceScreen> + <CheckBoxPreference android:defaultValue="true" android:dependency="show_notification" android:key="vibrate_on_notification" @@ -123,5 +145,4 @@ <eu.siacs.conversations.ui.AboutPreference android:summary="@string/pref_about_conversations_summary" android:title="@string/title_activity_about" /> - </PreferenceScreen> |