owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'weblate/main'

Browse Source
This commit is contained in:
sk
2022-12-23 23:20:38 +01:00
parent f2eecf774b 6ece8eb0c1
commit 9692a04275
19 changed files with 158 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
View File

@@ -208,10 +208,6 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
}else if(id==R.id.pin || id==R.id.unpin) {
UiUtils.confirmPinPost(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.status, !item.status.pinned, s -> {
});
}else if(id==R.id.mute){
UiUtils.confirmToggleMuteUser(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), account, relationship!=null && relationship.muting, r->{});
}else if(id==R.id.block){
UiUtils.confirmToggleBlockUser(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), account, relationship!=null && relationship.blocking, r->{});
}else if(id==R.id.report){
Bundle args=new Bundle();
args.putString("account", item.parentFragment.getAccountID());

2
mastodon/src/main/res/values-de-rDE/strings_sk.xml
View File

@@ -82,4 +82,6 @@
<string name="sk_settings_translation_availability_note_available">%s unterstützt Übersetzung!</string>
<string name="sk_settings_translation_availability_note_unavailable">%s scheint keine Übersetzung zu unterstützen.</string>
<string name="sk_loading_fediverse_resource_title">Suche im Fediverse…</string>
<string name="sk_undo_reblog">Reblog rückgängig machen</string>
<string name="sk_reblog_with_visibility">Rebloggen mit Sichtbarkeit</string>
</resources>

3
mastodon/src/main/res/values-es-rES/strings_sk.xml
View File

@@ -82,4 +82,7 @@
<string name="sk_settings_translation_availability_note_available">¡%s admite traducción!</string>
<string name="sk_settings_translation_availability_note_unavailable">%s no parece soportar la traducción.</string>
<string name="sk_loading_fediverse_resource_title">Buscándolo en Fediverse…</string>
<string name="sk_quote_post">Publicar sobre esto</string>
<string name="sk_undo_reblog">Deshacer reblogueo</string>
<string name="sk_reblog_with_visibility">Rebloguea con visibilidad</string>
</resources>

6
mastodon/src/main/res/values-fr-rFR/strings_sk.xml
View File

@@ -82,4 +82,10 @@
<string name="sk_settings_translation_availability_note_unavailable">%s ne semble pas prendre en charge la traduction.</string>
<string name="sk_clear_all_notifications_confirm">Voulez-vous vraiment supprimer toutes les notifications \?</string>
<string name="sk_loading_fediverse_resource_title">Le rechercher sur le Fediverse…</string>
<string name="sk_reblog_with_visibility">Rebloguer avec visibilité</string>
<string name="sk_undo_reblog">Annuler le reblogage</string>
<string name="sk_quote_post">Poster à ce sujet</string>
<string name="sk_hashtags_you_follow">Hashtags que vous suivez</string>
<string name="sk_open_in_account">Ouvrir dans un autre compte</string>
<string name="sk_copy_link_to_post">Copier le lien du post</string>
</resources>

6
mastodon/src/main/res/values-in-rID/strings_sk.xml
View File

@@ -82,4 +82,10 @@
<string name="sk_settings_posting">Preferensi kiriman</string>
<string name="sk_settings_auth">Pengaturan keamanan</string>
<string name="sk_clear_all_notifications">Hapus semua notifikasi</string>
<string name="sk_undo_reblog">Urungkan pembagian</string>
<string name="sk_quote_post">Kirim tentang ini</string>
<string name="sk_reblog_with_visibility">Bagikan dengan keterlihatan</string>
<string name="sk_copy_link_to_post">Salin tautan ke kiriman</string>
<string name="sk_open_in_account">Buka di akun lain</string>
<string name="sk_hashtags_you_follow">Tagar yang Anda ikuti</string>
</resources>

26
mastodon/src/main/res/values-uk-rUA/strings_sk.xml
View File

@@ -59,4 +59,30 @@
<string name="sk_example_domain">example.social</string>
<string name="sk_welcome_title">Вітаємо!</string>
<string name="sk_welcome_text">Акулка вас вітає! Щоб розпочати, введіть нижче доменне ім’я вашого інстансу.</string>
<string name="sk_settings_profile">Налаштувати профіль</string>
<string name="sk_settings_posting">Налаштувати постинг</string>
<string name="sk_settings_filters">Налаштувати фільтри</string>
<string name="sk_settings_rules">Правила</string>
<string name="sk_settings_about">Про застосунок</string>
<string name="sk_settings_donate">Донат</string>
<string name="sk_color_palette_material3">Системна</string>
<string name="sk_color_palette_red">Червона</string>
<string name="sk_delete_notification">Видалити сповіщення</string>
<string name="sk_delete_notification_confirm_action">Видалити</string>
<string name="sk_delete_notification_confirm">Ви впевнені, що хочете видалити це сповіщення\?</string>
<string name="sk_enable_delete_notifications">Увімкнути видалення сповіщень</string>
<string name="sk_settings_publish_button_text">Текст кнопки \"опублікувати\"</string>
<string name="sk_settings_publish_button_text_title">Змінити текст кнопки \"опублікувати\"</string>
<string name="sk_settings_hide_translate_in_timeline">Сховати кнопку \"перекласти\" у стрічці</string>
<string name="sk_settings_translation_availability_note_available">%s підтримує переклад!</string>
<string name="sk_settings_translation_availability_note_unavailable">%s не підтримує переклад.</string>
<string name="sk_clear_all_notifications">Очистити всі сповіщення</string>
<string name="sk_clear_all_notifications_confirm">Ви впевнені, що хочете очистити всі сповіщення\?</string>
<string name="sk_loading_fediverse_resource_title">Переглядаємо Федісвіт…</string>
<string name="sk_undo_reblog">Скасувати репост</string>
<string name="sk_reblog_with_visibility">Репост з видимістю</string>
<string name="sk_quote_post">Цитувати пост</string>
<string name="sk_tabs_disable_swipe">Вимкнути перегортання вкладок</string>
<string name="sk_settings_auth">Налаштування безпеці</string>
<string name="sk_clear_all_notifications_confirm_action">Видалити все</string>
</resources>

38
mastodon/src/main/res/values-zh-rCN/strings_sk.xml
View File

@@ -47,4 +47,42 @@
<string name="sk_color_palette_yellow">黄</string>
<string name="sk_notification_type_status">嘟文</string>
<string name="sk_notify_posts">嘟文通知</string>
<string name="sk_translate_post">翻译</string>
<string name="sk_translate_show_original">显示原文</string>
<string name="sk_poll_allow_multiple">允许多选</string>
<string name="sk_welcome_text">鲨鱼向你致敬！要想开始，请在下面输入你的账户所在实例的域名。</string>
<string name="sk_welcome_title">欢迎！</string>
<string name="sk_clear_recent_languages">清除最近使用的语言</string>
<string name="sk_confirm_clear_recent_languages">您确定要清除最近使用的语言吗？</string>
<string name="sk_translated_using">使用 %s 翻译</string>
<string name="sk_post_language">语言: %s</string>
<string name="sk_available_languages">可用语言</string>
<string name="sk_language_name">%s (%s)</string>
<string name="sk_example_domain">example.social</string>
<string name="sk_tabs_disable_swipe">禁用选项卡之间的滑动</string>
<string name="sk_settings_profile">设置个人资料</string>
<string name="sk_settings_posting">发布偏好</string>
<string name="sk_settings_filters">配置过滤器</string>
<string name="sk_settings_auth">安全设置</string>
<string name="sk_settings_rules">规则</string>
<string name="sk_settings_about">关于应用程序</string>
<string name="sk_settings_donate">捐赠</string>
<string name="sk_color_palette_material3">系统</string>
<string name="sk_color_palette_red">红</string>
<string name="sk_delete_notification_confirm">您确定要删除此通知吗？</string>
<string name="sk_enable_delete_notifications">启用删除通知</string>
<string name="sk_delete_notification">删除通知</string>
<string name="sk_delete_notification_confirm_action">删除通知</string>
<string name="sk_settings_publish_button_text">发布按钮文本</string>
<string name="sk_settings_publish_button_text_title">自定义发布按钮文本</string>
<string name="sk_settings_hide_translate_in_timeline">在时间轴中隐藏翻译按钮</string>
<string name="sk_settings_translation_availability_note_available">%s 支持翻译！</string>
<string name="sk_settings_translation_availability_note_unavailable">%s 似乎不支持翻译。</string>
<string name="sk_clear_all_notifications">清除所有通知</string>
<string name="sk_clear_all_notifications_confirm_action">删除所有</string>
<string name="sk_clear_all_notifications_confirm">您确定要清除所有通知吗？</string>
<string name="sk_loading_fediverse_resource_title">在 Fediverse 上查找它……</string>
<string name="sk_undo_reblog">撤销转发</string>
<string name="sk_reblog_with_visibility">转发可见性</string>
<string name="sk_quote_post">关于这个嘟文</string>
</resources>