summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortom79 <tschneider.ac@gmail.com>2019-04-25 19:07:51 +0200
committertom79 <tschneider.ac@gmail.com>2019-04-25 19:07:51 +0200
commit6e82ad48684455bfe6cfbebac5f2485e295a060f (patch)
tree0f07fc82141e7954fd07ea3cb12152a522eb9ed2
parent567623fd04f9912dce8c41bb8b082c6f8a859784 (diff)
parentb7eeec4f9b6960112e7b04c3db83ecc04b80e3be (diff)
Merge branch 'l10n_crowdin_localization_gitlab' into develop
-rw-r--r--app/src/main/res/values-af/strings.xml11
-rw-r--r--app/src/main/res/values-ar/strings.xml11
-rw-r--r--app/src/main/res/values-ca/strings.xml11
-rw-r--r--app/src/main/res/values-cs/strings.xml11
-rw-r--r--app/src/main/res/values-cy/strings.xml11
-rw-r--r--app/src/main/res/values-da/strings.xml11
-rw-r--r--app/src/main/res/values-de/strings.xml11
-rw-r--r--app/src/main/res/values-el/strings.xml11
-rw-r--r--app/src/main/res/values-es/strings.xml11
-rw-r--r--app/src/main/res/values-eu/strings.xml11
-rw-r--r--app/src/main/res/values-fa/strings.xml11
-rw-r--r--app/src/main/res/values-fi/strings.xml11
-rw-r--r--app/src/main/res/values-fr/strings.xml11
-rw-r--r--app/src/main/res/values-gl/strings.xml11
-rw-r--r--app/src/main/res/values-he/strings.xml11
-rw-r--r--app/src/main/res/values-hi/strings.xml11
-rw-r--r--app/src/main/res/values-hu/strings.xml11
-rw-r--r--app/src/main/res/values-hy/strings.xml11
-rw-r--r--app/src/main/res/values-id/strings.xml11
-rw-r--r--app/src/main/res/values-it/strings.xml11
-rw-r--r--app/src/main/res/values-ja/strings.xml11
-rw-r--r--app/src/main/res/values-kab/strings.xml11
-rw-r--r--app/src/main/res/values-ko/strings.xml11
-rw-r--r--app/src/main/res/values-lmo/strings.xml11
-rw-r--r--app/src/main/res/values-mk/strings.xml11
-rw-r--r--app/src/main/res/values-nl/strings.xml11
-rw-r--r--app/src/main/res/values-no/strings.xml11
-rw-r--r--app/src/main/res/values-oc/strings.xml11
-rw-r--r--app/src/main/res/values-pl/strings.xml11
-rw-r--r--app/src/main/res/values-pt/strings.xml11
-rw-r--r--app/src/main/res/values-ro/strings.xml11
-rw-r--r--app/src/main/res/values-ru/strings.xml11
-rw-r--r--app/src/main/res/values-si/strings.xml11
-rw-r--r--app/src/main/res/values-sl/strings.xml11
-rw-r--r--app/src/main/res/values-sr/strings.xml11
-rw-r--r--app/src/main/res/values-sv/strings.xml11
-rw-r--r--app/src/main/res/values-tr/strings.xml11
-rw-r--r--app/src/main/res/values-uk/strings.xml11
-rw-r--r--app/src/main/res/values-vi/strings.xml11
-rw-r--r--app/src/main/res/values-zh-rCN/strings.xml11
-rw-r--r--app/src/main/res/values-zh-rTW/strings.xml11
41 files changed, 287 insertions, 164 deletions
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 2b6348ca4..a169e350b 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -273,6 +273,7 @@
<string name="nothing_to_do">No action can be taken</string>
<string name="toast_saved">The media has been saved!</string>
<string name="toast_error_translate">An error occurred while translating!</string>
+ <string name="toast_error_translations_disabled">Translations are disabled in settings</string>
<string name="toast_toot_saved">Draft saved!</string>
<string name="toast_error_char_limit">Are you sure this instance allows this number of characters? Usually, this value is close to 500 characters.</string>
<string name="toast_visibility_changed">Visibility of the toots has been changed for the account %1$s</string>
@@ -298,7 +299,6 @@
<string name="set_auto_store_toot">Save drafts automatically</string>
<string name="set_bubble_counter">Display counters</string>
<string name="set_auto_add_media_url">Add URL of media in toots</string>
- <string name="settings_title_notifications">Manage notifications</string>
<string name="set_notif_follow">Notify when someone follows you</string>
<string name="set_notif_follow_ask">Notify when someone requests to follow you</string>
<string name="set_notif_follow_share">Notify when someone boosts your status</string>
@@ -306,7 +306,6 @@
<string name="set_notif_follow_mention">Notify when someone mentions you</string>
<string name="set_share_validation">Show confirmation dialog before boosting</string>
<string name="set_share_validation_fav">Show confirmation dialog before adding to favourites</string>
- <string name="settings_title_more_options">Advanced settings</string>
<string name="set_wifi_only">Notify in WIFI only</string>
<string name="set_notify">Notify?</string>
<string name="set_notif_silent">Silent Notifications</string>
@@ -323,7 +322,6 @@
<string name="set_automatically_split_toot">Automatically split toots over 500 chars in replies</string>
<string name="note_no_space">You have reached the 160 characters allowed!</string>
<string name="username_no_space">You have reached the 30 characters allowed!</string>
- <string name="settings_title_hour">Time slot for notifications:</string>
<string name="settings_time_from">Between</string>
<string name="settings_time_to">and</string>
<string name="settings_time_greater">The time must be greater than %1$s</string>
@@ -373,7 +371,6 @@
<item>Yellow</item>
<item>White</item>
</string-array>
- <string name="set_title_news">News</string>
<string name="set_notification_news">Notify for new toots on the home timeline</string>
<string name="action_follow">Follow</string>
<string name="action_unfollow">Unfollow</string>
@@ -812,6 +809,12 @@
<string name="vote">Vote</string>
<string name="poll_not_private">A poll cannot be attached to a direct message!</string>
<string name="notif_poll">A poll you have voted in has ended</string>
+ <string name="settings_category_notif_customize">Customize</string>
+ <string name="settings_category_notif_categories">Categories</string>
+ <string name="settings_category_notif_news">News</string>
+ <string name="settings_category_notif_time_slot">Time slot</string>
+ <string name="settings_category_notif_advanced">Advanced</string>
+ <string name="set_display_new_badge">Display \'new\' badge on unread toots</string>
<string name="set_display_peertube">Display Peertube timeline</string>
<string name="peertube_menu">Peertube</string>
<string name="hide_tab">Hide the tab</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index a57505661..c318cf600 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -289,6 +289,7 @@
<string name="nothing_to_do">لا يمكن اتخاذ أي إجراء</string>
<string name="toast_saved">تم حفظ الصورة بنجاح!</string>
<string name="toast_error_translate">وقع خطاء أثناء عملية الترجمة!</string>
+ <string name="toast_error_translations_disabled">Translations are disabled in settings</string>
<string name="toast_toot_saved">تم حِفظ المُسوَدَّة!</string>
<string name="toast_error_char_limit">هل أنت متأكد من أنّ مثيل الخادوم هذا يسمح بهذا الكمّ من الأحرف؟ عادةً ما تكون القيمة تقرب من 500 حرف.</string>
<string name="toast_visibility_changed">لقد تم تغيير نمط عرض التبويقات على الحساب %1$s</string>
@@ -314,7 +315,6 @@
<string name="set_auto_store_toot">حفظ تلقائي للمسودات</string>
<string name="set_bubble_counter">عرض العدادات</string>
<string name="set_auto_add_media_url">إضافة روابط الوسائط في التبويقات</string>
- <string name="settings_title_notifications">إدارة الإشعارات</string>
<string name="set_notif_follow">تنبيهي عندما يتبعني أحدهم</string>
<string name="set_notif_follow_ask">تنبيهي عندما أتلقى طلبا بالمتابعة</string>
<string name="set_notif_follow_share">تنبيهي عندما يقوم أحدهم بترقية منشوري</string>
@@ -322,7 +322,6 @@
<string name="set_notif_follow_mention">إخطاري عندما يُشار إليّ</string>
<string name="set_share_validation">عرض مربع حوار للتأكيد قبل ترقية أي تبويق</string>
<string name="set_share_validation_fav">عرض مربع حوار للتأكيد قبل إضافة أي تبويق إلى المفضلة</string>
- <string name="settings_title_more_options">الإعدادات المتقدمة</string>
<string name="set_wifi_only">تفعيل الإخطار في وضع الواي فاي فقط</string>
<string name="set_notify">هل تود الإشعار؟</string>
<string name="set_notif_silent">كتم الاشعارات</string>
@@ -339,7 +338,6 @@
<string name="set_automatically_split_toot">تقسيم التبويقات التي تفوق الـ 500 حرف عند الرد</string>
<string name="note_no_space">لقد بلغت حد الـ 160 حرف المسموح به!</string>
<string name="username_no_space">لقد بلغت حد الـ 30 حرف المسموح به!</string>
- <string name="settings_title_hour">فترة استقبال الإشعارات:</string>
<string name="settings_time_from">بين</string>
<string name="settings_time_to">و</string>
<string name="settings_time_greater">يجب أن تكون المدة الزمنية أكبر مِن %1$s</string>
@@ -389,7 +387,6 @@
<item>أصفر</item>
<item>أبيض</item>
</string-array>
- <string name="set_title_news">الأخبار</string>
<string name="set_notification_news">الإخطار عن التبويقات الجديدة على الخط الرئيسي</string>
<string name="action_follow">اتبع</string>
<string name="action_unfollow">إلغاء المتابعة</string>
@@ -826,6 +823,12 @@
<string name="vote">تصويت</string>
<string name="poll_not_private">لا يمكن إرفاق استطلاع للرأي في الرسائل المباشِرة!</string>
<string name="notif_poll">لقد انقضت مدة استطلاع رأي قد قُمتَ بالتصويت عليه مِن قَبل</string>
+ <string name="settings_category_notif_customize">Customize</string>
+ <string name="settings_category_notif_categories">Categories</string>
+ <string name="settings_category_notif_news">News</string>
+ <string name="settings_category_notif_time_slot">Time slot</string>
+ <string name="settings_category_notif_advanced">Advanced</string>
+ <string name="set_display_new_badge">Display \'new\' badge on unread toots</string>
<string name="set_display_peertube">Display Peertube timeline</string>
<string name="peertube_menu">Peertube</string>
<string name="hide_tab">Hide the tab</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 3bfc776ea..70c5d452b 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -273,6 +273,7 @@
<string name="nothing_to_do">No es pot endegar cap acció</string>
<string name="toast_saved">El mèdia s\'ha guardat!</string>
<string name="toast_error_translate">Hi ha hagut un error durant la traducció!</string>
+ <string name="toast_error_translations_disabled">Translations are disabled in settings</string>
<string name="toast_toot_saved">S\'ha desat l\'esborrany!</string>
<string name="toast_error_char_limit">Estàs segur que aquesta instància permet tants caràcters? El valor usual s\'aproxima a 500 caràcters.</string>
<string name="toast_visibility_changed">S\'ha canviat la visibilitat dels toots d\'aquest compte %1$s</string>
@@ -298,7 +299,6 @@
<string name="set_auto_store_toot">Desa els esborrany automàticament</string>
<string name="set_bubble_counter">Mostra els comptadors</string>
<string name="set_auto_add_media_url">Afegeix als toots els URL dels mèdia</string>
- <string name="settings_title_notifications">Gestiona les notificacions</string>
<string name="set_notif_follow">Avisa quan algú et comenci a seguir</string>
<string name="set_notif_follow_ask">Avisa quan algú demani per seguir-te</string>
<string name="set_notif_follow_share">Avisa quan algú difongui el teu estatus</string>
@@ -306,7 +306,6 @@
<string name="set_notif_follow_mention">Avisa quan algú et mencioni</string>
<string name="set_share_validation">Demana confirmació abans de difondre</string>
<string name="set_share_validation_fav">Demana confirmació abans d\'afegir a preferits</string>
- <string name="settings_title_more_options">Configuració avançada</string>
<string name="set_wifi_only">Enviar avisos només per WIFI</string>
<string name="set_notify">Avisar?</string>
<string name="set_notif_silent">Notificacions silencioses</string>
@@ -323,7 +322,6 @@
<string name="set_automatically_split_toot">Per sobre de 500 caràcters, separa automàticament els toots de resposta</string>
<string name="note_no_space">Has assolit el màxim permès de 160 caràcters!</string>
<string name="username_no_space">Has assolit el màxim permès de 30 caràcters!</string>
- <string name="settings_title_hour">Intèrval de temps per a notificacions:</string>
<string name="settings_time_from">Entre</string>
<string name="settings_time_to">i</string>
<string name="settings_time_greater">Ha d\'haver passat més de %1$s</string>
@@ -373,7 +371,6 @@
<item>Groc</item>
<item>Blanc</item>
</string-array>
- <string name="set_title_news">Notícies</string>
<string name="set_notification_news">Avisa dels toots nous a la pissarra pròpia</string>
<string name="action_follow">Segueix</string>
<string name="action_unfollow">Deixa de seguir</string>
@@ -803,6 +800,12 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
<string name="vote">Vota</string>
<string name="poll_not_private">A poll cannot be attached to a direct message!</string>
<string name="notif_poll">S\'ha acabat una enquesta en què havies participat</string>
+ <string name="settings_category_notif_customize">Customize</string>
+ <string name="settings_category_notif_categories">Categories</string>
+ <string name="settings_category_notif_news">News</string>
+ <string name="settings_category_notif_time_slot">Time slot</string>
+ <string name="settings_category_notif_advanced">Advanced</string>
+ <string name="set_display_new_badge">Display \'new\' badge on unread toots</string>
<string name="set_display_peertube">Display Peertube timeline</string>
<string name="peertube_menu">Peertube</string>
<string name="hide_tab">Hide the tab</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index d5ead0992..deadcddcc 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -281,6 +281,7 @@
<string name="nothing_to_do">Nelze vykonat akci</string>
<string name="toast_saved">Média byla uložena!</string>
<string name="toast_error_translate">Při překladu došlo k chybě!</string>
+ <string name="toast_error_translations_disabled">Translations are disabled in settings</string>
<string name="toast_toot_saved">Koncept uložen!</string>
<string name="toast_error_char_limit">Jste si jisti, že tato instance dovoluje tento počet znaků? Obvyklá hodnota je 500 znaků.</string>
<string name="toast_visibility_changed">Viditelnost tootů byla změněna pro účet %1$s</string>
@@ -306,7 +307,6 @@
<string name="set_auto_store_toot">Ukládat koncepty automaticky</string>
<string name="set_bubble_counter">Zobrazit počítadla</string>
<string name="set_auto_add_media_url">Přidat URL médií v tootu</string>
- <string name="settings_title_notifications">Spravovat oznámení</string>
<string name="set_notif_follow">Oznámení v případě sledování</string>
<string name="set_notif_follow_ask">Oznámení v případě žádosti o sledování</string>
<string name="set_notif_follow_share">Oznámení v případě boostnutí vašeho tootu</string>
@@ -314,7 +314,6 @@
<string name="set_notif_follow_mention">Oznámení v případě, že vás někdo zmíní</string>
<string name="set_share_validation">Zobrazit potvrzení před boostnutí</string>
<string name="set_share_validation_fav">Zobrazit potvrzení před oblíbením</string>
- <string name="settings_title_more_options">Rozšířené nastavení</string>
<string name="set_wifi_only">Oznámení pouze na WIFI</string>
<string name="set_notify">Oznámení?</string>
<string name="set_notif_silent">Tichá oznámení</string>
@@ -331,7 +330,6 @@
<string name="set_automatically_split_toot">Automaticky rozdělit tooty nad 500 znaků do odpovědí</string>
<string name="note_no_space">Bylo dosaženo 160ti znakového limitu!</string>
<string name="username_no_space">Bylo dosaženo 30ti znakového limitu!</string>
- <string name="settings_title_hour">Časové okno pro oznámení:</string>
<string name="settings_time_from">Mezi</string>
<string name="settings_time_to">a</string>
<string name="settings_time_greater">Čas musí být vyšší než %1$s</string>
@@ -381,7 +379,6 @@
<item>Žlutá</item>
<item>Bílá</item>
</string-array>
- <string name="set_title_news">Novinky</string>
<string name="set_notification_news">Upozorňovat na nové tooty v domovské časové ose</string>
<string name="action_follow">Následovat</string>
<string name="action_unfollow">Přestat sledovat</string>
@@ -817,6 +814,12 @@ Uživatelské jméno a heslo nejsou nikdy ukládány. Jsou použity pouze během
<string name="vote">Hlasovat</string>
<string name="poll_not_private">K přímé zprávě nelze připojit anketu!</string>
<string name="notif_poll">Anketa, ve které jste hlasoval/a, skončila</string>
+ <string name="settings_category_notif_customize">Customize</string>
+ <string name="settings_category_notif_categories">Categories</string>
+ <string name="settings_category_notif_news">News</string>
+ <string name="settings_category_notif_time_slot">Time slot</string>
+ <string name="settings_category_notif_advanced">Advanced</string>
+ <string name="set_display_new_badge">Display \'new\' badge on unread toots</string>
<string name="set_display_peertube">Display Peertube timeline</string>
<string name="peertube_menu">Peertube</string>
<string name="hide_tab">Hide the tab</string>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index bcf450294..aebecd9f0 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -289,6 +289,7 @@
<string name="nothing_to_do">Ni ellir gwneud dim</string>
<string name="toast_saved">Arbedwyd y cyfryngau!</string>
<string name="toast_error_translate">Aeth rhywbeth o\'i le tra\'n cyfieithu!</string>
+ <string name="toast_error_translations_disabled">Translations are disabled in settings</string>
<string name="toast_toot_saved">Arbedwyd y drafft!</string>
<string name="toast_error_char_limit">Ydych chi\'n siwr fyd yr achos hwn yn caniatau y nifer hyn o nodau? Fel arfer, tua 500 o nodau yw\'r nifer a ganiateir.</string>
<string name="toast_visibility_changed">Gwelededd y tŵtiau wedi ei newid ar gyfer y cyfrif %1$s</string>
@@ -314,7 +315,6 @@
<string name="set_auto_store_toot">Arbed drafft yn ddiofyn</string>
<string name="set_bubble_counter">Arddangos cownteri</string>
<string name="set_auto_add_media_url">Ychwanegu URL o\'r cyfryngau yn y tŵtiau</string>
- <string name="settings_title_notifications">Trefnu hysbysiadau</string>
<string name="set_notif_follow">Hysbysu pryd mae rhywun yn eich dilyn chi</string>
<string name="set_notif_follow_ask">Hysbysu pryd mae rhywun yn gwneud cais i\'ch dilyn chi</string>
<string name="set_notif_follow_share">Hysbysu pan mae rhywun yn hybu\'ch statws</string>
@@ -322,7 +322,6 @@
<string name="set_notif_follow_mention">Hysbysu pan mae rhywun yn sôn amdanoch chi</string>
<string name="set_share_validation">Dangos deialog cadarnhau cyn hybu</string>
<string name="set_share_validation_fav">Dangos deialog cadarnhau cyn ychwanegu i\'r ffefrynnau</string>
- <string name="settings_title_more_options">Gosodiadau uwch</string>
<string name="set_wifi_only">Ond hysbysu pan yn gysylltiedig i WIFI</string>
<string name="set_notify">Hsybysu?</string>
<string name="set_notif_silent">Hysbysiadau distaw</string>
@@ -339,7 +338,6 @@
<string name="set_automatically_split_toot">Hollti tŵtiau dros 500 nodyn yn ymatebion</string>
<string name="note_no_space">Yr ydych wedi llewnwi\'r 160 nodyn a ganiateir!</string>
<string name="username_no_space">Yr ydych wedi llenwi y 30 nodyn a ganiateir!</string>
- <string name="settings_title_hour">Slot amser ar gyfer hysbysiadau:</string>
<string name="settings_time_from">Rhwng</string>
<string name="settings_time_to">ac</string>
<string name="settings_time_greater">Rhaid i\'r amser fod yn fwy na %1$s</string>
@@ -389,7 +387,6 @@
<item>Melyn</item>
<item>Gwyn</item>
</string-array>
- <string name="set_title_news">Newyddion</string>
<string name="set_notification_news">Hysbysu tŵtiau newydd ar y ffrwd gartref</string>
<string name="action_follow">Dilyn</string>
<string name="action_unfollow">Dad-ddilyn</string>
@@ -827,6 +824,12 @@
<string name="vote">Vote</string>
<string name="poll_not_private">A poll cannot be attached to a direct message!</string>
<string name="notif_poll">A poll you have voted in has ended</string>
+ <string name="settings_category_notif_customize">Customize</string>
+ <string name="settings_category_notif_categories">Categories</string>
+ <string name="settings_category_notif_news">News</string>
+ <string name="settings_category_notif_time_slot">Time slot</string>
+ <string name="settings_category_notif_advanced">Advanced</string>
+ <string name="set_display_new_badge">Display \'new\' badge on unread toots</string>
<string name="set_display_peertube">Display Peertube timeline</string>
<string name="peertube_menu">Peertube</string>
<string name="hide_tab">Hide the tab</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 2b6348ca4..a169e350b 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -273,6 +273,7 @@
<string name="nothing_to_do">No action can be taken</string>
<string name="toast_saved">The media has been saved!</string>
<string name="toast_error_translate">An error occurred while translating!</string>
+ <string name="toast_error_translations_disabled">Translations are disabled in settings</string>
<string name="toast_toot_saved">Draft saved!</string>
<string name="toast_error_char_limit">Are you sure this instance allows this number of characters? Usually, this value is close to 500 characters.</string>
<string name="toast_visibility_changed">Visibility of the toots has been changed for the account %1$s</string>
@@ -298,7 +299,6 @@
<string name="set_auto_store_toot">Save drafts automatically</string>
<string name="set_bubble_counter">Display counters</string>
<string name="set_auto_add_media_url">Add URL of media in toots</string>
- <string name="settings_title_notifications">Manage notifications</string>
<string name="set_notif_follow">Notify when someone follows you</string>
<string name="set_notif_follow_ask">Notify when someone requests to follow you</string>
<string name="set_notif_follow_share">Notify when someone boosts your status</string>
@@ -306,7 +306,6 @@
<string name="set_notif_follow_mention">Notify when someone mentions you</string>
<string name="set_share_validation">Show confirmation dialog before boosting</string>
<string name="set_share_validation_fav">Show confirmation dialog before adding to favourites</string>
- <string name="settings_title_more_options">Advanced settings</string>
<string name="set_wifi_only">Notify in WIFI only</string>
<string name="set_notify">Notify?</string>
<string name="set_notif_silent">Silent Notifications</string>
@@ -323,7 +322,6 @@
<string name="set_automatically_split_toot">Automatically split toots over 500 chars in replies</string>
<string name="note_no_space">You have reached the 160 characters allowed!</string>
<string name="username_no_space">You have reached the 30 characters allowed!</string>
- <string name="settings_title_hour">Time slot for notifications:</string>
<string name="settings_time_from">Between</string>
<string name="settings_time_to">and</string>
<string name="settings_time_greater">The time must be greater than %1$s</string>
@@ -373,7 +371,6 @@
<item>Yellow</item>
<item>White</item>
</string-array>
- <string name="set_title_news">News</string>
<string name="set_notification_news">Notify for new toots on the home timeline</string>
<string name="action_follow">Follow</string>
<string name="action_unfollow">Unfollow</string>
@@ -812,6 +809,12 @@
<string name="vote">Vote</string>
<string name="poll_not_private">A poll cannot be attached to a direct message!</string>
<string name="notif_poll">A poll you have voted in has ended</string>
+ <string name="settings_category_notif_customize">Customize</string>
+ <string name="settings_category_notif_categories">Categories</string>
+ <string name="settings_category_notif_news">News</string>
+ <string name="settings_category_notif_time_slot">Time slot</string>
+ <string name="settings_category_notif_advanced">Advanced</string>
+ <string name="set_display_new_badge">Display \'new\' badge on unread toots</string>
<string name="set_display_peertube">Display Peertube timeline</string>
<string name="peertube_menu">Peertube</string>
<string name="hide_tab">Hide the tab</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 21ef5d842..dab5cbfab 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -273,6 +273,7 @@
<string name="nothing_to_do">Keine Aktion kann durchgeführt werden</string>
<string name="toast_saved">Datei wurde gespeichert!</string>
<string name="toast_error_translate">Während der Übersetzung ist ein Fehler aufgetreten!</string>
+ <string name="toast_error_translations_disabled">Translations are disabled in settings</string>
<string name="toast_toot_saved">Entwurf gespeichert!</string>
<string name="toast_error_char_limit">Bist du sicher das diese Instanz die Anzahl an Zeichen unterstützt? Gewöhnlich liegt der Wert bei 500.</string>
<string name="toast_visibility_changed">Sichtbarkeit der Toots für Nutzer %1$s wurde geändert</string>
@@ -298,7 +299,6 @@
<string name="set_auto_store_toot">Entwürfe automatisch speichern</string>
<string name="set_bubble_counter">Anzahl neuer Beiträge anzeigen</string>
<string name="set_auto_add_media_url">Füge die URL bei Anhängen in Toots hinzu</string>
- <string name="settings_title_notifications">Benachrichtigen wenn ...</string>
<string name="set_notif_follow">mir jemand folgt</string>
<string name="set_notif_follow_ask">Ich eine Folgeanfrage erhalte</string>
<string name="set_notif_follow_share">jemand meinen Beitrag teilt</string>
@@ -306,7 +306,6 @@
<string name="set_notif_follow_mention">ich erwähnt werde</string>
<string name="set_share_validation">Bestätigungsdialog vor dem Teilen anzeigen</string>
<string name="set_share_validation_fav">Bestätigungsdialog vor dem Favorisieren anzeigen</string>
- <string name="settings_title_more_options">Erweiterte Einstellungen</string>
<string name="set_wifi_only">Nur bei WLAN benachrichtigen</string>
<string name="set_notify">Benachrichtigen?</string>
<string name="set_notif_silent">Leise Benachrichtigungen</string>
@@ -323,7 +322,6 @@
<string name="set_automatically_split_toot">Toots mit mehr als 500 Zeichen automatisch unterteilen</string>
<string name="note_no_space">Du hast die Grenze von 160 Zeichen erreicht!</string>
<string name="username_no_space">Du hast die Grenze von 30 Zeichen erreicht!</string>
- <string name="settings_title_hour">Zeitfenster für Benachrichtigungen:</string>
<string name="settings_time_from">Zwischen</string>
<string name="settings_time_to">und</string>
<string name="settings_time_greater">Uhrzeit muss größer sein als %1$s</string>
@@ -373,7 +371,6 @@
<item>Gelb</item>
<item>Weiß</item>
</string-array>
- <string name="set_title_news">Neuigkeiten</string>
<string name="set_notification_news">Benachrichtigung für neue Toots auf der Startleiste</string>
<string name="action_follow">Folgen</string>
<string name="action_unfollow">Entfolgen</string>
@@ -800,6 +797,12 @@ Sobald Sie die ersten Buchstaben eintippen, w