Skip to content

Commit 4bbbb97

Browse files
authored
Merge pull request #8349 from cakebaker/i10n_fix_newline_in_ftl_files
l10n: replace `\n` with a new line in ftl files
2 parents 004336d + 8a8e03e commit 4bbbb97

File tree

6 files changed

+24
-8
lines changed

6 files changed

+24
-8
lines changed

src/uu/chroot/locales/en-US.ftl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ chroot-error-command-not-found = failed to run command { $cmd }: { $err }
1414
chroot-error-groups-parsing-failed = --groups parsing failed
1515
chroot-error-invalid-group = invalid group: { $group }
1616
chroot-error-invalid-group-list = invalid group list: { $list }
17-
chroot-error-missing-newroot = Missing operand: NEWROOT\nTry '{ $util_name } --help' for more information.
17+
chroot-error-missing-newroot = Missing operand: NEWROOT
18+
Try '{ $util_name } --help' for more information.
1819
chroot-error-no-group-specified = no group specified for unknown uid: { $uid }
1920
chroot-error-no-such-user = invalid user
2021
chroot-error-no-such-group = invalid group

src/uu/chroot/locales/fr-FR.ftl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ chroot-error-command-not-found = échec de l'exécution de la commande { $cmd }
1414
chroot-error-groups-parsing-failed = échec de l'analyse de --groups
1515
chroot-error-invalid-group = groupe invalide : { $group }
1616
chroot-error-invalid-group-list = liste de groupes invalide : { $list }
17-
chroot-error-missing-newroot = Opérande manquant : NOUVRACINE\nEssayez '{ $util_name } --help' pour plus d'informations.
17+
chroot-error-missing-newroot = Opérande manquant : NOUVRACINE
18+
Essayez '{ $util_name } --help' pour plus d'informations.
1819
chroot-error-no-group-specified = aucun groupe spécifié pour l'uid inconnu : { $uid }
1920
chroot-error-no-such-user = utilisateur invalide
2021
chroot-error-no-such-group = groupe invalide

src/uu/du/locales/en-US.ftl

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,21 @@ du-help-time-style = show times using style STYLE: full-iso, long-iso, iso, +FOR
4747
# Error messages
4848
du-error-invalid-max-depth = invalid maximum depth { $depth }
4949
du-error-summarize-depth-conflict = summarizing conflicts with --max-depth={ $depth }
50-
du-error-invalid-time-style = invalid argument { $style } for 'time style'\nValid arguments are:\n- 'full-iso'\n- 'long-iso'\n- 'iso'\nTry '{ $help }' for more information.
50+
du-error-invalid-time-style = invalid argument { $style } for 'time style'
51+
Valid arguments are:
52+
- 'full-iso'
53+
- 'long-iso'
54+
- 'iso'
55+
Try '{ $help }' for more information.
5156
du-error-invalid-time-arg = 'birth' and 'creation' arguments for --time are not supported on this platform.
5257
du-error-invalid-glob = Invalid exclude syntax: { $error }
5358
du-error-cannot-read-directory = cannot read directory { $path }
5459
du-error-cannot-access = cannot access { $path }
5560
du-error-read-error-is-directory = { $file }: read error: Is a directory
5661
du-error-cannot-open-for-reading = cannot open '{ $file }' for reading: No such file or directory
5762
du-error-invalid-zero-length-file-name = { $file }:{ $line }: invalid zero-length file name
58-
du-error-extra-operand-with-files0-from = extra operand { $file }\nfile operands cannot be combined with --files0-from
63+
du-error-extra-operand-with-files0-from = extra operand { $file }
64+
file operands cannot be combined with --files0-from
5965
du-error-invalid-block-size-argument = invalid --{ $option } argument { $value }
6066
du-error-cannot-access-no-such-file = cannot access { $path }: No such file or directory
6167
du-error-printing-thread-panicked = Printing thread panicked.

