Merge branch 'master' into feature/451-recycle-bin

This commit is contained in:
Ensar Sarajčić 2023-07-25 08:08:04 +02:00
commit 450a0c22d1
8 changed files with 94 additions and 66 deletions

View file

@ -62,13 +62,13 @@
<string name="me">Я</string>
<!-- Archive -->
<string name="unarchive">Разархивировать</string>
<string name="empty_archive">Delete all archived conversations</string>
<string name="archived_conversations">Archive</string>
<string name="show_archived_conversations">Show archived conversations</string>
<string name="empty_archive">Удалить все архивные переписки</string>
<string name="archived_conversations">Архивная</string>
<string name="show_archived_conversations">Показывать архивные переписки</string>
<string name="archive">Архивировать</string>
<string name="no_archived_conversations">No archived conversations have been found</string>
<string name="archive_emptied_successfully">The archive has been emptied successfully</string>
<string name="empty_archive_confirmation">Are you sure you want to empty the archive? All archived conversations will be permanently lost.</string>
<string name="no_archived_conversations">Нет архивных переписок</string>
<string name="archive_emptied_successfully">Архив успешно очищен</string>
<string name="empty_archive_confirmation">Очистить архив\? Все архивные переписки будут безвозвратно потеряны.</string>
<!-- Recycle bin -->
<string name="restore">Restore</string>
<string name="restore_all_messages">Restore all messages</string>
@ -76,7 +76,7 @@
<string name="skip_the_recycle_bin_messages">Skip the Recycle Bin, delete messages directly</string>
<!-- Confirmation dialog -->
<string name="delete_whole_conversation_confirmation">Удалить все сообщения в этой переписке\?</string>
<string name="archive_confirmation">Are you sure you want to archive %s?</string>
<string name="archive_confirmation">Архивировать %s\?</string>
<string name="restore_whole_conversation_confirmation">Are you sure you want to restore all messages of this conversation?</string>
<string name="restore_confirmation">Are you sure you want to restore %s?</string>
<!-- Are you sure you want to delete 5 conversations? -->
@ -141,4 +141,4 @@
Haven't found some strings? There's more at
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
-->
</resources>
</resources>