diff --git a/src/uu/cp/locales/en-US.ftl b/src/uu/cp/locales/en-US.ftl index 36ab60f25f0..7c47a91b4d2 100644 --- a/src/uu/cp/locales/en-US.ftl +++ b/src/uu/cp/locales/en-US.ftl @@ -109,10 +109,8 @@ cp-debug-enum-seek-hole-zeros = SEEK_HOLE + zeros cp-warning-source-specified-more-than-once = source { $file_type } { $source } specified more than once # Verbose and debug messages -cp-verbose-copied = { $source } -> { $dest } cp-debug-skipped = skipped { $path } cp-verbose-removed = removed { $path } -cp-verbose-created-directory = { $source } -> { $dest } cp-debug-copy-offload = copy offload: { $offload }, reflink: { $reflink }, sparse detection: { $sparse } # Prompts diff --git a/src/uu/cp/locales/fr-FR.ftl b/src/uu/cp/locales/fr-FR.ftl index 4a2ed8baf90..b9d7450016b 100644 --- a/src/uu/cp/locales/fr-FR.ftl +++ b/src/uu/cp/locales/fr-FR.ftl @@ -108,10 +108,8 @@ cp-debug-enum-seek-hole-zeros = SEEK_HOLE + zéros cp-warning-source-specified-more-than-once = { $file_type } source { $source } spécifié plus d'une fois # Messages verbeux et de débogage -cp-verbose-copied = { $source } -> { $dest } cp-debug-skipped = { $path } ignoré cp-verbose-removed = supprimé { $path } -cp-verbose-created-directory = { $source } -> { $dest } cp-debug-copy-offload = copy offload : { $offload }, reflink : { $reflink }, sparse detection : { $sparse } # Invites diff --git a/src/uu/cp/src/cp.rs b/src/uu/cp/src/cp.rs index c3ca44e7696..9f023a3937f 100644 --- a/src/uu/cp/src/cp.rs +++ b/src/uu/cp/src/cp.rs @@ -2213,10 +2213,7 @@ fn print_paths(parents: bool, source: &Path, dest: &Path) { // a/b -> d/a/b // for (x, y) in aligned_ancestors(source, dest) { - println!( - "{}", - translate!("cp-verbose-created-directory", "source" => x.display(), "dest" => y.display()) - ); + println!("{} -> {}", x.display(), y.display()); } } diff --git a/src/uu/env/locales/en-US.ftl b/src/uu/env/locales/en-US.ftl index a460c69fba4..d2cdd15d140 100644 --- a/src/uu/env/locales/en-US.ftl +++ b/src/uu/env/locales/en-US.ftl @@ -28,7 +28,6 @@ env-error-unexpected-number = Unexpected character: '{ $char }', expected variab env-error-expected-brace-or-colon = Unexpected character: '{ $char }', expected a closing brace ('{"}"}') or colon (':') at position { $position } env-error-cannot-specify-null-with-command = cannot specify --null (-0) with command env-error-invalid-signal = { $signal }: invalid signal -env-error-config-file = { $file }: { $error } env-error-variable-name-issue = variable name issue (at { $position }): { $error } env-error-generic = Error: { $error } env-error-no-such-file = { $program }: No such file or directory diff --git a/src/uu/env/locales/fr-FR.ftl b/src/uu/env/locales/fr-FR.ftl index b3fa0c2fbe6..78351e0da4b 100644 --- a/src/uu/env/locales/fr-FR.ftl +++ b/src/uu/env/locales/fr-FR.ftl @@ -29,7 +29,6 @@ env-error-expected-brace-or-colon = Caractère inattendu : '{ $char }', accolade env-error-cannot-specify-null-with-command = impossible de spécifier --null (-0) avec une commande env-error-invalid-signal = { $signal } : signal invalide -env-error-config-file = { $file } : { $error } env-error-variable-name-issue = problème de nom de variable (à { $position }) : { $error } env-error-generic = Erreur : { $error } env-error-no-such-file = { $program } : Aucun fichier ou répertoire de ce type diff --git a/src/uu/env/src/env.rs b/src/uu/env/src/env.rs index 7b36c7c6355..3343544253e 100644 --- a/src/uu/env/src/env.rs +++ b/src/uu/env/src/env.rs @@ -319,12 +319,8 @@ fn load_config_file(opts: &mut Options) -> UResult<()> { Ini::load_from_file(file) }; - let conf = conf.map_err(|e| { - USimpleError::new( - 1, - translate!("env-error-config-file", "file" => file.maybe_quote(), "error" => e), - ) - })?; + let conf = + conf.map_err(|e| USimpleError::new(1, format!("{}: {e}", file.maybe_quote())))?; for (_, prop) in &conf { // ignore all INI section lines (treat them as comments) diff --git a/src/uu/install/locales/en-US.ftl b/src/uu/install/locales/en-US.ftl index a9a0d5395d7..34189d86333 100644 --- a/src/uu/install/locales/en-US.ftl +++ b/src/uu/install/locales/en-US.ftl @@ -57,5 +57,4 @@ install-warning-compare-ignored = the --compare (-C) option is ignored when you install-verbose-creating-directory = creating directory { $path } install-verbose-creating-directory-step = install: creating directory { $path } install-verbose-removed = removed { $path } -install-verbose-copy = { $from } -> { $to } install-verbose-backup = (backup: { $backup }) diff --git a/src/uu/install/locales/fr-FR.ftl b/src/uu/install/locales/fr-FR.ftl index 3d5f2feddee..054cc292eb2 100644 --- a/src/uu/install/locales/fr-FR.ftl +++ b/src/uu/install/locales/fr-FR.ftl @@ -57,5 +57,4 @@ install-warning-compare-ignored = l'option --compare (-C) est ignorée quand un install-verbose-creating-directory = création du répertoire { $path } install-verbose-creating-directory-step = install : création du répertoire { $path } install-verbose-removed = supprimé { $path } -install-verbose-copy = { $from } -> { $to } install-verbose-backup = (sauvegarde : { $backup }) diff --git a/src/uu/install/src/install.rs b/src/uu/install/src/install.rs index 596d9ebf35d..f19f8aca249 100644 --- a/src/uu/install/src/install.rs +++ b/src/uu/install/src/install.rs @@ -1106,11 +1106,7 @@ fn finalize_installed_file( } if b.verbose { - write!( - stdout(), - "{}", - translate!("install-verbose-copy", "from" => from.quote(), "to" => to.quote()) - )?; + write!(stdout(), "{} -> {}", from.quote(), to.quote())?; match backup_path { Some(path) => writeln!( stdout(), diff --git a/src/uu/tail/locales/en-US.ftl b/src/uu/tail/locales/en-US.ftl index 6d434ae9862..44b9a7c6288 100644 --- a/src/uu/tail/locales/en-US.ftl +++ b/src/uu/tail/locales/en-US.ftl @@ -58,10 +58,8 @@ tail-status-has-been-replaced-following-new-file = { $file } has been replaced; tail-status-file-truncated = { $file }: file truncated tail-status-replaced-with-untailable-file = { $file } has been replaced with an untailable file tail-status-replaced-with-untailable-file-giving-up = { $file } has been replaced with an untailable file; giving up on this name -tail-status-file-became-inaccessible = { $file } { $become_inaccessible }: { $no_such_file } tail-status-directory-containing-watched-file-removed = directory containing watched file was removed tail-status-backend-cannot-be-used-reverting-to-polling = { $backend } cannot be used, reverting to polling -tail-status-file-no-such-file = { $file }: { $no_such_file } # Text constants tail-bad-fd = Bad file descriptor diff --git a/src/uu/tail/locales/fr-FR.ftl b/src/uu/tail/locales/fr-FR.ftl index 72cb4108108..39f0a5a7ebb 100644 --- a/src/uu/tail/locales/fr-FR.ftl +++ b/src/uu/tail/locales/fr-FR.ftl @@ -57,10 +57,8 @@ tail-status-has-been-replaced-following-new-file = { $file } a été remplacé ; tail-status-file-truncated = { $file } : fichier tronqué tail-status-replaced-with-untailable-file = { $file } a été remplacé par un fichier non suivable tail-status-replaced-with-untailable-file-giving-up = { $file } a été remplacé par un fichier non suivable ; abandon de ce nom -tail-status-file-became-inaccessible = { $file } { $become_inaccessible } : { $no_such_file } tail-status-directory-containing-watched-file-removed = le répertoire contenant le fichier surveillé a été supprimé tail-status-backend-cannot-be-used-reverting-to-polling = { $backend } ne peut pas être utilisé, retour au sondage -tail-status-file-no-such-file = { $file } : { $no_such_file } # Constantes de texte tail-bad-fd = Descripteur de fichier incorrect diff --git a/src/uu/tail/src/follow/watch.rs b/src/uu/tail/src/follow/watch.rs index b3f88c224a3..592c866dbf9 100644 --- a/src/uu/tail/src/follow/watch.rs +++ b/src/uu/tail/src/follow/watch.rs @@ -394,8 +394,10 @@ impl Observer { if let Some(old_md) = self.files.get_mut_metadata(event_path) { if old_md.is_tailable() && self.files.get(event_path).reader.is_some() { show_error!( - "{}", - translate!("tail-status-file-became-inaccessible", "file" => display_name.quote(), "become_inaccessible" => translate!("tail-become-inaccessible"), "no_such_file" => translate!("tail-no-such-file-or-directory")) + "{} {}: {}", + display_name.quote(), + translate!("tail-become-inaccessible"), + translate!("tail-no-such-file-or-directory") ); } } @@ -410,8 +412,9 @@ impl Observer { } } else { show_error!( - "{}", - translate!("tail-status-file-no-such-file", "file" => display_name, "no_such_file" => translate!("tail-no-such-file-or-directory")) + "{}: {}", + display_name, + translate!("tail-no-such-file-or-directory") ); if !self.files.files_remaining() && self.use_polling { // NOTE: GNU's tail exits here for `---disable-inotify` diff --git a/src/uu/who/locales/en-US.ftl b/src/uu/who/locales/en-US.ftl index f092489a16a..2984c2fdcc5 100644 --- a/src/uu/who/locales/en-US.ftl +++ b/src/uu/who/locales/en-US.ftl @@ -32,9 +32,7 @@ who-user-count = # { $count -> } # Idle time indicators -who-idle-current = . who-idle-old = old -who-idle-unknown = ? # System information who-runlevel = run-level { $level } diff --git a/src/uu/who/locales/fr-FR.ftl b/src/uu/who/locales/fr-FR.ftl index 27d0230182c..0c853e51ee9 100644 --- a/src/uu/who/locales/fr-FR.ftl +++ b/src/uu/who/locales/fr-FR.ftl @@ -32,7 +32,6 @@ who-user-count = # { $count -> # Idle time indicators who-idle-old = anc. -who-idle-unknown = ? # System information who-runlevel = niveau-exec { $level } diff --git a/src/uu/who/src/platform/unix.rs b/src/uu/who/src/platform/unix.rs index 6fb70753dd0..975ac31c4df 100644 --- a/src/uu/who/src/platform/unix.rs +++ b/src/uu/who/src/platform/unix.rs @@ -379,7 +379,7 @@ impl Who { } let idle = if last_change == 0 { - translate!("who-idle-unknown").into() + " ?".into() } else { idle_string(last_change, 0) };