From 1e6aec51512bca7743b3fb35d282a180175f26c3 Mon Sep 17 00:00:00 2001 From: mtkennerly Date: Sat, 20 Aug 2022 09:03:23 +0800 Subject: [PATCH] Minimize formtting concerns in translations --- lang/ar-SA.ftl | 36 ++++++++---------------------- lang/de-DE.ftl | 36 ++++++++---------------------- lang/en-US.ftl | 36 ++++++++---------------------- lang/es-ES.ftl | 38 +++++++++---------------------- lang/fil-PH.ftl | 38 +++++++++---------------------- lang/it-IT.ftl | 36 ++++++++---------------------- lang/pl-PL.ftl | 38 +++++++++---------------------- lang/pt-BR.ftl | 38 +++++++++---------------------- lang/zh-CN.ftl | 36 ++++++++---------------------- src/cli.rs | 4 ++-- src/lang.rs | 59 +++++++++++++++++++++++++++++++++---------------- src/prelude.rs | 4 ---- 12 files changed, 127 insertions(+), 272 deletions(-) diff --git a/lang/ar-SA.ftl b/lang/ar-SA.ftl index b09f2996..36410f56 100644 --- a/lang/ar-SA.ftl +++ b/lang/ar-SA.ftl @@ -1,6 +1,11 @@ ludusavi = Ludusavi language = اللغة font = الخط +game-name = Name +total-games = Games +file-size = Size +file-location = Location +overall = Overall cli-backup-target-already-exists = النسخ الإحتياطي موجود بالفعل ( { $path } ) إما أن تختار مسارا مختلفا أو تحذفه باستخدام --force. cli-unrecognized-games = لا توجد معلومات عن هذه الألعاب: cli-confirm-restoration = هل تريد الاستعادة من { $path }؟ @@ -13,17 +18,6 @@ badge-ignored = تجاهل badge-redirected-from = من: { $path } some-entries-failed = فشلت بعض الإدخالات في المعالجة؛ ابحث عن { badge-failed } في الإخراج للحصول على التفاصيل. تحقق مرة أخرى مما إذا كان يمكنك الوصول إلى هذه الملفات أو ما إذا كانت مساراتها طويلة جدا. cli-game-line-item-redirected = أعيد توجيهه من: { $path } -cli-summary = - .succeeded = - عموما: - الألعاب: { $processed-games } - الحجم: { $processed-size } - الموقع: { $path } - .failed = - عموما: - الألعاب: { $processed-games } من اصل { $total-games } - الحجم: { $processed-size } من اصل { $total-size } - الموقع: { $path } button-backup = النسخ الاحتياطي button-preview = معاينة button-restore = استعادة @@ -75,10 +69,6 @@ field-redirect-source = .placeholder = Source (original location) field-redirect-target = .placeholder = Target (new location) -field-custom-game-name = - .placeholder = Name -field-search-game-name = - .placeholder = Name field-backup-excluded-items = Backup exclusions: field-retention-full = Full: field-retention-differential = Differential: @@ -122,21 +112,13 @@ consider-doing-a-preview = are no surprises. confirm-backup = Are you sure you want to proceed with the backup? { $path-action -> - [merge] New save data will be merged into the target folder - [recreate] The target folder will be deleted and recreated from scratch - *[create] The target folder will be created - }: - - { $path } - - { consider-doing-a-preview } + [merge] New save data will be merged into the target folder: + [recreate] The target folder will be deleted and recreated from scratch: + *[create] The target folder will be created: + } confirm-restore = Are you sure you want to proceed with the restoration? This will overwrite any current files with the backups from here: - - { $path } - - { consider-doing-a-preview } confirm-add-missing-roots = Add these roots? no-missing-roots = No additional roots found. preparing-backup-target = Preparing backup directory... diff --git a/lang/de-DE.ftl b/lang/de-DE.ftl index 24bc17e8..b3010911 100644 --- a/lang/de-DE.ftl +++ b/lang/de-DE.ftl @@ -1,6 +1,11 @@ ludusavi = Ludusavi language = Sprache font = Schriftart +game-name = Name +total-games = Spiele +file-size = Größe +file-location = Ort +overall = Insgesamt cli-backup-target-already-exists = Das Sicherungsziel exitiert bereits ( { $path } ). Wähle einen anderen Ort mit --path oder lösche ihn mit --force. cli-unrecognized-games = Keine Informationen für diese Spiele: cli-confirm-restoration = Wollen Sie von { $path } wiederherstellen? @@ -13,17 +18,6 @@ badge-ignored = IGNORIERT badge-redirected-from = VON: { $path } some-entries-failed = Einige Einträge konnten nicht verarbeitet werden; Suche nach { badge-failed } in der Ausgabe für Details. Überprüfen Sie, ob Sie auf diese Dateien zugreifen können oder ob ihre Pfade sehr lang sind. cli-game-line-item-redirected = Umgeleitet von: { $path } -cli-summary = - .succeeded = - Insgesamt: - Spiele: { $processed-games } - Größe: { $processed-size } - Ort: { $path } - .failed = - Insgesamt: - Spiele: { $processed-games } von { $total-games } - Größe: { $processed-size } von { $total-size } - Ort: { $path } button-backup = Sichern button-preview = Vorschau button-restore = Wiederherstellen @@ -75,10 +69,6 @@ field-redirect-source = .placeholder = Quelle (Originalort) field-redirect-target = .placeholder = Ziel (neuer Ort) -field-custom-game-name = - .placeholder = Name -field-search-game-name = - .placeholder = Name field-backup-excluded-items = Sicherungsausschlüsse: field-retention-full = Komplett: field-retention-differential = Differenz: @@ -118,21 +108,13 @@ consider-doing-a-preview = keine Überraschungen gibt. confirm-backup = Sind Sie sicher, dass Sie die Sicherung fortsetzen möchten? { $path-action -> - [merge] Neue Speicherdaten werden in den Zielordner zusammengeführt - [recreate] Der Zielordner wird gelöscht und von Grund auf neu erstellt, - *[create] Der Zielordner wird erstellt - }: - - { $path } - - { consider-doing-a-preview } + [merge] Neue Speicherdaten werden in den Zielordner zusammengeführt: + [recreate] Der Zielordner wird gelöscht und von Grund auf neu erstellt: + *[create] Der Zielordner wird erstellt: + } confirm-restore = Sind Sie sicher, dass Sie die Wiederherstellung fortsetzen möchten? Dies überschreibt alle aktuellen Dateien mit den Sicherungen von hier: - - { $path } - - { consider-doing-a-preview } confirm-add-missing-roots = Diese Wurzel hinzufügen? no-missing-roots = Keine zusätzlichen Wurzeln gefunden. preparing-backup-target = Sicherungsverzeichnis wird vorbereitet... diff --git a/lang/en-US.ftl b/lang/en-US.ftl index 43441bc2..18dc5464 100644 --- a/lang/en-US.ftl +++ b/lang/en-US.ftl @@ -2,6 +2,11 @@ ludusavi = Ludusavi language = Language font = Font +game-name = Name +total-games = Games +file-size = Size +file-location = Location +overall = Overall cli-backup-target-already-exists = The backup target already exists ( {$path} ). Either choose a different --path or delete it with --force. cli-unrecognized-games = No info for these games: @@ -18,17 +23,6 @@ badge-redirected-from = FROM: {$path} some-entries-failed = Some entries failed to process; look for {badge-failed} in the output for details. Double check whether you can access those files or whether their paths are very long. cli-game-line-item-redirected = Redirected from: {$path} -cli-summary = - .succeeded = - Overall: - Games: {$processed-games} - Size: {$processed-size} - Location: {$path} - .failed = - Overall: - Games: {$processed-games} of {$total-games} - Size: {$processed-size} of {$total-size} - Location: {$path} button-backup = Back up button-preview = Preview @@ -83,10 +77,6 @@ field-redirect-source = .placeholder = Source (original location) field-redirect-target = .placeholder = Target (new location) -field-custom-game-name = - .placeholder = Name -field-search-game-name = - .placeholder = Name field-backup-excluded-items = Backup exclusions: field-retention-full = Full: field-retention-differential = Differential: @@ -138,23 +128,15 @@ consider-doing-a-preview = confirm-backup = Are you sure you want to proceed with the backup? {$path-action -> - [merge] New save data will be merged into the target folder - [recreate] The target folder will be deleted and recreated from scratch - *[create] The target folder will be created - }: - - {$path} - - {consider-doing-a-preview} + [merge] New save data will be merged into the target folder: + [recreate] The target folder will be deleted and recreated from scratch: + *[create] The target folder will be created: + } confirm-restore = Are you sure you want to proceed with the restoration? This will overwrite any current files with the backups from here: - {$path} - - {consider-doing-a-preview} - confirm-add-missing-roots = Add these roots? no-missing-roots = No additional roots found. preparing-backup-target = Preparing backup directory... diff --git a/lang/es-ES.ftl b/lang/es-ES.ftl index 8bb44737..61211f94 100644 --- a/lang/es-ES.ftl +++ b/lang/es-ES.ftl @@ -1,6 +1,11 @@ ludusavi = Ludusavi language = Idioma font = Fuente +game-name = Nombre +total-games = Juegos +file-size = Tamaño +file-location = Ubicación +overall = Global cli-backup-target-already-exists = El objetivo de la copia de seguridad ya existe ( { $path } ). Elija un --path diferente o borre con --force. cli-unrecognized-games = No hay información para estos juegos: cli-confirm-restoration = ¿Quieres restaurar desde { $path }? @@ -13,17 +18,6 @@ badge-ignored = IGNORADO badge-redirected-from = DESDE: { $path } some-entries-failed = Algunas entradas no se han podido procesar; busca { badge-failed } en la salida para ver los detalles. Comprueba si puedes acceder a esos archivos o si sus rutas son muy largas. cli-game-line-item-redirected = Redirigido de: { $path } -cli-summary = - .succeeded = - Global: - Juegos: { $processed-games } - Tamaño: { $processed-size } - Ubicación: { $path } - .failed = - Global: - Juegos: { $processed-games } de { $total-games } - Tamaño: { $processed-size } de { $total-size } - Ubicación: { $path } button-backup = Respaldar button-preview = Previsualizar button-restore = Restaurar @@ -75,10 +69,6 @@ field-redirect-source = .placeholder = Origen (ubicación original) field-redirect-target = .placeholder = Destino (nueva ubicación) -field-custom-game-name = - .placeholder = Nombre -field-search-game-name = - .placeholder = Nombre field-backup-excluded-items = Backup exclusions: field-retention-full = Full: field-retention-differential = Differential: @@ -95,7 +85,7 @@ store-uplay = Uplay store-other-home = Carpeta Home store-other-wine = Prefijo de Wine store-other = Otro -sort-name = Name +sort-name = Nombre sort-size = Size sort-reversed = Reversed backup-format-simple = Simple @@ -118,21 +108,13 @@ consider-doing-a-preview = no haya sorpresas. confirm-backup = ¿Estás seguro de que quieres proceder con la copia de seguridad? { $path-action -> - [merge] Los nuevos datos guardados se combinaran en la carpeta de destino - [recreate] La carpeta de destino será eliminada y recreada desde cero - *[create] Se creará la carpeta de destino - }: - - { $path } - - { consider-doing-a-preview } + [merge] Los nuevos datos guardados se combinaran en la carpeta de destino: + [recreate] La carpeta de destino será eliminada y recreada desde cero: + *[create] Se creará la carpeta de destino: + } confirm-restore = ¿Estás seguro de que deseas continuar con la restauración? Esto sobrescribirá cualquier archivo actual con las copias de seguridad desde aquí: - - { $path } - - { consider-doing-a-preview } confirm-add-missing-roots = Add these roots? no-missing-roots = No additional roots found. preparing-backup-target = Preparing backup directory... diff --git a/lang/fil-PH.ftl b/lang/fil-PH.ftl index 4d0ec2e5..fc2ea65f 100644 --- a/lang/fil-PH.ftl +++ b/lang/fil-PH.ftl @@ -1,6 +1,11 @@ ludusavi = Ludusavi language = Wika font = Font +game-name = Pamagat +total-games = Games +file-size = Sukat +file-location = Lokasyon +overall = Buod cli-backup-target-already-exists = Mayroon siyang backup target ( { $path } ). Pumili ng ibang --path o tanggalin ito gamit ang --force. cli-unrecognized-games = Wala pang impormasyon para sa mga games na ito: cli-confirm-restoration = Gusto mo bang i-restore sa { $path }? @@ -13,17 +18,6 @@ badge-ignored = DEDMA badge-redirected-from = MULA SA: { $path } some-entries-failed = Mayroon mali sa proseso; hanapin mo ng { badge-failed } sa output. Paki-tiyak kung kaya mong buksan ang mga files o kung masyado mahaba ang mga paths. cli-game-line-item-redirected = Na-redirect mula sa: { $path } -cli-summary = - .succeeded = - Buod: - Games: { $processed-games } - Sukat: { $processed-size } - Lokasyon: { $path } - .failed = - Buod: - Games: { $processed-games } sa { $total-games } - Sukat: { $processed-size } sa { $total-size } - Lokasyon: { $path } button-backup = Back up button-preview = Preview button-restore = Restore @@ -75,10 +69,6 @@ field-redirect-source = .placeholder = Source (orihinal na lokasyon) field-redirect-target = .placeholder = Target (bagong lokasyon) -field-custom-game-name = - .placeholder = Pamagat -field-search-game-name = - .placeholder = Pamagat field-backup-excluded-items = Backup exclusions: field-retention-full = Full: field-retention-differential = Differential: @@ -95,7 +85,7 @@ store-uplay = Uplay store-other-home = Home folder store-other-wine = Wine prefix store-other = Other -sort-name = Name +sort-name = Pamagat sort-size = Size sort-reversed = Reversed backup-format-simple = Simple @@ -116,21 +106,13 @@ consider-doing-a-preview = are no surprises. confirm-backup = Are you sure you want to proceed with the backup? { $path-action -> - [merge] New save data will be merged into the target folder - [recreate] The target folder will be deleted and recreated from scratch - *[create] The target folder will be created - }: - - { $path } - - { consider-doing-a-preview } + [merge] New save data will be merged into the target folder: + [recreate] The target folder will be deleted and recreated from scratch: + *[create] The target folder will be created: + } confirm-restore = Are you sure you want to proceed with the restoration? This will overwrite any current files with the backups from here: - - { $path } - - { consider-doing-a-preview } confirm-add-missing-roots = Add these roots? no-missing-roots = No additional roots found. preparing-backup-target = Preparing backup directory... diff --git a/lang/it-IT.ftl b/lang/it-IT.ftl index 24dda062..cf13cafd 100644 --- a/lang/it-IT.ftl +++ b/lang/it-IT.ftl @@ -1,6 +1,11 @@ ludusavi = Ludusavi language = Lingua font = Font +game-name = Nome +total-games = Giochi +file-size = Dimensione +file-location = Posizione +overall = Nel complesso cli-backup-target-already-exists = Il target di backup esiste già ( { $path } ). Scegli un altro --path o eliminalo con --force. cli-unrecognized-games = Nessuna informazione per questi giochi: cli-confirm-restoration = Vuoi ripristinare da { $path }? @@ -13,17 +18,6 @@ badge-ignored = IGNORATO badge-redirected-from = DA: { $path } some-entries-failed = Alcune voci non sono riuscite a elaborare; cerca { badge-failed } nell'output per i dettagli. Controlla se è possibile accedere a questi file o se i loro percorsi sono molto lunghi. cli-game-line-item-redirected = Reindirizzato da: { $path } -cli-summary = - .succeeded = - Nel complesso: - Giochi: { $processed-games } - Dimensione: { $processed-size } - Posizione: { $path } - .failed = - Complessivo: - Giochi: { $processed-games } di { $total-games } - Dimensione: { $processed-size } di { $total-size } - Posizione: { $path } button-backup = Backup button-preview = Anteprima button-restore = Ripristina @@ -75,10 +69,6 @@ field-redirect-source = .placeholder = Origine (posizione originale) field-redirect-target = .placeholder = Destinazione (nuova posizione) -field-custom-game-name = - .placeholder = Nome -field-search-game-name = - .placeholder = Nome field-backup-excluded-items = Esclusioni dal backup: field-retention-full = Pieno: field-retention-differential = Differenziale: @@ -121,21 +111,13 @@ consider-doing-a-preview = sorprese. confirm-backup = Sei sicuro di voler procedere con il backup? { $path-action -> - [merge] Nuovi dati di salvataggio verranno uniti nella cartella di destinazione - [recreate] La cartella di destinazione verrà eliminata e ricreata da zero - *[create] La cartella di destinazione verrà creata - }: - - { $path } - - { consider-doing-a-preview } + [merge] Nuovi dati di salvataggio verranno uniti nella cartella di destinazione: + [recreate] La cartella di destinazione verrà eliminata e ricreata da zero: + *[create] La cartella di destinazione verrà creata: + } confirm-restore = Sei sicuro di voler procedere con il ripristino? Questo sovrascriverà tutti i file attuali con i backup da qui: - - { $path } - - { consider-doing-a-preview } confirm-add-missing-roots = Aggiungere queste radici? no-missing-roots = Nessuna radice aggiuntiva trovata. preparing-backup-target = Preparazione directory di backup... diff --git a/lang/pl-PL.ftl b/lang/pl-PL.ftl index debfcef8..7c24253c 100644 --- a/lang/pl-PL.ftl +++ b/lang/pl-PL.ftl @@ -1,6 +1,11 @@ ludusavi = Ludusavi language = Język font = Czcionka +game-name = Nazwa +total-games = Gry +file-size = Rozmiar +file-location = Lokalizacja +overall = W sumie cli-backup-target-already-exists = Docelowa kopia zapasowa już istnieje ( { $path } ). Wybierz inną ścieżkę --path lub usuń kopię poprzez --force. cli-unrecognized-games = Brak informacji dla tych gier: cli-confirm-restoration = Czy chcesz przywrócić z { $path }? @@ -13,17 +18,6 @@ badge-ignored = ZIGNOROWANE badge-redirected-from = Z: { $path } some-entries-failed = Błąd przetwarzania niektórych elementów; sprawdź { badge-failed } w anych wyjściowych po więcej szczegółów. Upewnij się, że masz dostęp do tych plików oraz, czy ich ścieżki są zbyt długie. cli-game-line-item-redirected = Przekierowano z: { $path } -cli-summary = - .succeeded = - W sumie: - Gry: { $processed-games } - Rozmiar: { $processed-size } - Lokalizacja: { $path } - .failed = - W sumie: - Gry: { $processed-games } z { $total-games } - Rozmiar: { $processed-size } z { $total-size } - Lokalizacja: { $path } button-backup = Utwórz kopię button-preview = Podgląd button-restore = Przywróć @@ -75,10 +69,6 @@ field-redirect-source = .placeholder = Źródło (oryginalna lokalizacja) field-redirect-target = .placeholder = Cel (nowa lokalizacja) -field-custom-game-name = - .placeholder = Nazwa -field-search-game-name = - .placeholder = Nazwa field-backup-excluded-items = Backup exclusions: field-retention-full = Full: field-retention-differential = Differential: @@ -95,7 +85,7 @@ store-uplay = Uplay store-other-home = Folder główny store-other-wine = Prefiks Wine store-other = Pozostałe -sort-name = Name +sort-name = Nazwa sort-size = Size sort-reversed = Reversed backup-format-simple = Simple @@ -110,21 +100,13 @@ explanation-for-exclude-store-screenshots = Nie zawieraj w kopiach zapasowych zr consider-doing-a-preview = Jeśli jeszcze tego nie zrobiono, rozważ wykonanie pierwszego testu, aby zobaczyć, czy wszystko działa. confirm-backup = Czy na pewno chcesz kontynuować z kopią zapasową? { $path-action -> - [merge] Nowe dane zapisu zostaną scalone z folderem docelowym - [recreate] Folder docelowy zostanie usunięty i odtworzony od zera - *[create] Folder docelowy zostanie utworzony - }: - - { $path } - - { consider-doing-a-preview } + [merge] Nowe dane zapisu zostaną scalone z folderem docelowym: + [recreate] Folder docelowy zostanie usunięty i odtworzony od zera: + *[create] Folder docelowy zostanie utworzony: + } confirm-restore = Czy na pewno chcesz kontynuować przywracanie? Jakiekolwiek bieżące pliki z kopią zapasową zostaną zastąpione: - - { $path } - - { consider-doing-a-preview } confirm-add-missing-roots = Czy to są katalogi główne? no-missing-roots = Nie znaleziono więcej katalogów głównych. preparing-backup-target = Preparing backup directory... diff --git a/lang/pt-BR.ftl b/lang/pt-BR.ftl index 19be9c66..3fa2cb90 100644 --- a/lang/pt-BR.ftl +++ b/lang/pt-BR.ftl @@ -1,6 +1,11 @@ ludusavi = Ludusavi language = Idioma font = Fonte +game-name = Nome +total-games = Jogos +file-size = Tamanho +file-location = Localização +overall = Geral cli-backup-target-already-exists = O alvo da cópia de segurança já existe ( { $path } ). Escolha um --path diferente ou exclua-o com --force. cli-unrecognized-games = Sem informações para estes jogos: cli-confirm-restoration = Você deseja restaurar a partir de { $path }? @@ -13,17 +18,6 @@ badge-ignored = IGNORADO badge-redirected-from = DE: { $path } some-entries-failed = Algumas entradas não conseguiram processar; procure por { badge-failed } na saída para mais detalhes. Verifique se você pode acessar esses arquivos ou se os caminhos deles são muito longos. cli-game-line-item-redirected = Redirecionado de: { $path } -cli-summary = - .succeeded = - Geral: - Jogos: { $processed-games } - Tamanho: { $processed-size } - Localização: { $path } - .failed = - Geral: - Jogos: { $processed-games } de { $total-games } - Tamanho: { $processed-size } de { $total-size } - Localização: { $path } button-backup = Fazer backup button-preview = Visualizar button-restore = Restaurar @@ -75,10 +69,6 @@ field-redirect-source = .placeholder = Fonte (local original) field-redirect-target = .placeholder = Alvo (novo local) -field-custom-game-name = - .placeholder = Nome -field-search-game-name = - .placeholder = Nome field-backup-excluded-items = Backup exclusions: field-retention-full = Full: field-retention-differential = Differential: @@ -95,7 +85,7 @@ store-uplay = Uplay store-other-home = Pasta padrão store-other-wine = Prefixo Wine store-other = Outro -sort-name = Name +sort-name = Nome sort-size = Size sort-reversed = Reversed backup-format-simple = Simple @@ -122,21 +112,13 @@ consider-doing-a-preview = não há surpresas. confirm-backup = Tem certeza que deseja prosseguir com o backup? { $path-action -> - [merge] Novos dados salvos serão mesclados na pasta de destino - [recreate] A pasta de destino será excluída e recriada do zero - *[create] A pasta de destino será criada - }: - - { $path } - - { consider-doing-a-preview } + [merge] Novos dados salvos serão mesclados na pasta de destino: + [recreate] A pasta de destino será excluída e recriada do zero: + *[create] A pasta de destino será criada: + } confirm-restore = Tem certeza que deseja prosseguir com a restauração? Isto irá sobrescrever qualquer arquivo atual com os backups aqui: - - { $path } - - { consider-doing-a-preview } confirm-add-missing-roots = Add these roots? no-missing-roots = No additional roots found. preparing-backup-target = Preparing backup directory... diff --git a/lang/zh-CN.ftl b/lang/zh-CN.ftl index 40bc474e..77fbe268 100644 --- a/lang/zh-CN.ftl +++ b/lang/zh-CN.ftl @@ -1,6 +1,11 @@ ludusavi = 录读加一 language = 语言 font = 字体 +game-name = Name +total-games = 游戏 +file-size = 大小 +file-location = 位置 +overall = 总体 cli-backup-target-already-exists = 备份目标已存在于 ( { $path } )。要么选择一个不同的 --path 参数，要么使用 --force 参数删除它。 cli-unrecognized-games = 没有这些游戏的信息： cli-confirm-restoration = 您想从 { $path } 恢复吗？ @@ -13,17 +18,6 @@ badge-ignored = 已忽略 badge-redirected-from = 来自：{ $path } some-entries-failed = 有些条目无法处理；详情请参阅输出中的 { badge-failed }。请仔细检查您是否可以访问这些文件，或者它们的路径是否太长。 cli-game-line-item-redirected = 重定向自：{ $path } -cli-summary = - .succeeded = - 总体： - 游戏：{ $processed-games } - 大小：{ $processed-size } - 位置：{ $path } - .failed = - 总体： - 游戏：{ $processed-games }，共 { $total-games } - 大小：{ $processed-size }，共 { $total-size } - 位置：{ $path } button-backup = 备份 button-preview = 预览 button-restore = 恢复 @@ -67,10 +61,6 @@ field-redirect-source = .placeholder = Source (original location) field-redirect-target = .placeholder = Target (new location) -field-custom-game-name = - .placeholder = Name -field-search-game-name = - .placeholder = Name field-backup-excluded-items = Backup exclusions: field-retention-full = Full: field-retention-differential = Differential: @@ -114,21 +104,13 @@ consider-doing-a-preview = are no surprises. confirm-backup = Are you sure you want to proceed with the backup? { $path-action -> - [merge] New save data will be merged into the target folder - [recreate] The target folder will be deleted and recreated from scratch - *[create] The target folder will be created - }: - - { $path } - - { consider-doing-a-preview } + [merge] New save data will be merged into the target folder: + [recreate] The target folder will be deleted and recreated from scratch: + *[create] The target folder will be created: + } confirm-restore = Are you sure you want to proceed with the restoration? This will overwrite any current files with the backups from here: - - { $path } - - { consider-doing-a-preview } confirm-add-missing-roots = Add these roots? no-missing-roots = No additional roots found. preparing-backup-target = Preparing backup directory... diff --git a/src/cli.rs b/src/cli.rs index 6a1168ff..6ef72ccf 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -1268,8 +1268,8 @@ foo [100.00 KiB]: - HKEY_CURRENT_USER/Key2 Overall: - Games: 1 of 1 - Size: 100.00 KiB of 150.00 KiB + Games: 1 + Size: 100.00 KiB / 150.00 KiB Location: /dev/null "# .trim() diff --git a/src/lang.rs b/src/lang.rs index bd9494b0..5ddf6734 100644 --- a/src/lang.rs +++ b/src/lang.rs @@ -337,18 +337,28 @@ impl Translator { } pub fn cli_summary(&self, status: &OperationStatus, location: &StrictPath) -> String { - let mut args = FluentArgs::new(); - args.set(PATH, location.render()); - args.set(TOTAL_GAMES, status.total_games); - args.set(PROCESSED_GAMES, status.processed_games); - args.set(TOTAL_SIZE, self.adjusted_size(status.total_bytes)); - args.set(PROCESSED_SIZE, self.adjusted_size(status.processed_bytes)); - - if status.processed_all() { - translate_args("cli-summary.succeeded", &args) - } else { - translate_args("cli-summary.failed", &args) - } + format!( + "{}:\n {}: {}\n {}: {}\n {}: {}", + translate("overall"), + translate("total-games"), + if status.processed_all_games() { + status.processed_games.to_string() + } else { + format!("{} / {}", status.processed_games, status.total_games) + }, + translate("file-size"), + if status.processed_all_bytes() { + self.adjusted_size(status.processed_bytes) + } else { + format!( + "{} / {}", + self.adjusted_size(status.processed_bytes), + self.adjusted_size(status.total_bytes) + ) + }, + translate("file-location"), + location.render(), + ) } pub fn backup_button(&self) -> String { @@ -606,11 +616,11 @@ impl Translator { } pub fn custom_game_name_placeholder(&self) -> String { - translate("field-custom-game-name.placeholder") + translate("game-name") } pub fn search_game_name_placeholder(&self) -> String { - translate("field-search-game-name.placeholder") + translate("game-name") } pub fn explanation_for_exclude_other_os_data(&self) -> String { @@ -641,9 +651,12 @@ impl Translator { translate("field-backup-compression") } + fn consider_doing_a_preview(&self) -> String { + translate("consider-doing-a-preview") + } + pub fn modal_confirm_backup(&self, target: &StrictPath, target_exists: bool, merge: bool) -> String { let mut args = FluentArgs::new(); - args.set(PATH, target.render()); args.set( PATH_ACTION, match (target_exists, merge) { @@ -652,12 +665,20 @@ impl Translator { (true, true) => "merge", }, ); - translate_args("confirm-backup", &args) + format!( + "{}\n\n{}\n\n{}", + translate_args("confirm-backup", &args), + target.render(), + self.consider_doing_a_preview(), + ) } pub fn modal_confirm_restore(&self, source: &StrictPath) -> String { - let mut args = FluentArgs::new(); - args.set(PATH, source.render()); - translate_args("confirm-restore", &args) + format!( + "{}\n\n{}\n\n{}", + translate("confirm-restore"), + source.render(), + self.consider_doing_a_preview(), + ) } } diff --git a/src/prelude.rs b/src/prelude.rs index 1d2c8e78..84725f1f 100644 --- a/src/prelude.rs +++ b/src/prelude.rs @@ -225,10 +225,6 @@ impl OperationStatus { } } - pub fn processed_all(&self) -> bool { - self.processed_all_games() && self.processed_all_bytes() - } - pub fn processed_all_games(&self) -> bool { self.total_games == self.processed_games }