Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Thomas 2022-11-20 16:30:18 +01:00
commit 6f72dd7c2d
3 changed files with 11 additions and 4 deletions

View File

@ -393,7 +393,7 @@
<string name="settings_category_notif_categories">Categorias</string>
<string name="move_timeline">Move sa lìnia de tempus</string>
<string name="hide_timeline">Cua sa lìnia de su tempus</string>
<string name="reorder_timelines">Torra a ordinare is lìnias de su tempus</string>
<string name="reorder_timelines">Manìgia is lìnias de su tempus</string>
<string name="reorder_list_deleted">Lista cantzellada definitivamente</string>
<string name="reorder_instance_removed">Istàntzia sighida bogada</string>
<string name="reorder_tag_removed">Eticheta apicada bogada</string>
@ -703,7 +703,7 @@
<string name="notification_sounds">Sonos de notìfica</string>
<string name="disable_notifications">Disabìlita is notìficas</string>
<string name="pref_theme_base">Base de su tema</string>
<string name="pref_theme_base_summary">Sèbera si sa base de su tema diat dèpere èssere iscura o crara</string>
<string name="pref_theme_base_summary">Sèbera si sa base de su tema depat èssere iscura o crara</string>
<string name="fetch_more_messages">Recùpera prus messàgios…</string>
<string name="label_line">Lìnia</string>
<string name="msg_save_image">Boles essire chene sarvare s\'immàgine\?</string>
@ -846,4 +846,7 @@
<string name="show_anyway">Ammustra su matessi</string>
<string name="toast_error_add_to_list">S\'aplicatzione no est resèssida a annànghere su contu a sa lista!</string>
<string name="add_keyword">Annanghe sa paràula crae</string>
<string name="display_remote_profile">Mustra su profilu remotu</string>
<string name="toast_fetch_error">S\'aplicatzione non resesset a agatare datos remotos!</string>
<string name="delete_timeline">Iscantzella sa lìnia de tempus</string>
</resources>

View File

@ -395,7 +395,7 @@
<string name="settings_category_notif_categories">Kategoriler</string>
<string name="move_timeline">Zaman çizelgesini taşı</string>
<string name="hide_timeline">Zaman çizelgesini gizle</string>
<string name="reorder_timelines">Zaman çizelgelerini yeniden sırala</string>
<string name="reorder_timelines">Zaman çizelgelerini yönet</string>
<string name="reorder_list_deleted">Liste kalıcı olarak silindi</string>
<string name="reorder_instance_removed">Sunucu takipten çıkarıldı</string>
<string name="reorder_tag_removed">Sabitlenmiş etiket kaldırıldı</string>
@ -854,4 +854,7 @@
<string name="toast_error_add_to_list">Uygulama, hesabı listeye ekleyemedi!</string>
<string name="display_remote_profile">Uzak profili görüntüle</string>
<string name="toast_fetch_error">Uygulama uzak verileri bulamıyor!</string>
<string name="delete_timeline">Zaman çizelgesini sil</string>
<string name="notif_submitted_report">Rapor gönderildi</string>
<string name="notif_signed_up">Kaydoldu</string>
</resources>

View File

@ -391,7 +391,7 @@
<string name="settings_category_notif_categories">类别</string>
<string name="move_timeline">移动时间线</string>
<string name="hide_timeline">隐藏时间线</string>
<string name="reorder_timelines">记录时间线</string>
<string name="reorder_timelines">管理时间线</string>
<string name="reorder_list_deleted">列表永久性地被删除</string>
<string name="reorder_instance_removed">所关注的实例已被移除</string>
<string name="reorder_tag_removed">钉住标签已被移除</string>
@ -568,4 +568,5 @@
<string name="no_distributors_found">没有找到分发商!</string>
<string name="no_distributors_explanation">要接收推送通知你需要一个分发商。\n你将在%1$s找到更多详情。\n\n你也可以在设置中禁用推送通知以忽略该消息。</string>
<string name="select_distributors">选择一个分发商</string>
<string name="show_anyway">仍要显示</string>
</resources>