src/uu/du/locales/fr-FR.ftl

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,21 @@ du-help-time-style = montrer les heures en utilisant le style STYLE : full-iso,
4747
# Messages d'erreur
4848
du-error-invalid-max-depth = profondeur maximale invalide { $depth }
4949
du-error-summarize-depth-conflict = la synthèse entre en conflit avec --max-depth={ $depth }
50-
du-error-invalid-time-style = argument invalide { $style } pour 'style de temps'\nLes arguments valides sont :\n- 'full-iso'\n- 'long-iso'\n- 'iso'\nEssayez '{ $help }' pour plus d'informations.
50+
du-error-invalid-time-style = argument invalide { $style } pour 'style de temps'
51+
Les arguments valides sont :
52+
- 'full-iso'
53+
- 'long-iso'
54+
- 'iso'
55+
Essayez '{ $help }' pour plus d'informations.
5156
du-error-invalid-time-arg = les arguments 'birth' et 'creation' pour --time ne sont pas supportés sur cette plateforme.
5257
du-error-invalid-glob = Syntaxe d'exclusion invalide : { $error }
5358
du-error-cannot-read-directory = impossible de lire le répertoire { $path }
5459
du-error-cannot-access = impossible d'accéder à { $path }
5560
du-error-read-error-is-directory = { $file } : erreur de lecture : C'est un répertoire
5661
du-error-cannot-open-for-reading = impossible d'ouvrir '{ $file }' en lecture : Aucun fichier ou répertoire de ce type
5762
du-error-invalid-zero-length-file-name = { $file }:{ $line } : nom de fichier de longueur zéro invalide
58-
du-error-extra-operand-with-files0-from = opérande supplémentaire { $file }\nles opérandes de fichier ne peuvent pas être combinées avec --files0-from
63+
du-error-extra-operand-with-files0-from = opérande supplémentaire { $file }
64+
les opérandes de fichier ne peuvent pas être combinées avec --files0-from
5965
du-error-invalid-block-size-argument = argument --{ $option } invalide { $value }
6066
du-error-cannot-access-no-such-file = impossible d'accéder à { $path } : Aucun fichier ou répertoire de ce type
6167
du-error-printing-thread-panicked = Le thread d'affichage a paniqué.

src/uu/nohup/locales/en-US.ftl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ nohup-after-help = If standard input is terminal, it'll be replaced with /dev/nu
1010
nohup-error-cannot-detach = Cannot detach from console
1111
nohup-error-cannot-replace = Cannot replace { $name }: { $err }
1212
nohup-error-open-failed = failed to open { $path }: { $err }
13-
nohup-error-open-failed-both = failed to open { $first_path }: { $first_err }\nfailed to open { $second_path }: { $second_err }
13+
nohup-error-open-failed-both = failed to open { $first_path }: { $first_err }
14+
failed to open { $second_path }: { $second_err }
1415
1516
# Status messages
1617
nohup-ignoring-input-appending-output = ignoring input and appending output to { $path }

src/uu/nohup/locales/fr-FR.ftl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ nohup-after-help = Si l'entrée standard est un terminal, elle sera remplacée p
1010
nohup-error-cannot-detach = Impossible de se détacher de la console
1111
nohup-error-cannot-replace = Impossible de remplacer { $name } : { $err }
1212
nohup-error-open-failed = échec de l'ouverture de { $path } : { $err }
13-
nohup-error-open-failed-both = échec de l'ouverture de { $first_path } : { $first_err }\néchec de l'ouverture de { $second_path } : { $second_err }
13+
nohup-error-open-failed-both = échec de l'ouverture de { $first_path } : { $first_err }
14+
échec de l'ouverture de { $second_path } : { $second_err }
1415
1516
# Messages de statut
1617
nohup-ignoring-input-appending-output = entrée ignorée et sortie ajoutée à { $path }

0 commit comments

Comments
 (0)