From 1964bef73ad9aff22022ef8989a43079703328a4 Mon Sep 17 00:00:00 2001 From: Tien Do Nam Date: Thu, 6 Aug 2026 02:31:20 +0200 Subject: [PATCH] i18n: make remaining time plural --- app/assets/i18n/_missing_translations_ar.json | 13 ++++++++ app/assets/i18n/_missing_translations_az.json | 14 ++++++-- app/assets/i18n/_missing_translations_bg.json | 13 ++++++++ app/assets/i18n/_missing_translations_bn.json | 13 ++++++++ app/assets/i18n/_missing_translations_ca.json | 14 ++++++-- app/assets/i18n/_missing_translations_cs.json | 14 ++++++-- app/assets/i18n/_missing_translations_da.json | 14 ++++++-- app/assets/i18n/_missing_translations_de.json | 15 ++++++++- app/assets/i18n/_missing_translations_el.json | 13 ++++++++ .../i18n/_missing_translations_es_ES.json | 13 ++++++++ app/assets/i18n/_missing_translations_et.json | 13 ++++++++ app/assets/i18n/_missing_translations_eu.json | 14 ++++++-- app/assets/i18n/_missing_translations_fa.json | 13 ++++++++ app/assets/i18n/_missing_translations_fi.json | 13 ++++++++ .../i18n/_missing_translations_fil_PH.json | 14 ++++++-- app/assets/i18n/_missing_translations_fr.json | 13 ++++++++ app/assets/i18n/_missing_translations_gl.json | 13 ++++++++ app/assets/i18n/_missing_translations_gu.json | 13 ++++++++ app/assets/i18n/_missing_translations_he.json | 14 ++++++-- app/assets/i18n/_missing_translations_hi.json | 13 ++++++++ app/assets/i18n/_missing_translations_hu.json | 13 ++++++++ app/assets/i18n/_missing_translations_id.json | 14 ++++++-- app/assets/i18n/_missing_translations_it.json | 13 ++++++++ app/assets/i18n/_missing_translations_ja.json | 14 ++++++-- app/assets/i18n/_missing_translations_km.json | 14 ++++++-- app/assets/i18n/_missing_translations_ko.json | 13 ++++++++ app/assets/i18n/_missing_translations_lo.json | 13 ++++++++ app/assets/i18n/_missing_translations_ml.json | 14 ++++++-- app/assets/i18n/_missing_translations_mn.json | 14 ++++++-- app/assets/i18n/_missing_translations_ms.json | 14 ++++++-- app/assets/i18n/_missing_translations_ne.json | 14 ++++++-- app/assets/i18n/_missing_translations_nl.json | 13 ++++++++ app/assets/i18n/_missing_translations_pl.json | 13 ++++++++ .../i18n/_missing_translations_pt_BR.json | 13 ++++++++ .../i18n/_missing_translations_pt_PT.json | 13 ++++++++ app/assets/i18n/_missing_translations_ro.json | 14 ++++++-- app/assets/i18n/_missing_translations_ru.json | 15 ++++++++- app/assets/i18n/_missing_translations_si.json | 14 ++++++-- app/assets/i18n/_missing_translations_sk.json | 13 ++++++++ app/assets/i18n/_missing_translations_sl.json | 14 ++++++-- .../i18n/_missing_translations_sr_Cyrl.json | 14 ++++++-- app/assets/i18n/_missing_translations_sv.json | 13 ++++++++ app/assets/i18n/_missing_translations_ta.json | 14 ++++++-- app/assets/i18n/_missing_translations_th.json | 14 ++++++-- app/assets/i18n/_missing_translations_tr.json | 13 ++++++++ app/assets/i18n/_missing_translations_uk.json | 15 ++++++++- app/assets/i18n/_missing_translations_ur.json | 14 ++++++-- app/assets/i18n/_missing_translations_uz.json | 13 ++++++++ app/assets/i18n/_missing_translations_vi.json | 14 ++++++-- .../i18n/_missing_translations_zh_CN.json | 13 ++++++++ .../i18n/_missing_translations_zh_HK.json | 14 ++++++-- .../i18n/_missing_translations_zh_TW.json | 13 ++++++++ app/assets/i18n/ar.json | 1 - app/assets/i18n/bg.json | 1 - app/assets/i18n/bn.json | 1 - app/assets/i18n/de.json | 1 - app/assets/i18n/el.json | 1 - app/assets/i18n/en-IN.json | 1 - app/assets/i18n/en.json | 16 ++++++--- app/assets/i18n/es-ES.json | 1 - app/assets/i18n/et.json | 1 - app/assets/i18n/fa.json | 1 - app/assets/i18n/fi.json | 1 - app/assets/i18n/fr.json | 1 - app/assets/i18n/gl.json | 1 - app/assets/i18n/gu.json | 1 - app/assets/i18n/hi.json | 1 - app/assets/i18n/hu.json | 1 - app/assets/i18n/it.json | 1 - app/assets/i18n/ko.json | 1 - app/assets/i18n/lo.json | 1 - app/assets/i18n/nl.json | 1 - app/assets/i18n/pl.json | 1 - app/assets/i18n/pt-BR.json | 1 - app/assets/i18n/pt-PT.json | 1 - app/assets/i18n/ru.json | 1 - app/assets/i18n/sk.json | 1 - app/assets/i18n/sv.json | 1 - app/assets/i18n/tr.json | 1 - app/assets/i18n/uk.json | 1 - app/assets/i18n/uz.json | 1 - app/assets/i18n/zh-CN.json | 1 - app/assets/i18n/zh-TW.json | 1 - app/lib/gen/strings.g.dart | 2 +- app/lib/gen/strings_ar.g.dart | 2 -- app/lib/gen/strings_bg.g.dart | 2 -- app/lib/gen/strings_bn.g.dart | 2 -- app/lib/gen/strings_de.g.dart | 2 -- app/lib/gen/strings_el.g.dart | 2 -- app/lib/gen/strings_en.g.dart | 33 +++++++++++++------ app/lib/gen/strings_en_IN.g.dart | 2 -- app/lib/gen/strings_es_ES.g.dart | 2 -- app/lib/gen/strings_et.g.dart | 2 -- app/lib/gen/strings_fa.g.dart | 2 -- app/lib/gen/strings_fi.g.dart | 2 -- app/lib/gen/strings_fr.g.dart | 2 -- app/lib/gen/strings_gl.g.dart | 2 -- app/lib/gen/strings_gu.g.dart | 2 -- app/lib/gen/strings_hi.g.dart | 2 -- app/lib/gen/strings_hu.g.dart | 2 -- app/lib/gen/strings_it.g.dart | 2 -- app/lib/gen/strings_ko.g.dart | 2 -- app/lib/gen/strings_lo.g.dart | 2 -- app/lib/gen/strings_nl.g.dart | 2 -- app/lib/gen/strings_pl.g.dart | 2 -- app/lib/gen/strings_pt_BR.g.dart | 2 -- app/lib/gen/strings_pt_PT.g.dart | 2 -- app/lib/gen/strings_ru.g.dart | 2 -- app/lib/gen/strings_sk.g.dart | 2 -- app/lib/gen/strings_sv.g.dart | 2 -- app/lib/gen/strings_tr.g.dart | 2 -- app/lib/gen/strings_uk.g.dart | 2 -- app/lib/gen/strings_uz.g.dart | 2 -- app/lib/gen/strings_zh_CN.g.dart | 2 -- app/lib/gen/strings_zh_TW.g.dart | 2 -- app/lib/util/notification_strings.dart | 1 - .../lib/util/file_speed_helper.dart | 6 ++-- .../lib/util/notification_strings.dart | 10 ++---- 118 files changed, 673 insertions(+), 190 deletions(-) diff --git a/app/assets/i18n/_missing_translations_ar.json b/app/assets/i18n/_missing_translations_ar.json index 2aee714f..defd50bd 100644 --- a/app/assets/i18n/_missing_translations_ar.json +++ b/app/assets/i18n/_missing_translations_ar.json @@ -41,5 +41,18 @@ "icons": "Icons", "raw": "Raw", "question": "Does it look the same on the other device?" + }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } } } diff --git a/app/assets/i18n/_missing_translations_az.json b/app/assets/i18n/_missing_translations_az.json index 7833db7b..1c47fab6 100644 --- a/app/assets/i18n/_missing_translations_az.json +++ b/app/assets/i18n/_missing_translations_az.json @@ -47,10 +47,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webReceivePage": { diff --git a/app/assets/i18n/_missing_translations_bg.json b/app/assets/i18n/_missing_translations_bg.json index a5abee0b..b36305c6 100644 --- a/app/assets/i18n/_missing_translations_bg.json +++ b/app/assets/i18n/_missing_translations_bg.json @@ -41,5 +41,18 @@ "icons": "Icons", "raw": "Raw", "question": "Does it look the same on the other device?" + }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } } } diff --git a/app/assets/i18n/_missing_translations_bn.json b/app/assets/i18n/_missing_translations_bn.json index 677c4cac..6a662ede 100644 --- a/app/assets/i18n/_missing_translations_bn.json +++ b/app/assets/i18n/_missing_translations_bn.json @@ -45,6 +45,19 @@ "sendPage": { "calculatingChecksum": "Calculating checksum ({curr} / {n})" }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } + }, "webReceivePage": { "title": "Receive via link" }, diff --git a/app/assets/i18n/_missing_translations_ca.json b/app/assets/i18n/_missing_translations_ca.json index d44c9cb0..71f3f50f 100644 --- a/app/assets/i18n/_missing_translations_ca.json +++ b/app/assets/i18n/_missing_translations_ca.json @@ -47,10 +47,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webReceivePage": { diff --git a/app/assets/i18n/_missing_translations_cs.json b/app/assets/i18n/_missing_translations_cs.json index 0dcfdfb4..0a739120 100644 --- a/app/assets/i18n/_missing_translations_cs.json +++ b/app/assets/i18n/_missing_translations_cs.json @@ -47,10 +47,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webReceivePage": { diff --git a/app/assets/i18n/_missing_translations_da.json b/app/assets/i18n/_missing_translations_da.json index 01001d46..467346a3 100644 --- a/app/assets/i18n/_missing_translations_da.json +++ b/app/assets/i18n/_missing_translations_da.json @@ -47,10 +47,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webReceivePage": { diff --git a/app/assets/i18n/_missing_translations_de.json b/app/assets/i18n/_missing_translations_de.json index 0c43123a..7f8fd327 100644 --- a/app/assets/i18n/_missing_translations_de.json +++ b/app/assets/i18n/_missing_translations_de.json @@ -2,5 +2,18 @@ "@@info": [ "Here are translations that exist in but not in .", "After editing this file, you can run 'dart run slang apply --locale=de' to quickly apply the newly added translations." - ] + ], + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } + } } diff --git a/app/assets/i18n/_missing_translations_el.json b/app/assets/i18n/_missing_translations_el.json index 4a75e19b..7ae16e63 100644 --- a/app/assets/i18n/_missing_translations_el.json +++ b/app/assets/i18n/_missing_translations_el.json @@ -45,6 +45,19 @@ "sendPage": { "calculatingChecksum": "Calculating checksum ({curr} / {n})" }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } + }, "webReceivePage": { "title": "Receive via link" }, diff --git a/app/assets/i18n/_missing_translations_es_ES.json b/app/assets/i18n/_missing_translations_es_ES.json index 1d1df9e5..5fbeb350 100644 --- a/app/assets/i18n/_missing_translations_es_ES.json +++ b/app/assets/i18n/_missing_translations_es_ES.json @@ -41,5 +41,18 @@ "icons": "Icons", "raw": "Raw", "question": "Does it look the same on the other device?" + }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } } } diff --git a/app/assets/i18n/_missing_translations_et.json b/app/assets/i18n/_missing_translations_et.json index 8d544fa7..13f7afcf 100644 --- a/app/assets/i18n/_missing_translations_et.json +++ b/app/assets/i18n/_missing_translations_et.json @@ -42,6 +42,19 @@ "raw": "Raw", "question": "Does it look the same on the other device?" }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } + }, "webReceivePage": { "title": "Receive via link" }, diff --git a/app/assets/i18n/_missing_translations_eu.json b/app/assets/i18n/_missing_translations_eu.json index 4372fc5c..35f6fb64 100644 --- a/app/assets/i18n/_missing_translations_eu.json +++ b/app/assets/i18n/_missing_translations_eu.json @@ -60,10 +60,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webSharePage": { diff --git a/app/assets/i18n/_missing_translations_fa.json b/app/assets/i18n/_missing_translations_fa.json index a0f9dd95..9f033f0c 100644 --- a/app/assets/i18n/_missing_translations_fa.json +++ b/app/assets/i18n/_missing_translations_fa.json @@ -45,6 +45,19 @@ "sendPage": { "calculatingChecksum": "Calculating checksum ({curr} / {n})" }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } + }, "webReceivePage": { "title": "Receive via link" }, diff --git a/app/assets/i18n/_missing_translations_fi.json b/app/assets/i18n/_missing_translations_fi.json index 7a627911..cea15298 100644 --- a/app/assets/i18n/_missing_translations_fi.json +++ b/app/assets/i18n/_missing_translations_fi.json @@ -45,6 +45,19 @@ "sendPage": { "calculatingChecksum": "Calculating checksum ({curr} / {n})" }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } + }, "webReceivePage": { "title": "Receive via link" }, diff --git a/app/assets/i18n/_missing_translations_fil_PH.json b/app/assets/i18n/_missing_translations_fil_PH.json index 4d75cfe0..b114c1f4 100644 --- a/app/assets/i18n/_missing_translations_fil_PH.json +++ b/app/assets/i18n/_missing_translations_fil_PH.json @@ -47,10 +47,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webReceivePage": { diff --git a/app/assets/i18n/_missing_translations_fr.json b/app/assets/i18n/_missing_translations_fr.json index 0ff42776..b512985b 100644 --- a/app/assets/i18n/_missing_translations_fr.json +++ b/app/assets/i18n/_missing_translations_fr.json @@ -45,6 +45,19 @@ "sendPage": { "calculatingChecksum": "Calculating checksum ({curr} / {n})" }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } + }, "webReceivePage": { "title": "Receive via link" }, diff --git a/app/assets/i18n/_missing_translations_gl.json b/app/assets/i18n/_missing_translations_gl.json index 126e4a84..caf01ea3 100644 --- a/app/assets/i18n/_missing_translations_gl.json +++ b/app/assets/i18n/_missing_translations_gl.json @@ -45,6 +45,19 @@ "sendPage": { "calculatingChecksum": "Calculating checksum ({curr} / {n})" }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } + }, "webReceivePage": { "title": "Receive via link" }, diff --git a/app/assets/i18n/_missing_translations_gu.json b/app/assets/i18n/_missing_translations_gu.json index 02c5fa26..d02cafd5 100644 --- a/app/assets/i18n/_missing_translations_gu.json +++ b/app/assets/i18n/_missing_translations_gu.json @@ -45,6 +45,19 @@ "sendPage": { "calculatingChecksum": "Calculating checksum ({curr} / {n})" }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } + }, "webReceivePage": { "title": "Receive via link" }, diff --git a/app/assets/i18n/_missing_translations_he.json b/app/assets/i18n/_missing_translations_he.json index 2e212764..880db29e 100644 --- a/app/assets/i18n/_missing_translations_he.json +++ b/app/assets/i18n/_missing_translations_he.json @@ -47,10 +47,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webReceivePage": { diff --git a/app/assets/i18n/_missing_translations_hi.json b/app/assets/i18n/_missing_translations_hi.json index 0fda4109..3ed857aa 100644 --- a/app/assets/i18n/_missing_translations_hi.json +++ b/app/assets/i18n/_missing_translations_hi.json @@ -41,5 +41,18 @@ "icons": "Icons", "raw": "Raw", "question": "Does it look the same on the other device?" + }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } } } diff --git a/app/assets/i18n/_missing_translations_hu.json b/app/assets/i18n/_missing_translations_hu.json index 2b55e203..a1bcb8cd 100644 --- a/app/assets/i18n/_missing_translations_hu.json +++ b/app/assets/i18n/_missing_translations_hu.json @@ -41,5 +41,18 @@ "icons": "Icons", "raw": "Raw", "question": "Does it look the same on the other device?" + }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } } } diff --git a/app/assets/i18n/_missing_translations_id.json b/app/assets/i18n/_missing_translations_id.json index 6a6c64da..00112b6e 100644 --- a/app/assets/i18n/_missing_translations_id.json +++ b/app/assets/i18n/_missing_translations_id.json @@ -51,10 +51,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webReceivePage": { diff --git a/app/assets/i18n/_missing_translations_it.json b/app/assets/i18n/_missing_translations_it.json index d1443cd2..7ae132f7 100644 --- a/app/assets/i18n/_missing_translations_it.json +++ b/app/assets/i18n/_missing_translations_it.json @@ -45,6 +45,19 @@ "sendPage": { "calculatingChecksum": "Calculating checksum ({curr} / {n})" }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } + }, "webReceivePage": { "title": "Receive via link" }, diff --git a/app/assets/i18n/_missing_translations_ja.json b/app/assets/i18n/_missing_translations_ja.json index 0eb0b4a7..7d6c2c63 100644 --- a/app/assets/i18n/_missing_translations_ja.json +++ b/app/assets/i18n/_missing_translations_ja.json @@ -47,10 +47,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webReceivePage": { diff --git a/app/assets/i18n/_missing_translations_km.json b/app/assets/i18n/_missing_translations_km.json index 3356a8dc..8b223fe5 100644 --- a/app/assets/i18n/_missing_translations_km.json +++ b/app/assets/i18n/_missing_translations_km.json @@ -54,10 +54,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webReceivePage": { diff --git a/app/assets/i18n/_missing_translations_ko.json b/app/assets/i18n/_missing_translations_ko.json index c4b41c77..61503796 100644 --- a/app/assets/i18n/_missing_translations_ko.json +++ b/app/assets/i18n/_missing_translations_ko.json @@ -41,5 +41,18 @@ "icons": "Icons", "raw": "Raw", "question": "Does it look the same on the other device?" + }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } } } diff --git a/app/assets/i18n/_missing_translations_lo.json b/app/assets/i18n/_missing_translations_lo.json index 5854233a..517a7031 100644 --- a/app/assets/i18n/_missing_translations_lo.json +++ b/app/assets/i18n/_missing_translations_lo.json @@ -45,6 +45,19 @@ "sendPage": { "calculatingChecksum": "Calculating checksum ({curr} / {n})" }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } + }, "webReceivePage": { "title": "Receive via link" }, diff --git a/app/assets/i18n/_missing_translations_ml.json b/app/assets/i18n/_missing_translations_ml.json index 140b634c..c8b60cfa 100644 --- a/app/assets/i18n/_missing_translations_ml.json +++ b/app/assets/i18n/_missing_translations_ml.json @@ -51,10 +51,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webSharePage": { diff --git a/app/assets/i18n/_missing_translations_mn.json b/app/assets/i18n/_missing_translations_mn.json index 54b22d78..5c4d30fe 100644 --- a/app/assets/i18n/_missing_translations_mn.json +++ b/app/assets/i18n/_missing_translations_mn.json @@ -67,10 +67,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webSharePage": { diff --git a/app/assets/i18n/_missing_translations_ms.json b/app/assets/i18n/_missing_translations_ms.json index 80a100c4..8334ff68 100644 --- a/app/assets/i18n/_missing_translations_ms.json +++ b/app/assets/i18n/_missing_translations_ms.json @@ -47,10 +47,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webReceivePage": { diff --git a/app/assets/i18n/_missing_translations_ne.json b/app/assets/i18n/_missing_translations_ne.json index 5ae4b96a..486d1a64 100644 --- a/app/assets/i18n/_missing_translations_ne.json +++ b/app/assets/i18n/_missing_translations_ne.json @@ -48,10 +48,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webReceivePage": { diff --git a/app/assets/i18n/_missing_translations_nl.json b/app/assets/i18n/_missing_translations_nl.json index 1b266547..238687c9 100644 --- a/app/assets/i18n/_missing_translations_nl.json +++ b/app/assets/i18n/_missing_translations_nl.json @@ -41,5 +41,18 @@ "icons": "Icons", "raw": "Raw", "question": "Does it look the same on the other device?" + }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } } } diff --git a/app/assets/i18n/_missing_translations_pl.json b/app/assets/i18n/_missing_translations_pl.json index 773baf36..e14cd811 100644 --- a/app/assets/i18n/_missing_translations_pl.json +++ b/app/assets/i18n/_missing_translations_pl.json @@ -35,5 +35,18 @@ "icons": "Icons", "raw": "Raw", "question": "Does it look the same on the other device?" + }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } } } diff --git a/app/assets/i18n/_missing_translations_pt_BR.json b/app/assets/i18n/_missing_translations_pt_BR.json index 7b96f51b..5a1cfc38 100644 --- a/app/assets/i18n/_missing_translations_pt_BR.json +++ b/app/assets/i18n/_missing_translations_pt_BR.json @@ -35,5 +35,18 @@ "icons": "Icons", "raw": "Raw", "question": "Does it look the same on the other device?" + }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } } } diff --git a/app/assets/i18n/_missing_translations_pt_PT.json b/app/assets/i18n/_missing_translations_pt_PT.json index 95242474..5458188e 100644 --- a/app/assets/i18n/_missing_translations_pt_PT.json +++ b/app/assets/i18n/_missing_translations_pt_PT.json @@ -45,6 +45,19 @@ "sendPage": { "calculatingChecksum": "Calculating checksum ({curr} / {n})" }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } + }, "webReceivePage": { "title": "Receive via link" }, diff --git a/app/assets/i18n/_missing_translations_ro.json b/app/assets/i18n/_missing_translations_ro.json index cb8e2a76..834de8c8 100644 --- a/app/assets/i18n/_missing_translations_ro.json +++ b/app/assets/i18n/_missing_translations_ro.json @@ -47,10 +47,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webReceivePage": { diff --git a/app/assets/i18n/_missing_translations_ru.json b/app/assets/i18n/_missing_translations_ru.json index d69f5f8c..e639c656 100644 --- a/app/assets/i18n/_missing_translations_ru.json +++ b/app/assets/i18n/_missing_translations_ru.json @@ -2,5 +2,18 @@ "@@info": [ "Here are translations that exist in but not in .", "After editing this file, you can run 'dart run slang apply --locale=ru' to quickly apply the newly added translations." - ] + ], + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } + } } diff --git a/app/assets/i18n/_missing_translations_si.json b/app/assets/i18n/_missing_translations_si.json index f8c7286d..dc61b4f9 100644 --- a/app/assets/i18n/_missing_translations_si.json +++ b/app/assets/i18n/_missing_translations_si.json @@ -47,10 +47,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webReceivePage": { diff --git a/app/assets/i18n/_missing_translations_sk.json b/app/assets/i18n/_missing_translations_sk.json index 17578503..59560d48 100644 --- a/app/assets/i18n/_missing_translations_sk.json +++ b/app/assets/i18n/_missing_translations_sk.json @@ -41,5 +41,18 @@ "icons": "Icons", "raw": "Raw", "question": "Does it look the same on the other device?" + }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } } } diff --git a/app/assets/i18n/_missing_translations_sl.json b/app/assets/i18n/_missing_translations_sl.json index 72346762..228db6fe 100644 --- a/app/assets/i18n/_missing_translations_sl.json +++ b/app/assets/i18n/_missing_translations_sl.json @@ -66,10 +66,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webReceivePage": { diff --git a/app/assets/i18n/_missing_translations_sr_Cyrl.json b/app/assets/i18n/_missing_translations_sr_Cyrl.json index 09ca3752..2245599d 100644 --- a/app/assets/i18n/_missing_translations_sr_Cyrl.json +++ b/app/assets/i18n/_missing_translations_sr_Cyrl.json @@ -47,10 +47,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webReceivePage": { diff --git a/app/assets/i18n/_missing_translations_sv.json b/app/assets/i18n/_missing_translations_sv.json index bc61a3aa..9d19e3f7 100644 --- a/app/assets/i18n/_missing_translations_sv.json +++ b/app/assets/i18n/_missing_translations_sv.json @@ -42,6 +42,19 @@ "raw": "Raw", "question": "Does it look the same on the other device?" }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } + }, "webReceivePage": { "title": "Receive via link" }, diff --git a/app/assets/i18n/_missing_translations_ta.json b/app/assets/i18n/_missing_translations_ta.json index c0ef8ab3..157eeb69 100644 --- a/app/assets/i18n/_missing_translations_ta.json +++ b/app/assets/i18n/_missing_translations_ta.json @@ -47,10 +47,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webReceivePage": { diff --git a/app/assets/i18n/_missing_translations_th.json b/app/assets/i18n/_missing_translations_th.json index ed7f0344..f7e3f1a7 100644 --- a/app/assets/i18n/_missing_translations_th.json +++ b/app/assets/i18n/_missing_translations_th.json @@ -47,10 +47,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webReceivePage": { diff --git a/app/assets/i18n/_missing_translations_tr.json b/app/assets/i18n/_missing_translations_tr.json index 6c1b1185..3d2ca67d 100644 --- a/app/assets/i18n/_missing_translations_tr.json +++ b/app/assets/i18n/_missing_translations_tr.json @@ -35,5 +35,18 @@ "icons": "Icons", "raw": "Raw", "question": "Does it look the same on the other device?" + }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } } } diff --git a/app/assets/i18n/_missing_translations_uk.json b/app/assets/i18n/_missing_translations_uk.json index 4eb0fee1..a604e3ad 100644 --- a/app/assets/i18n/_missing_translations_uk.json +++ b/app/assets/i18n/_missing_translations_uk.json @@ -2,5 +2,18 @@ "@@info": [ "Here are translations that exist in but not in .", "After editing this file, you can run 'dart run slang apply --locale=uk' to quickly apply the newly added translations." - ] + ], + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } + } } diff --git a/app/assets/i18n/_missing_translations_ur.json b/app/assets/i18n/_missing_translations_ur.json index 1bce4f0b..59f0152b 100644 --- a/app/assets/i18n/_missing_translations_ur.json +++ b/app/assets/i18n/_missing_translations_ur.json @@ -48,10 +48,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webReceivePage": { diff --git a/app/assets/i18n/_missing_translations_uz.json b/app/assets/i18n/_missing_translations_uz.json index 7be37e9e..9d237992 100644 --- a/app/assets/i18n/_missing_translations_uz.json +++ b/app/assets/i18n/_missing_translations_uz.json @@ -45,6 +45,19 @@ "sendPage": { "calculatingChecksum": "Calculating checksum ({curr} / {n})" }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } + }, "webReceivePage": { "title": "Receive via link" }, diff --git a/app/assets/i18n/_missing_translations_vi.json b/app/assets/i18n/_missing_translations_vi.json index 1971d749..9e4a4856 100644 --- a/app/assets/i18n/_missing_translations_vi.json +++ b/app/assets/i18n/_missing_translations_vi.json @@ -47,10 +47,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webReceivePage": { diff --git a/app/assets/i18n/_missing_translations_zh_CN.json b/app/assets/i18n/_missing_translations_zh_CN.json index fe948718..d4ffbd9e 100644 --- a/app/assets/i18n/_missing_translations_zh_CN.json +++ b/app/assets/i18n/_missing_translations_zh_CN.json @@ -41,5 +41,18 @@ "icons": "Icons", "raw": "Raw", "question": "Does it look the same on the other device?" + }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } } } diff --git a/app/assets/i18n/_missing_translations_zh_HK.json b/app/assets/i18n/_missing_translations_zh_HK.json index 35512e05..a5eeb127 100644 --- a/app/assets/i18n/_missing_translations_zh_HK.json +++ b/app/assets/i18n/_missing_translations_zh_HK.json @@ -47,10 +47,18 @@ }, "progressPage": { "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webReceivePage": { diff --git a/app/assets/i18n/_missing_translations_zh_TW.json b/app/assets/i18n/_missing_translations_zh_TW.json index 9a2adc37..690a60c3 100644 --- a/app/assets/i18n/_missing_translations_zh_TW.json +++ b/app/assets/i18n/_missing_translations_zh_TW.json @@ -42,6 +42,19 @@ "raw": "Raw", "question": "Does it look the same on the other device?" }, + "progressPage": { + "remainingTime": { + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + } + } + }, "webReceivePage": { "title": "Receive via link" } diff --git a/app/assets/i18n/ar.json b/app/assets/i18n/ar.json index 1566cd18..d3508356 100644 --- a/app/assets/i18n/ar.json +++ b/app/assets/i18n/ar.json @@ -241,7 +241,6 @@ "speed": "سرعة: {speed}/ثانية" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}س {m}د", "days": "{d}ي {h}س {m}د", diff --git a/app/assets/i18n/bg.json b/app/assets/i18n/bg.json index 47edae70..91b40b58 100644 --- a/app/assets/i18n/bg.json +++ b/app/assets/i18n/bg.json @@ -241,7 +241,6 @@ "speed": "Скорост: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}ч {m}мин", "days": "{d}д {h}ч {m}мин", diff --git a/app/assets/i18n/bn.json b/app/assets/i18n/bn.json index aac3eae1..4ea3c172 100644 --- a/app/assets/i18n/bn.json +++ b/app/assets/i18n/bn.json @@ -240,7 +240,6 @@ "speed": "স্পীড: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}ঘণ্টা {m}মিনিট", "days": "{d}দিন {h}ঘণ্টা {m}মিনিট", diff --git a/app/assets/i18n/de.json b/app/assets/i18n/de.json index c107118e..1fcbb098 100644 --- a/app/assets/i18n/de.json +++ b/app/assets/i18n/de.json @@ -268,7 +268,6 @@ "speed": "Geschwindigkeit: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}h {m}m", "days": "{d}d {h}h {m}m", diff --git a/app/assets/i18n/el.json b/app/assets/i18n/el.json index d92fe9f3..7016920b 100644 --- a/app/assets/i18n/el.json +++ b/app/assets/i18n/el.json @@ -240,7 +240,6 @@ "speed": "Ταχύτητα: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}ώ {m}λ", "days": "{d}ημ {h}ώ {m}λ", diff --git a/app/assets/i18n/en-IN.json b/app/assets/i18n/en-IN.json index 8aa3d635..90091262 100644 --- a/app/assets/i18n/en-IN.json +++ b/app/assets/i18n/en-IN.json @@ -240,7 +240,6 @@ "speed": "Speed: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}h {m}m", "days": "{d}d {h}h {m}m", diff --git a/app/assets/i18n/en.json b/app/assets/i18n/en.json index 83c4bbf3..8c65b685 100644 --- a/app/assets/i18n/en.json +++ b/app/assets/i18n/en.json @@ -268,12 +268,18 @@ "speed": "Speed: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", + "minutesUnit(plural, param=m)": { + "other": "{m}m" + }, + "hoursUnit(plural, param=h)": { + "other": "{h}h" + }, + "daysUnit(plural, param=d)": { + "other": "{d}d" + }, "minutes": "{n}:{ss}", - "hours": "{h}h {m}m", - "days": "{d}d {h}h {m}m", - "@hours": "Use 'h' for hours abbreviation and 'm' for minutes", - "@days": "Use 'd' for days, 'h' for hours, and 'm' for minutes" + "hours": "@:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit", + "days": "@:progressPage.remainingTime.daysUnit @:progressPage.remainingTime.hoursUnit @:progressPage.remainingTime.minutesUnit" } }, "webSharePage": { diff --git a/app/assets/i18n/es-ES.json b/app/assets/i18n/es-ES.json index 8cc12f2a..6ea6e90c 100644 --- a/app/assets/i18n/es-ES.json +++ b/app/assets/i18n/es-ES.json @@ -241,7 +241,6 @@ "speed": "Velocidad: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}h {m}m", "days": "{d}d {h}h {m}m", diff --git a/app/assets/i18n/et.json b/app/assets/i18n/et.json index 3200c183..d39796f1 100644 --- a/app/assets/i18n/et.json +++ b/app/assets/i18n/et.json @@ -241,7 +241,6 @@ "speed": "Kiirus: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h} t {m} min", "days": "{d} pv {h} t {m} min", diff --git a/app/assets/i18n/fa.json b/app/assets/i18n/fa.json index 845bc64b..c9a5c69b 100644 --- a/app/assets/i18n/fa.json +++ b/app/assets/i18n/fa.json @@ -240,7 +240,6 @@ "speed": "سرعت: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}س {m}د", "days": "{d}ر {h}س {m}د", diff --git a/app/assets/i18n/fi.json b/app/assets/i18n/fi.json index ea137913..1449ea85 100644 --- a/app/assets/i18n/fi.json +++ b/app/assets/i18n/fi.json @@ -240,7 +240,6 @@ "speed": "Nopeus: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}t {m}m", "days": "{d}pv {h}t {m}m", diff --git a/app/assets/i18n/fr.json b/app/assets/i18n/fr.json index 34c2b42c..ede9e179 100644 --- a/app/assets/i18n/fr.json +++ b/app/assets/i18n/fr.json @@ -240,7 +240,6 @@ "speed": "Vitesse : {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n} :{ss}", "hours": "{h}h {m}min", "days": "{d}j {h}h {m}min", diff --git a/app/assets/i18n/gl.json b/app/assets/i18n/gl.json index ef921d9a..611527ea 100644 --- a/app/assets/i18n/gl.json +++ b/app/assets/i18n/gl.json @@ -240,7 +240,6 @@ "speed": "Velocidade: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}h {m}m", "days": "{d}d {h}h {m}m", diff --git a/app/assets/i18n/gu.json b/app/assets/i18n/gu.json index 8d208856..a1e939f4 100644 --- a/app/assets/i18n/gu.json +++ b/app/assets/i18n/gu.json @@ -240,7 +240,6 @@ "speed": "ગતિ: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}ક {m}મિ", "days": "{d}દિ {h}ક {m}મિ", diff --git a/app/assets/i18n/hi.json b/app/assets/i18n/hi.json index 60b21fb8..f2e8801c 100644 --- a/app/assets/i18n/hi.json +++ b/app/assets/i18n/hi.json @@ -241,7 +241,6 @@ "speed": "गति: {speed}/सेकंड" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}घं {m}मि", "days": "{d}दि {h}घं {m}मि", diff --git a/app/assets/i18n/hu.json b/app/assets/i18n/hu.json index 7d5c808e..4be97ec1 100644 --- a/app/assets/i18n/hu.json +++ b/app/assets/i18n/hu.json @@ -241,7 +241,6 @@ "speed": "Sebesség: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}h {m}m", "days": "{d}d {h}h {m}m", diff --git a/app/assets/i18n/it.json b/app/assets/i18n/it.json index e5907337..3746f18c 100644 --- a/app/assets/i18n/it.json +++ b/app/assets/i18n/it.json @@ -240,7 +240,6 @@ "speed": "Velocità: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}h {m}m", "days": "{d}d {h}h {m}m", diff --git a/app/assets/i18n/ko.json b/app/assets/i18n/ko.json index 6c0a4a19..784247a4 100644 --- a/app/assets/i18n/ko.json +++ b/app/assets/i18n/ko.json @@ -241,7 +241,6 @@ "speed": "속도: {speed}/초" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}시간 {m}분", "days": "{d}일 {h}시간 {m}분", diff --git a/app/assets/i18n/lo.json b/app/assets/i18n/lo.json index 0e67b370..e574aff2 100644 --- a/app/assets/i18n/lo.json +++ b/app/assets/i18n/lo.json @@ -240,7 +240,6 @@ "speed": "ຄວາມໄວ: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}ຊມ {m}ນທ", "days": "{d}ມື້ {h}ຊມ {m}ນທ" diff --git a/app/assets/i18n/nl.json b/app/assets/i18n/nl.json index 44935c4b..f182d30d 100644 --- a/app/assets/i18n/nl.json +++ b/app/assets/i18n/nl.json @@ -241,7 +241,6 @@ "speed": "Snelheid: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}u {m}m", "days": "{d}d {h}u {m}m", diff --git a/app/assets/i18n/pl.json b/app/assets/i18n/pl.json index de843eff..a7517376 100644 --- a/app/assets/i18n/pl.json +++ b/app/assets/i18n/pl.json @@ -243,7 +243,6 @@ "speed": "Prędkość: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}h {m}m", "days": "{d}d {h}h {m}m", diff --git a/app/assets/i18n/pt-BR.json b/app/assets/i18n/pt-BR.json index 53ffa912..34527dd6 100644 --- a/app/assets/i18n/pt-BR.json +++ b/app/assets/i18n/pt-BR.json @@ -243,7 +243,6 @@ "speed": "Velocidade: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}h {m}m", "days": "{d}d {h}h {m}m", diff --git a/app/assets/i18n/pt-PT.json b/app/assets/i18n/pt-PT.json index 74e75989..1a7292d0 100644 --- a/app/assets/i18n/pt-PT.json +++ b/app/assets/i18n/pt-PT.json @@ -240,7 +240,6 @@ "speed": "Velocidade: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}h {m}m", "days": "{d}d {h}h {m}m", diff --git a/app/assets/i18n/ru.json b/app/assets/i18n/ru.json index 31e942d9..01ff5558 100644 --- a/app/assets/i18n/ru.json +++ b/app/assets/i18n/ru.json @@ -268,7 +268,6 @@ "speed": "Скорость: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}ч {m}мин", "days": "{d}д {h}ч {m}мин", diff --git a/app/assets/i18n/sk.json b/app/assets/i18n/sk.json index 7ad77295..b7df5172 100644 --- a/app/assets/i18n/sk.json +++ b/app/assets/i18n/sk.json @@ -241,7 +241,6 @@ "speed": "Rýchlosť: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}h {m}m", "days": "{d}d {h}h {m}m", diff --git a/app/assets/i18n/sv.json b/app/assets/i18n/sv.json index 0ef8e362..2c21b655 100644 --- a/app/assets/i18n/sv.json +++ b/app/assets/i18n/sv.json @@ -241,7 +241,6 @@ "speed": "Hastighet: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}h {m}m", "days": "{d}d {h}h {m}m", diff --git a/app/assets/i18n/tr.json b/app/assets/i18n/tr.json index f0924fb3..8fd37fe3 100644 --- a/app/assets/i18n/tr.json +++ b/app/assets/i18n/tr.json @@ -243,7 +243,6 @@ "speed": "Hız: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}s {m}d", "days": "{d}g {h}s {m}d", diff --git a/app/assets/i18n/uk.json b/app/assets/i18n/uk.json index 469a01d9..39072ad8 100644 --- a/app/assets/i18n/uk.json +++ b/app/assets/i18n/uk.json @@ -268,7 +268,6 @@ "speed": "Швидкість: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}h {m}m", "days": "{d}d {h}h {m}m", diff --git a/app/assets/i18n/uz.json b/app/assets/i18n/uz.json index fae544d8..541ed3ca 100644 --- a/app/assets/i18n/uz.json +++ b/app/assets/i18n/uz.json @@ -240,7 +240,6 @@ "speed": "Tezlik: {speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}s {m}d", "days": "{d}k {h}s {m}d" diff --git a/app/assets/i18n/zh-CN.json b/app/assets/i18n/zh-CN.json index ddeec44f..57fdd194 100644 --- a/app/assets/i18n/zh-CN.json +++ b/app/assets/i18n/zh-CN.json @@ -241,7 +241,6 @@ "speed": "速度：{speed}/s" }, "remainingTime": { - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "hours": "{h}h {m}m", "days": "{d}d {h}h {m}m", diff --git a/app/assets/i18n/zh-TW.json b/app/assets/i18n/zh-TW.json index 993c8978..540a4fee 100644 --- a/app/assets/i18n/zh-TW.json +++ b/app/assets/i18n/zh-TW.json @@ -243,7 +243,6 @@ "remainingTime": { "hours": "{h}小時 {m}分鐘", "days": "{d}天 {h}小時 {m}分鐘", - "seconds": "{n}:{ss}", "minutes": "{n}:{ss}", "@hours": "使用「h」作為小時縮寫，「m」作為分鐘縮寫", "@days": "使用「d」作為日數縮寫，「h」作為小時縮寫，「m」作為分鐘縮寫" diff --git a/app/lib/gen/strings.g.dart b/app/lib/gen/strings.g.dart index 55e7f9fb..c89f175c 100644 --- a/app/lib/gen/strings.g.dart +++ b/app/lib/gen/strings.g.dart @@ -4,7 +4,7 @@ /// To regenerate, run: `dart run slang` /// /// Locales: 55 -/// Strings: 18466 (335 per locale) +/// Strings: 18438 (335 per locale) // coverage:ignore-file // ignore_for_file: type=lint, unused_import diff --git a/app/lib/gen/strings_ar.g.dart b/app/lib/gen/strings_ar.g.dart index 149dcca8..bc8157da 100644 --- a/app/lib/gen/strings_ar.g.dart +++ b/app/lib/gen/strings_ar.g.dart @@ -1106,8 +1106,6 @@ class _Translations$progressPage$remainingTime$ar extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// استخدم 'س' لاختصار الساعات و'د' للدقائق diff --git a/app/lib/gen/strings_bg.g.dart b/app/lib/gen/strings_bg.g.dart index a57ecc8d..b5cf617d 100644 --- a/app/lib/gen/strings_bg.g.dart +++ b/app/lib/gen/strings_bg.g.dart @@ -1023,8 +1023,6 @@ class _Translations$progressPage$remainingTime$bg extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// Използвайте „h“ като съкращение за часове и „m“ за минути diff --git a/app/lib/gen/strings_bn.g.dart b/app/lib/gen/strings_bn.g.dart index e77084b5..7a22ba71 100644 --- a/app/lib/gen/strings_bn.g.dart +++ b/app/lib/gen/strings_bn.g.dart @@ -1077,8 +1077,6 @@ class _Translations$progressPage$remainingTime$bn extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// ঘন্টার জন্য 'h' এবং মিনিটের জন্য 'm' ব্যবহার করুন diff --git a/app/lib/gen/strings_de.g.dart b/app/lib/gen/strings_de.g.dart index d59b182d..98a68826 100644 --- a/app/lib/gen/strings_de.g.dart +++ b/app/lib/gen/strings_de.g.dart @@ -1102,8 +1102,6 @@ class _Translations$progressPage$remainingTime$de extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// Benutze 'h' als Abkürzung für Stunden und 'm' für Minuten diff --git a/app/lib/gen/strings_el.g.dart b/app/lib/gen/strings_el.g.dart index b7e947b3..c90ac115 100644 --- a/app/lib/gen/strings_el.g.dart +++ b/app/lib/gen/strings_el.g.dart @@ -1079,8 +1079,6 @@ class _Translations$progressPage$remainingTime$el extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// Χρησιμοποιήστε τη συντομογραφία «ώ» για ώρες και τη συντομογραφία «λ» για λεπτά diff --git a/app/lib/gen/strings_en.g.dart b/app/lib/gen/strings_en.g.dart index 3f62c485..00b4886d 100644 --- a/app/lib/gen/strings_en.g.dart +++ b/app/lib/gen/strings_en.g.dart @@ -1378,21 +1378,34 @@ class Translations$progressPage$remainingTime$en { // Translations - /// en: '{n}:{ss}' - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; + /// en: '(other) {{m}m}' + String minutesUnit({required num m}) => (_root.$meta.cardinalResolver ?? PluralResolvers.cardinal('en'))( + m, + other: '${m}m', + ); + + /// en: '(other) {{h}h}' + String hoursUnit({required num h}) => (_root.$meta.cardinalResolver ?? PluralResolvers.cardinal('en'))( + h, + other: '${h}h', + ); + + /// en: '(other) {{d}d}' + String daysUnit({required num d}) => (_root.$meta.cardinalResolver ?? PluralResolvers.cardinal('en'))( + d, + other: '${d}d', + ); /// en: '{n}:{ss}' String minutes({required Object n, required Object ss}) => '${n}:${ss}'; - /// Use 'h' for hours abbreviation and 'm' for minutes - /// - /// en: '{h}h {m}m' - String hours({required Object h, required Object m}) => '${h}h ${m}m'; + /// en: '(other) {{h}h} (other) {{m}m}' + String hours({required num h, required num m}) => + '${_root.progressPage.remainingTime.hoursUnit(h: h)} ${_root.progressPage.remainingTime.minutesUnit(m: m)}'; - /// Use 'd' for days, 'h' for hours, and 'm' for minutes - /// - /// en: '{d}d {h}h {m}m' - String days({required Object d, required Object h, required Object m}) => '${d}d ${h}h ${m}m'; + /// en: '(other) {{d}d} (other) {{h}h} (other) {{m}m}' + String days({required num d, required num h, required num m}) => + '${_root.progressPage.remainingTime.daysUnit(d: d)} ${_root.progressPage.remainingTime.hoursUnit(h: h)} ${_root.progressPage.remainingTime.minutesUnit(m: m)}'; } // Path: whatsNewPage.changes diff --git a/app/lib/gen/strings_en_IN.g.dart b/app/lib/gen/strings_en_IN.g.dart index 9bdc0ede..6b8550ac 100644 --- a/app/lib/gen/strings_en_IN.g.dart +++ b/app/lib/gen/strings_en_IN.g.dart @@ -1081,8 +1081,6 @@ class _Translations$progressPage$remainingTime$en_IN extends Translations$progre // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// Use 'h' for hours abbreviation and 'm' for minutes diff --git a/app/lib/gen/strings_es_ES.g.dart b/app/lib/gen/strings_es_ES.g.dart index 6226ce30..74b45fd4 100644 --- a/app/lib/gen/strings_es_ES.g.dart +++ b/app/lib/gen/strings_es_ES.g.dart @@ -1027,8 +1027,6 @@ class _Translations$progressPage$remainingTime$es_ES extends Translations$progre // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// Usa «h» como abreviatura de horas y «m» para minutos diff --git a/app/lib/gen/strings_et.g.dart b/app/lib/gen/strings_et.g.dart index 42b5e979..2273a0d8 100644 --- a/app/lib/gen/strings_et.g.dart +++ b/app/lib/gen/strings_et.g.dart @@ -994,8 +994,6 @@ class _Translations$progressPage$remainingTime$et extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// Kasuta „h“ tunni lühendina ja „m“ minutite jaoks diff --git a/app/lib/gen/strings_fa.g.dart b/app/lib/gen/strings_fa.g.dart index 5c0447a2..0903a809 100644 --- a/app/lib/gen/strings_fa.g.dart +++ b/app/lib/gen/strings_fa.g.dart @@ -1078,8 +1078,6 @@ class _Translations$progressPage$remainingTime$fa extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// از «س» به عنوان مخفف ساعت و از «د» برای دقیقه استفاده کنید diff --git a/app/lib/gen/strings_fi.g.dart b/app/lib/gen/strings_fi.g.dart index a4d8694b..b15eae50 100644 --- a/app/lib/gen/strings_fi.g.dart +++ b/app/lib/gen/strings_fi.g.dart @@ -1085,8 +1085,6 @@ class _Translations$progressPage$remainingTime$fi extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// Käytä 'h' tuntien lyhenteenä ja 'm' minuuttien diff --git a/app/lib/gen/strings_fr.g.dart b/app/lib/gen/strings_fr.g.dart index 26af65e2..fe08b1bb 100644 --- a/app/lib/gen/strings_fr.g.dart +++ b/app/lib/gen/strings_fr.g.dart @@ -993,8 +993,6 @@ class _Translations$progressPage$remainingTime$fr extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n} :${ss}'; /// Utilisez « h » pour l'abréviation des heures et « m » pour les minutes diff --git a/app/lib/gen/strings_gl.g.dart b/app/lib/gen/strings_gl.g.dart index 045a540a..a763ea14 100644 --- a/app/lib/gen/strings_gl.g.dart +++ b/app/lib/gen/strings_gl.g.dart @@ -992,8 +992,6 @@ class _Translations$progressPage$remainingTime$gl extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// Usa «h» para abreviatura de horas e «m» para minutos diff --git a/app/lib/gen/strings_gu.g.dart b/app/lib/gen/strings_gu.g.dart index ffa7f919..228ac565 100644 --- a/app/lib/gen/strings_gu.g.dart +++ b/app/lib/gen/strings_gu.g.dart @@ -1075,8 +1075,6 @@ class _Translations$progressPage$remainingTime$gu extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// નાનું કરી ને 'ક' કલાક માટે અને 'મિ' મિનિટ માટે વાપરો diff --git a/app/lib/gen/strings_hi.g.dart b/app/lib/gen/strings_hi.g.dart index 6eff028d..784ee85c 100644 --- a/app/lib/gen/strings_hi.g.dart +++ b/app/lib/gen/strings_hi.g.dart @@ -1106,8 +1106,6 @@ class _Translations$progressPage$remainingTime$hi extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// घंटों के लिए 'h' और मिनटों के लिए 'm' का इस्तेमाल करें diff --git a/app/lib/gen/strings_hu.g.dart b/app/lib/gen/strings_hu.g.dart index 483cefc2..0767dcd5 100644 --- a/app/lib/gen/strings_hu.g.dart +++ b/app/lib/gen/strings_hu.g.dart @@ -1022,8 +1022,6 @@ class _Translations$progressPage$remainingTime$hu extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// Az órák rövidítéséhez használja a 'h' betűt, a percekhez pedig az 'm' betűt diff --git a/app/lib/gen/strings_it.g.dart b/app/lib/gen/strings_it.g.dart index aabe7124..1656cc1e 100644 --- a/app/lib/gen/strings_it.g.dart +++ b/app/lib/gen/strings_it.g.dart @@ -992,8 +992,6 @@ class _Translations$progressPage$remainingTime$it extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// Usa 'h' come abbreviazione per ore e 'm' per minuti diff --git a/app/lib/gen/strings_ko.g.dart b/app/lib/gen/strings_ko.g.dart index d5ba8a4f..0e2f7bb2 100644 --- a/app/lib/gen/strings_ko.g.dart +++ b/app/lib/gen/strings_ko.g.dart @@ -1016,8 +1016,6 @@ class _Translations$progressPage$remainingTime$ko extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// 'h'로 시간을, 'm'으로 분을 나타냅니다 diff --git a/app/lib/gen/strings_lo.g.dart b/app/lib/gen/strings_lo.g.dart index fe474cb2..951d80d7 100644 --- a/app/lib/gen/strings_lo.g.dart +++ b/app/lib/gen/strings_lo.g.dart @@ -1072,8 +1072,6 @@ class _Translations$progressPage$remainingTime$lo extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; @override String hours({required Object h, required Object m}) => '${h}ຊມ ${m}ນທ'; diff --git a/app/lib/gen/strings_nl.g.dart b/app/lib/gen/strings_nl.g.dart index 06d3c5bd..1b531bec 100644 --- a/app/lib/gen/strings_nl.g.dart +++ b/app/lib/gen/strings_nl.g.dart @@ -1023,8 +1023,6 @@ class _Translations$progressPage$remainingTime$nl extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// Gebruik 'u' als afkorting voor uren en 'm' voor minuten diff --git a/app/lib/gen/strings_pl.g.dart b/app/lib/gen/strings_pl.g.dart index 4a52c2a1..9535b821 100644 --- a/app/lib/gen/strings_pl.g.dart +++ b/app/lib/gen/strings_pl.g.dart @@ -1026,8 +1026,6 @@ class _Translations$progressPage$remainingTime$pl extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// Użyj „h” w przypadku skrótu godzin i „m” w przypadku minut diff --git a/app/lib/gen/strings_pt_BR.g.dart b/app/lib/gen/strings_pt_BR.g.dart index 5e7e0359..81738f24 100644 --- a/app/lib/gen/strings_pt_BR.g.dart +++ b/app/lib/gen/strings_pt_BR.g.dart @@ -1110,8 +1110,6 @@ class Translations$progressPage$remainingTime$pt_BR extends Translations$progres // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// Use 'h' para abreviar horas e 'm' para minutos diff --git a/app/lib/gen/strings_pt_PT.g.dart b/app/lib/gen/strings_pt_PT.g.dart index c33d8088..f4a80386 100644 --- a/app/lib/gen/strings_pt_PT.g.dart +++ b/app/lib/gen/strings_pt_PT.g.dart @@ -1088,8 +1088,6 @@ class Translations$progressPage$remainingTime$pt_PT extends Translations$progres // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// Usar 'h' e 'm' para abreviar as palavras horas e minutos diff --git a/app/lib/gen/strings_ru.g.dart b/app/lib/gen/strings_ru.g.dart index 1529b8e2..849868d1 100644 --- a/app/lib/gen/strings_ru.g.dart +++ b/app/lib/gen/strings_ru.g.dart @@ -1103,8 +1103,6 @@ class _Translations$progressPage$remainingTime$ru extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// Используйте "h" для обозначения часов, а "m" для минут diff --git a/app/lib/gen/strings_sk.g.dart b/app/lib/gen/strings_sk.g.dart index fe87776c..1f89384f 100644 --- a/app/lib/gen/strings_sk.g.dart +++ b/app/lib/gen/strings_sk.g.dart @@ -1106,8 +1106,6 @@ class _Translations$progressPage$remainingTime$sk extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// Použiť „h“ pre skratku hodín a „m“ pre minúty diff --git a/app/lib/gen/strings_sv.g.dart b/app/lib/gen/strings_sv.g.dart index 29a6cf76..858bab1d 100644 --- a/app/lib/gen/strings_sv.g.dart +++ b/app/lib/gen/strings_sv.g.dart @@ -1077,8 +1077,6 @@ class _Translations$progressPage$remainingTime$sv extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// Använd ”h” som förkortning för timmar och ”m” för minuter diff --git a/app/lib/gen/strings_tr.g.dart b/app/lib/gen/strings_tr.g.dart index a8c0ab5a..c1f6a2b1 100644 --- a/app/lib/gen/strings_tr.g.dart +++ b/app/lib/gen/strings_tr.g.dart @@ -1026,8 +1026,6 @@ class _Translations$progressPage$remainingTime$tr extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// Saat kısaltması için 's', dakika kısaltması için 'd' kullanın diff --git a/app/lib/gen/strings_uk.g.dart b/app/lib/gen/strings_uk.g.dart index 17ed4b84..00e96074 100644 --- a/app/lib/gen/strings_uk.g.dart +++ b/app/lib/gen/strings_uk.g.dart @@ -1102,8 +1102,6 @@ class _Translations$progressPage$remainingTime$uk extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// Використовуйте «h» як скорочення для годин і «m» для хвилин diff --git a/app/lib/gen/strings_uz.g.dart b/app/lib/gen/strings_uz.g.dart index fc164858..1cb4fc42 100644 --- a/app/lib/gen/strings_uz.g.dart +++ b/app/lib/gen/strings_uz.g.dart @@ -992,8 +992,6 @@ class _Translations$progressPage$remainingTime$uz extends Translations$progressP // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; @override String hours({required Object h, required Object m}) => '${h}s ${m}d'; diff --git a/app/lib/gen/strings_zh_CN.g.dart b/app/lib/gen/strings_zh_CN.g.dart index e4a98996..660e19aa 100644 --- a/app/lib/gen/strings_zh_CN.g.dart +++ b/app/lib/gen/strings_zh_CN.g.dart @@ -1104,8 +1104,6 @@ class Translations$progressPage$remainingTime$zh_CN extends Translations$progres // Translations @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; - @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; /// 使用'h'作为小时缩写，使用'm'作为分钟缩写 diff --git a/app/lib/gen/strings_zh_TW.g.dart b/app/lib/gen/strings_zh_TW.g.dart index 38200657..03dc7c77 100644 --- a/app/lib/gen/strings_zh_TW.g.dart +++ b/app/lib/gen/strings_zh_TW.g.dart @@ -1016,8 +1016,6 @@ class Translations$progressPage$remainingTime$zh_TW extends Translations$progres @override String days({required Object d, required Object h, required Object m}) => '${d}天 ${h}小時 ${m}分鐘'; - @override - String seconds({required Object n, required Object ss}) => '${n}:${ss}'; @override String minutes({required Object n, required Object ss}) => '${n}:${ss}'; } diff --git a/app/lib/util/notification_strings.dart b/app/lib/util/notification_strings.dart index 93e35fdc..d4bdd1dc 100644 --- a/app/lib/util/notification_strings.dart +++ b/app/lib/util/notification_strings.dart @@ -8,7 +8,6 @@ import 'package:localsend_isolates/util/notification_strings.dart'; final notificationStrings = NotificationStrings( titleReceiving: t.progressPage.titleReceiving, titleSending: t.progressPage.titleSending, - remainingTimeSeconds: t.progressPage.remainingTime.seconds, remainingTimeMinutes: t.progressPage.remainingTime.minutes, remainingTimeHours: t.progressPage.remainingTime.hours, remainingTimeDays: t.progressPage.remainingTime.days, diff --git a/packages/localsend_isolates/lib/util/file_speed_helper.dart b/packages/localsend_isolates/lib/util/file_speed_helper.dart index f15cfd94..c1c52fb8 100644 --- a/packages/localsend_isolates/lib/util/file_speed_helper.dart +++ b/packages/localsend_isolates/lib/util/file_speed_helper.dart @@ -20,14 +20,12 @@ String getRemainingTime({ required NotificationStrings strings, }) { if (bytesPerSeconds == 0) { - return remainingBytes == 0 ? strings.remainingTimeSeconds(n: 0, ss: '00') : '∞'; + return remainingBytes == 0 ? strings.remainingTimeMinutes(n: 0, ss: '00') : '∞'; } final remainingTimeInSeconds = _getRemainingTime(bytesPerSeconds: bytesPerSeconds, remainingBytes: remainingBytes); - if (remainingTimeInSeconds < _secondsPerMinute) { - return strings.remainingTimeSeconds(n: 0, ss: remainingTimeInSeconds.toString().padLeft(2, '0')); - } else if (remainingTimeInSeconds < _secondsPerHour) { + if (remainingTimeInSeconds < _secondsPerHour) { final minutes = remainingTimeInSeconds ~/ _secondsPerMinute; final seconds = remainingTimeInSeconds % _secondsPerMinute; return strings.remainingTimeMinutes(n: minutes, ss: seconds.toString().padLeft(2, '0')); diff --git a/packages/localsend_isolates/lib/util/notification_strings.dart b/packages/localsend_isolates/lib/util/notification_strings.dart index 00d7a5e8..31ce25a8 100644 --- a/packages/localsend_isolates/lib/util/notification_strings.dart +++ b/packages/localsend_isolates/lib/util/notification_strings.dart @@ -10,22 +10,18 @@ class NotificationStrings { /// Title while files are being sent, e.g. "Sending files". final String titleSending; - /// Remaining time below a minute, e.g. "0:45". [ss] is zero padded. - final String Function({required Object n, required Object ss}) remainingTimeSeconds; - - /// Remaining time below an hour, e.g. "1:30". [ss] is zero padded. + /// Remaining time below an hour, e.g. "1:30" or "0:45". [ss] is zero padded. final String Function({required Object n, required Object ss}) remainingTimeMinutes; /// Remaining time below a day, e.g. "2h 5m". - final String Function({required Object h, required Object m}) remainingTimeHours; + final String Function({required num h, required num m}) remainingTimeHours; /// Remaining time of a day or more, e.g. "3d 4h 5m". - final String Function({required Object d, required Object h, required Object m}) remainingTimeDays; + final String Function({required num d, required num h, required num m}) remainingTimeDays; const NotificationStrings({ required this.titleReceiving, required this.titleSending, - required this.remainingTimeSeconds, required this.remainingTimeMinutes, required this.remainingTimeHours, required this.remainingTimeDays,