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

Changing stuff back to moshidon again

Browse Source
This commit is contained in:
LucasGGamerM
2022-12-22 15:32:32 -03:00
parent 481241c4f6
commit ba3f6c4f95
12 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
View File

@@ -142,7 +142,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
.setShowWhen(true)
.setCategory(Notification.CATEGORY_SOCIAL)
.setAutoCancel(true)
.setColor(UiUtils.getThemeColor(context, R.attr.colorPrimary700));
.setColor(context.getColor(R.color.shortcut_icon_background));
switch (pn.notificationType) {
case FAVORITE -> builder.setSmallIcon(R.drawable.ic_fluent_star_24_filled);
case REBLOG -> builder.setSmallIcon(R.drawable.ic_fluent_arrow_repeat_all_24_filled);

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

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="sk_app_name">Megalodon</string>
<string name="sk_app_name">Moshidon</string>
<string name="sk_pinned_posts">Angeheftet</string>
<string name="sk_delete_and_redraft">Löschen und neu erstellen</string>
<string name="sk_confirm_delete_and_redraft_title">Beitrag löschen und neu erstellen</string>
@@ -19,14 +19,14 @@
<string name="sk_settings_show_boosts">Geteilte Beiträge anzeigen</string>
<string name="sk_settings_load_new_posts">Automatisch neue Beiträge laden</string>
<string name="sk_settings_show_interaction_counts">Interaktions-Anzahlen anzeigen</string>
<string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
<string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
<string name="sk_mark_media_as_sensitive">Medien als sensibel markieren</string>
<string name="sk_user_post_notifications_on">Benachrichtigungen über Beiträge von %s aktiviert</string>
<string name="sk_user_post_notifications_off">Benachrichtigungen über Beiträge von %s deaktiviert</string>
<string name="sk_federated_timeline">Föderation</string>
<string name="sk_federated_timeline_info_banner">Das sind die neuesten Beiträge von Personen, die in der Föderation deines Servers sind.</string>
<string name="sk_update_available">Megalodon %s ist zum Herunterladen bereit.</string>
<string name="sk_update_ready">Megalodon %s wurde heruntergeladen und kann jetzt installiert werden.</string>
<string name="sk_update_available">Moshidon %s ist zum Herunterladen bereit.</string>
<string name="sk_update_ready">Moshidon %s wurde heruntergeladen und kann jetzt installiert werden.</string>
<string name="sk_check_for_update">Auf Update prüfen</string>
<string name="sk_no_update_available">Kein Update verfügbar</string>
<string name="sk_list_timelines">Listen</string>
@@ -36,7 +36,7 @@
<string name="sk_lists_with_user">Listen mit %s</string>
<string name="sk_settings_always_reveal_content_warnings">Inhaltswarnungen immer ausklappen</string>
<string name="sk_disable_marquee">Laufschrift in Titelleisten deaktivieren</string>
<string name="sk_settings_contribute">Zu Megalodon beitragen</string>
<string name="sk_settings_contribute">Zu Moshidon beitragen</string>
<string name="sk_settings_show_federated_timeline">Föderierte Timeline anzeigen</string>
<string name="sk_notify_posts">Beitrags-Benachrichtigungen</string>
<string name="sk_settings_color_picker">Farbschema</string>

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

@@ -11,7 +11,7 @@
<string name="sk_unpin_post">Desanclar del perfil</string>
<string name="sk_confirm_unpin_post_title">Desanclar publicación del perfil</string>
<string name="sk_confirm_unpin_post">¿Confirma que quiere desanclar esta publicación\?</string>
<string name="sk_app_name">Megalodon</string>
<string name="sk_app_name">Moshidon</string>
<string name="sk_unpinning">Desanclando publicación…</string>
<string name="sk_image_description">Descripción de la imagen</string>
<string name="sk_visibility_unlisted">Descatalogada</string>
@@ -24,8 +24,8 @@
<string name="sk_user_post_notifications_off">Desactivadas las notificaciones de posts para %s</string>
<string name="sk_federated_timeline">Federación</string>
<string name="sk_federated_timeline_info_banner">Estas son las publicaciones más recientes de las personas de su federación.</string>
<string name="sk_update_available">Megalodon %s está listo para descargar.</string>
<string name="sk_update_ready">Megalodon %s se ha descargado y está listo para instalarse.</string>
<string name="sk_update_available">Moshidon %s está listo para descargar.</string>
<string name="sk_update_ready">Moshidon %s se ha descargado y está listo para instalarse.</string>
<string name="sk_check_for_update">Buscar actualizaciones</string>
<string name="sk_no_update_available">No hay actualizaciones disponibles</string>
<string name="sk_list_timelines">Listas</string>
@@ -35,9 +35,9 @@
<string name="sk_lists_with_user">Listas con %s</string>
<string name="sk_settings_always_reveal_content_warnings">Mostrar siempre advertencias de contenido</string>
<string name="sk_disable_marquee">Desactivar desplazamiento de texto en barras del título</string>
<string name="sk_settings_contribute">Contribuir a Megalodon</string>
<string name="sk_settings_contribute">Contribuir a Moshidon</string>
<string name="sk_settings_show_federated_timeline">Mostrar cronología federada</string>
<string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
<string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
<string name="sk_notification_type_status">Publicaciones</string>
<string name="sk_notify_posts">Publicar notificaciones</string>
<string name="sk_settings_color_picker">Colores para los temas</string>

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

@@ -13,12 +13,12 @@
<string name="sk_settings_show_replies">Afficher les réponses</string>
<string name="sk_settings_show_boosts">Afficher les boosts</string>
<string name="sk_settings_load_new_posts">Charger automatiquement les nouveaux messages</string>
<string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
<string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
<string name="sk_mark_media_as_sensitive">Marquer le média comme sensible</string>
<string name="sk_user_post_notifications_on">Notifications de message activées pour %s</string>
<string name="sk_user_post_notifications_off">Désactivation des notifications de message pour %s</string>
<string name="sk_update_available">Megalodon %s est prête à être téléchargée.</string>
<string name="sk_update_ready">Megalodon %s est téléchargée et prête à être installée.</string>
<string name="sk_update_available">Moshidon %s est prête à être téléchargée.</string>
<string name="sk_update_ready">Moshidon %s est téléchargée et prête à être installée.</string>
<string name="sk_check_for_update">Vérifier les mises à jour</string>
<string name="sk_no_update_available">Pas de mise a jour disponible</string>
<string name="sk_list_timelines">Listes</string>
@@ -28,9 +28,9 @@
<string name="sk_lists_with_user">Listes avec %s</string>
<string name="sk_settings_always_reveal_content_warnings">Toujours afficher les avertissements de contenu</string>
<string name="sk_disable_marquee">Désactiver le défilement du texte dans les barres de titre</string>
<string name="sk_settings_contribute">Contribuez à Megalodon</string>
<string name="sk_settings_contribute">Contribuez à Moshidon</string>
<string name="sk_settings_show_federated_timeline">Afficher la timeline fédérée</string>
<string name="sk_app_name">Megalodon</string>
<string name="sk_app_name">Moshidon</string>
<string name="sk_delete_and_redraft">Supprimer et rééditer</string>
<string name="sk_pin_post">Épingler au profil</string>
<string name="sk_confirm_pin_post_title">Épingler le message au profil</string>

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

@@ -12,23 +12,23 @@
<string name="sk_settings_show_boosts">Lihat boost</string>
<string name="sk_settings_load_new_posts">Muat kiriman baru secara otomatis</string>
<string name="sk_settings_show_interaction_counts">Tampilkan jumlah interaksi</string>
<string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
<string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
<string name="sk_user_post_notifications_on">Nyalakan notifikasi kiriman untuk %s</string>
<string name="sk_user_post_notifications_off">Matikan notifikasi kiriman untuk %s</string>
<string name="sk_federated_timeline">Federasi</string>
<string name="sk_federated_timeline_info_banner">Kiriman terbaru dari orang-orang di federasi anda.</string>
<string name="sk_update_available">Megalodon %s siap untuk diunduh.</string>
<string name="sk_update_ready">Megalodon %s telah diunduh dan siap dipasang.</string>
<string name="sk_update_available">Moshidon %s siap untuk diunduh.</string>
<string name="sk_update_ready">Moshidon %s telah diunduh dan siap dipasang.</string>
<string name="sk_check_for_update">Periksa pembaruan</string>
<string name="sk_no_update_available">Tidak ada pembaruan</string>
<string name="sk_list_timelines">Daftar</string>
<string name="sk_unpinning">Menghapus sematan kiriman…</string>
<string name="sk_accept_follow_request">Terima permintaan pengikut</string>
<string name="sk_reject_follow_request">Tolak permintaan pengikut</string>
<string name="sk_app_name">Megalodon</string>
<string name="sk_app_name">Moshidon</string>
<string name="sk_confirm_delete_and_redraft">Hapus dan tulis ulang kiriman ini\?</string>
<string name="sk_confirm_unpin_post">Apakah Anda yakin untuk menghapus sematan kiriman ini\?</string>
<string name="sk_settings_contribute">Berkontribusi ke Megalodon</string>
<string name="sk_settings_contribute">Berkontribusi ke Moshidon</string>
<string name="sk_pinned_posts">Disematkan</string>
<string name="sk_pin_post">Sematkan ke profil</string>
<string name="sk_visibility_unlisted">Tidak terdaftar</string>

10
mastodon/src/main/res/values-ko-rKR/strings_sk.xml
View File

@@ -32,10 +32,10 @@
<string name="sk_lists_with_user">%s 님이 포함된 리스트</string>
<string name="sk_settings_always_reveal_content_warnings">열람주의 게시물을 항상 펼치기</string>
<string name="sk_disable_marquee">제목 표시줄의 텍스트 스크롤 비활성화</string>
<string name="sk_app_name">Megalodon</string>
<string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
<string name="sk_update_available">Megalodon %s 버전을 다운로드할 수 있습니다.</string>
<string name="sk_update_ready">Megalodon %s 버전을 다운로드하였으며 설치할 수 있습니다.</string>
<string name="sk_app_name">Moshidon</string>
<string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
<string name="sk_update_available">Moshidon %s 버전을 다운로드할 수 있습니다.</string>
<string name="sk_update_ready">Moshidon %s 버전을 다운로드하였으며 설치할 수 있습니다.</string>
<string name="sk_settings_show_federated_timeline">연합 타임라인 표시</string>
<string name="sk_notification_type_status">게시물</string>
<string name="sk_notify_posts">게시물 알림</string>
@@ -46,7 +46,7 @@
<string name="sk_color_theme_blue">파란색</string>
<string name="sk_color_theme_brown">갈색</string>
<string name="sk_color_theme_yellow">노란색</string>
<string name="sk_settings_contribute">Megalodon에 기여</string>
<string name="sk_settings_contribute">Moshidon에 기여</string>
<string name="sk_poll_allow_multiple">다중 선택 허용</string>
<string name="sk_translate_post">번역하기</string>
<string name="sk_translate_show_original">원본 보기</string>

2
mastodon/src/main/res/values-night/colors.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="shortcut_icon_background">@color/gray_700</color>
<color name="shortcut_icon_background">#282C37</color>
<!-- <color name="shortcut_icon_foreground">@color/purple_primary_600</color>-->
</resources>

10
mastodon/src/main/res/values-pt-rBR/strings_sk.xml
View File

@@ -7,7 +7,7 @@
<string name="sk_confirm_pin_post_title">Fixar postagem no perfil</string>
<string name="sk_confirm_pin_post">Você deseja fixar esta postagem em seu perfil\?</string>
<string name="sk_pinning">Fixando postagem…</string>
<string name="sk_app_name">Megalodon</string>
<string name="sk_app_name">Moshidon</string>
<string name="sk_pinned_posts">Fixado</string>
<string name="sk_unpin_post">Desafixar do perfil</string>
<string name="sk_confirm_unpin_post_title">Desafixar postagem do perfil</string>
@@ -18,13 +18,13 @@
<string name="sk_settings_show_boosts">Mostrar boosts</string>
<string name="sk_settings_load_new_posts">Carregar novas postagens automaticamente</string>
<string name="sk_mark_media_as_sensitive">Marcar mídia como sensível</string>
<string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
<string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
<string name="sk_lists_with_user">Listas com %s</string>
<string name="sk_user_post_notifications_on">Ativar as notificações de postagem para %s</string>
<string name="sk_federated_timeline">Federação</string>
<string name="sk_federated_timeline_info_banner">Estas são as postagens mais recentes das pessoas em sua federação.</string>
<string name="sk_update_available">Megalodon %s está pronto para baixar.</string>
<string name="sk_update_ready">Megalodon %s foi baixado e está pronto para instalar.</string>
<string name="sk_update_available">Moshidon %s está pronto para baixar.</string>
<string name="sk_update_ready">Moshidon %s foi baixado e está pronto para instalar.</string>
<string name="sk_check_for_update">Verificar se há atualizações</string>
<string name="sk_no_update_available">Nenhuma atualização disponível</string>
<string name="sk_list_timelines">Listas</string>
@@ -34,7 +34,7 @@
<string name="sk_reject_follow_request">Recusar solicitação para seguir</string>
<string name="sk_settings_always_reveal_content_warnings">Sempre revelar avisos de conteúdo</string>
<string name="sk_disable_marquee">Desative o texto de rolagem nas barras de título</string>
<string name="sk_settings_contribute">Contribua para o Megalodon</string>
<string name="sk_settings_contribute">Contribua para o Moshidon</string>
<string name="sk_settings_show_federated_timeline">Mostre a linha do tempo federada</string>
<string name="sk_visibility_unlisted">Não-listado</string>
<string name="sk_settings_show_interaction_counts">Mostrar contagens de interação</string>

10
mastodon/src/main/res/values-ru-rRU/strings_sk.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="sk_app_name">Megalodon</string>
<string name="sk_app_name">Moshidon</string>
<string name="sk_pinned_posts">Закрепленные</string>
<string name="sk_delete_and_redraft">Удалить и исправить</string>
<string name="sk_confirm_delete_and_redraft_title">Удалить и исправить пост</string>
@@ -14,7 +14,7 @@
<string name="sk_image_description">Описание изображения</string>
<string name="sk_visibility_unlisted">Скрытый</string>
<string name="sk_mark_media_as_sensitive">Отметить медиафайл как деликатный</string>
<string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
<string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
<string name="sk_notification_type_status">Публикации</string>
<string name="sk_notify_posts">Отправляет публикацию</string>
<string name="sk_settings_color_picker">Цветовая схема</string>
@@ -31,8 +31,8 @@
<string name="sk_settings_load_new_posts">Автоматически загружать новые публикации</string>
<string name="sk_settings_show_replies">Показывать ответы на публикации</string>
<string name="sk_federated_timeline">Федерация</string>
<string name="sk_update_available">Megalodon %s готов к скачиванию.</string>
<string name="sk_update_ready">Megalodon %s скачан и готов к установке новой версии.</string>
<string name="sk_update_available">Moshidon %s готов к скачиванию.</string>
<string name="sk_update_ready">Moshidon %s скачан и готов к установке новой версии.</string>
<string name="sk_check_for_update">Проверить обновления</string>
<string name="sk_follow_requests">Запросы на подписку</string>
<string name="sk_lists_with_user">Списки с %s</string>
@@ -44,7 +44,7 @@
<string name="sk_accept_follow_request">Принять запрос на подписку</string>
<string name="sk_reject_follow_request">Отклонить заявку на подписку</string>
<string name="sk_settings_always_reveal_content_warnings">Всегда раскрывать предупреждения о непристойном контенте</string>
<string name="sk_settings_contribute">Внести свой код в Megalodon</string>
<string name="sk_settings_contribute">Внести свой код в Moshidon</string>
<string name="sk_settings_show_federated_timeline">Показывать федеративную временную шкалу</string>
<string name="sk_color_theme_green">Зелёный</string>
<string name="sk_color_theme_blue">Синий</string>

2
mastodon/src/main/res/values/colors.xml
View File

@@ -98,7 +98,7 @@
<color name="bookmark_selected">@color/success_500</color>
<color name="boost_selected">@color/primary_500</color>
<color name="shortcut_icon_background">@color/gray_100</color>
<color name="shortcut_icon_background">#282C37</color>
<color name="shortcut_icon_foreground">@color/purple_primary_700</color>
<!-- M3 dynamic colors -->

2
mastodon/src/main/res/values/strings.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">Mastodon</string>
<string name="app_name" translatable="false">Moshidon</string>
<string name="get_started">Create account</string>
<string name="already_have_account">I already have an account</string>

10
mastodon/src/main/res/values/strings_sk.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="sk_app_name">Megalodon</string>
<string name="sk_app_name">Moshidon</string>
<string name="sk_pinned_posts">Pinned</string>
<string name="sk_delete_and_redraft">Delete and re-draft</string>
<string name="sk_confirm_delete_and_redraft_title">Delete and re-draft Post</string>
@@ -19,14 +19,14 @@
<string name="sk_settings_show_boosts">Show boosts</string>
<string name="sk_settings_load_new_posts">Automatically load new posts</string>
<string name="sk_settings_show_interaction_counts">Show interaction counts</string>
<string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
<string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
<string name="sk_mark_media_as_sensitive">Mark media as sensitive</string>
<string name="sk_user_post_notifications_on">Turned on post notifications for %s</string>
<string name="sk_user_post_notifications_off">Turned off post notifications for %s</string>
<string name="sk_federated_timeline">Federation</string>
<string name="sk_federated_timeline_info_banner">These are the most recent posts by the people in your federation.</string>
<string name="sk_update_available">Megalodon %s is ready to download.</string>
<string name="sk_update_ready">Megalodon %s is downloaded and ready to install.</string>
<string name="sk_update_available">Moshidon %s is ready to download.</string>
<string name="sk_update_ready">Moshidon %s is downloaded and ready to install.</string>
<string name="sk_check_for_update">Check for update</string>
<string name="sk_no_update_available">No update available</string>
<string name="sk_list_timelines">Lists</string>
@@ -36,7 +36,7 @@
<string name="sk_lists_with_user">Lists with %s</string>
<string name="sk_settings_always_reveal_content_warnings">Always reveal content warnings</string>
<string name="sk_disable_marquee">Disable scrolling text in title bars</string>
<string name="sk_settings_contribute">Contribute to Megalodon</string>
<string name="sk_settings_contribute">Contribute to Moshidon</string>
<string name="sk_settings_show_federated_timeline">Show federated timeline</string>
<string name="sk_notification_type_status">Posts</string>
<string name="sk_notify_posts">Post notifications</string>