diff options
author | Thomas <tschneider.ac@gmail.com> | 2023-03-07 18:25:21 +0100 |
---|---|---|
committer | Thomas <tschneider.ac@gmail.com> | 2023-03-07 18:25:21 +0100 |
commit | e22d063a1e0c39b72ab52322b888703234769962 (patch) | |
tree | 311ceae9ebf40e2bbc8afab680fa865b3e9de5ab | |
parent | caee0ad2762e66cfbafb5a0b19d6c3260961d563 (diff) | |
parent | 275d941afded2c669e70bc1492ac08bd8fa0abf4 (diff) |
Merge remote-tracking branch 'origin/develop' into develop
-rw-r--r-- | app/src/main/res/values-gd/strings.xml | 9 | ||||
-rw-r--r-- | app/src/main/res/values-ja/strings.xml | 12 | ||||
-rw-r--r-- | app/src/main/res/values-uk/strings.xml | 2 |
3 files changed, 19 insertions, 4 deletions
diff --git a/app/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml index 2e3564d3a..5ec286f18 100644 --- a/app/src/main/res/values-gd/strings.xml +++ b/app/src/main/res/values-gd/strings.xml @@ -230,7 +230,6 @@ <string name="undo">Neo-dhèan</string> <string name="gnu_instance">Ionstans GNU</string> <string name="category_music">Ceòl</string> - <string name="also_favourite_by">" "</string> <string name="blocked_domains">Àrainnean bacte</string> <string name="muted_menu_home">Cleachdaichean mùchte na dachaighe</string> <string name="settings_custom_sharing_url">An t-URL co-roinnidh gnàthaichte agad…</string> @@ -296,7 +295,6 @@ <string name="label_filter">Criathrag</string> <string name="category_activism">Iomairteachd</string> <string name="category_games">Geamaireachd</string> - <string name="account_created_message">" "</string> <string name="save_changes">Sàbhail na h-atharraichean</string> <string name="show_privates">Sell na teachdaireachdan dìreach</string> <string name="set_led_colour">Suidhich dath an LED:</string> @@ -415,4 +413,11 @@ <string name="tos">teirmichean na seirbheise</string> <string name="sign_up">Clàradh</string> <string name="sign_ups">Clàraidhean</string> + <string name="notif_follow">– tha iad ’gad leantainn a-nis</string> + <string name="users">Cleachdaichean: %1$s</string> + <string name="notif_mention">– thug iad iomradh ort</string> + <string name="notif_status">– tha teachdaireachd ùr aca</string> + <string name="notif_reblog">– brosnaich iad an staid agad</string> + <string name="notif_favourite">– is annsa leotha am post agad</string> + <string name="notif_follow_request">– dh’iarr iad gad leantainn</string> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 2306aefc3..1d73247fe 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -207,7 +207,7 @@ <string name="settings_time_from">開始</string> <string name="settings_time_to">終了</string> <string name="embedded_browser">アプリ内ブラウザを使用する</string> - <string name="custom_tabs">カスタムタブ</string> + <string name="custom_tabs">アプリ内ブラウザー(カスタムタブ)</string> <string name="expand_cw">CWを自動的に展開する</string> <string name="set_led_colour">LEDの色:</string> <string-array name="led_colours"> @@ -1000,4 +1000,14 @@ <string name="maths_format">数式のフォーマット</string> <string name="boost_original_date">ブーストされた日時の代わりにブーストされた投稿の作成日時を表示する</string> <string name="set_disable_release_notes_indication">新しいバージョンのアプリがインストールされた後に、アプリ内で更新履歴が表示されなくなります。</string> + <string name="set_alt_text_mandatory_description_warn">メディアの説明がない場合、ダイアログが表示されてそこからそのまま投稿することができます</string> + <string name="toot_error_no_media_description">メディアの説明がありません</string> + <string name="truncate_links">リンクの省略</string> + <string name="truncate_links_max">リンクの最大文字数</string> + <string name="set_alt_text_mandatory">メディアの説明を必須にする</string> + <string name="set_remove_battery">バッテリーの最適化を無視する</string> + <string name="send_anyway">無視して送信</string> + <string name="set_alt_text_mandatory_description">メディアの説明がない投稿は送信されません</string> + <string name="set_alt_text_mandatory_warn">警告のみ</string> + <string name="set_autoplay_gif">アニメーションメディアを自動再生する</string> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 655f0d1f8..a780c0c94 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="action_about">Про додаток</string> + <string name="action_about">Про застосунок</string> <string name="action_about_instance">Про екземпляр</string> <string name="action_privacy">Політики конфіденційності</string> <string name="action_cache">Кеш</string> |