From 945a4ab507f3a3628b783093a9668c0cb08fc41d Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 30 Apr 2019 18:32:12 +0000 Subject: [PATCH 001/162] New translations strings.xml (Dutch) --- app/src/main/res/values-nl/strings.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 8c5ae0ed7..c7deb9b8a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -273,7 +273,7 @@ Er valt niets te doen Media is opgeslagen! Er ging wat mis tijdens het vertalen! - Translations are disabled in settings + Vertalingen zijn uitgeschakeld in instellingen Concept opgeslagen! Weet je zeker dat je op deze server zoveel tekens mag gebruiken? Standaard is er een limiet van 500 karakters. Zichtbaarheid toots van account %1$s is veranderd @@ -806,12 +806,12 @@ Je kunt beginnen met typen en er zullen namen gesuggereerd worden.\n\n Stemmen Een poll kan niet aan een direct bericht worden toegevoegd! Een poll waarin je hebt gestemd is beëindigd - Customize - Categories - News - Time slot - Advanced - Display \'new\' badge on unread toots + Aanpassen + Categorieën + Nieuws + Tijdslot + Geavanceerd + Badge met \'nieuw\' op ongelezen toots tonen Display Peertube timeline Peertube Hide the tab From 22cf1735d8a41282b59d206e66d77076dd9994bc Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 30 Apr 2019 18:42:31 +0000 Subject: [PATCH 002/162] New translations strings.xml (Dutch) --- app/src/main/res/values-nl/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index c7deb9b8a..4c061ba55 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -812,8 +812,8 @@ Je kunt beginnen met typen en er zullen namen gesuggereerd worden.\n\n Tijdslot Geavanceerd Badge met \'nieuw\' op ongelezen toots tonen - Display Peertube timeline - Peertube + PeerTubetijdlijn tonen + PeerTube Hide the tab Move timeline Hide timeline From e2fa72deea4c38ce282cbe6a37fcf16926400f21 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 30 Apr 2019 18:52:12 +0000 Subject: [PATCH 003/162] New translations strings.xml (Dutch) --- app/src/main/res/values-nl/strings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 4c061ba55..56e9ff7b3 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -814,13 +814,13 @@ Je kunt beginnen met typen en er zullen namen gesuggereerd worden.\n\n Badge met \'nieuw\' op ongelezen toots tonen PeerTubetijdlijn tonen PeerTube - Hide the tab - Move timeline - Hide timeline - Reorder timelines - Undo + Tabblad verbergen + Tijdlijn verplaatsen + Tijdlijn verbergen + Tijdlijnen herordenen + Ongedaan maken You need to keep two visible tabs! - Reorder timelines + Tijdlijnen herordenen Use the lists entry for deleting this list! Main timelines can only be hidden! BBCode From cdcbfa0942b089e6af5ba6e2cf7a84c8d6727af7 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 30 Apr 2019 20:59:05 +0000 Subject: [PATCH 004/162] New translations strings.xml (Dutch) --- app/src/main/res/values-nl/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 56e9ff7b3..57a110a0f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -819,7 +819,7 @@ Je kunt beginnen met typen en er zullen namen gesuggereerd worden.\n\n Tijdlijn verbergen Tijdlijnen herordenen Ongedaan maken - You need to keep two visible tabs! + Je moet twee zichtbare tabbladen behouden! Tijdlijnen herordenen Use the lists entry for deleting this list! Main timelines can only be hidden! From 0b71666ff664269717c9ac6aad2b52a5a8fed3a2 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 30 Apr 2019 21:12:37 +0000 Subject: [PATCH 005/162] New translations strings.xml (Dutch) --- app/src/main/res/values-nl/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 57a110a0f..3b18f01af 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -821,8 +821,8 @@ Je kunt beginnen met typen en er zullen namen gesuggereerd worden.\n\n Ongedaan maken Je moet twee zichtbare tabbladen behouden! Tijdlijnen herordenen - Use the lists entry for deleting this list! - Main timelines can only be hidden! + Druk lang op de lijstnaam onder lijsten om deze lijst te verwijderen! + Hoofdtijdlijnen kunnen alleen worden verborgen! BBCode %d stem From c4da5ffac08c98249892a31768404011c3e8eacf Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 30 Apr 2019 22:55:24 +0000 Subject: [PATCH 006/162] New translations strings.xml (Dutch) --- app/src/main/res/values-nl/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 3b18f01af..fa36e6242 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -801,7 +801,7 @@ Je kunt beginnen met typen en er zullen namen gesuggereerd worden.\n\n Keuze 4 Je hebt tenminste twee keuzes nodig voor een poll! Klaar - eindigt over %s + eindigt op %s Poll vernieuwen Stemmen Een poll kan niet aan een direct bericht worden toegevoegd! From e36bedcd3f21261d27c354118fab6c99d1393c9f Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 30 Apr 2019 22:57:14 +0000 Subject: [PATCH 007/162] New translations strings.xml (Dutch) --- app/src/main/res/values-nl/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index fa36e6242..a21aa8f50 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -56,7 +56,7 @@ Bevestigen Media Delen met - Gedeeld via Mastalab + Gedeeld via Fedilab Reacties Gebruikersnaam Concepten From d2f2bfd8d35a6ef366bb1e042f70efdd659d8ae7 Mon Sep 17 00:00:00 2001 From: Kasun Date: Wed, 1 May 2019 09:57:54 +0530 Subject: [PATCH 008/162] correctly unmute accounts --- .../mastodon/activities/ShowAccountActivity.java | 12 +++++++++--- app/src/main/res/values/strings.xml | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java index f3a4b0191..1b5bc28ef 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java @@ -1211,9 +1211,15 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt startActivity(intent); return true; case R.id.action_mute: - builderInner = new AlertDialog.Builder(ShowAccountActivity.this, style); - builderInner.setTitle(stringArrayConf[0]); - doActionAccount = API.StatusAction.MUTE; + if (relationship.isMuting()) { + builderInner = new AlertDialog.Builder(ShowAccountActivity.this, style); + builderInner.setTitle(stringArrayConf[4]); + doActionAccount = API.StatusAction.UNMUTE; + } else { + builderInner = new AlertDialog.Builder(ShowAccountActivity.this, style); + builderInner.setTitle(stringArrayConf[0]); + doActionAccount = API.StatusAction.MUTE; + } break; case R.id.action_block: builderInner = new AlertDialog.Builder(ShowAccountActivity.this, style); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2db5d17b7..ee2f2f50c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -132,6 +132,7 @@ Block this account? Report this toot? Block this domain? + Unmute this account? From 37ba1b394d9699998c40b1e2827622f14c74f56a Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:04:15 +0000 Subject: [PATCH 009/162] New translations strings.xml (Czech) --- app/src/main/res/values-cs/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 56eb34132..7921ce700 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -125,6 +125,7 @@ Blokovat tento účet? Nahlásit tento toot? Blokovat tuto doménu? + Unmute this account? Oznámit From 2b1748f8622af6c3a9ee223c381035b764f541e1 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:04:20 +0000 Subject: [PATCH 010/162] New translations strings.xml (Romanian) --- app/src/main/res/values-ro/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 6dc3d97eb..32d07d354 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -125,6 +125,7 @@ Blochează acest cont? Raportează acestă notiță? Block this domain? + Unmute this account? Notify From 98fc7b14e8548d9444535de2df7649c6335cb34f Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:04:24 +0000 Subject: [PATCH 011/162] New translations strings.xml (Korean) --- app/src/main/res/values-ko/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 377e406a9..bbf76dbc6 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -125,6 +125,7 @@ 이 계정을 차단하시겠습니까? 이 툿을 신고하시겠습니까? 이 도메인을 차단하시겠습니까? + Unmute this account? 알림 From e03349f4ab7bfa404c3d1355745fafed190a97ff Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:04:28 +0000 Subject: [PATCH 012/162] New translations strings.xml (Macedonian) --- app/src/main/res/values-mk/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index cbf4be7b3..43dc21105 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -125,6 +125,7 @@ Block this account? Report this toot? Block this domain? + Unmute this account? Notify From 889345fc560c205596962a1acde1ac47546125c5 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:04:32 +0000 Subject: [PATCH 013/162] New translations strings.xml (Norwegian) --- app/src/main/res/values-no/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 3578abee2..1e9eb9107 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -125,6 +125,7 @@ Blokkere denne kontoen? Rapportere dette tootet? Blokkere dette domenet? + Unmute this account? Varsle From 830fe65ee2c6e8f01302b3e1b5967e7b027fedd9 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:04:35 +0000 Subject: [PATCH 014/162] New translations strings.xml (Occitan) --- app/src/main/res/values-oc/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml index cbf4be7b3..43dc21105 100644 --- a/app/src/main/res/values-oc/strings.xml +++ b/app/src/main/res/values-oc/strings.xml @@ -125,6 +125,7 @@ Block this account? Report this toot? Block this domain? + Unmute this account? Notify From 257cbf1d8b66f154bc468bfa1984045347ca71d7 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:04:39 +0000 Subject: [PATCH 015/162] New translations strings.xml (Persian) --- app/src/main/res/values-fa/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index b371a92fe..e417f9cfe 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -125,6 +125,7 @@ این حساب مسدود شود؟ Report this toot? Block this domain? + Unmute this account? Notify From e42a73e713d9a593628d9336a16a9accfe2e0c24 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:04:44 +0000 Subject: [PATCH 016/162] New translations strings.xml (Polish) --- app/src/main/res/values-pl/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 0a57f2820..ac5060044 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -125,6 +125,7 @@ Zablokować? Zgłosić ten wpis? Zablokować tę domenę? + Unmute this account? Powiadomienie From 64f0dcbd7f8283ddad26172ab587c77cb9a2c407 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:04:48 +0000 Subject: [PATCH 017/162] New translations strings.xml (Portuguese) --- app/src/main/res/values-pt/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 63bccf5be..47d596dee 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -125,6 +125,7 @@ Bloquear esta conta? Denunciar este toot? Bloquear este domínio? + Unmute this account? Notificar From d34c1032c4d4114525ab923faad37e0a8b0c4024 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:04:51 +0000 Subject: [PATCH 018/162] New translations strings.xml (Russian) --- app/src/main/res/values-ru/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index fde48e05f..3af5e53a9 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -125,6 +125,7 @@ Заблокировать этот аккаунт? Пожаловаться на этот тут? Заблокировать этот домен? + Unmute this account? Уведомлять From b1d262291ab357814d4c36e28cfd89c5f3ad53f6 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:04:56 +0000 Subject: [PATCH 019/162] New translations strings.xml (Japanese) --- app/src/main/res/values-ja/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 2f63e17b5..2788c58bd 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -125,6 +125,7 @@ このアカウントをブロックしますか？ このトゥートを報告しますか？ このドメインをブロックしますか？ + Unmute this account? 通知 From 3435d12f08c7c9e6d9cdf706248038db573a8255 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:05:00 +0000 Subject: [PATCH 020/162] New translations strings.xml (Serbian (Cyrillic)) --- app/src/main/res/values-sr/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 748c7c677..4588a70f8 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -125,6 +125,7 @@ Блокирај овај налог? Пријави овaj тут? Блокирај овај домен? + Unmute this account? Обавести From 51205b2d2de10cd675351ce277cdca20c07fa1bf Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:05:06 +0000 Subject: [PATCH 021/162] New translations strings.xml (Sinhala) --- app/src/main/res/values-si/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index dd23dd28c..a1eb727aa 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -125,6 +125,7 @@ මෙම ගිණුම අවහිර කරනවා ද? Report this toot? මෙම අඩවිය අවහිර කරනවා ද? + Unmute this account? දැනුම්දෙන්න From 6dcafc1111699eeab05fa745a914753888af2284 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:05:10 +0000 Subject: [PATCH 022/162] New translations strings.xml (Slovenian) --- app/src/main/res/values-sl/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index a76540961..146dd3719 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -125,6 +125,7 @@ Naj blokiram ta račun? Želite prijaviti sporne vsebine v tej objavi? Želite blokirati to domeno? + Unmute this account? Obvesti From 715388d27fdac3680bef365ee3b81931b965e039 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:05:14 +0000 Subject: [PATCH 023/162] New translations strings.xml (Spanish) --- app/src/main/res/values-es/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index d1dae8684..c1ff55e8d 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -125,6 +125,7 @@ ¿Bloquear esta cuenta? ¿Reportar este toot? ¿Bloquear este dominio? + Unmute this account? Notificar From 1dbe288d8197f51f30d96e7c46a88beedeae166e Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:05:19 +0000 Subject: [PATCH 024/162] New translations strings.xml (Turkish) --- app/src/main/res/values-tr/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 79cad477f..7334998ed 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -125,6 +125,7 @@ Bu hesabı engelle? Bu toot\'u bildir? Block this domain? + Unmute this account? Notify From 2a2a68486deb939b19b61de120e43e48ebc54bd4 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:05:22 +0000 Subject: [PATCH 025/162] New translations strings.xml (Ukrainian) --- app/src/main/res/values-uk/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 7f3b8c23b..4a784029c 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -125,6 +125,7 @@ Заблокувати цей обліковий запис? Поскаржитися на цей дмух? Блокувати цей домен? + Unmute this account? Notify From 4dadae5f79776e900d21e7cb3bd9005195a518eb Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:05:26 +0000 Subject: [PATCH 026/162] New translations strings.xml (Vietnamese) --- app/src/main/res/values-vi/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 9e983c4ef..f9401ccbf 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -125,6 +125,7 @@ Chặn tài khoản này? Báo cáo này thổi còi? Block this domain? + Unmute this account? Notify From d0eee0d28e840543352c0297a00c110be4708749 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:05:30 +0000 Subject: [PATCH 027/162] New translations strings.xml (Welsh) --- app/src/main/res/values-cy/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 477b3a424..2fcffcca4 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -125,6 +125,7 @@ Blocio\'r cyfrif hwn? Cwyno am y tŵt hwn? Blocio\'r parth hwn? + Unmute this account? Hysbysu From 84e52a174b45c57f0ffb753034e023ddcd9c1aa2 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:05:34 +0000 Subject: [PATCH 028/162] New translations strings.xml (Kabyle) --- app/src/main/res/values-kab/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml index 4a87da969..981186df5 100644 --- a/app/src/main/res/values-kab/strings.xml +++ b/app/src/main/res/values-kab/strings.xml @@ -125,6 +125,7 @@ Block this account? Report this toot? Block this domain? + Unmute this account? Notify From 9c3b80080680b6e5bb59ebc160950acccfd22a5a Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:05:39 +0000 Subject: [PATCH 029/162] New translations strings.xml (Italian) --- app/src/main/res/values-it/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e7c07e2cc..e8ca7b337 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -125,6 +125,7 @@ Bloccare questo account? Segnalare questo toot? Bloccare questo dominio? + Unmute this account? Notifica From c1b1116ccd5dbe18a1b320d4d56a2a6569c08e0d Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:05:42 +0000 Subject: [PATCH 030/162] New translations strings.xml (Swedish) --- app/src/main/res/values-sv/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 74ad41e83..63fa8e38a 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -125,6 +125,7 @@ Blockera detta konto? Anmäl den här tooten? Blockera denna domän? + Unmute this account? Meddela From 1dbf2d462c12ea48af1344e2662314c16bd57f3d Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:05:47 +0000 Subject: [PATCH 031/162] New translations strings.xml (Chinese Traditional) --- app/src/main/res/values-zh-rTW/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 2ef384167..4e24f0c00 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -125,6 +125,7 @@ 封鎖此帳號？ 檢舉此嘟文？ 是否封鎖該站點？ + Unmute this account? 通知 From 0e5635ab8d3d0f91bb0548e4c6f53a97d46ff939 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:05:52 +0000 Subject: [PATCH 032/162] New translations strings.xml (Greek) --- app/src/main/res/values-el/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 1e7a0d274..b174f6c9e 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -125,6 +125,7 @@ Φραγή αυτού του λογαριασμού; Αναφορά αυτής της φωνής; Φραγή αυτού του τομέα; + Unmute this account? Ειδοποίηση From 082e7d9ab6d49fbce4ee3fff6c851c4c6a713230 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:05:56 +0000 Subject: [PATCH 033/162] New translations strings.xml (Afrikaans) --- app/src/main/res/values-af/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml index cbf4be7b3..43dc21105 100644 --- a/app/src/main/res/values-af/strings.xml +++ b/app/src/main/res/values-af/strings.xml @@ -125,6 +125,7 @@ Block this account? Report this toot? Block this domain? + Unmute this account? Notify From 85ba0d375e68f44db49db31661951e356343be54 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:06:00 +0000 Subject: [PATCH 034/162] New translations strings.xml (Arabic) --- app/src/main/res/values-ar/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 00c7a34cc..777f0053f 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -125,6 +125,7 @@ هل تود حجب هذا الحساب؟ هل تود الإبلاغ عن هذا التبويق؟ هل تريد حظر هذا النطاق؟ + Unmute this account? إشعار From ddc743ba592400b16b17d37401e047e347c776ee Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:06:04 +0000 Subject: [PATCH 035/162] New translations strings.xml (Armenian) --- app/src/main/res/values-hy/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml index 884885ff1..3258602ea 100644 --- a/app/src/main/res/values-hy/strings.xml +++ b/app/src/main/res/values-hy/strings.xml @@ -125,6 +125,7 @@ Արգելափակե՞լ այս հաշիվը Ահազանգե՞լ այս հաշվի մասին Block this domain? + Unmute this account? Notify From 55536a30c933c7198e1acdf12353749258dfdcf3 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:06:09 +0000 Subject: [PATCH 036/162] New translations strings.xml (Basque) --- app/src/main/res/values-eu/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index bd1483351..30f826a4f 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -125,6 +125,7 @@ Blokeatu kontu hau? Salatu toot hau? Blokeatu domeinu hau? + Unmute this account? Jakinarazi From e219e58760c4a9b651d64e968ca6c70e567895d4 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:06:13 +0000 Subject: [PATCH 037/162] New translations strings.xml (Catalan) --- app/src/main/res/values-ca/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index cd7c82c2a..aa2a9eb17 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -125,6 +125,7 @@ Vols blocar aquest compte? Vols denunciar aquest toot? Vols blocar el domini? + Unmute this account? Notificar From 59c0453e8d65a9c0f5f3eb5aa05206d765e50eae Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:06:17 +0000 Subject: [PATCH 038/162] New translations strings.xml (Chinese Simplified) --- app/src/main/res/values-zh-rCN/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index b1396acdb..4871023be 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -125,6 +125,7 @@ 是否屏蔽此帐户？ 举报这条嘟文吗？ 是否屏蔽此域名？ + Unmute this account? 通知 From 0fa8fab3a3ae05b8f4fd985aa10517d112e7d349 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:06:21 +0000 Subject: [PATCH 039/162] New translations strings.xml (Danish) --- app/src/main/res/values-da/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index cbf4be7b3..43dc21105 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -125,6 +125,7 @@ Block this account? Report this toot? Block this domain? + Unmute this account? Notify From c3ccc7a9e0003db7f93eeb8db035c9b0be9cdbf3 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:06:26 +0000 Subject: [PATCH 040/162] New translations strings.xml (Indonesian) --- app/src/main/res/values-id/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index fe1c09d31..f0cbd35ef 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -125,6 +125,7 @@ Blok akun ini? Laporkan kutipan ini? Blok domain ini? + Unmute this account? Notifikasi From 558b7caff245e7751de626fea398724434304480 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:06:29 +0000 Subject: [PATCH 041/162] New translations strings.xml (Dutch) --- app/src/main/res/values-nl/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index a21aa8f50..0ad9ee03f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -125,6 +125,7 @@ Account blokkeren? Toot rapporteren? Dit domein blokkeren? + Unmute this account? Melden From 45414568444755e2f86943eef327f7b5d3549ebe Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:06:35 +0000 Subject: [PATCH 042/162] New translations strings.xml (Finnish) --- app/src/main/res/values-fi/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index cbf4be7b3..43dc21105 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -125,6 +125,7 @@ Block this account? Report this toot? Block this domain? + Unmute this account? Notify From 9dd08d12f41311572a778babe269199cb9969dc0 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:06:40 +0000 Subject: [PATCH 043/162] New translations strings.xml (French) --- app/src/main/res/values-fr/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 6d786ca39..9dde18893 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -125,6 +125,7 @@ Bloquer ce compte ? Signaler ce pouet ? Désirez-vous bloquer ce domaine ? + Unmute this account? Notifier From 4fc49e684343dcde6cd2bd36d4edc2e4b28490fb Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:06:45 +0000 Subject: [PATCH 044/162] New translations strings.xml (Galician) --- app/src/main/res/values-gl/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index e4da058ac..f4e6a9a2e 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -125,6 +125,7 @@ Bloquear esta conta? Informar sobre este toot? Bloquear este dominio? + Unmute this account? Notificar From 10bac805c9fb6309aeb5a38922fa1ac11b055810 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:06:50 +0000 Subject: [PATCH 045/162] New translations strings.xml (German) --- app/src/main/res/values-de/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index fb60c2ab1..ebbebe583 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -125,6 +125,7 @@ Diesen Nutzer blockieren? Diesen Toot melden? Diese Domäne blockieren? + Unmute this account? Benachrichtigen From 92150481726f61ada131dd24fdab85693097032f Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:06:55 +0000 Subject: [PATCH 046/162] New translations strings.xml (Hebrew) --- app/src/main/res/values-he/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index a2c6ac168..314ca854e 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -125,6 +125,7 @@ Block this account? Report this toot? Block this domain? + Unmute this account? Notify From e63c0068daa0fcfe3c19c6a1e725a5718d4c2fa3 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:07:00 +0000 Subject: [PATCH 047/162] New translations strings.xml (Hindi) --- app/src/main/res/values-hi/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 35c9790e6..061e59264 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -125,6 +125,7 @@ इस खाते को अवरुद्ध करें? इस संदेश को रिपोर्ट करें? इस इंस्टेंस को अवरुद्ध करें? + Unmute this account? सूचित करें From c2bf8f2fc6bc52bacfc1f596ce3260f6a9a1684b Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:07:04 +0000 Subject: [PATCH 048/162] New translations strings.xml (Hungarian) --- app/src/main/res/values-hu/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 4f72c49d8..8fd70cab6 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -125,6 +125,7 @@ Letiltod ezt a fiókot? Jelented ezt a tootot? Letiltod ezt a domént? + Unmute this account? Értesítés From 58dddecb6e406729210e3f337859f9b5b7925c8b Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:07:10 +0000 Subject: [PATCH 049/162] New translations strings.xml (Lombard) --- app/src/main/res/values-lmo/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-lmo/strings.xml b/app/src/main/res/values-lmo/strings.xml index cbf4be7b3..43dc21105 100644 --- a/app/src/main/res/values-lmo/strings.xml +++ b/app/src/main/res/values-lmo/strings.xml @@ -125,6 +125,7 @@ Block this account? Report this toot? Block this domain? + Unmute this account? Notify From fe6cbd9fd7b6587db13a3620391a9bf5ca98d464 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:37:26 +0000 Subject: [PATCH 050/162] New translations strings.xml (Chinese Traditional) --- app/src/main/res/values-zh-rTW/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 4e24f0c00..acd3e0461 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -125,7 +125,7 @@ 封鎖此帳號？ 檢舉此嘟文？ 是否封鎖該站點？ - Unmute this account? + 取消靜音此帳號？ 通知 From 1eda6f0e1468a90a9cc6ed484f1b4d0a5b39f16b Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:37:29 +0000 Subject: [PATCH 051/162] New translations strings.xml (German) --- app/src/main/res/values-de/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ebbebe583..4d2fed66c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -125,7 +125,7 @@ Diesen Nutzer blockieren? Diesen Toot melden? Diese Domäne blockieren? - Unmute this account? + Lautlosmodus für dieses Konto aufhaben? Benachrichtigen From d62d19632656b081666017eaca9a3dd70c989964 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 10:37:33 +0000 Subject: [PATCH 052/162] New translations strings.xml (Norwegian) --- app/src/main/res/values-no/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 1e9eb9107..fe81c404f 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -125,7 +125,7 @@ Blokkere denne kontoen? Rapportere dette tootet? Blokkere dette domenet? - Unmute this account? + Fjern demping for denne kontoen? Varsle From 808d39a0d9438ee112a4d974d29a768197d0e896 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 12:06:59 +0000 Subject: [PATCH 053/162] New translations strings.xml (Hungarian) --- app/src/main/res/values-hu/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 8fd70cab6..6c2d7a2d8 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -125,7 +125,7 @@ Letiltod ezt a fiókot? Jelented ezt a tootot? Letiltod ezt a domént? - Unmute this account? + Megszünteted a fiók elnémítását? Értesítés From 61b9616a4cbab9cd9bac3ad3c8a68b1be5aaad32 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 13:38:40 +0000 Subject: [PATCH 054/162] New translations strings.xml (Chinese Simplified) --- app/src/main/res/values-zh-rCN/strings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 4871023be..3a74447bc 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -125,7 +125,7 @@ 是否屏蔽此帐户？ 举报这条嘟文吗？ 是否屏蔽此域名？ - Unmute this account? + 取消该用户的禁言吗？ 通知 @@ -270,7 +270,7 @@ 无法进行任何操作 媒体已保存！ 翻译时出错！ - Translations are disabled in settings + 设置中已禁用翻译 草稿已保存！ 您确定此实例允许此数量的字符？通常，该值接近于 500 个字符。 已更改帐户 %1$s 的嘟文可见性 @@ -806,10 +806,10 @@ 投票 投票无法附加到直接消息上！ 一个你参加过的投票已经结束 - Customize - Categories - News - Time slot + 定制 + 类别 + 新闻 + 时隙 Advanced Display \'new\' badge on unread toots Display Peertube timeline From 1578d00de238075255f0e9f53020024efe4a08ce Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 13:53:34 +0000 Subject: [PATCH 055/162] New translations strings.xml (Chinese Simplified) --- app/src/main/res/values-zh-rCN/strings.xml | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3a74447bc..f3af49fe5 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -810,19 +810,19 @@ 类别 新闻 时隙 - Advanced - Display \'new\' badge on unread toots - Display Peertube timeline + 高级 + 在未读嘟文上显示“新”徽章 + 显示Peertube时间线 Peertube - Hide the tab - Move timeline - Hide timeline - Reorder timelines - Undo - You need to keep two visible tabs! - Reorder timelines - Use the lists entry for deleting this list! - Main timelines can only be hidden! + 隐藏选项卡 + 移动时间线 + 隐藏时间线 + 记录时间线 + 撤销 + 您需要保持两条可见的时间线！ + 记录时间线 + 用列表入口来删除这个列表！ + 主时间线只能被隐藏！ BBCode %d 票 From b0fb703941d5c4fab96695e51479e1f0f6bb202b Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 1 May 2019 19:47:29 +0000 Subject: [PATCH 056/162] New translations strings.xml (German) --- app/src/main/res/values-de/strings.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 4d2fed66c..027c5b5aa 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -125,7 +125,7 @@ Diesen Nutzer blockieren? Diesen Toot melden? Diese Domäne blockieren? - Lautlosmodus für dieses Konto aufhaben? + Nutzer nicht mehr stummschalten? Benachrichtigen @@ -671,21 +671,21 @@ Sobald Sie die ersten Buchstaben eintippen, werden Namensvorschläge angezeigt\n Sprachen Nur Medien - Unpassenden Inhalten anzeigen + Heikle Inhalte anzeigen Crowdin Übersetzungen Crowdin Manager Übersetzung der App Über Crowdin Bot - Pixelfed Instanz + Pixelfed-Instanz Mastodon-Instanz - Keine Pixelfed Instanzen + Keine Pixelfed-Instanzen Irgendwelche davon Alle von denen Keine von denen - Eines dieser Wörter (Leerzeichen getrennt) - Alle diese Wörter (Leerzeichen getrennt) - Keines dieser Wörter (Leerzeichen getrennt) + Eines dieser Wörter (durch Leerzeichen getrennt) + Alle diese Wörter (durch Leerzeichen getrennt) + Keines dieser Wörter (durch Leerzeichen getrennt) Spaltenname ändern Keine Misskey-Instanzen Misskey Instanz @@ -699,16 +699,16 @@ Sobald Sie die ersten Buchstaben eintippen, werden Namensvorschläge angezeigt\n Antworten Kommentar entfernen Möchten Sie diesen Kommentar wirklich löschen? - Vollbildvideo + Vollbild-Video Modus für Videoaufnahmen - Eine Datei zum Hochladen auswählen + Datei zum Hochladen auswählen Eigene Videos Titel Kategorien Lizenz Kategorie Sprache - Dieses Video enthält für Erwachsene oder sexuell eindeutige Inhalte + Dieses Video enthält heikle Inhalte Kommentare zu Videos ermöglichen Video aktualisieren Beschreibung @@ -720,7 +720,7 @@ Sobald Sie die ersten Buchstaben eintippen, werden Namensvorschläge angezeigt\n Video löschen Möchten Sie dieses Video wirklich löschen? Noch keine Videos hochgeladen! - Videos mit unpassenden Inhalten anzeigen + Videos mit heiklen Inhalten anzeigen Standard %s Kanal Keine Videos zum Anzeigen! Medien zu Favoriten hinzufügen @@ -761,7 +761,7 @@ Sobald Sie die ersten Buchstaben eintippen, werden Namensvorschläge angezeigt\n Reintext HTML Markdown - Von Konto abmelden + Konto abmelden Ladezeit optimieren Alle Die App unterstützen From dcdc35bae2777875e44505f14fa0e643b3f3acc2 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 2 May 2019 04:44:47 +0000 Subject: [PATCH 057/162] New translations strings.xml (Galician) --- app/src/main/res/values-gl/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index f4e6a9a2e..feaf835f2 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -125,7 +125,7 @@ Bloquear esta conta? Informar sobre este toot? Bloquear este dominio? - Unmute this account? + Voltar a ler esta conta? Notificar @@ -823,9 +823,9 @@ Mover liña temporal Agochar liña temporal Ordear liñas temporais - Undo - You need to keep two visible tabs! - Reorder timelines + Desfacer + Debe manter dúas lapelas visibles! + Ordear liñas temporais Use the lists entry for deleting this list! Main timelines can only be hidden! BBCode From 08629474ae290b2fce9df029b4ac73af0ccdd933 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 2 May 2019 04:55:20 +0000 Subject: [PATCH 058/162] New translations strings.xml (Galician) --- app/src/main/res/values-gl/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index feaf835f2..837bf8196 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -826,8 +826,8 @@ Desfacer Debe manter dúas lapelas visibles! Ordear liñas temporais - Use the lists entry for deleting this list! - Main timelines can only be hidden! + Utilice os axustes das listas para eliminar esta lista! + As liñas temporais principais só poden ocultarse! BBCode %d voto From 774cb23e85a724a6f3025f408c8d430bb6b045e6 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 2 May 2019 06:06:16 +0000 Subject: [PATCH 059/162] New translations strings.xml (Catalan) --- app/src/main/res/values-ca/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index aa2a9eb17..34803b391 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -125,7 +125,7 @@ Vols blocar aquest compte? Vols denunciar aquest toot? Vols blocar el domini? - Unmute this account? + Desilenciar aquest compte? Notificar @@ -274,7 +274,7 @@ No es pot endegar cap acció El mèdia s\'ha guardat! Hi ha hagut un error durant la traducció! - Opció de traducció deshabilitada + Tens l\'opció de traducció deshabilitada S\'ha desat l\'esborrany! Estàs segur que aquesta instància permet tants caràcters? El valor usual s\'aproxima a 500 caràcters. S\'ha canviat la visibilitat dels toots d\'aquest compte %1$s From 2a1c77f89531808d475f61ad4f99f2a747f40278 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 2 May 2019 06:29:15 +0000 Subject: [PATCH 060/162] New translations strings.xml (Italian) --- app/src/main/res/values-it/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e8ca7b337..3c5621e3b 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -125,7 +125,7 @@ Bloccare questo account? Segnalare questo toot? Bloccare questo dominio? - Unmute this account? + Smettere di silenziare questo account? Notifica From fdaee0083af4086f81ca877e9e0c2a82538aa8a3 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 2 May 2019 07:23:17 +0000 Subject: [PATCH 061/162] New translations strings.xml (Swedish) --- app/src/main/res/values-sv/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 63fa8e38a..62de818b8 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -125,7 +125,7 @@ Blockera detta konto? Anmäl den här tooten? Blockera denna domän? - Unmute this account? + Återställ ljud på detta konto? Meddela From 7dad67cd5b02dbfeed1a6fa69d2caa9bfb1a3d30 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 2 May 2019 18:26:13 +0000 Subject: [PATCH 062/162] New translations strings.xml (Russian) --- app/src/main/res/values-ru/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 3af5e53a9..a4c9922ca 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -125,7 +125,7 @@ Заблокировать этот аккаунт? Пожаловаться на этот тут? Заблокировать этот домен? - Unmute this account? + Не глушить этот аккаунт? Уведомлять From 6ebbbec2d1cbbc9406b6b85c9d7a012874ccaf03 Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 2 May 2019 22:27:19 +0000 Subject: [PATCH 063/162] New translations strings.xml (Dutch) --- app/src/main/res/values-nl/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 0ad9ee03f..78324b1ca 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -125,7 +125,7 @@ Account blokkeren? Toot rapporteren? Dit domein blokkeren? - Unmute this account? + Dit account niet langer negeren? Melden From cfe2b48176d378fdc145bc6c28b2db2810fe725a Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 3 May 2019 16:53:46 +0000 Subject: [PATCH 064/162] New translations strings.xml (Czech) --- app/src/main/res/values-cs/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 7921ce700..a3ddb91f0 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -125,7 +125,7 @@ Blokovat tento účet? Nahlásit tento toot? Blokovat tuto doménu? - Unmute this account? + Zrušit ztlumení tohoto účtu? Oznámit From 16c2936d5a3bae34cf08685cc87c1f80f4fa0229 Mon Sep 17 00:00:00 2001 From: Kasun Date: Sat, 4 May 2019 13:31:38 +0530 Subject: [PATCH 065/162] Typo (POOL --> POLL) --- app/src/main/java/fr/gouv/etalab/mastodon/client/API.java | 2 +- .../etalab/mastodon/fragments/DisplayNotificationsFragment.java | 2 +- .../mastodon/fragments/TabLayoutNotificationsFragment.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java index eb4d47763..956908163 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/API.java @@ -2445,7 +2445,7 @@ public class API { parameters.append("exclude_types[]=").append("poll").append("&"); parameters = new StringBuilder(parameters.substring(0, parameters.length() - 1).substring(16)); params.put("exclude_types[]", parameters.toString()); - }else if(type == DisplayNotificationsFragment.Type.POOL){ + }else if(type == DisplayNotificationsFragment.Type.POLL){ parameters.append("exclude_types[]=").append("reblog").append("&"); parameters.append("exclude_types[]=").append("follow").append("&"); parameters.append("exclude_types[]=").append("mention").append("&"); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java index b6308bbd2..6f81fffaf 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java @@ -90,7 +90,7 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve MENTION, FAVORITE, BOOST, - POOL, + POLL, FOLLOW } diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/TabLayoutNotificationsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/TabLayoutNotificationsFragment.java index d52e54dae..48d349eac 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/TabLayoutNotificationsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/TabLayoutNotificationsFragment.java @@ -229,7 +229,7 @@ public class TabLayoutNotificationsFragment extends Fragment { break; case 4: if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) - type = DisplayNotificationsFragment.Type.POOL; + type = DisplayNotificationsFragment.Type.POLL; else type = DisplayNotificationsFragment.Type.FOLLOW; break; From 3b96fb9bb7e9925a514f7955b626d9b3779e5836 Mon Sep 17 00:00:00 2001 From: Kasun Date: Sat, 4 May 2019 16:28:58 +0530 Subject: [PATCH 066/162] poll notifications 1/3 add polls to notification settings --- .../SettingsNotificationsFragment.java | 22 +++++++++++++ .../gouv/etalab/mastodon/helper/Helper.java | 1 + .../fragment_settings_notifications.xml | 32 +++++++++++++++++-- app/src/main/res/values/strings.xml | 2 ++ 4 files changed, 55 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java index 8860ba66c..8f83e08c6 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java @@ -105,6 +105,7 @@ public class SettingsNotificationsFragment extends Fragment { boolean notif_ask = sharedpreferences.getBoolean(Helper.SET_NOTIF_ASK, true); boolean notif_mention = sharedpreferences.getBoolean(Helper.SET_NOTIF_MENTION, true); boolean notif_share = sharedpreferences.getBoolean(Helper.SET_NOTIF_SHARE, true); + boolean notif_poll = sharedpreferences.getBoolean(Helper.SET_NOTIF_POLL, true); boolean notif_wifi = sharedpreferences.getBoolean(Helper.SET_WIFI_ONLY, false); boolean notif_silent = sharedpreferences.getBoolean(Helper.SET_NOTIF_SILENT, false); @@ -120,6 +121,7 @@ public class SettingsNotificationsFragment extends Fragment { final CheckBox set_notif_follow_ask = rootView.findViewById(R.id.set_notif_follow_ask); final CheckBox set_notif_follow_mention = rootView.findViewById(R.id.set_notif_follow_mention); final CheckBox set_notif_follow_share = rootView.findViewById(R.id.set_notif_follow_share); + final CheckBox set_notif_follow_poll = rootView.findViewById(R.id.set_notif_follow_poll); final CheckBox set_notif_hometimeline = rootView.findViewById(R.id.set_notif_hometimeline); @@ -134,6 +136,7 @@ public class SettingsNotificationsFragment extends Fragment { final Button sound_fav = rootView.findViewById(R.id.sound_fav); final Button sound_follow = rootView.findViewById(R.id.sound_follow); final Button sound_mention = rootView.findViewById(R.id.sound_mention); + final Button sound_poll = rootView.findViewById(R.id.sound_poll); final Button sound_backup = rootView.findViewById(R.id.sound_backup); final Button sound_media = rootView.findViewById(R.id.sound_media); Button set_notif_sound = rootView.findViewById(R.id.set_notif_sound); @@ -184,6 +187,16 @@ public class SettingsNotificationsFragment extends Fragment { } }); + sound_poll.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS); + intent.putExtra(Settings.EXTRA_APP_PACKAGE, context.getPackageName()); + intent.putExtra(Settings.EXTRA_CHANNEL_ID, "channel_poll"); + startActivity(intent); + } + }); + sound_backup.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -332,6 +345,7 @@ public class SettingsNotificationsFragment extends Fragment { set_notif_follow_ask.setChecked(notif_ask); set_notif_follow_mention.setChecked(notif_mention); set_notif_follow_share.setChecked(notif_share); + set_notif_follow_poll.setChecked(notif_poll); set_notif_hometimeline.setChecked(notif_hometimeline); switchCompatWIFI.setChecked(notif_wifi); @@ -385,6 +399,14 @@ public class SettingsNotificationsFragment extends Fragment { editor.apply(); } }); + set_notif_follow_poll.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + SharedPreferences.Editor editor = sharedpreferences.edit(); + editor.putBoolean(Helper.SET_NOTIF_POLL, set_notif_follow_poll.isChecked()); + editor.apply(); + } + }); switchCompatWIFI.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java index 8903463ce..f41cee810 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java @@ -356,6 +356,7 @@ public class Helper { public static final String SET_NOTIF_ASK = "set_notif_follow_ask"; public static final String SET_NOTIF_MENTION = "set_notif_follow_mention"; public static final String SET_NOTIF_SHARE = "set_notif_follow_share"; + public static final String SET_NOTIF_POLL = "set_notif_follow_poll"; public static final String SET_NOTIF_FOLLOW_FILTER = "set_notif_follow_filter"; public static final String SET_NOTIF_ADD_FILTER = "set_notif_follow_add_filter"; public static final String SET_NOTIF_MENTION_FILTER = "set_notif_follow_mention_filter"; diff --git a/app/src/main/res/layout/fragment_settings_notifications.xml b/app/src/main/res/layout/fragment_settings_notifications.xml index 299ae4679..2874eb9c6 100644 --- a/app/src/main/res/layout/fragment_settings_notifications.xml +++ b/app/src/main/res/layout/fragment_settings_notifications.xml @@ -165,11 +165,11 @@ android:orientation="horizontal" >