Mastodon
/
SubwayTooter-Android-App
mirror of https://github.com/tateisu/SubwayTooter
1
0
Fork 0
Code Issues Releases Wiki Activity

文言の修正

This commit is contained in:
tateisu 2023-01-13 06:51:38 +09:00
parent 425fd8b45f
commit c0966845b0
10 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/jp/juggler/subwaytooter/appsetting/AppSettingItem.kt
View File

@ -233,7 +233,7 @@ val appSettingRoot = AppSettingItem(null, SettingType.Section, R.string.app_sett
sw(PrefB.bpDivideNotification, R.string.divide_notification)
sw(PrefB.bpMisskeyNotificationCheck, R.string.enable_misskey_notification_check)
// sw(PrefB.bpMisskeyNotificationCheck, R.string.enable_misskey_notification_check)
sample(R.layout.setting_sample_notification_desc)
}

24
app/src/main/java/jp/juggler/subwaytooter/notification/PollingChecker.kt
View File

@ -292,20 +292,16 @@ class PollingChecker(
cache = NotificationCache(account.db_id).apply {
load()
if (account.isMisskey && !PrefB.bpMisskeyNotificationCheck()) {
log.d("skip misskey server. ${account.acct}")
} else {
requestAsync(
client,
account,
wps.flags,
) { result ->
account.updateNotificationError("${result.error} ${result.requestInfo}".trim())
if (result.error?.contains("Timeout") == true &&
!account.dont_show_timeout
) {
progress(account, PollingState.Timeout)
}
requestAsync(
client,
account,
wps.flags,
) { result ->
account.updateNotificationError("${result.error} ${result.requestInfo}".trim())
if (result.error?.contains("Timeout") == true &&
!account.dont_show_timeout
) {
progress(account, PollingState.Timeout)
}
}
}

5
app/src/main/res/values-ca/strings.xml
View File

@ -486,7 +486,7 @@
<string name="relative_time_phrase_past">Fa %1$d %2$s</string>
<string name="relative_time_phrase_future">Després de %1$d %2$s</string>
<string name="notification_channel_description">Aquest paràmetre serveix per ajustar les notificacions de %1$s</string>
<string name="notification_style_after_oreo">Estil de notificacions (Android 8.0+)</string>
<string name="notification_style_after_oreo">Estil de notificacions</string>
<string name="notification_for">Notificacions per %1$s</string>
<string name="enquete_was_end">Ha finalitzat l\'enquesta.</string>
<string name="enquete_voted">Heu votat.</string>
@ -932,7 +932,6 @@
<string name="translation_app">Aplicació de traducció</string>
<string name="missing_app_can_receive_action_send">No es troba cap aplicació que pugui acollir l\'ordre ACTION_SEND.</string>
<string name="select_destination_app_and_back">Selecciona l\'aplicació de destinació, i després torna a la configuració.</string>
<string name="app_chooser_works_android_5_1">Disculpeu, el selector d\'apliacions funciona a Android 5.1+.</string>
<string name="custom_share_button_1">Botó de compartir personalitzat 1</string>
<string name="custom_share_button_2">Botó de compartir personalitzat 2</string>
<string name="custom_share_button_3">Botó de compartir personalitzat 3</string>
@ -970,7 +969,7 @@
<string name="block_domain">Bloca tot el domini</string>
<string name="instance_actions_for">Accions per al servidor \"%1$s\"</string>
<string name="quick_toot_omit_account_selection">En fer brams ràpids, omet selecció de compte si és possible</string>
<string name="separate_notification_group_for_reply">Fer grups de notificacions separats per a respostes (Android 8+)</string>
<string name="separate_notification_group_for_reply">Fer grups de notificacions separats per a respostes</string>
<string name="timeline_line_spacing">Espaiat de línia a les pissarres (s\'usa el número flotant com a multiplicador, deixar buit per defecte. Cal reiniciar aplicació)</string>
<string name="always_expand_context_menu_sub_items">Expandeix sempre els sub-elements del menú contextual</string>
<string name="release_notes_latest">Notes de la versió (v%1$s)</string>

7
app/src/main/res/values-de/strings.xml
View File

@ -671,7 +671,6 @@
<string name="custom_share_button_3">Benutzerdefinierter Teile-Button 3</string>
<string name="custom_share_button_2">Benutzerdefinierter Teile-Button 2</string>
<string name="custom_share_button_1">Benutzerdefinierter Teile-Button 1</string>
<string name="app_chooser_works_android_5_1">Sorry, die App-Auswahl funktioniert unter Android 5.1 und später.</string>
<string name="select_destination_app_and_back">Wähle die Ziel-App, dann zurück zu den App-Einstellungen.</string>
<string name="missing_app_can_receive_action_send">Es fehlt eine App, die mit der Aktion ACTION_SEND etwas anfangen kann.</string>
<string name="translation_app">Übersetzungs-App</string>
@ -720,7 +719,7 @@
<string name="release_notes_updated">Versionsinformationen (v%1$s→v%2$s)</string>
<string name="release_notes_latest">Versionsinformationen (v%1$s)</string>
<string name="always_expand_context_menu_sub_items">Unterpunkte eines Kontextmenüs immer aufklappen</string>
<string name="separate_notification_group_for_reply">Trenne Benachrichtigungsgruppen zur Beantwortung auf (Android 8.0 und später)</string>
<string name="separate_notification_group_for_reply">Trenne Benachrichtigungsgruppen zur Beantwortung auf</string>
<string name="timeline_line_spacing">Zeilenabstände in der Timeline (Gleitkommazahl als Multiplikator für den Zeilenabstand, leer lassen für standard. App-Neustart erforderlich)</string>
<string name="quick_toot_omit_account_selection">Bei der Nutzung von Quick-Toot nach Möglichkeit keine Kontenauswahl treffen</string>
<string name="instance_actions_for">Aktionen bzgl. Server \"%1$s\"</string>
@ -758,7 +757,7 @@
<string name="edited_at">Bearbeitet: %1$s</string>
<string name="announcements_index">%1$d/%2$d</string>
<string name="announcements">Ankündigungen</string>
<string name="divide_notification">Benachrichtigungen aufteilen (Android 6.0 und später)</string>
<string name="divide_notification">Benachrichtigungen aufteilen</string>
<string name="push_notification_server_key_empty">Push-Benachrichtigungen werden aufgrund einer Fehlkonfiguration des Servers nicht funktionieren. Der öffentliche Schlüssel des Servers ist leer.</string>
<string name="push_notification_server_key_missing">Push-Benachrichtigungen werden aufgrund einer Fehlkonfiguration des Servers nicht funktionieren. Der öffentliche Schlüssel des Servers fehlt.</string>
<string name="follow_request">Anfrage folgen</string>
@ -935,7 +934,7 @@
<string name="enquete_vote_failed">Konnte nicht abstimmen. %1$s</string>
<string name="enquete_voted">Abgestimmt.</string>
<string name="notification_for">Benachrichtigung für %1$s</string>
<string name="notification_style_after_oreo">Benachrichtigungsstil (Android 8.0 und später)</string>
<string name="notification_style_after_oreo">Benachrichtigungsstil</string>
<string name="notification_channel_description">Diese Einstellung legt die Benachrichtigung für %1$s fest</string>
<string name="relative_time_phrase_future">%1$d %2$s später</string>
<string name="relative_time_phrase_past">%1$d %2$s</string>

7
app/src/main/res/values-fr/strings.xml
View File

@ -451,7 +451,7 @@
<string name="relative_time_unit_days">jours</string>
<string name="relative_time_phrase_past">Il y a %1$d %2$s</string>
<string name="relative_time_phrase_future">Dans %1$d %2$s</string>
<string name="notification_style_after_oreo">Style de notifications (Android 8.0+)</string>
<string name="notification_style_after_oreo">Style de notifications</string>
<string name="notification_for">Notification for %1$s</string>
<string name="notification_channel_description">Ce paramètre est utilisé pour ajuster les notifications pour %1$s</string>
<string name="enquete_was_end">Sondage terminé.</string>
@ -907,7 +907,6 @@
<string name="missing_app_can_receive_action_send">Application pouvant recevoir ACTION-SEND manquante.</string>
<string name="translation_app">Application de traduction</string>
<string name="select_destination_app_and_back">Sélectionnez l’application de destination puis retournez aux paramètres de l’application.</string>
<string name="app_chooser_works_android_5_1">Désolé, le sélecteur d’applications fonctionne sur Android 5.1+.</string>
<string name="custom_share_button_1">Bouton de partage personnalisé 1</string>
<string name="custom_share_button_2">Bouton de partage personnalisé 2</string>
<string name="custom_share_button_3">Bouton de partage personnalisé 3</string>
@ -998,7 +997,7 @@
<string name="copied_to_clipboard">A été copié vers le presse-papiers.</string>
<string name="copy_to_clipboard">Copier vers le presse-papiers</string>
<string name="hide_followers_count">Cacher le nombre des abonné·e·s</string>
<string name="divide_notification">Séparer les notifications (Android 6+)</string>
<string name="divide_notification">Séparer les notifications</string>
<string name="show_bookmark_button">Afficher le bouton des signets (redémarrage requis)</string>
<string name="release_notes_updated">Notes de version (v%1$s→v%2$s)</string>
<string name="release_notes_latest">Notes de version (v%1$s)</string>
@ -1030,7 +1029,7 @@
<string name="custom_thumbnail">Vignette personnalisée</string>
<string name="personal_notes">Notes personnelles</string>
<string name="conversation_main_toot_background_color">Couleur d’arrière-plan du pouet principal de la conversation</string>
<string name="separate_notification_group_for_reply">Groupes de notification distincts pour la réponse (Android 8+)</string>
<string name="separate_notification_group_for_reply">Groupes de notification distincts pour la réponse</string>
<string name="warn_hashtag_ascii_and_non_ascii">Avertir si le hashtag contient à la fois des caractères ASCII et non-ASCII</string>
<string name="hashtag_contains_ascii_and_not_ascii">Le Hashtag %1$s contient à la fois des caractères ASCII et non ASCII. Il peut s’agir d’une faute de frappe. En êtes-vous sûr \?</string>
<string name="direct_with_user_visibility">Visibilité \"direct aux utilisateur·rice·s\"</string>

7
app/src/main/res/values-ja/strings.xml
View File

@ -492,7 +492,7 @@
<string name="notification_on_off_desc">通知のON/OFFはアカウント設定にあります</string>
<string name="notification_option">通知オプション</string>
<string name="notification_sound">通知音</string>
<string name="notification_style_after_oreo">通知スタイル(Android 8.x 以降)</string>
<string name="notification_style_after_oreo">通知スタイル</string>
<string name="notification_tl_font_size">通知TLのフォントの大きさ\n(単位:sp。空欄でデフォルト。アプリ再起動が必要)\n…\n…</string>
<string name="notification_tl_icon_size">通知TLのアイコンの大きさ (単位:dp。デフォルト:24。アプリ再起動が必要)</string>
<string name="notification_type_boost">ブースト</string>
@ -932,7 +932,6 @@
<string name="translation_app">翻訳アプリ</string>
<string name="missing_app_can_receive_action_send">ACTION_SENDを受け取れるアプリがありません。</string>
<string name="select_destination_app_and_back">出力先のアプリを選択した後に設定画面まで戻ってください</string>
<string name="app_chooser_works_android_5_1">アプリを選択する機能はAndroid5.1+で使えます。</string>
<string name="custom_share_button_1">カスタム共有ボタン1</string>
<string name="custom_share_button_2">カスタム共有ボタン2</string>
<string name="custom_share_button_3">カスタム共有ボタン3</string>
@ -970,7 +969,7 @@
<string name="block_domain">ドメイン全体をブロック</string>
<string name="instance_actions_for">\"%1$s\" サーバへのアクション</string>
<string name="quick_toot_omit_account_selection">簡易投稿でも可能ならアカウント選択を省略する</string>
<string name="separate_notification_group_for_reply">返信の通知グループを分ける (Android 8+)</string>
<string name="separate_notification_group_for_reply">返信の通知グループを分ける</string>
<string name="timeline_line_spacing">タイムラインの行間 (数値は文字に対する割合を示します。空欄でデフォルト状態。アプリ再起動が必要)</string>
<string name="always_expand_context_menu_sub_items">コンテキストメニューの副項目を常に展開する</string>
<string name="release_notes_latest">更新履歴 (v%1$s)</string>
@ -1004,7 +1003,7 @@
<string name="developer_options">開発者オプション</string>
<string name="push_notification_server_key_missing">サーバ側の設定ミスによりプッシュ通知は動作しません。サーバ公開鍵がありません。</string>
<string name="push_notification_server_key_empty">サーバ側の設定ミスによりプッシュ通知は動作しません。サーバ公開鍵がカラです。</string>
<string name="divide_notification">通知を分割する (Android 6+)</string>
<string name="divide_notification">通知を分割する</string>
<string name="announcements">告知</string>
<string name="announcements_index">%1$d/%2$d</string>
<string name="announcements_period1">イベント期間: %1$s</string>

2
app/src/main/res/values-ko/strings.xml
View File

@ -463,7 +463,7 @@
<string name="relative_time_phrase_past">%1$d %2$s</string>
<string name="relative_time_phrase_future">%1$d %2$s 후</string>
<string name="notification_channel_description">이 설정은 %1$s에 대한 알림을 조절하는 데 사용됩니다</string>
<string name="notification_style_after_oreo">알림 스타일 (안드로이드 8.0 이상)</string>
<string name="notification_style_after_oreo">알림 스타일</string>
<string name="notification_for">%1$s에 대한 알림</string>
<string name="enquete_was_end">설문조사 끝남.</string>
<string name="enquete_voted">투표함.</string>

2
app/src/main/res/values-nb-rNO/strings.xml
View File

@ -372,7 +372,7 @@
<string name="relative_time_phrase_past">%1$d %2$s siden</string>
<string name="relative_time_phrase_future">%1$d %2$s senere</string>
<string name="notification_channel_description">Disse innstillingen brukes for merknad for %1$s</string>
<string name="notification_style_after_oreo">Merknadsstil (Android 8.0 eller senere)</string>
<string name="notification_style_after_oreo">Merknadsstil</string>
<string name="notification_for">Merknad for %1$s</string>
<string name="enquete_voted">Innsendt.</string>
<string name="enquete_vote_failed">Stemmegivning mislyktes. %1$s</string>

7
app/src/main/res/values-zh-rCN/strings.xml
View File

@ -567,7 +567,7 @@
<string name="announcements_period1">事件日期:%1$s</string>
<string name="announcements_index">%1$d %2$d</string>
<string name="announcements">公告</string>
<string name="divide_notification">去除通知(android6 +)</string>
<string name="divide_notification">去除通知</string>
<string name="push_notification_server_key_empty">推送通知将不起作用，因为服务器配置错误，服务器公钥为空.</string>
<string name="push_notification_server_key_missing">推送通知将无法工作，因为服务器配置错误，缺少服务器公钥.</string>
<string name="follow_request">关注请求</string>
@ -601,7 +601,7 @@
<string name="release_notes_latest">发布注释(v%1$s)</string>
<string name="always_expand_context_menu_sub_items">总是展开上下文菜单的子项目</string>
<string name="timeline_line_spacing">时间线行间距(浮动数字用作行间距倍增器，默认留空，应用需要重启)</string>
<string name="separate_notification_group_for_reply">独立的回复通知组(android8 +)</string>
<string name="separate_notification_group_for_reply">独立的回复通知组</string>
<string name="quick_toot_omit_account_selection">当使用快速嘟嘟时，如果可能的话，省略帐户选择</string>
<string name="instance_actions_for">\"%1$s\"实例的动作</string>
<string name="block_domain">阻止整个域名</string>
@ -1006,7 +1006,7 @@
<string name="enquete_voted">已投票.</string>
<string name="enquete_was_end">投票结束.</string>
<string name="notification_for">%1$s的通知</string>
<string name="notification_style_after_oreo">通知方式(Android 8.0+)</string>
<string name="notification_style_after_oreo">通知方式</string>
<string name="notification_channel_description">此设置用于调整%1$s</string>
<string name="relative_time_phrase_future">%1$d %2$s 之后</string>
<string name="relative_time_unit_days">天数</string>
@ -1031,7 +1031,6 @@
<string name="custom_share_button_3">自定义共享按钮3</string>
<string name="custom_share_button_2">自定义共享按钮2</string>
<string name="custom_share_button_1">自定义共享按钮1</string>
<string name="app_chooser_works_android_5_1">对不起，应用选择器工作中Android 5.1+.</string>
<string name="select_destination_app_and_back">选择目标应用，然后返回到应用设置.</string>
<string name="missing_app_can_receive_action_send">丢失可以接收 ACTION _ send的应用.</string>
<string name="translation_app">翻译应用</string>

7
app/src/main/res/values/strings.xml
View File

@ -482,7 +482,7 @@
<string name="relative_time_phrase_past">%1$d %2$s</string>
<string name="relative_time_phrase_future">%1$d %2$s later</string>
<string name="notification_channel_description">This setting is used to adjust notification for %1$s</string>
<string name="notification_style_after_oreo">Notification style (Android 8.0+)</string>
<string name="notification_style_after_oreo">Notification style</string>
<string name="notification_for">Notification for %1$s</string>
<string name="enquete_was_end">Enquete ended.</string>
<string name="enquete_voted">Voted.</string>
@ -939,7 +939,6 @@
<string name="translation_app">Translation app</string>
<string name="missing_app_can_receive_action_send">Missing app that can receive ACTION_SEND.</string>
<string name="select_destination_app_and_back">Select the destination app, then back to app setting.</string>
<string name="app_chooser_works_android_5_1">Sorry, app chooser works on Android 5.1+.</string>
<string name="custom_share_button_1">Custom share button 1</string>
<string name="custom_share_button_2">Custom share button 2</string>
<string name="custom_share_button_3">Custom share button 3</string>
@ -977,7 +976,7 @@
<string name="block_domain">Block whole domain</string>
<string name="instance_actions_for">Actions for the server \"%1$s\"</string>
<string name="quick_toot_omit_account_selection">When using quick toot, omit account selection if possible</string>
<string name="separate_notification_group_for_reply">Separate notification groups for reply (Android 8+)</string>
<string name="separate_notification_group_for_reply">Separate notification groups for reply</string>
<string name="timeline_line_spacing">Timeline line spacing (floating number is used as line spacing multiplier. leave empty to default. app restart required)</string>
<string name="always_expand_context_menu_sub_items">Always expand sub-items of context menu</string>
<string name="release_notes_latest">Release notes (v%1$s)</string>
@ -1012,7 +1011,7 @@
<string name="follow_request">Follow request</string>
<string name="push_notification_server_key_missing">Push notification will not work because server misconfiguration. Server public key is missing.</string>
<string name="push_notification_server_key_empty">Push notification will not work because server misconfiguration. Server public key is empty.</string>
<string name="divide_notification">Divide notifications (Android 6+)</string>
<string name="divide_notification">Divide notifications</string>
<string name="announcements">Announcements</string>
<string name="announcements_index">%1$d/%2$d</string>
<string name="announcements_period1">Event Period: %1$s</string>