diff options
Diffstat (limited to 'src/main/res')
118 files changed, 1205 insertions, 833 deletions
diff --git a/src/main/res/drawable-hdpi/ic_action_keyboard.png b/src/main/res/drawable-hdpi/ic_action_keyboard.png Binary files differnew file mode 100644 index 00000000..37c04af2 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_action_keyboard.png diff --git a/src/main/res/drawable-hdpi/ic_launcher.png b/src/main/res/drawable-hdpi/ic_launcher.png Binary files differindex 690400eb..16c7a7ce 100644 --- a/src/main/res/drawable-hdpi/ic_launcher.png +++ b/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png Binary files differdeleted file mode 100644 index 00e7d074..00000000 --- a/src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png Binary files differdeleted file mode 100644 index 558f0ea3..00000000 --- a/src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_notification.png b/src/main/res/drawable-hdpi/ic_notification.png Binary files differindex 31c0ee1a..854d299e 100644 --- a/src/main/res/drawable-hdpi/ic_notification.png +++ b/src/main/res/drawable-hdpi/ic_notification.png diff --git a/src/main/res/drawable-hdpi/message_bubble_received.9.png b/src/main/res/drawable-hdpi/message_bubble_received.9.png Binary files differindex dfd857cb..384d7e9c 100644 --- a/src/main/res/drawable-hdpi/message_bubble_received.9.png +++ b/src/main/res/drawable-hdpi/message_bubble_received.9.png diff --git a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png Binary files differindex fd07bc20..449a3252 100644 --- a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png +++ b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png diff --git a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png b/src/main/res/drawable-hdpi/message_bubble_received_white.9.png Binary files differindex bec20798..64bfed2c 100644 --- a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png +++ b/src/main/res/drawable-hdpi/message_bubble_received_white.9.png diff --git a/src/main/res/drawable-hdpi/message_bubble_sent.9.png b/src/main/res/drawable-hdpi/message_bubble_sent.9.png Binary files differindex 10dc2e29..1a43d347 100644 --- a/src/main/res/drawable-hdpi/message_bubble_sent.9.png +++ b/src/main/res/drawable-hdpi/message_bubble_sent.9.png diff --git a/src/main/res/drawable-hdpi/smiley.png b/src/main/res/drawable-hdpi/smiley.png Binary files differnew file mode 100644 index 00000000..c841c4c0 --- /dev/null +++ b/src/main/res/drawable-hdpi/smiley.png diff --git a/src/main/res/drawable-mdpi/ic_action_keyboard.png b/src/main/res/drawable-mdpi/ic_action_keyboard.png Binary files differnew file mode 100644 index 00000000..481e4222 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_action_keyboard.png diff --git a/src/main/res/drawable-mdpi/ic_launcher.png b/src/main/res/drawable-mdpi/ic_launcher.png Binary files differindex 9e076434..3a59b17e 100644 --- a/src/main/res/drawable-mdpi/ic_launcher.png +++ b/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png Binary files differdeleted file mode 100644 index ebd96073..00000000 --- a/src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png Binary files differdeleted file mode 100644 index e23c42db..00000000 --- a/src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_notification.png b/src/main/res/drawable-mdpi/ic_notification.png Binary files differindex aafc54f5..9dd4a9c8 100644 --- a/src/main/res/drawable-mdpi/ic_notification.png +++ b/src/main/res/drawable-mdpi/ic_notification.png diff --git a/src/main/res/drawable-mdpi/message_bubble_received.9.png b/src/main/res/drawable-mdpi/message_bubble_received.9.png Binary files differindex 9835a736..6f6b0e00 100644 --- a/src/main/res/drawable-mdpi/message_bubble_received.9.png +++ b/src/main/res/drawable-mdpi/message_bubble_received.9.png diff --git a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png Binary files differindex ff8f80b6..c5eddbe0 100644 --- a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png +++ b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png diff --git a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png b/src/main/res/drawable-mdpi/message_bubble_received_white.9.png Binary files differindex d7a3bb5d..86543da3 100644 --- a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png +++ b/src/main/res/drawable-mdpi/message_bubble_received_white.9.png diff --git a/src/main/res/drawable-mdpi/message_bubble_sent.9.png b/src/main/res/drawable-mdpi/message_bubble_sent.9.png Binary files differindex 596699bb..97415d6a 100644 --- a/src/main/res/drawable-mdpi/message_bubble_sent.9.png +++ b/src/main/res/drawable-mdpi/message_bubble_sent.9.png diff --git a/src/main/res/drawable-mdpi/smiley.png b/src/main/res/drawable-mdpi/smiley.png Binary files differnew file mode 100644 index 00000000..9f6d6511 --- /dev/null +++ b/src/main/res/drawable-mdpi/smiley.png diff --git a/src/main/res/drawable-xhdpi/ic_action_keyboard.png b/src/main/res/drawable-xhdpi/ic_action_keyboard.png Binary files differnew file mode 100644 index 00000000..c1af1a2f --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_action_keyboard.png diff --git a/src/main/res/drawable-xhdpi/ic_launcher.png b/src/main/res/drawable-xhdpi/ic_launcher.png Binary files differindex c49b2cb1..9afafb85 100644 --- a/src/main/res/drawable-xhdpi/ic_launcher.png +++ b/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png Binary files differdeleted file mode 100644 index b33c964d..00000000 --- a/src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png Binary files differdeleted file mode 100644 index 3ee3e172..00000000 --- a/src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_notification.png b/src/main/res/drawable-xhdpi/ic_notification.png Binary files differindex 042d2cda..70aa9574 100644 --- a/src/main/res/drawable-xhdpi/ic_notification.png +++ b/src/main/res/drawable-xhdpi/ic_notification.png diff --git a/src/main/res/drawable-xhdpi/message_bubble_received.9.png b/src/main/res/drawable-xhdpi/message_bubble_received.9.png Binary files differindex c0eb47eb..233d7364 100644 --- a/src/main/res/drawable-xhdpi/message_bubble_received.9.png +++ b/src/main/res/drawable-xhdpi/message_bubble_received.9.png diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png Binary files differindex fe0324ce..2e4421bd 100644 --- a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png +++ b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png Binary files differindex fdb6be0d..65640b08 100644 --- a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png +++ b/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png Binary files differindex cb5654b7..4e1be845 100644 --- a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png +++ b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png diff --git a/src/main/res/drawable-xhdpi/smiley.png b/src/main/res/drawable-xhdpi/smiley.png Binary files differnew file mode 100644 index 00000000..b06e0073 --- /dev/null +++ b/src/main/res/drawable-xhdpi/smiley.png diff --git a/src/main/res/drawable-xxhdpi/ic_action_keyboard.png b/src/main/res/drawable-xxhdpi/ic_action_keyboard.png Binary files differnew file mode 100644 index 00000000..a4668c41 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_action_keyboard.png diff --git a/src/main/res/drawable-xxhdpi/ic_launcher.png b/src/main/res/drawable-xxhdpi/ic_launcher.png Binary files differindex 873d4b14..b12d83bb 100644 --- a/src/main/res/drawable-xxhdpi/ic_launcher.png +++ b/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png Binary files differdeleted file mode 100644 index 66d25296..00000000 --- a/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png Binary files differdeleted file mode 100644 index 9d7f2ff9..00000000 --- a/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_notification.png b/src/main/res/drawable-xxhdpi/ic_notification.png Binary files differindex 42c62d32..2ab9bc95 100644 --- a/src/main/res/drawable-xxhdpi/ic_notification.png +++ b/src/main/res/drawable-xxhdpi/ic_notification.png diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png Binary files differindex 10e78408..212ac617 100644 --- a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png +++ b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png Binary files differindex 53ecbecf..912b1722 100644 --- a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png +++ b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png Binary files differindex 436a1bd3..4e4d4216 100644 --- a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png +++ b/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png Binary files differindex f78425d2..bbd02a31 100644 --- a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png +++ b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png diff --git a/src/main/res/drawable-xxhdpi/smiley.png b/src/main/res/drawable-xxhdpi/smiley.png Binary files differnew file mode 100644 index 00000000..2f11d408 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/smiley.png diff --git a/src/main/res/drawable-xxxhdpi/ic_launcher.png b/src/main/res/drawable-xxxhdpi/ic_launcher.png Binary files differindex baadfa78..d0654a90 100644 --- a/src/main/res/drawable-xxxhdpi/ic_launcher.png +++ b/src/main/res/drawable-xxxhdpi/ic_launcher.png diff --git a/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png Binary files differdeleted file mode 100644 index 827b6848..00000000 --- a/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png Binary files differdeleted file mode 100644 index 34ec7092..00000000 --- a/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/ic_notification.png b/src/main/res/drawable-xxxhdpi/ic_notification.png Binary files differindex c3439f1a..d25ed7b3 100644 --- a/src/main/res/drawable-xxxhdpi/ic_notification.png +++ b/src/main/res/drawable-xxxhdpi/ic_notification.png diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png Binary files differindex c474359e..043fa7ce 100644 --- a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png +++ b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png Binary files differindex 1421768c..a6095aa4 100644 --- a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png +++ b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png Binary files differindex ee89b670..474781bc 100644 --- a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png +++ b/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png Binary files differindex d34038d0..6431e5c8 100644 --- a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png +++ b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png diff --git a/src/main/res/drawable/switch_back_off.xml b/src/main/res/drawable/switch_back_off.xml deleted file mode 100644 index 20d2fb14..00000000 --- a/src/main/res/drawable/switch_back_off.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - - <item android:state_enabled="false"><shape android:shape="rectangle"> - <solid android:color="#D5D5D5" /> - - <corners android:radius="99dp" /> - </shape></item> - <item android:state_enabled="true"><shape android:shape="rectangle"> - <solid android:color="#939393" /> - - <corners android:radius="99dp" /> - </shape></item> - -</selector>
\ No newline at end of file diff --git a/src/main/res/drawable/switch_back_on.xml b/src/main/res/drawable/switch_back_on.xml deleted file mode 100644 index 45117a98..00000000 --- a/src/main/res/drawable/switch_back_on.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false"> - <shape android:shape="rectangle"> - <solid android:color="#D5D5D5"/> - <corners android:radius="99dp"/> - </shape> - </item> - <item android:state_enabled="true"> - <shape android:shape="rectangle"> - <!-- 30% accent on white --> - <solid android:color="#b3ddf7"/> - <corners android:radius="99dp"/> - </shape> - </item> -</selector>
\ No newline at end of file diff --git a/src/main/res/drawable/switch_thumb.xml b/src/main/res/drawable/switch_thumb.xml deleted file mode 100644 index ba3d1c45..00000000 --- a/src/main/res/drawable/switch_thumb.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - - <item android:drawable="@drawable/switch_thumb_disable" android:state_enabled="false"/> - <item android:drawable="@drawable/switch_thumb_on_pressed" android:state_checked="true" android:state_pressed="true"/> - <item android:drawable="@drawable/switch_thumb_on_pressed" android:state_checked="true" android:state_focused="true"/> - <item android:drawable="@drawable/switch_thumb_on_normal" android:state_checked="true"/> - <item android:drawable="@drawable/switch_thumb_off_pressed" android:state_checked="false" android:state_pressed="true"/> - <item android:drawable="@drawable/switch_thumb_off_pressed" android:state_checked="false" android:state_focused="true"/> - <item android:drawable="@drawable/switch_thumb_off_normal" android:state_checked="false"/> - -</selector>
\ No newline at end of file diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml index cac9a9fa..d1ec92af 100644 --- a/src/main/res/layout/account_row.xml +++ b/src/main/res/layout/account_row.xml @@ -33,7 +33,7 @@ android:layout_height="wrap_content" android:scrollHorizontally="false" android:singleLine="true" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeHeadline" /> <TextView @@ -46,8 +46,7 @@ android:textStyle="bold" /> </LinearLayout> - <eu.siacs.conversations.ui.widget.Switch - style="@style/MD" + <Switch android:id="@+id/tgl_account_status" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml index 247e96e5..8f1113ad 100644 --- a/src/main/res/layout/activity_about.xml +++ b/src/main/res/layout/activity_about.xml @@ -15,7 +15,7 @@ android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" android:typeface="monospace" android:fontFamily="monospace"/> diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml index 1a4d00d8..df75e61f 100644 --- a/src/main/res/layout/activity_change_password.xml +++ b/src/main/res/layout/activity_change_password.xml @@ -22,7 +22,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/current_password" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <EditText @@ -32,15 +32,15 @@ android:layout_marginBottom="8dp" android:hint="@string/password" android:inputType="textPassword" - android:textColor="@color/black87" - android:textColorHint="@color/black54" + 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/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <EditText @@ -50,15 +50,15 @@ android:layout_marginBottom="8dp" android:hint="@string/password" android:inputType="textPassword" - android:textColor="@color/black87" - android:textColorHint="@color/black54" + 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/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <EditText @@ -67,8 +67,8 @@ android:layout_height="wrap_content" android:hint="@string/password" android:inputType="textPassword" - android:textColor="@color/black87" - android:textColorHint="@color/black54" + android:textColor="@color/primaryText" + android:textColorHint="@color/secondaryText" android:textSize="?attr/TextSizeBody"/> </LinearLayout> </ScrollView> diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index c35f26bb..598003e3 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -5,7 +5,6 @@ android:background="@color/grey200" > <LinearLayout - android:id="@+id/details_main_layout" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" > @@ -40,7 +39,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/account_settings_example_jabber_id" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeHeadline" android:textStyle="bold" /> @@ -62,7 +61,7 @@ android:id="@+id/details_lastseen" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/black54" + android:textColor="@color/secondaryText" android:textSize="?attr/TextSizeBody" /> </LinearLayout> @@ -79,7 +78,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/send_presence_updates" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" /> <CheckBox @@ -87,7 +86,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/receive_presence_updates" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" /> </LinearLayout> @@ -99,7 +98,7 @@ android:layout_below="@+id/details_jidbox" android:layout_marginTop="32dp" android:text="@string/using_account" - android:textColor="@color/black54" + android:textColor="@color/secondaryText" android:textSize="?attr/TextSizeInfo" /> </RelativeLayout> diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index d308b4ce..58e168f3 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -41,13 +41,14 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_toRightOf="@+id/avater" - android:orientation="vertical"> + android:orientation="vertical" + android:id="@+id/editAccountBoxes"> <TextView android:id="@+id/account_jid_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/account_settings_jabber_id" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <AutoCompleteTextView @@ -56,8 +57,8 @@ android:layout_height="wrap_content" android:hint="@string/account_settings_example_jabber_id" android:inputType="textEmailAddress" - android:textColor="@color/black87" - android:textColorHint="@color/black54" + android:textColor="@color/primaryText" + android:textColorHint="@color/secondaryText" android:textSize="?attr/TextSizeBody"/> <TextView @@ -65,7 +66,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/account_settings_password" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <EditText @@ -74,8 +75,8 @@ android:layout_height="wrap_content" android:hint="@string/password" android:inputType="textPassword" - android:textColor="@color/black87" - android:textColorHint="@color/black54" + android:textColor="@color/primaryText" + android:textColorHint="@color/secondaryText" android:textSize="?attr/TextSizeBody"/> <LinearLayout @@ -95,16 +96,16 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/account_settings_hostname" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <EditText android:id="@+id/hostname" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:hint="@string/hostname_or_onion" + android:hint="@string/hostname_example" android:inputType="textNoSuggestions" - android:textColor="@color/black87" - android:textColorHint="@color/black54" + android:textColor="@color/primaryText" + android:textColorHint="@color/secondaryText" android:textSize="?attr/TextSizeBody"/> </LinearLayout> <LinearLayout @@ -117,7 +118,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/account_settings_port" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <EditText android:id="@+id/port" @@ -125,8 +126,8 @@ android:layout_height="match_parent" android:inputType="number" android:maxLength="5" - android:textColor="@color/black87" - android:textColorHint="@color/black54" + android:textColor="@color/primaryText" + android:textColorHint="@color/secondaryText" android:textSize="?attr/TextSizeBody"/> </LinearLayout> </LinearLayout> @@ -136,7 +137,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/register_account" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <TextView @@ -144,7 +145,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/account_settings_confirm_password" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" android:visibility="gone"/> @@ -155,11 +156,27 @@ android:layout_marginTop="8dp" android:hint="@string/confirm_password" android:inputType="textPassword" - android:textColor="@color/black87" - android:textColorHint="@color/black54" + android:textColor="@color/primaryText" + android:textColorHint="@color/secondaryText" android:textSize="?attr/TextSizeBody" android:visibility="gone"/> </LinearLayout> + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:layout_toRightOf="@+id/avater" + android:id="@+id/displayAccountFrame" + android:visibility="gone"> + <TextView + android:id="@+id/detailsAccountJid" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/account_settings_example_jabber_id" + android:textColor="@color/primaryText" + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold" /> + </LinearLayout> </RelativeLayout> <RelativeLayout @@ -179,7 +196,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/battery_optimizations_enabled" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeHeadline" android:textStyle="bold"/> <TextView @@ -190,7 +207,7 @@ android:layout_marginBottom="8dp" android:layout_marginTop="8dp" android:text="@string/battery_optimizations_enabled_explained" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <Button android:id="@+id/batt_op_disable" @@ -232,7 +249,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/server_info_session_established" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <TextView @@ -240,7 +257,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" tools:ignore="RtlHardcoded"/> </TableRow> @@ -261,7 +278,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/server_info_pep" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <TextView @@ -269,7 +286,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" tools:ignore="RtlHardcoded"/> </TableRow> @@ -282,7 +299,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/server_info_blocking" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <TextView @@ -290,7 +307,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" tools:ignore="RtlHardcoded"/> </TableRow> @@ -303,7 +320,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/server_info_stream_management" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <TextView @@ -311,7 +328,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" tools:ignore="RtlHardcoded"/> </TableRow> @@ -324,7 +341,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/server_info_roster_version" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <TextView @@ -332,7 +349,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" tools:ignore="RtlHardcoded"/> </TableRow> @@ -345,7 +362,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/server_info_carbon_messages" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <TextView @@ -353,7 +370,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" tools:ignore="RtlHardcoded"/> </TableRow> @@ -366,7 +383,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/server_info_mam" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <TextView @@ -374,7 +391,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" tools:ignore="RtlHardcoded"/> </TableRow> @@ -387,7 +404,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/server_info_csi" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <TextView @@ -395,7 +412,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" tools:ignore="RtlHardcoded"/> </TableRow> @@ -408,7 +425,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/server_info_push" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <TextView @@ -416,7 +433,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> </TableRow> <TableRow @@ -427,7 +444,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/server_info_http_upload" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <TextView @@ -435,8 +452,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textColor="@color/primaryText" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded"/> </TableRow> </TableLayout> @@ -458,7 +476,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="monospace" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" android:typeface="monospace"/> @@ -466,7 +484,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/otr_fingerprint" - android:textColor="@color/black54" + android:textColor="@color/secondaryText" android:textSize="?attr/TextSizeInfo"/> </LinearLayout> @@ -486,7 +504,8 @@ android:id="@+id/axolotl_fingerprint_box" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_marginTop="32dp"> + android:layout_marginTop="32dp" + android:visibility="gone"> <LinearLayout android:layout_width="wrap_content" @@ -500,7 +519,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="monospace" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" android:typeface="monospace"/> @@ -508,7 +527,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/this_device_omemo_fingerprint" - android:textColor="@color/black54" + android:textColor="@color/secondaryText" android:textSize="?attr/TextSizeInfo"/> </LinearLayout> @@ -560,7 +579,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/other_devices" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeHeadline" android:textStyle="bold"/> @@ -593,7 +612,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/cancel" - android:textColor="@color/black87"/> + android:textColor="@color/primaryText"/> <View android:layout_width="1dp" @@ -610,7 +629,7 @@ android:layout_weight="1" android:enabled="false" android:text="@string/save" - android:textColor="@color/black54"/> + android:textColor="@color/secondaryText"/> </LinearLayout> </RelativeLayout> diff --git a/src/main/res/layout/activity_logcatoutput.xml b/src/main/res/layout/activity_logcatoutput.xml new file mode 100644 index 00000000..302991b1 --- /dev/null +++ b/src/main/res/layout/activity_logcatoutput.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" android:layout_width="match_parent" + android:layout_height="match_parent"> + + <Button + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/cplus_copy_to_clipboard" + android:id="@+id/actLogOutputCopyButton" /> + + <ListView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/actLogInfoOutput" + android:scrollbars="vertical" + android:textSize="12sp" + android:textIsSelectable="true"/> +</LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index e7b11d9f..4c6b0301 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:text="@string/account_settings_example_jabber_id" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeHeadline" android:textStyle="bold"/> @@ -58,7 +58,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeHeadline"/> <TextView @@ -66,7 +66,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> </LinearLayout> @@ -90,7 +90,7 @@ android:layout_height="wrap_content" android:text="@string/private_conference" android:layout_centerVertical="true" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" android:layout_alignParentLeft="true" android:layout_toLeftOf="@+id/change_conference_button" @@ -104,7 +104,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:background="?android:selectableItemBackground" - android:padding="@dimen/image_button_padding" + android:padding="8dp" android:src="?attr/icon_settings"/> </RelativeLayout> @@ -117,7 +117,7 @@ android:layout_height="wrap_content" android:text="@string/notify_on_all_messages" android:layout_centerVertical="true" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" android:layout_alignParentLeft="true" android:layout_toLeftOf="@+id/notification_status_button" @@ -150,7 +150,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/server_info_mam" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" /> <TextView @@ -158,7 +158,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" /> </TableRow> @@ -171,7 +171,7 @@ android:layout_gravity="right" android:layout_marginTop="32dp" android:text="@string/using_account" - android:textColor="@color/black54" + android:textColor="@color/secondaryText" android:textSize="?attr/TextSizeInfo"/> </LinearLayout> diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml index 8c7c359b..1520b330 100644 --- a/src/main/res/layout/activity_publish_profile_picture.xml +++ b/src/main/res/layout/activity_publish_profile_picture.xml @@ -27,7 +27,7 @@ android:layout_below="@id/account_image_wrapper" android:layout_centerHorizontal="true" android:text="@string/touch_to_choose_picture" - android:textColor="@color/black54" /> + android:textColor="@color/secondaryText" /> <TextView android:id="@+id/secondary_hint" @@ -36,7 +36,7 @@ android:layout_below="@id/hint" android:layout_centerHorizontal="true" android:text="@string/or_long_press_for_default" - android:textColor="@color/black54" /> + android:textColor="@color/secondaryText" /> <LinearLayout android:id="@+id/button_bar" @@ -53,7 +53,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/cancel" - android:textColor="@color/black87" /> + android:textColor="@color/primaryText" /> <View android:layout_width="1dp" @@ -70,7 +70,7 @@ android:layout_weight="1" android:enabled="false" android:text="@string/publish" - android:textColor="@color/black54" /> + android:textColor="@color/secondaryText" /> </LinearLayout> <LinearLayout @@ -89,7 +89,7 @@ android:id="@+id/account" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeHeadline" /> <TextView @@ -99,7 +99,7 @@ android:layout_marginTop="8dp" android:minLines="3" android:text="@string/publish_avatar_explanation" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" /> </LinearLayout> diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml index c15f19d5..2d5821a4 100644 --- a/src/main/res/layout/activity_verify_otr.xml +++ b/src/main/res/layout/activity_verify_otr.xml @@ -34,7 +34,7 @@ android:id="@+id/your_fingerprint" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" android:typeface="monospace" android:fontFamily="monospace"/> @@ -43,7 +43,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/your_fingerprint" - android:textColor="@color/black54" + android:textColor="@color/secondaryText" android:textSize="?attr/TextSizeInfo"/> <TextView @@ -51,7 +51,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="20dp" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" android:typeface="monospace" android:fontFamily="monospace"/> @@ -61,7 +61,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="20dp" android:text="@string/remote_fingerprint" - android:textColor="@color/black54" + android:textColor="@color/secondaryText" android:textSize="?attr/TextSizeInfo"/> </LinearLayout> @@ -79,7 +79,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:text="@string/verified" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeHeadline" android:textStyle="bold" android:visibility="gone"/> @@ -89,7 +89,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" android:textStyle="bold" android:visibility="gone"/> @@ -101,8 +101,8 @@ android:layout_marginBottom="8dp" android:hint="@string/shared_secret_hint" android:inputType="textAutoComplete" - android:textColor="@color/black87" - android:textColorHint="@color/black54" + android:textColor="@color/primaryText" + android:textColorHint="@color/secondaryText" android:textSize="?attr/TextSizeBody"/> <EditText @@ -112,8 +112,8 @@ android:layout_marginTop="8dp" android:hint="@string/shared_secret_secret" android:inputType="textPassword" - android:textColor="@color/black87" - android:textColorHint="@color/black54" + android:textColor="@color/primaryText" + android:textColorHint="@color/secondaryText" android:textSize="?attr/TextSizeBody"/> </LinearLayout> </LinearLayout> diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml index 56443c34..faf017d0 100644 --- a/src/main/res/layout/contact.xml +++ b/src/main/res/layout/contact.xml @@ -14,6 +14,14 @@ android:scaleType="centerCrop" android:src="@drawable/ic_profile" app:riv_corner_radius="2dp" /> + <TextView + android:layout_width="48dp" + android:layout_height="4dp" + android:textAppearance="?android:attr/textAppearanceSmall" + android:id="@+id/contact_status" + android:layout_below="@+id/contact_photo" + android:paddingTop="8dp" + android:paddingRight="8dp"/> <LinearLayout android:layout_width="wrap_content" @@ -28,7 +36,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeHeadline" /> <TextView @@ -36,7 +44,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" /> <LinearLayout android:id="@+id/tags" @@ -49,7 +57,7 @@ android:id="@+id/key" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeHeadline" android:typeface="monospace" android:fontFamily="monospace" diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml index a4fd29e9..03246ccb 100644 --- a/src/main/res/layout/contact_key.xml +++ b/src/main/res/layout/contact_key.xml @@ -16,7 +16,7 @@ android:id="@+id/key" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:layout_alignParentLeft="true" android:layout_toLeftOf="@+id/tgl_trust" android:textSize="?attr/TextSizeBody" @@ -27,7 +27,7 @@ android:id="@+id/key_type" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/black54" + android:textColor="@color/secondaryText" android:layout_alignParentLeft="true" android:layout_below="@+id/key" android:maxLines="1" @@ -40,7 +40,7 @@ android:layout_alignParentRight="true" android:layout_below="@+id/key" android:visibility="gone" - android:textColor="@color/black54" + android:textColor="@color/secondaryText" android:textSize="?attr/TextSizeInfo"/> <ImageButton @@ -55,15 +55,13 @@ android:src="?attr/icon_remove" android:visibility="gone" /> - - <eu.siacs.conversations.ui.widget.Switch + <Switch android:id="@+id/tgl_trust" android:visibility="invisible" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" - android:layout_centerVertical="true" - style="@style/MD"/> + android:layout_centerVertical="true"/> </RelativeLayout> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index cd3f9266..74e84593 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -1,13 +1,18 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:descendantFocusability="blocksDescendants"> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:padding="8dp" + android:descendantFocusability="blocksDescendants" + android:id="@+id/conversationListRowFrame" + android:background="@color/primaryBackground"> <View android:layout_width="fill_parent" android:layout_height="match_parent" - android:background="@color/primary"/> + android:background="@color/red500"/> <FrameLayout android:id="@+id/swipeable_item" @@ -20,7 +25,8 @@ android:layout_height="wrap_content" android:background="?android:selectableItemBackground" android:orientation="horizontal" - android:padding="8dp"> + android:padding="8dp" + android:id="@+id/conversationListRowContent"> <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/conversation_image" @@ -30,6 +36,15 @@ android:scaleType="centerCrop" app:riv_corner_radius="2dp"/> + <TextView + android:layout_width="56dp" + android:layout_height="4dp" + android:textAppearance="?android:attr/textAppearanceSmall" + android:id="@+id/status" + android:layout_below="@+id/conversation_image" + android:paddingTop="8dp" + android:paddingRight="8dp"/> + <RelativeLayout android:layout_width="fill_parent" android:layout_height="wrap_content" @@ -46,7 +61,7 @@ android:paddingRight="4dp" android:singleLine="true" android:text="Awesome groupchat" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeHeadline" android:typeface="sans"/> @@ -63,21 +78,23 @@ android:layout_centerVertical="true" android:layout_toLeftOf="@+id/notification_status" android:orientation="vertical"> - <TextView - android:id="@+id/conversation_lastmsg" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:scrollHorizontally="false" - android:singleLine="true" + + <github.ankushsachdeva.emojicon.EmojiconTextView + android:id="@+id/conversation_lastmsg" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:scrollHorizontally="false" + android:singleLine="true" android:text="This is a placeholder text to show the last messages" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textColor="@color/primaryText" + android:textSize="?attr/TextSizeBody" + app:emojiconSize="?attr/EmojiconSizeBody" /> <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/conversation_lastimage" android:layout_width="fill_parent" android:layout_height="36dp" - android:background="@color/black87" + android:background="@color/primaryText" android:scaleType="centerCrop" android:visibility="gone" app:riv_corner_radius="2dp"/> @@ -101,7 +118,7 @@ android:layout_alignParentRight="true" android:gravity="right" android:text="23:42" - android:textColor="@color/black54" + android:textColor="@color/secondaryText" android:textSize="?attr/TextSizeInfo"/> </RelativeLayout> </RelativeLayout> diff --git a/src/main/res/layout/dialog_message_details.xml b/src/main/res/layout/dialog_message_details.xml new file mode 100644 index 00000000..84159f44 --- /dev/null +++ b/src/main/res/layout/dialog_message_details.xml @@ -0,0 +1,168 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="8dp"> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/dlg_msg_details_time_sent" + android:id="@+id/dlgMsgDetLblTimeSent" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/dlgMsgDetTimeSent" + android:width="200dp" + android:layout_alignParentTop="true" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:textAlignment="viewEnd" + android:gravity="end" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/dlg_msg_details_msg_type" + android:id="@+id/dlgMsgDetLblMsgType" + android:layout_below="@+id/dlgMsgDetLblTimeSent" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/dlgMsgDetMsgType" + android:layout_below="@+id/dlgMsgDetTimeSent" + android:layout_alignRight="@+id/dlgMsgDetTimeSent" + android:layout_alignEnd="@+id/dlgMsgDetTimeSent" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/dlg_msg_details_msg_status" + android:id="@+id/dlgMsgDetLblMsgStatus" + android:layout_below="@+id/dlgMsgDetLblMsgType" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/dlgMsgDetMsgStatus" + android:layout_below="@+id/dlgMsgDetMsgType" + android:layout_alignRight="@+id/dlgMsgDetMsgType" + android:layout_alignEnd="@+id/dlgMsgDetMsgType" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/dlg_msg_details_sender_resource" + android:id="@+id/dlgMsgDetLblSender" + android:layout_below="@+id/dlgMsgDetLblMsgStatus" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/dlgMsgDetSender" + android:layout_below="@+id/dlgMsgDetMsgStatus" + android:layout_alignRight="@+id/dlgMsgDetMsgStatus" + android:layout_alignEnd="@+id/dlgMsgDetMsgStatus" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/dlg_msg_details_receipient_resource" + android:id="@+id/dlgMsgDetLblReceipient" + android:layout_below="@+id/dlgMsgDetLblSender" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/dlgMsgDetReceipient" + android:layout_below="@+id/dlgMsgDetSender" + android:layout_alignRight="@+id/dlgMsgDetSender" + android:layout_alignEnd="@+id/dlgMsgDetSender" /> + + <TableLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/dlgMsgDetLblReceipient" + android:layout_marginTop="11dp" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:stretchColumns="1" + android:background="@color/primaryText" + android:id="@+id/dlgMsgDetFileTable" + android:visibility="gone"> + + <TableRow + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/white" + android:layout_marginTop="0.3dp" + android:layout_marginLeft="0.3dp" + android:layout_marginRight="0.3dp"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/dlg_msg_details_file_details" + android:layout_column="0"/> + </TableRow> + + <TableRow + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/white" + android:layout_marginTop="0.3dp" + android:layout_marginLeft="0.3dp" + android:layout_marginRight="0.3dp"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/dlg_msg_details_file_mime" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="" + android:textAlignment="textEnd" + android:gravity="end" + android:id="@+id/dlgMsgDetFileMimeType" /> + </TableRow> + + <TableRow + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/white" + android:layout_marginLeft="0.3dp" + android:layout_marginTop="0.3dp" + android:layout_marginRight="0.3dp"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/dlg_msg_details_file_size" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="" + android:textAlignment="textEnd" + android:gravity="end" + android:id="@+id/dlgMsgDetFileSize"/> + </TableRow> + </TableLayout> + </RelativeLayout> + + + +</LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/dialog_resources_status.xml b/src/main/res/layout/dialog_resources_status.xml new file mode 100644 index 00000000..4dd511f5 --- /dev/null +++ b/src/main/res/layout/dialog_resources_status.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" android:layout_width="match_parent" + android:layout_height="match_parent"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="Medium Text" + android:id="@+id/dlg_res_stat_resource_name" + android:layout_marginLeft="10dp" /> +</LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/dialog_userdecision.xml b/src/main/res/layout/dialog_userdecision.xml new file mode 100644 index 00000000..55f28a0b --- /dev/null +++ b/src/main/res/layout/dialog_userdecision.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <CheckBox + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/cplus_remember_userdecision" + android:id="@+id/dlgUserDecRemember" + android:checked="false" /> +</LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/enter_jid_dialog.xml b/src/main/res/layout/enter_jid_dialog.xml index d4af0dfc..f75f2674 100644 --- a/src/main/res/layout/enter_jid_dialog.xml +++ b/src/main/res/layout/enter_jid_dialog.xml @@ -13,7 +13,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/your_account" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <Spinner @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/account_settings_jabber_id" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> <AutoCompleteTextView @@ -36,8 +36,8 @@ android:layout_height="wrap_content" android:hint="@string/account_settings_example_jabber_id" android:inputType="textEmailAddress" - android:textColor="@color/black87" - android:textColorHint="@color/black54" + android:textColor="@color/primaryText" + android:textColorHint="@color/secondaryText" android:textSize="?attr/TextSizeBody" /> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index db92c05f..4145afb8 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -1,10 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/grey200" > + <com.orangegangsters.github.swipyrefreshlayout.library.SwipyRefreshLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_above="@+id/snackbar" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:id="@+id/swipe_refresh_container" + app:direction="both"> <ListView android:id="@+id/messages_view" android:layout_width="fill_parent" @@ -20,6 +29,7 @@ android:transcriptMode="normal" tools:listitem="@layout/message_sent"> </ListView> + </com.orangegangsters.github.swipyrefreshlayout.library.SwipyRefreshLayout> <RelativeLayout android:id="@+id/textsend" @@ -33,19 +43,20 @@ android:id="@+id/textinput" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_toLeftOf="@+id/textSendButton" + android:layout_toRightOf="@+id/emoji_btn" android:background="@color/grey50" android:ems="10" android:imeOptions="flagNoExtractUi|actionSend" android:inputType="textShortMessage|textMultiLine|textCapSentences" - android:minHeight="48dp" + android:minHeight="56dp" android:minLines="1" android:paddingBottom="12dp" android:paddingLeft="8dp" android:paddingRight="8dp" android:paddingTop="12dp" - android:textColor="@color/black87" > + android:textColor="@color/primaryText" + app:emojiconSize="?attr/EmojiconSizeInput" > <requestFocus /> </eu.siacs.conversations.ui.EditMessage> @@ -58,6 +69,15 @@ android:layout_centerVertical="true" android:background="?android:selectableItemBackground" android:src="@drawable/ic_send_text_offline" /> + + <ImageView + android:layout_width="48dp" + android:layout_height="48dp" + android:id="@+id/emoji_btn" + android:layout_centerVertical="true" + android:layout_alignParentLeft="true" + android:padding="4dp" + android:src="@drawable/smiley" /> </RelativeLayout> <RelativeLayout diff --git a/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml index f7aa3c46..d172142a 100644 --- a/src/main/res/layout/join_conference_dialog.xml +++ b/src/main/res/layout/join_conference_dialog.xml @@ -13,7 +13,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/your_account" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" /> <Spinner @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/conference_address" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" /> <AutoCompleteTextView @@ -36,8 +36,8 @@ android:layout_height="wrap_content" android:hint="@string/conference_address_example" android:inputType="textEmailAddress" - android:textColor="@color/black87" - android:textColorHint="@color/black54" + android:textColor="@color/primaryText" + android:textColorHint="@color/secondaryText" android:textSize="?attr/TextSizeBody"/> <CheckBox @@ -47,7 +47,7 @@ android:layout_marginTop="8dp" android:checked="true" android:text="@string/save_as_bookmark" - android:textColor="@color/black87" + android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody"/> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/list_item_logcatoutput.xml b/src/main/res/layout/list_item_logcatoutput.xml new file mode 100644 index 00000000..9a31be17 --- /dev/null +++ b/src/main/res/layout/list_item_logcatoutput.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/listItemLogcatoutputText" + android:scrollbars="vertical" + android:textSize="12sp"/>
\ No newline at end of file diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index 466dd045..d331b3ef 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_toRightOf="@+id/message_photo" - android:background="@drawable/message_bubble_received" + android:background="@drawable/message_bubble_received_white" android:minHeight="53dp" android:layout_marginTop="-2dp" android:layout_marginRight="-4dp" @@ -34,6 +34,7 @@ <LinearLayout android:layout_width="wrap_content" android:layout_height="fill_parent" + android:background="@color/primaryBackground" android:gravity="center_vertical" android:orientation="vertical" android:padding="2dp"> @@ -48,15 +49,14 @@ android:background="@color/black87" android:scaleType="centerCrop" /> - <TextView + <github.ankushsachdeva.emojicon.EmojiconTextView android:id="@+id/message_body" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:autoLink="web" - android:textColorLink="@color/white" - android:textColor="@color/white" - android:textColorHighlight="@color/grey800" - android:textSize="?attr/TextSizeBody" /> + android:autoLink="web|phone|email" + android:textColor="@color/primaryText" + android:textSize="?attr/TextSizeBody" + app:emojiconSize="?attr/EmojiconSizeBody" /> <Button android:id="@+id/download_button" @@ -93,16 +93,6 @@ android:gravity="center_vertical" android:src="@drawable/ic_lock_white_18dp" /> - <ImageView - android:id="@+id/edit_indicator" - android:layout_width="?attr/TextSizeInfo" - android:layout_height="?attr/TextSizeInfo" - android:layout_gravity="center_vertical" - android:layout_marginRight="4sp" - android:alpha="0.70" - android:gravity="center_vertical" - android:src="@drawable/ic_mode_edit_white_18dp" /> - <TextView android:id="@+id/message_time" android:layout_width="wrap_content" diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index fc68c389..0edbab51 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -19,6 +19,7 @@ android:layout_alignParentBottom="true" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" + android:visibility="gone" app:riv_corner_radius="2dp" /> <LinearLayout @@ -26,7 +27,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_toLeftOf="@+id/message_photo" + android:layout_alignParentRight="true" android:background="@drawable/message_bubble_sent" android:minHeight="53dp" android:layout_marginLeft="-4dp" @@ -46,18 +47,17 @@ android:layout_marginTop="8dp" android:layout_marginBottom="4dp" android:adjustViewBounds="true" - android:background="@color/black87" + android:background="@color/primaryText" android:scaleType="centerCrop" /> - <TextView + <github.ankushsachdeva.emojicon.EmojiconTextView android:id="@+id/message_body" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:autoLink="web" - android:textColorLink="@color/black87" - android:textColor="@color/black87" - android:textColorHighlight="@color/grey500" - android:textSize="?attr/TextSizeBody" /> + android:autoLink="web|phone|email" + android:textColor="@color/primaryText" + android:textSize="?attr/TextSizeBody" + app:emojiconSize="?attr/EmojiconSizeBody"/> <Button android:id="@+id/download_button" @@ -80,7 +80,7 @@ android:layout_gravity="center_vertical" android:gravity="center_vertical" android:text="@string/sending" - android:textColor="@color/black54" + android:textColor="@color/secondaryText" android:textSize="?attr/TextSizeInfo" /> <ImageView @@ -94,16 +94,6 @@ android:src="@drawable/ic_lock_black_18dp" /> <ImageView - android:id="@+id/edit_indicator" - android:layout_width="?attr/TextSizeInfo" - android:layout_height="?attr/TextSizeInfo" - android:layout_gravity="center_vertical" - android:layout_marginLeft="4sp" - android:alpha="0.54" - android:gravity="center_vertical" - android:src="@drawable/ic_mode_edit_black_18dp" /> - - <ImageView android:id="@+id/indicator_received" android:layout_width="?attr/TextSizeInfo" android:layout_height="?attr/TextSizeInfo" diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml index 93a80d84..aa02e154 100644 --- a/src/main/res/layout/message_status.xml +++ b/src/main/res/layout/message_status.xml @@ -9,15 +9,6 @@ android:paddingRight="8dp" android:paddingTop="5dp"> - <Button - android:id="@+id/load_more_messages" - style="?android:attr/borderlessButtonStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/load_more_messages" - android:textColor="@color/accent" android:layout_centerVertical="true" - android:layout_centerHorizontal="true"/> - <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/message_photo" android:layout_width="32dp" @@ -39,7 +30,7 @@ android:layout_toEndOf="@+id/message_photo" android:layout_toRightOf="@+id/message_photo" android:text="@string/contact_has_read_up_to_this_point" - android:textColor="@color/black54" + android:textColor="@color/secondaryText" android:textSize="?attr/TextSizeInfo" android:textStyle="italic"/> diff --git a/src/main/res/layout/quickedit.xml b/src/main/res/layout/quickedit.xml index ff6b0413..74e8dcf8 100644 --- a/src/main/res/layout/quickedit.xml +++ b/src/main/res/layout/quickedit.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:ems="10" android:inputType="textPersonName" - android:textColor="@color/black87" > + android:textColor="@color/primaryText" > <requestFocus /> </EditText> diff --git a/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml index ab42a206..445c4114 100644 --- a/src/main/res/menu/encryption_choices.xml +++ b/src/main/res/menu/encryption_choices.xml @@ -7,7 +7,8 @@ android:title="@string/encryption_choice_unencrypted"/> <item android:id="@+id/encryption_choice_axolotl" - android:title="@string/encryption_choice_omemo"/> + android:title="@string/encryption_choice_omemo" + android:visible="@bool/omemo_enabled"/> <item android:id="@+id/encryption_choice_otr" android:title="@string/encryption_choice_otr"/> diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml index bc8acede..0c7d8eef 100644 --- a/src/main/res/menu/message_context.xml +++ b/src/main/res/menu/message_context.xml @@ -1,17 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android" > - + <item + android:id="@+id/msg_ctx_mnu_details" + android:title="@string/msg_ctx_mnu_details" + android:visible="true"/> <item android:id="@+id/copy_text" android:title="@string/copy_text" android:visible="false"/> <item android:id="@+id/retry_decryption" - android:title="Retry decryption" - android:visible="false"/> - <item - android:id="@+id/correct_message" - android:title="@string/correct_message" + android:title="@string/retry_decryption" android:visible="false"/> <item android:id="@+id/share_with" diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml index cefcdf06..2c59fd2f 100644 --- a/src/main/res/values-ar/strings.xml +++ b/src/main/res/values-ar/strings.xml @@ -92,6 +92,7 @@ <string name="pref_xmpp_resource">الريسورس</string> <string name="pref_accept_files">ضبط استقبال الملفات</string> <string name="pref_accept_files_summary">اقبل تلقائيا الملفات أقل من</string> + <string name="pref_accept_files_size_summary">اقبل تلقائيا الملفات أقل من</string> <string name="pref_notifications">الإشعارات</string> <string name="pref_notifications_summary">أخبرني عندما تصل رساله جديده</string> <string name="pref_vibrate">إعداد الإهتزاز</string> @@ -301,4 +302,7 @@ <string name="hide_offline">اخفاء غير المتصلين</string> <string name="disable_account">ايقاف الحساب</string> <string name="dialog_manage_certs_negativebutton">الغاء</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">فشل الاتصال</string> + <string name="conference_name">اسم الغرفة</string> </resources> diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index 06463963..efb29356 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -103,6 +103,7 @@ <string name="pref_xmpp_resource_summary">Името, с което се определя този клиент</string> <string name="pref_accept_files">Приемане на файлове</string> <string name="pref_accept_files_summary">Автоматично приемане на файлове с размер, по-малък от…</string> + <string name="pref_accept_files_size_summary">Автоматично приемане на файлове с размер, по-малък от…</string> <string name="pref_notification_settings">Известие</string> <string name="pref_notifications">Известия</string> <string name="pref_notifications_summary">Известяване при получаване на ново съобщение</string> @@ -491,6 +492,8 @@ <string name="recently_used">Използвани наскоро</string> <string name="choose_quick_action">Изберете бързо действие</string> <string name="search_for_contacts_or_groups">Търсене на контакти или групи</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">Неуспешно</string> <string name="send_private_message">Изпращане на лично съобщение</string> <string name="user_has_left_conference">%s напусна беседата!</string> <string name="username">Потребителско име</string> @@ -501,8 +504,6 @@ <string name="download_failed_server_not_found">Неуспешно сваляне: Сървърът не е открит</string> <string name="download_failed_file_not_found">Неуспешно сваляне: Файлът не е открит</string> <string name="download_failed_could_not_connect">Неуспешно сваляне: Неуспешна връзка със сървъра</string> - <string name="pref_use_white_background">Използване на бял фон</string> - <string name="pref_use_white_background_summary">Показване на получените съобщения с черен текст на бял фон</string> <string name="account_status_tor_unavailable">Мрежата на Тор е недостъпна</string> <string name="server_info_broken">Повредено</string> <string name="pref_presence_settings">Присъствие</string> @@ -532,11 +533,8 @@ <string name="verified_omemo_key_with_certificate">Ключът за OMEMO беше потвърден със сертификат!</string> <string name="device_does_not_support_certificates">Устройството Ви не поддържа избраните клиентски сертификати!</string> <string name="pref_connection_options">Връзка</string> - <string name="pref_use_tor">Свързване през Тор</string> - <string name="pref_use_tor_summary">Всички връзки да минават през мрежата на Тор. Изисква Орбот</string> <string name="account_settings_hostname">Име на сървър</string> <string name="account_settings_port">Порт</string> - <string name="hostname_or_onion">Адрес на сървър или .onion</string> <string name="not_a_valid_port">Това не е правилен номер на порт</string> <string name="not_valid_hostname">Това не е правилно име на сървър</string> <string name="connected_accounts">%1$d от %2$d свързани профила</string> @@ -544,7 +542,6 @@ <item quantity="one">%d съобщение</item> <item quantity="other">%d съобщения</item> </plurals> - <string name="load_more_messages">Зареждане на още съобщения</string> <string name="shared_file_with_x">Файлът е споделен с %s</string> <string name="shared_image_with_x">Изображението е споделено с %s</string> <string name="shared_images_with_x">Изображения, споделени с %s</string> @@ -563,8 +560,6 @@ <string name="notify_only_when_highlighted">Известяване само на осветените</string> <string name="notify_never">Известията са изключени</string> <string name="notify_paused">Известията са спрени временно</string> - <string name="pref_picture_compression">Компресиране на снимките</string> - <string name="pref_picture_compression_summary">Преоразмеряване и компресиране на снимките</string> <string name="always">Винаги</string> <string name="automatically">Автоматично</string> <string name="battery_optimizations_enabled">Оптимизациите за използв. на батерията са вкл.</string> @@ -574,8 +569,6 @@ <string name="selection_too_large">Избраната област е твърде голяма</string> <string name="no_accounts">(Няма активирани профили)</string> <string name="this_field_is_required">Това поле е задължително</string> - <string name="correct_message">Поправяне на съобщението</string> - <string name="send_corrected_message">Изпращане на поправеното съобщение</string> <string name="no_keys_just_confirm">Вие вече имате доверие на този контакт. Избирайки „готово“, Вие просто потвърждавате, че %s е част от тази беседа.</string> <string name="select_image_and_crop">Изберете изображение и изрежете</string> <string name="this_account_is_disabled">Вие сте деактивирали този профил</string> diff --git a/src/main/res/values-ca-rES/strings.xml b/src/main/res/values-ca-rES/strings.xml index c757504a..873829b5 100644 --- a/src/main/res/values-ca-rES/strings.xml +++ b/src/main/res/values-ca-rES/strings.xml @@ -1,2 +1,4 @@ <?xml version='1.0' encoding='UTF-8'?> -<resources/> +<resources> + <!--%s = bare jid, %d = count of online resources--> +</resources> diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml index 2a9aa8c5..045dc101 100644 --- a/src/main/res/values-ca/strings.xml +++ b/src/main/res/values-ca/strings.xml @@ -93,6 +93,7 @@ <string name="pref_xmpp_resource_summary">El nom que identifica aquest client amb</string> <string name="pref_accept_files">Acceptar fitxers</string> <string name="pref_accept_files_summary">Accepta fitxers automàticament amb una mida menor a…</string> + <string name="pref_accept_files_size_summary">Accepta fitxers automàticament amb una mida menor a…</string> <string name="pref_notifications">Notificacions</string> <string name="pref_notifications_summary">Notifica quan arriba un nou missatge</string> <string name="pref_vibrate">Vibra</string> @@ -416,4 +417,7 @@ <item quantity="one">Seleccionar %d contacte</item> <item quantity="other">Seleccionar %d contactes</item> </plurals> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">Fallat</string> + <string name="conference_name">Nom de la sala</string> </resources> diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index c70eac63..6094ad87 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -498,8 +498,6 @@ <string name="download_failed_server_not_found">Stahování selhalo: Server nenalezen</string> <string name="download_failed_file_not_found">Stahování selhalo: Soubor nenalezen</string> <string name="download_failed_could_not_connect">Stahování selhalo: Nelze se připojit k hostu</string> - <string name="pref_use_white_background">Použít bílé pozadí</string> - <string name="pref_use_white_background_summary">Zobrazovat přijaté zprávy jako černý text na bílém pozadí</string> <string name="account_status_tor_unavailable">Tor síť není dostupná</string> <string name="server_info_broken">Rozbité</string> <string name="pref_presence_settings">Stav</string> @@ -529,11 +527,8 @@ <string name="verified_omemo_key_with_certificate">OMEMO klíč ověřen certifikátem!</string> <string name="device_does_not_support_certificates">Tento přístroj nepodporuje výběr klientského certifikátu!</string> <string name="pref_connection_options">Připojení</string> - <string name="pref_use_tor">Připojit přes Tor</string> - <string name="pref_use_tor_summary">Vedení všech připojení po Tor síti vyžaduje aplikaci Orbot</string> <string name="account_settings_hostname">Hostname</string> <string name="account_settings_port">Port</string> - <string name="hostname_or_onion">Server- nebo .onion-adresa</string> <string name="not_a_valid_port">Toto není platné číslo portu</string> <string name="not_valid_hostname">Toto není platné hostname</string> <string name="connected_accounts">%1$d z %2$d účtů připojeno</string> @@ -542,7 +537,6 @@ <item quantity="few">%d zprávy</item> <item quantity="other">%d zpráv</item> </plurals> - <string name="load_more_messages">Načíst více zpráv</string> <string name="shared_file_with_x">Soubor sdílen s %s</string> <string name="shared_image_with_x">Obrázek sdílen s %s</string> <string name="shared_images_with_x">Obrázky sdíleny s %s</string> @@ -561,8 +555,6 @@ <string name="notify_only_when_highlighted">Upozorňovat pouze pokud zvýrazněno</string> <string name="notify_never">Upozornění vypnuta</string> <string name="notify_paused">Upozornění pozastavena</string> - <string name="pref_picture_compression">Komprimovat obrázky</string> - <string name="pref_picture_compression_summary">Upravit velikost a komprimovat obrázky</string> <string name="always">Vždy</string> <string name="automatically">Automaticky</string> <string name="battery_optimizations_enabled">Povolena optimalizace využití baterie</string> @@ -572,8 +564,6 @@ <string name="selection_too_large">Vybraný obsah je příliš dlouhý</string> <string name="no_accounts">(Žádné aktivované účty)</string> <string name="this_field_is_required">Toto pole je vyžadováno</string> - <string name="correct_message">Opravit zprávu</string> - <string name="send_corrected_message">Odeslat opravenou zprávu</string> <string name="no_keys_just_confirm">Tomuto kontaktu již důvěřujete. Vybráním možnosti \'hotovo\' jen potvrzujete, že %s je součástí této konference.</string> <string name="select_image_and_crop">Vybrat obrázek a oříznout</string> <string name="this_account_is_disabled">Tento účet byl vypnut</string> diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 523dc1e1..b8729940 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -3,7 +3,7 @@ <string name="action_settings">Einstellungen</string> <string name="action_add">Neue Unterhaltung</string> <string name="action_accounts">Konten verwalten</string> - <string name="action_end_conversation">Unterhaltung beenden</string> + <string name="action_end_conversation">Unterhaltung schließen</string> <string name="action_contact_details">Kontakt-Details</string> <string name="action_muc_details">Konferenz-Details</string> <string name="action_secure">Verschlüsselte Unterhaltung</string> @@ -77,9 +77,9 @@ <string name="clear_conversation_history">Verlauf löschen</string> <string name="clear_histor_msg">Möchtest du alle Nachrichten in dieser Unterhaltung löschen?\n\n<b>Achtung:</b> Dies beeinflusst nicht Nachrichten, die auf anderen Geräten oder Servern gespeichert sind.</string> <string name="delete_messages">Nachrichten löschen</string> - <string name="also_end_conversation">Diese Unterhaltung danach beenden</string> + <string name="also_end_conversation">Diese Unterhaltung danach schließen</string> <string name="choose_presence">Ressource des Kontakts auswählen</string> - <string name="send_unencrypted_message">Unverschlüsselt schreiben…</string> + <string name="send_unencrypted_message">Normal schreiben…</string> <string name="send_otr_message">OTR-verschlüsselt schreiben…</string> <string name="send_omemo_message">OMEMO-verschlüsselt schreiben…</string> <string name="send_omemo_x509_message">v\\OMEMO-verschlüsselte Nachricht senden</string> @@ -101,9 +101,15 @@ <string name="pref_general">Allgemeines</string> <string name="pref_xmpp_resource">XMPP-Ressource</string> <string name="pref_xmpp_resource_summary">Der Name, mit dem sich der Client selbst identifiziert</string> - <string name="pref_accept_files">Dateien annehmen</string> - <string name="pref_accept_files_summary">Dateien automatisch annehmen, die kleiner sind als …</string> - <string name="pref_notification_settings">Benachrichtigung</string> + <string name="pref_accept_files">Dateiannahme</string> + <string name="pref_accept_files_summary">Einstellungen für Dateiannahme und automatischen Download</string> + <string name="pref_accept_files_size">Größe</string> + <string name="pref_accept_files_size_summary">Dateien, die kleiner sind als …, automatisch annehmen</string> + <string name="pref_accept_files_download">nur WLAN</string> + <string name="pref_accept_files_download_summary">Automatisches Herunterladen und Akzeptieren von Dateien nur im WLAN</string> + <string name="pref_accept_files_download_link">Bilder-Links</string> + <string name="pref_accept_files_download_link_summary">Bilder-Links automatisch herunterladen</string> + <string name="pref_notification_settings">Benachrichtigungen</string> <string name="pref_notifications">Benachrichtigungen</string> <string name="pref_notifications_summary">Benachrichtigen bei Erhalt einer neuen Nachricht</string> <string name="pref_vibrate">Vibrieren</string> @@ -119,7 +125,12 @@ <string name="pref_never_send_crash_summary">Wenn du Absturzberichte einschickst, hilfst du Conversations stetig zu verbessern</string> <string name="pref_confirm_messages">Lese- und Empfangsbestätigung senden</string> <string name="pref_confirm_messages_summary">Informiere deine Kontakte, wenn du eine Nachricht empfangen und gelesen hast</string> + <string name="pref_confirm_messages_none">Keine Bestätigungen</string> + <string name="pref_confirm_messages_received">Nur Empfangsbestätigung</string> + <string name="pref_confirm_messages_read_and_received">Lese- und Empfangsbestätigung</string> <string name="pref_ui_options">Benutzeroberfläche</string> + <string name="pref_parse_emoticons">Smilies ersetzen</string> + <string name="pref_parse_emoticons_summary">Zeige Smilie-Bilder anstelle von Emoticons.</string> <string name="openpgp_error">Fehler mit OpenKeychain</string> <string name="error_decrypting_file">Fehler beim Entschlüsseln der Datei</string> <string name="accept">Annehmen</string> @@ -406,7 +417,8 @@ <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 aktiveren</string> + <string name="password_should_not_contain_only_spaces">Das Passwort darf nicht nur aus Leerzeichen bestehen</string> + <string name="enable_all_accounts">Alle Konten aktivieren</string> <string name="disable_all_accounts">Alle Konten abschalten</string> <string name="perform_action_with">Aktion durchführen mit</string> <string name="no_affiliation">Keine Zugehörigkeit</string> @@ -467,7 +479,7 @@ <string name="no_application_found_to_display_location">Keine App für die Standort-Anzeige gefunden</string> <string name="location">Standort</string> <string name="received_location">Standort empfangen</string> - <string name="title_undo_swipe_out_conversation">Unterhaltung beendet</string> + <string name="title_undo_swipe_out_conversation">Unterhaltung geschlossen</string> <string name="title_undo_swipe_out_muc">Konferenz verlassen</string> <string name="pref_dont_trust_system_cas_title">Zertifizierungsstellen misstrauen</string> <string name="pref_dont_trust_system_cas_summary">Alle Zertifikate müssen manuell bestätigt werden</string> @@ -491,6 +503,56 @@ <string name="recently_used">zuletzt verwendet</string> <string name="choose_quick_action">wähle Schnell-Taste</string> <string name="search_for_contacts_or_groups">Nach Kontakten oder Konferenzen suchen</string> + <string name="pref_led_notification_color">LED-Benachrichtigung Farbe</string> + <string name="pref_led_notification_color_summary">Setze die Farbe der LED-Benachrichtigung</string> + <string name="msg_ctx_mnu_details">Nachrichtendetails</string> + <string name="dlg_msg_details_title">Nachrichtendetails</string> + <string name="cplus_ok">Ok</string> + <string name="dlg_resources_title">%1$s (%2$d)</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_receipient_resource">Empfänger Resource:</string> + <string name="dlg_msg_details_receipient_nick">Empfänger Nickname:</string> + <string name="dlg_msg_details_sender_resource">Absender Resource:</string> + <string name="dlg_msg_details_sender_nick">Absender Nickname:</string> + <string name="dlg_msg_details_time_sent">Gesendet:</string> + <string name="dlg_msg_details_msg_type">Nachrichtentyp:</string> + <string name="dlg_msg_details_msg_status">Nachrichtenstatus:</string> + <string name="dlg_msg_details_file_details">Dateidetails</string> + <string name="dlg_msg_details_file_mime">Mime Type</string> + <string name="dlg_msg_details_file_size">Größe</string> + <string name="dlg_msg_details_msg_type_text">Text</string> + <string name="dlg_msg_details_msg_type_image">Bild</string> + <string name="dlg_msg_details_msg_type_file">Datei</string> + <string name="dlg_msg_details_msg_type_status">Status</string> + <string name="dlg_msg_details_msg_type_private">Privat</string> + <string name="dlg_msg_details_msg_status_sent">Gesendet</string> + <string name="dlg_msg_details_msg_status_received">Empfangen</string> + <string name="dlg_msg_details_msg_status_waiting">Wartend</string> + <string name="dlg_msg_details_msg_status_unsend">In Übertragung</string> + <string name="dlg_msg_details_msg_status_offered">Angeboten</string> + <string name="dlg_msg_details_msg_status_failed">Fehlgeschlagen</string> + <string name="pref_resize_picture_ask">nachfragen</string> + <string name="pref_resize_picture_always">immer</string> + <string name="pref_resize_picture_never">nie</string> + <string name="pref_resize_picture_summary">Sollen Bilder vor dem Senden verkleinert werden oder nicht?</string> + <string name="pref_resize_picture">Bilder verkleinern</string> + <string name="cplus_yes">Ja</string> + <string name="cplus_no">Nein</string> + <string name="cplus_remember_userdecision">Diese Entscheidung merken</string> + <string name="userdecision_question_resize_picture">Soll das Bild verkleinert werden?</string> + <string name="title_activity_loginformation">Logausgaben</string> + <string name="cplus_copy_to_clipboard">Kopieren</string> + <string name="cplus_copied_to_clipboard">In Zwischenablage kopiert</string> + <string name="pref_show_logcat_title">Zeige logcat Ausgabe</string> + <string name="pref_show_logcat_summary">Zeigt die Ausgabe von logcat an. Hilfreich für die Fehlersuche.</string> + <string name="cplus_bugreport_jabberid">c+bugs@conference.thedevstack.de</string> + <string name="pref_file_transfer">Ordnername, um eingehnde Datein zu speichern</string> + <string name="pref_file_transfer_folder_summary">Unterordner des globalen Dateiordners, um eingehende Dateien zu speichern.</string> + <string name="pref_img_file_transfer">Ordnername, um eingehende Bilder zu speichern</string> + <string name="pref_img_file_transfer_summary">Unterordner des globalen Bilderordners, um eingehende Bilder zu speichern.</string> + <string name="pref_file_transfer_category">Dateiübertragung</string> + <string name="cplus_not_copied_to_clipboard_empty">Nichts zu kopieren.</string> + <string name="cplus_me">Ich</string> <string name="send_private_message">Private Nachricht senden</string> <string name="user_has_left_conference">%s hat die Konferenz verlassen!</string> <string name="username">Benutzername</string> @@ -501,8 +563,6 @@ <string name="download_failed_server_not_found">Download fehlgeschlagen: Server nicht gefunden</string> <string name="download_failed_file_not_found">Download fehlgeschlagen: Datei nicht gefunden</string> <string name="download_failed_could_not_connect">Download fehlgeschlagen: keine Verbindung zum Host</string> - <string name="pref_use_white_background">Weißen Hintergrund benutzen</string> - <string name="pref_use_white_background_summary">Empfangene Nachrichten als schwarzen Text auf weißem Hintergrund anzeigen</string> <string name="account_status_tor_unavailable">Tor-Netzwerk nicht verfügbar</string> <string name="server_info_broken">Fehlerhaft</string> <string name="pref_presence_settings">Status</string> @@ -532,11 +592,8 @@ <string name="verified_omemo_key_with_certificate">OMEMO Schlüssel mit Zertifikat bestätigt!</string> <string name="device_does_not_support_certificates">Dein Gerät unterstützt das Auswählen von Client-Zertifikaten nicht!</string> <string name="pref_connection_options">Verbindung</string> - <string name="pref_use_tor">Über TOR verbinden</string> - <string name="pref_use_tor_summary">Alle Verbindungen über das Tor-Netzwerk tunneln. Benötigt Orbot</string> <string name="account_settings_hostname">Hostname</string> <string name="account_settings_port">Port</string> - <string name="hostname_or_onion">Server- oder .onion-Adresse</string> <string name="not_a_valid_port">Dies ist keine gültige Port-Nummer</string> <string name="not_valid_hostname">Dies ist kein gültiger Hostname</string> <string name="connected_accounts">%1$d von %2$d Konten verbunden</string> @@ -544,7 +601,6 @@ <item quantity="one">%d Nachricht</item> <item quantity="other">%d Nachrichten</item> </plurals> - <string name="load_more_messages">Weitere Nachrichten laden</string> <string name="shared_file_with_x">Datei mit %s geteilt</string> <string name="shared_image_with_x">Bild mit %s geteilt</string> <string name="shared_images_with_x">Bilder mit %s geteilt</string> @@ -563,8 +619,6 @@ <string name="notify_only_when_highlighted">Nur benachrichtigen, wenn ich angesprochen werde</string> <string name="notify_never">Benachrichtigungen deaktiviert</string> <string name="notify_paused">Benachrichtigungen pausiert</string> - <string name="pref_picture_compression">Bilder komprimieren</string> - <string name="pref_picture_compression_summary">Bildgröße anpassen und komprimieren</string> <string name="always">Immer</string> <string name="automatically">Automatisch</string> <string name="battery_optimizations_enabled">Batterieoptimierung aktiv</string> @@ -574,10 +628,10 @@ <string name="selection_too_large">Der ausgewählte Bereich ist zu groß</string> <string name="no_accounts">(Keine aktivierten Konten)</string> <string name="this_field_is_required">Dieses Feld ist erforderlich</string> - <string name="correct_message">Nachricht korrigieren</string> - <string name="send_corrected_message">Korrigierte Nachricht senden</string> + <string name="retry_decryption">Entschlüsselung nochmal versuchen</string> + <string name="pref_omemo_enabled_summary">OMEMO aktivieren?</string> + <string name="pref_omemo_enabled_title">OMEMO aktivieren</string> <string name="no_keys_just_confirm">Du vertraust diesem Kontakt bereits. Durch Auswählen von \"Fertig\" bestätigst du, dass %s Teil dieser Konferenz ist.</string> <string name="select_image_and_crop">Bild auswählen und zuschneiden</string> - <string name="this_account_is_disabled">Du hast dieses Konto deaktiviert</string> - <string name="security_error_invalid_file_access">Sicherheitsfehler: Dateizugriff nicht erlaubt</string> + <string name="this_account_is_disabled">Du hast diesen Account deaktiviert</string> </resources> diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml index 6a3bec96..43dc9ef1 100644 --- a/src/main/res/values-el/strings.xml +++ b/src/main/res/values-el/strings.xml @@ -93,6 +93,7 @@ <string name="pref_xmpp_resource_summary">Το όνομα με το οποίο ταυτοποιείται αυτό το πρόγραμμα-πελάτης</string> <string name="pref_accept_files">Αποδοχή αρχείων</string> <string name="pref_accept_files_summary">Αυτόματη αποδοχή αρχείων μικρότερα από...</string> + <string name="pref_accept_files_size_summary">Αυτόματη αποδοχή αρχείων μικρότερα από...</string> <string name="pref_notifications">Ειδοποιήσεις</string> <string name="pref_notifications_summary">Ειδοποίηση όταν λαμβάνεται ένα νέο μήνυμα</string> <string name="pref_vibrate">Δόνηση</string> @@ -416,4 +417,7 @@ <item quantity="one">Επιλογή %d επαφής</item> <item quantity="other">Επιλογή %d επαφών</item> </plurals> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">Αποτυχία</string> + <string name="conference_name">Όνομα συνδιάσκεψης</string> </resources> diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index b45a0248..49add502 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -5,30 +5,30 @@ <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 conversación</string> - <string name="action_secure">Conversación segura</string> + <string name="action_muc_details">Detalles de la reunión</string> + <string name="action_secure">Asegurar conversación</string> <string name="action_add_account">Añadir cuenta</string> <string name="action_edit_contact">Editar contacto</string> - <string name="action_add_phone_book">Añadir a contactos</string> + <string name="action_add_phone_book">Añadir a la libreta de direcciones</string> <string name="action_delete_contact">Eliminar contacto de la lista</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_manage_accounts">Gestionar cuentas</string> <string name="title_activity_settings">Ajustes</string> - <string name="title_activity_conference_details">Detalles de Conversación</string> - <string name="title_activity_contact_details">Detalles del Contacto</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_conference_details">Detalles de la reunión</string> + <string name="title_activity_contact_details">Detalles del contacto</string> + <string name="title_activity_sharewith">Compartir con la conversación</string> + <string name="title_activity_start_conversation">Iniciar 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="title_activity_block_list">Lista de contactos bloqueados</string> + <string name="just_now">ahora mismo</string> <string name="minute_ago">hace 1 min</string> - <string name="minutes_ago">hace %d min</string> - <string name="unread_conversations">conversaciones por leer</string> + <string name="minutes_ago">hace %d mins</string> + <string name="unread_conversations">conversaciones no leídas</string> <string name="sending">enviando…</string> - <string name="message_decrypting">Descifrando mensaje. Por favor, espera...</string> + <string name="message_decrypting">Descifrando mensaje. Por favor, espere...</string> <string name="pgp_message">Mensaje cifrado con OpenPGP</string> <string name="nick_in_use">El apodo ya está en uso</string> <string name="admin">Administrador</string> @@ -36,15 +36,15 @@ <string name="moderator">Moderador</string> <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="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="remove_contact_text">¿Quiere eliminar a %s de su lista? La conversación asociada a esta contacto no se eliminará.</string> + <string name="block_contact_text">¿Quiere bloquear a %s para que no pueda enviarle mensajes?</string> + <string name="unblock_contact_text">¿Quiere desbloquear a %s y permitir que le 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 en servidor</string> + <string name="remove_bookmark_text">¿Quiere eliminar %s de sus marcadores? La conversación asociada con este marcador no se eliminará.</string> + <string name="register_account">Registrar nueva cuenta en el servidor</string> + <string name="change_password_on_server">Cambiar contraseña en el servidor</string> <string name="share_with">Compartir con...</string> <string name="start_conversation">Comenzar conversación</string> <string name="invite_contact">Invitar contacto</string> @@ -58,83 +58,97 @@ <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> - <string name="crash_report_message">Si envías informes de fallos ayudas al desarrollo de Conversations\n<b>Aviso:</b> Esto usará tu cuenta XMPP para enviar los registros de error al desarrollador.</string> + <string name="crash_report_title">Conversations se ha caído</string> + <string name="crash_report_message">Si envía informes de fallos ayuda al desarrollo de Conversations\n<b>Advertencia:</b> Esto usará su cuenta XMPP para enviar los registros de error al desarrollador.</string> <string name="send_now">Enviar ahora</string> <string name="send_never">No preguntar de nuevo</string> <string name="problem_connecting_to_account">No se ha podido conectar a la cuenta</string> <string name="problem_connecting_to_accounts">No se ha podido conectar a múltiples cuentas</string> - <string name="touch_to_fix">Pulsa aquí para gestionar tus cuentas</string> - <string name="attach_file">Adjuntar</string> - <string name="not_in_roster">El contacto no está en tu lista. ¿Quieres añadirlo?</string> + <string name="touch_to_fix">Pulse aquí para gestionar sus cuentas</string> + <string name="attach_file">Adjuntar archivo</string> + <string name="not_in_roster">El contacto no está en su lista. ¿Quiere añadirlo?</string> <string name="add_contact">Añadir contacto</string> - <string name="send_failed">Error al enviar</string> + <string name="send_failed">Fallo al enviar</string> <string name="send_rejected">rechazado</string> <string name="preparing_image">Preparando imagen para enviar</string> - <string name="preparing_images">Preparando imágenes para enviar</string> - <string name="sharing_files_please_wait">Compartiendo ficheros. Por favor, espera...</string> + <string name="preparing_images">Preparando imágenes para el envío</string> + <string name="sharing_files_please_wait">Compartiendo ficheros. Por favor, espere...</string> <string name="action_clear_history">Limpiar historial</string> <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="clear_histor_msg">¿Quiere borrar todos los mensajes de esta conversación?\n\n<b>Advertencia:</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">Además, terminar esta conversación</string> - <string name="choose_presence">Selecciona recurso del contacto</string> - <string name="send_unencrypted_message">Enviar mensaje sin cifrar</string> - <string name="send_otr_message">Enviar mensaje cifrado con OTR</string> - <string name="send_omemo_message">Enviar mensaje cifrado con OMEMO </string> - <string name="send_omemo_x509_message">Enviar mensaje cifrado v\\OMEMO</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="also_end_conversation">Terminar esta conversación a continuación</string> + <string name="choose_presence">Seleccione presencia para contactar</string> + <string name="send_unencrypted_message">Enviar mensaje no cifrado</string> + <string name="send_otr_message">Enviar mensaje con cifrado OTR</string> + <string name="send_omemo_message">Enviar mensaje con cifrado OMEMO </string> + <string name="send_omemo_x509_message">Enviar mensaje con cifrado v\\OMEMO</string> + <string name="send_pgp_message">Enviar mensaje con cifrado OpenPGP</string> + <string name="your_nick_has_been_changed">Su apodo se ha modificado</string> <string name="send_unencrypted">Enviar sin cifrar</string> - <string name="decryption_failed">Falló el descifrado. Tal vez no tengas la clave privada apropiada.</string> + <string name="decryption_failed">Falló al descifrar. Tal vez no tenga la clave privada apropiada.</string> <string name="openkeychain_required">OpenKeychain</string> - <string name="openkeychain_required_long">Conversations utiliza una aplicación de terceros llamada <b>OpenKeychain</b> para cifrar y descifrar mensajes y gestionar tus claves públicas.\n\nOpenKeychain está publicado bajo licencia GPLv3 y disponible on F-Droid y Google Play.\n\n<small>(Por favor, reinicie Conversations después.)</small></string> + <string name="openkeychain_required_long">Conversations utiliza una aplicación de terceros llamada <b>OpenKeychain</b> para cifrar y descifrar mensajes, y gestionar sus claves públicas.\n\nOpenKeychain está publicado bajo licencia GPLv3 y disponible en F-Droid y Google Play.\n\n<small>(Por favor, reinicie Conversations a continuación.)</small></string> <string name="restart">Reiniciar</string> <string name="install">Instalar</string> - <string name="openkeychain_not_installed">Por favor, instala OpenKeyChain</string> + <string name="openkeychain_not_installed">Por favor, instale OpenKeychain</string> <string name="offering">ofreciendo…</string> <string name="waiting">esperando…</string> - <string name="no_pgp_key">Clave OpenPGP no encontrada</string> - <string name="contact_has_no_pgp_key">Conversations no ha podido cifrar tus mensajes porque tu 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 cifrar 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="no_pgp_key">No se encontró clave OpenPGP</string> + <string name="contact_has_no_pgp_key">Conversations no ha podido cifrar sus mensajes porque su contacto no está anunciando su clave publica.\n\n<small>Por favor, pida a su contacto que configure OpenPGP.</small></string> + <string name="no_pgp_keys">No se encontraron claves OpenPGP</string> + <string name="contacts_have_no_pgp_keys">Conversations no ha podido cifrar tus mensajes porque sus contactos no están anunciando sus claves publicas.\n\n<small>Por favor, pida a sus contactos que configuren OpenPGP.</small></string> <string name="pref_general">General</string> - <string name="pref_xmpp_resource">Recurso</string> - <string name="pref_xmpp_resource_summary">El nombre que identifica el cliente que estás utilizando</string> + <string name="pref_xmpp_resource">Recurso XMPP</string> + <string name="pref_xmpp_resource_summary">El nombre que identifica el cliente que está utilizando</string> <string name="pref_accept_files">Aceptar archivos</string> - <string name="pref_accept_files_summary">De forma automática aceptar archivos menores que…</string> - <string name="pref_notification_settings">Notificaciones</string> + <string name="pref_accept_files_summary">Aceptar de forma automática archivos menores que…</string> + <string name="pref_accept_files_size">Tamaño</string> + <string name="pref_accept_files_size_summary">Aceptar de forma automática archivos menores que…</string> + <string name="pref_accept_files_download">Sólo Wi-Fi</string> + <string name="pref_accept_files_download_summary">Descargar y aceptar archivos de forma automática sólo al usar Wi-Fi</string> + <string name="pref_accept_files_download_link">Enlaces de imagen</string> + <string name="pref_accept_files_download_link_summary">Descargar enlaces de imagen automáticamente</string> + <string name="pref_notification_settings">Notificación</string> <string name="pref_notifications">Notificaciones</string> - <string name="pref_notifications_summary">Notificar cuando llega un nuevo mensaje</string> + <string name="pref_notifications_summary">Notificar cuando llegue un nuevo mensaje</string> <string name="pref_vibrate">Vibrar</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">Avanzado</string> - <string name="pref_never_send_crash">Nunca informar de errores</string> + <string name="pref_vibrate_summary">Vibrar también cuando llegue un nuevo mensaje</string> + <string name="pref_sound">Sonido</string> + <string name="pref_sound_summary">Reproducir tono con la notificación</string> + <string name="pref_notification_grace_period">Periodo de gracia de las notificaciones</string> + <string name="pref_notification_grace_period_summary">Deshabilita las notificaciones durante un corto periodo de tiempo tras recibir la copia de un mensaje</string> + <string name="pref_advanced_options">Avanzados</string> + <string name="pref_never_send_crash">Nunca enviar informes de error</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> + <string name="pref_confirm_messages_summary">Permitir que mi contacto sepa cuando recibo y leo un mensaje</string> + <string name="pref_confirm_messages_none">Sin confirmación</string> + <string name="pref_confirm_messages_received">Confirmación para mensaje recibido</string> + <string name="pref_confirm_messages_read_and_received">Confirmación para mensaje recibido y leído</string> <string name="pref_ui_options">Pantalla</string> + <string name="pref_parse_emoticons">Interpretar emoticonos</string> + <string name="pref_parse_emoticons_summary">Reemplaza los emoticonos con su representación.</string> <string name="openpgp_error">OpenKeychain reportó un error</string> - <string name="error_decrypting_file">Error descifrando archivo</string> + <string name="error_decrypting_file">Error al descifrar archivo</string> <string name="accept">Aceptar</string> <string name="error">Ha ocurrido un error</string> - <string name="pref_grant_presence_updates">Suscripción de presencia</string> - <string name="pref_grant_presence_updates_summary">De forma automática solicitar y conceder suscripciones de presencia de los contactos que has creado</string> + <string name="pref_grant_presence_updates">Conceder actualizaciones de presencia</string> + <string name="pref_grant_presence_updates_summary">Solicita y concede de forma automática refresco del estado de presencia para los contactos que ha creado</string> <string name="subscriptions">Suscripciones</string> - <string name="your_account">Tu cuenta</string> + <string name="your_account">Su cuenta</string> <string name="keys">Claves</string> <string name="send_presence_updates">Enviar actualizaciones de presencia</string> <string name="receive_presence_updates">Recibir actualizaciones de presencia</string> <string name="ask_for_presence_updates">Solicitar actualizaciones de presencia</string> - <string name="attach_choose_picture">Seleccionar imagen</string> + <string name="attach_choose_picture">Seleccione imagen</string> <string name="attach_take_picture">Hacer foto</string> - <string name="preemptively_grant">De forma automática conceder suscripción de presencia</string> + <string name="preemptively_grant">Conceder de forma automática las peticiones de la suscripción de presencia</string> <string name="error_not_an_image_file">El archivo seleccionado no es una imagen</string> - <string name="error_compressing_image">Error comprimiendo el archivo de imagen</string> + <string name="error_compressing_image">Error al comprimir el archivo de imagen</string> <string name="error_file_not_found">Archivo no encontrado</string> - <string name="error_io_exception">Error general. ¿Es posible que no tengas espacio en disco?</string> - <string name="error_security_exception_during_image_copy">La aplicación que usas para seleccionar esta imagen no proporciona suficientes permisos para leer el archivo.\n\n<small>Utiliza un explorador de archivos diferente para seleccionar la imagen</small></string> + <string name="error_io_exception">Error general. ¿Agotó quizá el espacio de almacenamiento?</string> + <string name="error_security_exception_during_image_copy">La aplicación que usó para seleccionar esta imagen no proporciona suficientes permisos para leer el archivo.\n\n<small>Use un explorador de archivos distinto para seleccionar la imagen</small></string> <string name="account_status_unknown">Desconocido</string> <string name="account_status_disabled">Deshabilitado temporalmente</string> <string name="account_status_online">Conectado</string> @@ -143,87 +157,87 @@ <string name="account_status_unauthorized">No autorizado</string> <string name="account_status_not_found">Servidor no encontrado</string> <string name="account_status_no_internet">Sin conectividad</string> - <string name="account_status_regis_fail">Error en el registro</string> + <string name="account_status_regis_fail">Error al registrarse</string> <string name="account_status_regis_conflict">El identificador ya está en uso</string> <string name="account_status_regis_success">Registro completado</string> - <string name="account_status_regis_not_sup">El servidor no soporta registros</string> + <string name="account_status_regis_not_sup">El servidor no admite registros</string> <string name="account_status_security_error">Error de seguridad</string> <string name="account_status_incompatible_server">Servidor incompatible</string> - <string name="encryption_choice_unencrypted">Sin cifrado</string> + <string name="encryption_choice_unencrypted">No cifrado</string> <string name="encryption_choice_otr">OTR</string> <string name="encryption_choice_pgp">OpenPGP</string> <string name="encryption_choice_omemo">OMEMO</string> <string name="mgmt_account_edit">Editar cuenta</string> <string name="mgmt_account_delete">Eliminar cuenta</string> <string name="mgmt_account_disable">Deshabilitar temporalmente</string> - <string name="mgmt_account_publish_avatar">Imagen de perfil</string> + <string name="mgmt_account_publish_avatar">Publicar avatar</string> <string name="mgmt_account_publish_pgp">Publicar clave pública OpenPGP</string> - <string name="mgmt_account_enable">Habilitar</string> - <string name="mgmt_account_are_you_sure">¿Estás seguro?</string> - <string name="mgmt_account_delete_confirm_text">Si eliminas tu cuenta tu historial completo de conversaciones se perderá</string> + <string name="mgmt_account_enable">Habilitar cuenta</string> + <string name="mgmt_account_are_you_sure">¿Está seguro?</string> + <string name="mgmt_account_delete_confirm_text">Si elimina su cuenta su historial completo de conversaciones se perderá</string> <string name="attach_record_voice">Grabar audio</string> <string name="account_settings_jabber_id">Identificador Jabber</string> <string name="account_settings_password">Contraseña</string> <string name="account_settings_example_jabber_id">usuario@ejemplo.com</string> <string name="account_settings_confirm_password">Confirmar contraseña</string> <string name="password">Contraseña</string> - <string name="confirm_password">Confirmar contraseña</string> + <string name="confirm_password">Confirme la contraseña</string> <string name="passwords_do_not_match">Las contraseñas no coinciden</string> - <string name="invalid_jid">El identificador no es un identificador Jabber válido</string> + <string name="invalid_jid">Este no es un identificador Jabber válido</string> <string name="error_out_of_memory">Sin memoria. La imagen es demasiado grande</string> - <string name="add_phone_book_text">¿Quieres añadir a %s a tus contactos?</string> - <string name="contact_status_online">Disponible</string> - <string name="contact_status_free_to_chat">Hablador</string> + <string name="add_phone_book_text">¿Quiere añadir a %s a sus contactos?</string> + <string name="contact_status_online">Conectado</string> + <string name="contact_status_free_to_chat">Disponible</string> <string name="contact_status_away">Ausente</string> - <string name="contact_status_extended_away">Ausencia extendida</string> + <string name="contact_status_extended_away">Ausente de forma prolongada</string> <string name="contact_status_do_not_disturb">No molestar</string> <string name="contact_status_offline">Desconectado</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="muc_details_conference">Reunión</string> + <string name="muc_details_other_members">Otros miembros</string> + <string name="server_info_show_more">Información del 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 / OMEMO)</string> - <string name="server_info_http_upload">XEP-0363: HTTP File Upload</string> - <string name="server_info_push">XEP-0357: Push</string> - <string name="server_info_available">Sí</string> - <string name="server_info_unavailable">No</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> - <string name="last_seen_mins">Visto última vez hace %d minutos</string> - <string name="last_seen_hour">Visto última vez hace 1 hora</string> - <string name="last_seen_hours">Visto última vez hace %d horas</string> - <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="server_info_carbon_messages">XEP-0280: Copias del mensaje</string> + <string name="server_info_csi">XEP-0352: Indicación de estado del cliente</string> + <string name="server_info_blocking">XEP-0191: Comando de bloqueo</string> + <string name="server_info_roster_version">XEP-0237: Versionado de listas de contactos</string> + <string name="server_info_stream_management">XEP-0198: Gestión de flujos de datos</string> + <string name="server_info_pep">XEP-0163: PEP (Avatares / OMEMO)</string> + <string name="server_info_http_upload">XEP-0363: Subida de archivo por HTTP</string> + <string name="server_info_push">XEP-0357: Actualización dinámica (push)</string> + <string name="server_info_available">Disponible</string> + <string name="server_info_unavailable">No disponible</string> + <string name="missing_public_keys">Anuncios de ausencia de clave pública</string> + <string name="last_seen_now">Visto por última vez hace un momento</string> + <string name="last_seen_min">Visto por última vez hace 1 minuto</string> + <string name="last_seen_mins">Visto por última vez hace %d minutos</string> + <string name="last_seen_hour">Visto por última vez hace 1 hora</string> + <string name="last_seen_hours">Visto por última vez hace %d horas</string> + <string name="last_seen_day">Visto por última vez hace 1 día</string> + <string name="last_seen_days">Visto por última vez hace %d días</string> <string name="never_seen">Nunca visto</string> - <string name="install_openkeychain">Mensaje cifrado. Por favor instala OpenKeychain para descifrar.</string> - <string name="unknown_otr_fingerprint">Huella digital OTR desconocida</string> + <string name="install_openkeychain">Mensaje cifrado. Por favor, instale OpenKeychain para descifrarlo.</string> + <string name="unknown_otr_fingerprint">Huella de validación de clave OTR, desconocida</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="omemo_fingerprint">Huella digital OMEMO</string> - <string name="omemo_fingerprint_x509">Huella digital v\\OMEMO</string> - <string name="omemo_fingerprint_selected_message">Huella digital OMEMO del mensaje</string> - <string name="omemo_fingerprint_x509_selected_message">huella digital v\\OMEMO del mensaje</string> - <string name="this_device_omemo_fingerprint">Tu huella digital OMEMO</string> + <string name="your_fingerprint">Su huella de validación de clave (fingerprint)</string> + <string name="otr_fingerprint">Huella de valicación de clave OTR</string> + <string name="omemo_fingerprint">Huella de validación de clave OMEMO</string> + <string name="omemo_fingerprint_x509">Huella de validación de clave v\\OMEMO</string> + <string name="omemo_fingerprint_selected_message">Huella de validación de clave OMEMO del mensaje</string> + <string name="omemo_fingerprint_x509_selected_message">Huella de validación de clave v\\OMEMO del mensaje</string> + <string name="this_device_omemo_fingerprint">Su huella de validación de clave OMEMO</string> <string name="other_devices">Otros dispositivos</string> - <string name="trust_omemo_fingerprints">Huellas digitales OMEMO de confianza</string> + <string name="trust_omemo_fingerprints">Confiar en huellas de validación de clave OMEMO</string> <string name="fetching_keys">Buscando claves...</string> <string name="done">Hecho</string> <string name="verify">Verificar</string> <string name="decrypt">Descifrar</string> - <string name="conferences">Conversación Grupo</string> + <string name="conferences">Reuniones</string> <string name="search">Buscar</string> - <string name="create_contact">Crear Contacto</string> + <string name="create_contact">Crear contacto</string> <string name="enter_contact">Introducir contacto</string> - <string name="join_conference">Unirse a Conversación en grupo</string> - <string name="delete_contact">Eliminar Contacto</string> + <string name="join_conference">Unirse a la reunión</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> @@ -231,104 +245,104 @@ <string name="select">Seleccionar</string> <string name="contact_already_exists">El contacto ya existe</string> <string name="join">Unirse</string> - <string name="conference_address">Dirección</string> - <string name="conference_address_example">nombre@salas.ejemplo.com</string> + <string name="conference_address">Dirección de la reunión</string> + <string name="conference_address_example">sala@reunion.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 existe</string> - <string name="you">Tú</string> - <string name="action_edit_subject">Editar asunto de la conversación</string> - <string name="joining_conference">Uniéndose a conversación...</string> + <string name="you">Usted</string> + <string name="action_edit_subject">Editar asunto de la reunión</string> + <string name="joining_conference">Uniéndose a la reunión...</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="contact_added_you">El contacto le ha añadido a su lista de contactos</string> <string name="add_back">Añadir contacto</string> <string name="contact_has_read_up_to_this_point">%s ha leído hasta aquí</string> <string name="publish">Publicar</string> - <string name="touch_to_choose_picture">Pulsa para seleccionar una imagen de la galería</string> - <string name="publish_avatar_explanation">Nota: Todos tus contactos podrán ver esta imagen.</string> + <string name="touch_to_choose_picture">Pulse para seleccionar una imagen de la galería</string> + <string name="publish_avatar_explanation">Por favor, recuerde: Todos los suscritos a sus actualizaciones de presencia podrán ver esta imagen.</string> <string name="publishing">Publicando…</string> - <string name="error_publish_avatar_server_reject">El servidor rechazó la publicación</string> + <string name="error_publish_avatar_server_reject">El servidor rechazó publicar su avatar</string> <string name="error_publish_avatar_converting">Se ha producido un error mientras se convertía la imagen</string> - <string name="error_saving_avatar">No se ha podido guardar la imagen de perfil en disco</string> - <string name="or_long_press_for_default">(O pulsación prolongada para volver a tu imagen de la agenda)</string> - <string name="error_publish_avatar_no_server_support">Tu servidor no soporta la publicación de imágenes de perfil</string> + <string name="error_saving_avatar">No se pudo guardar el avatar en el disco</string> + <string name="or_long_press_for_default">(O mantenga pulsado para volver al avatar predeterminado)</string> + <string name="error_publish_avatar_no_server_support">Su servidor no soporta la publicación de avatares</string> <string name="private_message">en privado</string> - <string name="private_message_to">en privado para %s</string> + <string name="private_message_to">para %s</string> <string name="send_private_message_to">Enviar mensaje privado a %s</string> <string name="connect">Conectar</string> <string name="account_already_exists">Esta cuenta ya existe</string> <string name="next">Siguiente</string> - <string name="server_info_session_established">Inicio sesión actual</string> + <string name="server_info_session_established">Sesión actual establecida</string> <string name="additional_information">Información adicional</string> <string name="skip">Omitir</string> <string name="disable_notifications">Deshabilitar notificaciones</string> <string name="disable_notifications_for_this_conversation">Deshabilitar notificaciones para esta conversación</string> <string name="enable">Habilitar</string> - <string name="conference_requires_password">Esta conversación 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="conference_requires_password">Esta reunión requiere contraseña</string> + <string name="enter_password">Introduzca la contraseña</string> + <string name="missing_presence_updates">Suscripción de actualizaciones de presencia del contacto, ausente</string> + <string name="request_presence_updates">Por favor, solicite primero las actualizaciones de presencia de su contacto.\n\n<small>Esto se usará para determinar qué cliente(s) está usando su 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 de que quieres eliminar esta huella digital OTR?</string> + <string name="delete_fingerprint">Eliminar huella de validación de clave</string> + <string name="sure_delete_fingerprint">¿Está seguro de que quiere eliminar esta huella de validación de clave?</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="without_mutual_presence_updates"><b>Advertencia:</b> Enviar esto sin actualizaciones de presencia mutuas podría causar problemas inesperados.\n\n<small>Vayan ambos a los detalles de contacto para verificar sus suscripciones de presencia recíprocas.</small></string> <string name="pref_security_settings">Seguridad</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_allow_message_correction">Corrección de mensaje</string> - <string name="pref_allow_message_correction_summary">Permitir a tus contactos editar mensajes previamente enviados</string> + <string name="pref_force_encryption">Forzar cifrado de extremo-a-extremo</string> + <string name="pref_force_encryption_summary">Enviar siempre mensajes cifrados (excepto para reuniones)</string> + <string name="pref_allow_message_correction">Permitir corrección del mensaje</string> + <string name="pref_allow_message_correction_summary">Permitir que sus contactos editen los mensajes que enviaron previamente</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_dont_save_encrypted_summary">Advertencia: Esto podría llevar a la pérdida de mensajes</string> <string name="pref_expert_options">Opciones para expertos</string> - <string name="pref_expert_options_summary">Por favor, cuidado con estas opciones</string> + <string name="pref_expert_options_summary">Por favor, tenga 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="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_quiet_hours_start_time">Hora de iniciación</string> + <string name="title_pref_quiet_hours_end_time">Hora de final</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_use_larger_font">Tamaño grade de fuente</string> + <string name="pref_use_larger_font_summary">Usa fuentes grandes en toda la aplicación</string> + <string name="pref_use_send_button_to_indicate_status">El botón Enviar indica el estado</string> + <string name="pref_use_indicate_received">Solicitar acuse de recibo del mensaje</string> + <string name="pref_use_indicate_received_summary">Cuando el contacto reciba el mensaje se indicará con una marca verde, si el contacto permite acuses de recibo.</string> + <string name="pref_use_send_button_to_indicate_status_summary">Colorear botón Enviar para indicar el estado del contacto</string> <string name="pref_expert_options_other">Otros</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="pref_autojoin">Unirse a conversaciones en grupo automáticamente</string> - <string name="pref_autojoin_summary">Respetar la opción de unirse automáticamente de los marcadores de las conversaciones en grupo</string> - <string name="toast_message_otr_fingerprint">¡Huella digital OTR copiada al portapapeles!</string> - <string name="toast_message_omemo_fingerprint">¡Huella digital OMEMO copiada al portapapeles!</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="conference_shutdown">La conversación ha sido cerrada</string> - <string name="conference_unknown_error">Ya no estás dentro de esta conversación</string> - <string name="using_account">Usando cuenta %s</string> - <string name="checking_x">Comprobando %s en servidor HTTP</string> - <string name="not_connected_try_again">No estás conectado. Inténtalo más tarde</string> + <string name="pref_conference_name">Nombre de la reunión</string> + <string name="pref_conference_name_summary">Usa el tema de la sala en lugar del identificador Jabber (JID) como nombre para las reuniones</string> + <string name="pref_autojoin">Unirse automáticamente a las reuniones</string> + <string name="pref_autojoin_summary">Respeta la indicador de unión automática en los marcadores reuniones</string> + <string name="toast_message_otr_fingerprint">¡Huella de validación de clave OTR copiada al portapapeles!</string> + <string name="toast_message_omemo_fingerprint">¡Huella de validación de clave OMEMO copiada al portapapeles!</string> + <string name="conference_banned">Ha sido excluido de esta reunión</string> + <string name="conference_members_only">Esta reunión es sólo para miembros</string> + <string name="conference_kicked">Ha sido expulsado de esta reunión</string> + <string name="conference_shutdown">La reunión ha sido cerrada</string> + <string name="conference_unknown_error">Ya no está dentro de esta reunión</string> + <string name="using_account">usando cuenta %s</string> + <string name="checking_x">Comprobando %s en el servidor HTTP</string> + <string name="not_connected_try_again">No está conectado. Inténtelo más tarde</string> <string name="check_x_filesize">Comprobar tamaño de %s</string> <string name="check_x_filesize_on_host">Comprobar tamaño de %1$s en %2$s</string> <string name="message_options">Opciones de mensaje</string> <string name="copy_text">Copiar texto</string> <string name="copy_original_url">Copiar URL original</string> <string name="send_again">Volver a enviar</string> - <string name="file_url">URL de archivo</string> + <string name="file_url">URL del archivo</string> <string name="message_text">Mensaje de texto</string> <string name="url_copied_to_clipboard">URL copiada al portapapeles</string> <string name="message_copied_to_clipboard">Mensaje copiado al portapapeles</string> - <string name="image_transmission_failed">Falló la transferencia de la imagen</string> + <string name="image_transmission_failed">No se pudo transmitir 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> + <string name="remote_fingerprint">Huella de validación de clave remota</string> <string name="scan">escanear</string> - <string name="smp">Protocolo del Socialista Millonario</string> + <string name="smp">Protocolo del Socialista Millonario (SMP)</string> <string name="shared_secret_hint">Sugerencia o pregunta</string> <string name="shared_secret_secret">Secreto compartido</string> <string name="confirm">Confirmar</string> @@ -343,64 +357,65 @@ <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="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="pref_export_logs">Exportar logs</string> - <string name="pref_export_logs_summary">Escribir logs en la tarjeta SD</string> + <string name="pref_keep_foreground_service_summary">Mantener el servicio en primer plano evita que el sistema cierre la conexión</string> + <string name="pref_export_logs">Exportar registros (logs)</string> + <string name="pref_export_logs_summary">Escribir registros (logs) en la tarjeta SD</string> <string name="notification_export_logs_title">Escribiendo logs en la tarjeta SD</string> <string name="choose_file">Seleccionar archivo</string> <string name="receiving_x_file">Recibiendo %1$s (%2$d%% completado)</string> <string name="download_x_file">Descargar %s</string> - <string name="delete_x_file">Eliminar %s</string> + <string name="delete_x_file">Borrar %s</string> <string name="file">archivo</string> <string name="open_x_file">Abrir %s</string> - <string name="sending_file">Enviando (%1$d%% completado)</string> - <string name="preparing_file">Preparando transferencia de archivo</string> + <string name="sending_file">enviando (%1$d%% completado)</string> + <string name="preparing_file">Preparando archivo para transferencia</string> <string name="x_file_offered_for_download">%s ofrecido para descarga</string> <string name="cancel_transmission">Cancelar transferencia</string> - <string name="file_transmission_failed">falló la transferencia del archivo</string> + <string name="file_transmission_failed">no se pudo transferir el archivo</string> <string name="file_deleted">El archivo ha sido eliminado</string> <string name="no_application_found_to_open_file">No se ha encontrado ninguna aplicación para abrir el archivo</string> - <string name="could_not_verify_fingerprint">No se puede verificar el contacto</string> + <string name="could_not_verify_fingerprint">No se pudo verificar la huella del contacto</string> <string name="manually_verify">Verificar manualmente</string> - <string name="are_you_sure_verify_fingerprint">¿Estás seguro de que quieres verificar el contacto?</string> - <string name="pref_show_dynamic_tags">Mostrar etiquetas</string> - <string name="pref_show_dynamic_tags_summary">Mostrar información en forma de etiquetas debajo de los contactos</string> + <string name="are_you_sure_verify_fingerprint">¿Seguro que quiere verificar la huella validación de la clave OTR del contacto?</string> + <string name="pref_show_dynamic_tags">Mostrar etiquetas dinámicas</string> + <string name="pref_show_dynamic_tags_summary">Muestra información en etiquetas de sólo-lectura bajo los contactos</string> <string name="enable_notifications">Habilitar notificaciones</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</string> - <string name="conference_creation_failed">¡La creación de la conversación ha fallado!</string> - <string name="conference_created">¡Conversación en grupo creada!</string> + <string name="conference_with">Crear reunión con...</string> + <string name="no_conference_server_found">No se encontró servidor de reunión</string> + <string name="conference_creation_failed">¡No se pudo crear la reunión!</string> + <string name="conference_created">¡Se ha creado una reunión!</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="copy_omemo_clipboard_description">Copiar huella digital OMEMO al portapapeles</string> - <string name="regenerate_omemo_key">Regenerar clave OMEMO</string> - <string name="wipe_omemo_pep">Limpiar otros dispositivos de PEP</string> + <string name="account_image_description">Avatar de la cuenta</string> + <string name="copy_otr_clipboard_description">Copiar huella de validación de clave OTR al portapapeles</string> + <string name="copy_omemo_clipboard_description">Copiar huella de validación de clave OMEMO al portapapeles</string> + <string name="regenerate_omemo_key">Volver a generar clave OMEMO</string> + <string name="wipe_omemo_pep">Limpiar otros dispositivos por PEP</string> <string name="clear_other_devices">Limpiar dispositivos</string> - <string name="clear_other_devices_desc">¿Estás seguro de que quieres limpiar todos los otros dispositivos del anuncio OMEMO? La próxima vez que tus dispositivos conecten, tendrán que volver a anunciarse, pero estos podrían no recibir los mensajes enviados durante el proceso.</string> + <string name="clear_other_devices_desc">¿Está seguro de que quiere limpiar todos los demás dispositivos anunciados por OMEMO? La próxima vez que sus dispositivos conecten, tendrán que volver a anunciarse, pero estos podrían no recibir los mensajes enviados entre tanto.</string> <string name="purge_key">Eliminar clave</string> <string name="purge_key_desc_part1">¿Estás seguro de que quieres eliminar esta clave?</string> - <string name="purge_key_desc_part2">Esto será irreversible y nunca podrás iniciar sesión con esta clave de nuevo.</string> - <string name="error_no_keys_to_trust_server_error">No hay claves usables disponibles para este contacto. La búsqueda de nuevas claves al servidor ha fallado. Puede que exista un problema con el servidor de tus contactos.</string> - <string name="error_no_keys_to_trust">No hay claves usables disponibles para este contacto. Si has eliminado alguna de sus claves, tus contactos necesitarán generar nuevas claves.</string> + <string name="purge_key_desc_part2">Se la considerará comprometida de forma irreversible y nunca podrá establecer una sesión con esta clave de nuevo.</string> + <string name="error_no_keys_to_trust_server_error">No hay claves usables disponibles para este contacto. La descarga de nuevas claves desde el servidor ha fallado. Puede que haya algún problema con su servidor de contactos.</string> + <string name="error_no_keys_to_trust">No hay claves usables disponibles para este contacto. Si ha eliminado alguna de sus claves, necesitará generar nuevas claves.</string> <string name="error_trustkeys_title">Error</string> - <string name="fetching_history_from_server">Buscando historial en el servidor</string> + <string name="fetching_history_from_server">Descargando historial desde el servidor</string> <string name="no_more_history_on_server">No hay más historial en el 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> - <string name="otr_session_not_started">Enviar mensaje para empezar una conversación cifrada</string> - <string name="ask_question">Haz una pregunta</string> - <string name="smp_explain_question">Si tu contacto y tú tenéis un secreto en común que nadie más sabe (como una broma o simplemente lo que tomasteis para comer la última vez que os visteis) podéis usar ese secreto para verificar la huella digital de cada uno.\n\nPuedes usar una sugerencia o pregunta para hacer a tu contacto que deberá responder distinguiendo mayúsculas y minúsculas.</string> - <string name="smp_explain_answer">Tu contacto quiere verificar tu huella digital a través de un secreto compartido. Te hace la siguiente sugerencia o pregunta para ese secreto.</string> - <string name="shared_secret_hint_should_not_be_empty">La pregunta no puede ser vacía</string> - <string name="shared_secret_can_not_be_empty">El secreto compartido no puede ser vacío</string> - <string name="manual_verification_explanation">Compara detenidamente la huella digital mostrada abajo con la de tu contacto.\nPuedes usar cualquier forma de comunicación segura como un correo electrónico cifrado o conversación telefónica para verificarlo.</string> + <string name="password_changed">¡Se ha cambiado la contraseña!</string> + <string name="could_not_change_password">No se pudo cambiar la contraseña</string> + <string name="otr_session_not_started">Enviar un mensaje para comenzar una conversación cifrada</string> + <string name="ask_question">Formule una pregunta</string> + <string name="smp_explain_question">Si usted y su contacto tienen un secreto en común que nadie más conoce (como una broma entre ambos, o simplemente lo que tomaron para comer la última vez que se encontraron) pueden usar ese secreto para verificar las huellas de validación de claves (fingerprints) entre si.\n\nPuede proporcionar una sugerencia o una pregunta a realizar a su contacto, que este deberá responder distinguiendo mayúsculas y minúsculas.</string> + <string name="smp_explain_answer">Su contacto desea verificar su huella de validación de clave (fingerprint) mediante su secreto compartido. Le plantea la siguiente sugerencia o pregunta respecto a ese secreto.</string> + <string name="shared_secret_hint_should_not_be_empty">Su sugerencia o pregunta no puede estar vacía</string> + <string name="shared_secret_can_not_be_empty">El secreto compartido no puede estar vacío</string> + <string name="manual_verification_explanation">Compare detenidamente la huella de validación de clave (fingerprint) mostrada debajo con la de su contacto.\nPara intercambiarlas puede usar cualquier forma de comunicación que le ofrezca seguridad suficiente, como un correo electrónico cifrado o acaso una llamada telefónica, </string> <string name="change_password">Cambiar contraseña</string> <string name="current_password">Contraseña actual</string> <string name="new_password">Nueva contraseña</string> - <string name="password_should_not_be_empty">La contraseña no puede ser vacía</string> + <string name="password_should_not_be_empty">La contraseña no puede estar vacía</string> + <string name="password_should_not_contain_only_spaces">La contraseña no puede contener sólo espacios</string> <string name="enable_all_accounts">Habilitar todas las cuentas</string> <string name="disable_all_accounts">Deshabilitar todas las cuentas</string> <string name="perform_action_with">Realizar acción con</string> @@ -413,21 +428,21 @@ <string name="remove_membership">Revocar membresía</string> <string name="grant_admin_privileges">Conceder privilegios de administrador</string> <string name="remove_admin_privileges">Revocar privilegios de administrador</string> - <string name="remove_from_room">Expulsar de la conversación</string> - <string name="could_not_change_affiliation">No se puede cambiar la afiliación de %s</string> - <string name="ban_from_conference">Prohibir entrada en la conversación</string> - <string name="removing_from_public_conference">Estás intentando expulsar a %s de una conversación de acceso público. La única forma de hacer esto es prohibir su entrada para siempre.</string> - <string name="ban_now">Prohibir ahora</string> - <string name="could_not_change_role">No se puede cambiar el rol de %s</string> - <string name="public_conference">Conversación de acceso público</string> - <string name="private_conference">Conversación privada solo para miembros</string> - <string name="conference_options">Opciones de conversación</string> - <string name="members_only">Privada, solo miembros</string> + <string name="remove_from_room">Expulsar de la reunión</string> + <string name="could_not_change_affiliation">No se pudo cambiar la afiliación de %s</string> + <string name="ban_from_conference">Excluir de la reunión</string> + <string name="removing_from_public_conference">Está intentando expulsar a %s de una reunión de acceso público. La única forma de hacer esto es excluir a ese usuario para siempre.</string> + <string name="ban_now">Excluir ahora</string> + <string name="could_not_change_role">No se pudo cambiar el rol de %s</string> + <string name="public_conference">Reunión de acceso público</string> + <string name="private_conference">Reunión privada, sólo para miembros</string> + <string name="conference_options">Opciones de reunión</string> + <string name="members_only">Privada, sólo miembros</string> <string name="non_anonymous">No anónima</string> <string name="moderated">Moderada</string> - <string name="you_are_not_participating">No estás participando</string> - <string name="modified_conference_options">¡Modificadas las opciones de la conversación!</string> - <string name="could_not_modify_conference_options">No se pueden modificar las opciones de la conversación</string> + <string name="you_are_not_participating">No está participando</string> + <string name="modified_conference_options">¡Se han modificado las opciones de reunión!</string> + <string name="could_not_modify_conference_options">No se pudieron modificar las opciones de reunión</string> <string name="never">Nunca</string> <string name="thirty_minutes">30 minutos</string> <string name="one_hour">1 hora</string> @@ -436,39 +451,39 @@ <string name="until_further_notice">Hasta nuevo aviso</string> <string name="pref_input_options">Entrada</string> <string name="pref_enter_is_send">Intro para enviar</string> - <string name="pref_enter_is_send_summary">Usar la tecla intro para enviar el mensaje</string> - <string name="pref_display_enter_key">Mostrar tecla Intro</string> + <string name="pref_enter_is_send_summary">Usar la tecla Intro para enviar el mensaje</string> + <string name="pref_display_enter_key">Mostrar la tecla Intro</string> <string name="pref_display_enter_key_summary">Cambiar la tecla de emoticonos por la tecla Intro</string> <string name="audio">audio</string> <string name="video">vídeo</string> <string name="image">imagen</string> <string name="pdf_document">documento PDF</string> - <string name="apk">Android App</string> + <string name="apk">Aplicación Android</string> <string name="vcard">Contacto</string> <string name="received_x_file">Recibido %s</string> <string name="disable_foreground_service">Deshabilitar servicio en primer plano</string> - <string name="touch_to_open_conversations">Pulsa para abrir Conversations</string> - <string name="avatar_has_been_published">¡La imagen de perfil ha sido publicada!</string> + <string name="touch_to_open_conversations">Pulse para abrir Conversations</string> + <string name="avatar_has_been_published">¡Se ha publicado el avatar!</string> <string name="sending_x_file">Enviando %s</string> <string name="offering_x_file">Ofreciendo %s</string> <string name="hide_offline">Ocultar desconectados</string> - <string name="disable_account">Deshabilitar Cuenta</string> + <string name="disable_account">Deshabilitar cuenta</string> <string name="contact_is_typing">%s está escribiendo...</string> <string name="contact_has_stopped_typing">%s ha dejado de escribir</string> - <string name="pref_chat_states">Notificación de escritura</string> - <string name="pref_chat_states_summary">Permitir a tus contactos saber cuando estás escribiendo un nuevo mensaje</string> + <string name="pref_chat_states">Notificaciones de escritura</string> + <string name="pref_chat_states_summary">Permite que su contacto sepa cuando se encuentra escribiendo un nuevo mensaje</string> <string name="send_location">Enviar ubicación</string> <string name="show_location">Mostrar ubicación</string> <string name="no_application_found_to_display_location">No se ha encontrado ninguna aplicación para mostrar la ubicación</string> <string name="location">Ubicación</string> <string name="received_location">Ubicación recibida</string> <string name="title_undo_swipe_out_conversation">Conversación cerrada</string> - <string name="title_undo_swipe_out_muc">Has salido de la conversación</string> - <string name="pref_dont_trust_system_cas_title">No confiar en los CAs del sistema</string> - <string name="pref_dont_trust_system_cas_summary">Todos los certificados deben ser aprobados manualmente</string> + <string name="title_undo_swipe_out_muc">Ha dejado la reunión</string> + <string name="pref_dont_trust_system_cas_title">No confiar en las autoridades de certificación (CAs) del sistema</string> + <string name="pref_dont_trust_system_cas_summary">Todos los certificados se tienen que aprobar manualmente</string> <string name="pref_remove_trusted_certificates_title">Eliminar certificados</string> <string name="pref_remove_trusted_certificates_summary">Eliminar manualmente certificados aceptados</string> - <string name="toast_no_trusted_certs">No aceptar certificados manualmente</string> + <string name="toast_no_trusted_certs">No aceptar certificados aprobados manualmente</string> <string name="dialog_manage_certs_title">Eliminar certificados</string> <string name="dialog_manage_certs_positivebutton">Eliminar seleccionados</string> <string name="dialog_manage_certs_negativebutton">Cancelar</string> @@ -477,85 +492,129 @@ <item quantity="other">%d certificados eliminados</item> </plurals> <plurals name="select_contact"> - <item quantity="one">Seleccionado %d contacto</item> - <item quantity="other">Seleccionados %d contactos</item> + <item quantity="one">%d contacto seleccionado</item> + <item quantity="other">%d contactos seleccionados</item> </plurals> - <string name="pref_quick_action_summary">Cambiar el botón de enviar por botón de acción rápida</string> + <string name="pref_quick_action_summary">Reemplaza el botón de envío con una acción rápida</string> <string name="pref_quick_action">Acción rápida</string> <string name="none">Ninguna</string> <string name="recently_used">Usada más recientemente</string> <string name="choose_quick_action">Elegir acción rápida</string> <string name="search_for_contacts_or_groups">Buscar contactos o grupos</string> + <string name="pref_led_notification_color">Color del LED de notificación</string> + <string name="pref_led_notification_color_summary">Cambiar el color del LED de notificación</string> + <string name="msg_ctx_mnu_details">Detalles del mensaje</string> + <string name="dlg_msg_details_title">Detalles del mensaje</string> + <string name="cplus_ok">OK</string> + <string name="dlg_resources_title">%1$s (%2$d)</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_receipient_resource">Recurso XMPP del destinatario:</string> + <string name="dlg_msg_details_receipient_nick">Apodo (nick) del destinatario:</string> + <string name="dlg_msg_details_sender_resource">Recurso XMPP del remitente:</string> + <string name="dlg_msg_details_sender_nick">Apodo (nick) del remitente:</string> + <string name="dlg_msg_details_time_sent">Hora de envío:</string> + <string name="dlg_msg_details_msg_type">Tipo de mensaje:</string> + <string name="dlg_msg_details_msg_status">Estado del mensaje:</string> + <string name="dlg_msg_details_file_details">Detalles del archivo</string> + <string name="dlg_msg_details_file_mime">Tipo MIME:</string> + <string name="dlg_msg_details_file_size">Tamaño</string> + <string name="dlg_msg_details_msg_type_text">Texto</string> + <string name="dlg_msg_details_msg_type_image">Imagen</string> + <string name="dlg_msg_details_msg_type_file">Archivo</string> + <string name="dlg_msg_details_msg_type_status">Estado</string> + <string name="dlg_msg_details_msg_type_private">Privado</string> + <string name="dlg_msg_details_msg_status_sent">Enviado</string> + <string name="dlg_msg_details_msg_status_received">Recibido</string> + <string name="dlg_msg_details_msg_status_waiting">En espera</string> + <string name="dlg_msg_details_msg_status_unsend">No enviado</string> + <string name="dlg_msg_details_msg_status_offered">Ofrecido</string> + <string name="dlg_msg_details_msg_status_failed">Fallido</string> + <string name="pref_resize_picture_ask">pedir</string> + <string name="pref_resize_picture_always">siempre</string> + <string name="pref_resize_picture_never">nunca</string> + <string name="pref_resize_picture_summary">Establece si las imágenes se redimensionarán o no</string> + <string name="pref_resize_picture">Redimensionar imágenes</string> + <string name="cplus_yes">Sí</string> + <string name="cplus_no">No</string> + <string name="cplus_remember_userdecision">Recordar esta decisión</string> + <string name="userdecision_question_resize_picture">¿Se redimensionará la imagen?</string> + <string name="title_activity_loginformation">Registrar salida</string> + <string name="cplus_copy_to_clipboard">Copiar al portapapeles</string> + <string name="cplus_copied_to_clipboard">Copiado al portapapeles</string> + <string name="pref_show_logcat_title">Mostrar salida de logcat</string> + <string name="pref_show_logcat_summary">Muestra la salida del comando logcat. Esto es útil para depuración.</string> + <string name="cplus_bugreport_jabberid">c+bugs@conference.thedevstack.de</string> + <string name="pref_file_transfer">Carpeta para guardar archivos entrantes</string> + <string name="pref_file_transfer_folder_summary">Este es el subdirectorio para ficheros entrantes.</string> + <string name="pref_img_file_transfer">Carpeta para guardar imágenes entrantes</string> + <string name="pref_img_file_transfer_summary">Este es el subdirectorio en el directorio de imágenes para ficheros entrantes.</string> + <string name="pref_file_transfer_category">Transferencia de archivo</string> + <string name="cplus_not_copied_to_clipboard_empty">Nada que copiar.</string> + <string name="cplus_me">Yo</string> <string name="send_private_message">Enviar mensaje privado</string> - <string name="user_has_left_conference">¡%s ha dejado la conversación!</string> + <string name="user_has_left_conference">¡%s ha dejado la reunión!</string> <string name="username">Usuario</string> - <string name="username_hint">Usuario</string> - <string name="invalid_username">Esto no es un usuario válido</string> - <string name="conference_name">Nombre de la conversación</string> - <string name="invalid_conference_name">Nombre de conversación no válido</string> + <string name="username_hint">Nombre de usuario</string> + <string name="invalid_username">Este no es un nombre de usuario válido</string> + <string name="conference_name">Nombre de la reunión</string> + <string name="invalid_conference_name">Este no es un nombre de reunión válido</string> <string name="download_failed_server_not_found">Error al descargar: Servidor no encontrado</string> <string name="download_failed_file_not_found">Error al descargar: Archivo no encontrado</string> <string name="download_failed_could_not_connect">Error al descargar: No se ha podido conectar con el servidor</string> - <string name="pref_use_white_background">Usar fondo blanco</string> - <string name="pref_use_white_background_summary">Mostrar mensajes recibidos en texto negro con fondo blanco</string> - <string name="account_status_tor_unavailable">Red Tor no disponible.</string> + <string name="account_status_tor_unavailable">Red Tor no disponible</string> <string name="server_info_broken">Error</string> <string name="pref_presence_settings">Presencia</string> - <string name="pref_away_when_screen_off">Ausente con pantalla apagada</string> - <string name="pref_away_when_screen_off_summary">Cambia tu estado a ausente cuando la pantalla está apagada</string> + <string name="pref_away_when_screen_off">Ausente para pantalla apagada</string> + <string name="pref_away_when_screen_off_summary">Cambia su estado a ausente cuando la pantalla esté apagada</string> <string name="pref_xa_on_silent_mode">No disponible en modo silencio</string> - <string name="pref_xa_on_silent_mode_summary">Cambia tu estado a no disponible cuando el dispositivo está en modo silencio</string> - <string name="pref_treat_vibrate_as_silent">Modo vibración como modo silencio</string> - <string name="pref_treat_vibrate_as_silent_summary">Cambia tu estado a no disponible cuando el dispositivo está en modo vibración</string> - <string name="pref_show_connection_options">Opciones de conexión</string> - <string name="pref_show_connection_options_summary">Mostrar el hostname y el puerto cuando se está creando una cuenta</string> + <string name="pref_xa_on_silent_mode_summary">Cambia su estado a no disponible cuando el dispositivo esté en modo silencioso</string> + <string name="pref_treat_vibrate_as_silent">Tratar el modo vibración como modo silencioso</string> + <string name="pref_treat_vibrate_as_silent_summary">Cambia su estado a no disponible cuando el dispositivo esté en modo vibración</string> + <string name="pref_show_connection_options">Opciones extendidas de conexión</string> + <string name="pref_show_connection_options_summary">Muestra el nombre del servidor y el puerto al establecer una cuenta</string> <string name="hostname_example">xmpp.ejemplo.com</string> <string name="action_add_account_with_certificate">Añadir cuenta con certificado</string> - <string name="unable_to_parse_certificate">No se ha podido leer el certificado</string> - <string name="authenticate_with_certificate">Dejar vacío para autenticar certificado w/ </string> + <string name="unable_to_parse_certificate">No se pudo interpretar el certificado</string> + <string name="authenticate_with_certificate">Dejar vacío para autentificar con certificado</string> <string name="mam_prefs">Preferencias de archivado</string> - <string name="server_side_mam_prefs">Preferencias de archivado en servidor</string> - <string name="fetching_mam_prefs">Buscando preferencias de archivado. Por favor, espera...</string> - <string name="unable_to_fetch_mam_prefs">No se ha podido conseguir las preferencias de archivado</string> + <string name="server_side_mam_prefs">Preferencias de archivado del lado del servidor</string> + <string name="fetching_mam_prefs">Descargando preferencias de archivado. Por favor, espere...</string> + <string name="unable_to_fetch_mam_prefs">No se pudieron descargar las preferencias de archivado</string> <string name="captcha_ocr">Texto captcha</string> - <string name="captcha_required">Captcha requerido</string> - <string name="captcha_hint">Introduce el texto de la imagen</string> + <string name="captcha_required">Se requiere el captcha</string> + <string name="captcha_hint">Introduzca el texto de la imagen</string> <string name="certificate_chain_is_not_trusted">La cadena de certificados no es de confianza</string> - <string name="jid_does_not_match_certificate">El identificador Jabber no coincide con el del certificado</string> + <string name="jid_does_not_match_certificate">El identificador (ID) Jabber no coincide con el del certificado</string> <string name="action_renew_certificate">Renovar certificado</string> - <string name="error_fetching_omemo_key">¡Error buscando clave OMEMO!</string> - <string name="verified_omemo_key_with_certificate">¡Clave OMEMO con certificado verificada!</string> - <string name="device_does_not_support_certificates">¡Tu dispositivo no soporta la elección de certificados de cliente!</string> + <string name="error_fetching_omemo_key">¡Error al descargar clave OMEMO!</string> + <string name="verified_omemo_key_with_certificate">¡Se ha verificado la clave OMEMO con el certificado!</string> + <string name="device_does_not_support_certificates">¡Su dispositivo no soporta la elección de certificados de cliente!</string> <string name="pref_connection_options">Conexión</string> - <string name="pref_use_tor">Conectar via Tor</string> - <string name="pref_use_tor_summary">Todas las conexiones se realizan a través de la red TOR. Requiere Orbot</string> - <string name="account_settings_hostname">Hostname</string> + <string name="account_settings_hostname">Nombre del servidor</string> <string name="account_settings_port">Puerto</string> - <string name="hostname_or_onion">Server- or .onion-Address</string> - <string name="not_a_valid_port">Éste no es un número de puerto válido</string> - <string name="not_valid_hostname">Éste no es un hostame válido</string> + <string name="not_a_valid_port">Este no es un número de puerto válido</string> + <string name="not_valid_hostname">Este no es un nombre de servidor válido</string> <string name="connected_accounts">%1$d de %2$d cuentas conectadas</string> <plurals name="x_messages"> <item quantity="one">%d mensaje</item> <item quantity="other">%d mensajes</item> </plurals> - <string name="load_more_messages">Cargar más mensajes</string> <string name="shared_file_with_x">Archivo compartido con %s</string> <string name="shared_image_with_x">Imagen compartida con %s</string> <string name="shared_images_with_x">Imágenes compartidas con %s</string> <string name="no_storage_permission">Conversations necesita acceder al almacenamiento externo</string> <string name="sync_with_contacts">Sincronizar contactos</string> - <string name="sync_with_contacts_long">Conversations quiere cruzar tu lista de contactos de XMPP con tus contactos del móvil para mostrar sus nombres completos y sus fotos de perfil.\n\nConversations solo leerá tus contactos y los cruzará localmente sin subirlos a tu servidor.\n\nEl sistema te preguntará ahora para conceder los permisos de acceso a tus contactos del móvil.</string> + <string name="sync_with_contacts_long">Conversations quiere cruzar su lista de contactos XMPP con sus contactos del móvil para mostrar sus nombres completos y fotos del perfil.\n\nConversations sólo leerá y cruzará sus contactos localmente sin subirlos a su servidor.\n\nEl sistema le pedirá ahora que conceda permiso para acceder a sus contactos del móvil.</string> <string name="certificate_information">Información de certificado</string> <string name="certificate_subject">Asunto</string> - <string name="certificate_issuer">Editor</string> + <string name="certificate_issuer">Emisor</string> <string name="certificate_cn">Nombre</string> <string name="certificate_o">Organización</string> <string name="certificate_sha1">SHA-1</string> <string name="certicate_info_not_available">(No disponible)</string> <string name="certificate_not_found">Certificado no encontrado</string> <string name="notify_on_all_messages">Notificar para todos los mensajes</string> - <string name="notify_only_when_highlighted">Notificar solo cuando se recibe un mensjae resaltado</string> + <string name="notify_only_when_highlighted">Notificar sólo para mensajes destacados</string> <string name="notify_never">Notificaciones deshabilitadas</string> <string name="notify_paused">Notificaciones pausadas</string> <string name="pref_picture_compression">Comprimir imágenes</string> @@ -563,15 +622,16 @@ <string name="always">Siempre</string> <string name="automatically">Automáticamente</string> <string name="battery_optimizations_enabled">Optimizaciones de uso de batería habilitadas</string> - <string name="battery_optimizations_enabled_explained">Tu dispositivo está realizando optimizaciones de uso de batería en Conversations que pueden hacer que los mensajes se retrasen o incluso hacer que se pierdan.\nEs recomendable deshabilitarlas.</string> - <string name="battery_optimizations_enabled_dialog">Tu dispositivo está realizando optimizaciones de uso de batería en Conversations que pueden hacer que los mensajes se retrasen o incluso hacer que se pierdan.\n\nEl sistema te preguntará ahora para deshabilitarlas.</string> + <string name="battery_optimizations_enabled_explained">Su dispositivo está realizando extensas optimizaciones de uso de batería en Conversations que pueden hacer que los mensajes se retrasen o que incluso se pierdan.\nEs recomendable deshabilitarlas.</string> + <string name="battery_optimizations_enabled_dialog">Su dispositivo está realizando optimizaciones de uso de batería en Conversations que pueden hacer que los mensajes se retrasen o que incluso se pierdan.\n\nEl sistema le pedirá ahora que las deshabilite.</string> <string name="disable">Deshabilitar</string> <string name="selection_too_large">El área seleccionada es demasiado grande</string> - <string name="no_accounts">(No hay cuentas activas)</string> + <string name="no_accounts">(No hay cuentas activadas)</string> <string name="this_field_is_required">Este campo es requerido</string> - <string name="correct_message">Corregir mensaje</string> - <string name="send_corrected_message">Enviar mensaje corregido</string> - <string name="no_keys_just_confirm">Ya confías en este contacto. Seleccionando \'hecho\', estás confirmando que %s es parte de esta conversación.</string> + <string name="retry_decryption">Volver a intentar descifrado</string> + <string name="pref_omemo_enabled_summary">¿Habilitar OMEMO?</string> + <string name="pref_omemo_enabled_title">Habilitar OMEMO</string> + <string name="no_keys_just_confirm">Ya confía en este contacto. Al seleccionar \'hecho\' está confirmando que %s es parte de esta reunión.</string> <string name="select_image_and_crop">Seleccionar imagen y recortar</string> - <string name="this_account_is_disabled">Has deshabilitado esta cuenta</string> + <string name="this_account_is_disabled">Ha deshabilitado esta cuenta</string> </resources> diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 061d4fd4..c18e6d8d 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -103,6 +103,7 @@ <string name="pref_xmpp_resource_summary">Bezero honek bere burua aurkezteko erabiltzen duen izena</string> <string name="pref_accept_files">Fitxategiak onartu</string> <string name="pref_accept_files_summary">Hurrengo tamaina baino fitxategi txikiagoak automatikoki onartu…</string> + <string name="pref_accept_files_size_summary">Hurrengo tamaina baino fitxategi txikiagoak automatikoki onartu…</string> <string name="pref_notification_settings">Jakinarazpena</string> <string name="pref_notifications">Jakinarazpenak</string> <string name="pref_notifications_summary">Mezu berri bat heltzerakoan jakinarazi</string> @@ -486,6 +487,8 @@ <string name="recently_used">Azkenengo aldiz erabilitakoa</string> <string name="choose_quick_action">Ekintza azkarra aukeratu</string> <string name="search_for_contacts_or_groups">Kontaktuak edo taldeak bilatu</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">Huts egin du</string> <string name="send_private_message">Mezu pribatua bidali</string> <string name="user_has_left_conference">%s(e)k konferentzia utzi egin du</string> <string name="username">Erabiltzaile izena</string> @@ -496,8 +499,6 @@ <string name="download_failed_server_not_found">Deskargak huts egin du: zerbitzaria ez da aurkitu</string> <string name="download_failed_file_not_found">Deskargak huts egin du: fitxategia ez da aurkitu</string> <string name="download_failed_could_not_connect">Deskargak huts egin du: ezin izan da ostalarira konektatu</string> - <string name="pref_use_white_background">Atzeko-planoan kolore zuria erabili</string> - <string name="pref_use_white_background_summary">Jasotako mezuak testu beltza atzeko-plano zuri baten gainean bezala erakutsi</string> <string name="account_status_tor_unavailable">Tor sarea ez dago eskuragarri</string> <string name="server_info_broken">Hondatuta</string> <string name="pref_presence_settings">Presentzia</string> @@ -527,11 +528,8 @@ <string name="verified_omemo_key_with_certificate">OMEMO gakoa ziurtagiriarekin egiaztatuta!</string> <string name="device_does_not_support_certificates">Zure gailuak ez du bezero ziurtagiriak aukeratzea onartzen!</string> <string name="pref_connection_options">Konexioa</string> - <string name="pref_use_tor">Tor bidez konektatu</string> - <string name="pref_use_tor_summary">Konexio guztiak Tor sarean zehar igaro. Orbot behar du</string> <string name="account_settings_hostname">Ostalariaren izena</string> <string name="account_settings_port">Ataka</string> - <string name="hostname_or_onion">Zerbitzari- edo .onion-helbidea</string> <string name="not_a_valid_port">Hau ez da ataka zenbaki balioduna</string> <string name="not_valid_hostname">Hau ez da ostalari izen balioduna</string> <string name="connected_accounts">%2$dtik %1$d kontu konektatuta</string> @@ -539,7 +537,6 @@ <item quantity="one">mezu %d</item> <item quantity="other">%d mezu</item> </plurals> - <string name="load_more_messages">Mezu gehiago kargatu</string> <string name="shared_file_with_x">Fitxategia %s(r)ekin partekatu da</string> <string name="shared_image_with_x">Irudia %s(r)ekin partekatu da</string> <string name="shared_images_with_x">Irudiak %s(r)ekin partekatu dira</string> @@ -558,8 +555,6 @@ <string name="notify_only_when_highlighted">Jakinarazi nabarmentzerakoan soilik</string> <string name="notify_never">Jakinarazpenak ezgaituta</string> <string name="notify_paused">Jakinarazpenak gelditu dira</string> - <string name="pref_picture_compression">Irudiak konprimitu</string> - <string name="pref_picture_compression_summary">Irudiak konprimitu eta neurriz aldatu</string> <string name="always">Beti</string> <string name="automatically">Automatikoki</string> <string name="battery_optimizations_enabled">Bateriaren optimizazioak gaituta</string> @@ -569,8 +564,6 @@ <string name="selection_too_large">Hautatutako zatia handiegia da</string> <string name="no_accounts">(Ez dago kontu aktiborik)</string> <string name="this_field_is_required">Datu hau beharrezkoa da</string> - <string name="correct_message">Mezua zuzendu</string> - <string name="send_corrected_message">Mezu zuzendua bidali</string> <string name="no_keys_just_confirm">Kontaktu honetaz fidatzen zara dagoeneko. \'Eginda\' hautatuz %s konferentzia honen kidea dela egiaztatzen duzu besterik gabe.</string> <string name="select_image_and_crop">Irudia hautatu eta moztu</string> <string name="this_account_is_disabled">Kontu hau ezgaitu duzu</string> diff --git a/src/main/res/values-fa-rIR/strings.xml b/src/main/res/values-fa-rIR/strings.xml index c757504a..873829b5 100644 --- a/src/main/res/values-fa-rIR/strings.xml +++ b/src/main/res/values-fa-rIR/strings.xml @@ -1,2 +1,4 @@ <?xml version='1.0' encoding='UTF-8'?> -<resources/> +<resources> + <!--%s = bare jid, %d = count of online resources--> +</resources> diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml index 3ddb3e77..03ab3e9b 100644 --- a/src/main/res/values-fr/strings.xml +++ b/src/main/res/values-fr/strings.xml @@ -101,10 +101,14 @@ <string name="pref_xmpp_resource_summary">Nom utilisé par ce client pour s\'identifier</string> <string name="pref_accept_files">Accepter les fichiers</string> <string name="pref_accept_files_summary">Accepter automatiquement les fichiers plus petits que…</string> + <string name="pref_accept_files_size_summary">Accepter automatiquement les fichiers plus petits que…</string> <string name="pref_notification_settings">Notification</string> <string name="pref_notifications">Notifications</string> <string name="pref_notifications_summary">Notifier de l\'arrivée d\'un message.</string> <string name="pref_vibrate">Vibration</string> + <string name="pref_vibrate_summary">Vibrer lors de l\'arrivée d\'un message.</string> + <string name="pref_sound">Sonore</string> + <string name="pref_sound_summary">Jouer une sonnerie pour notifier.</string> <string name="pref_notification_grace_period">Période sans notification</string> <string name="pref_notification_grace_period_summary">Désactiver momentanément les notifications après l\'arrivée d\'une copie carbone.</string> <string name="pref_advanced_options">Avancé</string> @@ -493,8 +497,6 @@ <string name="download_failed_server_not_found">Échec du téléchargement : impossible de trouver le serveur</string> <string name="download_failed_file_not_found">Échec du téléchargement : impossible de trouver le fichier</string> <string name="download_failed_could_not_connect">Échec du téléchargement : impossible de se connecter à l\'hôte</string> - <string name="pref_use_white_background">Utiliser un fond blanc</string> - <string name="pref_use_white_background_summary">Afficher les messages reçus en texte noir sur fond blanc.</string> <string name="account_status_tor_unavailable">Réseau Tor inaccessible</string> <string name="server_info_broken">Détraqué</string> <string name="pref_presence_settings">Présence</string> @@ -524,11 +526,8 @@ <string name="verified_omemo_key_with_certificate">Clef OMEMO vérifiée avec un certificat !</string> <string name="device_does_not_support_certificates">Votre appareil ne supporte pas la sélection de certificats client !</string> <string name="pref_connection_options">Connexion</string> - <string name="pref_use_tor">Connexion via Tor</string> - <string name="pref_use_tor_summary">Rediriger toutes les connexions via le réseau Tor. Nécessite Orbot.</string> <string name="account_settings_hostname">Nom d\'hôte</string> <string name="account_settings_port">Port</string> - <string name="hostname_or_onion">Adresse du serveur ou .onion</string> <string name="not_a_valid_port">Ce numéro de port n\'est pas valide</string> <string name="not_valid_hostname">Ce nom d\'hôte n\'est pas valide</string> <string name="connected_accounts">%1$d compte(s) sur %2$d connecté(s)</string> @@ -536,7 +535,6 @@ <item quantity="one">%d message</item> <item quantity="other">%d messages</item> </plurals> - <string name="load_more_messages">Charger plus de messages</string> <string name="shared_file_with_x">Fichier partagé avec %s</string> <string name="shared_image_with_x">Image partagée avec %s</string> <string name="no_storage_permission">Conversations a besoin d\'accéder au stockage externe</string> @@ -554,8 +552,6 @@ <string name="notify_only_when_highlighted">Notifier uniquement quand surligné</string> <string name="notify_never">Notifications désactivées</string> <string name="notify_paused">Notifications en pause</string> - <string name="pref_picture_compression">Compresser images</string> - <string name="pref_picture_compression_summary">Redimensionner et compresser les images</string> <string name="always">Toujours</string> <string name="automatically">Automatiquement</string> <string name="battery_optimizations_enabled">Optimisations de batterie activées</string> @@ -565,8 +561,6 @@ <string name="selection_too_large">La zone sélectionnée est trop grande</string> <string name="no_accounts">(Aucun compte activé)</string> <string name="this_field_is_required">Ce champ est requis</string> - <string name="correct_message">Corriger le message</string> - <string name="send_corrected_message">Envoyer le message corrigé</string> <string name="no_keys_just_confirm">Vous faites déjà confiance à ce contact. En sélectionnant « Terminé » vous confirmerez seulement que %s est membre de cette conférence.</string> <string name="select_image_and_crop">Sélectionner et découper une image</string> <string name="this_account_is_disabled">Vous avez désactivé ce compte</string> diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index cdab2e03..630807df 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -10,6 +10,8 @@ <string name="action_add_account">Engadir conta</string> <string name="action_edit_contact">Editar contacto</string> <string name="action_delete_contact">Eliminar contacto da lista</string> + <string name="title_activity_settings">Axustes</string> + <string name="title_activity_start_conversation">Comeza conversa</string> <string name="just_now">agora</string> <string name="minutes_ago">min</string> <string name="unread_conversations">conversas sen ler</string> @@ -58,6 +60,8 @@ <string name="pref_xmpp_resource_summary">O nome que identifica o cliente que estás a empregar</string> <string name="pref_accept_files">Aceptar arquivos</string> <string name="pref_accept_files_summary">De forma automática aceptar arquivos menores de…</string> + <string name="pref_accept_files_size_summary">De forma automática aceptar arquivos menores de…</string> + <string name="pref_notification_settings">Axustes de notificación</string> <string name="pref_notifications">Notificacións</string> <string name="pref_notifications_summary">Notifica cuando chega unha nova mensaxe</string> <string name="pref_vibrate">Tremer</string> @@ -106,4 +110,6 @@ <string name="attach_record_voice">Grabar audio</string> <string name="passwords_do_not_match">As contrasinais non coinciden</string> <string name="invalid_jid">O identificador non é un identificador de Jabber válido</string> + <string name="dialog_manage_certs_negativebutton">Cancelar</string> + <!--%s = bare jid, %d = count of online resources--> </resources> diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml index ab149bf0..1dfca822 100644 --- a/src/main/res/values-id/strings.xml +++ b/src/main/res/values-id/strings.xml @@ -97,6 +97,7 @@ <string name="pref_xmpp_resource_summary">Identifikasi nama klien ini dengan</string> <string name="pref_accept_files">Terima berkas</string> <string name="pref_accept_files_summary">Otomatis menerima berkas lebih kecil dari...</string> + <string name="pref_accept_files_size_summary">Otomatis menerima berkas lebih kecil dari...</string> <string name="pref_notification_settings">Notif</string> <string name="pref_notifications">Notifikasi</string> <string name="pref_notifications_summary">Notifikasikan jika pesan baru tiba</string> @@ -434,6 +435,8 @@ <string name="recently_used">Maling sering digunakan</string> <string name="choose_quick_action">Pilih aksi cepat</string> <string name="search_for_contacts_or_groups">Cari grup atau daftar kontak</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">Gagal</string> <string name="send_private_message">Kirim pesan pribadi</string> <string name="user_has_left_conference">%s meninggalkan conference!</string> <string name="username">Username</string> @@ -443,13 +446,11 @@ <string name="download_failed_server_not_found">Unduhan gagal: Server tidak ditemukan</string> <string name="download_failed_file_not_found">Unduh gagal: Berkas tidak ditemukan</string> <string name="download_failed_could_not_connect">Unduhan gagal: Tidak dapat terhubung ke host</string> - <string name="pref_use_white_background">Gunakan latar putih</string> <string name="account_status_tor_unavailable">Tor network tidak tersedia</string> <string name="server_info_broken">Rusak</string> <string name="pref_presence_settings">Kehadiran</string> <string name="hostname_example">xmpp.example.com</string> <string name="pref_connection_options">Koneksi</string> - <string name="pref_use_tor">Hubungkan via Tor</string> <string name="account_settings_hostname">Hostname</string> <string name="account_settings_port">Port</string> <string name="certificate_information">Informasi Sertifikat</string> @@ -459,8 +460,6 @@ <string name="certificate_sha1">SHA-1</string> <string name="certicate_info_not_available">(Tidak tersedia)</string> <string name="certificate_not_found">Tidak ada sertifikat ditemukan</string> - <string name="pref_picture_compression">Kompres Gambar</string> - <string name="pref_picture_compression_summary">Rubah ukuran dan kompres gambar</string> <string name="always">Selalu</string> <string name="automatically">Secara otomatis</string> <string name="battery_optimizations_enabled">Pengoptimalan baterai diaktifkan</string> @@ -468,6 +467,4 @@ <string name="selection_too_large">Area yang dipilih terlalu besar</string> <string name="no_accounts">(Tidak ada akun aktif)</string> <string name="this_field_is_required">Bagian ini wajib diisi</string> - <string name="correct_message">Perbaiki pesan</string> - <string name="send_corrected_message">Kirim perbaikan pesan</string> </resources> diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 8f00ad6a..f1a12a77 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -101,10 +101,14 @@ <string name="pref_xmpp_resource_summary">Il nome con il quale questo client si identifica</string> <string name="pref_accept_files">Accetta i file</string> <string name="pref_accept_files_summary">Accetta automaticamente i file più piccoli di…</string> + <string name="pref_accept_files_size_summary">Accetta automaticamente i file più piccoli di…</string> <string name="pref_notification_settings">Notifiche</string> <string name="pref_notifications">Notifiche</string> <string name="pref_notifications_summary">Notifica quando arriva un nuovo messaggio</string> <string name="pref_vibrate">Vibra</string> + <string name="pref_vibrate_summary">Vibra anche quando arriva un nuovo messaggio</string> + <string name="pref_sound">Suono</string> + <string name="pref_sound_summary">Riproduci una suoneria con la notifica</string> <string name="pref_notification_grace_period">Periodo tra notifiche</string> <string name="pref_notification_grace_period_summary">Disabilita le notifiche per un breve lasso di tempo dopo che un messaggio è stato ricevuto</string> <string name="pref_advanced_options">Avanzate</string> @@ -274,8 +278,6 @@ <string name="pref_security_settings">Sicurezza</string> <string name="pref_force_encryption">Forza cifratura end-to-end</string> <string name="pref_force_encryption_summary">Manda sempre messaggi cifrati (ad eccezione delle conferenze)</string> - <string name="pref_allow_message_correction">Permetti correzione del messaggio</string> - <string name="pref_allow_message_correction_summary">Consenti ai tuoi contatti di modificare retroattivamente i loro messaggi</string> <string name="pref_dont_save_encrypted">Non salvare i messaggi cifrati</string> <string name="pref_dont_save_encrypted_summary">Attenzione: Questo potrebbe comportare la perdita di messaggi</string> <string name="pref_expert_options">Impostazioni esperto</string> @@ -492,8 +494,6 @@ <string name="download_failed_server_not_found">Download fallito: Server non trovato</string> <string name="download_failed_file_not_found">Download fallito: File non trovato</string> <string name="download_failed_could_not_connect">Download fallito: Impossibile connettersi all\'host</string> - <string name="pref_use_white_background">Usa sfondo bianco</string> - <string name="pref_use_white_background_summary">Mostra i messaggi ricevuti con testo nero su sfondo bianco</string> <string name="account_status_tor_unavailable">Rete Tor non disponibile</string> <string name="server_info_broken">Rotto</string> <string name="pref_presence_settings">Presenza</string> @@ -523,11 +523,8 @@ <string name="verified_omemo_key_with_certificate">Chiave OMEMO verificata con certificato!</string> <string name="device_does_not_support_certificates">Il tuo dispositivo non supporta la selezione di certificati utente!</string> <string name="pref_connection_options">Connessione</string> - <string name="pref_use_tor">Connettiti via Tor</string> - <string name="pref_use_tor_summary">Indirizza tutte le connessioni attraverso la rete Tor. Richiede Orbot</string> <string name="account_settings_hostname">Nome host</string> <string name="account_settings_port">Porta</string> - <string name="hostname_or_onion">Indirizzo server o .onion</string> <string name="not_a_valid_port">Questo non è un numero di porta valido</string> <string name="not_valid_hostname">Questo non è un nome host valido</string> <string name="connected_accounts">%1$d su %2$d account connessi</string> @@ -535,7 +532,6 @@ <item quantity="one">%d messaggio</item> <item quantity="other">%d messaggi</item> </plurals> - <string name="load_more_messages">Carica altri messaggi</string> <string name="shared_file_with_x">Condividi file con %s</string> <string name="shared_image_with_x">Immagine condivisa con %s</string> <string name="no_storage_permission">Conversations necessita di accesso alla memoria esterna</string> @@ -553,8 +549,6 @@ <string name="notify_only_when_highlighted">Notifica solo quando evidenziato</string> <string name="notify_never">Notifiche disabilitate</string> <string name="notify_paused">Notifiche in pausa</string> - <string name="pref_picture_compression">Comprimi immagini</string> - <string name="pref_picture_compression_summary">Ridimensiona e comprimi immagini</string> <string name="always">Sempre</string> <string name="automatically">Automaticamente</string> <string name="battery_optimizations_enabled">Ottimizzazioni batteria abilitate</string> @@ -564,8 +558,6 @@ <string name="selection_too_large">L\'area selezionata è troppo grande</string> <string name="no_accounts">(Nessun account attivo)</string> <string name="this_field_is_required">Questo campo è obbligatorio</string> - <string name="correct_message">Correggi messaggio</string> - <string name="send_corrected_message">Invia messaggio corretto</string> <string name="no_keys_just_confirm">Ti fidi già di questo contatto. Selezionando \'fatto\' stai solo confermando che %s fa parte di questa conferenza.</string> <string name="select_image_and_crop">Seleziona immagine e ritagliala</string> <string name="this_account_is_disabled">Hai disabilitato questo account</string> diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml index 7d22efb8..92dbb73d 100644 --- a/src/main/res/values-iw/strings.xml +++ b/src/main/res/values-iw/strings.xml @@ -99,6 +99,7 @@ <string name="pref_xmpp_resource_summary">השם שבעזרתו לקוח זה מזהה את עצמו</string> <string name="pref_accept_files">קבל קבצים</string> <string name="pref_accept_files_summary">קבל אוטומטית קבצים שגודלם קטן מ…</string> + <string name="pref_accept_files_size_summary">קבל אוטומטית קבצים שגודלם קטן מ…</string> <string name="pref_notifications">התראות</string> <string name="pref_notifications_summary">תודיע כאשר הודעה חדשה מגיעה</string> <string name="pref_vibrate">הרטט</string> @@ -455,16 +456,17 @@ <string name="recently_used">לפי השימוש האחרון</string> <string name="choose_quick_action">בחר פעולה מהירה</string> <string name="search_for_contacts_or_groups">חפש אנשי קשר או קבוצות</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">נכשל</string> <string name="send_private_message">שלח הודעה פרטית</string> <string name="user_has_left_conference">%s עזב את הועידה</string> <string name="username">שם משתמש</string> <string name="username_hint">שם משתמש</string> <string name="invalid_username">שם משתמש זה אינו חוקי</string> + <string name="conference_name">שם ועידה</string> <string name="download_failed_server_not_found">ההורדה נכשלה: שרת לא נמצא</string> <string name="download_failed_file_not_found">ההורדה נכשלה: הקובץ לא נמצא</string> <string name="download_failed_could_not_connect">ההורדה נכשלה: נכשל ביצוע חיבור לשרת</string> - <string name="pref_use_white_background">השתמש ברקע לבן</string> - <string name="pref_use_white_background_summary">הראה הודעות שהתקבלו בטקסט שחור על גבי רקע לבען</string> <string name="server_info_broken">לא עובד</string> <string name="pref_away_when_screen_off">העבר למצב \"לא נמצא\" כאשר המסך כבוי</string> <string name="pref_away_when_screen_off_summary">מעביר את המכשיר לסטטוס \"לא נמצא\" כאשר המסך כבוי</string> @@ -479,10 +481,8 @@ <string name="jid_does_not_match_certificate">אין התאמה בין מזהה Jabber לבין תעודה</string> <string name="action_renew_certificate">חידוש תעודה</string> <string name="error_fetching_omemo_key">שגיאה בתפיסת OMEMO!</string> - <string name="pref_use_tor">התחבר דרך Tor</string> <string name="account_settings_hostname">שם מארח</string> <string name="account_settings_port">פורט</string> - <string name="hostname_or_onion">שרת- או כתובת onion.</string> <string name="not_a_valid_port">זהו אינו מספר פורט תקין</string> <string name="not_valid_hostname">זהו אינו שם מארח תקין</string> <string name="connected_accounts">%1$d מתוך %2$d חשבונות מחוברים</string> diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml index 2ff16d5b..fecef223 100644 --- a/src/main/res/values-ja/strings.xml +++ b/src/main/res/values-ja/strings.xml @@ -103,6 +103,7 @@ <string name="pref_xmpp_resource_summary">自分自身を識別するこのクライアントの名前</string> <string name="pref_accept_files">ファイルを受取</string> <string name="pref_accept_files_summary">自動的に小さいファイルを受取…</string> + <string name="pref_accept_files_size_summary">自動的に小さいファイルを受取…</string> <string name="pref_notification_settings">通知</string> <string name="pref_notifications">通知</string> <string name="pref_notifications_summary">新しいメッセージが到着したときに通知します</string> @@ -484,6 +485,8 @@ <string name="recently_used">最近使用した</string> <string name="choose_quick_action">クイックアクションの選択</string> <string name="search_for_contacts_or_groups">連絡先またはグループの検索</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">失敗しました</string> <string name="send_private_message">プライベートメッセージを送信</string> <string name="user_has_left_conference">%s が会議を退出しました!</string> <string name="username">ユーザー名</string> @@ -494,8 +497,6 @@ <string name="download_failed_server_not_found">ダウンロードに失敗しました: サーバーが見つかりません</string> <string name="download_failed_file_not_found">ダウンロードに失敗しました: ファイルが見つかりません</string> <string name="download_failed_could_not_connect">ダウンロードに失敗しました: ホストに接続できませんでした</string> - <string name="pref_use_white_background">白い背景を使用する</string> - <string name="pref_use_white_background_summary">白地に黒の文字で、受け取ったメッセージを表示します</string> <string name="account_status_tor_unavailable">Tor ネットワークが利用できません</string> <string name="server_info_broken">壊れています</string> <string name="pref_presence_settings">参加</string> @@ -525,18 +526,14 @@ <string name="verified_omemo_key_with_certificate">OMEMO 鍵の取得中にエラー!</string> <string name="device_does_not_support_certificates">お使いのデバイスはクライアント証明書の選択をサポートしていません!</string> <string name="pref_connection_options">接続</string> - <string name="pref_use_tor">Tor 経由で接続</string> - <string name="pref_use_tor_summary">Tor ネットワークを介してすべての接続をトンネルします。 Orbot が必要です</string> <string name="account_settings_hostname">ホスト名</string> <string name="account_settings_port">ポート</string> - <string name="hostname_or_onion">サーバーまたは .onion アドレス</string> <string name="not_a_valid_port">これは有効なポート番号ではありません</string> <string name="not_valid_hostname">これは有効なホスト名ではありません</string> <string name="connected_accounts">%1$d / %2$d アカウントが接続しました</string> <plurals name="x_messages"> <item quantity="other">%d メッセージ</item> </plurals> - <string name="load_more_messages">さらにメッセージをロード</string> <string name="shared_file_with_x">%s でファイルを共有</string> <string name="shared_image_with_x">%s で画像を共有</string> <string name="shared_images_with_x">%s で画像を共有</string> @@ -555,8 +552,6 @@ <string name="notify_only_when_highlighted">ハイライトされたときにのみ通知</string> <string name="notify_never">通知は無効</string> <string name="notify_paused">通知は一時停止</string> - <string name="pref_picture_compression">写真を圧縮</string> - <string name="pref_picture_compression_summary">写真のサイズ変更と圧縮</string> <string name="always">常に</string> <string name="automatically">自動</string> <string name="battery_optimizations_enabled">バッテリー最適化が有効</string> @@ -566,8 +561,6 @@ <string name="selection_too_large">選択した範囲が大きすぎます</string> <string name="no_accounts">(アクティベートしたアカウントはありません)</string> <string name="this_field_is_required">このフィールドは必須です</string> - <string name="correct_message">メッセージを修正</string> - <string name="send_corrected_message">修正したメッセージを送信</string> <string name="no_keys_just_confirm">既にこの連絡先を信頼しています。\'完了\' を選択すると、%s がこの会議の参加者であることを確認します。</string> <string name="select_image_and_crop">画像の選択とトリミング</string> <string name="this_account_is_disabled">このアカウントを無効にしました</string> diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index b4e0311b..47cf4f5c 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -101,6 +101,7 @@ <string name="pref_xmpp_resource_summary">이 클라이언트가 자신을 알아보는 이름</string> <string name="pref_accept_files">파일 수락 </string> <string name="pref_accept_files_summary">이 크기보다 작은 파일을 자동으로 수락 </string> + <string name="pref_accept_files_size_summary">이 크기보다 작은 파일을 자동으로 수락 </string> <string name="pref_notifications">알림 </string> <string name="pref_notifications_summary">새 메세지 도착시 알림 </string> <string name="pref_vibrate">진동 </string> @@ -466,16 +467,17 @@ <string name="recently_used">최근 사용된 항목</string> <string name="choose_quick_action">빠른 동작 선택</string> <string name="search_for_contacts_or_groups">연락처 또는 그룹 검색</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">실패 </string> <string name="send_private_message">개인 메세지 전송</string> <string name="user_has_left_conference">%s 이(가) 회의에서 나갔습니다.</string> <string name="username">사용자 이름</string> <string name="username_hint">사용자 이름</string> <string name="invalid_username">이것은 올바른 사용자 이름이 아닙니다</string> + <string name="conference_name">회의 이름 </string> <string name="download_failed_server_not_found">다운로드 실패: 서버가 발견되지 않음</string> <string name="download_failed_file_not_found">다운로드 실패: 파일이 발견되지 않음</string> <string name="download_failed_could_not_connect">다운도륻 실패: 호스트에 접속할 수 없음</string> - <string name="pref_use_white_background">하얀색 배경 사용</string> - <string name="pref_use_white_background_summary">받은 메세지를 하얀색 배경에 검은색 글씨로 표시</string> <string name="account_status_tor_unavailable">Tor 네트워크 사용할 수 없음</string> <string name="server_info_broken">손상됨</string> <string name="pref_away_when_screen_off">화면이 꺼져있을 경우 자리 비움으로 표시</string> @@ -493,11 +495,8 @@ <string name="error_fetching_omemo_key">OMEMO key를 가져오는 도중 오류가 발생했습니다</string> <string name="verified_omemo_key_with_certificate">OMEMO 키와 인증서 검증됨</string> <string name="device_does_not_support_certificates">기기가 선택된 클라이언트 인증서를 지원하지 않습니다</string> - <string name="pref_use_tor">Tor를 통해 접속</string> - <string name="pref_use_tor_summary">모든 연결을 Tor 네트워크를 통하도록 유도함. Orbot이 필요합니다</string> <string name="account_settings_hostname">호스트 이름</string> <string name="account_settings_port">포트</string> - <string name="hostname_or_onion">서버 또는 .onion 주소</string> <string name="not_a_valid_port">올바른 포트 번호가 아닙니다</string> <string name="not_valid_hostname">올바른 호스트 이름이 아닙니다</string> <string name="connected_accounts">%2$d 중 %1$d 계정이 연결되었습니다</string> @@ -520,7 +519,6 @@ <string name="notify_only_when_highlighted">중요 표시를 했을 때만 알림</string> <string name="notify_never">알림 해제됨</string> <string name="notify_paused">알림 일시중지됨</string> - <string name="pref_picture_compression">사진 압축</string> <string name="always">항상</string> <string name="automatically">자동</string> <string name="battery_optimizations_enabled">배터리 최적화 사용됨</string> diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml index d12975bd..e762f534 100644 --- a/src/main/res/values-nb-rNO/strings.xml +++ b/src/main/res/values-nb-rNO/strings.xml @@ -101,15 +101,19 @@ <string name="pref_xmpp_resource_summary">Navnet denne klienten identifiserer seg med</string> <string name="pref_accept_files">Godta filer</string> <string name="pref_accept_files_summary">Automatisk godkjenning av filer mindre enn...</string> + <string name="pref_accept_files_size_summary">Automatisk godkjenning av filer mindre enn...</string> + <string name="pref_notification_settings">Varslingsinnstillinger</string> <string name="pref_notifications">Varslinger</string> <string name="pref_notifications_summary">Varsle når en ny melding ankommer</string> <string name="pref_vibrate">Vibrer</string> <string name="pref_notification_grace_period">Stilleperiode</string> <string name="pref_notification_grace_period_summary">Deaktiver varslinger for en kort periode etter at en kopi er mottatt</string> + <string name="pref_advanced_options">Avanserte valg</string> <string name="pref_never_send_crash">Aldri send feilrettingsrapporter</string> <string name="pref_never_send_crash_summary">Ved å sende inn stabelsporinger hjelper du den pågående utviklingen av Conversations</string> <string name="pref_confirm_messages">Bekreft meldinger</string> <string name="pref_confirm_messages_summary">La din kontakt få vite når du har mottatt og lest en melding</string> + <string name="pref_ui_options">Valg for grensesnitt</string> <string name="openpgp_error">Feilmelding fra OpenKeychain</string> <string name="error_decrypting_file">I/O-feil ved dekryptering av fil</string> <string name="accept">Godta</string> @@ -270,6 +274,7 @@ <string name="pref_force_encryption_summary">Alltid send meldinger kryptert (bortsett fra konferanser)</string> <string name="pref_dont_save_encrypted">Ikke lagre krypterte meldinger</string> <string name="pref_dont_save_encrypted_summary">Advarsel: Dette kan føre til at meldinger går tapt</string> + <string name="pref_expert_options">Ekspertinnstillinger</string> <string name="pref_expert_options_summary">Vær forsiktig med disse</string> <string name="title_activity_about">Om Conversations</string> <string name="pref_about_conversations_summary">Utgave og lisensinformasjon</string> @@ -417,6 +422,7 @@ <string name="two_hours">2 timer</string> <string name="eight_hours">8 timer</string> <string name="until_further_notice">Til videre beskjed</string> + <string name="pref_input_options">Inndata-valg</string> <string name="pref_enter_is_send">Enter er forsendelsesknapp</string> <string name="pref_enter_is_send_summary">Bruk enter for å sende en melding</string> <string name="pref_display_enter_key">Vis enter-tast</string> @@ -468,18 +474,20 @@ <string name="recently_used">Senest brukt</string> <string name="choose_quick_action">Velg hurtighendelse</string> <string name="search_for_contacts_or_groups">Søk etter kontakter eller grupper</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">Feilet</string> <string name="send_private_message">Send privat melding</string> <string name="user_has_left_conference">%s har forlatt konferansen!</string> <string name="username">Brukernavn</string> <string name="username_hint">Brukernavn</string> <string name="invalid_username">Dette er ikke et gyldig brukernavn</string> + <string name="conference_name">Konferanse-rom</string> <string name="download_failed_server_not_found">Nedlasting feilet: Fant ikke tjener</string> <string name="download_failed_file_not_found">Nedlasting feilet: Fant ikke fila</string> <string name="download_failed_could_not_connect">Nedlasting feilet: Kunne ikke koble til tjeneren</string> - <string name="pref_use_white_background">Bruk hvit bakgrunn</string> - <string name="pref_use_white_background_summary">Vis mottatte meldinger som svart tekst på hvit bakgrunn</string> <string name="account_status_tor_unavailable">Tor-nettverk utilgjengelig</string> <string name="server_info_broken">Knekt</string> + <string name="pref_presence_settings">Tilstedeværelse-innstillinger</string> <string name="pref_away_when_screen_off">Borte når skjermen er av</string> <string name="pref_away_when_screen_off_summary">Markerer din ressurs som borte når skjermen er avskrudd</string> <string name="pref_xa_on_silent_mode">Ikke tilgjengelig i stille-modus</string> @@ -496,11 +504,9 @@ <string name="error_fetching_omemo_key">Feil ved innhenting av OMEMO-nøkkel!</string> <string name="verified_omemo_key_with_certificate">Bekreftet OMEMO-nøkkel med sertifikat!</string> <string name="device_does_not_support_certificates">Din enhet støtter ikke valg av klientsertifikat!</string> - <string name="pref_use_tor">Koble til via Tor</string> - <string name="pref_use_tor_summary">Send alle tilkoblinger i tunnel gjennom Tor-nettverket. Krever Orbot</string> + <string name="pref_connection_options">Tilkoblingsalternativ</string> <string name="account_settings_hostname">Tjenernavn</string> <string name="account_settings_port">Port</string> - <string name="hostname_or_onion">Tjener- eller .onion-adresse</string> <string name="not_a_valid_port">Dette er ikke et gyldig portnummer</string> <string name="not_valid_hostname">Dette er ikke et gyldig tjenernavn</string> <string name="connected_accounts">%1$d av %2$d kontoer tilkoblet</string> @@ -518,13 +524,13 @@ <string name="certificate_issuer">Utsteder</string> <string name="certificate_cn">Vanlig navn</string> <string name="certificate_o">Organisasjon</string> + <string name="certificate_sha1">SHA1</string> <string name="certicate_info_not_available">(Ikke tilgjengelig)</string> <string name="certificate_not_found">Fant ikke noe sertifikat</string> <string name="notify_on_all_messages">Varsle ved alle meldinger</string> <string name="notify_only_when_highlighted">Varsle bare når fremhevet</string> <string name="notify_never">Varslinger deaktivert</string> <string name="notify_paused">Varslinger pauset</string> - <string name="pref_picture_compression">Komprimer bilder</string> <string name="always">Alltid</string> <string name="automatically">Automatisk</string> <string name="battery_optimizations_enabled">Batterioptimaliseringer aktivert</string> diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index 4e742f81..68203cf4 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -103,6 +103,7 @@ <string name="pref_xmpp_resource_summary">De naam waarmee deze cliënt zich identificeert</string> <string name="pref_accept_files">Aanvaard bestanden</string> <string name="pref_accept_files_summary">Aanvaard automatisch bestanden kleiner dan…</string> + <string name="pref_accept_files_size_summary">Aanvaard automatisch bestanden kleiner dan…</string> <string name="pref_notification_settings">Melding</string> <string name="pref_notifications">Meldingen</string> <string name="pref_notifications_summary">Melding als een nieuw bericht arriveert</string> @@ -486,6 +487,8 @@ <string name="recently_used">Recent gebruikt</string> <string name="choose_quick_action">Snelle actie kiezen</string> <string name="search_for_contacts_or_groups">Zoeken naar contacten of groepen</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">Mislukt</string> <string name="send_private_message">Privébericht sturen</string> <string name="user_has_left_conference">%s heeft het groepsgesprek verlaten!</string> <string name="username">Gebruikersnaam</string> @@ -496,8 +499,6 @@ <string name="download_failed_server_not_found">Downloaden mislukt: server niet gevonden</string> <string name="download_failed_file_not_found">Downloaden mislukt: bestand niet gevonden</string> <string name="download_failed_could_not_connect">Downloaden mislukt: kon geen verbinding maken met host</string> - <string name="pref_use_white_background">Gebruik witte achtergrond</string> - <string name="pref_use_white_background_summary">Toon ontvangen berichten als zwarte tekst op een witte achtergrond</string> <string name="account_status_tor_unavailable">Tor-netwerk niet beschikbaar</string> <string name="server_info_broken">Gebroken</string> <string name="pref_presence_settings">Aanwezigheid</string> @@ -527,11 +528,8 @@ <string name="verified_omemo_key_with_certificate">OMEMO-sleutel geverifieerd met certificaat!</string> <string name="device_does_not_support_certificates">Je apparaat ondersteunt de selectie van cliënt-certificaten niet!</string> <string name="pref_connection_options">Verbinding</string> - <string name="pref_use_tor">Verbinden via Tor</string> - <string name="pref_use_tor_summary">Tunnel alle verbindingen door het Tor-netwerk. Vereist Orbot</string> <string name="account_settings_hostname">Hostnaam</string> <string name="account_settings_port">Poort</string> - <string name="hostname_or_onion">Server- of .onion-adres</string> <string name="not_a_valid_port">Dit is geen geldig poortnummer</string> <string name="not_valid_hostname">Dit is geen geldige hostnaam</string> <string name="connected_accounts">%1$d van %2$d accounts verbonden</string> @@ -539,7 +537,6 @@ <item quantity="one">%d bericht</item> <item quantity="other">%d berichten</item> </plurals> - <string name="load_more_messages">Laad meer berichten</string> <string name="shared_file_with_x">Bestand gedeeld met %s</string> <string name="shared_image_with_x">Afbeelding gedeeld met %s</string> <string name="shared_images_with_x">Afbeeldingen gedeeld met %s</string> @@ -558,8 +555,6 @@ <string name="notify_only_when_highlighted">Melding enkel wanneer vermeld</string> <string name="notify_never">Meldingen uitgeschakeld</string> <string name="notify_paused">Meldingen gepauzeerd</string> - <string name="pref_picture_compression">Afbeeldingen comprimeren</string> - <string name="pref_picture_compression_summary">Verklein en comprimeer afbeeldingen</string> <string name="always">Altijd</string> <string name="automatically">Automatisch</string> <string name="battery_optimizations_enabled">Batterij-optimalisaties ingeschakeld</string> @@ -569,8 +564,6 @@ <string name="selection_too_large">Het gekozen vlak is te groot</string> <string name="no_accounts">(Geen actieve accounts)</string> <string name="this_field_is_required">Dit veld is vereist</string> - <string name="correct_message">Bericht verbeteren</string> - <string name="send_corrected_message">Verbeterd bericht sturen</string> <string name="no_keys_just_confirm">Je vertrouwt dit contact al. Door \'klaar\' te kiezen bevestig je enkel dat %s deel uitmaakt van dit groepsgesprek.</string> <string name="select_image_and_crop">Afbeelding kiezen en bijsnijden</string> <string name="this_account_is_disabled">Je hebt deze account uitgeschakeld</string> diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index 658f1711..964f7551 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -101,6 +101,7 @@ <string name="pref_xmpp_resource_summary">Nazwa identyfikująca urządzenie</string> <string name="pref_accept_files">Akceptuj pliki</string> <string name="pref_accept_files_summary">Automatycznie akceptuj pliki mniejsze niż...</string> + <string name="pref_accept_files_size_summary">Automatycznie akceptuj pliki mniejsze niż...</string> <string name="pref_notification_settings">Powiadomienie</string> <string name="pref_notifications">Powiadomienia</string> <string name="pref_notifications_summary">Powiadamiaj, gdy nadejdzie wiadomość</string> @@ -274,8 +275,6 @@ <string name="pref_security_settings">Bezpieczeństwo</string> <string name="pref_force_encryption">Wymuszaj szyfrowanie typu end-to-end</string> <string name="pref_force_encryption_summary">Szyfruj wszystkie wiadomości (poza konferencjami)</string> - <string name="pref_allow_message_correction">Pozwól na poprawianie wiadomości</string> - <string name="pref_allow_message_correction_summary">Pozwól swoim kontaktom poprawiać wiadomości</string> <string name="pref_dont_save_encrypted">Nie zapisuj zaszyfrowanych wiadomości</string> <string name="pref_dont_save_encrypted_summary">Uwaga: Może powodować utratę wiadomości</string> <string name="pref_expert_options">Ustawienia zaawansowane</string> @@ -483,6 +482,8 @@ <string name="recently_used">Ostatnio używana</string> <string name="choose_quick_action">Wybierz szybką akcję</string> <string name="search_for_contacts_or_groups">Szukaj kontaktów i grup</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">Operacja nieudana</string> <string name="send_private_message">Wyślij wiadomość prywatną</string> <string name="user_has_left_conference">%s opuścił(a) konferencję!</string> <string name="username">Nazwa użytkownika</string> @@ -493,8 +494,6 @@ <string name="download_failed_server_not_found">Pobieranie nieudane: Nie odnaleziono serwera</string> <string name="download_failed_file_not_found">Pobieranie nieudane: Nie odnaleziono pliku</string> <string name="download_failed_could_not_connect">Pobieranie nieudane: Nie można połączyć z hostem</string> - <string name="pref_use_white_background">Białe tło</string> - <string name="pref_use_white_background_summary">Pokazuj otrzymane wiadomości jako czarny tekst na białym tle</string> <string name="account_status_tor_unavailable">Sieć TOR jest niedostepna</string> <string name="server_info_broken">Zepsute</string> <string name="pref_presence_settings">Obecność</string> @@ -522,11 +521,8 @@ <string name="verified_omemo_key_with_certificate">Zweryfikowano klucz OMEMO z certyfikatem</string> <string name="device_does_not_support_certificates">Twoje urządzenie nie wspiera wyboru certyfikatów klienckich</string> <string name="pref_connection_options">Połączenie</string> - <string name="pref_use_tor">Połącz przez sieć TOR</string> - <string name="pref_use_tor_summary">Tuneluj wszystkie połączenia przez sieć TOR. Wymaga zainstalowania aplikacji \"Orbot\"</string> <string name="account_settings_hostname">Nazwa hosta</string> <string name="account_settings_port">Port</string> - <string name="hostname_or_onion">Adres serwera lub \".onion\" adres</string> <string name="not_a_valid_port">To nie jest prawidłowy numer portu</string> <string name="not_valid_hostname">To nie jest prawidłowa nazwa hosta</string> <string name="connected_accounts">%1$d z %2$d kont połączonych</string> @@ -535,7 +531,6 @@ <item quantity="few">%d wiadomości</item> <item quantity="other">%d wiadomości</item> </plurals> - <string name="load_more_messages">Załaduj wiecej wiadomości</string> <string name="shared_file_with_x">Dzielony plik z %s</string> <string name="shared_image_with_x">Dzielony obraz z %s</string> <string name="no_storage_permission">Conversations potrzebuje dostęp do zewnętrznego magazynu</string> @@ -553,8 +548,6 @@ <string name="notify_only_when_highlighted">Powiadom tylko gdy wspomniano</string> <string name="notify_never">Powiadomienia wyłączone</string> <string name="notify_paused">Powiadomienia wstrzymane</string> - <string name="pref_picture_compression">Kompresuj obrazki</string> - <string name="pref_picture_compression_summary">Zmień rozmiar i kompresuj obrazki</string> <string name="always">Zawsze</string> <string name="automatically">Automatycznie</string> <string name="battery_optimizations_enabled">Optymalizacje zużycia baterii włączone</string> @@ -564,6 +557,4 @@ <string name="selection_too_large">Zaznaczony obszar jest zbyt duży</string> <string name="no_accounts">(Brak aktywynych kont)</string> <string name="this_field_is_required">To pole jest wymagane</string> - <string name="correct_message">Popraw wiadomość</string> - <string name="send_corrected_message">Wyślij poprawioną wiadomość</string> </resources> diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 3c41c32a..52f40439 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -103,6 +103,7 @@ <string name="pref_xmpp_resource_summary">O nome pelo qual esse cliente se identifica</string> <string name="pref_accept_files">Aceitar arquivos</string> <string name="pref_accept_files_summary">Aceitar automaticamente arquivos menores que...</string> + <string name="pref_accept_files_size_summary">Aceitar automaticamente arquivos menores que...</string> <string name="pref_notification_settings">Notificação</string> <string name="pref_notifications">Notificações</string> <string name="pref_notifications_summary">Notificar ao receber uma nova mensagem</string> @@ -501,8 +502,6 @@ <string name="download_failed_server_not_found">Não foi possível fazer o download: servidor não encontrado</string> <string name="download_failed_file_not_found">Não foi possível fazer o download: arquivo não encontrado</string> <string name="download_failed_could_not_connect">Não foi possível fazer o download: não foi possível conectar ao host</string> - <string name="pref_use_white_background">Usar fundo branco</string> - <string name="pref_use_white_background_summary">Exibir a mensagens recebidas como texto preto em um fundo branco</string> <string name="account_status_tor_unavailable">Rede Tor não disponível</string> <string name="server_info_broken">Quebrado</string> <string name="pref_presence_settings">Presença</string> @@ -532,11 +531,8 @@ <string name="verified_omemo_key_with_certificate">A chave OMEMO foi verificada com o certificado.</string> <string name="device_does_not_support_certificates">O seu dispositivo não suporta a seleção de certificados de clientes.</string> <string name="pref_connection_options">Conexão</string> - <string name="pref_use_tor">Conectar via Tor</string> - <string name="pref_use_tor_summary">Faça o tunelamento de todas as conexões através de redes Tor. Necessita do Orbot.</string> <string name="account_settings_hostname">Nome do host</string> <string name="account_settings_port">Porta</string> - <string name="hostname_or_onion">Server- ou .onion-Address</string> <string name="not_a_valid_port">Esse número de porta não é válido</string> <string name="not_valid_hostname">Esse nome de host não é válido</string> <string name="connected_accounts">%1$d de %2$d contas conectadas</string> @@ -544,10 +540,8 @@ <item quantity="one">%d mensagem</item> <item quantity="other">%d mensagens</item> </plurals> - <string name="load_more_messages">Carregar mais mensagens</string> <string name="shared_file_with_x">Arquivo compartilhado com %s</string> <string name="shared_image_with_x">Imagem compartilhada com %s</string> - <string name="shared_images_with_x">Imagens compartilhadas com %s</string> <string name="no_storage_permission">O Conversations necessita de acesso ao armazenamento externo</string> <string name="sync_with_contacts">Sincronizar com os contatos</string> <string name="sync_with_contacts_long">O Conversations quer procurar por correspondências entre contatos da sua conta Jabber e do seu telefone, para complementar as informações de nome completo e avatares\n\nO Conversations fará a verificação localmente, sem enviar nenhuma informação sua para o servidor\n\nVocê será solicitado a fornecer permissão de acesso aos seus contatos agora.</string> @@ -563,8 +557,6 @@ <string name="notify_only_when_highlighted">Notificar somente quando destacado</string> <string name="notify_never">Notificações desabilitadas</string> <string name="notify_paused">Notificações pausadas</string> - <string name="pref_picture_compression">Comprimir imagens</string> - <string name="pref_picture_compression_summary">Redimensiona e comprime as imagens</string> <string name="always">Sempre</string> <string name="automatically">Automaticamente</string> <string name="battery_optimizations_enabled">Otimizações de bateria habilitadas</string> @@ -574,8 +566,6 @@ <string name="selection_too_large">A área selecionada é muito grande</string> <string name="no_accounts">(Nenhuma conta ativa)</string> <string name="this_field_is_required">Este campo é necessário</string> - <string name="correct_message">Corrigir a mensagem</string> - <string name="send_corrected_message">Enviar a mensagem corrigida</string> <string name="no_keys_just_confirm">Você já confia nesse contato. Ao selecionar \'Concluído\', você está apenas confirmando que %s é parte dessa conferência.</string> <string name="select_image_and_crop">Selecione e recorte a imagem</string> <string name="this_account_is_disabled">Você desabilitou essa conta</string> diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index 8e502797..ba262d9c 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -103,6 +103,7 @@ <string name="pref_xmpp_resource_summary">O nome pelo qual este cliente se identifica</string> <string name="pref_accept_files">Aceitar ficheiros</string> <string name="pref_accept_files_summary">Automaticamente aceitar ficheiros menores que...</string> + <string name="pref_accept_files_size_summary">Automaticamente aceitar ficheiros menores que...</string> <string name="pref_notification_settings">Notificação</string> <string name="pref_notifications">Notificações</string> <string name="pref_notifications_summary">Notificar quando uma nova mensagem for recebida</string> @@ -486,6 +487,8 @@ <string name="recently_used">Usados mais recentemente</string> <string name="choose_quick_action">Escolher ação rápida</string> <string name="search_for_contacts_or_groups">Procurar contactos ou grupos</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">Falhou</string> <string name="send_private_message">Enviar mensagem privada</string> <string name="user_has_left_conference">%s deixou a conferência!</string> <string name="username">Nome de utilizador</string> @@ -496,8 +499,6 @@ <string name="download_failed_server_not_found">Transferência falhou: Servidor não encontrado</string> <string name="download_failed_file_not_found">Transferência falhou: Ficheiro não encontrado</string> <string name="download_failed_could_not_connect">Transferência falhou: Não foi possível conectar ao host</string> - <string name="pref_use_white_background">Usar fundo branco</string> - <string name="pref_use_white_background_summary">Mostrar mensagens recebidas como texto preto num fundo branco</string> <string name="account_status_tor_unavailable">Rede Tor indisponível</string> <string name="server_info_broken">Existe um problema</string> <string name="pref_presence_settings">Presença</string> @@ -527,11 +528,8 @@ <string name="verified_omemo_key_with_certificate">A chave OMEMO foi verificada com o certificado!</string> <string name="device_does_not_support_certificates">O seu dispositivo não suporta a seleção de certificados de cliente!</string> <string name="pref_connection_options">Conexão</string> - <string name="pref_use_tor">Conectar via TOR</string> - <string name="pref_use_tor_summary">Usar a rede Tor para todas as conexões. Requer a aplicação Orbot</string> <string name="account_settings_hostname">Hostname</string> <string name="account_settings_port">Porto</string> - <string name="hostname_or_onion">Servidor ou endereço .onion</string> <string name="not_a_valid_port">Este não é um número de porto válido</string> <string name="not_valid_hostname">Este não é um hostname válido</string> <string name="connected_accounts">%1$d de %2$d contas conectadas</string> @@ -539,7 +537,6 @@ <item quantity="one">%d mensagem</item> <item quantity="other">%d mensagens</item> </plurals> - <string name="load_more_messages">Carregar mais mensagens</string> <string name="shared_file_with_x">Ficheiro partilhado com %s</string> <string name="shared_image_with_x">Imagem partilhada com %s</string> <string name="shared_images_with_x">Imagens partilhadas com %s</string> @@ -558,8 +555,6 @@ <string name="notify_only_when_highlighted">Notificar apenas quando destacado</string> <string name="notify_never">Notificações desativadas</string> <string name="notify_paused">Notificações interrompidas</string> - <string name="pref_picture_compression">Comprimir Imagens</string> - <string name="pref_picture_compression_summary">Redimensionar e comprimir fotografias</string> <string name="always">Sempre</string> <string name="automatically">Automaticamente</string> <string name="battery_optimizations_enabled">Otimizações da bateria ativadas</string> @@ -569,8 +564,6 @@ <string name="selection_too_large">A área selecionada é demasiado grande</string> <string name="no_accounts">(Nenhuma conta ativada)</string> <string name="this_field_is_required">Este campo é obrigatório</string> - <string name="correct_message">Corrigir mensagem</string> - <string name="send_corrected_message">Enviar mensagem corrigida</string> <string name="no_keys_just_confirm">Já confia neste contacto. Ao selecionar \'Concluído\' apenas está a confirmar que %s faz parte desta conferência.</string> <string name="select_image_and_crop">Selecione imagem e corte</string> <string name="this_account_is_disabled">Desativou esta conta</string> diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml index d8512d6d..d799e1c2 100644 --- a/src/main/res/values-ro-rRO/strings.xml +++ b/src/main/res/values-ro-rRO/strings.xml @@ -103,6 +103,7 @@ <string name="pref_xmpp_resource_summary">Numele cu care acest client se identifica</string> <string name="pref_accept_files">Accepta fisiere</string> <string name="pref_accept_files_summary">Accepta automat fisiere mai mici decat...</string> + <string name="pref_accept_files_size_summary">Accepta automat fisiere mai mici decat...</string> <string name="pref_notification_settings">Notificare</string> <string name="pref_notifications">Notificari</string> <string name="pref_notifications_summary">Notifica cand un nou mesaj este primit</string> @@ -488,6 +489,8 @@ <string name="recently_used">Folosit recent</string> <string name="choose_quick_action">Alege actiunea rapida</string> <string name="search_for_contacts_or_groups">Cauta contacte sau grupuri</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">Esuat</string> <string name="send_private_message">trimite mesaj privat</string> <string name="user_has_left_conference">%s a parasit conferinta!</string> <string name="username">Nume utilizator</string> @@ -498,8 +501,6 @@ <string name="download_failed_server_not_found">Descarcarea a esuat: Serverul nu a fost gasit</string> <string name="download_failed_file_not_found">Descarcare esuata: Fisierul nu a fost gasit</string> <string name="download_failed_could_not_connect">Descarcarea a esuat. Nu s-a putut realiza conexiunea cu gazda.</string> - <string name="pref_use_white_background">Foloseste un fundal alb</string> - <string name="pref_use_white_background_summary">Arata mesajele primite cu negru pe fond alb</string> <string name="account_status_tor_unavailable">Reteaua Tor nu este disponibila</string> <string name="server_info_broken">Deteriorat</string> <string name="pref_presence_settings">Setari de prezenta</string> @@ -529,11 +530,8 @@ <string name="verified_omemo_key_with_certificate">Verifica cheia OMEMO cu un certificat</string> <string name="device_does_not_support_certificates">Dispozitivul nu permite selectia unui certificat pentru client!</string> <string name="pref_connection_options">Optiuni conexiune</string> - <string name="pref_use_tor">Conectare prin TOR</string> - <string name="pref_use_tor_summary">Trimite toate conexiunile prin reteaua Tor. Necesita OrBot</string> <string name="account_settings_hostname">Nume gazda</string> <string name="account_settings_port">Port</string> - <string name="hostname_or_onion">Adresa server- sau .onion</string> <string name="not_a_valid_port">Acesta nu este un numar de port valabil</string> <string name="not_valid_hostname">Acesta nu este un nume de gazda valabila</string> <string name="connected_accounts">%1$d din %2$d conturi conectate</string> @@ -542,7 +540,6 @@ <item quantity="few">%d mesaje</item> <item quantity="other">%d mesaje</item> </plurals> - <string name="load_more_messages">Incarca mai multe mesaje</string> <string name="shared_file_with_x">Partajeaza fisierul cu %s...</string> <string name="shared_image_with_x">Partajeaza imaginea cu %s.</string> <string name="shared_images_with_x">Partajeaza imaginile cu %s.</string> @@ -562,8 +559,6 @@ Emitent</string> <string name="notify_only_when_highlighted">Notifica numai la evidentiere</string> <string name="notify_never">Notificari dezactivate</string> <string name="notify_paused">Notificari suspendate</string> - <string name="pref_picture_compression">Comprima imaginile</string> - <string name="pref_picture_compression_summary">Redimensioneaza si comprima imaginile</string> <string name="always">Mereu</string> <string name="automatically">Automat</string> <string name="battery_optimizations_enabled">Optimizare baterie activata</string> @@ -573,8 +568,6 @@ Emitent</string> <string name="selection_too_large">Zona selectata este prea mare</string> <string name="no_accounts">(Nici un cont activat)</string> <string name="this_field_is_required">Acest camp este obligatoriu</string> - <string name="correct_message">Corectie mesaj</string> - <string name="send_corrected_message">Trimite text corectat</string> <string name="no_keys_just_confirm">Deja ai incredere in acest contact. Selectand \'gata\' doar confirmi ca %s ia parte la conferinta.</string> <string name="select_image_and_crop">Selecteaza imaginea si decupeaza</string> <string name="this_account_is_disabled">Ai dezactivat acest cont</string> diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index c206717c..258cd4dd 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -101,6 +101,7 @@ <string name="pref_xmpp_resource_summary">Имя которым Conversations идентифицирует себя</string> <string name="pref_accept_files">Принимать файлы</string> <string name="pref_accept_files_summary">Автоматический прием файлов…</string> + <string name="pref_accept_files_size_summary">Автоматический прием файлов…</string> <string name="pref_notification_settings">Уведомление</string> <string name="pref_notifications">Уведомление</string> <string name="pref_notifications_summary">Использовать звуковое уведомление когда приходят новые сообщения</string> @@ -482,6 +483,8 @@ <string name="recently_used">Последнее выбранное</string> <string name="choose_quick_action">Выбрать быстрое действие</string> <string name="search_for_contacts_or_groups">Поиск контактов или групп</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">Не удалось</string> <string name="send_private_message">Отправить частное сообщение</string> <string name="user_has_left_conference">%s покинул конференцию!</string> <string name="username">Имя пользователя</string> @@ -492,8 +495,6 @@ <string name="download_failed_server_not_found">Загрузка не удалась: сервер не найден</string> <string name="download_failed_file_not_found">Загрузка не удалась: файл не найден</string> <string name="download_failed_could_not_connect">Загрузка не удалась: не удалось подключиться к серверу</string> - <string name="pref_use_white_background">Использовать белый фон</string> - <string name="pref_use_white_background_summary">Показывать принятые сообщения черным текстом на белом фоне</string> <string name="account_status_tor_unavailable">Сеть Tor недоступна</string> <string name="server_info_broken">Повреждено</string> <string name="pref_away_when_screen_off">Вышел когда экран выключен</string> @@ -518,11 +519,8 @@ <string name="verified_omemo_key_with_certificate">Проверен OMEMO ключ с сертификатом!</string> <string name="device_does_not_support_certificates">Ваше устройство не поддерживает выбор клиентских сертификатов!</string> <string name="pref_connection_options">Подключение</string> - <string name="pref_use_tor">Соединение через Tor</string> - <string name="pref_use_tor_summary">Направить все соединения через сеть TOR. Требуется Orbot</string> <string name="account_settings_hostname">Имя сервера</string> <string name="account_settings_port">Порт</string> - <string name="hostname_or_onion">Сервер- или .onion-Адрес</string> <string name="not_a_valid_port">Это недопустимый номер порта</string> <string name="not_valid_hostname">Это недопустимое имя сервера</string> <string name="connected_accounts">%1$d из %2$d аккаунтов соединены</string> @@ -542,17 +540,9 @@ <string name="notify_only_when_highlighted">Оповещение только при обращениях</string> <string name="notify_never">Уведомления запрещены</string> <string name="notify_paused">Уведомления приостановлены</string> - <string name="pref_picture_compression">Сжать изображения</string> - <string name="pref_picture_compression_summary">Изменить размер и сжать изображения</string> <string name="always">Всегда</string> <string name="automatically">Автоматически</string> <string name="battery_optimizations_enabled">Оптимизации энергопотребления разрешены</string> <string name="disable">Запретить</string> <string name="selection_too_large">Выбранная область слишком большая</string> - <string name="no_accounts">(Нет активных аккаунтов)</string> - <string name="this_field_is_required">Незаполненное поле</string> - <string name="correct_message">Исправить сообщение</string> - <string name="send_corrected_message">Отправить исправленное сообщение</string> - <string name="select_image_and_crop">Выбрать изображение</string> - <string name="this_account_is_disabled">Вы отключили этот аккаунт</string> </resources> diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index aaa39dd4..d8852d30 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -96,6 +96,7 @@ <string name="pref_xmpp_resource_summary">Meno, ktorým sa tento klient identifikuje</string> <string name="pref_accept_files">Prijať súbory</string> <string name="pref_accept_files_summary">Automaticky prijať súbory menšie ako…</string> + <string name="pref_accept_files_size_summary">Automaticky prijať súbory menšie ako…</string> <string name="pref_notifications">Upozornenia</string> <string name="pref_notifications_summary">Upozorniť pri prijatí novej správy</string> <string name="pref_vibrate">Vibrovať</string> @@ -443,11 +444,14 @@ <string name="recently_used">Naposledy použitý</string> <string name="choose_quick_action">Vybrať rýchlu voľbu</string> <string name="search_for_contacts_or_groups">Hľadať kontakty alebo skupiny</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">Zlyhal</string> <string name="send_private_message">Poslať súkromnú správu</string> <string name="user_has_left_conference">%s opustil skupinovú konverzáciu!</string> <string name="username">Užívateľské meno</string> <string name="username_hint">Užívateľské meno</string> <string name="invalid_username">Toto nie je platné užívateľské meno</string> + <string name="conference_name">Meno skupinovej konverzácie</string> <string name="pref_xa_on_silent_mode">Nedostupný v tichom režime</string> <string name="action_add_account_with_certificate">Pridať účet s certifikátom</string> <string name="unable_to_parse_certificate">Neschopný analyzovať certifikát</string> diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml index f4091e6b..fe5b5f20 100644 --- a/src/main/res/values-sr/strings.xml +++ b/src/main/res/values-sr/strings.xml @@ -103,6 +103,7 @@ <string name="pref_xmpp_resource_summary">Име са којим се овај клијент идентификује</string> <string name="pref_accept_files">Прихватај фајлове</string> <string name="pref_accept_files_summary">Аутоматски прихватај фајлове мање од…</string> + <string name="pref_accept_files_size_summary">Аутоматски прихватај фајлове мање од…</string> <string name="pref_notification_settings">Обавештење</string> <string name="pref_notifications">Обавештења</string> <string name="pref_notifications_summary">Обавести кад стигне нова порука</string> @@ -281,8 +282,6 @@ <string name="pref_security_settings">Безбедност</string> <string name="pref_force_encryption">Присили крај-на-крај шифровање</string> <string name="pref_force_encryption_summary">Увек шифруј поруке (осим за групна ћаскања)</string> - <string name="pref_allow_message_correction">Дозволи исправљање порука</string> - <string name="pref_allow_message_correction_summary">Дозвољава вашим контактима да ретроактивно уређују њихове поруке</string> <string name="pref_dont_save_encrypted">Не успремај шифроване поруке</string> <string name="pref_dont_save_encrypted_summary">Упозорење: Ово може да доведе до губитка порука</string> <string name="pref_expert_options">Поставке за стручњаке</string> @@ -493,6 +492,8 @@ <string name="recently_used">Недавно коришћена</string> <string name="choose_quick_action">Изаберите брзу радњу</string> <string name="search_for_contacts_or_groups">Тражите контакте или групе</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">Неуспех</string> <string name="send_private_message">Пошаљи личну поруку</string> <string name="user_has_left_conference">%s напусти групно ћаскање!</string> <string name="username">Корисничко име</string> @@ -503,8 +504,6 @@ <string name="download_failed_server_not_found">Преузимање није успело: сервер није нађен</string> <string name="download_failed_file_not_found">Преузимање није успело: фајл није нађен</string> <string name="download_failed_could_not_connect">Преузимање није успело: не могу да се повежем са домаћином</string> - <string name="pref_use_white_background">Користи белу позадину</string> - <string name="pref_use_white_background_summary">Приказ примљених порука црним текстом на белој позадини</string> <string name="account_status_tor_unavailable">Тор мрежа недоступна</string> <string name="server_info_broken">Оштећен</string> <string name="pref_presence_settings">Присутност</string> @@ -518,7 +517,7 @@ <string name="pref_show_connection_options_summary">Приказ домаћина и порта у поставкама налога</string> <string name="hostname_example">xmpp.primer.com</string> <string name="action_add_account_with_certificate">Додај налог сертификатом</string> - <string name="unable_to_parse_certificate">Не могох да рашчланим сертификат</string> + <string name="unable_to_parse_certificate">Не могу да рашчланим сертификат</string> <string name="authenticate_with_certificate">Оставите празно за аутентификацију сертификатом</string> <string name="mam_prefs">Поставке архивисања</string> <string name="server_side_mam_prefs">Серверске поставке архивисања</string> @@ -534,11 +533,8 @@ <string name="verified_omemo_key_with_certificate">Оверен ОМЕМО кључ помоћу сертификата!</string> <string name="device_does_not_support_certificates">Ваш уређај не подржава избор сертификата клијента!</string> <string name="pref_connection_options">Повезивање</string> - <string name="pref_use_tor">Повежи се преко Тора</string> - <string name="pref_use_tor_summary">Тунеловање свих веза кроз Тор мрежу. Захтева Орбот</string> <string name="account_settings_hostname">Име домаћина</string> <string name="account_settings_port">Порт</string> - <string name="hostname_or_onion">Сервер или .onion адреса</string> <string name="not_a_valid_port">Ово није исправан број порта</string> <string name="not_valid_hostname">Ово није исправно име домаћина</string> <string name="connected_accounts">%1$d од %2$d налога повезано</string> @@ -547,7 +543,6 @@ <item quantity="few">%d поруке</item> <item quantity="other">%d порука</item> </plurals> - <string name="load_more_messages">Учитај још порука</string> <string name="shared_file_with_x">Подељен фајл са %s</string> <string name="shared_image_with_x">Подељена слика са %s</string> <string name="shared_images_with_x">Подељене слике са %s</string> @@ -566,8 +561,6 @@ <string name="notify_only_when_highlighted">Обавештења само за означене поруке</string> <string name="notify_never">Обавештења искључена</string> <string name="notify_paused">Обавештења паузирана</string> - <string name="pref_picture_compression">Компресуј слике</string> - <string name="pref_picture_compression_summary">Промена величине и компресовање слика</string> <string name="always">увек</string> <string name="automatically">аутоматски</string> <string name="battery_optimizations_enabled">Оптимизација батерије је укључена</string> @@ -577,8 +570,6 @@ <string name="selection_too_large">Назначена површина је превелика</string> <string name="no_accounts">(Нема активираних налога)</string> <string name="this_field_is_required">Ово поље је захтевано</string> - <string name="correct_message">Исправи поруку</string> - <string name="send_corrected_message">Пошаљи исправљену поруку</string> <string name="no_keys_just_confirm">Већ се поуздате у овог контакта. Избором „Готово“ само потврђујете да је %s део овог групног ћаскања.</string> <string name="select_image_and_crop">Изабери слику и опсеци</string> <string name="this_account_is_disabled">Искључили сте овај налог</string> diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 2834cbb3..0468180a 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -103,6 +103,7 @@ <string name="pref_xmpp_resource_summary">Namnet klienten identifierar sig med</string> <string name="pref_accept_files">Acceptera filer</string> <string name="pref_accept_files_summary">Acceptera automatiskt filer som är mindre än…</string> + <string name="pref_accept_files_size_summary">Acceptera automatiskt filer som är mindre än…</string> <string name="pref_notification_settings">Notifiering</string> <string name="pref_notifications">Notifieringar</string> <string name="pref_notifications_summary">Notifiera när meddelande tagits emot</string> @@ -486,6 +487,8 @@ <string name="recently_used">Senast använd</string> <string name="choose_quick_action">Välj snabbfunktion</string> <string name="search_for_contacts_or_groups">Sök efter kontakter eller grupper</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">Lyckades ej</string> <string name="send_private_message">Skicka privat meddelande</string> <string name="user_has_left_conference">%s har lämnat konferensen!</string> <string name="username">Användarnamn</string> @@ -496,8 +499,6 @@ <string name="download_failed_server_not_found">Nerladdning gick fel: Server hittades inte</string> <string name="download_failed_file_not_found">Nerladdning gick fel: Filen hittades inte</string> <string name="download_failed_could_not_connect">Nerladdningen gick fel: Kunder inte ansluta till server</string> - <string name="pref_use_white_background">Använd vit bakgrund</string> - <string name="pref_use_white_background_summary">Visa mottagna meddelanden som svart text på vit bakgrund</string> <string name="account_status_tor_unavailable">Tor-nätverk ej tillgängligt</string> <string name="server_info_broken">Sönder</string> <string name="pref_presence_settings">Tillgänglighet</string> @@ -527,11 +528,8 @@ <string name="verified_omemo_key_with_certificate">Verifierade OMEMO-nyckel med certifikat!</string> <string name="device_does_not_support_certificates">Din enhet stödjer inte val av klientcertifikat!</string> <string name="pref_connection_options">Anslutning</string> - <string name="pref_use_tor">Ansluten via Tor</string> - <string name="pref_use_tor_summary">Tunnla alla anslutningar genom Tor-nätverket. Kräver Orbot</string> <string name="account_settings_hostname">Servernamn</string> <string name="account_settings_port">Port</string> - <string name="hostname_or_onion">Server- eller .onion-adress</string> <string name="not_a_valid_port">Inte ett giltigt portnummer</string> <string name="not_valid_hostname">Inte ett giltigt servernamn</string> <string name="connected_accounts">%1$d av %2$d konton anslutna</string> @@ -539,7 +537,6 @@ <item quantity="one">%d meddelande</item> <item quantity="other">%d meddelanden</item> </plurals> - <string name="load_more_messages">Ladda fler meddelanden</string> <string name="shared_file_with_x">Delade fil med %s</string> <string name="shared_image_with_x">Delade bild med %s</string> <string name="shared_images_with_x">Delade bilder med %s</string> @@ -558,8 +555,6 @@ <string name="notify_only_when_highlighted">Notifiera endast vid highlight</string> <string name="notify_never">Notifieringar deaktiverade</string> <string name="notify_paused">Notifieringar pausade</string> - <string name="pref_picture_compression">Komprimera bilder</string> - <string name="pref_picture_compression_summary">Storleksjustera och komprimera bilder</string> <string name="always">Alltid</string> <string name="automatically">Automatiskt</string> <string name="battery_optimizations_enabled">Batterioptimeringar aktiverade</string> @@ -569,8 +564,6 @@ <string name="selection_too_large">The valda området är för stort</string> <string name="no_accounts">(Inget konto aktiverat)</string> <string name="this_field_is_required">Detta fält måste fyllas i</string> - <string name="correct_message">Korrigera meddelanden</string> - <string name="send_corrected_message">Skicka korrigerat meddelande</string> <string name="no_keys_just_confirm">Du litar redan på denna kontakt. Genom att välja \'klar\' bekräftar du att %s är med i denna konferens.</string> <string name="select_image_and_crop">Välj bild och beskär</string> <string name="this_account_is_disabled">Du har deaktiverat detta konto</string> diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml index a1c08516..2063bdbf 100644 --- a/src/main/res/values-tr-rTR/strings.xml +++ b/src/main/res/values-tr-rTR/strings.xml @@ -101,6 +101,7 @@ <string name="pref_xmpp_resource_summary">İstemci kimliği</string> <string name="pref_accept_files">Dosyaları kabul et</string> <string name="pref_accept_files_summary">…‘den küçük olan dosyaları otomatik olarak kabul et</string> + <string name="pref_accept_files_size_summary">…‘den küçük olan dosyaları otomatik olarak kabul et</string> <string name="pref_notification_settings">Bildirim</string> <string name="pref_notifications">Bildirimler</string> <string name="pref_notifications_summary">Yeni ileti geldiğinde bildir</string> @@ -481,6 +482,8 @@ <string name="recently_used">En son kullanılanlar</string> <string name="choose_quick_action">Kısayolu seç</string> <string name="search_for_contacts_or_groups">Kişi veya gruplarda ara</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">Başarısız</string> <string name="send_private_message">Özel ileti gönder</string> <string name="user_has_left_conference">%s görüşmeden ayrıldı!</string> <string name="username">Kullanıcı adı</string> @@ -491,8 +494,6 @@ <string name="download_failed_server_not_found">İndirme başarısız: Sunucu bulunamadı</string> <string name="download_failed_file_not_found">İndirme başarısız: Dosya bulunamadı</string> <string name="download_failed_could_not_connect">İndirme başarısız: Sunucuya bağlanılamadı</string> - <string name="pref_use_white_background">Beyaz arka plan kullan</string> - <string name="pref_use_white_background_summary">Alınan iletileri beyaz arka plan üzerinde siyah yazıyla göster</string> <string name="account_status_tor_unavailable">Tor ağına erişilemiyor</string> <string name="server_info_broken">Bozuk</string> <string name="pref_presence_settings">Durum</string> @@ -522,18 +523,14 @@ <string name="verified_omemo_key_with_certificate">Sertifikalı OMEMO anahtarı onaylandı!</string> <string name="device_does_not_support_certificates">Cihazınız seçilen istemci sertifikalarını desteklemiyor!</string> <string name="pref_connection_options">Bağlantı</string> - <string name="pref_use_tor">Tor üzerinden bağlan</string> - <string name="pref_use_tor_summary">Bütün bağlantıları Tor ağı üzerinden aktar. Orbot gerekir.</string> <string name="account_settings_hostname">Sunucu adı</string> <string name="account_settings_port">Port</string> - <string name="hostname_or_onion">Sunucu- veya .onion-Address</string> <string name="not_a_valid_port">Bu port numarası geçerli değil</string> <string name="not_valid_hostname">Bu sunucu geçerli değil</string> <string name="connected_accounts"> %2$d hesabın %1$ kadarı bağlandı</string> <plurals name="x_messages"> <item quantity="other">%d ileti</item> </plurals> - <string name="load_more_messages">Daha fazla ileti yükle</string> <string name="shared_file_with_x">%s ile paylaşılan dosyalar</string> <string name="shared_image_with_x">%s ile paylaşılan resim</string> <string name="no_storage_permission">Conversations’ın harici depolama alanına erişmesi gerek </string> @@ -551,8 +548,6 @@ <string name="notify_only_when_highlighted">Sadece işaretliyse uyar</string> <string name="notify_never">Uyarılar devre dışı</string> <string name="notify_paused">Uyarılar geçici olarak durduruldu</string> - <string name="pref_picture_compression">Resimleri sıkıştır</string> - <string name="pref_picture_compression_summary">Resimleri yeniden boyutlandır ve sıkıştır</string> <string name="always">Her zaman</string> <string name="automatically">Otomatik olarak</string> <string name="battery_optimizations_enabled">Pil optimizasyonu devrede</string> @@ -562,8 +557,6 @@ <string name="selection_too_large">Seçilen alan çok büyük</string> <string name="no_accounts">(Aktif hesap bulunmuyor)</string> <string name="this_field_is_required">Bu alan zorunludur</string> - <string name="correct_message">ileti düzelt</string> - <string name="send_corrected_message">Düzeltilmiş iletiyi gönder</string> <string name="no_keys_just_confirm">Bu kişiye zaten güveniyor durumdasınız. \"tamam\" seçeneğini işaretleyerek, sadece %s \'in bu grup sohbete katılabileceğini teyid ediyorsunuz.</string> <string name="select_image_and_crop">Resmi seçip kırpın</string> <string name="this_account_is_disabled">Bu hesabı devre dışı bıraktınız</string> diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml index 8556c99a..57cb9dc3 100644 --- a/src/main/res/values-v21/themes.xml +++ b/src/main/res/values-v21/themes.xml @@ -13,6 +13,9 @@ <item name="TextSizeBody">14sp</item> <item name="TextSizeHeadline">20sp</item> + <item name="EmojiconSizeBody">19sp</item> + <item name="EmojiconSizeInput">24sp</item> + <item name="attr/icon_add_group">@drawable/ic_group_add_white_24dp</item> <item name="attr/icon_add_person">@drawable/ic_person_add_white_24dp</item> <item name="attr/icon_cancel">@drawable/ic_cancel_white_24dp</item> diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml index 2887af13..d2ca5940 100644 --- a/src/main/res/values-vi/strings.xml +++ b/src/main/res/values-vi/strings.xml @@ -101,6 +101,7 @@ <string name="pref_xmpp_resource_summary">Tên của máy trạm này được tự đặt là</string> <string name="pref_accept_files">Chấp thuận các tập tin</string> <string name="pref_accept_files_summary">Tự động chấp thuận các tập tin nhỏ hơn...</string> + <string name="pref_accept_files_size_summary">Tự động chấp thuận các tập tin nhỏ hơn...</string> <string name="pref_notifications">Thông báo</string> <string name="pref_notifications_summary">Thông báo khi có tin nhắn mới</string> <string name="pref_vibrate">Rung</string> @@ -466,16 +467,17 @@ <string name="recently_used">Dùng gần đây nhất</string> <string name="choose_quick_action">Chọn thao tác nhanh</string> <string name="search_for_contacts_or_groups">Tìm các liên hệ và nhóm</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">Đã thất bại</string> <string name="send_private_message">Gửi tin nhắn cá nhân</string> <string name="user_has_left_conference">%s đã rời khỏi diễn đàn!</string> <string name="username">Tên người dùng</string> <string name="username_hint">Tên người dùng</string> <string name="invalid_username">Đây không phải là tên người dùng hợp lệ</string> + <string name="conference_name">Tên diễn đàn</string> <string name="download_failed_server_not_found">Tải xuống thất bại: Không thấy máy chủ</string> <string name="download_failed_file_not_found">Tải xuống thất bại: Không thấy tập tin</string> <string name="download_failed_could_not_connect">Tải xuống thất bại: Không thể kết nối đến máy chủ</string> - <string name="pref_use_white_background">Dùng nền trắng</string> - <string name="pref_use_white_background_summary">Hiện các tin nhắn nhận được dưới dạng chữ đen trên nền trắng</string> <string name="account_status_tor_unavailable">Mạng Tor chưa sẵn sàng</string> <string name="server_info_broken">Bị hỏng</string> <string name="pref_away_when_screen_off">Vắng mặt khi màn hình tắt</string> @@ -494,11 +496,8 @@ <string name="error_fetching_omemo_key">Lỗi nhập khoá OMEMO!</string> <string name="verified_omemo_key_with_certificate">Khoá OMEMO đã xác minh với chứng nhận!</string> <string name="device_does_not_support_certificates">Thiết bị không hỗ trợ chọn lựa các chứng chỉ của máy trạm!</string> - <string name="pref_use_tor">Kết nối đến Tor</string> - <string name="pref_use_tor_summary">Chuyển toàn bộ kết nối thông qua mạng Tor. Cần có Orbot</string> <string name="account_settings_hostname">Tên máy chủ</string> <string name="account_settings_port">Cổng</string> - <string name="hostname_or_onion">Máy chủ- hoặc địa chỉ .onion-</string> <string name="not_a_valid_port">Đây không phải là số cổng hợp lệ</string> <string name="not_valid_hostname">Đây không phải là tên máy chủ hợp lệ</string> <string name="connected_accounts">%1$d trên %2$d tài khoản đã kết nối</string> @@ -521,7 +520,6 @@ <string name="notify_only_when_highlighted">Thông báo chỉ khi được làm nổi bật</string> <string name="notify_never">Đã tắt thông báo</string> <string name="notify_paused">Đã dừng thông báo</string> - <string name="pref_picture_compression">Nén hình ảnh</string> <string name="always">Luôn luôn</string> <string name="automatically">Tự động</string> <string name="battery_optimizations_enabled">Đã bật tối ưu pin</string> diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 9f041334..4c846c8f 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -484,6 +484,8 @@ <string name="recently_used">最近使用过的</string> <string name="choose_quick_action">选择快速动作</string> <string name="search_for_contacts_or_groups">搜索联系人或群组</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="dlg_msg_details_msg_status_failed">失败</string> <string name="send_private_message">发送私密消息</string> <string name="user_has_left_conference">%s 已离开讨论组！</string> <string name="username">用户名</string> @@ -494,8 +496,6 @@ <string name="download_failed_server_not_found">下载失败：未找到服务器</string> <string name="download_failed_file_not_found">下载失败：未找到文件</string> <string name="download_failed_could_not_connect">下载失败：无法连接到服务器</string> - <string name="pref_use_white_background">使用白色背景</string> - <string name="pref_use_white_background_summary">收到的消息将显示为白底黑字</string> <string name="account_status_tor_unavailable">Tor network 不可用</string> <string name="server_info_broken">损坏</string> <string name="pref_presence_settings">存在</string> @@ -525,18 +525,14 @@ <string name="verified_omemo_key_with_certificate">请用证书验证 OMEMO 密钥！</string> <string name="device_does_not_support_certificates">您的设备不支持设备证书选择！</string> <string name="pref_connection_options">连接</string> - <string name="pref_use_tor">通过 Tor 连接</string> - <string name="pref_use_tor_summary">所有连接使用 Tor 网络传输，需要 Orbot</string> <string name="account_settings_hostname">主机名</string> <string name="account_settings_port">端口</string> - <string name="hostname_or_onion">服务器 - 或者 .orion 地址</string> <string name="not_a_valid_port">该端口号无效</string> <string name="not_valid_hostname">该主机名无效</string> <string name="connected_accounts">%2$d 个中的 %1$d 个账户已连接</string> <plurals name="x_messages"> <item quantity="other">%d 条消息</item> </plurals> - <string name="load_more_messages">载入更多消息</string> <string name="shared_file_with_x">用 %s 分享文件</string> <string name="shared_image_with_x">用 %s 分享图片</string> <string name="shared_images_with_x">图片分享自 %s</string> @@ -555,8 +551,6 @@ <string name="notify_only_when_highlighted">仅当高亮时显示通知</string> <string name="notify_never">禁用通知</string> <string name="notify_paused">暂停通知</string> - <string name="pref_picture_compression">压缩图片</string> - <string name="pref_picture_compression_summary">裁剪并压缩图片</string> <string name="always">总是</string> <string name="automatically">自动</string> <string name="battery_optimizations_enabled">启用节电模式</string> @@ -568,8 +562,6 @@ <string name="selection_too_large">选择区域过大</string> <string name="no_accounts">(没有激活的账户)</string> <string name="this_field_is_required">必填</string> - <string name="correct_message">更正消息</string> - <string name="send_corrected_message">发送更正后的消息</string> <string name="no_keys_just_confirm">你已信任此联系人。选择“完成”表示 %s 将成为此讨论组的一部分。</string> <string name="select_image_and_crop">选择照片并裁剪</string> <string name="this_account_is_disabled">你已经禁用了此账户</string> diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index de919744..d42808e1 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -10,6 +10,7 @@ <string name="action_edit_contact">編輯姓名</string> <string name="action_delete_contact">從列表中刪除</string> <string name="title_activity_manage_accounts">管理帳戶</string> + <string name="title_activity_settings">設定</string> <string name="title_activity_conference_details">群組詳情</string> <string name="title_activity_contact_details">聯絡人詳情</string> <string name="title_activity_sharewith">分享對話</string> @@ -77,6 +78,8 @@ <string name="pref_xmpp_resource_summary">客戶端標示名稱</string> <string name="pref_accept_files">接收文件</string> <string name="pref_accept_files_summary">自動接收小於 … 的文件</string> + <string name="pref_accept_files_size_summary">自動接收小於 … 的文件</string> + <string name="pref_notification_settings">通知設定</string> <string name="pref_notifications">通知</string> <string name="pref_notifications_summary">收到新訊息時通知</string> <string name="pref_vibrate">震動</string> @@ -231,4 +234,7 @@ <string name="pref_expert_options_other">其他</string> <string name="pref_conference_name">群組名稱</string> <string name="pref_conference_name_summary">使用群組的名稱而不是 JID 來識別之。 </string> + <string name="dialog_manage_certs_negativebutton">取消</string> + <!--%s = bare jid, %d = count of online resources--> + <string name="conference_name">群組名稱</string> </resources> diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index 2058162c..f8028ea3 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -58,17 +58,27 @@ <item>location</item> </string-array> - <string-array name="picture_compression_values"> - <item>never</item> - <item>auto</item> - <item>always</item> - </string-array> + <string-array name="confirm_strings"> + <item>@string/pref_confirm_messages_none</item> + <item>@string/pref_confirm_messages_received</item> + <item>@string/pref_confirm_messages_read_and_received</item> + </string-array> - <string-array name="picture_compression_entries"> - <item>@string/never</item> - <item>@string/automatically</item> - <item>@string/always</item> - </string-array> + <string-array name="confirm_values"> + <item>0</item> + <item>1</item> + <item>2</item> + </string-array> + <string-array name="resize_picture_setting_entries"> + <item>@string/pref_resize_picture_ask</item> + <item>@string/pref_resize_picture_always</item> + <item>@string/pref_resize_picture_never</item> + </string-array> + <string-array name="resize_picture_setting_values"> + <item>ASK</item> + <item>ALWAYS</item> + <item>NEVER</item> + </string-array> <string-array name="mam_prefs"> <item>@string/never</item> diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 901ea754..135301c0 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -5,6 +5,9 @@ <attr name="TextSizeBody" format="dimension" /> <attr name="TextSizeHeadline" format="dimension" /> + <attr name="EmojiconSizeBody" format="dimension" /> + <attr name="EmojiconSizeInput" format="dimension" /> + <attr name="icon_add_group" format="reference"/> <attr name="icon_add_person" format="reference"/> <attr name="icon_cancel" format="reference"/> @@ -26,5 +29,8 @@ <attr name="icon_settings" format="reference"/> <attr name="icon_share" format="reference"/> <attr name="icon_import_export" format="reference"/> - + <declare-styleable name="AmbilWarnaPreference"> + <attr name="supportsAlpha" + format="boolean"/> + </declare-styleable> </resources>
\ No newline at end of file diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index b3567b44..2a0ad592 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -1,7 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="primary">#ff259b24</color> - <color name="primary_dark">#ff0a7e07</color> + <color name="primaryBackground">@color/grey50</color> + <color name="secondaryBackground">@color/grey200</color> + <color name="primaryText">@color/black87</color> + <color name="secondaryText">@color/black54</color> + <color name="tertiaryText">@color/black12</color> + + <color name="primaryTextOnDark">@color/white</color> + <color name="secondaryTextOnDark">@color/white70</color> + + <color name="warning">@color/red500</color> + <color name="error">@color/red500</color> + <color name="notification">@color/green500</color> + + <!-- Colors for presence status --> + <color name="online">@color/green500</color> + <color name="chat">@color/green500</color> + <color name="away">@color/orange500</color> + <color name="xa">@color/orange500</color> + <color name="dnd">#ffe51c23</color> + <color name="offline">#ffcccccc</color> + + <color name="primary">@color/green500</color> + <color name="primary_dark">@color/green700</color> <color name="accent">#ff0091ea</color> <color name="black87">#de000000</color> <color name="black54">#8a000000</color> @@ -17,4 +38,5 @@ <color name="red800">#ffc62828</color> <color name="orange500">#ffff9800</color> <color name="green500">#ff259b24</color> + <color name="green700">#ff0a7e07</color> </resources>
\ No newline at end of file diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index 95e80055..d5d4aad4 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -5,4 +5,8 @@ <dimen name="infocard_padding">16dp</dimen> <dimen name="conversations_overview_width">288dp</dimen> <dimen name="image_button_padding">8dp</dimen> + <dimen name="ambilwarna_hsvHeight">240dp</dimen> + <dimen name="ambilwarna_hsvWidth">240dp</dimen> + <dimen name="ambilwarna_hueWidth">30dp</dimen> + <dimen name="ambilwarna_spacer">8dp</dimen> </resources> diff --git a/src/main/res/values/encryption_settings.xml b/src/main/res/values/encryption_settings.xml new file mode 100644 index 00000000..33db8387 --- /dev/null +++ b/src/main/res/values/encryption_settings.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <bool name="omemo_enabled">false</bool> +</resources>
\ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index aadf81d7..63f76a59 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -107,6 +107,12 @@ <string name="pref_attachments">Attachments</string> <string name="pref_return_to_previous">Quick Sharing</string> <string name="pref_return_to_previous_summary">Immediately return to previous activity instead of opening the conversation after sharing something</string> + <string name="pref_accept_files_size">Size</string> + <string name="pref_accept_files_size_summary">Automatically accept files smaller than…</string> + <string name="pref_accept_files_download">Wi-Fi only</string> + <string name="pref_accept_files_download_summary">Download and accept files automatically only when using Wi-Fi</string> + <string name="pref_accept_files_download_link">Image links</string> + <string name="pref_accept_files_download_link_summary">Automatically download image links</string> <string name="pref_notification_settings">Notification</string> <string name="pref_notifications">Notifications</string> <string name="pref_notifications_summary">Notify when a new message arrives</string> @@ -123,7 +129,12 @@ <string name="pref_never_send_crash_summary">By sending in stack traces you are helping the ongoing development of Conversations</string> <string name="pref_confirm_messages">Confirm Messages</string> <string name="pref_confirm_messages_summary">Let your contact know when you have received and read a message</string> + <string name="pref_confirm_messages_none">No confirmation</string> + <string name="pref_confirm_messages_received">Confirmation for received message</string> + <string name="pref_confirm_messages_read_and_received">Confirmation for received and read message</string> <string name="pref_ui_options">UI</string> + <string name="pref_parse_emoticons">Parse Emoticons</string> + <string name="pref_parse_emoticons_summary">Replace emoticons with smilies.</string> <string name="openpgp_error">OpenKeychain reported an error</string> <string name="error_decrypting_file">I/O Error decrypting file</string> <string name="accept">Accept</string> @@ -294,8 +305,8 @@ <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"> - Conversations • the very last word in instant messaging. - \n\nCopyright © 2014-2016 Daniel Gultsch + Conversations+ is the improved version of Conversations. + \n\nThe extensions are designed and developed by thedevstack.de \n\nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or @@ -306,7 +317,8 @@ GNU General Public License for more details. \n\nYou should have received a copy of the GNU General Public License along with this program. If not, see https://www.gnu.org/licenses - \n\nDownload the full source code at https://github.com/siacs/Conversations + \n\nBased on + \n\nhttps://github.com/siacs/Conversations\n(GPL, Version 3.0) \n\n\nLibraries \n\nhttps://www.bouncycastle.org\n(The MIT License (MIT)) \n\nhttps://www.gnu.org/software/libidn\n(Apache License, Version 2.0) @@ -323,6 +335,8 @@ \n\nhttps://github.com/WhisperSystems/libaxolotl-java\n(GPLv3) \n\nhttps://github.com/vinc3m1/RoundedImageView\n(Apache License, Version 2.0) \n\nhttps://github.com/jdamcd/android-crop\n(Apache License, Version 2.0) + \n\nhttps://github.com/ankushsachdeva/emojicon\n(Apache License, Version 2.0) + \n\nhttps://github.com/yukuku/ambilwarna\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> @@ -441,6 +455,7 @@ <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="password_should_not_contain_only_spaces">Password should not contain only spaces</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> @@ -526,6 +541,55 @@ <string name="recently_used">Most recently used</string> <string name="choose_quick_action">Choose quick action</string> <string name="search_for_contacts_or_groups">Search for contacts or groups</string> + <string name="pref_led_notification_color">LED notification color</string> + <string name="pref_led_notification_color_summary">Change the color of the LED notification</string> + <string name="msg_ctx_mnu_details">Message Details</string> + <string name="dlg_msg_details_title">Message Details</string> + <string name="cplus_ok">Ok</string> + <string name="dlg_resources_title">%1$s (%2$d)</string><!-- %s = bare jid, %d = count of online resources --> + <string name="dlg_msg_details_receipient_resource">Recipient Resource:</string> + <string name="dlg_msg_details_receipient_nick">Recipient Nick:</string> + <string name="dlg_msg_details_sender_resource">Sender Resource:</string> + <string name="dlg_msg_details_sender_nick">Sender Nick:</string> + <string name="dlg_msg_details_time_sent">Time Sent:</string> + <string name="dlg_msg_details_msg_type">Message Type:</string> + <string name="dlg_msg_details_msg_status">Message Status:</string> + <string name="dlg_msg_details_file_details">File Details</string> + <string name="dlg_msg_details_file_mime">Mime Type</string> + <string name="dlg_msg_details_file_size">Size</string> + <string name="dlg_msg_details_msg_type_text">Text</string> + <string name="dlg_msg_details_msg_type_image">Image</string> + <string name="dlg_msg_details_msg_type_file">File</string> + <string name="dlg_msg_details_msg_type_status">Status</string> + <string name="dlg_msg_details_msg_type_private">Private</string> + <string name="dlg_msg_details_msg_status_sent">Sent</string> + <string name="dlg_msg_details_msg_status_received">Received</string> + <string name="dlg_msg_details_msg_status_waiting">Waiting</string> + <string name="dlg_msg_details_msg_status_unsend">Unsend</string> + <string name="dlg_msg_details_msg_status_offered">Offered</string> + <string name="dlg_msg_details_msg_status_failed">Failed</string> + <string name="pref_resize_picture_ask">ask</string> + <string name="pref_resize_picture_always">always</string> + <string name="pref_resize_picture_never">never</string> + <string name="pref_resize_picture_summary">Whether pictures shall be resized or not</string> + <string name="pref_resize_picture">Resize pictures</string> + <string name="cplus_yes">Yes</string> + <string name="cplus_no">No</string> + <string name="cplus_remember_userdecision">Remember this decision</string> + <string name="userdecision_question_resize_picture">Shall the picture be resized?</string> + <string name="title_activity_loginformation">Logoutput</string> + <string name="cplus_copy_to_clipboard">Copy to clipboard</string> + <string name="cplus_copied_to_clipboard">Copied to clipboard</string> + <string name="pref_show_logcat_title">Show logcat output</string> + <string name="pref_show_logcat_summary">Shows the output of logcat. This is useful for debugging.</string> + <string name="cplus_bugreport_jabberid">c+bugs@conference.thedevstack.de</string> + <string name="pref_file_transfer">Folder to save incoming files</string> + <string name="pref_file_transfer_folder_summary">This is the subdirectory for incoming files.</string> + <string name="pref_img_file_transfer">Folder to save incoming pictures</string> + <string name="pref_img_file_transfer_summary">This is the subdirectory in the pictures directory for incoming files.</string> + <string name="pref_file_transfer_category">File Transfer</string> + <string name="cplus_not_copied_to_clipboard_empty">Nothing to copy.</string> + <string name="cplus_me">Me</string> <string name="send_private_message">Send private message</string> <string name="user_has_left_conference">%s has left the conference!</string> <string name="username">Username</string> @@ -536,8 +600,6 @@ <string name="download_failed_server_not_found">Download failed: Server not found</string> <string name="download_failed_file_not_found">Download failed: File not found</string> <string name="download_failed_could_not_connect">Download failed: Could not connect to host</string> - <string name="pref_use_white_background">Use white background</string> - <string name="pref_use_white_background_summary">Show received messages as black text on a white background</string> <string name="account_status_tor_unavailable">Tor network unavailable</string> <string name="server_info_broken">Broken</string> <string name="pref_presence_settings">Presence</string> @@ -567,11 +629,8 @@ <string name="verified_omemo_key_with_certificate">Verified OMEMO key with certificate!</string> <string name="device_does_not_support_certificates">Your device does not support the selection of client certificates!</string> <string name="pref_connection_options">Connection</string> - <string name="pref_use_tor">Connect via Tor</string> - <string name="pref_use_tor_summary">Tunnel all connections through the Tor network. Requires Orbot</string> <string name="account_settings_hostname">Hostname</string> <string name="account_settings_port">Port</string> - <string name="hostname_or_onion">Server- or .onion-Address</string> <string name="not_a_valid_port">This is not a valid port number</string> <string name="not_valid_hostname">This is not a valid hostname</string> <string name="connected_accounts">%1$d of %2$d accounts connected</string> @@ -579,7 +638,6 @@ <item quantity="one">%d message</item> <item quantity="other">%d messages</item> </plurals> - <string name="load_more_messages">Load more messages</string> <string name="shared_file_with_x">Shared file with %s</string> <string name="shared_image_with_x">Shared image with %s</string> <string name="shared_images_with_x">Shared images with %s</string> @@ -599,8 +657,6 @@ <string name="notify_only_when_highlighted">Notify only when highlighted</string> <string name="notify_never">Notifications disabled</string> <string name="notify_paused">Notifications paused</string> - <string name="pref_picture_compression">Compress Pictures</string> - <string name="pref_picture_compression_summary">Resize and compress pictures</string> <string name="always">Always</string> <string name="automatically">Automatically</string> <string name="battery_optimizations_enabled">Battery optimizations enabled</string> @@ -610,11 +666,12 @@ <string name="selection_too_large">The selected area is too large</string> <string name="no_accounts">(No activated accounts)</string> <string name="this_field_is_required">This field is required</string> - <string name="correct_message">Correct message</string> - <string name="send_corrected_message">Send corrected message</string> + <string name="pref_omemo_enabled_summary">Enable OMEMO?</string> + <string name="pref_omemo_enabled_title">Enable OMEMO</string> <string name="no_keys_just_confirm">You already trust this contact. By selecting \'done\' you are just confirming that %s is part of this conference.</string> <string name="select_image_and_crop">Select image and crop</string> <string name="this_account_is_disabled">You have disabled this account</string> + <string name="cplus_copy_item">Copy item</string> <string name="security_error_invalid_file_access">Security error: Invalid file access</string> <string name="no_application_to_share_uri">No application found to share URI</string> <string name="share_uri_with">Share URI with…</string> diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index e8572d9d..450cf183 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -4,18 +4,5 @@ <item name="android:layout_height">1.5dp</item> <item name="android:background">@color/black12</item> </style> - <style name="MD"> - <item name="animationVelocity">6</item> - <item name="insetBottom">16dp</item> - <item name="insetTop">16dp</item> - <item name="insetLeft">16dp</item> - <item name="insetRight">16dp</item> - <item name="measureFactor">1.4</item> - <item name="offDrawable">@drawable/switch_back_off</item> - <item name="onDrawable">@drawable/switch_back_on</item> - <item name="thumbDrawable">@drawable/switch_thumb</item> - <item name="thumb_margin">-17dp</item> - <item name="android:padding">16dp</item> - </style> </resources>
\ No newline at end of file diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 424db4c9..4209a39a 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -9,6 +9,9 @@ <item name="TextSizeBody">14sp</item> <item name="TextSizeHeadline">20sp</item> + <item name="EmojiconSizeBody">19sp</item> + <item name="EmojiconSizeInput">24sp</item> + <item name="attr/icon_add_group">@drawable/ic_action_add_group</item> <item name="attr/icon_add_person">@drawable/ic_action_add_person</item> <item name="attr/icon_cancel">@drawable/ic_action_cancel</item> @@ -37,6 +40,7 @@ <item name="TextSizeInfo">14sp</item> <item name="TextSizeBody">16sp</item> <item name="TextSizeHeadline">22sp</item> + <item name="EmojiconSizeBody">22sp</item> </style> <style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse"> diff --git a/src/main/res/xml/filepaths.xml b/src/main/res/xml/filepaths.xml new file mode 100644 index 00000000..71062dda --- /dev/null +++ b/src/main/res/xml/filepaths.xml @@ -0,0 +1,4 @@ +<paths xmlns:android="http://schemas.android.com/apk/res/android"> + <files-path name="conversationsplus_images" path="Images/"/> + <files-path name="conversationsplus_files" path="files/" /> +</paths>
\ No newline at end of file diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index d1ba6b7f..90ac3c0b 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" > <PreferenceCategory android:title="@string/pref_general"> <CheckBoxPreference @@ -15,62 +16,121 @@ android:key="resource" android:summary="@string/pref_xmpp_resource_summary" android:title="@string/pref_xmpp_resource"/> - <CheckBoxPreference - android:defaultValue="true" - android:key="confirm_messages" + <ListPreference + android:defaultValue="2" + android:entries="@array/confirm_strings" + android:entryValues="@array/confirm_values" + android:key="confirm_messages_list" android:summary="@string/pref_confirm_messages_summary" - android:title="@string/pref_confirm_messages"/> + android:title="@string/pref_confirm_messages" /> <CheckBoxPreference android:defaultValue="false" android:key="chat_states" android:summary="@string/pref_chat_states_summary" android:title="@string/pref_chat_states"/> + <CheckBoxPreference + android:defaultValue="true" + android:key="parse_emoticons" + android:summary="@string/pref_parse_emoticons_summary" + android:title="@string/pref_parse_emoticons"/> + </PreferenceCategory> + <PreferenceCategory android:title="@string/pref_file_transfer_category"> + <PreferenceScreen + android:summary="@string/pref_accept_files_summary" + android:title="@string/pref_accept_files"> + + <CheckBoxPreference + android:defaultValue="true" + android:key="auto_download_file_link" + android:summary="@string/pref_accept_files_download_link_summary" + android:title="@string/pref_accept_files_download_link" /> + + <ListPreference + android:defaultValue="524288" + android:entries="@array/filesizes" + android:entryValues="@array/filesizes_values" + android:key="auto_accept_file_size" + android:summary="@string/pref_accept_files_size_summary" + android:title="@string/pref_accept_files_size" /> + + <CheckBoxPreference + android:defaultValue="true" + android:key="auto_download_file_wlan" + android:summary="@string/pref_accept_files_download_summary" + android:title="@string/pref_accept_files_download" /> + </PreferenceScreen> + <EditTextPreference + android:title="@string/pref_img_file_transfer" + android:summary="@string/pref_file_transfer_folder_summary" + android:key="file_transfer_folder" + android:defaultValue="Conversations+"/> + <EditTextPreference + android:title="@string/pref_file_transfer" + android:summary="@string/pref_img_file_transfer_summary" + android:key="img_transfer_folder" + android:defaultValue="Conversations+"/> + + <ListPreference + android:defaultValue="ASK" + android:entries="@array/resize_picture_setting_entries" + android:entryValues="@array/resize_picture_setting_values" + android:key="resize_picture" + android:summary="@string/pref_resize_picture_summary" + android:title="@string/pref_resize_picture"/> + <CheckBoxPreference + android:defaultValue="false" + android:key="return_to_previous" + android:title="@string/pref_return_to_previous" + android:summary="@string/pref_return_to_previous_summary"/> </PreferenceCategory> <PreferenceCategory android:key="notifications" android:title="@string/pref_notification_settings"> - <CheckBoxPreference - android:defaultValue="true" - android:key="show_notification" - android:summary="@string/pref_notifications_summary" - android:title="@string/pref_notifications"/> <PreferenceScreen - android:dependency="show_notification" - android:key="quiet_hours" - android:summary="@string/pref_quiet_hours_summary" - android:title="@string/title_pref_quiet_hours"> + android:summary="@string/pref_notification_settings" + android:title="@string/pref_notifications" > <CheckBoxPreference - android:defaultValue="false" - android:key="enable_quiet_hours" + android:defaultValue="true" + android:key="show_notification" + android:summary="@string/pref_notifications_summary" + android:title="@string/pref_notifications" /> + <PreferenceScreen + android:dependency="show_notification" + android:key="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" - android:summary="@string/pref_vibrate_summary" - android:title="@string/pref_vibrate"/> - <CheckBoxPreference - android:defaultValue="true" - android:dependency="show_notification" - android:key="led" - android:title="@string/pref_led" - android:summary="@string/pref_led_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" + android:summary="@string/pref_vibrate_summary" + android:title="@string/pref_vibrate"/> + <CheckBoxPreference + android:defaultValue="true" + android:dependency="show_notification" + android:key="led" + android:title="@string/pref_led" + android:summary="@string/pref_led_summary"/> <RingtonePreference android:defaultValue="content://settings/system/notification_sound" android:dependency="show_notification" @@ -78,28 +138,14 @@ android:ringtoneType="notification" android:summary="@string/pref_sound_summary" android:title="@string/pref_sound"/> - </PreferenceCategory> - <PreferenceCategory - android:title="@string/pref_attachments"> - <ListPreference - android:defaultValue="524288" - android:entries="@array/filesizes" - android:entryValues="@array/filesizes_values" - android:key="auto_accept_file_size" - android:summary="@string/pref_accept_files_summary" - android:title="@string/pref_accept_files"/> - <ListPreference - android:defaultValue="auto" - android:entries="@array/picture_compression_entries" - android:entryValues="@array/picture_compression_values" - android:key="picture_compression" - android:summary="@string/pref_picture_compression_summary" - android:title="@string/pref_picture_compression"/> - <CheckBoxPreference - android:defaultValue="false" - android:key="return_to_previous" - android:title="@string/pref_return_to_previous" - android:summary="@string/pref_return_to_previous_summary"/> + + <yuku.ambilwarna.widget.AmbilWarnaPreference + android:defaultValue="0xffffffff" + android:key="led_notify_color" + android:title="@string/pref_led_notification_color" + app:supportsAlpha="true" + android:summary="@string/pref_led_notification_color_summary"/> + </PreferenceScreen> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_ui_options"> <CheckBoxPreference @@ -109,11 +155,6 @@ android:title="@string/pref_conference_name"/> <CheckBoxPreference android:defaultValue="false" - android:key="use_white_background" - android:summary="@string/pref_use_white_background_summary" - android:title="@string/pref_use_white_background"/> - <CheckBoxPreference - android:defaultValue="false" android:key="use_larger_font" android:summary="@string/pref_use_larger_font_summary" android:title="@string/pref_use_larger_font"/> @@ -169,11 +210,6 @@ android:title="@string/pref_connection_options"> <CheckBoxPreference android:defaultValue="false" - android:key="use_tor" - android:summary="@string/pref_use_tor_summary" - android:title="@string/pref_use_tor"/> - <CheckBoxPreference - android:defaultValue="false" android:key="show_connection_options" android:summary="@string/pref_show_connection_options_summary" android:title="@string/pref_show_connection_options"/> @@ -229,6 +265,14 @@ android:key="export_logs" android:summary="@string/pref_export_logs_summary" android:title="@string/pref_export_logs"/> + <de.thedevstack.conversationsplus.ui.preferences.LogInformationPreference + android:summary="@string/pref_show_logcat_summary" + android:title="@string/pref_show_logcat_title"/> + <CheckBoxPreference + android:defaultValue="@bool/omemo_enabled" + android:key="omemo_enabled" + android:summary="@string/pref_omemo_enabled_summary" + android:title="@string/pref_omemo_enabled_title"/> </PreferenceCategory> </PreferenceScreen> |
