Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/uu/cp/locales/en-US.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions src/uu/cp/locales/fr-FR.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions src/uu/cp/src/cp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}

Expand Down
1 change: 0 additions & 1 deletion src/uu/env/locales/en-US.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/uu/env/locales/fr-FR.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions src/uu/env/src/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion src/uu/install/locales/en-US.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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 })
1 change: 0 additions & 1 deletion src/uu/install/locales/fr-FR.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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 })
6 changes: 1 addition & 5 deletions src/uu/install/src/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 0 additions & 2 deletions src/uu/tail/locales/en-US.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions src/uu/tail/locales/fr-FR.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 7 additions & 4 deletions src/uu/tail/src/follow/watch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
);
}
}
Expand All @@ -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`
Expand Down
2 changes: 0 additions & 2 deletions src/uu/who/locales/en-US.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
1 change: 0 additions & 1 deletion src/uu/who/locales/fr-FR.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion src/uu/who/src/platform/unix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ impl Who {
}

let idle = if last_change == 0 {
translate!("who-idle-unknown").into()
" ?".into()
} else {
idle_string(last_change, 0)
};
Expand Down
Loading