Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions FlowCrypt/src/main/res/layout/activity_check_keys.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
android:gravity="center"
android:textColor="@android:color/black"
android:textSize="@dimen/default_text_size_medium"
tools:text="@string/no_backups_found" />
tools:text="No backups found on this account" />

<ImageButton
android:id="@+id/imageButtonHint"
Expand Down Expand Up @@ -153,7 +153,7 @@
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/guidelineLeft"
app:layout_constraintTop_toBottomOf="@+id/rGPassphraseType"
tools:text="@string/load_account" />
tools:text="Load Account" />

<Button
android:id="@+id/buttonSkipRemainingBackups"
Expand Down
7 changes: 6 additions & 1 deletion FlowCrypt/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -464,4 +464,9 @@
<string name="legal">Юридическая информация</string>
<string name="experimental">Экспериментальные</string>
<string name="loading_labels">Загрузка ярлыков</string>
</resources>
<string name="silent">Беззвучный</string>
<string name="mixed_signed">разные подписи</string>
<string name="password_protected_msg_promo">%1$s отправил Вам сообщение, которое защищено паролем. Вы можете открыт его используя эту ссылку: %2$s</string>
<string name="hint">Подсказка</string>
<string name="can_not_send_password_protected">Сбой при отправке: защищено паролем</string>
</resources>
15 changes: 6 additions & 9 deletions FlowCrypt/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@
<item quantity="other">We found backups of %1$d keys</item>
</plurals>
<string name="enter_your_pass_phrase">Enter your pass phrase</string>
<string name="load_account">Load Account</string>
<string name="no_backups_found">No backups found on this account</string>
<string name="passphrase_must_be_non_empty">Pass phrase cannot be empty</string>
<string name="your_message_must_be_non_empty">Message should not be empty</string>
<string name="password_is_incorrect">Incorrect pass phrase, please try again</string>
Expand Down Expand Up @@ -143,7 +141,7 @@
<string name="template_reply_subject" translatable="false">%1$s: %2$s</string>
<string name="other_email_provider">Other email provider</string>
<string name="account_info">Account info</string>
<string name="e_mail">E-mail</string>
<string name="e_mail" translatable="false">E-mail</string>
<string name="username">Username</string>
<string name="password">Password</string>
<string name="incoming_mail_settings">Incoming mail settings</string>
Expand All @@ -157,16 +155,15 @@
<string name="smtp_username">SMTP Username</string>
<string name="smtp_password">SMTP Password</string>
<string name="try_to_connect">Connect</string>
<string name="template_imap_server">imap.%1$s</string>
<string name="template_smtp_server">smtp.%1$s</string>
<string name="template_imap_server" translatable="false">imap.%1$s</string>
<string name="template_smtp_server" translatable="false">smtp.%1$s</string>
<string name="none">None</string>
<string name="ssl_tls">SSL/TLS</string>
<string name="startls">STARTLS</string>
<string name="ssl_tls" translatable="false">SSL/TLS</string>
<string name="startls" translatable="false">STARTLS</string>
<string name="template_email_already_added">The email \"%1$s\" already added!</string>
<string name="expand_an_account_managment">Expand an account management</string>
<string name="add_account">Add account</string>
<string name="skip_remaining_backups">Skip remaining backups</string>
<string name="crash_the_app">Crash the App</string>
<string name="experimental">Experimental</string>
<string name="experimental_settings">Experimental Settings</string>
<string name="simulate_app_crash">Simulate app crash</string>
Expand Down Expand Up @@ -361,7 +358,7 @@
<string name="template_modified">Modified: %1$s</string>
<string name="template_algorithm">Algorithm: %1$s</string>
<string name="template_algorithm_bits">Bits: %1$s</string>
<string name="template_curve">Curve: %1$s</string>
<string name="template_curve" translatable="false">Curve: %1$s</string>
<string name="template_user">User %1$d: %2$s</string>
<string name="template_fingerprint_2">Fingerprint %1$d: %2$s</string>
<string name="public_key_copied_to_clipboard">Public Key copied to clipboard</string>
Expand Down
3 changes: 2 additions & 1 deletion FlowCrypt/src/main/res/values/strings_dev_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
<string name="pref_title_general" translatable="false">General</string>
<string name="pref_title_http" translatable="false">Http</string>
<string name="pref_title_build_config_info" translatable="false">Build config info</string>
<string name="toast_message_press_force_stop_to_apply_changes">Please press "Force stop" to apply changes</string>
<string name="crash_the_app" translatable="false">Crash the App</string>
<string name="toast_message_press_force_stop_to_apply_changes" translatable="false">Please press "Force stop" to apply changes</string>
<string name="pref_title_write_api_logs_to_file" translatable="false">Write API logs to a file</string>
<string name="pref_title_enable_acra" translatable="false" tools:ignore="UnusedResources">Enable ACRA(App Crash Reports)</string>
<string name="pref_title_imap_debug" translatable="false">IMAP debug</string>
Expand Down