From defac037deec921715102adb7aa34a06e1941a56 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Wed, 12 Dec 2018 01:50:35 +0100 Subject: [PATCH] rework strings --- AndroidManifest.xml | 10 +- res/layout/activity_qr_show.xml | 2 +- res/layout/attachment_type_selector.xml | 30 +- res/layout/audio_view.xml | 4 +- res/layout/contact_filter_toolbar.xml | 2 +- .../contact_selection_list_fragment.xml | 2 +- res/layout/contact_selection_list_item.xml | 2 +- ...sation_activity_attachment_editor_stub.xml | 2 +- res/layout/conversation_fragment.xml | 4 +- res/layout/conversation_input_panel.xml | 12 +- res/layout/conversation_item_footer.xml | 2 +- res/layout/conversation_item_received.xml | 2 +- .../conversation_item_received_thumbnail.xml | 2 +- .../conversation_item_sent_thumbnail.xml | 2 +- res/layout/conversation_item_thumbnail.xml | 2 +- res/layout/conversation_list_fragment.xml | 4 +- .../conversation_list_item_inbox_zero.xml | 4 +- res/layout/conversation_list_item_view.xml | 4 +- res/layout/conversation_title_view.xml | 2 +- res/layout/delivery_status_view.xml | 6 +- res/layout/group_create_activity.xml | 8 +- res/layout/invite_activity.xml | 6 +- .../media_overview_documents_fragment.xml | 2 +- .../media_overview_gallery_fragment.xml | 2 +- res/layout/media_overview_gallery_item.xml | 2 +- res/layout/media_view.xml | 2 +- .../preference_divider_explain_autocrypt.xml | 2 +- res/layout/profile_create_activity.xml | 8 +- res/layout/registration_activity.xml | 32 +- res/layout/reminder_header.xml | 2 +- res/layout/share_activity.xml | 2 +- res/layout/thumbnail_view.xml | 2 +- res/layout/transport_selection_list_item.xml | 2 +- res/layout/welcome_activity.xml | 2 +- res/menu/action_mode_delete.xml | 4 +- res/menu/conversation.xml | 6 +- res/menu/conversation_archive.xml | 2 +- res/menu/conversation_context.xml | 14 +- res/menu/conversation_delete.xml | 2 +- res/menu/conversation_list_batch_archive.xml | 2 +- .../conversation_list_batch_unarchive.xml | 2 +- res/menu/conversation_muted.xml | 2 +- res/menu/conversation_popup.xml | 2 +- res/menu/conversation_push_group_options.xml | 4 +- res/menu/conversation_unarchive.xml | 2 +- res/menu/conversation_unmuted.xml | 2 +- res/menu/group_create.xml | 2 +- res/menu/media_overview_context.xml | 2 +- res/menu/media_preview.xml | 8 +- res/menu/preferences_create_profile_menu.xml | 2 +- res/menu/text_secure_normal.xml | 11 +- res/menu/view_log.xml | 2 +- res/values/arrays.xml | 80 +- res/values/strings.xml | 1289 +++++------------ res/values/styles.xml | 2 +- res/xml/preferences.xml | 14 +- res/xml/preferences_advanced.xml | 16 +- res/xml/preferences_app_protection.xml | 34 +- res/xml/preferences_appearance.xml | 6 +- res/xml/preferences_chats.xml | 23 +- res/xml/preferences_notifications.xml | 20 +- res/xml/recipient_preferences.xml | 16 +- .../ApplicationPreferencesActivity.java | 6 +- .../securesms/BaseActionBarActivity.java | 2 +- .../BlockedAndShareContactsActivity.java | 7 +- .../securesms/ClearProfileAvatarActivity.java | 4 +- .../ContactSelectionListFragment.java | 6 +- .../securesms/ConversationActivity.java | 33 +- .../securesms/ConversationAdapter.java | 2 +- .../securesms/ConversationFragment.java | 30 +- .../securesms/ConversationItem.java | 4 +- .../securesms/ConversationListActivity.java | 4 +- .../ConversationListArchiveActivity.java | 3 +- .../securesms/ConversationListFragment.java | 44 +- .../securesms/ConversationTitleView.java | 2 +- .../securesms/CreateProfileActivity.java | 14 +- .../securesms/GroupCreateActivity.java | 12 +- .../securesms/InviteActivity.java | 8 +- .../securesms/MediaOverviewActivity.java | 17 +- .../securesms/MediaPreviewActivity.java | 16 +- .../thoughtcrime/securesms/MuteDialog.java | 2 +- .../securesms/NewConversationActivity.java | 3 +- .../securesms/QrScanActivity.java | 4 +- .../securesms/QrShowActivity.java | 14 +- .../RecipientPreferenceActivity.java | 29 +- .../securesms/RegistrationActivity.java | 12 +- .../thoughtcrime/securesms/ShareActivity.java | 2 +- .../securesms/TransportOptions.java | 4 +- .../securesms/WelcomeActivity.java | 4 +- .../securesms/audio/AudioSlidePlayer.java | 2 +- .../components/CustomDefaultPreference.java | 6 +- .../securesms/components/DocumentView.java | 2 +- .../securesms/components/InputPanel.java | 2 +- .../securesms/components/QuoteView.java | 8 +- .../securesms/components/SearchToolbar.java | 4 +- .../components/reminder/DozeReminder.java | 4 +- .../reminder/ExpiredBuildReminder.java | 42 - .../reminder/OutdatedBuildReminder.java | 52 - .../connect/ApplicationDcContext.java | 14 +- .../securesms/connect/KeepAliveService.java | 6 +- .../contacts/ContactSelectionListAdapter.java | 8 +- .../loaders/BucketedThreadMediaLoader.java | 8 +- .../securesms/mms/AttachmentManager.java | 19 +- .../securesms/mms/AudioSlide.java | 4 +- .../securesms/mms/ImageSlide.java | 2 +- .../securesms/mms/VideoSlide.java | 2 +- .../AbstractNotificationBuilder.java | 4 +- .../notifications/MessageNotifier.java | 4 +- .../MultipleRecipientNotificationBuilder.java | 6 +- .../SingleRecipientNotificationBuilder.java | 20 +- .../securesms/permissions/Permissions.java | 8 +- .../AdvancedPreferenceFragment.java | 44 +- .../AppProtectionPreferenceFragment.java | 12 +- .../AppearancePreferenceFragment.java | 12 +- .../preferences/ChatBackgroundActivity.java | 2 +- .../preferences/ChatsPreferenceFragment.java | 11 +- .../ListSummaryPreferenceFragment.java | 2 +- .../NotificationsPreferenceFragment.java | 8 +- .../widgets/ProfilePreference.java | 2 +- .../widgets/ProgressPreference.java | 61 - .../securesms/qr/QrScanHandler.java | 27 +- .../securesms/scribbles/ScribbleActivity.java | 2 +- .../securesms/search/SearchFragment.java | 4 +- .../securesms/search/SearchListAdapter.java | 10 +- .../securesms/util/DateUtils.java | 20 +- .../thoughtcrime/securesms/util/Dialogs.java | 17 +- .../securesms/util/ExpirationUtil.java | 50 - .../securesms/util/LongClickCopySpan.java | 2 +- .../securesms/util/SaveAttachmentTask.java | 17 +- .../securesms/util/ScreenLockUtil.java | 2 +- .../securesms/video/VideoPlayer.java | 2 +- 131 files changed, 905 insertions(+), 1662 deletions(-) delete mode 100644 src/org/thoughtcrime/securesms/components/reminder/ExpiredBuildReminder.java delete mode 100644 src/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java delete mode 100644 src/org/thoughtcrime/securesms/preferences/widgets/ProgressPreference.java delete mode 100644 src/org/thoughtcrime/securesms/util/ExpirationUtil.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c178f1b5b..65f301ee3 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -114,7 +114,7 @@ @@ -150,7 +150,7 @@ android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> @@ -169,12 +169,12 @@ android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> @@ -232,7 +232,7 @@ android:theme="@style/Theme.AppCompat.Dialog.Alert" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" android:icon="@drawable/clear_profile_avatar" - android:label="@string/AndroidManifest_remove_photo"> + android:label="@string/menu_delete_image"> diff --git a/res/layout/activity_qr_show.xml b/res/layout/activity_qr_show.xml index 0eefb4714..d757fcccc 100644 --- a/res/layout/activity_qr_show.xml +++ b/res/layout/activity_qr_show.xml @@ -9,7 +9,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:contentDescription="@string/qr_scan_activity__title" /> + android:contentDescription="@string/qrscan_title" /> + android:text="@string/gallery"/> @@ -64,14 +64,14 @@ android:layout_height="53dp" android:src="@drawable/ic_headset_white_24dp" android:scaleType="center" - android:contentDescription="@string/attachment_type_selector__audio_description" + android:contentDescription="@string/audio" app:circleColor="@color/orange_400"/> + android:text="@string/audio"/> @@ -87,14 +87,14 @@ android:layout_height="53dp" android:src="@drawable/ic_insert_drive_file_white_24dp" android:scaleType="center" - android:contentDescription="@string/attachment_type_selector__file_description" + android:contentDescription="@string/file" app:circleColor="@color/red_400"/> + android:text="@string/file"/> @@ -111,7 +111,7 @@ android:src="@drawable/ic_gif_white_24dp" android:visibility="gone" android:scaleType="center" - android:contentDescription="@string/attachment_type_selector__gif_description" + android:contentDescription="@string/gif" app:circleColor="@color/cyan_400"/> + android:text="@string/gif"/> @@ -146,7 +146,7 @@ android:layout_height="53dp" android:src="@drawable/ic_camera_white_24dp" android:scaleType="center" - android:contentDescription="@string/attachment_type_selector__camera_description" + android:contentDescription="@string/camera" app:circleColor="@color/green_400"/> + android:text="@string/camera"/> @@ -171,14 +171,14 @@ android:layout_height="53dp" android:src="@drawable/ic_location_on_white_24dp" android:scaleType="center" - android:contentDescription="@string/attachment_type_selector__location_description" + android:contentDescription="@string/location" app:circleColor="@color/blue_grey_400"/> + android:text="@string/location"/> @@ -194,14 +194,14 @@ android:layout_height="53dp" android:src="@drawable/ic_person_white_24dp" android:scaleType="center" - android:contentDescription="@string/attachment_type_selector__contact_description" + android:contentDescription="@string/contact" app:circleColor="@color/blue_400"/> + android:text="@string/contact"/> @@ -217,7 +217,7 @@ android:layout_height="53dp" android:src="@drawable/ic_keyboard_arrow_down_white_24dp" android:scaleType="center" - android:contentDescription="@string/attachment_type_selector__drawer_description" + android:contentDescription="@string/menu_add_attachment" app:circleColor="@color/gray50"/> + android:contentDescription="@string/menu_play"/> + android:contentDescription="@string/menu_pause"/> diff --git a/res/layout/contact_filter_toolbar.xml b/res/layout/contact_filter_toolbar.xml index 1b0aa75a6..5efb28f87 100644 --- a/res/layout/contact_filter_toolbar.xml +++ b/res/layout/contact_filter_toolbar.xml @@ -21,7 +21,7 @@ android:contentDescription="@string/email_address" android:fontFamily="sans-serif" android:gravity="center_vertical" - android:hint="@string/contact_selection_activity__enter_name_or_email" + android:hint="@string/contacts_enter_name_or_email" android:inputType="textPersonName" android:textCursorDrawable="@null" android:textSize="18sp" /> diff --git a/res/layout/contact_selection_list_fragment.xml b/res/layout/contact_selection_list_fragment.xml index ca642b2b0..9a83a27dd 100644 --- a/res/layout/contact_selection_list_fragment.xml +++ b/res/layout/contact_selection_list_fragment.xml @@ -22,7 +22,7 @@ android:layout_height="match_parent" android:gravity="center|center_vertical" android:layout_marginTop="15dp" - android:text="@string/contact_selection_group_activity__finding_contacts" + android:text="@string/one_moment" android:textSize="20sp" /> diff --git a/res/layout/contact_selection_list_item.xml b/res/layout/contact_selection_list_item.xml index 4b3b432fc..cae5eae77 100644 --- a/res/layout/contact_selection_list_item.xml +++ b/res/layout/contact_selection_list_item.xml @@ -20,7 +20,7 @@ android:foreground="@drawable/contact_photo_background" android:cropToPadding="true" tools:src="@color/blue_600" - android:contentDescription="@string/SingleContactSelectionActivity_contact_photo" /> + android:contentDescription="@null" /> diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml index 722d7b244..6c990ed30 100644 --- a/res/layout/conversation_input_panel.xml +++ b/res/layout/conversation_input_panel.xml @@ -62,7 +62,7 @@ android:layout_height="match_parent" android:layout_gravity="center_vertical" android:background="@drawable/touch_highlight_background" - android:contentDescription="@string/conversation_activity__emoji_toggle_description" /> + android:contentDescription="@string/menu_toggle_keyboard" /> + android:contentDescription="@string/camera" /> + android:contentDescription="@string/audio" /> diff --git a/res/layout/conversation_item_footer.xml b/res/layout/conversation_item_footer.xml index bd7863e0f..93d0c0ed8 100644 --- a/res/layout/conversation_item_footer.xml +++ b/res/layout/conversation_item_footer.xml @@ -15,7 +15,7 @@ android:src="@drawable/msg_encr_out" android:visibility="gone" android:layout_gravity="center_vertical|end" - android:contentDescription="@string/conversation_item__secure_message_description" + android:contentDescription="@string/chat_input_placeholder" tools:visibility="visible"/> + android:contentDescription="@null" /> diff --git a/res/layout/conversation_item_received_thumbnail.xml b/res/layout/conversation_item_received_thumbnail.xml index 3d93f459a..32c3e7fdd 100644 --- a/res/layout/conversation_item_received_thumbnail.xml +++ b/res/layout/conversation_item_received_thumbnail.xml @@ -8,7 +8,7 @@ android:layout_height="@dimen/media_bubble_default_dimens" android:scaleType="centerCrop" android:adjustViewBounds="true" - android:contentDescription="@string/conversation_item__mms_image_description" + android:contentDescription="@string/image" android:visibility="gone" android:elevation="8dp" app:conversationThumbnail_minWidth="@dimen/media_bubble_min_width" diff --git a/res/layout/conversation_item_sent_thumbnail.xml b/res/layout/conversation_item_sent_thumbnail.xml index fc7af1b51..fb84ec2a5 100644 --- a/res/layout/conversation_item_sent_thumbnail.xml +++ b/res/layout/conversation_item_sent_thumbnail.xml @@ -10,7 +10,7 @@ android:layout_gravity="center" android:scaleType="centerCrop" android:adjustViewBounds="true" - android:contentDescription="@string/conversation_item__mms_image_description" + android:contentDescription="@string/chat_input_placeholder" android:visibility="gone" android:elevation="8dp" app:conversationThumbnail_minWidth="@dimen/media_bubble_min_width" diff --git a/res/layout/conversation_item_thumbnail.xml b/res/layout/conversation_item_thumbnail.xml index 3876fa7e0..0851fc4a7 100644 --- a/res/layout/conversation_item_thumbnail.xml +++ b/res/layout/conversation_item_thumbnail.xml @@ -11,7 +11,7 @@ android:clickable="false" android:longClickable="false" android:scaleType="fitCenter" - android:contentDescription="@string/conversation_item__mms_image_description" + android:contentDescription="@string/image" app:thumbnail_radius="1dp"/> - + android:contentDescription="@string/menu_new_chat"/> diff --git a/res/layout/conversation_list_item_inbox_zero.xml b/res/layout/conversation_list_item_inbox_zero.xml index 149e45ad9..760cbfae8 100644 --- a/res/layout/conversation_list_item_inbox_zero.xml +++ b/res/layout/conversation_list_item_inbox_zero.xml @@ -11,7 +11,7 @@ android:textSize="25sp" android:gravity="center" android:padding="16dp" - android:text="@string/conversation_list_item_inbox_zero__inbox_zeeerrro"/> + android:text="@string/chat_all_done_hint"/> + android:text="@string/chat_all_done_explain"/> \ No newline at end of file diff --git a/res/layout/conversation_list_item_view.xml b/res/layout/conversation_list_item_view.xml index 49ec6f211..e9a8e4e39 100644 --- a/res/layout/conversation_list_item_view.xml +++ b/res/layout/conversation_list_item_view.xml @@ -20,7 +20,7 @@ android:layout_centerVertical="true" android:cropToPadding="true" tools:src="@drawable/ic_contact_picture" - android:contentDescription="@string/conversation_list_item_view__contact_photo_image" + android:contentDescription="@string/pref_profile_photo" android:layout_marginLeft="12dp" android:layout_marginRight="12dp" /> @@ -114,7 +114,7 @@ android:paddingTop="1dp" android:paddingBottom="1dp" style="@style/Signal.Text.Caption" - android:text="@string/conversation_list_item_view__archived" + android:text="@string/chat_archived_label" android:textColor="?attr/conversation_list_item_date_color" android:textAllCaps="true" android:background="@drawable/archived_indicator_background" /> diff --git a/res/layout/conversation_title_view.xml b/res/layout/conversation_title_view.xml index d2dba8195..783ccad60 100644 --- a/res/layout/conversation_title_view.xml +++ b/res/layout/conversation_title_view.xml @@ -37,7 +37,7 @@ android:clickable="true" app:inverted="true" tools:src="@drawable/ic_contact_picture" - android:contentDescription="@string/conversation_list_item_view__contact_photo_image"/> + android:contentDescription="@string/pref_profile_photo"/> + android:contentDescription="@string/message_delivered" /> @@ -38,7 +38,7 @@ android:src="@drawable/ic_delivery_status_failed" android:paddingLeft="2dp" android:visibility="gone" - android:contentDescription="@string/conversation_item_sent__send_failed_indicator_description" + android:contentDescription="@string/error" android:tint="@color/core_blue" tools:visibility="visible"/> diff --git a/res/layout/group_create_activity.xml b/res/layout/group_create_activity.xml index 62d7fd950..d73d56f4f 100644 --- a/res/layout/group_create_activity.xml +++ b/res/layout/group_create_activity.xml @@ -26,7 +26,7 @@ android:layout_height="70dp" position="bottom_right" android:layout_marginRight="10dp" - android:contentDescription="@string/GroupCreateActivity_avatar_content_description" /> + android:contentDescription="@string/group_avatar" /> + android:hint="@string/group_name" /> + app:cpb_textIdle="@string/group_add_members"/> + app:cpb_textIdle="@string/qrshow_title"/> diff --git a/res/layout/invite_activity.xml b/res/layout/invite_activity.xml index 21351432c..f10835146 100644 --- a/res/layout/invite_activity.xml +++ b/res/layout/invite_activity.xml @@ -20,14 +20,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:contentDescription="@string/InviteActivity_heart_content_description" + android:contentDescription="@null" android:src="@drawable/love_heart" /> diff --git a/res/layout/media_overview_documents_fragment.xml b/res/layout/media_overview_documents_fragment.xml index c3edce10c..fe944086e 100644 --- a/res/layout/media_overview_documents_fragment.xml +++ b/res/layout/media_overview_documents_fragment.xml @@ -17,6 +17,6 @@ android:textSize="24sp" android:gravity="center" android:visibility="gone" - android:text="@string/media_overview_documents_fragment__no_documents_found" /> + android:text="@string/media_no_documents_hint" /> diff --git a/res/layout/media_overview_gallery_fragment.xml b/res/layout/media_overview_gallery_fragment.xml index fd33d5301..883d328fb 100644 --- a/res/layout/media_overview_gallery_fragment.xml +++ b/res/layout/media_overview_gallery_fragment.xml @@ -17,6 +17,6 @@ android:textSize="24sp" android:gravity="center" android:visibility="gone" - android:text="@string/media_overview_activity__no_media" /> + android:text="@string/media_no_media_hint" /> diff --git a/res/layout/media_overview_gallery_item.xml b/res/layout/media_overview_gallery_item.xml index 44112d8af..c04090b05 100644 --- a/res/layout/media_overview_gallery_item.xml +++ b/res/layout/media_overview_gallery_item.xml @@ -9,7 +9,7 @@ android:id="@+id/image" android:layout_width="match_parent" android:layout_height="match_parent" - android:contentDescription="@string/media_preview_activity__media_content_description" /> + android:contentDescription="@string/media_preview" /> + android:contentDescription="@string/media_preview" /> @@ -52,7 +52,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="top|left" - android:hint="@string/default_status_hint" + android:hint="@string/pref_default_status_label" android:inputType="textMultiLine" android:maxLines="3" /> @@ -84,7 +84,7 @@ android:layout_marginLeft="3dp" android:clickable="true" android:gravity="center_vertical" - android:text="@string/profile_create_activity__who_can_see_this_information" + android:text="@string/pref_who_can_see_this_information" android:textColor="#73B7F0" /> @@ -103,7 +103,7 @@ android:layout_gravity="center_horizontal" android:layout_marginBottom="20dp" android:layout_marginTop="0dp" - android:text="@string/profile_create_activity__password_account" + android:text="@string/pref_password_and_account_settings" android:textColor="#73B7F0" android:textSize="16sp" android:textStyle="normal" diff --git a/res/layout/registration_activity.xml b/res/layout/registration_activity.xml index 68c172f3b..4f079e297 100644 --- a/res/layout/registration_activity.xml +++ b/res/layout/registration_activity.xml @@ -34,7 +34,7 @@ android:background="@color/signal_primary" android:gravity="center" android:padding="16dp" - android:text="@string/RegistrationActivity_header" + android:text="@string/login_header" android:textColor="@color/white" android:textSize="20sp" android:textStyle="bold" /> @@ -48,7 +48,7 @@ android:paddingBottom="48dp" android:paddingLeft="16dp" android:paddingRight="16dp" - android:text="@string/RegistrationActivity_subheader" + android:text="@string/login_subheader" android:textColor="@color/white" app:layout_constraintTop_toBottomOf="@id/header" /> @@ -120,7 +120,7 @@ android:layout_width="wrap_content" android:layout_height="48dp" android:gravity="center" - android:text="@string/advanced" + android:text="@string/menu_advanced" android:textColor="@color/blue_400" app:layout_constraintEnd_toStartOf="@+id/advanced_icon" app:layout_constraintHorizontal_chainStyle="packed" @@ -131,7 +131,7 @@ android:id="@+id/advanced_icon" android:layout_width="40dp" android:layout_height="40dp" - android:contentDescription="@string/icon" + android:contentDescription="@null" android:padding="8dp" android:src="@drawable/ic_menu_remove_holo_light" android:tint="@color/blue_400" @@ -146,7 +146,7 @@ android:layout_width="wrap_content" android:layout_height="24dp" android:gravity="center" - android:text="@string/RegistrationActivity_inbox" + android:text="@string/login_inbox" app:layout_constraintStart_toStartOf="@id/guideline_root_start" app:layout_constraintTop_toBottomOf="@id/advanced_text" /> @@ -162,7 +162,7 @@ android:id="@+id/imap_login_text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/RegistrationActivity_imap_login" /> + android:hint="@string/login_imap_login" /> @@ -179,7 +179,7 @@ android:id="@+id/imap_server_text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/RegistrationActivity_imap_server" /> + android:hint="@string/login_imap_server" /> @@ -196,7 +196,7 @@ android:id="@+id/imap_port_text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/RegistrationActivity_imap_port" + android:hint="@string/login_imap_port" android:inputType="number" /> @@ -206,7 +206,7 @@ style="@style/TextAppearance.AppCompat.Caption" android:layout_width="0dp" android:layout_height="wrap_content" - android:text="@string/RegistrationActivity_imap_security" + android:text="@string/login_imap_security" app:layout_constraintEnd_toEndOf="@id/guideline_root_end" app:layout_constraintStart_toStartOf="@id/guideline_root_start" app:layout_constraintTop_toBottomOf="@id/imap_port" /> @@ -231,7 +231,7 @@ android:layout_width="wrap_content" android:layout_height="24dp" android:gravity="center" - android:text="@string/RegistrationActivity_outbox" + android:text="@string/login_outbox" app:layout_constraintStart_toStartOf="@id/guideline_root_start" app:layout_constraintTop_toBottomOf="@id/outbox_view_spacer_top" /> @@ -247,7 +247,7 @@ android:id="@+id/smtp_login_text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/RegistrationActivity_smtp_login" /> + android:hint="@string/login_smtp_login" /> @@ -264,7 +264,7 @@ android:id="@+id/smtp_password_text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/RegistrationActivity_smtp_password" + android:hint="@string/login_smtp_password" android:inputType="textPassword" /> @@ -282,7 +282,7 @@ android:id="@+id/smtp_server_text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/RegistrationActivity_smtp_server" /> + android:hint="@string/login_smtp_server" /> @@ -299,7 +299,7 @@ android:id="@+id/smtp_port_text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/RegistrationActivity_smtp_port" + android:hint="@string/login_smtp_port" android:inputType="number" /> @@ -309,7 +309,7 @@ style="@style/TextAppearance.AppCompat.Caption" android:layout_width="0dp" android:layout_height="wrap_content" - android:text="@string/RegistrationActivity_smtp_security" + android:text="@string/login_smtp_security" app:layout_constraintEnd_toEndOf="@id/guideline_root_end" app:layout_constraintStart_toStartOf="@id/guideline_root_start" app:layout_constraintTop_toBottomOf="@id/smtp_port" /> @@ -341,7 +341,7 @@ app:cpb_colorProgress="@color/textsecure_primary" app:cpb_cornerRadius="50dp" app:cpb_selectorIdle="@drawable/progress_button_state" - app:cpb_textIdle="@string/registration_activity__login" + app:cpb_textIdle="@string/login_title" app:layout_constraintEnd_toEndOf="@id/guideline_root_end" app:layout_constraintStart_toStartOf="@id/guideline_root_start" app:layout_constraintTop_toBottomOf="@id/register_button_spacer_top" /> diff --git a/res/layout/reminder_header.xml b/res/layout/reminder_header.xml index 8ec5032e5..7513b2677 100644 --- a/res/layout/reminder_header.xml +++ b/res/layout/reminder_header.xml @@ -50,6 +50,6 @@ android:nextFocusLeft="@+id/container" android:nextFocusRight="@+id/container" android:src="@drawable/ic_close_white_24dp" - android:contentDescription="@string/InviteActivity_cancel"/> + android:contentDescription="@string/cancel"/> diff --git a/res/layout/share_activity.xml b/res/layout/share_activity.xml index 4767c065c..971133e10 100644 --- a/res/layout/share_activity.xml +++ b/res/layout/share_activity.xml @@ -23,7 +23,7 @@ + android:contentDescription="@null" /> diff --git a/res/layout/welcome_activity.xml b/res/layout/welcome_activity.xml index d8ebf04ea..83d76c083 100644 --- a/res/layout/welcome_activity.xml +++ b/res/layout/welcome_activity.xml @@ -41,7 +41,7 @@ app:cpb_colorProgress="@color/textsecure_primary" app:cpb_cornerRadius="20dp" app:cpb_selectorIdle="@drawable/progress_button_state" - app:cpb_textIdle="@string/WelcomeActivity_start_messaging" + app:cpb_textIdle="@string/welcome_start_messaging" app:layout_constraintBottom_toTopOf="@id/skip_button_bottom_spacer" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"/> diff --git a/res/menu/action_mode_delete.xml b/res/menu/action_mode_delete.xml index 3df65d81d..052bac9bd 100644 --- a/res/menu/action_mode_delete.xml +++ b/res/menu/action_mode_delete.xml @@ -2,12 +2,12 @@ - - diff --git a/res/menu/conversation.xml b/res/menu/conversation.xml index abe722744..c9e4de636 100644 --- a/res/menu/conversation.xml +++ b/res/menu/conversation.xml @@ -1,13 +1,13 @@ - - - diff --git a/res/menu/conversation_archive.xml b/res/menu/conversation_archive.xml index 72eaa4985..3d7c9fa92 100644 --- a/res/menu/conversation_archive.xml +++ b/res/menu/conversation_archive.xml @@ -1,7 +1,7 @@ - diff --git a/res/menu/conversation_context.xml b/res/menu/conversation_context.xml index f0d23d6ee..875beaf00 100644 --- a/res/menu/conversation_context.xml +++ b/res/menu/conversation_context.xml @@ -1,37 +1,37 @@ - - - - - - - - diff --git a/res/menu/conversation_list_batch_archive.xml b/res/menu/conversation_list_batch_archive.xml index 3ed58c44e..678ebc1c5 100644 --- a/res/menu/conversation_list_batch_archive.xml +++ b/res/menu/conversation_list_batch_archive.xml @@ -2,7 +2,7 @@ - diff --git a/res/menu/conversation_list_batch_unarchive.xml b/res/menu/conversation_list_batch_unarchive.xml index 3d4246833..835f26eac 100644 --- a/res/menu/conversation_list_batch_unarchive.xml +++ b/res/menu/conversation_list_batch_unarchive.xml @@ -2,7 +2,7 @@ - diff --git a/res/menu/conversation_muted.xml b/res/menu/conversation_muted.xml index 3b429c04d..3e1a733e9 100644 --- a/res/menu/conversation_muted.xml +++ b/res/menu/conversation_muted.xml @@ -1,5 +1,5 @@ - \ No newline at end of file diff --git a/res/menu/conversation_popup.xml b/res/menu/conversation_popup.xml index f35e1f1ae..3ebe5e2dc 100644 --- a/res/menu/conversation_popup.xml +++ b/res/menu/conversation_popup.xml @@ -1,7 +1,7 @@ - diff --git a/res/menu/conversation_push_group_options.xml b/res/menu/conversation_push_group_options.xml index c9df8dcbc..8a74d5c07 100644 --- a/res/menu/conversation_push_group_options.xml +++ b/res/menu/conversation_push_group_options.xml @@ -2,12 +2,12 @@ diff --git a/res/menu/conversation_unarchive.xml b/res/menu/conversation_unarchive.xml index fe5c30eea..0336a423b 100644 --- a/res/menu/conversation_unarchive.xml +++ b/res/menu/conversation_unarchive.xml @@ -1,7 +1,7 @@ - diff --git a/res/menu/conversation_unmuted.xml b/res/menu/conversation_unmuted.xml index 8474edc5c..37fb05011 100644 --- a/res/menu/conversation_unmuted.xml +++ b/res/menu/conversation_unmuted.xml @@ -1,7 +1,7 @@ - \ No newline at end of file diff --git a/res/menu/group_create.xml b/res/menu/group_create.xml index 7c1044c62..34eee4d8e 100644 --- a/res/menu/group_create.xml +++ b/res/menu/group_create.xml @@ -2,7 +2,7 @@ - diff --git a/res/menu/media_overview_context.xml b/res/menu/media_overview_context.xml index 4c3c26f78..594e7c44f 100644 --- a/res/menu/media_overview_context.xml +++ b/res/menu/media_overview_context.xml @@ -1,7 +1,7 @@ diff --git a/res/menu/media_preview.xml b/res/menu/media_preview.xml index 049416555..01914cd1e 100644 --- a/res/menu/media_preview.xml +++ b/res/menu/media_preview.xml @@ -2,19 +2,19 @@ diff --git a/res/menu/preferences_create_profile_menu.xml b/res/menu/preferences_create_profile_menu.xml index d626b7cb4..d4a51c032 100644 --- a/res/menu/preferences_create_profile_menu.xml +++ b/res/menu/preferences_create_profile_menu.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> \ No newline at end of file diff --git a/res/menu/text_secure_normal.xml b/res/menu/text_secure_normal.xml index c78253994..575016beb 100644 --- a/res/menu/text_secure_normal.xml +++ b/res/menu/text_secure_normal.xml @@ -2,24 +2,21 @@ - - - - - - diff --git a/res/menu/view_log.xml b/res/menu/view_log.xml index 0fab81912..a9e69d77f 100644 --- a/res/menu/view_log.xml +++ b/res/menu/view_log.xml @@ -2,7 +2,7 @@ - diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 0e95dfdc5..c24d975d0 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -2,7 +2,7 @@ - @string/preferences__default + @string/def English Arabic العربية Bulgarian български @@ -108,8 +108,8 @@ - @string/preferences__light_theme - @string/preferences__dark_theme + @string/pref_light_theme + @string/pref_dark_theme @@ -118,14 +118,14 @@ - @string/preferences__green - @string/preferences__red - @string/preferences__blue - @string/preferences__orange - @string/preferences__cyan - @string/preferences__magenta - @string/preferences__white - @string/preferences__none + @string/green + @string/red + @string/blue + @string/orange + @string/cyan + @string/magenta + @string/white + @string/none @@ -141,9 +141,9 @@ - @string/preferences__fast - @string/preferences__normal - @string/preferences__slow + @string/fast + @string/normal + @string/slow @@ -153,12 +153,12 @@ - @string/preferences__never - @string/preferences__one_time - @string/preferences__two_times - @string/preferences__three_times - @string/preferences__five_times - @string/preferences__ten_times + @string/never + @string/notify_repeat_one_time + @string/notify_repeat_two_times + @string/notify_repeat_three_times + @string/notify_repeat_five_times + @string/notify_repeat_ten_times @@ -176,22 +176,22 @@ - @string/arrays__use_default - @string/arrays__use_custom + @string/def + @string/custom - @string/arrays__mute_for_one_hour - @string/arrays__mute_for_two_hours - @string/arrays__mute_for_one_day - @string/arrays__mute_for_seven_days - @string/arrays__mute_for_one_year + @string/mute_for_one_hour + @string/mute_for_two_hours + @string/mute_for_one_day + @string/mute_for_seven_days + @string/mute_for_one_year - @string/arrays__settings_default - @string/arrays__enabled - @string/arrays__disabled + @string/def + @string/on + @string/off @@ -201,9 +201,9 @@ - @string/arrays__name_and_message - @string/arrays__name_only - @string/arrays__no_name_or_message + @string/notify_name_and_message + @string/notify_name_only + @string/notify_no_name_or_message @@ -230,10 +230,10 @@ - @string/arrays__small - @string/arrays__normal - @string/arrays__large - @string/arrays__extra_large + @string/small + @string/normal + @string/large + @string/extra_large @@ -244,9 +244,9 @@ - @string/arrays__default - @string/arrays__high - @string/arrays__max + @string/def + @string/notify_priority_high + @string/notify_priority_max diff --git a/res/values/strings.xml b/res/values/strings.xml index 39292d007..6e90f208c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,920 +1,421 @@ Delta Chat dev + English + + + + OK + Cancel Yes No - Delete - Please wait... - - - New message - - - - %d message per chat - %d messages per chat - - Delete all old messages now? - - This will immediately trim all chats to the most recent message. - This will immediately trim all chats to the %d most recent messages. - - Delete - on - On - off - Off - Screen lock %1$s, Read receipts %2$s - Theme %1$s, Language %2$s, Background %3$s - default - custom - - - Background image could not be saved - Custom - Default - - - + On + Off + Default + Custom + None + Open + Not now + Never + One moment… + Done + Undo + Error + Network unavailable. + Can\'t find an app to handle this type of data. + No browser installed. + Could not find %1$s. + Copied to clipboard. + Contacts + Email address + Bad email address. + Password + Now + %d min + Today + Yesterday + This week + This month + %d minute %d minutes - - - - - Can\'t find an app to select media. - Delta Chat requires the Storage permission in order to attach photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\". - Delta Chat requires Location permission in order to attach a location, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Location\". - Delta Chat requires the Camera permission in order to take photos, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Camera\". - - - Error playing audio! - - - Blocked contacts - - - Today - Yesterday - This week - This month - - - - - Remove - Remove profile photo? - - - - - Contacts - - - - - - - - - Copied %s - - - Add attachment - Compose message - Sorry, there was an error setting your attachment. - Message is empty! - - Are you sure you want to leave this group? - Delta Chat dev - Attachment exceeds size limits for the type of message you\'re sending. - Camera unavailable - Unable to record audio! - There is no app available to handle this link on your device. - - To send audio messages, allow Delta Chat access to your microphone. - Delta Chat requires the Microphone permission in order to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\". - To capture photos and video, allow Delta Chat access to the camera. - Delta Chat needs the Camera permission to take photos or video, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\". - Delta Chat needs Camera permissions to take photos or video - - Send message to %1$s:\n\n• It is okay if %2$s does not use Delta Chat.\n\n• Delivering the first message may take a while. - Compose the first message, allowing others to reply within this group.\n\n• It is okay if not all members use Delta Chat.\n\n• Delivering the first message may take a while. - Delete this chat? It will no longer be shown in the chat list, its messages will remain on the server. - - - - %d unread message - %d unread messages + + %d hour + %d hours - - - Delete selected message? - Delete selected messages? - - - This will permanently delete the selected message here and on the server. - This will permanently delete all %1$d selected messages here and one the server. - - Save to storage? - - Saving this file to storage will allow any other apps on your device to access it.\n\nContinue? - Saving all %1$d files to storage will allow any other apps on your device to access them.\n\nContinue? - - - Error while saving file to storage! - Error while saving file to storage! - - Unable to write to storage! - - Saving file - Saving %1$d files - - - Saving file to storage... - Saving %1$d files to storage... - - - Message copied to clipboard - %1$d selected messages copied to clipboard - + Me + Draft + Image + Gif + Audio + Video + Contact + Camera + Location + Gallery + File + Unknown - - There is no browser installed on your device. + Green + Red + Blue + Orange + Cyan + Magenta + White - - No results found for \'%s\' + Small + Normal + Large + Extra large - - Delete the selected chat? It will no longer be shown in the chat list, its messages will remain on the server. - Delete %1%d selected chats? They will no longer be shown in the chat list, their messages will remain on the server. + Fast + Slow + + Message delivered + Message read + + + + New contact + New chat + New group + New verified group + Send + Toggle emoji keyboard + Edit group + Archive chat + Unarchive chat + Add attachment + Leave group + Delete chat + Delete messages + Delete image + Message details + Copy to clipboard + Forward message + Resend message + Reply to message + Mute notifications + Unmute + Export attachment + All media + Share + Block contact + Unblock contact + Play + Pause + Scroll to the bottom + Invite friends + Help + Select all + Expand + Edit name + Settings + Advanced + Contact requests + View profile + + Mute for 1 hour + Mute for 2 hours + Mute for 1 day + Mute for 7 days + Mute for 1 year + + + + Are you sure you want to leave this group? + + Delete this chat? It will no longer be shown in the chat list, its messages will remain on the server. + Delete %1%d chats? They will no longer be shown in the chat list, their messages will remain on the server. - Deleting - Deleting selected chats... - + + Delete the message here and on the server? + Delete %1$d messages here and one the server? + + Forward messages to %1$s? + Export attachment? Exporting attachments will allow any other apps on your device to access them.\n\nContinue? + Block this contact? You will no longer receive messages and calls from this contact. + Unblock this contact? You will once again be able to receive messages and calls from this contact. + Delete contacts? This will permanently delete the selected contacts.\n\nContacts with ongoing chats and contacts from the system\'s address book cannot be deleted permanently. + Chat with %1$s? + + + + Contacts + Enter name or email address + Type email address above + No contacts. + + + + Chat archived %d chats archived - UNDO - - Moved chat to inbox - Moved %d chats to inbox + + Chat unarchived + %d chat unarchived - - - - - - - Your profile info - Error setting profile photo - Problem setting profile - Profile photo - - - Using custom: %s - Using default: %s - None - - - Now - %d min - Today - Yesterday - - - - - - - Today - - - Unknown file - - - Optimize for missing Play Services - This device does not support Play Services. Tap to disable system battery optimizations that prevent Delta Chat from retrieving messages while inactive. - - - Share with - Can\'t find an app able to open this media. - Could not find %1$s. - Forward selected messages to %1$s? - - - - - - - New group - New verified group - Edit group - Group name - Group avatar - Apply - Loading group details... - Please enter a name for the group. - - - - - - - Tap and hold to record a voice message, release to send - - - Share - Cancel - Heart - Invite to Delta Chat - Let\'s switch to Delta Chat - %1$s - you can text me at %2$s - It looks like you don\'t have any apps to share to. - Friends don\'t let friends locked in messaging silos. - - - - - Background connection enabled - - - - - Media - - Delete selected message? - Delete selected messages? + Archived chats + Please enter a message. + Camera unavailable. + Unable to record audio. + + %d unread message + %d unread messages - - This will permanently delete the selected message. - This will permanently delete all %1$d selected messages. - - Deleting - Deleting messages... - Documents - - - - - - - - - - - - - - - - - - - - - Block this contact? - You will no longer receive messages and calls from this contact. - Block - Unblock this contact? - You will once again be able to receive messages and calls from this contact. - Unblock - Enabled - Disabled - - - - - - - - - Failed to save image changes - - - No results found for \'%s\' - Chats - Contacts - Messages - - - - - - - Image - Audio - Video - - - - - - - - - - - - - - - - - - - - - Mute notifications - - - No web browser installed! - - - - - - - You - Unsupported media type - Draft - Delta Chat needs the Storage permission in order to save to external storage, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Storage\". - Unable to save to external storage without permissions - Delete message? - This will permanently delete this message. - - - %1$d new messages in %2$d chats - Most recent from: %1$s - Media message: %s - Mark all as read - Mark read - Media message - Reply - - - - - Saved to %s - - - Search - Search for chats, contacts, and messages - - - Delta Chat dev - New message - - - - - Error playing video - - - - - - - - - Audio - Audio - Contact - Contact - Camera - Camera - Location - Location - GIF - Gif - Image or video - File - Gallery - File - - Toggle attachment drawer - - - - - Enter name or email address - - - No contacts. - Loading contacts… - - - Contact Photo - - - Error deleting contacts, some contacts couldn\'t get deleted. Please delete existing conversations before. - Delete contacts? - This will permanently delete the selected contacts.\n\nContacts with ongoing chats and contacts from the system\'s address book cannot be deleted permanently. - - - - - - - Message - Send - Message composition - Toggle emoji keyboard - Attachment Thumbnail - Toggle quick camera attachment drawer - Record and send audio attachment - - - SLIDE TO CANCEL - - - Media message - Secure message - - - Send Failed - Delivered - Message read - - - Contact photo - - - Play - Pause - - - Audio - Video - Photo - You - - - Scroll to the bottom - - - - - - - - - - - - - Off - - - %d second - %d seconds - - - %ds - - - %d minute - %d minutes - - - %dm - - - %d hour - %d hours - - - %dh - - - %d day - %d days - - - %dd - - - %d week - %d weeks - - - %dw - - - - - - - - - - - - - No media - - - - - - - - - - - - - password and account settings - FINISH - Who can see this information? - Your profile picture and name will be shown alongside your messages when communicating with other users. Already sent information can not be deleted or removed. - Your name - - - - - Mute chat - Notification sound - Vibrate - Block - Chat settings - - - - - - - Add members - - - - - - - - - - - - - Select contacts - Media preview - Invite friends - Archived chats - Remove photo - - - Use default - Use custom - - Mute for 1 hour - Mute for 2 hours - Mute for 1 day - Mute for 7 days - Mute for 1 year - - Settings default - Enabled - Disabled - - Name and message - Name only - No name or message - - Small - Normal - Large - Extra large - - Default - High - Max - - - - %d hour - %d hours - - - - Enter key sends - Pressing the Enter key will send text messages - Change secret - Change your pin / pattern / fingerprint via system settings - Screen security - To apply the screen security setting please restart the app - Block screenshots in the recents list and inside the app - Auto-lock Delta Chat after a specified time interval of inactivity - Inactivity timeout lock - Inactivity timeout interval - Notifications - LED color - Unknown - LED blink pattern - Sound - Silent - Repeat alerts - Never - One time - Two times - Three times - Five times - Ten times - Vibrate - Green - Red - Blue - Orange - Cyan - Magenta - White - None - Fast - Normal - Slow - Advanced - Privacy - Automatically delete older messages once a chat exceeds a specified length - Delete old messages - Chats and media - Chat length limit - Trim all chats now - Scan through all chats and enforce chat length limits - Light - Dark - Appearance - Theme - Default - Language - Incognito keyboard - Read receipts - If read receipts are disabled, you won\'t be able to see read receipts from others. - Request keyboard to disable personalized learning - Backup - Manage keys - Blocked contacts - Message trimming - Use system emoji - Disable Delta Chat\'s built-in emoji support - App access - Communication - Chats - Messages - In-chat sounds - Show - Message font size - Priority - Other - A backup helps you to set up a new installation on this or on another device.\n\nThe backup will contain all messages, contacts and chats and your end-to-end Autocrypt setup. Keep the backup file in a safe place or delete it as soon as possible. - Start backup - Backup written successfully to %1$s - Delta Chat needs access to your files in order to create backups. - Manage keys - Delta Chat needs access to your files to import/export keys. - Export secret keys - Export secret keys to \"%1$s\"? - Import secret keys - Import secret keys from \"%1$s\"?\n\n• Existing secret keys will not be deleted\n\n• The last imported key will be used as the new default key unless it has the word \"legacy\" in its filename - Secret keys written successfully to \"%1$s\". - Secret keys imported from \"%1$s\". - Autocrypt - Send Autocrypt Setup Message - Prefer end-to-end encryption - Autocrypt is a new and open specification for automatic end-to-end email encryption.\n\nYour end-to-end setup is created automatically as needed and you can transfer it between devices with Autocrypt Setup Messages. - - - - - - - - - - - - - - Message details - Copy text - Delete message - Forward message - Resend message - Reply to message - - - Save attachment - - - - - - - - - Delete selected - Select all - Archive selected - Unarchive selected - - - - - Contact Photo Image - Archived - - Inbox zeeerrro - Zip. Zilch. Zero. Nada.\nYou\'re all caught up! - - - - New chat - Give your inbox something to write home about. Get started by messaging a friend. - - - - - - Unmute - - - Mute notifications - - - Add attachment - Edit group - Leave group - All media - - - Expand popup - - - - - - - Settings - Lock - Invite friends - Help - - - - - Your version of Delta Chat is outdated - - Your version of Delta Chat will expire in %d day. Tap to update to the most recent version. - Your version of Delta Chat will expire in %d days. Tap to update to the most recent version. - - Your version of Delta Chat will expire today. Tap to update to the most recent version. - Your version of Delta Chat has expired! - Messages will no longer send successfully. Tap to update to the most recent version. - - - Save - Forward - All media - - - No documents - - - Media preview - - - - - - Scan QR code - Place your camera over the QR code - - - Do you want to join the verified group ]]>%1$s]]>? - Verify contact and start chatting with ]]>%1$s]]>? - Contact ]]>%1$s]]> verified. Start chatting? - The scanned fingerprint does ]]>not match]]> the fingerprint last seen for ]]>%1$s]]>. - This QR code contains a fingerprint but no email address.\n\nFor an out-of-band-verification, please establish an encrpyted connection to the recipient first. - Scanned QR code text:\n\n%1$s - Scanned QR code URL:\n\n%1$s - Fingerprint - Chat with ]]>%1$s]]>? - %1$s verified, introduce myself … - - - Show QR verify code - %1$s joins. - %1$s verified. - %1$s securely joined the group. - Scan this to join the verified group ]]>%1$s]]>. - QR invite code - QR verify code - ]]>%1$s
]]>Scan this to set up a verified contact. - - - - - Transport icon - Permission required - Continue - Not now - Backup chats to external storage - %d messages so far - Screen lock - Lock Delta Chat access with Android screen lock or fingerprint - - Delta Chat dev - The messenger with the broadest audience in the world. Free and independent. - Independent - There is no Delta Chat server. The app only uses your mail server. - Fast - Push messages in seconds.
Rapid interface. - Powerful - Unlimited chats, images, videos, audio messages and more. Multi-client capable. - Free - Delta Chat dev is free forever.
Open-source. No ads. No subscription. No vendor lock-in. - Encrypted - Encrypted with all common algorithms. Messages stay on your servers. - Trustworthy - Delta Chat dev is safe for business use, compatible and standards-based. - Start Messaging - - Login to Delta Chat - For known email providers additional settings are setup automatically. Sometimes IMAP needs to be enabled in the web frontend. Consult your email provider or friends for help. - Inbox - IMAP login-name - IMAP server - IMAP port - IMAP Security - Outbox - SMTP login-name - SMTP Password - SMTP server - SMTP port - SMTP Security - GMail information - For GMail Accounts you need to create an App-Password if you have 2FA enabled. If this setting is not available, you need to enable Less Secure Apps. - Please enter a valid email address - Please enter a valid server / IP address - Please enter a valid port (1–65535) - Please enter a valid email address and a password - + Send message to %1$s:\n\n• It is okay if %2$s does not use Delta Chat.\n\n• Delivering the first message may take a while. + Compose the first message, allowing others to reply within this group.\n\n• It is okay if not all members use Delta Chat.\n\n• Delivering the first message may take a while. + Slide to cancel + Tap and hold to record a voice message, release to send + Give your inbox something to write home about. Get started by messaging a friend. + Inbox zeeerrro + Zip. Zilch. Zero. Nada.\nYou\'re all caught up! + Share with + Message + Archived + No messages. + + + + Search + Search for chats, contacts, and messages + No results found for \"%s\" + Chats + Contacts + Messages + + + + Group name + Group avatar + Create group + Please enter a name for the group. + Add members + Encryption + + + + Media preview + Media + Documents + No media. + No documents + + + + Friends don\'t let friends locked in messaging silos. + Let\'s switch to Delta Chat - %1$s - you can text me at %2$s + + + + Delta Chat dev + The messenger with the broadest audience in the world. Free and independent. + Independent + There is no Delta Chat server. The app only uses your mail server. + Fast + Push messages in seconds.
Rapid interface. + Powerful + Unlimited chats, images, videos, audio messages and more. Multi-client capable. + Free + Delta Chat dev is free forever.
Open-source. No ads. No subscription. No vendor lock-in. + Encrypted + Encrypted with all common algorithms. Messages stay on your servers. + Trustworthy + Delta Chat dev is safe for business use, compatible and standards-based. + Start Messaging + Login + Login to Delta Chat + For known email providers additional settings are setup automatically. Sometimes IMAP needs to be enabled in the web frontend. Consult your email provider or friends for help. + Inbox + IMAP login-name + IMAP server + IMAP port + IMAP Security + Outbox + SMTP login-name + SMTP Password + SMTP server + SMTP port + SMTP Security + For GMail Accounts you need to create an App-Password if you have 2FA enabled. If this setting is not available, you need to enable Less Secure Apps. + Please enter a valid email address + Please enter a valid server / IP address + Please enter a valid port (1–65535) + Please enter a valid email address and a password Import backup Backup found at \"%1$s\".\n\nDo you want to import and use all data and settings from it? No backups found.\n\nCopy the backup to \"%1$s\" and try again. Alternatively, press \"Start messaging\" to go with the normal setup process. - Send Autocrypt Setup Message - An \"Autocrypt Setup Message\" securely shares your end-to-end setup with other Autocrypt-compliant apps.\n\nThe setup will be encrypted by a setup code which is displayed here and must be typed on the other device. - Your setup has been sent to yourself. Switch to the other device and open the setup message. You should be prompted for a setup code. Type the following digits into the prompt:\n\n%1$s\n\nOnce you\'re done, your other device will be ready to use Autocrypt. - Autocrypt Setup Message - This is the Autocrypt Setup Message used to transfer your end-to-end setup between clients.\n\nTo decrypt and use your setup, open the message in an Autocrypt-compliant client and enter the setup code presented on the generating device. - This is the Autocrypt Setup Message used to transfer your end-to-end setup between clients.\n\nTo decrypt and use your setup, tap on this message. - Autocrypt Setup Message - Please enter the setup code that is displayed on the other device. - Bad setup code. Please try again.\n\nIf you do not remember the setup code, just send another Autocrypt Setup Message from the other device. - End-to-end setup transferred. This device is now ready to use Autocrypt with the same setup as the other device. - Retry - - Email address - Bad email address. - Password - Advanced - icon - Loading … - One moment … - Chat with %1$s? - New group - New verified group - New contact - Type email address above - New chat - https://delta.chat/en/help - Authentication failed. - Unlock Delta Chat - Please enter your system defined secret to unlock Delta Chat. - - Sent with my Delta Chat Messenger: https://delta.chat - Status text - Login - Chat-Background - Copy to clipboard - Open - Done - Contact requests - Not now - Never - View profile - Archive chat - Unarchive chat - Delete chat - No messages. - Network unavailable. - Draft - Contact - Encryption - Edit name - View log - View log + + Screen lock %1$s, Read receipts %2$s + Theme %1$s, Language %2$s, Background %3$s + on + off + default + custom + Using custom: %s + Using default: %s + Your profile info + Profile photo + Message trimming + Delete old messages + Automatically delete older messages once a chat exceeds a specified length + Chat length limit + %d messages per chat + Trim all chats now + Delete all old messages now? This will immediately trim all chats to the %d most recent messages. + Blocked contacts + Remove profile photo? + https://delta.chat/en/help + + Password and account settings + Who can see this information? + Your profile picture and name will be shown alongside your messages when communicating with other users. Already sent information can not be deleted or removed. + Your name + Status text + Sent with my Delta Chat Messenger: https://delta.chat + Enter key sends + Pressing the Enter key will send text messages + Vibrate + Chat settings + Change secret + Change your pin / pattern / fingerprint via system settings + Screen security + Block screenshots in the recents list and inside the app + To apply the screen security setting please restart the app. + Notifications + Show + Priority + LED color + LED blink pattern + Sound + Silent + Repeat alerts + Privacy + Chats and media + Light + Dark + Appearance + Theme + Language + Incognito keyboard + Request keyboard to disable personalized learning + Read receipts + If read receipts are disabled, you won\'t be able to see read receipts from others. + Manage keys + Use system emoji + Disable Delta Chat\'s built-in emoji support + App access + Communication + Chats + Messages + In-chat sounds + Message font size + View log + Other + Backup + Backup chats to external storage + A backup helps you to set up a new installation on this or on another device.\n\nThe backup will contain all messages, contacts and chats and your end-to-end Autocrypt setup. Keep the backup file in a safe place or delete it as soon as possible. + Start backup + Backup written successfully to %1$s + Manage keys + Delta Chat needs access to your files to import/export keys. + Export secret keys + Export secret keys to \"%1$s\"? + Import secret keys + Import secret keys from \"%1$s\"?\n\n• Existing secret keys will not be deleted\n\n• The last imported key will be used as the new default key unless it has the word \"legacy\" in its filename + Secret keys written successfully to \"%1$s\". + Secret keys imported from \"%1$s\". + Chat-Background + + + Autocrypt + Autocrypt is a new and open specification for automatic end-to-end email encryption.\n\nYour end-to-end setup is created automatically as needed and you can transfer it between devices with Autocrypt Setup Messages. + Send Autocrypt Setup Message + An \"Autocrypt Setup Message\" securely shares your end-to-end setup with other Autocrypt-compliant apps.\n\nThe setup will be encrypted by a setup code which is displayed here and must be typed on the other device. + Send Autocrypt Setup Message + Your setup has been sent to yourself. Switch to the other device and open the setup message. You should be prompted for a setup code. Type the following digits into the prompt:\n\n%1$s\n\nOnce you\'re done, your other device will be ready to use Autocrypt. + Prefer end-to-end encryption + Autocrypt Setup Message + This is the Autocrypt Setup Message used to transfer your end-to-end setup between clients.\n\nTo decrypt and use your setup, open the message in an Autocrypt-compliant client and enter the setup code presented on the generating device. + This is the Autocrypt Setup Message used to transfer your end-to-end setup between clients.\n\nTo decrypt and use your setup, tap or click on this message. + Autocrypt Setup Message + Please enter the setup code that is displayed on the other device. + End-to-end setup transferred. This device is now ready to use Autocrypt with the same setup as the other device. + Retry + Bad setup code. Please try again.\n\nIf you do not remember the setup code, just send another Autocrypt Setup Message from the other device. + + + + Screen lock + Lock Delta Chat access with Android screen lock or fingerprint + Authentication failed. + Unlock Delta Chat + Please enter your system defined secret to unlock Delta Chat. + Inactivity timeout lock + Auto-lock Delta Chat after a specified time interval of inactivity + Inactivity timeout interval + + + + Scan QR code + Place your camera over the QR code + Do you want to join the verified group \"%1$s\"? + Verify contact and start chatting with \"%1$s\"? + Contact \"%1$s\" verified. Start chatting? + The scanned fingerprint does \"not match\" the fingerprint last seen for \"%1$s\". + This QR code contains a fingerprint but no email address.\n\nFor an out-of-band-verification, please establish an encrpyted connection to the recipient first. + Scanned QR code text:\n\n%1$s + Scanned QR code URL:\n\n%1$s + Fingerprint + %1$s verified, introduce myself … + Show QR verify code + %1$s joins. + %1$s verified. + %1$s securely joined the group. + Scan this to join the verified group \"%1$s\". + QR invite code + QR verify code + \"%1$s\"Scan this to set up a verified contact. + + + + %1$d new messages in %2$d chats + Most recent from: %1$s + Media message: %s + Mark all as read + Mark read + Media message + Reply + New message + Background connection enabled + High + Max + Name and message + Name only + No name or message + One time + Two times + Three times + Five times + Ten times + + + + Permission required + Continue + Not now + To capture photos and video, allow Delta Chat access to the camera. + To send audio messages, allow Delta Chat access to your microphone. + Delta Chat needs access to your files in order to export files or to create backups. + Delta Chat requires the Camera permission in order to take photos or videos, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Camera\". + Delta Chat requires the Microphone permission in order to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\". + Delta Chat requires the Storage permission in order to attach or export photos, videos, or audio, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Storage\". + Delta Chat requires Location permission in order to attach a location, but it has been permanently denied. Please continue to the app settings menu, select \"Permissions\", and enable \"Location\". diff --git a/res/values/styles.xml b/res/values/styles.xml index ab71f3681..07bc972d8 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -91,7 +91,7 @@ center_vertical flagNoEnterAction textAutoCorrect|textCapSentences|textMultiLine - @string/conversation_activity__compose_description + @string/chat_input_placeholder