From 0d7968107058d656eb1fd2e22e637283035c5557 Mon Sep 17 00:00:00 2001 From: Daniel Rainer Date: Sat, 31 Jan 2026 21:23:01 +0100 Subject: [PATCH] gettext: remove remaining trailing newlines Complete the work started in e78e3f16e (gettext: remove trailing newlines, 2026-01-30) Now, there are no remaining trailing newlines in the localizable strings in our Rust sources. A bit more work is still needed to get rid of a few leading and trailing spaces, the goal being that for all localizable strings `s` in our Rust sources, `s == s.trim()`. Includes a bit of drive-by refactoring. Part of #12405 --- localization/po/de.po | 432 +++++++++++++------------- localization/po/en.po | 372 +++++++++++------------ localization/po/fr.po | 456 +++++++++++++--------------- localization/po/pl.po | 364 +++++++++++----------- localization/po/pt_BR.po | 386 +++++++++++------------ localization/po/sv.po | 366 +++++++++++----------- localization/po/zh_CN.po | 522 +++++++++++++++----------------- localization/po/zh_TW.po | 522 +++++++++++++++----------------- src/bin/fish.rs | 14 +- src/builtins/abbr.rs | 115 ++++--- src/builtins/argparse.rs | 71 +++-- src/builtins/bind.rs | 14 +- src/builtins/block.rs | 6 +- src/builtins/breakpoint.rs | 4 +- src/builtins/cd.rs | 43 +-- src/builtins/commandline.rs | 6 +- src/builtins/complete.rs | 41 ++- src/builtins/contains.rs | 2 +- src/builtins/fg.rs | 10 +- src/builtins/fish_indent.rs | 4 +- src/builtins/fish_key_reader.rs | 6 +- src/builtins/function.rs | 4 +- src/builtins/functions.rs | 45 +-- src/builtins/math.rs | 8 +- src/builtins/pwd.rs | 5 +- src/builtins/random.rs | 10 +- src/builtins/read.rs | 31 +- src/builtins/realpath.rs | 6 +- src/builtins/set.rs | 77 +++-- src/builtins/set_color.rs | 6 +- src/builtins/shared.rs | 25 +- src/builtins/source.rs | 14 +- src/builtins/string.rs | 7 +- src/builtins/string/escape.rs | 2 +- src/builtins/string/match.rs | 2 +- src/builtins/string/pad.rs | 6 +- src/builtins/string/repeat.rs | 4 +- src/builtins/string/replace.rs | 2 +- src/builtins/string/shorten.rs | 2 +- src/builtins/string/split.rs | 6 +- src/builtins/string/sub.rs | 13 +- src/builtins/string/unescape.rs | 2 +- src/builtins/type.rs | 9 +- src/builtins/wait.rs | 8 +- src/parse_execution.rs | 10 +- tests/checks/abbr.fish | 4 +- 46 files changed, 1964 insertions(+), 2100 deletions(-) diff --git a/localization/po/de.po b/localization/po/de.po index 8a885c4e7..e0128b6ae 100644 --- a/localization/po/de.po +++ b/localization/po/de.po @@ -27,13 +27,6 @@ msgstr "" msgid " PID Command" msgstr " PID Befehl" -#, c-format -msgid " (%s)\n" -msgstr " (%s)\n" - -msgid " (read-only)\n" -msgstr " (screibgeschützt)\n" - msgid " a path variable" msgstr " eine Pfadvariable" @@ -55,8 +48,8 @@ msgid "$%c is not a valid variable in fish." msgstr "" #, c-format -msgid "$%s: originally inherited as |%s|\n" -msgstr "$%s: Ursprünglich geerbt als |%s|\n" +msgid "$%s: originally inherited as |%s|" +msgstr "$%s: Ursprünglich geerbt als |%s|" #, c-format msgid "$%s: set in %s scope, %s,%s with %d elements" @@ -84,36 +77,36 @@ msgid "%s %s: %s: invalid subcommand" msgstr "%s %s: %s: ungültiger Unterbefehl" #, c-format -msgid "%s %s: Abbreviation %s already exists for commands %s, cannot rename %s\n" +msgid "%s %s: Abbreviation %s already exists for commands %s, cannot rename %s" msgstr "" #, c-format -msgid "%s %s: Abbreviation %s already exists, cannot rename %s\n" +msgid "%s %s: Abbreviation %s already exists, cannot rename %s" msgstr "" #, c-format -msgid "%s %s: Abbreviation '%s' cannot have spaces in the word\n" +msgid "%s %s: Abbreviation '%s' cannot have spaces in the word" msgstr "" #, c-format -msgid "%s %s: Name cannot be empty\n" -msgstr "%s %s: Name darf nicht leer sein\n" - -#, fuzzy, c-format -msgid "%s %s: No abbreviation named %s with the specified command restrictions\n" -msgstr "%s %s: Keine Abkürzung namens %s\n" +msgid "%s %s: Name cannot be empty" +msgstr "%s %s: Name darf nicht leer sein" #, c-format -msgid "%s %s: Requires at least two arguments\n" -msgstr "%s %s: Erfordert mindestens zwei Argumente\n" +msgid "%s %s: No abbreviation named %s with the specified command restrictions" +msgstr "%s %s: Keine Abkürzung namens %s mit den spezifizierten Befehlseinschränkungen" #, c-format -msgid "%s %s: Requires exactly two arguments\n" -msgstr "%s %s: Erfordert genau zwei Argumente\n" +msgid "%s %s: Requires at least two arguments" +msgstr "%s %s: Erfordert mindestens zwei Argumente" #, c-format -msgid "%s %s: Unexpected argument -- '%s'\n" -msgstr "%s %s: Unerwartetes Argument - '%s'\n" +msgid "%s %s: Requires exactly two arguments" +msgstr "%s %s: Erfordert genau zwei Argumente" + +#, c-format +msgid "%s %s: Unexpected argument -- '%s'" +msgstr "%s %s: Unerwartetes Argument - '%s'" #, c-format msgid "%s %s: unrecognized feature '%s'" @@ -140,11 +133,11 @@ msgid "%s could not read response to Primary Device Attribute query after waitin msgstr "" #, c-format -msgid "%s is %s\n" +msgid "%s is %s" msgstr "" #, c-format -msgid "%s is a builtin\n" +msgid "%s is a builtin" msgstr "" #, c-format @@ -159,10 +152,6 @@ msgstr "" msgid "%s, version %s" msgstr "" -#, c-format -msgid "%s, version %s\n" -msgstr "%s, version %s\n" - #, c-format msgid "%s: %s" msgstr "" @@ -171,6 +160,22 @@ msgstr "" msgid "%s: %s %s: options cannot be used together" msgstr "" +#, c-format +msgid "%s: %s failed: %s" +msgstr "%s: %s fehlgeschlagen: %s" + +#, c-format +msgid "%s: %s must be a positive integer" +msgstr "%s: %s muss eine positive Ganzzahl sein" + +#, c-format +msgid "%s: %s option requires %s" +msgstr "%s: Option %s braucht %s" + +#, c-format +msgid "%s: %s requires a non-empty string" +msgstr "%s: %s erfordert eine nicht-leere Zeichenkette" + #, c-format msgid "%s: %s: cannot overwrite read-only variable" msgstr "" @@ -180,16 +185,16 @@ msgid "%s: %s: cannot use reserved keyword as function name" msgstr "" #, c-format -msgid "%s: %s: contains a syntax error\n" -msgstr "%s: %s: enthält einen Syntaxfehler\n" +msgid "%s: %s: contains a syntax error" +msgstr "%s: %s: enthält einen Syntaxfehler" #, c-format msgid "%s: %s: expected %d arguments; got %d" msgstr "" #, c-format -msgid "%s: %s: invalid base value\n" -msgstr "%s: %s: ungültiger Basiswert\n" +msgid "%s: %s: invalid base value" +msgstr "%s: %s: ungültiger Basiswert" #, c-format msgid "%s: %s: invalid function name" @@ -200,7 +205,7 @@ msgid "%s: %s: invalid integer" msgstr "" #, c-format -msgid "%s: %s: invalid mode\n" +msgid "%s: %s: invalid mode" msgstr "" #, c-format @@ -208,7 +213,7 @@ msgid "%s: %s: invalid mode name. See `help %s`" msgstr "" #, c-format -msgid "%s: %s: invalid scale\n" +msgid "%s: %s: invalid scale" msgstr "" #, c-format @@ -240,23 +245,23 @@ msgid "%s: %s: unknown option" msgstr "%s: %s: unbekannte Option" #, c-format -msgid "%s: '%s' is a broken symbolic link to '%s'\n" +msgid "%s: '%s' is a broken symbolic link to '%s'" msgstr "" #, c-format -msgid "%s: '%s' is not a directory\n" -msgstr "%s: '%s' ist kein Verzeichnis\n" +msgid "%s: '%s' is not a directory" +msgstr "%s: '%s' ist kein Verzeichnis" #, c-format -msgid "%s: '%s' is not a job\n" -msgstr "%s: '%s' ist kein Job\n" +msgid "%s: '%s' is not a job" +msgstr "%s: '%s' ist kein Job" #, c-format msgid "%s: '%s' is not a valid job ID" msgstr "" #, c-format -msgid "%s: '%s' is not a valid process ID\n" +msgid "%s: '%s' is not a valid process ID" msgstr "" #, c-format @@ -264,100 +269,72 @@ msgid "%s: --command cannot be combined with --position=command" msgstr "" #, c-format -msgid "%s: --function option requires --add\n" -msgstr "%s: Option --function braucht --add\n" - -#, c-format -msgid "%s: --position option requires --add\n" -msgstr "%s: Option --position erfordert --add\n" - -#, c-format -msgid "%s: --regex option requires --add\n" -msgstr "%s: Option --regex erfordert --add\n" - -#, c-format -msgid "%s: --set-cursor argument cannot be empty\n" +msgid "%s: --set-cursor argument cannot be empty" msgstr "" #, c-format -msgid "%s: --set-cursor option requires --add\n" +msgid "%s: Ambiguous job" +msgstr "%s: Mehrdeutiger Job" + +#, c-format +msgid "%s: An option spec must have at least a short or a long flag" msgstr "" #, c-format -msgid "%s: -l requires a non-empty string\n" -msgstr "" +msgid "%s: Argument '%s' is out of range" +msgstr "%s: Argument '%s' ist außerhalb des Definitionsbereichs" #, c-format -msgid "%s: -o requires a non-empty string\n" -msgstr "" +msgid "%s: Can not specify scope when removing block" +msgstr "%s: Bei Blocklöschung kann kein Geltungsbereich angegeben werden" #, c-format -msgid "%s: -s requires a non-empty string\n" -msgstr "%s: -s erfordert eine nicht-leere Zeichenkette\n" - -#, c-format -msgid "%s: Ambiguous job\n" -msgstr "%s: Mehrdeutiger Job\n" - -#, c-format -msgid "%s: An option spec must have at least a short or a long flag\n" -msgstr "" - -#, c-format -msgid "%s: Argument '%s' is out of range\n" -msgstr "%s: Argument '%s' ist außerhalb des Definitionsbereichs\n" - -#, c-format -msgid "%s: Can not specify scope when removing block\n" -msgstr "%s: Bei Blocklöschung kann kein Geltungsbereich angegeben werden\n" - -#, c-format -msgid "%s: Can't put job %d, '%s' to foreground because it is not under job control\n" -msgstr "%s: Kann job %d, '%s' nicht in den Vordergrund schicken weil er nicht der Jobsteuerung unterliegt\n" +msgid "%s: Can't put job %d, '%s' to foreground because it is not under job control" +msgstr "%s: Kann job %d, '%s' nicht in den Vordergrund schicken weil er nicht der Jobsteuerung unterliegt" #, c-format msgid "%s: Can't put job %s, '%s' to background because it is not under job control" msgstr "%s: Kann job %s, '%s' nicht in den Hintergrund schicken weil er nicht der Jobsteuerung unterliegt" #, c-format -msgid "%s: Cannot combine options %s\n" -msgstr "%s: Kann Optionen %s nicht kombinieren\n" +msgid "%s: Cannot combine options %s" +msgstr "%s: Kann Optionen %s nicht kombinieren" #, c-format -msgid "%s: Cannot specify multiple positions\n" -msgstr "%s: Mehrere Positionen können nicht gleichzeitig angegeben werden\n" +msgid "%s: Cannot specify multiple positions" +msgstr "%s: Mehrere Positionen können nicht gleichzeitig angegeben werden" #, c-format -msgid "%s: Cannot specify multiple regex patterns\n" -msgstr "%s: Maximal ein regulärer Ausdruck erlaubt\n" +msgid "%s: Cannot specify multiple regex patterns" +msgstr "%s: Maximal ein regulärer Ausdruck erlaubt" #, c-format -msgid "%s: Cannot specify multiple set-cursor options\n" -msgstr "%s: Maximal eine set-cursor-Option erlaubt\n" +msgid "%s: Cannot specify multiple set-cursor options" +msgstr "%s: Maximal eine set-cursor-Option erlaubt" #, c-format msgid "%s: Cannot use --append or --prepend when assigning to a slice" msgstr "" #, c-format -msgid "%s: Command not valid at an interactive prompt\n" -msgstr "%s: Kann nicht am Prompt verwendet werden\n" +msgid "%s: Command not valid at an interactive prompt" +msgstr "%s: Kann nicht am Prompt verwendet werden" #, c-format -msgid "%s: Could not find '%s'\n" -msgstr "%s: Konnte '%s' nicht finden\n" +msgid "%s: Could not find '%s'" +msgstr "%s: Konnte '%s' nicht finden" #, c-format -msgid "%s: Could not find a job with process ID '%d'\n" -msgstr "%s: Konnte keinen Job mit Prozess-ID '%d' finden\n" +msgid "%s: Could not find a job with process ID '%d'" +msgstr "%s: Konnte keinen Job mit Prozess-ID '%d' finden" #, c-format -msgid "%s: Could not find child processes with the name '%s'\n" -msgstr "%s: Kein Kindprozess namens '%s' gefunden\n" +msgid "%s: Could not find child processes with the name '%s'" +msgstr "%s: Kein Kindprozess namens '%s' gefunden" #, c-format -msgid "%s: Could not find home directory\n" -msgstr "%s: Konnte Heimordner nicht finden\n" +msgid "%s: Could not find home directory" +msgstr "%s: Konnte Heimordner nicht finden" #, c-format msgid "%s: Could not find job '%d'" @@ -368,63 +345,63 @@ msgid "%s: Did you mean `set %s %s`?" msgstr "%s: Meintest du `set %s %s`?" #, c-format -msgid "%s: Empty directory '%s' does not exist\n" -msgstr "%s: Leerer Ordnerpfad '%s' existiert nicht\n" +msgid "%s: Empty directory '%s' does not exist" +msgstr "%s: Leerer Ordnerpfad '%s' existiert nicht" #, c-format -msgid "%s: Error encountered while sourcing file '%s':\n" -msgstr "%s: Fehler beim Einladen von '%s':\n" +msgid "%s: Error encountered while sourcing file '%s':" +msgstr "%s: Fehler beim Einladen von '%s':" #, c-format -msgid "%s: Error while reading file '%s'\n" -msgstr "%s: Fehler beim Lesen der Datei '%s'\n" +msgid "%s: Error while reading file '%s'" +msgstr "%s: Fehler beim Lesen der Datei '%s'" + +#, c-format +msgid "%s: Expected %s for %s" +msgstr "%s: Erwartete %s für %s" #, c-format msgid "%s: Expected at least one argument" msgstr "" #, c-format -msgid "%s: Expected exactly one function name\n" -msgstr "%s: Erwartete genau einen Funktionsnamen\n" +msgid "%s: Expected exactly one function name" +msgstr "%s: Erwartete genau einen Funktionsnamen" #, c-format -msgid "%s: Expected exactly two names (current function name, and new function name)\n" -msgstr "%s: Erwartete exakt zwei Namen (aktuellen und neuen Funktionsnamen)\n" +msgid "%s: Expected exactly two names (current function name, and new function name)" +msgstr "%s: Erwartete exakt zwei Namen (aktuellen und neuen Funktionsnamen)" #, c-format -msgid "%s: Expected generic | variable | signal | exit | job-id for --handlers-type\n" -msgstr "%s: Erwartete generic | variable | signal | exit | job-id für --handlers-type\n" +msgid "%s: Function '%s' already exists. Cannot create copy of '%s'" +msgstr "%s: Funktion '%s' existiert schon. Konnte '%s' nicht kopieren" #, c-format -msgid "%s: Function '%s' already exists. Cannot create copy of '%s'\n" -msgstr "%s: Funktion '%s' existiert schon. Konnte '%s' nicht kopieren\n" +msgid "%s: Function '%s' does not exist" +msgstr "%s: Funktion '%s' existiert nicht" #, c-format -msgid "%s: Function '%s' does not exist\n" -msgstr "%s: Funktion '%s' existiert nicht\n" +msgid "%s: Illegal function name '%s'" +msgstr "%s: Ungültiger Funktionsname '%s'" #, c-format -msgid "%s: Illegal function name '%s'\n" -msgstr "%s: Ungültiger Funktionsname '%s'\n" +msgid "%s: Implicit int flag '%c' already defined" +msgstr "%s: Implizite Zahloption '%c' ist schon definiert" #, c-format -msgid "%s: Implicit int flag '%c' already defined\n" -msgstr "%s: Implizite Zahloption '%c' ist schon definiert\n" +msgid "%s: Implicit int short flag '%c' does not allow modifiers like '%c'" +msgstr "%s: Implizite Zahloption '%c' darf keine Modifikatoren wie '%c' haben" #, c-format -msgid "%s: Implicit int short flag '%c' does not allow modifiers like '%c'\n" -msgstr "%s: Implizite Zahloption '%c' darf keine Modifikatoren wie '%c' haben\n" - -#, c-format -msgid "%s: Invalid --max-args value '%s'\n" +msgid "%s: Invalid --max-args value '%s'" msgstr "" #, c-format -msgid "%s: Invalid --min-args value '%s'\n" +msgid "%s: Invalid --min-args value '%s'" msgstr "" #, c-format -msgid "%s: Invalid --unknown-arguments value '%s'\n" +msgid "%s: Invalid --unknown-arguments value '%s'" msgstr "" #, c-format @@ -432,36 +409,32 @@ msgid "%s: Invalid count value '%s'" msgstr "%s: Ungültiger 'count'-Wert '%s'" #, c-format -msgid "%s: Invalid count value '%s'\n" -msgstr "%s: Ungültiger 'count'-Wert '%s'\n" +msgid "%s: Invalid end value '%s'" +msgstr "%s: Ungültiger 'end'-Wert '%s'" #, c-format -msgid "%s: Invalid end value '%s'\n" -msgstr "%s: Ungültiger 'end'-Wert '%s'\n" +msgid "%s: Invalid escape style '%s'" +msgstr "%s: Ungültiger Escape-Stil '%s'" #, c-format -msgid "%s: Invalid escape style '%s'\n" -msgstr "%s: Ungültiger Escape-Stil '%s'\n" +msgid "%s: Invalid fields value '%s'" +msgstr "%s: Ungültiger 'fields'-Wert '%s'" #, c-format -msgid "%s: Invalid fields value '%s'\n" -msgstr "%s: Ungültiger 'fields'-Wert '%s'\n" +msgid "%s: Invalid function name: %s" +msgstr "%s: Ungültiger Funktionsname: %s" #, c-format -msgid "%s: Invalid function name: %s\n" -msgstr "%s: Ungültiger Funktionsname: %s\n" - -#, c-format -msgid "%s: Invalid index starting at '%s'\n" -msgstr "%s: Ungültiger Index ab '%s'\n" +msgid "%s: Invalid index starting at '%s'" +msgstr "%s: Ungültiger Index ab '%s'" #, c-format msgid "%s: Invalid job control mode '%s'" msgstr "%s: Ungültiger Jobkontrollmodus '%s'" #, c-format -msgid "%s: Invalid length value '%s'\n" -msgstr "%s: Ungültiger Längenwert '%s'\n" +msgid "%s: Invalid length value '%s'" +msgstr "%s: Ungültiger Längenwert '%s'" #, c-format msgid "%s: Invalid level value '%s'" @@ -472,19 +445,19 @@ msgid "%s: Invalid limit '%s'" msgstr "%s: Ungültiges Limit '%s'" #, c-format -msgid "%s: Invalid max matches value '%s'\n" +msgid "%s: Invalid max matches value '%s'" msgstr "" #, c-format -msgid "%s: Invalid max value '%s'\n" -msgstr "%s: Ungültiger Maximalwert '%s'\n" +msgid "%s: Invalid max value '%s'" +msgstr "%s: Ungültiger Maximalwert '%s'" #, c-format -msgid "%s: Invalid option spec '%s' at char '%c'\n" -msgstr "%s: Ungültige Options-Spezifikation '%s' bei Zeichen '%c'\n" +msgid "%s: Invalid option spec '%s' at char '%c'" +msgstr "%s: Ungültige Options-Spezifikation '%s' bei Zeichen '%c'" #, c-format -msgid "%s: Invalid padding character of width zero '%s'\n" +msgid "%s: Invalid padding character of width zero '%s'" msgstr "" #, c-format @@ -492,11 +465,11 @@ msgid "%s: Invalid permission '%s'" msgstr "%s: Ungültiger Rechtewert '%s'" #, c-format -msgid "%s: Invalid position '%s'\n" -msgstr "%s: Ungültige Position '%s'\n" +msgid "%s: Invalid position '%s'" +msgstr "%s: Ungültige Position '%s'" #, c-format -msgid "%s: Invalid range value for field '%s'\n" +msgid "%s: Invalid range value for field '%s'" msgstr "" #, c-format @@ -504,19 +477,19 @@ msgid "%s: Invalid sort key '%s'" msgstr "%s: Ungültiger Sortierschlüssel '%s'" #, c-format -msgid "%s: Invalid start value '%s'\n" -msgstr "%s: Ungültiger Startwert '%s'\n" +msgid "%s: Invalid start value '%s'" +msgstr "%s: Ungültiger Startwert '%s'" #, c-format -msgid "%s: Invalid state\n" +msgid "%s: Invalid state" msgstr "" #, c-format -msgid "%s: Invalid style value '%s'\n" +msgid "%s: Invalid style value '%s'" msgstr "" #, c-format -msgid "%s: Invalid token '%s'\n" +msgid "%s: Invalid token '%s'" msgstr "" #, c-format @@ -524,52 +497,52 @@ msgid "%s: Invalid type '%s'" msgstr "" #, c-format -msgid "%s: Invalid value for '--color' option: '%s'. Expected 'always', 'never', or 'auto'\n" -msgstr "%s: Ungültiger Wert für '--color'-Option: '%s'. Erwartet wird 'always', 'never' oder 'auto'\n" +msgid "%s: Invalid value for '--color' option: '%s'. Expected 'always', 'never', or 'auto'" +msgstr "%s: Ungültiger Wert für '--color'-Option: '%s'. Erwartet wird 'always', 'never' oder 'auto'" #, c-format -msgid "%s: Invalid width value '%s'\n" +msgid "%s: Invalid width value '%s'" msgstr "" #, c-format -msgid "%s: Key not specified\n" +msgid "%s: Key not specified" msgstr "" #, c-format -msgid "%s: Long flag '%s' already defined\n" +msgid "%s: Long flag '%s' already defined" msgstr "" #, c-format -msgid "%s: Missing -- separator\n" -msgstr "%s: Fehlendes '--'-Trennzeichen\n" +msgid "%s: Missing -- separator" +msgstr "%s: Fehlendes '--'-Trennzeichen" #, c-format msgid "%s: New limit cannot be an empty string" msgstr "%s: Neues Limit darf keine leere Zeichenkette sein" #, c-format -msgid "%s: No binding found for key '%s'\n" +msgid "%s: No binding found for key '%s'" msgstr "" #, c-format -msgid "%s: No binding found for key sequence '%s'\n" +msgid "%s: No binding found for key sequence '%s'" msgstr "" #, c-format -msgid "%s: No blocks defined\n" -msgstr "%s: Keine Blöcke definiert\n" +msgid "%s: No blocks defined" +msgstr "%s: Keine Blöcke definiert" #, c-format -msgid "%s: No suitable job: %d\n" -msgstr "%s: Kein passender Job: %d\n" +msgid "%s: No suitable job: %d" +msgstr "%s: Kein passender Job: %d" #, c-format msgid "%s: No suitable job: %s" msgstr "" #, c-format -msgid "%s: Not inside of loop\n" -msgstr "%s: Nicht innerhalb einer Schleife\n" +msgid "%s: Not inside of loop" +msgstr "%s: Nicht innerhalb einer Schleife" #, c-format msgid "%s: Number out of range" @@ -580,16 +553,16 @@ msgid "%s: Number was empty" msgstr "%s: Zahl war leer" #, c-format -msgid "%s: Options %s and %s cannot be used together\n" +msgid "%s: Options %s and %s cannot be used together" msgstr "" #, c-format -msgid "%s: Padding should be a character '%s'\n" +msgid "%s: Padding should be a character '%s'" msgstr "" #, c-format -msgid "%s: Permission denied: '%s'\n" -msgstr "%s: Berechtigung verweigert: '%s'\n" +msgid "%s: Permission denied: '%s'" +msgstr "%s: Berechtigung verweigert: '%s'" #, c-format msgid "%s: Regular expression compile error: %s" @@ -604,23 +577,19 @@ msgid "%s: Resource limit not available on this operating system" msgstr "%s: Ressourcenlimit ist auf diesem Betriebssystem nicht verfügbar" #, c-format -msgid "%s: STEP must be a positive integer\n" -msgstr "%s: STEP muss eine positive Ganzzahl sein\n" - -#, c-format -msgid "%s: Short flag '%c' already defined\n" +msgid "%s: Short flag '%c' already defined" msgstr "" #, c-format -msgid "%s: Short flag '%c' invalid, must be alphanum or '#'\n" +msgid "%s: Short flag '%c' invalid, must be alphanum or '#'" msgstr "" #, c-format -msgid "%s: The directory '%s' does not exist\n" -msgstr "%s: Das Verzeichnis '%s' existiert nicht\n" +msgid "%s: The directory '%s' does not exist" +msgstr "%s: Das Verzeichnis '%s' existiert nicht" #, c-format -msgid "%s: The variable '%s' does not exist\n" +msgid "%s: The variable '%s' does not exist" msgstr "" #, c-format @@ -632,31 +601,31 @@ msgid "%s: There are no suitable jobs" msgstr "" #, c-format -msgid "%s: Too many levels of symbolic links: '%s'\n" -msgstr "%s: Zu viele Ebenen von symbolischen Links: '%s'\n" +msgid "%s: Too many levels of symbolic links: '%s'" +msgstr "%s: Zu viele Ebenen von symbolischen Links: '%s'" #, c-format -msgid "%s: Too many long-only options\n" +msgid "%s: Too many long-only options" msgstr "" #, c-format -msgid "%s: Tried to change the read-only variable '%s'\n" +msgid "%s: Tried to change the read-only variable '%s'" msgstr "" #, c-format -msgid "%s: Tried to modify the special variable '%s' to an invalid value\n" +msgid "%s: Tried to modify the special variable '%s' to an invalid value" msgstr "" #, c-format -msgid "%s: Tried to modify the special variable '%s' with the wrong scope\n" +msgid "%s: Tried to modify the special variable '%s' with the wrong scope" msgstr "" #, c-format -msgid "%s: Unknown color '%s'\n" -msgstr "%s: Unbekannte Farbe '%s'\n" +msgid "%s: Unknown color '%s'" +msgstr "%s: Unbekannte Farbe '%s'" #, c-format -msgid "%s: Unknown error trying to locate directory '%s'\n" +msgid "%s: Unknown error trying to locate directory '%s'" msgstr "" #, c-format @@ -672,11 +641,11 @@ msgid "%s: Warning: Option '%s' was removed and is now ignored" msgstr "%s: Warnung: Option '%s' wurde entfernt und wird nun ignoriert" #, c-format -msgid "%s: `set --show` does not allow slices with the var names\n" +msgid "%s: `set --show` does not allow slices with the var names" msgstr "" #, c-format -msgid "%s: array index out of bounds\n" +msgid "%s: array index out of bounds" msgstr "" #, c-format @@ -704,16 +673,16 @@ msgid "%s: cannot both path and unpath" msgstr "" #, c-format -msgid "%s: column %s exceeds line length\n" +msgid "%s: column %s exceeds line length" msgstr "" #, c-format -msgid "%s: exclusive flag '%s' is not valid\n" -msgstr "%s: Exklusive Option '%s' ist ungültig\n" +msgid "%s: exclusive flag '%s' is not valid" +msgstr "%s: Exklusive Option '%s' ist ungültig" #, c-format -msgid "%s: exclusive flag string '%s' is not valid\n" -msgstr "%s: Exklusive Option '%s' ist ungültig\n" +msgid "%s: exclusive flag string '%s' is not valid" +msgstr "%s: Exklusive Option '%s' ist ungültig" #, c-format msgid "%s: expected %d arguments; got %d" @@ -736,7 +705,7 @@ msgid "%s: function name required" msgstr "%s: Brauche Funktionsnamen" #, c-format -msgid "%s: given %d indexes but %d values\n" +msgid "%s: given %d indexes but %d values" msgstr "" #, c-format @@ -752,7 +721,7 @@ msgid "%s: invalid option combination, %s" msgstr "" #, c-format -msgid "%s: invalid underline style: %s\n" +msgid "%s: invalid underline style: %s" msgstr "" #, c-format @@ -768,7 +737,7 @@ msgid "%s: missing argument" msgstr "" #, c-format -msgid "%s: missing filename argument or input redirection\n" +msgid "%s: missing filename argument or input redirection" msgstr "" #, c-format @@ -776,13 +745,9 @@ msgid "%s: missing subcommand" msgstr "%s: fehlender Unterbefehl" #, c-format -msgid "%s: nothing to choose from\n" +msgid "%s: nothing to choose from" msgstr "" -#, c-format -msgid "%s: realpath failed: %s\n" -msgstr "%s: realpath fehlgeschlagen: %s\n" - #, c-format msgid "%s: scope can be only one of: universal function global local" msgstr "" @@ -792,19 +757,19 @@ msgid "%s: setting cursor while evaluating 'complete --arguments' is not yet sup msgstr "" #, c-format -msgid "%s: stdin is closed\n" -msgstr "%s: stdin ist geschlossen\n" +msgid "%s: stdin is closed" +msgstr "%s: stdin ist geschlossen" #, c-format -msgid "%s: successfully set universal '%s'; but a global by that name shadows it\n" +msgid "%s: successfully set universal '%s'; but a global by that name shadows it" msgstr "" #, c-format -msgid "%s: the -k/--key syntax is no longer supported. See `bind --help` and `bind --key-names`\n" +msgid "%s: the -k/--key syntax is no longer supported. See `bind --help` and `bind --key-names`" msgstr "" #, c-format -msgid "%s: there is no line %s\n" +msgid "%s: there is no line %s" msgstr "" #, c-format @@ -812,7 +777,7 @@ msgid "%s: too many arguments" msgstr "%s: zu viele Argumente" #, c-format -msgid "%s: usage of -i for --silent is deprecated. Please use -s or --silent instead.\n" +msgid "%s: usage of -i for --silent is deprecated. Please use -s or --silent instead." msgstr "" #, c-format @@ -820,7 +785,7 @@ msgid "%s: value not completely converted (can't convert '%s')" msgstr "%s: Wert nicht vollständig konvertiert (kann '%s' nicht konvertieren)" #, c-format -msgid "%s: variable '%s' is read-only\n" +msgid "%s: variable '%s' is read-only" msgstr "" #, c-format @@ -852,12 +817,19 @@ msgid "'}' does not take arguments. Did you forget a ';'?" msgstr "" #, c-format -msgid "(Type 'help %s' for related documentation)\n" -msgstr "(Nutze 'help %s' für entsprechende Dokumentation)\n" +msgid "(%s)" +msgstr "(%s)" + +#, c-format +msgid "(Type 'help %s' for related documentation)" +msgstr "(Nutze 'help %s' für entsprechende Dokumentation)" msgid "(no matches)" msgstr "(keine Treffer)" +msgid "(read-only)" +msgstr "(screibgeschützt)" + #, c-format msgid ", copied in %s @ line %d" msgstr ", kopiert in %s, Zeile %d" @@ -1051,8 +1023,8 @@ msgid "Error when renaming file: %s" msgstr "" #, c-format -msgid "Error while reading file %s\n" -msgstr "Fehler beim Lesen der Datei %s\n" +msgid "Error while reading file %s" +msgstr "Fehler beim Lesen der Datei %s" msgid "Errors reported by exec (on by default)" msgstr "" @@ -1298,7 +1270,7 @@ msgid "Missing operator" msgstr "" #, c-format -msgid "Modification of read-only variable \"%s\" is not allowed\n" +msgid "Modification of read-only variable \"%s\" is not allowed" msgstr "" msgid "Negate exit status of job" @@ -1369,11 +1341,15 @@ msgstr "Bitte setzen sie %s oder die HOME Umgebungsvariable bevor sie fish start msgid "Polite quit request" msgstr "Höfliche Beendigungsanforderung" +#, c-format +msgid "Position must be one of: %s" +msgstr "" + msgid "Power failure" msgstr "Stromausfall" #, c-format -msgid "Press ctrl-%c again to exit\n" +msgid "Press ctrl-%c again to exit" msgstr "" msgid "Print arguments" @@ -1766,6 +1742,10 @@ msgstr "Array-Indizes beginnen mit 1, nicht 0" msgid "autoloading" msgstr "" +#, c-format +msgid "builtin %s: %s failed: %s" +msgstr "" + #, c-format msgid "builtin %s: %s: %s" msgstr "builtin %s: %s: %s" @@ -1774,10 +1754,6 @@ msgstr "builtin %s: %s: %s" msgid "builtin %s: Invalid arg: %s" msgstr "builtin %s: Ungültiges argument: %s" -#, c-format -msgid "builtin %s: realpath failed: %s" -msgstr "" - msgid "builtin history delete --exact requires --case-sensitive" msgstr "builtin history delete --exact benötigt --case-sensitive" @@ -1882,8 +1858,8 @@ msgid "stopped" msgstr "gestoppt" #, c-format -msgid "switch: Expected at most one argument, got %u\n" -msgstr "switch: Erwartet höchstens einen Parameter, aber %u angegeben\n" +msgid "switch: Expected at most one argument, got %u" +msgstr "switch: Erwartet höchstens einen Parameter, aber %u angegeben" msgid "symlink" msgstr "" diff --git a/localization/po/en.po b/localization/po/en.po index cc76539b7..cbba46f5c 100644 --- a/localization/po/en.po +++ b/localization/po/en.po @@ -27,13 +27,6 @@ msgstr "" msgid " PID Command" msgstr "" -#, c-format -msgid " (%s)\n" -msgstr "" - -msgid " (read-only)\n" -msgstr "" - msgid " a path variable" msgstr "" @@ -55,7 +48,7 @@ msgid "$%c is not a valid variable in fish." msgstr "$%c is not a valid variable in fish." #, c-format -msgid "$%s: originally inherited as |%s|\n" +msgid "$%s: originally inherited as |%s|" msgstr "" #, c-format @@ -84,35 +77,35 @@ msgid "%s %s: %s: invalid subcommand" msgstr "" #, c-format -msgid "%s %s: Abbreviation %s already exists for commands %s, cannot rename %s\n" +msgid "%s %s: Abbreviation %s already exists for commands %s, cannot rename %s" msgstr "" #, c-format -msgid "%s %s: Abbreviation %s already exists, cannot rename %s\n" +msgid "%s %s: Abbreviation %s already exists, cannot rename %s" msgstr "" #, c-format -msgid "%s %s: Abbreviation '%s' cannot have spaces in the word\n" +msgid "%s %s: Abbreviation '%s' cannot have spaces in the word" msgstr "" #, c-format -msgid "%s %s: Name cannot be empty\n" +msgid "%s %s: Name cannot be empty" msgstr "" #, c-format -msgid "%s %s: No abbreviation named %s with the specified command restrictions\n" +msgid "%s %s: No abbreviation named %s with the specified command restrictions" msgstr "" #, c-format -msgid "%s %s: Requires at least two arguments\n" +msgid "%s %s: Requires at least two arguments" msgstr "" #, c-format -msgid "%s %s: Requires exactly two arguments\n" +msgid "%s %s: Requires exactly two arguments" msgstr "" #, c-format -msgid "%s %s: Unexpected argument -- '%s'\n" +msgid "%s %s: Unexpected argument -- '%s'" msgstr "" #, c-format @@ -140,11 +133,11 @@ msgid "%s could not read response to Primary Device Attribute query after waitin msgstr "" #, c-format -msgid "%s is %s\n" +msgid "%s is %s" msgstr "" #, c-format -msgid "%s is a builtin\n" +msgid "%s is a builtin" msgstr "" #, c-format @@ -159,10 +152,6 @@ msgstr "" msgid "%s, version %s" msgstr "" -#, c-format -msgid "%s, version %s\n" -msgstr "%s, version %s\n" - #, c-format msgid "%s: %s" msgstr "" @@ -171,6 +160,22 @@ msgstr "" msgid "%s: %s %s: options cannot be used together" msgstr "" +#, c-format +msgid "%s: %s failed: %s" +msgstr "" + +#, c-format +msgid "%s: %s must be a positive integer" +msgstr "" + +#, c-format +msgid "%s: %s option requires %s" +msgstr "" + +#, c-format +msgid "%s: %s requires a non-empty string" +msgstr "" + #, c-format msgid "%s: %s: cannot overwrite read-only variable" msgstr "" @@ -180,7 +185,7 @@ msgid "%s: %s: cannot use reserved keyword as function name" msgstr "" #, c-format -msgid "%s: %s: contains a syntax error\n" +msgid "%s: %s: contains a syntax error" msgstr "" #, c-format @@ -188,7 +193,7 @@ msgid "%s: %s: expected %d arguments; got %d" msgstr "" #, c-format -msgid "%s: %s: invalid base value\n" +msgid "%s: %s: invalid base value" msgstr "" #, c-format @@ -200,7 +205,7 @@ msgid "%s: %s: invalid integer" msgstr "" #, c-format -msgid "%s: %s: invalid mode\n" +msgid "%s: %s: invalid mode" msgstr "" #, c-format @@ -208,7 +213,7 @@ msgid "%s: %s: invalid mode name. See `help %s`" msgstr "" #, c-format -msgid "%s: %s: invalid scale\n" +msgid "%s: %s: invalid scale" msgstr "" #, c-format @@ -240,23 +245,23 @@ msgid "%s: %s: unknown option" msgstr "" #, c-format -msgid "%s: '%s' is a broken symbolic link to '%s'\n" +msgid "%s: '%s' is a broken symbolic link to '%s'" msgstr "" #, c-format -msgid "%s: '%s' is not a directory\n" -msgstr "%s: “%s” is not a directory\n" +msgid "%s: '%s' is not a directory" +msgstr "%s: “%s” is not a directory" #, c-format -msgid "%s: '%s' is not a job\n" -msgstr "%s: “%s” is not a job\n" +msgid "%s: '%s' is not a job" +msgstr "%s: “%s” is not a job" #, c-format msgid "%s: '%s' is not a valid job ID" msgstr "" #, c-format -msgid "%s: '%s' is not a valid process ID\n" +msgid "%s: '%s' is not a valid process ID" msgstr "" #, c-format @@ -264,75 +269,47 @@ msgid "%s: --command cannot be combined with --position=command" msgstr "" #, c-format -msgid "%s: --function option requires --add\n" +msgid "%s: --set-cursor argument cannot be empty" msgstr "" #, c-format -msgid "%s: --position option requires --add\n" +msgid "%s: Ambiguous job" +msgstr "%s: Ambiguous job" + +#, c-format +msgid "%s: An option spec must have at least a short or a long flag" msgstr "" #, c-format -msgid "%s: --regex option requires --add\n" -msgstr "" +msgid "%s: Argument '%s' is out of range" +msgstr "%s: Argument “%s” is out of range" #, c-format -msgid "%s: --set-cursor argument cannot be empty\n" -msgstr "" +msgid "%s: Can not specify scope when removing block" +msgstr "%s: Can not specify scope when removing block" #, c-format -msgid "%s: --set-cursor option requires --add\n" -msgstr "" - -#, c-format -msgid "%s: -l requires a non-empty string\n" -msgstr "" - -#, c-format -msgid "%s: -o requires a non-empty string\n" -msgstr "" - -#, c-format -msgid "%s: -s requires a non-empty string\n" -msgstr "" - -#, c-format -msgid "%s: Ambiguous job\n" -msgstr "%s: Ambiguous job\n" - -#, c-format -msgid "%s: An option spec must have at least a short or a long flag\n" -msgstr "" - -#, c-format -msgid "%s: Argument '%s' is out of range\n" -msgstr "%s: Argument “%s” is out of range\n" - -#, c-format -msgid "%s: Can not specify scope when removing block\n" -msgstr "%s: Can not specify scope when removing block\n" - -#, c-format -msgid "%s: Can't put job %d, '%s' to foreground because it is not under job control\n" -msgstr "%s: Can't put job %d, “%s” to foreground because it is not under job control\n" +msgid "%s: Can't put job %d, '%s' to foreground because it is not under job control" +msgstr "%s: Can't put job %d, “%s” to foreground because it is not under job control" #, c-format msgid "%s: Can't put job %s, '%s' to background because it is not under job control" msgstr "" #, c-format -msgid "%s: Cannot combine options %s\n" +msgid "%s: Cannot combine options %s" msgstr "" #, c-format -msgid "%s: Cannot specify multiple positions\n" +msgid "%s: Cannot specify multiple positions" msgstr "" #, c-format -msgid "%s: Cannot specify multiple regex patterns\n" +msgid "%s: Cannot specify multiple regex patterns" msgstr "" #, c-format -msgid "%s: Cannot specify multiple set-cursor options\n" +msgid "%s: Cannot specify multiple set-cursor options" msgstr "" #, c-format @@ -340,24 +317,24 @@ msgid "%s: Cannot use --append or --prepend when assigning to a slice" msgstr "" #, c-format -msgid "%s: Command not valid at an interactive prompt\n" +msgid "%s: Command not valid at an interactive prompt" msgstr "" #, c-format -msgid "%s: Could not find '%s'\n" +msgid "%s: Could not find '%s'" msgstr "" #, c-format -msgid "%s: Could not find a job with process ID '%d'\n" +msgid "%s: Could not find a job with process ID '%d'" msgstr "" #, c-format -msgid "%s: Could not find child processes with the name '%s'\n" +msgid "%s: Could not find child processes with the name '%s'" msgstr "" #, c-format -msgid "%s: Could not find home directory\n" -msgstr "%s: Could not find home directory\n" +msgid "%s: Could not find home directory" +msgstr "%s: Could not find home directory" #, c-format msgid "%s: Could not find job '%d'" @@ -368,63 +345,63 @@ msgid "%s: Did you mean `set %s %s`?" msgstr "" #, c-format -msgid "%s: Empty directory '%s' does not exist\n" +msgid "%s: Empty directory '%s' does not exist" msgstr "" #, c-format -msgid "%s: Error encountered while sourcing file '%s':\n" -msgstr "%s: Error encountered while sourcing file “%s”:\n" +msgid "%s: Error encountered while sourcing file '%s':" +msgstr "%s: Error encountered while sourcing file “%s”:" #, c-format -msgid "%s: Error while reading file '%s'\n" -msgstr "%s: Error while reading file “%s”\n" +msgid "%s: Error while reading file '%s'" +msgstr "%s: Error while reading file “%s”" + +#, c-format +msgid "%s: Expected %s for %s" +msgstr "" #, c-format msgid "%s: Expected at least one argument" msgstr "" #, c-format -msgid "%s: Expected exactly one function name\n" -msgstr "%s: Expected exactly one function name\n" +msgid "%s: Expected exactly one function name" +msgstr "%s: Expected exactly one function name" #, c-format -msgid "%s: Expected exactly two names (current function name, and new function name)\n" -msgstr "%s: Expected exactly two names (current function name, and new function name)\n" +msgid "%s: Expected exactly two names (current function name, and new function name)" +msgstr "%s: Expected exactly two names (current function name, and new function name)" #, c-format -msgid "%s: Expected generic | variable | signal | exit | job-id for --handlers-type\n" +msgid "%s: Function '%s' already exists. Cannot create copy of '%s'" msgstr "" #, c-format -msgid "%s: Function '%s' already exists. Cannot create copy of '%s'\n" +msgid "%s: Function '%s' does not exist" +msgstr "%s: Function “%s” does not exist" + +#, c-format +msgid "%s: Illegal function name '%s'" +msgstr "%s: Illegal function name “%s”" + +#, c-format +msgid "%s: Implicit int flag '%c' already defined" msgstr "" #, c-format -msgid "%s: Function '%s' does not exist\n" -msgstr "%s: Function “%s” does not exist\n" - -#, c-format -msgid "%s: Illegal function name '%s'\n" -msgstr "%s: Illegal function name “%s”\n" - -#, c-format -msgid "%s: Implicit int flag '%c' already defined\n" +msgid "%s: Implicit int short flag '%c' does not allow modifiers like '%c'" msgstr "" #, c-format -msgid "%s: Implicit int short flag '%c' does not allow modifiers like '%c'\n" +msgid "%s: Invalid --max-args value '%s'" msgstr "" #, c-format -msgid "%s: Invalid --max-args value '%s'\n" +msgid "%s: Invalid --min-args value '%s'" msgstr "" #, c-format -msgid "%s: Invalid --min-args value '%s'\n" -msgstr "" - -#, c-format -msgid "%s: Invalid --unknown-arguments value '%s'\n" +msgid "%s: Invalid --unknown-arguments value '%s'" msgstr "" #, c-format @@ -432,35 +409,31 @@ msgid "%s: Invalid count value '%s'" msgstr "" #, c-format -msgid "%s: Invalid count value '%s'\n" +msgid "%s: Invalid end value '%s'" msgstr "" #, c-format -msgid "%s: Invalid end value '%s'\n" +msgid "%s: Invalid escape style '%s'" msgstr "" #, c-format -msgid "%s: Invalid escape style '%s'\n" +msgid "%s: Invalid fields value '%s'" msgstr "" #, c-format -msgid "%s: Invalid fields value '%s'\n" +msgid "%s: Invalid function name: %s" msgstr "" #, c-format -msgid "%s: Invalid function name: %s\n" -msgstr "" - -#, c-format -msgid "%s: Invalid index starting at '%s'\n" -msgstr "%s: Invalid index starting at “%s”\n" +msgid "%s: Invalid index starting at '%s'" +msgstr "%s: Invalid index starting at “%s”" #, c-format msgid "%s: Invalid job control mode '%s'" msgstr "" #, c-format -msgid "%s: Invalid length value '%s'\n" +msgid "%s: Invalid length value '%s'" msgstr "" #, c-format @@ -472,19 +445,19 @@ msgid "%s: Invalid limit '%s'" msgstr "" #, c-format -msgid "%s: Invalid max matches value '%s'\n" +msgid "%s: Invalid max matches value '%s'" msgstr "" #, c-format -msgid "%s: Invalid max value '%s'\n" +msgid "%s: Invalid max value '%s'" msgstr "" #, c-format -msgid "%s: Invalid option spec '%s' at char '%c'\n" +msgid "%s: Invalid option spec '%s' at char '%c'" msgstr "" #, c-format -msgid "%s: Invalid padding character of width zero '%s'\n" +msgid "%s: Invalid padding character of width zero '%s'" msgstr "" #, c-format @@ -492,11 +465,11 @@ msgid "%s: Invalid permission '%s'" msgstr "" #, c-format -msgid "%s: Invalid position '%s'\n" +msgid "%s: Invalid position '%s'" msgstr "" #, c-format -msgid "%s: Invalid range value for field '%s'\n" +msgid "%s: Invalid range value for field '%s'" msgstr "" #, c-format @@ -504,19 +477,19 @@ msgid "%s: Invalid sort key '%s'" msgstr "" #, c-format -msgid "%s: Invalid start value '%s'\n" +msgid "%s: Invalid start value '%s'" msgstr "" #, c-format -msgid "%s: Invalid state\n" -msgstr "%s: Invalid state\n" +msgid "%s: Invalid state" +msgstr "%s: Invalid state" #, c-format -msgid "%s: Invalid style value '%s'\n" +msgid "%s: Invalid style value '%s'" msgstr "" #, c-format -msgid "%s: Invalid token '%s'\n" +msgid "%s: Invalid token '%s'" msgstr "" #, c-format @@ -524,23 +497,23 @@ msgid "%s: Invalid type '%s'" msgstr "" #, c-format -msgid "%s: Invalid value for '--color' option: '%s'. Expected 'always', 'never', or 'auto'\n" +msgid "%s: Invalid value for '--color' option: '%s'. Expected 'always', 'never', or 'auto'" msgstr "" #, c-format -msgid "%s: Invalid width value '%s'\n" +msgid "%s: Invalid width value '%s'" msgstr "" #, c-format -msgid "%s: Key not specified\n" -msgstr "%s: Key not specified\n" +msgid "%s: Key not specified" +msgstr "%s: Key not specified" #, c-format -msgid "%s: Long flag '%s' already defined\n" +msgid "%s: Long flag '%s' already defined" msgstr "" #, c-format -msgid "%s: Missing -- separator\n" +msgid "%s: Missing -- separator" msgstr "" #, c-format @@ -548,28 +521,28 @@ msgid "%s: New limit cannot be an empty string" msgstr "" #, c-format -msgid "%s: No binding found for key '%s'\n" -msgstr "%s: No binding found for key “%s”\n" +msgid "%s: No binding found for key '%s'" +msgstr "%s: No binding found for key “%s”" #, c-format -msgid "%s: No binding found for key sequence '%s'\n" +msgid "%s: No binding found for key sequence '%s'" msgstr "" #, c-format -msgid "%s: No blocks defined\n" -msgstr "%s: No blocks defined\n" +msgid "%s: No blocks defined" +msgstr "%s: No blocks defined" #, c-format -msgid "%s: No suitable job: %d\n" -msgstr "%s: No suitable job: %d\n" +msgid "%s: No suitable job: %d" +msgstr "%s: No suitable job: %d" #, c-format msgid "%s: No suitable job: %s" msgstr "" #, c-format -msgid "%s: Not inside of loop\n" -msgstr "%s: Not inside of loop\n" +msgid "%s: Not inside of loop" +msgstr "%s: Not inside of loop" #, c-format msgid "%s: Number out of range" @@ -580,16 +553,16 @@ msgid "%s: Number was empty" msgstr "" #, c-format -msgid "%s: Options %s and %s cannot be used together\n" +msgid "%s: Options %s and %s cannot be used together" msgstr "" #, c-format -msgid "%s: Padding should be a character '%s'\n" +msgid "%s: Padding should be a character '%s'" msgstr "" #, c-format -msgid "%s: Permission denied: '%s'\n" -msgstr "%s: Permission denied: “%s”\n" +msgid "%s: Permission denied: '%s'" +msgstr "%s: Permission denied: “%s”" #, c-format msgid "%s: Regular expression compile error: %s" @@ -604,23 +577,19 @@ msgid "%s: Resource limit not available on this operating system" msgstr "" #, c-format -msgid "%s: STEP must be a positive integer\n" +msgid "%s: Short flag '%c' already defined" msgstr "" #, c-format -msgid "%s: Short flag '%c' already defined\n" +msgid "%s: Short flag '%c' invalid, must be alphanum or '#'" msgstr "" #, c-format -msgid "%s: Short flag '%c' invalid, must be alphanum or '#'\n" -msgstr "" +msgid "%s: The directory '%s' does not exist" +msgstr "%s: The directory “%s” does not exist" #, c-format -msgid "%s: The directory '%s' does not exist\n" -msgstr "%s: The directory “%s” does not exist\n" - -#, c-format -msgid "%s: The variable '%s' does not exist\n" +msgid "%s: The variable '%s' does not exist" msgstr "" #, c-format @@ -632,32 +601,32 @@ msgid "%s: There are no suitable jobs" msgstr "%s: There are no suitable jobs" #, c-format -msgid "%s: Too many levels of symbolic links: '%s'\n" +msgid "%s: Too many levels of symbolic links: '%s'" msgstr "" #, c-format -msgid "%s: Too many long-only options\n" +msgid "%s: Too many long-only options" msgstr "" #, c-format -msgid "%s: Tried to change the read-only variable '%s'\n" -msgstr "%s: Tried to change the read-only variable “%s”\n" +msgid "%s: Tried to change the read-only variable '%s'" +msgstr "%s: Tried to change the read-only variable “%s”" #, c-format -msgid "%s: Tried to modify the special variable '%s' to an invalid value\n" +msgid "%s: Tried to modify the special variable '%s' to an invalid value" msgstr "" #, c-format -msgid "%s: Tried to modify the special variable '%s' with the wrong scope\n" +msgid "%s: Tried to modify the special variable '%s' with the wrong scope" msgstr "" #, c-format -msgid "%s: Unknown color '%s'\n" -msgstr "%s: Unknown color “%s”\n" +msgid "%s: Unknown color '%s'" +msgstr "%s: Unknown color “%s”" #, c-format -msgid "%s: Unknown error trying to locate directory '%s'\n" -msgstr "%s: Unknown error trying to locate directory “%s”\n" +msgid "%s: Unknown error trying to locate directory '%s'" +msgstr "%s: Unknown error trying to locate directory “%s”" #, c-format msgid "%s: Unknown input function '%s'" @@ -672,11 +641,11 @@ msgid "%s: Warning: Option '%s' was removed and is now ignored" msgstr "" #, c-format -msgid "%s: `set --show` does not allow slices with the var names\n" +msgid "%s: `set --show` does not allow slices with the var names" msgstr "" #, c-format -msgid "%s: array index out of bounds\n" +msgid "%s: array index out of bounds" msgstr "" #, c-format @@ -704,15 +673,15 @@ msgid "%s: cannot both path and unpath" msgstr "" #, c-format -msgid "%s: column %s exceeds line length\n" +msgid "%s: column %s exceeds line length" msgstr "" #, c-format -msgid "%s: exclusive flag '%s' is not valid\n" +msgid "%s: exclusive flag '%s' is not valid" msgstr "" #, c-format -msgid "%s: exclusive flag string '%s' is not valid\n" +msgid "%s: exclusive flag string '%s' is not valid" msgstr "" #, c-format @@ -736,7 +705,7 @@ msgid "%s: function name required" msgstr "" #, c-format -msgid "%s: given %d indexes but %d values\n" +msgid "%s: given %d indexes but %d values" msgstr "" #, c-format @@ -752,7 +721,7 @@ msgid "%s: invalid option combination, %s" msgstr "" #, c-format -msgid "%s: invalid underline style: %s\n" +msgid "%s: invalid underline style: %s" msgstr "" #, c-format @@ -768,7 +737,7 @@ msgid "%s: missing argument" msgstr "" #, c-format -msgid "%s: missing filename argument or input redirection\n" +msgid "%s: missing filename argument or input redirection" msgstr "" #, c-format @@ -776,11 +745,7 @@ msgid "%s: missing subcommand" msgstr "" #, c-format -msgid "%s: nothing to choose from\n" -msgstr "" - -#, c-format -msgid "%s: realpath failed: %s\n" +msgid "%s: nothing to choose from" msgstr "" #, c-format @@ -792,19 +757,19 @@ msgid "%s: setting cursor while evaluating 'complete --arguments' is not yet sup msgstr "" #, c-format -msgid "%s: stdin is closed\n" +msgid "%s: stdin is closed" msgstr "" #, c-format -msgid "%s: successfully set universal '%s'; but a global by that name shadows it\n" +msgid "%s: successfully set universal '%s'; but a global by that name shadows it" msgstr "" #, c-format -msgid "%s: the -k/--key syntax is no longer supported. See `bind --help` and `bind --key-names`\n" +msgid "%s: the -k/--key syntax is no longer supported. See `bind --help` and `bind --key-names`" msgstr "" #, c-format -msgid "%s: there is no line %s\n" +msgid "%s: there is no line %s" msgstr "" #, c-format @@ -812,7 +777,7 @@ msgid "%s: too many arguments" msgstr "" #, c-format -msgid "%s: usage of -i for --silent is deprecated. Please use -s or --silent instead.\n" +msgid "%s: usage of -i for --silent is deprecated. Please use -s or --silent instead." msgstr "" #, c-format @@ -820,7 +785,7 @@ msgid "%s: value not completely converted (can't convert '%s')" msgstr "" #, c-format -msgid "%s: variable '%s' is read-only\n" +msgid "%s: variable '%s' is read-only" msgstr "" #, c-format @@ -852,12 +817,19 @@ msgid "'}' does not take arguments. Did you forget a ';'?" msgstr "" #, c-format -msgid "(Type 'help %s' for related documentation)\n" +msgid "(%s)" +msgstr "" + +#, c-format +msgid "(Type 'help %s' for related documentation)" msgstr "" msgid "(no matches)" msgstr "(no matches)" +msgid "(read-only)" +msgstr "" + #, c-format msgid ", copied in %s @ line %d" msgstr "" @@ -1051,8 +1023,8 @@ msgid "Error when renaming file: %s" msgstr "" #, c-format -msgid "Error while reading file %s\n" -msgstr "Error while reading file %s\n" +msgid "Error while reading file %s" +msgstr "Error while reading file %s" msgid "Errors reported by exec (on by default)" msgstr "" @@ -1298,7 +1270,7 @@ msgid "Missing operator" msgstr "" #, c-format -msgid "Modification of read-only variable \"%s\" is not allowed\n" +msgid "Modification of read-only variable \"%s\" is not allowed" msgstr "" msgid "Negate exit status of job" @@ -1369,11 +1341,15 @@ msgstr "" msgid "Polite quit request" msgstr "Polite quit request" +#, c-format +msgid "Position must be one of: %s" +msgstr "" + msgid "Power failure" msgstr "Power failure" #, c-format -msgid "Press ctrl-%c again to exit\n" +msgid "Press ctrl-%c again to exit" msgstr "" msgid "Print arguments" @@ -1766,6 +1742,10 @@ msgstr "" msgid "autoloading" msgstr "" +#, c-format +msgid "builtin %s: %s failed: %s" +msgstr "" + #, c-format msgid "builtin %s: %s: %s" msgstr "" @@ -1774,10 +1754,6 @@ msgstr "" msgid "builtin %s: Invalid arg: %s" msgstr "" -#, c-format -msgid "builtin %s: realpath failed: %s" -msgstr "" - msgid "builtin history delete --exact requires --case-sensitive" msgstr "" @@ -1882,7 +1858,7 @@ msgid "stopped" msgstr "stopped" #, c-format -msgid "switch: Expected at most one argument, got %u\n" +msgid "switch: Expected at most one argument, got %u" msgstr "" msgid "symlink" diff --git a/localization/po/fr.po b/localization/po/fr.po index 9a5ab3744..dbcbab6f3 100644 --- a/localization/po/fr.po +++ b/localization/po/fr.po @@ -156,13 +156,6 @@ msgstr "" msgid " PID Command" msgstr " PID Commande" -#, c-format -msgid " (%s)\n" -msgstr " (%s)\n" - -msgid " (read-only)\n" -msgstr " (lecture seule)\n" - msgid " a path variable" msgstr " une variable de chemin" @@ -184,8 +177,8 @@ msgid "$%c is not a valid variable in fish." msgstr "$%c est un nom de variable invalide dans fish." #, c-format -msgid "$%s: originally inherited as |%s|\n" -msgstr "$%s : hérité comme |%s|\n" +msgid "$%s: originally inherited as |%s|" +msgstr "$%s : hérité comme |%s|" #, c-format msgid "$%s: set in %s scope, %s,%s with %d elements" @@ -213,36 +206,36 @@ msgid "%s %s: %s: invalid subcommand" msgstr "%s %s : %s : sous-commande invalide" #, c-format -msgid "%s %s: Abbreviation %s already exists for commands %s, cannot rename %s\n" +msgid "%s %s: Abbreviation %s already exists for commands %s, cannot rename %s" msgstr "" #, c-format -msgid "%s %s: Abbreviation %s already exists, cannot rename %s\n" -msgstr "%s %s : l’abréviation %s existe déjà ; impossible de renommer %s\n" +msgid "%s %s: Abbreviation %s already exists, cannot rename %s" +msgstr "%s %s : l’abréviation %s existe déjà ; impossible de renommer %s" #, c-format -msgid "%s %s: Abbreviation '%s' cannot have spaces in the word\n" -msgstr "%s %s : l’abréviation « %s » ne peut pas avoir d’espaces dans son nom\n" +msgid "%s %s: Abbreviation '%s' cannot have spaces in the word" +msgstr "%s %s : l’abréviation « %s » ne peut pas avoir d’espaces dans son nom" #, c-format -msgid "%s %s: Name cannot be empty\n" -msgstr "%s %s : le nom ne peut pas être vide\n" +msgid "%s %s: Name cannot be empty" +msgstr "%s %s : le nom ne peut pas être vide" #, fuzzy, c-format -msgid "%s %s: No abbreviation named %s with the specified command restrictions\n" -msgstr "%s %s : aucune abréviation nommée %s\n" +msgid "%s %s: No abbreviation named %s with the specified command restrictions" +msgstr "%s %s : aucune abréviation nommée %s" #, c-format -msgid "%s %s: Requires at least two arguments\n" -msgstr "%s %s : doit être utilisée avec au moins deux arguments\n" +msgid "%s %s: Requires at least two arguments" +msgstr "%s %s : doit être utilisée avec au moins deux arguments" #, c-format -msgid "%s %s: Requires exactly two arguments\n" -msgstr "%s %s : doit être utilisée avec exactement deux arguments\n" +msgid "%s %s: Requires exactly two arguments" +msgstr "%s %s : doit être utilisée avec exactement deux arguments" #, c-format -msgid "%s %s: Unexpected argument -- '%s'\n" -msgstr "%s %s : argument inattendu -- « %s »\n" +msgid "%s %s: Unexpected argument -- '%s'" +msgstr "%s %s : argument inattendu -- « %s »" #, c-format msgid "%s %s: unrecognized feature '%s'" @@ -269,12 +262,12 @@ msgid "%s could not read response to Primary Device Attribute query after waitin msgstr "%s n’a pas pu lire de réponse à une requête « Primary Device Attribute » après avoir attendu %d secondes. Ceci est souvent dû à une fonctionnalité manquante de votre terminal. Voir « help %s » ou « man fish-terminal-compatibility ». Le processus %s va désormais ignorer les requêtes en attente, ce qui désactive quelques fonctionnalités optionnelles." #, c-format -msgid "%s is %s\n" -msgstr "%s est %s\n" +msgid "%s is %s" +msgstr "%s est %s" #, c-format -msgid "%s is a builtin\n" -msgstr "%s est intégré\n" +msgid "%s is a builtin" +msgstr "%s est intégré" #, c-format msgid "%s is a function" @@ -288,10 +281,6 @@ msgstr "" msgid "%s, version %s" msgstr "%s, version %s" -#, c-format -msgid "%s, version %s\n" -msgstr "%s, version %s\n" - #, c-format msgid "%s: %s" msgstr "%s : %s" @@ -300,6 +289,22 @@ msgstr "%s : %s" msgid "%s: %s %s: options cannot be used together" msgstr "%s : %s %s : ces options ne peuvent pas être utilisées ensembles" +#, c-format +msgid "%s: %s failed: %s" +msgstr "" + +#, c-format +msgid "%s: %s must be a positive integer" +msgstr "" + +#, c-format +msgid "%s: %s option requires %s" +msgstr "%s : l’option %s doit être utilisée avec %s" + +#, c-format +msgid "%s: %s requires a non-empty string" +msgstr "%s : %s doit être utilisée avec une chaîne non-vide" + #, c-format msgid "%s: %s: cannot overwrite read-only variable" msgstr "%s : %s : impossible de surcharger une variable en lecture seule" @@ -309,16 +314,16 @@ msgid "%s: %s: cannot use reserved keyword as function name" msgstr "%s : %s : impossible d’utiliser un mot-clé réservé comme nom de fonction" #, c-format -msgid "%s: %s: contains a syntax error\n" -msgstr "%s : %s : contient une erreur de syntaxe\n" +msgid "%s: %s: contains a syntax error" +msgstr "%s : %s : contient une erreur de syntaxe" #, c-format msgid "%s: %s: expected %d arguments; got %d" msgstr "%s : %s : %d arguments attendus ; %d reçus" #, c-format -msgid "%s: %s: invalid base value\n" -msgstr "%s : %s : valeur de base invalide\n" +msgid "%s: %s: invalid base value" +msgstr "%s : %s : valeur de base invalide" #, c-format msgid "%s: %s: invalid function name" @@ -329,16 +334,16 @@ msgid "%s: %s: invalid integer" msgstr "%s : %s : entier invalide" #, c-format -msgid "%s: %s: invalid mode\n" -msgstr "%s : %s : mode invalide\n" +msgid "%s: %s: invalid mode" +msgstr "%s : %s : mode invalide" #, c-format msgid "%s: %s: invalid mode name. See `help %s`" msgstr "%s : %s : nom de mode invalide. Voir « help %s »" #, c-format -msgid "%s: %s: invalid scale\n" -msgstr "%s : %s : échelle invalide\n" +msgid "%s: %s: invalid scale" +msgstr "%s : %s : échelle invalide" #, c-format msgid "%s: %s: invalid subcommand" @@ -369,124 +374,96 @@ msgid "%s: %s: unknown option" msgstr "%s : %s : option inconnue" #, c-format -msgid "%s: '%s' is a broken symbolic link to '%s'\n" -msgstr "%s : « %s » est un lien symbolique cassé vers « %s »\n" +msgid "%s: '%s' is a broken symbolic link to '%s'" +msgstr "%s : « %s » est un lien symbolique cassé vers « %s »" #, c-format -msgid "%s: '%s' is not a directory\n" -msgstr "%s : « %s » n’est pas un dossier\n" +msgid "%s: '%s' is not a directory" +msgstr "%s : « %s » n’est pas un dossier" #, c-format -msgid "%s: '%s' is not a job\n" -msgstr "%s : « %s » n’est pas une tâche\n" +msgid "%s: '%s' is not a job" +msgstr "%s : « %s » n’est pas une tâche" #, c-format msgid "%s: '%s' is not a valid job ID" msgstr "%s : « %s » n’est pas un ID de tâche valide" #, c-format -msgid "%s: '%s' is not a valid process ID\n" -msgstr "%s : « %s » n’est pas un ID de processus valide\n" +msgid "%s: '%s' is not a valid process ID" +msgstr "%s : « %s » n’est pas un ID de processus valide" #, c-format msgid "%s: --command cannot be combined with --position=command" msgstr "%s : --command ne peut pas être utilisée avec l’option --position=command" #, c-format -msgid "%s: --function option requires --add\n" -msgstr "%s : l’option --function doit être utilisée avec --add\n" +msgid "%s: --set-cursor argument cannot be empty" +msgstr "%s : l’option --set-cursor ne peut pas être vide" #, c-format -msgid "%s: --position option requires --add\n" -msgstr "%s : l’option --position doit être utilisée avec --add\n" +msgid "%s: Ambiguous job" +msgstr "%s : Tâche ambiguë" #, c-format -msgid "%s: --regex option requires --add\n" -msgstr "%s : l’option --regex doit être utilisée avec --add\n" +msgid "%s: An option spec must have at least a short or a long flag" +msgstr "%s : Une spécification d’option doit avoir au moins un nom court ou long" #, c-format -msgid "%s: --set-cursor argument cannot be empty\n" -msgstr "%s : l’option --set-cursor ne peut pas être vide\n" +msgid "%s: Argument '%s' is out of range" +msgstr "%s : L’argument « %s » est hors limites" #, c-format -msgid "%s: --set-cursor option requires --add\n" -msgstr "%s : l’option --set-cursor doit être utilisée avec --add\n" +msgid "%s: Can not specify scope when removing block" +msgstr "%s : Ne peut pas indiquer la portée en enlevant le bloc" #, c-format -msgid "%s: -l requires a non-empty string\n" -msgstr "%s : -l doit être utilisée avec une chaîne non-vide\n" - -#, c-format -msgid "%s: -o requires a non-empty string\n" -msgstr "%s : -o doit être utilisée avec une chaîne non-vide\n" - -#, c-format -msgid "%s: -s requires a non-empty string\n" -msgstr "%s : -s doit être utilisée avec une chaîne non-vide\n" - -#, c-format -msgid "%s: Ambiguous job\n" -msgstr "%s : Tâche ambiguë\n" - -#, c-format -msgid "%s: An option spec must have at least a short or a long flag\n" -msgstr "%s : Une spécification d’option doit avoir au moins un nom court ou long\n" - -#, c-format -msgid "%s: Argument '%s' is out of range\n" -msgstr "%s : L’argument « %s » est hors limites\n" - -#, c-format -msgid "%s: Can not specify scope when removing block\n" -msgstr "%s : Ne peut pas indiquer la portée en enlevant le bloc\n" - -#, c-format -msgid "%s: Can't put job %d, '%s' to foreground because it is not under job control\n" -msgstr "%s : Impossible de mettre la tâche %d, « %s » au premier plan, car elle n’est pas gérée par le contrôleur de tâches\n" +msgid "%s: Can't put job %d, '%s' to foreground because it is not under job control" +msgstr "%s : Impossible de mettre la tâche %d, « %s » au premier plan, car elle n’est pas gérée par le contrôleur de tâches" #, c-format msgid "%s: Can't put job %s, '%s' to background because it is not under job control" msgstr "%s : Impossible de mettre la tâche %s, « %s » en arrière plan, car elle n’est pas gérée par le contrôleur de tâches" #, c-format -msgid "%s: Cannot combine options %s\n" -msgstr "%s : Impossible de combiner les options %s\n" +msgid "%s: Cannot combine options %s" +msgstr "%s : Impossible de combiner les options %s" #, c-format -msgid "%s: Cannot specify multiple positions\n" -msgstr "%s : Impossible de spécifier plusieurs positions\n" +msgid "%s: Cannot specify multiple positions" +msgstr "%s : Impossible de spécifier plusieurs positions" #, c-format -msgid "%s: Cannot specify multiple regex patterns\n" -msgstr "%s : Impossible de spécifier plusieurs expressions régulières\n" +msgid "%s: Cannot specify multiple regex patterns" +msgstr "%s : Impossible de spécifier plusieurs expressions régulières" #, c-format -msgid "%s: Cannot specify multiple set-cursor options\n" -msgstr "%s : Impossible de spécifier plusieurs options set-cursor\n" +msgid "%s: Cannot specify multiple set-cursor options" +msgstr "%s : Impossible de spécifier plusieurs options set-cursor" #, c-format msgid "%s: Cannot use --append or --prepend when assigning to a slice" msgstr "%s : Impossible d’utiliser --append ou --prepend lors de l’assignation à une tranche" #, c-format -msgid "%s: Command not valid at an interactive prompt\n" -msgstr "%s : Commande invalide dans une invite interactive\n" +msgid "%s: Command not valid at an interactive prompt" +msgstr "%s : Commande invalide dans une invite interactive" #, c-format -msgid "%s: Could not find '%s'\n" -msgstr "%s : Impossible de trouver « %s »\n" +msgid "%s: Could not find '%s'" +msgstr "%s : Impossible de trouver « %s »" #, c-format -msgid "%s: Could not find a job with process ID '%d'\n" -msgstr "%s : Impossible de trouver une tâche avec l’ID de processus « %d »\n" +msgid "%s: Could not find a job with process ID '%d'" +msgstr "%s : Impossible de trouver une tâche avec l’ID de processus « %d »" #, c-format -msgid "%s: Could not find child processes with the name '%s'\n" -msgstr "%s : Impossible de trouver des processus enfants avec le nom « %s »\n" +msgid "%s: Could not find child processes with the name '%s'" +msgstr "%s : Impossible de trouver des processus enfants avec le nom « %s »" #, c-format -msgid "%s: Could not find home directory\n" -msgstr "%s : Dossier personnel introuvable\n" +msgid "%s: Could not find home directory" +msgstr "%s : Dossier personnel introuvable" #, c-format msgid "%s: Could not find job '%d'" @@ -497,100 +474,96 @@ msgid "%s: Did you mean `set %s %s`?" msgstr "%s : Vouliez-vous dire « set %s %s » ?" #, c-format -msgid "%s: Empty directory '%s' does not exist\n" -msgstr "%s : Le dossier vide « %s » n’existe pas\n" +msgid "%s: Empty directory '%s' does not exist" +msgstr "%s : Le dossier vide « %s » n’existe pas" #, c-format -msgid "%s: Error encountered while sourcing file '%s':\n" -msgstr "%s : Erreur lors de l’inclusion du fichier « %s »\n" +msgid "%s: Error encountered while sourcing file '%s':" +msgstr "%s : Erreur lors de l’inclusion du fichier « %s »" #, c-format -msgid "%s: Error while reading file '%s'\n" -msgstr "%s : Erreur lors de la lecture du fichier « %s »\n" +msgid "%s: Error while reading file '%s'" +msgstr "%s : Erreur lors de la lecture du fichier « %s »" + +#, c-format +msgid "%s: Expected %s for %s" +msgstr "%s : Seul %s est attendu comme valeur pour %s" #, c-format msgid "%s: Expected at least one argument" msgstr "%s : Au moins un argument est attendu" #, c-format -msgid "%s: Expected exactly one function name\n" -msgstr "%s : Exactement un nom de fonction est attendu\n" +msgid "%s: Expected exactly one function name" +msgstr "%s : Exactement un nom de fonction est attendu" #, c-format -msgid "%s: Expected exactly two names (current function name, and new function name)\n" -msgstr "%s : Exactement deux noms sont attendus (ancien et nouveau nom de fonction)\n" +msgid "%s: Expected exactly two names (current function name, and new function name)" +msgstr "%s : Exactement deux noms sont attendus (ancien et nouveau nom de fonction)" #, c-format -msgid "%s: Expected generic | variable | signal | exit | job-id for --handlers-type\n" -msgstr "%s : Seul generic | variable | signal | exit | job-id est attendu comme valeur pour --handlers-type\n" +msgid "%s: Function '%s' already exists. Cannot create copy of '%s'" +msgstr "%s : La fonction « %s » existe déjà. Impossible de créer la copie de « %s »" #, c-format -msgid "%s: Function '%s' already exists. Cannot create copy of '%s'\n" -msgstr "%s : La fonction « %s » existe déjà. Impossible de créer la copie de « %s »\n" +msgid "%s: Function '%s' does not exist" +msgstr "%s : La fonction « %s » n’existe pas" #, c-format -msgid "%s: Function '%s' does not exist\n" -msgstr "%s : La fonction « %s » n’existe pas\n" +msgid "%s: Illegal function name '%s'" +msgstr "%s : « %s » est un nom de fonction incorrect" #, c-format -msgid "%s: Illegal function name '%s'\n" -msgstr "%s : « %s » est un nom de fonction incorrect\n" +msgid "%s: Implicit int flag '%c' already defined" +msgstr "%s : Le sémaphore implicitement entier « %c » est déjà défini" #, c-format -msgid "%s: Implicit int flag '%c' already defined\n" -msgstr "%s : Le sémaphore implicitement entier « %c » est déjà défini\n" +msgid "%s: Implicit int short flag '%c' does not allow modifiers like '%c'" +msgstr "%s : Le sémaphore court implicitement entier « %c » n’autorise pas de modificateurs comme « %c »" #, c-format -msgid "%s: Implicit int short flag '%c' does not allow modifiers like '%c'\n" -msgstr "%s : Le sémaphore court implicitement entier « %c » n’autorise pas de modificateurs comme « %c »\n" +msgid "%s: Invalid --max-args value '%s'" +msgstr "%s : La valeur « %s » de --max-args est invalide" #, c-format -msgid "%s: Invalid --max-args value '%s'\n" -msgstr "%s : La valeur « %s » de --max-args est invalide\n" +msgid "%s: Invalid --min-args value '%s'" +msgstr "%s : La valeur « %s » de --min-args est invalide" #, c-format -msgid "%s: Invalid --min-args value '%s'\n" -msgstr "%s : La valeur « %s » de --min-args est invalide\n" - -#, c-format -msgid "%s: Invalid --unknown-arguments value '%s'\n" -msgstr "%s : La valeur « %s » de --unknown-arguments est invalide\n" +msgid "%s: Invalid --unknown-arguments value '%s'" +msgstr "%s : La valeur « %s » de --unknown-arguments est invalide" #, c-format msgid "%s: Invalid count value '%s'" msgstr "%s : La valeur « %s » de « count » est invalide" #, c-format -msgid "%s: Invalid count value '%s'\n" -msgstr "%s : La valeur « %s » de « count » est invalide\n" +msgid "%s: Invalid end value '%s'" +msgstr "%s : La valeur « %s » de « end » est invalide" #, c-format -msgid "%s: Invalid end value '%s'\n" -msgstr "%s : La valeur « %s » de « end » est invalide\n" +msgid "%s: Invalid escape style '%s'" +msgstr "%s : Le style d’échappement « %s » est invalide" #, c-format -msgid "%s: Invalid escape style '%s'\n" -msgstr "%s : Le style d’échappement « %s » est invalide\n" +msgid "%s: Invalid fields value '%s'" +msgstr "%s : La valeur « %s » de « fields » est invalide" #, c-format -msgid "%s: Invalid fields value '%s'\n" -msgstr "%s : La valeur « %s » de « fields » est invalide\n" +msgid "%s: Invalid function name: %s" +msgstr "%s : Nom de fonction invalide : %s" #, c-format -msgid "%s: Invalid function name: %s\n" -msgstr "%s : Nom de fonction invalide : %s\n" - -#, c-format -msgid "%s: Invalid index starting at '%s'\n" -msgstr "%s : Indice invalide à partir de « %s »\n" +msgid "%s: Invalid index starting at '%s'" +msgstr "%s : Indice invalide à partir de « %s »" #, c-format msgid "%s: Invalid job control mode '%s'" msgstr "%s : Mode de contrôle de tâche « %s » invalide" #, c-format -msgid "%s: Invalid length value '%s'\n" -msgstr "%s : La valeur de taille « %s » est invalide\n" +msgid "%s: Invalid length value '%s'" +msgstr "%s : La valeur de taille « %s » est invalide" #, c-format msgid "%s: Invalid level value '%s'" @@ -601,19 +574,19 @@ msgid "%s: Invalid limit '%s'" msgstr "%s : La limite « %s » est invalide" #, c-format -msgid "%s: Invalid max matches value '%s'\n" +msgid "%s: Invalid max matches value '%s'" msgstr "" #, c-format -msgid "%s: Invalid max value '%s'\n" -msgstr "%s : Valeur maximale « %s » invalide\n" +msgid "%s: Invalid max value '%s'" +msgstr "%s : Valeur maximale « %s » invalide" #, c-format -msgid "%s: Invalid option spec '%s' at char '%c'\n" -msgstr "%s : Option invalide « %s » au caractère « %c »\n" +msgid "%s: Invalid option spec '%s' at char '%c'" +msgstr "%s : Option invalide « %s » au caractère « %c »" #, c-format -msgid "%s: Invalid padding character of width zero '%s'\n" +msgid "%s: Invalid padding character of width zero '%s'" msgstr "" #, c-format @@ -621,11 +594,11 @@ msgid "%s: Invalid permission '%s'" msgstr "" #, c-format -msgid "%s: Invalid position '%s'\n" +msgid "%s: Invalid position '%s'" msgstr "" #, c-format -msgid "%s: Invalid range value for field '%s'\n" +msgid "%s: Invalid range value for field '%s'" msgstr "" #, c-format @@ -633,72 +606,72 @@ msgid "%s: Invalid sort key '%s'" msgstr "" #, c-format -msgid "%s: Invalid start value '%s'\n" -msgstr "%s : Indice de départ « %s » invalide\n" +msgid "%s: Invalid start value '%s'" +msgstr "%s : Indice de départ « %s » invalide" #, c-format -msgid "%s: Invalid state\n" -msgstr "%s : État invalide\n" +msgid "%s: Invalid state" +msgstr "%s : État invalide" #, c-format -msgid "%s: Invalid style value '%s'\n" +msgid "%s: Invalid style value '%s'" msgstr "" #, c-format -msgid "%s: Invalid token '%s'\n" -msgstr "%s : Lexème invalide « %s »\n" +msgid "%s: Invalid token '%s'" +msgstr "%s : Lexème invalide « %s »" #, c-format msgid "%s: Invalid type '%s'" msgstr "" #, c-format -msgid "%s: Invalid value for '--color' option: '%s'. Expected 'always', 'never', or 'auto'\n" -msgstr "%s : Valeur invalide pour l'option '--color' : '%s'. Attendu 'always', 'never' ou 'auto'\n" +msgid "%s: Invalid value for '--color' option: '%s'. Expected 'always', 'never', or 'auto'" +msgstr "%s : Valeur invalide pour l'option '--color' : '%s'. Attendu 'always', 'never' ou 'auto'" #, c-format -msgid "%s: Invalid width value '%s'\n" +msgid "%s: Invalid width value '%s'" msgstr "" #, c-format -msgid "%s: Key not specified\n" -msgstr "%s : Clé non spécifiée\n" +msgid "%s: Key not specified" +msgstr "%s : Clé non spécifiée" #, c-format -msgid "%s: Long flag '%s' already defined\n" +msgid "%s: Long flag '%s' already defined" msgstr "" #, c-format -msgid "%s: Missing -- separator\n" -msgstr "%s : Séparateur -- manquant\n" +msgid "%s: Missing -- separator" +msgstr "%s : Séparateur -- manquant" #, c-format msgid "%s: New limit cannot be an empty string" msgstr "%s : La nouvelle limite ne peut être une chaîne vide" #, c-format -msgid "%s: No binding found for key '%s'\n" -msgstr "%s : Aucun lien trouvé pour la combinaison %s\n" +msgid "%s: No binding found for key '%s'" +msgstr "%s : Aucun lien trouvé pour la combinaison %s" #, c-format -msgid "%s: No binding found for key sequence '%s'\n" +msgid "%s: No binding found for key sequence '%s'" msgstr "" #, c-format -msgid "%s: No blocks defined\n" -msgstr "%s : Aucun bloc défini\n" +msgid "%s: No blocks defined" +msgstr "%s : Aucun bloc défini" #, c-format -msgid "%s: No suitable job: %d\n" -msgstr "%s : Aucune tâche appropriée : %d\n" +msgid "%s: No suitable job: %d" +msgstr "%s : Aucune tâche appropriée : %d" #, c-format msgid "%s: No suitable job: %s" msgstr "" #, c-format -msgid "%s: Not inside of loop\n" -msgstr "%s : À l’extérieur de toute boucle\n" +msgid "%s: Not inside of loop" +msgstr "%s : À l’extérieur de toute boucle" #, c-format msgid "%s: Number out of range" @@ -709,16 +682,16 @@ msgid "%s: Number was empty" msgstr "" #, c-format -msgid "%s: Options %s and %s cannot be used together\n" +msgid "%s: Options %s and %s cannot be used together" msgstr "" #, c-format -msgid "%s: Padding should be a character '%s'\n" +msgid "%s: Padding should be a character '%s'" msgstr "" #, c-format -msgid "%s: Permission denied: '%s'\n" -msgstr "%s : Permission refusée « %s »\n" +msgid "%s: Permission denied: '%s'" +msgstr "%s : Permission refusée « %s »" #, c-format msgid "%s: Regular expression compile error: %s" @@ -733,23 +706,19 @@ msgid "%s: Resource limit not available on this operating system" msgstr "" #, c-format -msgid "%s: STEP must be a positive integer\n" +msgid "%s: Short flag '%c' already defined" msgstr "" #, c-format -msgid "%s: Short flag '%c' already defined\n" -msgstr "" +msgid "%s: Short flag '%c' invalid, must be alphanum or '#'" +msgstr "%s : Le sémaphore « %c » est invalide : il doit être alphanumérique ou valoir « # »" #, c-format -msgid "%s: Short flag '%c' invalid, must be alphanum or '#'\n" -msgstr "%s : Le sémaphore « %c » est invalide : il doit être alphanumérique ou valoir « # »\n" +msgid "%s: The directory '%s' does not exist" +msgstr "%s : Le dossier « %s » n’existe pas" #, c-format -msgid "%s: The directory '%s' does not exist\n" -msgstr "%s : Le dossier « %s » n’existe pas\n" - -#, c-format -msgid "%s: The variable '%s' does not exist\n" +msgid "%s: The variable '%s' does not exist" msgstr "" #, c-format @@ -761,32 +730,32 @@ msgid "%s: There are no suitable jobs" msgstr "%s : Aucune tâche appropriée" #, c-format -msgid "%s: Too many levels of symbolic links: '%s'\n" +msgid "%s: Too many levels of symbolic links: '%s'" msgstr "" #, c-format -msgid "%s: Too many long-only options\n" +msgid "%s: Too many long-only options" msgstr "" #, c-format -msgid "%s: Tried to change the read-only variable '%s'\n" -msgstr "%s : Impossible de modifier la variable en lecture seule « %s »\n" +msgid "%s: Tried to change the read-only variable '%s'" +msgstr "%s : Impossible de modifier la variable en lecture seule « %s »" #, c-format -msgid "%s: Tried to modify the special variable '%s' to an invalid value\n" +msgid "%s: Tried to modify the special variable '%s' to an invalid value" msgstr "" #, c-format -msgid "%s: Tried to modify the special variable '%s' with the wrong scope\n" +msgid "%s: Tried to modify the special variable '%s' with the wrong scope" msgstr "" #, c-format -msgid "%s: Unknown color '%s'\n" -msgstr "%s : Couleur « %s » inconnue\n" +msgid "%s: Unknown color '%s'" +msgstr "%s : Couleur « %s » inconnue" #, c-format -msgid "%s: Unknown error trying to locate directory '%s'\n" -msgstr "%s : Erreur inconnue en tentant de localiser le dossier « %s »\n" +msgid "%s: Unknown error trying to locate directory '%s'" +msgstr "%s : Erreur inconnue en tentant de localiser le dossier « %s »" #, c-format msgid "%s: Unknown input function '%s'" @@ -801,11 +770,11 @@ msgid "%s: Warning: Option '%s' was removed and is now ignored" msgstr "" #, c-format -msgid "%s: `set --show` does not allow slices with the var names\n" -msgstr "%s : « set --show » n’autorise pas de tranches avec les noms des variables\n" +msgid "%s: `set --show` does not allow slices with the var names" +msgstr "%s : « set --show » n’autorise pas de tranches avec les noms des variables" #, c-format -msgid "%s: array index out of bounds\n" +msgid "%s: array index out of bounds" msgstr "" #, c-format @@ -833,16 +802,16 @@ msgid "%s: cannot both path and unpath" msgstr "" #, c-format -msgid "%s: column %s exceeds line length\n" +msgid "%s: column %s exceeds line length" msgstr "" #, c-format -msgid "%s: exclusive flag '%s' is not valid\n" -msgstr "%s : le sémaphore exclusif « %s » est invalide\n" +msgid "%s: exclusive flag '%s' is not valid" +msgstr "%s : le sémaphore exclusif « %s » est invalide" #, c-format -msgid "%s: exclusive flag string '%s' is not valid\n" -msgstr "%s : le sémaphore texte exclusif « %s » est invalide\n" +msgid "%s: exclusive flag string '%s' is not valid" +msgstr "%s : le sémaphore texte exclusif « %s » est invalide" #, c-format msgid "%s: expected %d arguments; got %d" @@ -865,7 +834,7 @@ msgid "%s: function name required" msgstr "" #, c-format -msgid "%s: given %d indexes but %d values\n" +msgid "%s: given %d indexes but %d values" msgstr "" #, c-format @@ -881,7 +850,7 @@ msgid "%s: invalid option combination, %s" msgstr "" #, c-format -msgid "%s: invalid underline style: %s\n" +msgid "%s: invalid underline style: %s" msgstr "" #, c-format @@ -897,7 +866,7 @@ msgid "%s: missing argument" msgstr "" #, c-format -msgid "%s: missing filename argument or input redirection\n" +msgid "%s: missing filename argument or input redirection" msgstr "" #, c-format @@ -905,11 +874,7 @@ msgid "%s: missing subcommand" msgstr "" #, c-format -msgid "%s: nothing to choose from\n" -msgstr "" - -#, c-format -msgid "%s: realpath failed: %s\n" +msgid "%s: nothing to choose from" msgstr "" #, c-format @@ -921,19 +886,19 @@ msgid "%s: setting cursor while evaluating 'complete --arguments' is not yet sup msgstr "" #, c-format -msgid "%s: stdin is closed\n" +msgid "%s: stdin is closed" msgstr "" #, c-format -msgid "%s: successfully set universal '%s'; but a global by that name shadows it\n" +msgid "%s: successfully set universal '%s'; but a global by that name shadows it" msgstr "" #, c-format -msgid "%s: the -k/--key syntax is no longer supported. See `bind --help` and `bind --key-names`\n" +msgid "%s: the -k/--key syntax is no longer supported. See `bind --help` and `bind --key-names`" msgstr "" #, c-format -msgid "%s: there is no line %s\n" +msgid "%s: there is no line %s" msgstr "" #, c-format @@ -941,7 +906,7 @@ msgid "%s: too many arguments" msgstr "" #, c-format -msgid "%s: usage of -i for --silent is deprecated. Please use -s or --silent instead.\n" +msgid "%s: usage of -i for --silent is deprecated. Please use -s or --silent instead." msgstr "" #, c-format @@ -949,7 +914,7 @@ msgid "%s: value not completely converted (can't convert '%s')" msgstr "" #, c-format -msgid "%s: variable '%s' is read-only\n" +msgid "%s: variable '%s' is read-only" msgstr "" #, c-format @@ -981,12 +946,19 @@ msgid "'}' does not take arguments. Did you forget a ';'?" msgstr "" #, c-format -msgid "(Type 'help %s' for related documentation)\n" +msgid "(%s)" +msgstr "(%s)" + +#, c-format +msgid "(Type 'help %s' for related documentation)" msgstr "" msgid "(no matches)" msgstr "(pas d’occurrence)" +msgid "(read-only)" +msgstr "(lecture seule)" + #, c-format msgid ", copied in %s @ line %d" msgstr "" @@ -1180,8 +1152,8 @@ msgid "Error when renaming file: %s" msgstr "" #, c-format -msgid "Error while reading file %s\n" -msgstr "Erreur lors de la lecture du fichier %s\n" +msgid "Error while reading file %s" +msgstr "Erreur lors de la lecture du fichier %s" msgid "Errors reported by exec (on by default)" msgstr "" @@ -1427,7 +1399,7 @@ msgid "Missing operator" msgstr "" #, c-format -msgid "Modification of read-only variable \"%s\" is not allowed\n" +msgid "Modification of read-only variable \"%s\" is not allowed" msgstr "" msgid "Negate exit status of job" @@ -1498,11 +1470,15 @@ msgstr "Veuillez paramétrer la variable d’environnement %s ou HOME avant de l msgid "Polite quit request" msgstr "Demande polie de quitter" +#, c-format +msgid "Position must be one of: %s" +msgstr "" + msgid "Power failure" msgstr "Panne de courant" #, c-format -msgid "Press ctrl-%c again to exit\n" +msgid "Press ctrl-%c again to exit" msgstr "" msgid "Print arguments" @@ -1895,6 +1871,10 @@ msgstr "" msgid "autoloading" msgstr "" +#, c-format +msgid "builtin %s: %s failed: %s" +msgstr "" + #, c-format msgid "builtin %s: %s: %s" msgstr "" @@ -1903,10 +1883,6 @@ msgstr "" msgid "builtin %s: Invalid arg: %s" msgstr "" -#, c-format -msgid "builtin %s: realpath failed: %s" -msgstr "" - msgid "builtin history delete --exact requires --case-sensitive" msgstr "" @@ -2011,7 +1987,7 @@ msgid "stopped" msgstr "arrêtée" #, c-format -msgid "switch: Expected at most one argument, got %u\n" +msgid "switch: Expected at most one argument, got %u" msgstr "" msgid "symlink" diff --git a/localization/po/pl.po b/localization/po/pl.po index 1ec63d5c9..2c7deb8e3 100644 --- a/localization/po/pl.po +++ b/localization/po/pl.po @@ -23,13 +23,6 @@ msgstr "" msgid " PID Command" msgstr "" -#, c-format -msgid " (%s)\n" -msgstr "" - -msgid " (read-only)\n" -msgstr "" - msgid " a path variable" msgstr "" @@ -51,7 +44,7 @@ msgid "$%c is not a valid variable in fish." msgstr "$%c nie jest prawidłową zmienną w fish." #, c-format -msgid "$%s: originally inherited as |%s|\n" +msgid "$%s: originally inherited as |%s|" msgstr "" #, c-format @@ -80,35 +73,35 @@ msgid "%s %s: %s: invalid subcommand" msgstr "" #, c-format -msgid "%s %s: Abbreviation %s already exists for commands %s, cannot rename %s\n" +msgid "%s %s: Abbreviation %s already exists for commands %s, cannot rename %s" msgstr "" #, c-format -msgid "%s %s: Abbreviation %s already exists, cannot rename %s\n" +msgid "%s %s: Abbreviation %s already exists, cannot rename %s" msgstr "" #, c-format -msgid "%s %s: Abbreviation '%s' cannot have spaces in the word\n" +msgid "%s %s: Abbreviation '%s' cannot have spaces in the word" msgstr "" #, c-format -msgid "%s %s: Name cannot be empty\n" +msgid "%s %s: Name cannot be empty" msgstr "" #, c-format -msgid "%s %s: No abbreviation named %s with the specified command restrictions\n" +msgid "%s %s: No abbreviation named %s with the specified command restrictions" msgstr "" #, c-format -msgid "%s %s: Requires at least two arguments\n" +msgid "%s %s: Requires at least two arguments" msgstr "" #, c-format -msgid "%s %s: Requires exactly two arguments\n" +msgid "%s %s: Requires exactly two arguments" msgstr "" #, c-format -msgid "%s %s: Unexpected argument -- '%s'\n" +msgid "%s %s: Unexpected argument -- '%s'" msgstr "" #, c-format @@ -136,11 +129,11 @@ msgid "%s could not read response to Primary Device Attribute query after waitin msgstr "" #, c-format -msgid "%s is %s\n" +msgid "%s is %s" msgstr "" #, c-format -msgid "%s is a builtin\n" +msgid "%s is a builtin" msgstr "" #, c-format @@ -155,10 +148,6 @@ msgstr "" msgid "%s, version %s" msgstr "" -#, c-format -msgid "%s, version %s\n" -msgstr "%s, wersja %s\n" - #, c-format msgid "%s: %s" msgstr "" @@ -167,6 +156,22 @@ msgstr "" msgid "%s: %s %s: options cannot be used together" msgstr "" +#, c-format +msgid "%s: %s failed: %s" +msgstr "" + +#, c-format +msgid "%s: %s must be a positive integer" +msgstr "" + +#, c-format +msgid "%s: %s option requires %s" +msgstr "" + +#, c-format +msgid "%s: %s requires a non-empty string" +msgstr "" + #, c-format msgid "%s: %s: cannot overwrite read-only variable" msgstr "" @@ -176,7 +181,7 @@ msgid "%s: %s: cannot use reserved keyword as function name" msgstr "" #, c-format -msgid "%s: %s: contains a syntax error\n" +msgid "%s: %s: contains a syntax error" msgstr "" #, c-format @@ -184,7 +189,7 @@ msgid "%s: %s: expected %d arguments; got %d" msgstr "" #, c-format -msgid "%s: %s: invalid base value\n" +msgid "%s: %s: invalid base value" msgstr "" #, c-format @@ -196,7 +201,7 @@ msgid "%s: %s: invalid integer" msgstr "" #, c-format -msgid "%s: %s: invalid mode\n" +msgid "%s: %s: invalid mode" msgstr "" #, c-format @@ -204,7 +209,7 @@ msgid "%s: %s: invalid mode name. See `help %s`" msgstr "" #, c-format -msgid "%s: %s: invalid scale\n" +msgid "%s: %s: invalid scale" msgstr "" #, c-format @@ -236,23 +241,23 @@ msgid "%s: %s: unknown option" msgstr "" #, c-format -msgid "%s: '%s' is a broken symbolic link to '%s'\n" +msgid "%s: '%s' is a broken symbolic link to '%s'" msgstr "" #, c-format -msgid "%s: '%s' is not a directory\n" -msgstr "%s: '%s' nie jest ścieżką\n" +msgid "%s: '%s' is not a directory" +msgstr "%s: '%s' nie jest ścieżką" #, c-format -msgid "%s: '%s' is not a job\n" -msgstr "%s: '%s' nie jest zadaniem\n" +msgid "%s: '%s' is not a job" +msgstr "%s: '%s' nie jest zadaniem" #, c-format msgid "%s: '%s' is not a valid job ID" msgstr "" #, c-format -msgid "%s: '%s' is not a valid process ID\n" +msgid "%s: '%s' is not a valid process ID" msgstr "" #, c-format @@ -260,55 +265,27 @@ msgid "%s: --command cannot be combined with --position=command" msgstr "" #, c-format -msgid "%s: --function option requires --add\n" +msgid "%s: --set-cursor argument cannot be empty" msgstr "" #, c-format -msgid "%s: --position option requires --add\n" +msgid "%s: Ambiguous job" msgstr "" #, c-format -msgid "%s: --regex option requires --add\n" +msgid "%s: An option spec must have at least a short or a long flag" msgstr "" #, c-format -msgid "%s: --set-cursor argument cannot be empty\n" +msgid "%s: Argument '%s' is out of range" +msgstr "%s: Argument '%s' jest poza zasięgiem" + +#, c-format +msgid "%s: Can not specify scope when removing block" msgstr "" #, c-format -msgid "%s: --set-cursor option requires --add\n" -msgstr "" - -#, c-format -msgid "%s: -l requires a non-empty string\n" -msgstr "" - -#, c-format -msgid "%s: -o requires a non-empty string\n" -msgstr "" - -#, c-format -msgid "%s: -s requires a non-empty string\n" -msgstr "" - -#, c-format -msgid "%s: Ambiguous job\n" -msgstr "" - -#, c-format -msgid "%s: An option spec must have at least a short or a long flag\n" -msgstr "" - -#, c-format -msgid "%s: Argument '%s' is out of range\n" -msgstr "%s: Argument '%s' jest poza zasięgiem\n" - -#, c-format -msgid "%s: Can not specify scope when removing block\n" -msgstr "" - -#, c-format -msgid "%s: Can't put job %d, '%s' to foreground because it is not under job control\n" +msgid "%s: Can't put job %d, '%s' to foreground because it is not under job control" msgstr "" #, c-format @@ -316,19 +293,19 @@ msgid "%s: Can't put job %s, '%s' to background because it is not under job cont msgstr "" #, c-format -msgid "%s: Cannot combine options %s\n" +msgid "%s: Cannot combine options %s" msgstr "" #, c-format -msgid "%s: Cannot specify multiple positions\n" +msgid "%s: Cannot specify multiple positions" msgstr "" #, c-format -msgid "%s: Cannot specify multiple regex patterns\n" +msgid "%s: Cannot specify multiple regex patterns" msgstr "" #, c-format -msgid "%s: Cannot specify multiple set-cursor options\n" +msgid "%s: Cannot specify multiple set-cursor options" msgstr "" #, c-format @@ -336,24 +313,24 @@ msgid "%s: Cannot use --append or --prepend when assigning to a slice" msgstr "" #, c-format -msgid "%s: Command not valid at an interactive prompt\n" +msgid "%s: Command not valid at an interactive prompt" msgstr "" #, c-format -msgid "%s: Could not find '%s'\n" +msgid "%s: Could not find '%s'" msgstr "" #, c-format -msgid "%s: Could not find a job with process ID '%d'\n" +msgid "%s: Could not find a job with process ID '%d'" msgstr "" #, c-format -msgid "%s: Could not find child processes with the name '%s'\n" +msgid "%s: Could not find child processes with the name '%s'" msgstr "" #, c-format -msgid "%s: Could not find home directory\n" -msgstr "%s: Nie można odnaleźć katalogu domowego\n" +msgid "%s: Could not find home directory" +msgstr "%s: Nie można odnaleźć katalogu domowego" #, c-format msgid "%s: Could not find job '%d'" @@ -364,63 +341,63 @@ msgid "%s: Did you mean `set %s %s`?" msgstr "" #, c-format -msgid "%s: Empty directory '%s' does not exist\n" +msgid "%s: Empty directory '%s' does not exist" msgstr "" #, c-format -msgid "%s: Error encountered while sourcing file '%s':\n" +msgid "%s: Error encountered while sourcing file '%s':" msgstr "" #, c-format -msgid "%s: Error while reading file '%s'\n" -msgstr "%s: Nie udało się odczytać '%s'\n" +msgid "%s: Error while reading file '%s'" +msgstr "%s: Nie udało się odczytać '%s'" + +#, c-format +msgid "%s: Expected %s for %s" +msgstr "" #, c-format msgid "%s: Expected at least one argument" msgstr "" #, c-format -msgid "%s: Expected exactly one function name\n" -msgstr "%s: Oczekiwano dokładnie jednej nazwy funkcji\n" +msgid "%s: Expected exactly one function name" +msgstr "%s: Oczekiwano dokładnie jednej nazwy funkcji" #, c-format -msgid "%s: Expected exactly two names (current function name, and new function name)\n" -msgstr "%s: Oczekiwano dokładnie dwóch nazw (nazwa obecnej funkcji i nazwa nowej)\n" +msgid "%s: Expected exactly two names (current function name, and new function name)" +msgstr "%s: Oczekiwano dokładnie dwóch nazw (nazwa obecnej funkcji i nazwa nowej)" #, c-format -msgid "%s: Expected generic | variable | signal | exit | job-id for --handlers-type\n" +msgid "%s: Function '%s' already exists. Cannot create copy of '%s'" msgstr "" #, c-format -msgid "%s: Function '%s' already exists. Cannot create copy of '%s'\n" +msgid "%s: Function '%s' does not exist" +msgstr "%s: Funkcja '%s' nie istnieje" + +#, c-format +msgid "%s: Illegal function name '%s'" +msgstr "%s: Niedozwolona nazwa funkcji '%s'" + +#, c-format +msgid "%s: Implicit int flag '%c' already defined" msgstr "" #, c-format -msgid "%s: Function '%s' does not exist\n" -msgstr "%s: Funkcja '%s' nie istnieje\n" - -#, c-format -msgid "%s: Illegal function name '%s'\n" -msgstr "%s: Niedozwolona nazwa funkcji '%s'\n" - -#, c-format -msgid "%s: Implicit int flag '%c' already defined\n" +msgid "%s: Implicit int short flag '%c' does not allow modifiers like '%c'" msgstr "" #, c-format -msgid "%s: Implicit int short flag '%c' does not allow modifiers like '%c'\n" +msgid "%s: Invalid --max-args value '%s'" msgstr "" #, c-format -msgid "%s: Invalid --max-args value '%s'\n" +msgid "%s: Invalid --min-args value '%s'" msgstr "" #, c-format -msgid "%s: Invalid --min-args value '%s'\n" -msgstr "" - -#, c-format -msgid "%s: Invalid --unknown-arguments value '%s'\n" +msgid "%s: Invalid --unknown-arguments value '%s'" msgstr "" #, c-format @@ -428,27 +405,23 @@ msgid "%s: Invalid count value '%s'" msgstr "" #, c-format -msgid "%s: Invalid count value '%s'\n" +msgid "%s: Invalid end value '%s'" msgstr "" #, c-format -msgid "%s: Invalid end value '%s'\n" +msgid "%s: Invalid escape style '%s'" msgstr "" #, c-format -msgid "%s: Invalid escape style '%s'\n" +msgid "%s: Invalid fields value '%s'" msgstr "" #, c-format -msgid "%s: Invalid fields value '%s'\n" +msgid "%s: Invalid function name: %s" msgstr "" #, c-format -msgid "%s: Invalid function name: %s\n" -msgstr "" - -#, c-format -msgid "%s: Invalid index starting at '%s'\n" +msgid "%s: Invalid index starting at '%s'" msgstr "" #, c-format @@ -456,8 +429,8 @@ msgid "%s: Invalid job control mode '%s'" msgstr "" #, c-format -msgid "%s: Invalid length value '%s'\n" -msgstr "%s: Nieprawidłowa wartość długości '%s'\n" +msgid "%s: Invalid length value '%s'" +msgstr "%s: Nieprawidłowa wartość długości '%s'" #, c-format msgid "%s: Invalid level value '%s'" @@ -468,19 +441,19 @@ msgid "%s: Invalid limit '%s'" msgstr "" #, c-format -msgid "%s: Invalid max matches value '%s'\n" +msgid "%s: Invalid max matches value '%s'" msgstr "" #, c-format -msgid "%s: Invalid max value '%s'\n" +msgid "%s: Invalid max value '%s'" msgstr "" #, c-format -msgid "%s: Invalid option spec '%s' at char '%c'\n" +msgid "%s: Invalid option spec '%s' at char '%c'" msgstr "" #, c-format -msgid "%s: Invalid padding character of width zero '%s'\n" +msgid "%s: Invalid padding character of width zero '%s'" msgstr "" #, c-format @@ -488,11 +461,11 @@ msgid "%s: Invalid permission '%s'" msgstr "" #, c-format -msgid "%s: Invalid position '%s'\n" +msgid "%s: Invalid position '%s'" msgstr "" #, c-format -msgid "%s: Invalid range value for field '%s'\n" +msgid "%s: Invalid range value for field '%s'" msgstr "" #, c-format @@ -500,19 +473,19 @@ msgid "%s: Invalid sort key '%s'" msgstr "" #, c-format -msgid "%s: Invalid start value '%s'\n" -msgstr "%s: Nieprawidłową wartość początkowa '%s'\n" +msgid "%s: Invalid start value '%s'" +msgstr "%s: Nieprawidłową wartość początkowa '%s'" #, c-format -msgid "%s: Invalid state\n" -msgstr "%s: Nieprawidłowy stan\n" +msgid "%s: Invalid state" +msgstr "%s: Nieprawidłowy stan" #, c-format -msgid "%s: Invalid style value '%s'\n" +msgid "%s: Invalid style value '%s'" msgstr "" #, c-format -msgid "%s: Invalid token '%s'\n" +msgid "%s: Invalid token '%s'" msgstr "" #, c-format @@ -520,23 +493,23 @@ msgid "%s: Invalid type '%s'" msgstr "" #, c-format -msgid "%s: Invalid value for '--color' option: '%s'. Expected 'always', 'never', or 'auto'\n" -msgstr "%s: Nieprawidłowa wartość dla opcji '--color': '%s'. Oczekiwano 'always', 'never' lub 'auto'\n" +msgid "%s: Invalid value for '--color' option: '%s'. Expected 'always', 'never', or 'auto'" +msgstr "%s: Nieprawidłowa wartość dla opcji '--color': '%s'. Oczekiwano 'always', 'never' lub 'auto'" #, c-format -msgid "%s: Invalid width value '%s'\n" +msgid "%s: Invalid width value '%s'" msgstr "" #, c-format -msgid "%s: Key not specified\n" -msgstr "%s: Nie określono klawisza\n" +msgid "%s: Key not specified" +msgstr "%s: Nie określono klawisza" #, c-format -msgid "%s: Long flag '%s' already defined\n" +msgid "%s: Long flag '%s' already defined" msgstr "" #, c-format -msgid "%s: Missing -- separator\n" +msgid "%s: Missing -- separator" msgstr "" #, c-format @@ -544,27 +517,27 @@ msgid "%s: New limit cannot be an empty string" msgstr "" #, c-format -msgid "%s: No binding found for key '%s'\n" +msgid "%s: No binding found for key '%s'" msgstr "" #, c-format -msgid "%s: No binding found for key sequence '%s'\n" +msgid "%s: No binding found for key sequence '%s'" msgstr "" #, c-format -msgid "%s: No blocks defined\n" -msgstr "%s: Nie określono bloków\n" +msgid "%s: No blocks defined" +msgstr "%s: Nie określono bloków" #, c-format -msgid "%s: No suitable job: %d\n" -msgstr "%s: Brak pasujących zadań: %d\n" +msgid "%s: No suitable job: %d" +msgstr "%s: Brak pasujących zadań: %d" #, c-format msgid "%s: No suitable job: %s" msgstr "" #, c-format -msgid "%s: Not inside of loop\n" +msgid "%s: Not inside of loop" msgstr "" #, c-format @@ -576,16 +549,16 @@ msgid "%s: Number was empty" msgstr "" #, c-format -msgid "%s: Options %s and %s cannot be used together\n" +msgid "%s: Options %s and %s cannot be used together" msgstr "" #, c-format -msgid "%s: Padding should be a character '%s'\n" +msgid "%s: Padding should be a character '%s'" msgstr "" #, c-format -msgid "%s: Permission denied: '%s'\n" -msgstr "%s: Brak uprawnień: '%s'\n" +msgid "%s: Permission denied: '%s'" +msgstr "%s: Brak uprawnień: '%s'" #, c-format msgid "%s: Regular expression compile error: %s" @@ -600,23 +573,19 @@ msgid "%s: Resource limit not available on this operating system" msgstr "" #, c-format -msgid "%s: STEP must be a positive integer\n" +msgid "%s: Short flag '%c' already defined" msgstr "" #, c-format -msgid "%s: Short flag '%c' already defined\n" +msgid "%s: Short flag '%c' invalid, must be alphanum or '#'" msgstr "" #, c-format -msgid "%s: Short flag '%c' invalid, must be alphanum or '#'\n" -msgstr "" +msgid "%s: The directory '%s' does not exist" +msgstr "%s: Ścieżka '%s' nie istnieje" #, c-format -msgid "%s: The directory '%s' does not exist\n" -msgstr "%s: Ścieżka '%s' nie istnieje\n" - -#, c-format -msgid "%s: The variable '%s' does not exist\n" +msgid "%s: The variable '%s' does not exist" msgstr "" #, c-format @@ -628,32 +597,32 @@ msgid "%s: There are no suitable jobs" msgstr "%s: Brak pasujących zadań" #, c-format -msgid "%s: Too many levels of symbolic links: '%s'\n" +msgid "%s: Too many levels of symbolic links: '%s'" msgstr "" #, c-format -msgid "%s: Too many long-only options\n" +msgid "%s: Too many long-only options" msgstr "" #, c-format -msgid "%s: Tried to change the read-only variable '%s'\n" -msgstr "%s: Próbowano zmienić wartość zmiennej tylko do odczytu '%s'\n" +msgid "%s: Tried to change the read-only variable '%s'" +msgstr "%s: Próbowano zmienić wartość zmiennej tylko do odczytu '%s'" #, c-format -msgid "%s: Tried to modify the special variable '%s' to an invalid value\n" +msgid "%s: Tried to modify the special variable '%s' to an invalid value" msgstr "" #, c-format -msgid "%s: Tried to modify the special variable '%s' with the wrong scope\n" +msgid "%s: Tried to modify the special variable '%s' with the wrong scope" msgstr "" #, c-format -msgid "%s: Unknown color '%s'\n" -msgstr "%s: Nieznany kolor '%s'\n" +msgid "%s: Unknown color '%s'" +msgstr "%s: Nieznany kolor '%s'" #, c-format -msgid "%s: Unknown error trying to locate directory '%s'\n" -msgstr "%s: Nieokreślony błąd podczas wyszukiwania lokalizacji '%s'\n" +msgid "%s: Unknown error trying to locate directory '%s'" +msgstr "%s: Nieokreślony błąd podczas wyszukiwania lokalizacji '%s'" #, c-format msgid "%s: Unknown input function '%s'" @@ -668,11 +637,11 @@ msgid "%s: Warning: Option '%s' was removed and is now ignored" msgstr "" #, c-format -msgid "%s: `set --show` does not allow slices with the var names\n" +msgid "%s: `set --show` does not allow slices with the var names" msgstr "" #, c-format -msgid "%s: array index out of bounds\n" +msgid "%s: array index out of bounds" msgstr "" #, c-format @@ -700,15 +669,15 @@ msgid "%s: cannot both path and unpath" msgstr "" #, c-format -msgid "%s: column %s exceeds line length\n" +msgid "%s: column %s exceeds line length" msgstr "" #, c-format -msgid "%s: exclusive flag '%s' is not valid\n" +msgid "%s: exclusive flag '%s' is not valid" msgstr "" #, c-format -msgid "%s: exclusive flag string '%s' is not valid\n" +msgid "%s: exclusive flag string '%s' is not valid" msgstr "" #, c-format @@ -732,7 +701,7 @@ msgid "%s: function name required" msgstr "" #, c-format -msgid "%s: given %d indexes but %d values\n" +msgid "%s: given %d indexes but %d values" msgstr "" #, c-format @@ -748,7 +717,7 @@ msgid "%s: invalid option combination, %s" msgstr "" #, c-format -msgid "%s: invalid underline style: %s\n" +msgid "%s: invalid underline style: %s" msgstr "" #, c-format @@ -764,7 +733,7 @@ msgid "%s: missing argument" msgstr "" #, c-format -msgid "%s: missing filename argument or input redirection\n" +msgid "%s: missing filename argument or input redirection" msgstr "" #, c-format @@ -772,11 +741,7 @@ msgid "%s: missing subcommand" msgstr "" #, c-format -msgid "%s: nothing to choose from\n" -msgstr "" - -#, c-format -msgid "%s: realpath failed: %s\n" +msgid "%s: nothing to choose from" msgstr "" #, c-format @@ -788,19 +753,19 @@ msgid "%s: setting cursor while evaluating 'complete --arguments' is not yet sup msgstr "" #, c-format -msgid "%s: stdin is closed\n" +msgid "%s: stdin is closed" msgstr "" #, c-format -msgid "%s: successfully set universal '%s'; but a global by that name shadows it\n" +msgid "%s: successfully set universal '%s'; but a global by that name shadows it" msgstr "" #, c-format -msgid "%s: the -k/--key syntax is no longer supported. See `bind --help` and `bind --key-names`\n" +msgid "%s: the -k/--key syntax is no longer supported. See `bind --help` and `bind --key-names`" msgstr "" #, c-format -msgid "%s: there is no line %s\n" +msgid "%s: there is no line %s" msgstr "" #, c-format @@ -808,7 +773,7 @@ msgid "%s: too many arguments" msgstr "" #, c-format -msgid "%s: usage of -i for --silent is deprecated. Please use -s or --silent instead.\n" +msgid "%s: usage of -i for --silent is deprecated. Please use -s or --silent instead." msgstr "" #, c-format @@ -816,7 +781,7 @@ msgid "%s: value not completely converted (can't convert '%s')" msgstr "" #, c-format -msgid "%s: variable '%s' is read-only\n" +msgid "%s: variable '%s' is read-only" msgstr "" #, c-format @@ -848,12 +813,19 @@ msgid "'}' does not take arguments. Did you forget a ';'?" msgstr "" #, c-format -msgid "(Type 'help %s' for related documentation)\n" +msgid "(%s)" +msgstr "" + +#, c-format +msgid "(Type 'help %s' for related documentation)" msgstr "" msgid "(no matches)" msgstr "(brak pasujących wyników)" +msgid "(read-only)" +msgstr "" + #, c-format msgid ", copied in %s @ line %d" msgstr "" @@ -1047,8 +1019,8 @@ msgid "Error when renaming file: %s" msgstr "" #, c-format -msgid "Error while reading file %s\n" -msgstr "Wystąpił błąd podczas odczytywania pliku %s\n" +msgid "Error while reading file %s" +msgstr "Wystąpił błąd podczas odczytywania pliku %s" msgid "Errors reported by exec (on by default)" msgstr "" @@ -1294,7 +1266,7 @@ msgid "Missing operator" msgstr "" #, c-format -msgid "Modification of read-only variable \"%s\" is not allowed\n" +msgid "Modification of read-only variable \"%s\" is not allowed" msgstr "" msgid "Negate exit status of job" @@ -1365,11 +1337,15 @@ msgstr "" msgid "Polite quit request" msgstr "" +#, c-format +msgid "Position must be one of: %s" +msgstr "" + msgid "Power failure" msgstr "" #, c-format -msgid "Press ctrl-%c again to exit\n" +msgid "Press ctrl-%c again to exit" msgstr "" msgid "Print arguments" @@ -1762,6 +1738,10 @@ msgstr "" msgid "autoloading" msgstr "" +#, c-format +msgid "builtin %s: %s failed: %s" +msgstr "" + #, c-format msgid "builtin %s: %s: %s" msgstr "" @@ -1770,10 +1750,6 @@ msgstr "" msgid "builtin %s: Invalid arg: %s" msgstr "" -#, c-format -msgid "builtin %s: realpath failed: %s" -msgstr "" - msgid "builtin history delete --exact requires --case-sensitive" msgstr "" @@ -1878,7 +1854,7 @@ msgid "stopped" msgstr "zatrzymana" #, c-format -msgid "switch: Expected at most one argument, got %u\n" +msgid "switch: Expected at most one argument, got %u" msgstr "" msgid "symlink" diff --git a/localization/po/pt_BR.po b/localization/po/pt_BR.po index 7384cc8d7..5d05ecfed 100644 --- a/localization/po/pt_BR.po +++ b/localization/po/pt_BR.po @@ -28,13 +28,6 @@ msgstr "" msgid " PID Command" msgstr "" -#, c-format -msgid " (%s)\n" -msgstr "" - -msgid " (read-only)\n" -msgstr "" - msgid " a path variable" msgstr "" @@ -56,7 +49,7 @@ msgid "$%c is not a valid variable in fish." msgstr "" #, c-format -msgid "$%s: originally inherited as |%s|\n" +msgid "$%s: originally inherited as |%s|" msgstr "" #, c-format @@ -85,35 +78,35 @@ msgid "%s %s: %s: invalid subcommand" msgstr "" #, c-format -msgid "%s %s: Abbreviation %s already exists for commands %s, cannot rename %s\n" +msgid "%s %s: Abbreviation %s already exists for commands %s, cannot rename %s" msgstr "" #, c-format -msgid "%s %s: Abbreviation %s already exists, cannot rename %s\n" +msgid "%s %s: Abbreviation %s already exists, cannot rename %s" msgstr "" #, c-format -msgid "%s %s: Abbreviation '%s' cannot have spaces in the word\n" +msgid "%s %s: Abbreviation '%s' cannot have spaces in the word" msgstr "" #, c-format -msgid "%s %s: Name cannot be empty\n" +msgid "%s %s: Name cannot be empty" msgstr "" #, c-format -msgid "%s %s: No abbreviation named %s with the specified command restrictions\n" +msgid "%s %s: No abbreviation named %s with the specified command restrictions" msgstr "" #, c-format -msgid "%s %s: Requires at least two arguments\n" +msgid "%s %s: Requires at least two arguments" msgstr "" #, c-format -msgid "%s %s: Requires exactly two arguments\n" +msgid "%s %s: Requires exactly two arguments" msgstr "" #, c-format -msgid "%s %s: Unexpected argument -- '%s'\n" +msgid "%s %s: Unexpected argument -- '%s'" msgstr "" #, c-format @@ -141,12 +134,12 @@ msgid "%s could not read response to Primary Device Attribute query after waitin msgstr "" #, c-format -msgid "%s is %s\n" -msgstr "%s é %s\n" +msgid "%s is %s" +msgstr "%s é %s" #, c-format -msgid "%s is a builtin\n" -msgstr "%s é um builtin\n" +msgid "%s is a builtin" +msgstr "%s é um builtin" #, c-format msgid "%s is a function" @@ -160,10 +153,6 @@ msgstr "" msgid "%s, version %s" msgstr "" -#, c-format -msgid "%s, version %s\n" -msgstr "%s, versão %s\n" - #, c-format msgid "%s: %s" msgstr "" @@ -172,6 +161,22 @@ msgstr "" msgid "%s: %s %s: options cannot be used together" msgstr "" +#, c-format +msgid "%s: %s failed: %s" +msgstr "" + +#, c-format +msgid "%s: %s must be a positive integer" +msgstr "" + +#, c-format +msgid "%s: %s option requires %s" +msgstr "" + +#, c-format +msgid "%s: %s requires a non-empty string" +msgstr "" + #, c-format msgid "%s: %s: cannot overwrite read-only variable" msgstr "" @@ -181,7 +186,7 @@ msgid "%s: %s: cannot use reserved keyword as function name" msgstr "" #, c-format -msgid "%s: %s: contains a syntax error\n" +msgid "%s: %s: contains a syntax error" msgstr "" #, c-format @@ -189,7 +194,7 @@ msgid "%s: %s: expected %d arguments; got %d" msgstr "" #, c-format -msgid "%s: %s: invalid base value\n" +msgid "%s: %s: invalid base value" msgstr "" #, c-format @@ -201,7 +206,7 @@ msgid "%s: %s: invalid integer" msgstr "" #, c-format -msgid "%s: %s: invalid mode\n" +msgid "%s: %s: invalid mode" msgstr "" #, c-format @@ -209,7 +214,7 @@ msgid "%s: %s: invalid mode name. See `help %s`" msgstr "" #, c-format -msgid "%s: %s: invalid scale\n" +msgid "%s: %s: invalid scale" msgstr "" #, c-format @@ -241,99 +246,71 @@ msgid "%s: %s: unknown option" msgstr "" #, c-format -msgid "%s: '%s' is a broken symbolic link to '%s'\n" +msgid "%s: '%s' is a broken symbolic link to '%s'" msgstr "" #, c-format -msgid "%s: '%s' is not a directory\n" -msgstr "%s: “%s” não é um diretório\n" +msgid "%s: '%s' is not a directory" +msgstr "%s: “%s” não é um diretório" #, c-format -msgid "%s: '%s' is not a job\n" -msgstr "%s: “%s” não é uma tarefa\n" +msgid "%s: '%s' is not a job" +msgstr "%s: “%s” não é uma tarefa" #, c-format msgid "%s: '%s' is not a valid job ID" msgstr "" #, c-format -msgid "%s: '%s' is not a valid process ID\n" -msgstr "%s: '%s' não é um identificador de tarefa válido\n" +msgid "%s: '%s' is not a valid process ID" +msgstr "%s: '%s' não é um identificador de tarefa válido" #, c-format msgid "%s: --command cannot be combined with --position=command" msgstr "" #, c-format -msgid "%s: --function option requires --add\n" +msgid "%s: --set-cursor argument cannot be empty" msgstr "" #, c-format -msgid "%s: --position option requires --add\n" +msgid "%s: Ambiguous job" +msgstr "%s: Tarefa ambígua" + +#, c-format +msgid "%s: An option spec must have at least a short or a long flag" msgstr "" #, c-format -msgid "%s: --regex option requires --add\n" -msgstr "" +msgid "%s: Argument '%s' is out of range" +msgstr "%s: Argumento “%s” está fora do alcance" #, c-format -msgid "%s: --set-cursor argument cannot be empty\n" -msgstr "" +msgid "%s: Can not specify scope when removing block" +msgstr "%s: Não é possível especificar escopo ao remover bloco" #, c-format -msgid "%s: --set-cursor option requires --add\n" -msgstr "" - -#, c-format -msgid "%s: -l requires a non-empty string\n" -msgstr "" - -#, c-format -msgid "%s: -o requires a non-empty string\n" -msgstr "" - -#, c-format -msgid "%s: -s requires a non-empty string\n" -msgstr "" - -#, c-format -msgid "%s: Ambiguous job\n" -msgstr "%s: Tarefa ambígua\n" - -#, c-format -msgid "%s: An option spec must have at least a short or a long flag\n" -msgstr "" - -#, c-format -msgid "%s: Argument '%s' is out of range\n" -msgstr "%s: Argumento “%s” está fora do alcance\n" - -#, c-format -msgid "%s: Can not specify scope when removing block\n" -msgstr "%s: Não é possível especificar escopo ao remover bloco\n" - -#, c-format -msgid "%s: Can't put job %d, '%s' to foreground because it is not under job control\n" -msgstr "%s: Não é possível colocar tarefa %d, “%s” em primeiro plano porque não está sob controle de tarefas\n" +msgid "%s: Can't put job %d, '%s' to foreground because it is not under job control" +msgstr "%s: Não é possível colocar tarefa %d, “%s” em primeiro plano porque não está sob controle de tarefas" #, c-format msgid "%s: Can't put job %s, '%s' to background because it is not under job control" msgstr "" #, c-format -msgid "%s: Cannot combine options %s\n" +msgid "%s: Cannot combine options %s" msgstr "" #, c-format -msgid "%s: Cannot specify multiple positions\n" +msgid "%s: Cannot specify multiple positions" msgstr "" #, c-format -msgid "%s: Cannot specify multiple regex patterns\n" +msgid "%s: Cannot specify multiple regex patterns" msgstr "" #, c-format -msgid "%s: Cannot specify multiple set-cursor options\n" +msgid "%s: Cannot specify multiple set-cursor options" msgstr "" #, c-format @@ -341,24 +318,24 @@ msgid "%s: Cannot use --append or --prepend when assigning to a slice" msgstr "" #, c-format -msgid "%s: Command not valid at an interactive prompt\n" -msgstr "%s: Comando inválido em um prompt interativo\n" +msgid "%s: Command not valid at an interactive prompt" +msgstr "%s: Comando inválido em um prompt interativo" #, c-format -msgid "%s: Could not find '%s'\n" -msgstr "%s: Não foi possível encontrar '%s'\n" +msgid "%s: Could not find '%s'" +msgstr "%s: Não foi possível encontrar '%s'" #, c-format -msgid "%s: Could not find a job with process ID '%d'\n" -msgstr "%s: Não foi possível encontrar uma tarefa com id de processo '%d'\n" +msgid "%s: Could not find a job with process ID '%d'" +msgstr "%s: Não foi possível encontrar uma tarefa com id de processo '%d'" #, c-format -msgid "%s: Could not find child processes with the name '%s'\n" +msgid "%s: Could not find child processes with the name '%s'" msgstr "" #, c-format -msgid "%s: Could not find home directory\n" -msgstr "%s: Não foi possível encontrar o diretório home\n" +msgid "%s: Could not find home directory" +msgstr "%s: Não foi possível encontrar o diretório home" #, c-format msgid "%s: Could not find job '%d'" @@ -369,63 +346,63 @@ msgid "%s: Did you mean `set %s %s`?" msgstr "" #, c-format -msgid "%s: Empty directory '%s' does not exist\n" +msgid "%s: Empty directory '%s' does not exist" msgstr "" #, c-format -msgid "%s: Error encountered while sourcing file '%s':\n" -msgstr "%s: Erro encontrado ao interpretar arquivo “%s”:\n" +msgid "%s: Error encountered while sourcing file '%s':" +msgstr "%s: Erro encontrado ao interpretar arquivo “%s”:" #, c-format -msgid "%s: Error while reading file '%s'\n" -msgstr "%s: Erro ao ler o arquivo “%s”\n" +msgid "%s: Error while reading file '%s'" +msgstr "%s: Erro ao ler o arquivo “%s”" + +#, c-format +msgid "%s: Expected %s for %s" +msgstr "" #, c-format msgid "%s: Expected at least one argument" msgstr "" #, c-format -msgid "%s: Expected exactly one function name\n" -msgstr "%s: Esperava exatamente um nome de função\n" +msgid "%s: Expected exactly one function name" +msgstr "%s: Esperava exatamente um nome de função" #, c-format -msgid "%s: Expected exactly two names (current function name, and new function name)\n" -msgstr "%s: Esperava exatamente dois nomes (nome atual da função, e novo nome da função)\n" +msgid "%s: Expected exactly two names (current function name, and new function name)" +msgstr "%s: Esperava exatamente dois nomes (nome atual da função, e novo nome da função)" #, c-format -msgid "%s: Expected generic | variable | signal | exit | job-id for --handlers-type\n" +msgid "%s: Function '%s' already exists. Cannot create copy of '%s'" msgstr "" #, c-format -msgid "%s: Function '%s' already exists. Cannot create copy of '%s'\n" +msgid "%s: Function '%s' does not exist" +msgstr "%s: Função “%s” não existe" + +#, c-format +msgid "%s: Illegal function name '%s'" +msgstr "%s: Nome de função ilegal “%s”" + +#, c-format +msgid "%s: Implicit int flag '%c' already defined" msgstr "" #, c-format -msgid "%s: Function '%s' does not exist\n" -msgstr "%s: Função “%s” não existe\n" - -#, c-format -msgid "%s: Illegal function name '%s'\n" -msgstr "%s: Nome de função ilegal “%s”\n" - -#, c-format -msgid "%s: Implicit int flag '%c' already defined\n" +msgid "%s: Implicit int short flag '%c' does not allow modifiers like '%c'" msgstr "" #, c-format -msgid "%s: Implicit int short flag '%c' does not allow modifiers like '%c'\n" +msgid "%s: Invalid --max-args value '%s'" msgstr "" #, c-format -msgid "%s: Invalid --max-args value '%s'\n" +msgid "%s: Invalid --min-args value '%s'" msgstr "" #, c-format -msgid "%s: Invalid --min-args value '%s'\n" -msgstr "" - -#, c-format -msgid "%s: Invalid --unknown-arguments value '%s'\n" +msgid "%s: Invalid --unknown-arguments value '%s'" msgstr "" #, c-format @@ -433,27 +410,23 @@ msgid "%s: Invalid count value '%s'" msgstr "" #, c-format -msgid "%s: Invalid count value '%s'\n" +msgid "%s: Invalid end value '%s'" msgstr "" #, c-format -msgid "%s: Invalid end value '%s'\n" +msgid "%s: Invalid escape style '%s'" msgstr "" #, c-format -msgid "%s: Invalid escape style '%s'\n" +msgid "%s: Invalid fields value '%s'" msgstr "" #, c-format -msgid "%s: Invalid fields value '%s'\n" +msgid "%s: Invalid function name: %s" msgstr "" #, c-format -msgid "%s: Invalid function name: %s\n" -msgstr "" - -#, c-format -msgid "%s: Invalid index starting at '%s'\n" +msgid "%s: Invalid index starting at '%s'" msgstr "" #, c-format @@ -461,7 +434,7 @@ msgid "%s: Invalid job control mode '%s'" msgstr "" #, c-format -msgid "%s: Invalid length value '%s'\n" +msgid "%s: Invalid length value '%s'" msgstr "" #, c-format @@ -473,19 +446,19 @@ msgid "%s: Invalid limit '%s'" msgstr "" #, c-format -msgid "%s: Invalid max matches value '%s'\n" +msgid "%s: Invalid max matches value '%s'" msgstr "" #, c-format -msgid "%s: Invalid max value '%s'\n" +msgid "%s: Invalid max value '%s'" msgstr "" #, c-format -msgid "%s: Invalid option spec '%s' at char '%c'\n" +msgid "%s: Invalid option spec '%s' at char '%c'" msgstr "" #, c-format -msgid "%s: Invalid padding character of width zero '%s'\n" +msgid "%s: Invalid padding character of width zero '%s'" msgstr "" #, c-format @@ -493,11 +466,11 @@ msgid "%s: Invalid permission '%s'" msgstr "" #, c-format -msgid "%s: Invalid position '%s'\n" +msgid "%s: Invalid position '%s'" msgstr "" #, c-format -msgid "%s: Invalid range value for field '%s'\n" +msgid "%s: Invalid range value for field '%s'" msgstr "" #, c-format @@ -505,19 +478,19 @@ msgid "%s: Invalid sort key '%s'" msgstr "" #, c-format -msgid "%s: Invalid start value '%s'\n" +msgid "%s: Invalid start value '%s'" msgstr "" #, c-format -msgid "%s: Invalid state\n" -msgstr "%s: Estado inválido\n" +msgid "%s: Invalid state" +msgstr "%s: Estado inválido" #, c-format -msgid "%s: Invalid style value '%s'\n" +msgid "%s: Invalid style value '%s'" msgstr "" #, c-format -msgid "%s: Invalid token '%s'\n" +msgid "%s: Invalid token '%s'" msgstr "" #, c-format @@ -525,23 +498,23 @@ msgid "%s: Invalid type '%s'" msgstr "" #, c-format -msgid "%s: Invalid value for '--color' option: '%s'. Expected 'always', 'never', or 'auto'\n" -msgstr "%s: Valor inválido para a opção '--color': '%s'. Esperado 'always', 'never' ou 'auto'\n" +msgid "%s: Invalid value for '--color' option: '%s'. Expected 'always', 'never', or 'auto'" +msgstr "%s: Valor inválido para a opção '--color': '%s'. Esperado 'always', 'never' ou 'auto'" #, c-format -msgid "%s: Invalid width value '%s'\n" +msgid "%s: Invalid width value '%s'" msgstr "" #, c-format -msgid "%s: Key not specified\n" -msgstr "%s: Chave não especificada\n" +msgid "%s: Key not specified" +msgstr "%s: Chave não especificada" #, c-format -msgid "%s: Long flag '%s' already defined\n" +msgid "%s: Long flag '%s' already defined" msgstr "" #, c-format -msgid "%s: Missing -- separator\n" +msgid "%s: Missing -- separator" msgstr "" #, c-format @@ -549,28 +522,28 @@ msgid "%s: New limit cannot be an empty string" msgstr "" #, c-format -msgid "%s: No binding found for key '%s'\n" +msgid "%s: No binding found for key '%s'" msgstr "" #, c-format -msgid "%s: No binding found for key sequence '%s'\n" +msgid "%s: No binding found for key sequence '%s'" msgstr "" #, c-format -msgid "%s: No blocks defined\n" -msgstr "%s: Não há blocos definidos\n" +msgid "%s: No blocks defined" +msgstr "%s: Não há blocos definidos" #, c-format -msgid "%s: No suitable job: %d\n" -msgstr "%s: Não é trabalho adequado: %d\n" +msgid "%s: No suitable job: %d" +msgstr "%s: Não é trabalho adequado: %d" #, c-format msgid "%s: No suitable job: %s" msgstr "" #, c-format -msgid "%s: Not inside of loop\n" -msgstr "%s: Não está dentro de laço\n" +msgid "%s: Not inside of loop" +msgstr "%s: Não está dentro de laço" #, c-format msgid "%s: Number out of range" @@ -581,16 +554,16 @@ msgid "%s: Number was empty" msgstr "" #, c-format -msgid "%s: Options %s and %s cannot be used together\n" +msgid "%s: Options %s and %s cannot be used together" msgstr "" #, c-format -msgid "%s: Padding should be a character '%s'\n" +msgid "%s: Padding should be a character '%s'" msgstr "" #, c-format -msgid "%s: Permission denied: '%s'\n" -msgstr "%s: Permissão negada: “%s”\n" +msgid "%s: Permission denied: '%s'" +msgstr "%s: Permissão negada: “%s”" #, c-format msgid "%s: Regular expression compile error: %s" @@ -605,23 +578,19 @@ msgid "%s: Resource limit not available on this operating system" msgstr "" #, c-format -msgid "%s: STEP must be a positive integer\n" +msgid "%s: Short flag '%c' already defined" msgstr "" #, c-format -msgid "%s: Short flag '%c' already defined\n" +msgid "%s: Short flag '%c' invalid, must be alphanum or '#'" msgstr "" #, c-format -msgid "%s: Short flag '%c' invalid, must be alphanum or '#'\n" -msgstr "" +msgid "%s: The directory '%s' does not exist" +msgstr "%s: O diretório “%s” não existe" #, c-format -msgid "%s: The directory '%s' does not exist\n" -msgstr "%s: O diretório “%s” não existe\n" - -#, c-format -msgid "%s: The variable '%s' does not exist\n" +msgid "%s: The variable '%s' does not exist" msgstr "" #, c-format @@ -633,32 +602,32 @@ msgid "%s: There are no suitable jobs" msgstr "%s: Não há tarefas adequadas" #, c-format -msgid "%s: Too many levels of symbolic links: '%s'\n" +msgid "%s: Too many levels of symbolic links: '%s'" msgstr "" #, c-format -msgid "%s: Too many long-only options\n" +msgid "%s: Too many long-only options" msgstr "" #, c-format -msgid "%s: Tried to change the read-only variable '%s'\n" -msgstr "%s: Tentou mudar a variável somente leitura “%s”\n" +msgid "%s: Tried to change the read-only variable '%s'" +msgstr "%s: Tentou mudar a variável somente leitura “%s”" #, c-format -msgid "%s: Tried to modify the special variable '%s' to an invalid value\n" +msgid "%s: Tried to modify the special variable '%s' to an invalid value" msgstr "" #, c-format -msgid "%s: Tried to modify the special variable '%s' with the wrong scope\n" +msgid "%s: Tried to modify the special variable '%s' with the wrong scope" msgstr "" #, c-format -msgid "%s: Unknown color '%s'\n" -msgstr "%s: Cor desconhecida “%s”\n" +msgid "%s: Unknown color '%s'" +msgstr "%s: Cor desconhecida “%s”" #, c-format -msgid "%s: Unknown error trying to locate directory '%s'\n" -msgstr "%s: Erro desconhecido ao tentar localizar diretório “%s”\n" +msgid "%s: Unknown error trying to locate directory '%s'" +msgstr "%s: Erro desconhecido ao tentar localizar diretório “%s”" #, c-format msgid "%s: Unknown input function '%s'" @@ -673,11 +642,11 @@ msgid "%s: Warning: Option '%s' was removed and is now ignored" msgstr "" #, c-format -msgid "%s: `set --show` does not allow slices with the var names\n" +msgid "%s: `set --show` does not allow slices with the var names" msgstr "" #, c-format -msgid "%s: array index out of bounds\n" +msgid "%s: array index out of bounds" msgstr "" #, c-format @@ -705,15 +674,15 @@ msgid "%s: cannot both path and unpath" msgstr "" #, c-format -msgid "%s: column %s exceeds line length\n" +msgid "%s: column %s exceeds line length" msgstr "" #, c-format -msgid "%s: exclusive flag '%s' is not valid\n" +msgid "%s: exclusive flag '%s' is not valid" msgstr "" #, c-format -msgid "%s: exclusive flag string '%s' is not valid\n" +msgid "%s: exclusive flag string '%s' is not valid" msgstr "" #, c-format @@ -737,7 +706,7 @@ msgid "%s: function name required" msgstr "" #, c-format -msgid "%s: given %d indexes but %d values\n" +msgid "%s: given %d indexes but %d values" msgstr "" #, c-format @@ -753,7 +722,7 @@ msgid "%s: invalid option combination, %s" msgstr "" #, c-format -msgid "%s: invalid underline style: %s\n" +msgid "%s: invalid underline style: %s" msgstr "" #, c-format @@ -769,7 +738,7 @@ msgid "%s: missing argument" msgstr "" #, c-format -msgid "%s: missing filename argument or input redirection\n" +msgid "%s: missing filename argument or input redirection" msgstr "" #, c-format @@ -777,11 +746,7 @@ msgid "%s: missing subcommand" msgstr "" #, c-format -msgid "%s: nothing to choose from\n" -msgstr "" - -#, c-format -msgid "%s: realpath failed: %s\n" +msgid "%s: nothing to choose from" msgstr "" #, c-format @@ -793,19 +758,19 @@ msgid "%s: setting cursor while evaluating 'complete --arguments' is not yet sup msgstr "" #, c-format -msgid "%s: stdin is closed\n" +msgid "%s: stdin is closed" msgstr "" #, c-format -msgid "%s: successfully set universal '%s'; but a global by that name shadows it\n" +msgid "%s: successfully set universal '%s'; but a global by that name shadows it" msgstr "" #, c-format -msgid "%s: the -k/--key syntax is no longer supported. See `bind --help` and `bind --key-names`\n" +msgid "%s: the -k/--key syntax is no longer supported. See `bind --help` and `bind --key-names`" msgstr "" #, c-format -msgid "%s: there is no line %s\n" +msgid "%s: there is no line %s" msgstr "" #, c-format @@ -813,7 +778,7 @@ msgid "%s: too many arguments" msgstr "" #, c-format -msgid "%s: usage of -i for --silent is deprecated. Please use -s or --silent instead.\n" +msgid "%s: usage of -i for --silent is deprecated. Please use -s or --silent instead." msgstr "" #, c-format @@ -821,7 +786,7 @@ msgid "%s: value not completely converted (can't convert '%s')" msgstr "" #, c-format -msgid "%s: variable '%s' is read-only\n" +msgid "%s: variable '%s' is read-only" msgstr "" #, c-format @@ -853,12 +818,19 @@ msgid "'}' does not take arguments. Did you forget a ';'?" msgstr "" #, c-format -msgid "(Type 'help %s' for related documentation)\n" -msgstr "(Digite 'help %s' para documentação relacionada)\n" +msgid "(%s)" +msgstr "" + +#, c-format +msgid "(Type 'help %s' for related documentation)" +msgstr "(Digite 'help %s' para documentação relacionada)" msgid "(no matches)" msgstr "(nenhum resultado)" +msgid "(read-only)" +msgstr "" + #, c-format msgid ", copied in %s @ line %d" msgstr "" @@ -1052,8 +1024,8 @@ msgid "Error when renaming file: %s" msgstr "" #, c-format -msgid "Error while reading file %s\n" -msgstr "Erro ao ler arquivo %s\n" +msgid "Error while reading file %s" +msgstr "Erro ao ler arquivo %s" msgid "Errors reported by exec (on by default)" msgstr "" @@ -1299,7 +1271,7 @@ msgid "Missing operator" msgstr "" #, c-format -msgid "Modification of read-only variable \"%s\" is not allowed\n" +msgid "Modification of read-only variable \"%s\" is not allowed" msgstr "" msgid "Negate exit status of job" @@ -1370,11 +1342,15 @@ msgstr "" msgid "Polite quit request" msgstr "Requisição educada de término" +#, c-format +msgid "Position must be one of: %s" +msgstr "" + msgid "Power failure" msgstr "Falha de energia" #, c-format -msgid "Press ctrl-%c again to exit\n" +msgid "Press ctrl-%c again to exit" msgstr "" msgid "Print arguments" @@ -1767,6 +1743,10 @@ msgstr "" msgid "autoloading" msgstr "" +#, c-format +msgid "builtin %s: %s failed: %s" +msgstr "" + #, c-format msgid "builtin %s: %s: %s" msgstr "" @@ -1775,10 +1755,6 @@ msgstr "" msgid "builtin %s: Invalid arg: %s" msgstr "" -#, c-format -msgid "builtin %s: realpath failed: %s" -msgstr "" - msgid "builtin history delete --exact requires --case-sensitive" msgstr "" @@ -1883,8 +1859,8 @@ msgid "stopped" msgstr "parado" #, c-format -msgid "switch: Expected at most one argument, got %u\n" -msgstr "switch: Esperava no máximo um argumento, recebeu %u\n" +msgid "switch: Expected at most one argument, got %u" +msgstr "switch: Esperava no máximo um argumento, recebeu %u" msgid "symlink" msgstr "" diff --git a/localization/po/sv.po b/localization/po/sv.po index 80c6335b2..b02ebda3c 100644 --- a/localization/po/sv.po +++ b/localization/po/sv.po @@ -24,13 +24,6 @@ msgstr "" msgid " PID Command" msgstr "" -#, c-format -msgid " (%s)\n" -msgstr "" - -msgid " (read-only)\n" -msgstr "" - msgid " a path variable" msgstr "" @@ -52,7 +45,7 @@ msgid "$%c is not a valid variable in fish." msgstr "" #, c-format -msgid "$%s: originally inherited as |%s|\n" +msgid "$%s: originally inherited as |%s|" msgstr "" #, c-format @@ -81,35 +74,35 @@ msgid "%s %s: %s: invalid subcommand" msgstr "" #, c-format -msgid "%s %s: Abbreviation %s already exists for commands %s, cannot rename %s\n" +msgid "%s %s: Abbreviation %s already exists for commands %s, cannot rename %s" msgstr "" #, c-format -msgid "%s %s: Abbreviation %s already exists, cannot rename %s\n" +msgid "%s %s: Abbreviation %s already exists, cannot rename %s" msgstr "" #, c-format -msgid "%s %s: Abbreviation '%s' cannot have spaces in the word\n" +msgid "%s %s: Abbreviation '%s' cannot have spaces in the word" msgstr "" #, c-format -msgid "%s %s: Name cannot be empty\n" +msgid "%s %s: Name cannot be empty" msgstr "" #, c-format -msgid "%s %s: No abbreviation named %s with the specified command restrictions\n" +msgid "%s %s: No abbreviation named %s with the specified command restrictions" msgstr "" #, c-format -msgid "%s %s: Requires at least two arguments\n" +msgid "%s %s: Requires at least two arguments" msgstr "" #, c-format -msgid "%s %s: Requires exactly two arguments\n" +msgid "%s %s: Requires exactly two arguments" msgstr "" #, c-format -msgid "%s %s: Unexpected argument -- '%s'\n" +msgid "%s %s: Unexpected argument -- '%s'" msgstr "" #, c-format @@ -137,11 +130,11 @@ msgid "%s could not read response to Primary Device Attribute query after waitin msgstr "" #, c-format -msgid "%s is %s\n" +msgid "%s is %s" msgstr "" #, c-format -msgid "%s is a builtin\n" +msgid "%s is a builtin" msgstr "" #, c-format @@ -156,10 +149,6 @@ msgstr "" msgid "%s, version %s" msgstr "" -#, c-format -msgid "%s, version %s\n" -msgstr "%s, version %s\n" - #, c-format msgid "%s: %s" msgstr "" @@ -168,6 +157,22 @@ msgstr "" msgid "%s: %s %s: options cannot be used together" msgstr "" +#, c-format +msgid "%s: %s failed: %s" +msgstr "" + +#, c-format +msgid "%s: %s must be a positive integer" +msgstr "" + +#, c-format +msgid "%s: %s option requires %s" +msgstr "" + +#, c-format +msgid "%s: %s requires a non-empty string" +msgstr "" + #, c-format msgid "%s: %s: cannot overwrite read-only variable" msgstr "" @@ -177,7 +182,7 @@ msgid "%s: %s: cannot use reserved keyword as function name" msgstr "" #, c-format -msgid "%s: %s: contains a syntax error\n" +msgid "%s: %s: contains a syntax error" msgstr "" #, c-format @@ -185,7 +190,7 @@ msgid "%s: %s: expected %d arguments; got %d" msgstr "" #, c-format -msgid "%s: %s: invalid base value\n" +msgid "%s: %s: invalid base value" msgstr "" #, c-format @@ -197,7 +202,7 @@ msgid "%s: %s: invalid integer" msgstr "" #, c-format -msgid "%s: %s: invalid mode\n" +msgid "%s: %s: invalid mode" msgstr "" #, c-format @@ -205,7 +210,7 @@ msgid "%s: %s: invalid mode name. See `help %s`" msgstr "" #, c-format -msgid "%s: %s: invalid scale\n" +msgid "%s: %s: invalid scale" msgstr "" #, c-format @@ -237,23 +242,23 @@ msgid "%s: %s: unknown option" msgstr "" #, c-format -msgid "%s: '%s' is a broken symbolic link to '%s'\n" +msgid "%s: '%s' is a broken symbolic link to '%s'" msgstr "" #, c-format -msgid "%s: '%s' is not a directory\n" -msgstr "%s: '%s' är inte en katalog\n" +msgid "%s: '%s' is not a directory" +msgstr "%s: '%s' är inte en katalog" #, c-format -msgid "%s: '%s' is not a job\n" -msgstr "%s: '%s' är inte ett jobb\n" +msgid "%s: '%s' is not a job" +msgstr "%s: '%s' är inte ett jobb" #, c-format msgid "%s: '%s' is not a valid job ID" msgstr "" #, c-format -msgid "%s: '%s' is not a valid process ID\n" +msgid "%s: '%s' is not a valid process ID" msgstr "" #, c-format @@ -261,75 +266,47 @@ msgid "%s: --command cannot be combined with --position=command" msgstr "" #, c-format -msgid "%s: --function option requires --add\n" +msgid "%s: --set-cursor argument cannot be empty" msgstr "" #, c-format -msgid "%s: --position option requires --add\n" +msgid "%s: Ambiguous job" +msgstr "%s: Mer än ett jobb matchar" + +#, c-format +msgid "%s: An option spec must have at least a short or a long flag" msgstr "" #, c-format -msgid "%s: --regex option requires --add\n" +msgid "%s: Argument '%s' is out of range" msgstr "" #, c-format -msgid "%s: --set-cursor argument cannot be empty\n" -msgstr "" +msgid "%s: Can not specify scope when removing block" +msgstr "%s: Kan inte ange definitionsområde vid blockradering" #, c-format -msgid "%s: --set-cursor option requires --add\n" -msgstr "" - -#, c-format -msgid "%s: -l requires a non-empty string\n" -msgstr "" - -#, c-format -msgid "%s: -o requires a non-empty string\n" -msgstr "" - -#, c-format -msgid "%s: -s requires a non-empty string\n" -msgstr "" - -#, c-format -msgid "%s: Ambiguous job\n" -msgstr "%s: Mer än ett jobb matchar\n" - -#, c-format -msgid "%s: An option spec must have at least a short or a long flag\n" -msgstr "" - -#, c-format -msgid "%s: Argument '%s' is out of range\n" -msgstr "" - -#, c-format -msgid "%s: Can not specify scope when removing block\n" -msgstr "%s: Kan inte ange definitionsområde vid blockradering\n" - -#, c-format -msgid "%s: Can't put job %d, '%s' to foreground because it is not under job control\n" -msgstr "%s: Kan inte skicka jobb %d, '%s' till förgrunden eftersom det inte använder jobbkontroll\n" +msgid "%s: Can't put job %d, '%s' to foreground because it is not under job control" +msgstr "%s: Kan inte skicka jobb %d, '%s' till förgrunden eftersom det inte använder jobbkontroll" #, c-format msgid "%s: Can't put job %s, '%s' to background because it is not under job control" msgstr "" #, c-format -msgid "%s: Cannot combine options %s\n" +msgid "%s: Cannot combine options %s" msgstr "" #, c-format -msgid "%s: Cannot specify multiple positions\n" +msgid "%s: Cannot specify multiple positions" msgstr "" #, c-format -msgid "%s: Cannot specify multiple regex patterns\n" +msgid "%s: Cannot specify multiple regex patterns" msgstr "" #, c-format -msgid "%s: Cannot specify multiple set-cursor options\n" +msgid "%s: Cannot specify multiple set-cursor options" msgstr "" #, c-format @@ -337,24 +314,24 @@ msgid "%s: Cannot use --append or --prepend when assigning to a slice" msgstr "" #, c-format -msgid "%s: Command not valid at an interactive prompt\n" +msgid "%s: Command not valid at an interactive prompt" msgstr "" #, c-format -msgid "%s: Could not find '%s'\n" +msgid "%s: Could not find '%s'" msgstr "" #, c-format -msgid "%s: Could not find a job with process ID '%d'\n" +msgid "%s: Could not find a job with process ID '%d'" msgstr "" #, c-format -msgid "%s: Could not find child processes with the name '%s'\n" +msgid "%s: Could not find child processes with the name '%s'" msgstr "" #, c-format -msgid "%s: Could not find home directory\n" -msgstr "%s: Kunde inte hitta hemkatalogen\n" +msgid "%s: Could not find home directory" +msgstr "%s: Kunde inte hitta hemkatalogen" #, c-format msgid "%s: Could not find job '%d'" @@ -365,63 +342,63 @@ msgid "%s: Did you mean `set %s %s`?" msgstr "" #, c-format -msgid "%s: Empty directory '%s' does not exist\n" +msgid "%s: Empty directory '%s' does not exist" msgstr "" #, c-format -msgid "%s: Error encountered while sourcing file '%s':\n" -msgstr "%s: Ett fel uppstod medan filen '%s' lästes in\n" +msgid "%s: Error encountered while sourcing file '%s':" +msgstr "%s: Ett fel uppstod medan filen '%s' lästes in" #, c-format -msgid "%s: Error while reading file '%s'\n" -msgstr "%s: Ett fel uppstod medan filen '%s' lästes\n" +msgid "%s: Error while reading file '%s'" +msgstr "%s: Ett fel uppstod medan filen '%s' lästes" + +#, c-format +msgid "%s: Expected %s for %s" +msgstr "" #, c-format msgid "%s: Expected at least one argument" msgstr "" #, c-format -msgid "%s: Expected exactly one function name\n" -msgstr "%s: Förväntade exakt ett funktionsnamn\n" +msgid "%s: Expected exactly one function name" +msgstr "%s: Förväntade exakt ett funktionsnamn" #, c-format -msgid "%s: Expected exactly two names (current function name, and new function name)\n" +msgid "%s: Expected exactly two names (current function name, and new function name)" msgstr "" #, c-format -msgid "%s: Expected generic | variable | signal | exit | job-id for --handlers-type\n" +msgid "%s: Function '%s' already exists. Cannot create copy of '%s'" msgstr "" #, c-format -msgid "%s: Function '%s' already exists. Cannot create copy of '%s'\n" +msgid "%s: Function '%s' does not exist" +msgstr "%s: Funktionen '%s' existerar inte" + +#, c-format +msgid "%s: Illegal function name '%s'" +msgstr "%s: Ogiltigt funktionsnamn '%s'" + +#, c-format +msgid "%s: Implicit int flag '%c' already defined" msgstr "" #, c-format -msgid "%s: Function '%s' does not exist\n" -msgstr "%s: Funktionen '%s' existerar inte\n" - -#, c-format -msgid "%s: Illegal function name '%s'\n" -msgstr "%s: Ogiltigt funktionsnamn '%s'\n" - -#, c-format -msgid "%s: Implicit int flag '%c' already defined\n" +msgid "%s: Implicit int short flag '%c' does not allow modifiers like '%c'" msgstr "" #, c-format -msgid "%s: Implicit int short flag '%c' does not allow modifiers like '%c'\n" +msgid "%s: Invalid --max-args value '%s'" msgstr "" #, c-format -msgid "%s: Invalid --max-args value '%s'\n" +msgid "%s: Invalid --min-args value '%s'" msgstr "" #, c-format -msgid "%s: Invalid --min-args value '%s'\n" -msgstr "" - -#, c-format -msgid "%s: Invalid --unknown-arguments value '%s'\n" +msgid "%s: Invalid --unknown-arguments value '%s'" msgstr "" #, c-format @@ -429,35 +406,31 @@ msgid "%s: Invalid count value '%s'" msgstr "" #, c-format -msgid "%s: Invalid count value '%s'\n" +msgid "%s: Invalid end value '%s'" msgstr "" #, c-format -msgid "%s: Invalid end value '%s'\n" +msgid "%s: Invalid escape style '%s'" msgstr "" #, c-format -msgid "%s: Invalid escape style '%s'\n" +msgid "%s: Invalid fields value '%s'" msgstr "" #, c-format -msgid "%s: Invalid fields value '%s'\n" +msgid "%s: Invalid function name: %s" msgstr "" #, c-format -msgid "%s: Invalid function name: %s\n" -msgstr "" - -#, c-format -msgid "%s: Invalid index starting at '%s'\n" -msgstr "%s: Ogiltigt index vid '%s'\n" +msgid "%s: Invalid index starting at '%s'" +msgstr "%s: Ogiltigt index vid '%s'" #, c-format msgid "%s: Invalid job control mode '%s'" msgstr "" #, c-format -msgid "%s: Invalid length value '%s'\n" +msgid "%s: Invalid length value '%s'" msgstr "" #, c-format @@ -469,19 +442,19 @@ msgid "%s: Invalid limit '%s'" msgstr "" #, c-format -msgid "%s: Invalid max matches value '%s'\n" +msgid "%s: Invalid max matches value '%s'" msgstr "" #, c-format -msgid "%s: Invalid max value '%s'\n" +msgid "%s: Invalid max value '%s'" msgstr "" #, c-format -msgid "%s: Invalid option spec '%s' at char '%c'\n" +msgid "%s: Invalid option spec '%s' at char '%c'" msgstr "" #, c-format -msgid "%s: Invalid padding character of width zero '%s'\n" +msgid "%s: Invalid padding character of width zero '%s'" msgstr "" #, c-format @@ -489,11 +462,11 @@ msgid "%s: Invalid permission '%s'" msgstr "" #, c-format -msgid "%s: Invalid position '%s'\n" +msgid "%s: Invalid position '%s'" msgstr "" #, c-format -msgid "%s: Invalid range value for field '%s'\n" +msgid "%s: Invalid range value for field '%s'" msgstr "" #, c-format @@ -501,19 +474,19 @@ msgid "%s: Invalid sort key '%s'" msgstr "" #, c-format -msgid "%s: Invalid start value '%s'\n" +msgid "%s: Invalid start value '%s'" msgstr "" #, c-format -msgid "%s: Invalid state\n" -msgstr "%s: Ogiltigt tillstånd\n" +msgid "%s: Invalid state" +msgstr "%s: Ogiltigt tillstånd" #, c-format -msgid "%s: Invalid style value '%s'\n" +msgid "%s: Invalid style value '%s'" msgstr "" #, c-format -msgid "%s: Invalid token '%s'\n" +msgid "%s: Invalid token '%s'" msgstr "" #, c-format @@ -521,23 +494,23 @@ msgid "%s: Invalid type '%s'" msgstr "" #, c-format -msgid "%s: Invalid value for '--color' option: '%s'. Expected 'always', 'never', or 'auto'\n" -msgstr "%s: Ogiltigt värde för '--color'-alternativet: '%s'. Förväntade 'always', 'never' eller 'auto'\n" +msgid "%s: Invalid value for '--color' option: '%s'. Expected 'always', 'never', or 'auto'" +msgstr "%s: Ogiltigt värde för '--color'-alternativet: '%s'. Förväntade 'always', 'never' eller 'auto'" #, c-format -msgid "%s: Invalid width value '%s'\n" +msgid "%s: Invalid width value '%s'" msgstr "" #, c-format -msgid "%s: Key not specified\n" -msgstr "%s: Ingen nyckel angiven\n" +msgid "%s: Key not specified" +msgstr "%s: Ingen nyckel angiven" #, c-format -msgid "%s: Long flag '%s' already defined\n" +msgid "%s: Long flag '%s' already defined" msgstr "" #, c-format -msgid "%s: Missing -- separator\n" +msgid "%s: Missing -- separator" msgstr "" #, c-format @@ -545,28 +518,28 @@ msgid "%s: New limit cannot be an empty string" msgstr "" #, c-format -msgid "%s: No binding found for key '%s'\n" +msgid "%s: No binding found for key '%s'" msgstr "" #, c-format -msgid "%s: No binding found for key sequence '%s'\n" +msgid "%s: No binding found for key sequence '%s'" msgstr "" #, c-format -msgid "%s: No blocks defined\n" -msgstr "%s: Inga block definerade\n" +msgid "%s: No blocks defined" +msgstr "%s: Inga block definerade" #, c-format -msgid "%s: No suitable job: %d\n" -msgstr "%s: Inget passande jobb: %d\n" +msgid "%s: No suitable job: %d" +msgstr "%s: Inget passande jobb: %d" #, c-format msgid "%s: No suitable job: %s" msgstr "" #, c-format -msgid "%s: Not inside of loop\n" -msgstr "%s: Inte i en loop\n" +msgid "%s: Not inside of loop" +msgstr "%s: Inte i en loop" #, c-format msgid "%s: Number out of range" @@ -577,16 +550,16 @@ msgid "%s: Number was empty" msgstr "" #, c-format -msgid "%s: Options %s and %s cannot be used together\n" +msgid "%s: Options %s and %s cannot be used together" msgstr "" #, c-format -msgid "%s: Padding should be a character '%s'\n" +msgid "%s: Padding should be a character '%s'" msgstr "" #, c-format -msgid "%s: Permission denied: '%s'\n" -msgstr "%s: Åtkomst nekad till katalogen '%s'\n" +msgid "%s: Permission denied: '%s'" +msgstr "%s: Åtkomst nekad till katalogen '%s'" #, c-format msgid "%s: Regular expression compile error: %s" @@ -601,23 +574,19 @@ msgid "%s: Resource limit not available on this operating system" msgstr "" #, c-format -msgid "%s: STEP must be a positive integer\n" +msgid "%s: Short flag '%c' already defined" msgstr "" #, c-format -msgid "%s: Short flag '%c' already defined\n" +msgid "%s: Short flag '%c' invalid, must be alphanum or '#'" msgstr "" #, c-format -msgid "%s: Short flag '%c' invalid, must be alphanum or '#'\n" -msgstr "" +msgid "%s: The directory '%s' does not exist" +msgstr "%s: Katalogen '%s' existerar inte" #, c-format -msgid "%s: The directory '%s' does not exist\n" -msgstr "%s: Katalogen '%s' existerar inte\n" - -#, c-format -msgid "%s: The variable '%s' does not exist\n" +msgid "%s: The variable '%s' does not exist" msgstr "" #, c-format @@ -629,32 +598,32 @@ msgid "%s: There are no suitable jobs" msgstr "%s: Det finns inga lämpliga jobb" #, c-format -msgid "%s: Too many levels of symbolic links: '%s'\n" +msgid "%s: Too many levels of symbolic links: '%s'" msgstr "" #, c-format -msgid "%s: Too many long-only options\n" +msgid "%s: Too many long-only options" msgstr "" #, c-format -msgid "%s: Tried to change the read-only variable '%s'\n" -msgstr "%s: Försökte ändra den skrivskyddade variablen '%s'\n" +msgid "%s: Tried to change the read-only variable '%s'" +msgstr "%s: Försökte ändra den skrivskyddade variablen '%s'" #, c-format -msgid "%s: Tried to modify the special variable '%s' to an invalid value\n" +msgid "%s: Tried to modify the special variable '%s' to an invalid value" msgstr "" #, c-format -msgid "%s: Tried to modify the special variable '%s' with the wrong scope\n" +msgid "%s: Tried to modify the special variable '%s' with the wrong scope" msgstr "" #, c-format -msgid "%s: Unknown color '%s'\n" +msgid "%s: Unknown color '%s'" msgstr "" #, c-format -msgid "%s: Unknown error trying to locate directory '%s'\n" -msgstr "%s: Okänd fel inträffade under lokalisering av katalogen '%s'\n" +msgid "%s: Unknown error trying to locate directory '%s'" +msgstr "%s: Okänd fel inträffade under lokalisering av katalogen '%s'" #, c-format msgid "%s: Unknown input function '%s'" @@ -669,11 +638,11 @@ msgid "%s: Warning: Option '%s' was removed and is now ignored" msgstr "" #, c-format -msgid "%s: `set --show` does not allow slices with the var names\n" +msgid "%s: `set --show` does not allow slices with the var names" msgstr "" #, c-format -msgid "%s: array index out of bounds\n" +msgid "%s: array index out of bounds" msgstr "" #, c-format @@ -701,15 +670,15 @@ msgid "%s: cannot both path and unpath" msgstr "" #, c-format -msgid "%s: column %s exceeds line length\n" +msgid "%s: column %s exceeds line length" msgstr "" #, c-format -msgid "%s: exclusive flag '%s' is not valid\n" +msgid "%s: exclusive flag '%s' is not valid" msgstr "" #, c-format -msgid "%s: exclusive flag string '%s' is not valid\n" +msgid "%s: exclusive flag string '%s' is not valid" msgstr "" #, c-format @@ -733,7 +702,7 @@ msgid "%s: function name required" msgstr "" #, c-format -msgid "%s: given %d indexes but %d values\n" +msgid "%s: given %d indexes but %d values" msgstr "" #, c-format @@ -749,7 +718,7 @@ msgid "%s: invalid option combination, %s" msgstr "" #, c-format -msgid "%s: invalid underline style: %s\n" +msgid "%s: invalid underline style: %s" msgstr "" #, c-format @@ -765,7 +734,7 @@ msgid "%s: missing argument" msgstr "" #, c-format -msgid "%s: missing filename argument or input redirection\n" +msgid "%s: missing filename argument or input redirection" msgstr "" #, c-format @@ -773,11 +742,7 @@ msgid "%s: missing subcommand" msgstr "" #, c-format -msgid "%s: nothing to choose from\n" -msgstr "" - -#, c-format -msgid "%s: realpath failed: %s\n" +msgid "%s: nothing to choose from" msgstr "" #, c-format @@ -789,19 +754,19 @@ msgid "%s: setting cursor while evaluating 'complete --arguments' is not yet sup msgstr "" #, c-format -msgid "%s: stdin is closed\n" +msgid "%s: stdin is closed" msgstr "" #, c-format -msgid "%s: successfully set universal '%s'; but a global by that name shadows it\n" +msgid "%s: successfully set universal '%s'; but a global by that name shadows it" msgstr "" #, c-format -msgid "%s: the -k/--key syntax is no longer supported. See `bind --help` and `bind --key-names`\n" +msgid "%s: the -k/--key syntax is no longer supported. See `bind --help` and `bind --key-names`" msgstr "" #, c-format -msgid "%s: there is no line %s\n" +msgid "%s: there is no line %s" msgstr "" #, c-format @@ -809,7 +774,7 @@ msgid "%s: too many arguments" msgstr "" #, c-format -msgid "%s: usage of -i for --silent is deprecated. Please use -s or --silent instead.\n" +msgid "%s: usage of -i for --silent is deprecated. Please use -s or --silent instead." msgstr "" #, c-format @@ -817,7 +782,7 @@ msgid "%s: value not completely converted (can't convert '%s')" msgstr "" #, c-format -msgid "%s: variable '%s' is read-only\n" +msgid "%s: variable '%s' is read-only" msgstr "" #, c-format @@ -849,12 +814,19 @@ msgid "'}' does not take arguments. Did you forget a ';'?" msgstr "" #, c-format -msgid "(Type 'help %s' for related documentation)\n" +msgid "(%s)" +msgstr "" + +#, c-format +msgid "(Type 'help %s' for related documentation)" msgstr "" msgid "(no matches)" msgstr "" +msgid "(read-only)" +msgstr "" + #, c-format msgid ", copied in %s @ line %d" msgstr "" @@ -1048,8 +1020,8 @@ msgid "Error when renaming file: %s" msgstr "" #, c-format -msgid "Error while reading file %s\n" -msgstr "Ett fel uppstod medan filen '%s' lästes\n" +msgid "Error while reading file %s" +msgstr "Ett fel uppstod medan filen '%s' lästes" msgid "Errors reported by exec (on by default)" msgstr "" @@ -1295,7 +1267,7 @@ msgid "Missing operator" msgstr "" #, c-format -msgid "Modification of read-only variable \"%s\" is not allowed\n" +msgid "Modification of read-only variable \"%s\" is not allowed" msgstr "" msgid "Negate exit status of job" @@ -1366,11 +1338,15 @@ msgstr "" msgid "Polite quit request" msgstr "Artig avslutning" +#, c-format +msgid "Position must be one of: %s" +msgstr "" + msgid "Power failure" msgstr "Strömavbrott" #, c-format -msgid "Press ctrl-%c again to exit\n" +msgid "Press ctrl-%c again to exit" msgstr "" msgid "Print arguments" @@ -1763,6 +1739,10 @@ msgstr "" msgid "autoloading" msgstr "" +#, c-format +msgid "builtin %s: %s failed: %s" +msgstr "" + #, c-format msgid "builtin %s: %s: %s" msgstr "" @@ -1771,10 +1751,6 @@ msgstr "" msgid "builtin %s: Invalid arg: %s" msgstr "" -#, c-format -msgid "builtin %s: realpath failed: %s" -msgstr "" - msgid "builtin history delete --exact requires --case-sensitive" msgstr "" @@ -1879,7 +1855,7 @@ msgid "stopped" msgstr "stannat" #, c-format -msgid "switch: Expected at most one argument, got %u\n" +msgid "switch: Expected at most one argument, got %u" msgstr "" msgid "symlink" diff --git a/localization/po/zh_CN.po b/localization/po/zh_CN.po index 765e7cd16..bd6ea4a3e 100644 --- a/localization/po/zh_CN.po +++ b/localization/po/zh_CN.po @@ -48,13 +48,6 @@ msgstr "" msgid " PID Command" msgstr " PID 命令" -#, c-format -msgid " (%s)\n" -msgstr " (%s)\n" - -msgid " (read-only)\n" -msgstr " (只读)\n" - msgid " a path variable" msgstr "路径变量" @@ -76,8 +69,8 @@ msgid "$%c is not a valid variable in fish." msgstr "$%c 在 fish 中不是有效变量。" #, c-format -msgid "$%s: originally inherited as |%s|\n" -msgstr "$%s: 原继承值为 |%s|\n" +msgid "$%s: originally inherited as |%s|" +msgstr "$%s: 原继承值为 |%s|" #, c-format msgid "$%s: set in %s scope, %s,%s with %d elements" @@ -105,36 +98,36 @@ msgid "%s %s: %s: invalid subcommand" msgstr "%s %s: %s: 无效的子命令" #, c-format -msgid "%s %s: Abbreviation %s already exists for commands %s, cannot rename %s\n" -msgstr "%s %s: 名为 %s 且适用于命令 %s 的缩写已存在，无法重命名 %s\n" +msgid "%s %s: Abbreviation %s already exists for commands %s, cannot rename %s" +msgstr "%s %s: 名为 %s 且适用于命令 %s 的缩写已存在，无法重命名 %s" #, c-format -msgid "%s %s: Abbreviation %s already exists, cannot rename %s\n" -msgstr "%s %s: 缩写 %s 已经存在，无法重命名 %s\n" +msgid "%s %s: Abbreviation %s already exists, cannot rename %s" +msgstr "%s %s: 缩写 %s 已经存在，无法重命名 %s" #, c-format -msgid "%s %s: Abbreviation '%s' cannot have spaces in the word\n" -msgstr "%s %s: 缩写词 '%s' 不能包含空格\n" +msgid "%s %s: Abbreviation '%s' cannot have spaces in the word" +msgstr "%s %s: 缩写词 '%s' 不能包含空格" #, c-format -msgid "%s %s: Name cannot be empty\n" -msgstr "%s %s: 名称不能为空\n" +msgid "%s %s: Name cannot be empty" +msgstr "%s %s: 名称不能为空" #, c-format -msgid "%s %s: No abbreviation named %s with the specified command restrictions\n" -msgstr "%s %s: 没有命名为 %s 且符合指定命令限制的缩写\n" +msgid "%s %s: No abbreviation named %s with the specified command restrictions" +msgstr "%s %s: 没有命名为 %s 且符合指定命令限制的缩写" #, c-format -msgid "%s %s: Requires at least two arguments\n" -msgstr "%s %s: 需要至少两个参数\n" +msgid "%s %s: Requires at least two arguments" +msgstr "%s %s: 需要至少两个参数" #, c-format -msgid "%s %s: Requires exactly two arguments\n" -msgstr "%s %s: 需要两个参数\n" +msgid "%s %s: Requires exactly two arguments" +msgstr "%s %s: 需要两个参数" #, c-format -msgid "%s %s: Unexpected argument -- '%s'\n" -msgstr "%s %s: 意外参数 -- '%s'\n" +msgid "%s %s: Unexpected argument -- '%s'" +msgstr "%s %s: 意外参数 -- '%s'" #, c-format msgid "%s %s: unrecognized feature '%s'" @@ -161,12 +154,12 @@ msgid "%s could not read response to Primary Device Attribute query after waitin msgstr "%s 等待 %d 秒后仍无法读取 Primary Device Attribute 查询的响应。这通常是由于终端缺少相应功能所致。参见 'help %s' 或 'man fish-terminal-compatibility'。此 %s 进程将不再等待未处理的查询，这将禁用某些可选功能。" #, c-format -msgid "%s is %s\n" -msgstr "%s 是 %s\n" +msgid "%s is %s" +msgstr "%s 是 %s" #, c-format -msgid "%s is a builtin\n" -msgstr "%s 是一个内建命令\n" +msgid "%s is a builtin" +msgstr "%s 是一个内建命令" #, c-format msgid "%s is a function" @@ -180,10 +173,6 @@ msgstr "" msgid "%s, version %s" msgstr "%s，版本 %s" -#, c-format -msgid "%s, version %s\n" -msgstr "%s，版本 %s\n" - #, c-format msgid "%s: %s" msgstr "%s: %s" @@ -192,6 +181,22 @@ msgstr "%s: %s" msgid "%s: %s %s: options cannot be used together" msgstr "%s: %s %s: 选项无法一起使用" +#, c-format +msgid "%s: %s failed: %s" +msgstr "%s: %s 失败：%s" + +#, c-format +msgid "%s: %s must be a positive integer" +msgstr "%s: %s 必须是正整数" + +#, c-format +msgid "%s: %s option requires %s" +msgstr "%s: %s 选项需要 %s" + +#, c-format +msgid "%s: %s requires a non-empty string" +msgstr "%s: %s 需要一个非空字符串" + #, c-format msgid "%s: %s: cannot overwrite read-only variable" msgstr "%s: %s: 无法覆写只读变量" @@ -201,16 +206,16 @@ msgid "%s: %s: cannot use reserved keyword as function name" msgstr "%s: %s: 无法将保留关键字作为函数名" #, c-format -msgid "%s: %s: contains a syntax error\n" -msgstr "%s: %s: 包含语法错误\n" +msgid "%s: %s: contains a syntax error" +msgstr "%s: %s: 包含语法错误" #, c-format msgid "%s: %s: expected %d arguments; got %d" msgstr "%s: %s: 预期收到 %d 个参数；实际收到 %d 个" #, c-format -msgid "%s: %s: invalid base value\n" -msgstr "%s: %s: 无效的进制值\n" +msgid "%s: %s: invalid base value" +msgstr "%s: %s: 无效的进制值" #, c-format msgid "%s: %s: invalid function name" @@ -221,16 +226,16 @@ msgid "%s: %s: invalid integer" msgstr "%s: %s: 无效整数" #, c-format -msgid "%s: %s: invalid mode\n" -msgstr "%s: %s: 无效舍入模式\n" +msgid "%s: %s: invalid mode" +msgstr "%s: %s: 无效舍入模式" #, c-format msgid "%s: %s: invalid mode name. See `help %s`" msgstr "%s: %s: 无效模式名。参见 `help %s`" #, c-format -msgid "%s: %s: invalid scale\n" -msgstr "%s: %s: 无效位数\n" +msgid "%s: %s: invalid scale" +msgstr "%s: %s: 无效位数" #, c-format msgid "%s: %s: invalid subcommand" @@ -261,124 +266,96 @@ msgid "%s: %s: unknown option" msgstr "%s: %s: 未知选项" #, c-format -msgid "%s: '%s' is a broken symbolic link to '%s'\n" -msgstr "%s: '%s' 是损坏的到 '%s' 的符号链接\n" +msgid "%s: '%s' is a broken symbolic link to '%s'" +msgstr "%s: '%s' 是损坏的到 '%s' 的符号链接" #, c-format -msgid "%s: '%s' is not a directory\n" -msgstr "%s: '%s' 不是一个目录\n" +msgid "%s: '%s' is not a directory" +msgstr "%s: '%s' 不是一个目录" #, c-format -msgid "%s: '%s' is not a job\n" -msgstr "%s: '%s' 不是一个作业\n" +msgid "%s: '%s' is not a job" +msgstr "%s: '%s' 不是一个作业" #, c-format msgid "%s: '%s' is not a valid job ID" msgstr "%s: '%s' 不是一个有效的作业 ID" #, c-format -msgid "%s: '%s' is not a valid process ID\n" -msgstr "%s: '%s' 不是一个有效的进程 ID\n" +msgid "%s: '%s' is not a valid process ID" +msgstr "%s: '%s' 不是一个有效的进程 ID" #, c-format msgid "%s: --command cannot be combined with --position=command" msgstr "%s: --command 选项不能与 --position=command 组合使用" #, c-format -msgid "%s: --function option requires --add\n" -msgstr "%s: --function 选项需要 --add\n" +msgid "%s: --set-cursor argument cannot be empty" +msgstr "%s: --set-cursor 参数不能为空" #, c-format -msgid "%s: --position option requires --add\n" -msgstr "%s: --position 选项需要 --add\n" +msgid "%s: Ambiguous job" +msgstr "%s: 有歧义的作业" #, c-format -msgid "%s: --regex option requires --add\n" -msgstr "%s: --regex 选项需要 --add\n" +msgid "%s: An option spec must have at least a short or a long flag" +msgstr "%s: 选项规范必须至少包含一个短标识或长标识" #, c-format -msgid "%s: --set-cursor argument cannot be empty\n" -msgstr "%s: --set-cursor 参数不能为空\n" +msgid "%s: Argument '%s' is out of range" +msgstr "%s: 参数 '%s' 超出取值范围" #, c-format -msgid "%s: --set-cursor option requires --add\n" -msgstr "%s: --set-cursor 选项需要 --add\n" +msgid "%s: Can not specify scope when removing block" +msgstr "%s: 移除范围时不能指定作用域" #, c-format -msgid "%s: -l requires a non-empty string\n" -msgstr "%s: -l 需要一个非空字符串\n" - -#, c-format -msgid "%s: -o requires a non-empty string\n" -msgstr "%s: -o 需要一个非空字符串\n" - -#, c-format -msgid "%s: -s requires a non-empty string\n" -msgstr "%s: -s 需要一个非空字符串\n" - -#, c-format -msgid "%s: Ambiguous job\n" -msgstr "%s: 有歧义的作业\n" - -#, c-format -msgid "%s: An option spec must have at least a short or a long flag\n" -msgstr "%s: 选项规范必须至少包含一个短标识或长标识\n" - -#, c-format -msgid "%s: Argument '%s' is out of range\n" -msgstr "%s: 参数 '%s' 超出取值范围\n" - -#, c-format -msgid "%s: Can not specify scope when removing block\n" -msgstr "%s: 移除范围时不能指定作用域\n" - -#, c-format -msgid "%s: Can't put job %d, '%s' to foreground because it is not under job control\n" -msgstr "%s: 不能将作业 %d，'%s' 带到前台，因为它不受作业控制管理\n" +msgid "%s: Can't put job %d, '%s' to foreground because it is not under job control" +msgstr "%s: 不能将作业 %d，'%s' 带到前台，因为它不受作业控制管理" #, c-format msgid "%s: Can't put job %s, '%s' to background because it is not under job control" msgstr "%s: 无法将作业 %s，'%s' 放到后台，因为它不受作业控制管理" #, c-format -msgid "%s: Cannot combine options %s\n" -msgstr "%s: 无法合并选项 %s\n" +msgid "%s: Cannot combine options %s" +msgstr "%s: 无法合并选项 %s" #, c-format -msgid "%s: Cannot specify multiple positions\n" -msgstr "%s: 无法指定多个位置\n" +msgid "%s: Cannot specify multiple positions" +msgstr "%s: 无法指定多个位置" #, c-format -msgid "%s: Cannot specify multiple regex patterns\n" -msgstr "%s: 无法指定多种正则匹配规则\n" +msgid "%s: Cannot specify multiple regex patterns" +msgstr "%s: 无法指定多种正则匹配规则" #, c-format -msgid "%s: Cannot specify multiple set-cursor options\n" -msgstr "%s: 无法指定多个 set-cursor 选项\n" +msgid "%s: Cannot specify multiple set-cursor options" +msgstr "%s: 无法指定多个 set-cursor 选项" #, c-format msgid "%s: Cannot use --append or --prepend when assigning to a slice" msgstr "%s: 分配切片时无法使用 --append 或 --prepend" #, c-format -msgid "%s: Command not valid at an interactive prompt\n" -msgstr "%s: 命令在交互提示符下无效\n" +msgid "%s: Command not valid at an interactive prompt" +msgstr "%s: 命令在交互提示符下无效" #, c-format -msgid "%s: Could not find '%s'\n" -msgstr "%s: 找不到 '%s'\n" +msgid "%s: Could not find '%s'" +msgstr "%s: 找不到 '%s'" #, c-format -msgid "%s: Could not find a job with process ID '%d'\n" -msgstr "%s: 无法找到进程 ID 为 '%d' 的作业\n" +msgid "%s: Could not find a job with process ID '%d'" +msgstr "%s: 无法找到进程 ID 为 '%d' 的作业" #, c-format -msgid "%s: Could not find child processes with the name '%s'\n" -msgstr "%s: 无法找到名为 '%s' 的子进程\n" +msgid "%s: Could not find child processes with the name '%s'" +msgstr "%s: 无法找到名为 '%s' 的子进程" #, c-format -msgid "%s: Could not find home directory\n" -msgstr "%s: 找不到主目录\n" +msgid "%s: Could not find home directory" +msgstr "%s: 找不到主目录" #, c-format msgid "%s: Could not find job '%d'" @@ -389,100 +366,96 @@ msgid "%s: Did you mean `set %s %s`?" msgstr "%s: 您是否想输入 `set %s %s`？" #, c-format -msgid "%s: Empty directory '%s' does not exist\n" -msgstr "%s: 空目录 '%s' 不存在\n" +msgid "%s: Empty directory '%s' does not exist" +msgstr "%s: 空目录 '%s' 不存在" #, c-format -msgid "%s: Error encountered while sourcing file '%s':\n" -msgstr "%s: 加载源文件 '%s' 时遇到错误：\n" +msgid "%s: Error encountered while sourcing file '%s':" +msgstr "%s: 加载源文件 '%s' 时遇到错误：" #, c-format -msgid "%s: Error while reading file '%s'\n" -msgstr "%s: 读取文件 '%s' 时发生错误\n" +msgid "%s: Error while reading file '%s'" +msgstr "%s: 读取文件 '%s' 时发生错误" + +#, fuzzy, c-format +msgid "%s: Expected %s for %s" +msgstr "%s: 预期 %s，对于 %s 选项" #, c-format msgid "%s: Expected at least one argument" msgstr "%s: 至少需要一个参数" #, c-format -msgid "%s: Expected exactly one function name\n" -msgstr "%s: 需要一个函数名\n" +msgid "%s: Expected exactly one function name" +msgstr "%s: 需要一个函数名" #, c-format -msgid "%s: Expected exactly two names (current function name, and new function name)\n" -msgstr "%s: 预期有两个名称 (当前函数名，和新函数名)\n" +msgid "%s: Expected exactly two names (current function name, and new function name)" +msgstr "%s: 预期有两个名称 (当前函数名，和新函数名)" #, c-format -msgid "%s: Expected generic | variable | signal | exit | job-id for --handlers-type\n" -msgstr "%s: 对于 --handlers-type 选项，预期 generic | variable | signal | exit | job-id\n" +msgid "%s: Function '%s' already exists. Cannot create copy of '%s'" +msgstr "%s: 函数 '%s' 已经存在。无法创建副本 '%s'" #, c-format -msgid "%s: Function '%s' already exists. Cannot create copy of '%s'\n" -msgstr "%s: 函数 '%s' 已经存在。无法创建副本 '%s'\n" +msgid "%s: Function '%s' does not exist" +msgstr "%s: 函数 '%s' 不存在" #, c-format -msgid "%s: Function '%s' does not exist\n" -msgstr "%s: 函数 '%s' 不存在\n" +msgid "%s: Illegal function name '%s'" +msgstr "%s: 非法函数名 '%s'" #, c-format -msgid "%s: Illegal function name '%s'\n" -msgstr "%s: 非法函数名 '%s'\n" +msgid "%s: Implicit int flag '%c' already defined" +msgstr "%s: 隐式整形标识 '%c' 已被定义" #, c-format -msgid "%s: Implicit int flag '%c' already defined\n" -msgstr "%s: 隐式整形标识 '%c' 已被定义\n" +msgid "%s: Implicit int short flag '%c' does not allow modifiers like '%c'" +msgstr "%s: 隐式整形短标识 '%c' 不能带有形如 '%c' 的修饰符" #, c-format -msgid "%s: Implicit int short flag '%c' does not allow modifiers like '%c'\n" -msgstr "%s: 隐式整形短标识 '%c' 不能带有形如 '%c' 的修饰符\n" +msgid "%s: Invalid --max-args value '%s'" +msgstr "%s: 无效的 --max-args 值 '%s'" #, c-format -msgid "%s: Invalid --max-args value '%s'\n" -msgstr "%s: 无效的 --max-args 值 '%s'\n" +msgid "%s: Invalid --min-args value '%s'" +msgstr "%s: 无效的 --min-args 值 '%s'" #, c-format -msgid "%s: Invalid --min-args value '%s'\n" -msgstr "%s: 无效的 --min-args 值 '%s'\n" - -#, c-format -msgid "%s: Invalid --unknown-arguments value '%s'\n" -msgstr "%s: 无效的 --unknown-arguments 值 '%s'\n" +msgid "%s: Invalid --unknown-arguments value '%s'" +msgstr "%s: 无效的 --unknown-arguments 值 '%s'" #, c-format msgid "%s: Invalid count value '%s'" msgstr "%s: 无效的计数值 '%s'" #, c-format -msgid "%s: Invalid count value '%s'\n" -msgstr "%s: 无效的计数值 '%s'\n" +msgid "%s: Invalid end value '%s'" +msgstr "%s: 无效的终止值 '%s'" #, c-format -msgid "%s: Invalid end value '%s'\n" -msgstr "%s: 无效的终止值 '%s'\n" +msgid "%s: Invalid escape style '%s'" +msgstr "%s: 无效的转义格式 '%s'" #, c-format -msgid "%s: Invalid escape style '%s'\n" -msgstr "%s: 无效的转义格式 '%s'\n" +msgid "%s: Invalid fields value '%s'" +msgstr "%s: 无效的字段值 '%s'" #, c-format -msgid "%s: Invalid fields value '%s'\n" -msgstr "%s: 无效的字段值 '%s'\n" +msgid "%s: Invalid function name: %s" +msgstr "%s: 无效的函数名：%s" #, c-format -msgid "%s: Invalid function name: %s\n" -msgstr "%s: 无效的函数名：%s\n" - -#, c-format -msgid "%s: Invalid index starting at '%s'\n" -msgstr "%s: 无效的起始索引值 '%s'\n" +msgid "%s: Invalid index starting at '%s'" +msgstr "%s: 无效的起始索引值 '%s'" #, c-format msgid "%s: Invalid job control mode '%s'" msgstr "%s: 无效的作业控制模式 '%s'" #, c-format -msgid "%s: Invalid length value '%s'\n" -msgstr "%s: 无效的长度值 '%s'\n" +msgid "%s: Invalid length value '%s'" +msgstr "%s: 无效的长度值 '%s'" #, c-format msgid "%s: Invalid level value '%s'" @@ -493,104 +466,104 @@ msgid "%s: Invalid limit '%s'" msgstr "%s: 无效的限制 '%s'" #, c-format -msgid "%s: Invalid max matches value '%s'\n" -msgstr "%s: 无效的最大匹配值 '%s'\n" +msgid "%s: Invalid max matches value '%s'" +msgstr "%s: 无效的最大匹配值 '%s'" #, c-format -msgid "%s: Invalid max value '%s'\n" -msgstr "%s: 无效的最大值 '%s'\n" +msgid "%s: Invalid max value '%s'" +msgstr "%s: 无效的最大值 '%s'" #, c-format -msgid "%s: Invalid option spec '%s' at char '%c'\n" -msgstr "%s: 无效的选项规范 '%s' 于字符 '%c'\n" +msgid "%s: Invalid option spec '%s' at char '%c'" +msgstr "%s: 无效的选项规范 '%s' 于字符 '%c'" #, c-format -msgid "%s: Invalid padding character of width zero '%s'\n" -msgstr "%s: 宽度为零的无效的填充字符 '%s'\n" +msgid "%s: Invalid padding character of width zero '%s'" +msgstr "%s: 宽度为零的无效的填充字符 '%s'" #, c-format msgid "%s: Invalid permission '%s'" msgstr "%s: 无效的权限 '%s'" #, c-format -msgid "%s: Invalid position '%s'\n" -msgstr "%s: 无效的位置 '%s'\n" +msgid "%s: Invalid position '%s'" +msgstr "%s: 无效的位置 '%s'" #, c-format -msgid "%s: Invalid range value for field '%s'\n" -msgstr "%s: 字段 '%s' 的范围值无效\n" +msgid "%s: Invalid range value for field '%s'" +msgstr "%s: 字段 '%s' 的范围值无效" #, c-format msgid "%s: Invalid sort key '%s'" msgstr "%s: 无效的排序键 '%s'" #, c-format -msgid "%s: Invalid start value '%s'\n" -msgstr "%s: 无效的起始值 '%s'\n" +msgid "%s: Invalid start value '%s'" +msgstr "%s: 无效的起始值 '%s'" #, c-format -msgid "%s: Invalid state\n" -msgstr "%s: 无效状态\n" +msgid "%s: Invalid state" +msgstr "%s: 无效状态" #, c-format -msgid "%s: Invalid style value '%s'\n" -msgstr "%s: 无效的样式值 '%s'\n" +msgid "%s: Invalid style value '%s'" +msgstr "%s: 无效的样式值 '%s'" #, c-format -msgid "%s: Invalid token '%s'\n" -msgstr "%s: 无效记号 '%s'\n" +msgid "%s: Invalid token '%s'" +msgstr "%s: 无效记号 '%s'" #, c-format msgid "%s: Invalid type '%s'" msgstr "%s: 无效类型 '%s'" #, c-format -msgid "%s: Invalid value for '--color' option: '%s'. Expected 'always', 'never', or 'auto'\n" -msgstr "%s: 无效的 '--color' 选项值 '%s'。应为 'always'、'never' 或 'auto'\n" +msgid "%s: Invalid value for '--color' option: '%s'. Expected 'always', 'never', or 'auto'" +msgstr "%s: 无效的 '--color' 选项值 '%s'。应为 'always'、'never' 或 'auto'" #, c-format -msgid "%s: Invalid width value '%s'\n" -msgstr "%s: 无效的宽度值 '%s'\n" +msgid "%s: Invalid width value '%s'" +msgstr "%s: 无效的宽度值 '%s'" #, c-format -msgid "%s: Key not specified\n" -msgstr "%s: 没有指定键\n" +msgid "%s: Key not specified" +msgstr "%s: 没有指定键" #, c-format -msgid "%s: Long flag '%s' already defined\n" -msgstr "%s: 长标识 '%s' 已定义\n" +msgid "%s: Long flag '%s' already defined" +msgstr "%s: 长标识 '%s' 已定义" #, c-format -msgid "%s: Missing -- separator\n" -msgstr "%s: 缺少 -- 分隔符\n" +msgid "%s: Missing -- separator" +msgstr "%s: 缺少 -- 分隔符" #, c-format msgid "%s: New limit cannot be an empty string" msgstr "%s: 新限制不能为空字符串" #, c-format -msgid "%s: No binding found for key '%s'\n" -msgstr "%s: 未找到键 '%s' 的绑定\n" +msgid "%s: No binding found for key '%s'" +msgstr "%s: 未找到键 '%s' 的绑定" #, c-format -msgid "%s: No binding found for key sequence '%s'\n" -msgstr "%s: 未找到键序列 '%s' 的绑定\n" +msgid "%s: No binding found for key sequence '%s'" +msgstr "%s: 未找到键序列 '%s' 的绑定" #, c-format -msgid "%s: No blocks defined\n" -msgstr "%s: 没有定义作用域\n" +msgid "%s: No blocks defined" +msgstr "%s: 没有定义作用域" #, c-format -msgid "%s: No suitable job: %d\n" -msgstr "%s: 没有合适的作业：%d\n" +msgid "%s: No suitable job: %d" +msgstr "%s: 没有合适的作业：%d" #, c-format msgid "%s: No suitable job: %s" msgstr "%s: 没有合适的作业：%s" #, c-format -msgid "%s: Not inside of loop\n" -msgstr "%s: 不在循环体内部\n" +msgid "%s: Not inside of loop" +msgstr "%s: 不在循环体内部" #, c-format msgid "%s: Number out of range" @@ -601,16 +574,16 @@ msgid "%s: Number was empty" msgstr "%s：数字为空" #, c-format -msgid "%s: Options %s and %s cannot be used together\n" -msgstr "%s: 选项 %s 和 %s 无法一起使用\n" +msgid "%s: Options %s and %s cannot be used together" +msgstr "%s: 选项 %s 和 %s 无法一起使用" #, c-format -msgid "%s: Padding should be a character '%s'\n" -msgstr "%s: 填充应为字符 '%s'\n" +msgid "%s: Padding should be a character '%s'" +msgstr "%s: 填充应为字符 '%s'" #, c-format -msgid "%s: Permission denied: '%s'\n" -msgstr "%s: 拒绝访问: '%s'\n" +msgid "%s: Permission denied: '%s'" +msgstr "%s: 拒绝访问: '%s'" #, c-format msgid "%s: Regular expression compile error: %s" @@ -625,24 +598,20 @@ msgid "%s: Resource limit not available on this operating system" msgstr "%s: 该操作系统不支持资源限制" #, c-format -msgid "%s: STEP must be a positive integer\n" -msgstr "%s: STEP 必须是正整数\n" +msgid "%s: Short flag '%c' already defined" +msgstr "%s: 已经定义了短标识 '%c'" #, c-format -msgid "%s: Short flag '%c' already defined\n" -msgstr "%s: 已经定义了短标识 '%c'\n" +msgid "%s: Short flag '%c' invalid, must be alphanum or '#'" +msgstr "%s: 短标识 '%c' 无效，必须是字母、数字或 '#'" #, c-format -msgid "%s: Short flag '%c' invalid, must be alphanum or '#'\n" -msgstr "%s: 短标识 '%c' 无效，必须是字母、数字或 '#'\n" +msgid "%s: The directory '%s' does not exist" +msgstr "%s: 目录 '%s' 不存在" #, c-format -msgid "%s: The directory '%s' does not exist\n" -msgstr "%s: 目录 '%s' 不存在\n" - -#, c-format -msgid "%s: The variable '%s' does not exist\n" -msgstr "%s: 变量 '%s' 不存在\n" +msgid "%s: The variable '%s' does not exist" +msgstr "%s: 变量 '%s' 不存在" #, c-format msgid "%s: There are no jobs" @@ -653,32 +622,32 @@ msgid "%s: There are no suitable jobs" msgstr "%s: 没有匹配的作业" #, c-format -msgid "%s: Too many levels of symbolic links: '%s'\n" -msgstr "%s: 符号链接的级别过多：'%s'\n" +msgid "%s: Too many levels of symbolic links: '%s'" +msgstr "%s: 符号链接的级别过多：'%s'" #, c-format -msgid "%s: Too many long-only options\n" -msgstr "%s: 过多的仅长选项\n" +msgid "%s: Too many long-only options" +msgstr "%s: 过多的仅长选项" #, c-format -msgid "%s: Tried to change the read-only variable '%s'\n" -msgstr "%s: 试图改变只读变量 '%s' 的值\n" +msgid "%s: Tried to change the read-only variable '%s'" +msgstr "%s: 试图改变只读变量 '%s' 的值" #, c-format -msgid "%s: Tried to modify the special variable '%s' to an invalid value\n" -msgstr "%s: 尝试将特殊变量 '%s' 修改为无效值\n" +msgid "%s: Tried to modify the special variable '%s' to an invalid value" +msgstr "%s: 尝试将特殊变量 '%s' 修改为无效值" #, c-format -msgid "%s: Tried to modify the special variable '%s' with the wrong scope\n" -msgstr "%s: 尝试用错误的范围修改特殊变量 '%s'\n" +msgid "%s: Tried to modify the special variable '%s' with the wrong scope" +msgstr "%s: 尝试用错误的范围修改特殊变量 '%s'" #, c-format -msgid "%s: Unknown color '%s'\n" -msgstr "%s: 未知颜色 '%s'\n" +msgid "%s: Unknown color '%s'" +msgstr "%s: 未知颜色 '%s'" #, c-format -msgid "%s: Unknown error trying to locate directory '%s'\n" -msgstr "%s: 定位目录 '%s' 时发生未知错误\n" +msgid "%s: Unknown error trying to locate directory '%s'" +msgstr "%s: 定位目录 '%s' 时发生未知错误" #, c-format msgid "%s: Unknown input function '%s'" @@ -693,12 +662,12 @@ msgid "%s: Warning: Option '%s' was removed and is now ignored" msgstr "%s: 警告：忽略已被删除的选项 '%s'" #, c-format -msgid "%s: `set --show` does not allow slices with the var names\n" -msgstr "%s: `set --show` 不支持使用带有变量名称的切片\n" +msgid "%s: `set --show` does not allow slices with the var names" +msgstr "%s: `set --show` 不支持使用带有变量名称的切片" #, c-format -msgid "%s: array index out of bounds\n" -msgstr "%s: 数组索引越界\n" +msgid "%s: array index out of bounds" +msgstr "%s: 数组索引越界" #, c-format msgid "%s: called with no arguments. This will be an error in future." @@ -725,16 +694,16 @@ msgid "%s: cannot both path and unpath" msgstr "%s: 无法同时是路径变量和非路径变量" #, c-format -msgid "%s: column %s exceeds line length\n" -msgstr "%s: 列 %s 超出行长度\n" +msgid "%s: column %s exceeds line length" +msgstr "%s: 列 %s 超出行长度" #, c-format -msgid "%s: exclusive flag '%s' is not valid\n" -msgstr "%s: 排他标识 '%s' 无效\n" +msgid "%s: exclusive flag '%s' is not valid" +msgstr "%s: 排他标识 '%s' 无效" #, c-format -msgid "%s: exclusive flag string '%s' is not valid\n" -msgstr "%s: 排他标识字符串 '%s' 无效\n" +msgid "%s: exclusive flag string '%s' is not valid" +msgstr "%s: 排他标识字符串 '%s' 无效" #, c-format msgid "%s: expected %d arguments; got %d" @@ -757,8 +726,8 @@ msgid "%s: function name required" msgstr "%s: 函数名称是必须的" #, c-format -msgid "%s: given %d indexes but %d values\n" -msgstr "%s: 给定索引 %d 但只有 %d 个值\n" +msgid "%s: given %d indexes but %d values" +msgstr "%s: 给定索引 %d 但只有 %d 个值" #, c-format msgid "%s: invalid conversion specification" @@ -773,8 +742,8 @@ msgid "%s: invalid option combination, %s" msgstr "%s: 无效的选项组合，%s" #, c-format -msgid "%s: invalid underline style: %s\n" -msgstr "%s: 无效的下划线样式：%s\n" +msgid "%s: invalid underline style: %s" +msgstr "%s: 无效的下划线样式：%s" #, c-format msgid "%s: job %d ('%s') was stopped and has been signalled to continue." @@ -789,20 +758,16 @@ msgid "%s: missing argument" msgstr "%s: 缺少参数" #, c-format -msgid "%s: missing filename argument or input redirection\n" -msgstr "%s: 缺少文件名参数或输入重定向\n" +msgid "%s: missing filename argument or input redirection" +msgstr "%s: 缺少文件名参数或输入重定向" #, c-format msgid "%s: missing subcommand" msgstr "%s: 缺少子命令" #, c-format -msgid "%s: nothing to choose from\n" -msgstr "%s: 没有可选项\n" - -#, c-format -msgid "%s: realpath failed: %s\n" -msgstr "%s: realpath 失败：%s\n" +msgid "%s: nothing to choose from" +msgstr "%s: 没有可选项" #, c-format msgid "%s: scope can be only one of: universal function global local" @@ -813,36 +778,36 @@ msgid "%s: setting cursor while evaluating 'complete --arguments' is not yet sup msgstr "" #, c-format -msgid "%s: stdin is closed\n" -msgstr "%s: stdin 已关闭\n" +msgid "%s: stdin is closed" +msgstr "%s: stdin 已关闭" #, c-format -msgid "%s: successfully set universal '%s'; but a global by that name shadows it\n" -msgstr "%s: 成功设置通用变量 '%s' ；但是同名全局变量遮蔽它\n" +msgid "%s: successfully set universal '%s'; but a global by that name shadows it" +msgstr "%s: 成功设置通用变量 '%s' ；但是同名全局变量遮蔽它" #, c-format -msgid "%s: the -k/--key syntax is no longer supported. See `bind --help` and `bind --key-names`\n" -msgstr "%s：-k/--key 语法不再受支持。参见 `bind --help` 和 `bind --key-names`\n" +msgid "%s: the -k/--key syntax is no longer supported. See `bind --help` and `bind --key-names`" +msgstr "%s：-k/--key 语法不再受支持。参见 `bind --help` 和 `bind --key-names`" #, c-format -msgid "%s: there is no line %s\n" -msgstr "%s: 不存在行 %s\n" +msgid "%s: there is no line %s" +msgstr "%s: 不存在行 %s" #, c-format msgid "%s: too many arguments" msgstr "%s: 参数太多" #, c-format -msgid "%s: usage of -i for --silent is deprecated. Please use -s or --silent instead.\n" -msgstr "%s: 参数 -i 用于表示 --silent 已弃用。请改用 -s 或 --silent 代替。\n" +msgid "%s: usage of -i for --silent is deprecated. Please use -s or --silent instead." +msgstr "%s: 参数 -i 用于表示 --silent 已弃用。请改用 -s 或 --silent 代替。" #, c-format msgid "%s: value not completely converted (can't convert '%s')" msgstr "%s: 数值未完全转换 (无法转换 '%s')" #, c-format -msgid "%s: variable '%s' is read-only\n" -msgstr "%s: 变量 '%s' 只读\n" +msgid "%s: variable '%s' is read-only" +msgstr "%s: 变量 '%s' 只读" #, c-format msgid "%sand %u more rows" @@ -873,12 +838,19 @@ msgid "'}' does not take arguments. Did you forget a ';'?" msgstr "'}' 不接受参数。是否漏掉了分号';'？" #, c-format -msgid "(Type 'help %s' for related documentation)\n" -msgstr "(输入 'help %s' 查看相关文档)\n" +msgid "(%s)" +msgstr "(%s)" + +#, c-format +msgid "(Type 'help %s' for related documentation)" +msgstr "(输入 'help %s' 查看相关文档)" msgid "(no matches)" msgstr "(无匹配)" +msgid "(read-only)" +msgstr "(只读)" + #, c-format msgid ", copied in %s @ line %d" msgstr "，复制到 %s @ line %d" @@ -1072,8 +1044,8 @@ msgid "Error when renaming file: %s" msgstr "重命名文件时出错：%s" #, c-format -msgid "Error while reading file %s\n" -msgstr "读取文件 %s 时出错\n" +msgid "Error while reading file %s" +msgstr "读取文件 %s 时出错" msgid "Errors reported by exec (on by default)" msgstr "exec 报告的错误 (默认开启)" @@ -1322,8 +1294,8 @@ msgid "Missing operator" msgstr "缺少运算符" #, c-format -msgid "Modification of read-only variable \"%s\" is not allowed\n" -msgstr "不允许修改只读变量 \"%s\"\n" +msgid "Modification of read-only variable \"%s\" is not allowed" +msgstr "不允许修改只读变量 \"%s\"" msgid "Negate exit status of job" msgstr "对作业退出代码取反" @@ -1393,12 +1365,16 @@ msgstr "请在启动 fish 前设置 %s 或 HOME 环境变量。" msgid "Polite quit request" msgstr "请求温和退出" +#, c-format +msgid "Position must be one of: %s" +msgstr "" + msgid "Power failure" msgstr "断电" #, c-format -msgid "Press ctrl-%c again to exit\n" -msgstr "再次按下 ctrl-%c 退出\n" +msgid "Press ctrl-%c again to exit" +msgstr "再次按下 ctrl-%c 退出" msgid "Print arguments" msgstr "打印参数" @@ -1790,6 +1766,10 @@ msgstr "数组索引起始为 1，而不是 0。" msgid "autoloading" msgstr "自动加载" +#, c-format +msgid "builtin %s: %s failed: %s" +msgstr "内建 %s: %s 失败：%s" + #, c-format msgid "builtin %s: %s: %s" msgstr "内建 %s: %s: %s" @@ -1798,10 +1778,6 @@ msgstr "内建 %s: %s: %s" msgid "builtin %s: Invalid arg: %s" msgstr "内建 %s: 无效的参数：%s" -#, c-format -msgid "builtin %s: realpath failed: %s" -msgstr "内建 %s: realpath 失败：%s" - msgid "builtin history delete --exact requires --case-sensitive" msgstr "内建历史删除 --exact 需要 --case-sensitive" @@ -1909,8 +1885,8 @@ msgid "stopped" msgstr "已终止" #, c-format -msgid "switch: Expected at most one argument, got %u\n" -msgstr "switch: 最多需要一个参数，但收到 %u 个\n" +msgid "switch: Expected at most one argument, got %u" +msgstr "switch: 最多需要一个参数，但收到 %u 个" msgid "symlink" msgstr "符号链接" diff --git a/localization/po/zh_TW.po b/localization/po/zh_TW.po index b0c46b5fd..36d9a0ed0 100644 --- a/localization/po/zh_TW.po +++ b/localization/po/zh_TW.po @@ -21,13 +21,6 @@ msgstr "" msgid " PID Command" msgstr " PID 命令" -#, c-format -msgid " (%s)\n" -msgstr "（%s）\n" - -msgid " (read-only)\n" -msgstr "（唯讀）\n" - msgid " a path variable" msgstr "路徑變數" @@ -49,8 +42,8 @@ msgid "$%c is not a valid variable in fish." msgstr "$%c 在 fish 中不是有效的變數。" #, c-format -msgid "$%s: originally inherited as |%s|\n" -msgstr "$%s：原繼承值為 |%s|\n" +msgid "$%s: originally inherited as |%s|" +msgstr "$%s：原繼承值為 |%s|" #, c-format msgid "$%s: set in %s scope, %s,%s with %d elements" @@ -78,36 +71,36 @@ msgid "%s %s: %s: invalid subcommand" msgstr "%s %s：%s：無效的子命令" #, c-format -msgid "%s %s: Abbreviation %s already exists for commands %s, cannot rename %s\n" -msgstr "%s %s：名為 %s 且適用於命令 %s 的縮寫已存在，無法重新命名 %s\n" +msgid "%s %s: Abbreviation %s already exists for commands %s, cannot rename %s" +msgstr "%s %s：名為 %s 且適用於命令 %s 的縮寫已存在，無法重新命名 %s" #, c-format -msgid "%s %s: Abbreviation %s already exists, cannot rename %s\n" -msgstr "%s %s：縮寫 %s 已存在，無法重新命名 %s\n" +msgid "%s %s: Abbreviation %s already exists, cannot rename %s" +msgstr "%s %s：縮寫 %s 已存在，無法重新命名 %s" #, c-format -msgid "%s %s: Abbreviation '%s' cannot have spaces in the word\n" -msgstr "%s %s：縮寫「%s」中不能包含空格\n" +msgid "%s %s: Abbreviation '%s' cannot have spaces in the word" +msgstr "%s %s：縮寫「%s」中不能包含空格" #, c-format -msgid "%s %s: Name cannot be empty\n" -msgstr "%s %s：名稱不能空白\n" +msgid "%s %s: Name cannot be empty" +msgstr "%s %s：名稱不能空白" #, c-format -msgid "%s %s: No abbreviation named %s with the specified command restrictions\n" -msgstr "%s %s：沒有縮寫名為 %s 且符合指定命令限制\n" +msgid "%s %s: No abbreviation named %s with the specified command restrictions" +msgstr "%s %s：沒有縮寫名為 %s 且符合指定命令限制" #, c-format -msgid "%s %s: Requires at least two arguments\n" -msgstr "%s %s：需要至少兩個引數\n" +msgid "%s %s: Requires at least two arguments" +msgstr "%s %s：需要至少兩個引數" #, c-format -msgid "%s %s: Requires exactly two arguments\n" -msgstr "%s %s：需要正好兩個引數\n" +msgid "%s %s: Requires exactly two arguments" +msgstr "%s %s：需要正好兩個引數" #, c-format -msgid "%s %s: Unexpected argument -- '%s'\n" -msgstr "%s %s：非預期的引數「%s」\n" +msgid "%s %s: Unexpected argument -- '%s'" +msgstr "%s %s：非預期的引數「%s」" #, c-format msgid "%s %s: unrecognized feature '%s'" @@ -134,12 +127,12 @@ msgid "%s could not read response to Primary Device Attribute query after waitin msgstr "%s 在過了 %d 秒後仍無法讀取到查詢主要裝置特性的回應。這通常是由於你的終端機缺少功能，參見「help %s」或「man fish-terminal-compatibility」。此 %s 行程不再會等待未決的查詢，一些非必要的功能將因此停用。" #, c-format -msgid "%s is %s\n" -msgstr "%s 是 %s\n" +msgid "%s is %s" +msgstr "%s 是 %s" #, c-format -msgid "%s is a builtin\n" -msgstr "%s 是內建命令\n" +msgid "%s is a builtin" +msgstr "%s 是內建命令" #, c-format msgid "%s is a function" @@ -153,10 +146,6 @@ msgstr "" msgid "%s, version %s" msgstr "%s，%s 版" -#, c-format -msgid "%s, version %s\n" -msgstr "%s，%s 版\n" - #, c-format msgid "%s: %s" msgstr "%s：%s" @@ -165,6 +154,22 @@ msgstr "%s：%s" msgid "%s: %s %s: options cannot be used together" msgstr "%s：%s %s：選項不能同時使用" +#, c-format +msgid "%s: %s failed: %s" +msgstr "%s：%s 失敗：%s" + +#, c-format +msgid "%s: %s must be a positive integer" +msgstr "%s：%s 必須是正整數" + +#, c-format +msgid "%s: %s option requires %s" +msgstr "%s：%s 選項需要 %s" + +#, c-format +msgid "%s: %s requires a non-empty string" +msgstr "%s：%s 需要一個非空字串" + #, c-format msgid "%s: %s: cannot overwrite read-only variable" msgstr "%s：%s：不能覆寫唯讀變數" @@ -174,16 +179,16 @@ msgid "%s: %s: cannot use reserved keyword as function name" msgstr "%s：%s：不能使用保留字作為函式名稱" #, c-format -msgid "%s: %s: contains a syntax error\n" -msgstr "%s：%s：含有語法錯誤\n" +msgid "%s: %s: contains a syntax error" +msgstr "%s：%s：含有語法錯誤" #, c-format msgid "%s: %s: expected %d arguments; got %d" msgstr "%s：%s：預期有 %d 個引數，卻收到了 %d 個" #, c-format -msgid "%s: %s: invalid base value\n" -msgstr "%s：%s：無效的進位制\n" +msgid "%s: %s: invalid base value" +msgstr "%s：%s：無效的進位制" #, c-format msgid "%s: %s: invalid function name" @@ -194,16 +199,16 @@ msgid "%s: %s: invalid integer" msgstr "%s：%s：無效的整數" #, c-format -msgid "%s: %s: invalid mode\n" -msgstr "%s：%s：無效的模式\n" +msgid "%s: %s: invalid mode" +msgstr "%s：%s：無效的模式" #, c-format msgid "%s: %s: invalid mode name. See `help %s`" msgstr "%s：%s：無效的模式名稱。參見「help %s」" #, c-format -msgid "%s: %s: invalid scale\n" -msgstr "%s：%s：無效的小數位數\n" +msgid "%s: %s: invalid scale" +msgstr "%s：%s：無效的小數位數" #, c-format msgid "%s: %s: invalid subcommand" @@ -234,124 +239,96 @@ msgid "%s: %s: unknown option" msgstr "%s：%s：未知的選項" #, c-format -msgid "%s: '%s' is a broken symbolic link to '%s'\n" -msgstr "%s：「%s」是「%s」損壞的象徵式連結\n" +msgid "%s: '%s' is a broken symbolic link to '%s'" +msgstr "%s：「%s」是「%s」損壞的象徵式連結" #, c-format -msgid "%s: '%s' is not a directory\n" -msgstr "%s：「%s」不是目錄\n" +msgid "%s: '%s' is not a directory" +msgstr "%s：「%s」不是目錄" #, c-format -msgid "%s: '%s' is not a job\n" -msgstr "%s：「%s」不是作業\n" +msgid "%s: '%s' is not a job" +msgstr "%s：「%s」不是作業" #, c-format msgid "%s: '%s' is not a valid job ID" msgstr "%s：「%s」不是有效的作業 ID" #, c-format -msgid "%s: '%s' is not a valid process ID\n" -msgstr "%s：「%s」不是有效的行程 ID\n" +msgid "%s: '%s' is not a valid process ID" +msgstr "%s：「%s」不是有效的行程 ID" #, c-format msgid "%s: --command cannot be combined with --position=command" msgstr "%s：--command 和 --position=command 不能同時使用" #, c-format -msgid "%s: --function option requires --add\n" -msgstr "%s：--function 選項需要 --add\n" +msgid "%s: --set-cursor argument cannot be empty" +msgstr "%s：--set-cursor 的引數不能空白" #, c-format -msgid "%s: --position option requires --add\n" -msgstr "%s：--position 選項需要 --add\n" +msgid "%s: Ambiguous job" +msgstr "%s：無法確定所指的作業" #, c-format -msgid "%s: --regex option requires --add\n" -msgstr "%s：--regex 選項需要 --add\n" +msgid "%s: An option spec must have at least a short or a long flag" +msgstr "%s：選項規格必須至少有一個短旗標或長旗標" #, c-format -msgid "%s: --set-cursor argument cannot be empty\n" -msgstr "%s：--set-cursor 的引數不能空白\n" +msgid "%s: Argument '%s' is out of range" +msgstr "%s：引數「%s」超出範圍" #, c-format -msgid "%s: --set-cursor option requires --add\n" -msgstr "%s：--set-cursor 選項需要 --add\n" +msgid "%s: Can not specify scope when removing block" +msgstr "%s：移除事件阻塞時不能指定作用域" #, c-format -msgid "%s: -l requires a non-empty string\n" -msgstr "%s：-l 需要一個非空字串\n" - -#, c-format -msgid "%s: -o requires a non-empty string\n" -msgstr "%s：-o 需要一個非空字串\n" - -#, c-format -msgid "%s: -s requires a non-empty string\n" -msgstr "%s：-s 需要一個非空字串\n" - -#, c-format -msgid "%s: Ambiguous job\n" -msgstr "%s：無法確定所指的作業\n" - -#, c-format -msgid "%s: An option spec must have at least a short or a long flag\n" -msgstr "%s：選項規格必須至少有一個短旗標或長旗標\n" - -#, c-format -msgid "%s: Argument '%s' is out of range\n" -msgstr "%s：引數「%s」超出範圍\n" - -#, c-format -msgid "%s: Can not specify scope when removing block\n" -msgstr "%s：移除事件阻塞時不能指定作用域\n" - -#, c-format -msgid "%s: Can't put job %d, '%s' to foreground because it is not under job control\n" -msgstr "%s：不能將作業 %d「%s」置於前景，其並不受作業控制管理\n" +msgid "%s: Can't put job %d, '%s' to foreground because it is not under job control" +msgstr "%s：不能將作業 %d「%s」置於前景，其並不受作業控制管理" #, c-format msgid "%s: Can't put job %s, '%s' to background because it is not under job control" msgstr "%s：不能將作業 %s「%s」置於背景，其並不受作業控制管理" #, c-format -msgid "%s: Cannot combine options %s\n" -msgstr "%s：%s 不能同時使用\n" +msgid "%s: Cannot combine options %s" +msgstr "%s：%s 不能同時使用" #, c-format -msgid "%s: Cannot specify multiple positions\n" -msgstr "%s：不能指定多個位置\n" +msgid "%s: Cannot specify multiple positions" +msgstr "%s：不能指定多個位置" #, c-format -msgid "%s: Cannot specify multiple regex patterns\n" -msgstr "%s：不能指定多個正則表示式模式\n" +msgid "%s: Cannot specify multiple regex patterns" +msgstr "%s：不能指定多個正則表示式模式" #, c-format -msgid "%s: Cannot specify multiple set-cursor options\n" -msgstr "%s：不能指定多次 set-cursor 選項\n" +msgid "%s: Cannot specify multiple set-cursor options" +msgstr "%s：不能指定多次 set-cursor 選項" #, c-format msgid "%s: Cannot use --append or --prepend when assigning to a slice" msgstr "%s：指派給切片時不能使用 --append 或 --prepend" #, c-format -msgid "%s: Command not valid at an interactive prompt\n" -msgstr "%s：命令在互動式提示中無效\n" +msgid "%s: Command not valid at an interactive prompt" +msgstr "%s：命令在互動式提示中無效" #, c-format -msgid "%s: Could not find '%s'\n" -msgstr "%s：找不到「%s」\n" +msgid "%s: Could not find '%s'" +msgstr "%s：找不到「%s」" #, c-format -msgid "%s: Could not find a job with process ID '%d'\n" -msgstr "%s：找不到行程 ID 為 %d 的作業\n" +msgid "%s: Could not find a job with process ID '%d'" +msgstr "%s：找不到行程 ID 為 %d 的作業" #, c-format -msgid "%s: Could not find child processes with the name '%s'\n" -msgstr "%s：找不到名稱為「%s」的子行程\n" +msgid "%s: Could not find child processes with the name '%s'" +msgstr "%s：找不到名稱為「%s」的子行程" #, c-format -msgid "%s: Could not find home directory\n" -msgstr "%s：找不到家目錄\n" +msgid "%s: Could not find home directory" +msgstr "%s：找不到家目錄" #, c-format msgid "%s: Could not find job '%d'" @@ -362,100 +339,96 @@ msgid "%s: Did you mean `set %s %s`?" msgstr "%s：你是指「set %s %s」嗎？" #, c-format -msgid "%s: Empty directory '%s' does not exist\n" -msgstr "%s：空目錄「%s」不存在\n" +msgid "%s: Empty directory '%s' does not exist" +msgstr "%s：空目錄「%s」不存在" #, c-format -msgid "%s: Error encountered while sourcing file '%s':\n" -msgstr "%s：載入檔案「%s」時遇到錯誤：\n" +msgid "%s: Error encountered while sourcing file '%s':" +msgstr "%s：載入檔案「%s」時遇到錯誤：" #, c-format -msgid "%s: Error while reading file '%s'\n" -msgstr "%s：讀取檔案「%s」時遇到錯誤\n" +msgid "%s: Error while reading file '%s'" +msgstr "%s：讀取檔案「%s」時遇到錯誤" + +#, c-format +msgid "%s: Expected %s for %s" +msgstr "%s：預期 %s 作 %s 的引數" #, c-format msgid "%s: Expected at least one argument" msgstr "%s：預期至少有一個引數" #, c-format -msgid "%s: Expected exactly one function name\n" -msgstr "%s：預期正好有一個函式名稱\n" +msgid "%s: Expected exactly one function name" +msgstr "%s：預期正好有一個函式名稱" #, c-format -msgid "%s: Expected exactly two names (current function name, and new function name)\n" -msgstr "%s：預期正好有兩個名稱（目前的函式名稱和新的函式名稱）\n" +msgid "%s: Expected exactly two names (current function name, and new function name)" +msgstr "%s：預期正好有兩個名稱（目前的函式名稱和新的函式名稱）" #, c-format -msgid "%s: Expected generic | variable | signal | exit | job-id for --handlers-type\n" -msgstr "%s：預期 generic | variable | signal | exit | job-id 作 --handlers-type 的引數\n" +msgid "%s: Function '%s' already exists. Cannot create copy of '%s'" +msgstr "%s：函式「%s」已存在。無法建立「%s」的複本" #, c-format -msgid "%s: Function '%s' already exists. Cannot create copy of '%s'\n" -msgstr "%s：函式「%s」已存在。無法建立「%s」的複本\n" +msgid "%s: Function '%s' does not exist" +msgstr "%s：函式「%s」不存在" #, c-format -msgid "%s: Function '%s' does not exist\n" -msgstr "%s：函式「%s」不存在\n" +msgid "%s: Illegal function name '%s'" +msgstr "%s：非法的函式名稱「%s」" #, c-format -msgid "%s: Illegal function name '%s'\n" -msgstr "%s：非法的函式名稱「%s」\n" +msgid "%s: Implicit int flag '%c' already defined" +msgstr "%s：定義過隱式整數旗標「%c」了" #, c-format -msgid "%s: Implicit int flag '%c' already defined\n" -msgstr "%s：定義過隱式整數旗標「%c」了\n" +msgid "%s: Implicit int short flag '%c' does not allow modifiers like '%c'" +msgstr "%s：隱式整數短旗標「%c」不允許加上「%c」等修飾" #, c-format -msgid "%s: Implicit int short flag '%c' does not allow modifiers like '%c'\n" -msgstr "%s：隱式整數短旗標「%c」不允許加上「%c」等修飾\n" +msgid "%s: Invalid --max-args value '%s'" +msgstr "%s：無效的 --max-args 值「%s」" #, c-format -msgid "%s: Invalid --max-args value '%s'\n" -msgstr "%s：無效的 --max-args 值「%s」\n" +msgid "%s: Invalid --min-args value '%s'" +msgstr "%s：無效的 --min-args 值「%s」" #, c-format -msgid "%s: Invalid --min-args value '%s'\n" -msgstr "%s：無效的 --min-args 值「%s」\n" - -#, c-format -msgid "%s: Invalid --unknown-arguments value '%s'\n" -msgstr "%s：無效的 --unknown-arguments 值「%s」\n" +msgid "%s: Invalid --unknown-arguments value '%s'" +msgstr "%s：無效的 --unknown-arguments 值「%s」" #, c-format msgid "%s: Invalid count value '%s'" msgstr "%s：無效的次數「%s」" #, c-format -msgid "%s: Invalid count value '%s'\n" -msgstr "%s：無效的次數「%s」\n" +msgid "%s: Invalid end value '%s'" +msgstr "%s：無效的終點索引值「%s」" #, c-format -msgid "%s: Invalid end value '%s'\n" -msgstr "%s：無效的終點索引值「%s」\n" +msgid "%s: Invalid escape style '%s'" +msgstr "%s：無效的轉義樣式「%s」" #, c-format -msgid "%s: Invalid escape style '%s'\n" -msgstr "%s：無效的轉義樣式「%s」\n" +msgid "%s: Invalid fields value '%s'" +msgstr "%s：無效的欄位值「%s」" #, c-format -msgid "%s: Invalid fields value '%s'\n" -msgstr "%s：無效的欄位值「%s」\n" +msgid "%s: Invalid function name: %s" +msgstr "%s：無效的函式名稱：%s" #, c-format -msgid "%s: Invalid function name: %s\n" -msgstr "%s：無效的函式名稱：%s\n" - -#, c-format -msgid "%s: Invalid index starting at '%s'\n" -msgstr "%s：無效的索引值，在「%s」處\n" +msgid "%s: Invalid index starting at '%s'" +msgstr "%s：無效的索引值，在「%s」處" #, c-format msgid "%s: Invalid job control mode '%s'" msgstr "%s：無效的作業控制模式「%s」" #, c-format -msgid "%s: Invalid length value '%s'\n" -msgstr "%s：無效的長度「%s」\n" +msgid "%s: Invalid length value '%s'" +msgstr "%s：無效的長度「%s」" #, c-format msgid "%s: Invalid level value '%s'" @@ -466,104 +439,104 @@ msgid "%s: Invalid limit '%s'" msgstr "%s：無效的限制值「%s」" #, c-format -msgid "%s: Invalid max matches value '%s'\n" -msgstr "%s：無效的最大匹配數「%s」\n" +msgid "%s: Invalid max matches value '%s'" +msgstr "%s：無效的最大匹配數「%s」" #, c-format -msgid "%s: Invalid max value '%s'\n" -msgstr "%s：無效的最大值「%s」\n" +msgid "%s: Invalid max value '%s'" +msgstr "%s：無效的最大值「%s」" #, c-format -msgid "%s: Invalid option spec '%s' at char '%c'\n" -msgstr "%s：無效的選項規格「%s」，在「%c」處\n" +msgid "%s: Invalid option spec '%s' at char '%c'" +msgstr "%s：無效的選項規格「%s」，在「%c」處" #, c-format -msgid "%s: Invalid padding character of width zero '%s'\n" -msgstr "%s：沒有寬度的填充字元「%s」無效\n" +msgid "%s: Invalid padding character of width zero '%s'" +msgstr "%s：沒有寬度的填充字元「%s」無效" #, c-format msgid "%s: Invalid permission '%s'" msgstr "%s：無效的權限「%s」" #, c-format -msgid "%s: Invalid position '%s'\n" -msgstr "%s：無效的位置「%s」\n" +msgid "%s: Invalid position '%s'" +msgstr "%s：無效的位置「%s」" #, c-format -msgid "%s: Invalid range value for field '%s'\n" -msgstr "%s：欄位有無效的範圍值「%s」\n" +msgid "%s: Invalid range value for field '%s'" +msgstr "%s：欄位有無效的範圍值「%s」" #, c-format msgid "%s: Invalid sort key '%s'" msgstr "%s：無效的排序鍵「%s」" #, c-format -msgid "%s: Invalid start value '%s'\n" -msgstr "%s：無效的起點索引值「%s」\n" +msgid "%s: Invalid start value '%s'" +msgstr "%s：無效的起點索引值「%s」" #, c-format -msgid "%s: Invalid state\n" -msgstr "%s：無效的狀態\n" +msgid "%s: Invalid state" +msgstr "%s：無效的狀態" #, c-format -msgid "%s: Invalid style value '%s'\n" -msgstr "%s：無效的樣式「%s」\n" +msgid "%s: Invalid style value '%s'" +msgstr "%s：無效的樣式「%s」" #, c-format -msgid "%s: Invalid token '%s'\n" -msgstr "%s：無效的詞元「%s」\n" +msgid "%s: Invalid token '%s'" +msgstr "%s：無效的詞元「%s」" #, c-format msgid "%s: Invalid type '%s'" msgstr "%s：無效的類型「%s」" #, c-format -msgid "%s: Invalid value for '--color' option: '%s'. Expected 'always', 'never', or 'auto'\n" -msgstr "%s：「--color」選項的值「%s」無效。應為「always」、「never」、或「auto」\n" +msgid "%s: Invalid value for '--color' option: '%s'. Expected 'always', 'never', or 'auto'" +msgstr "%s：「--color」選項的值「%s」無效。應為「always」、「never」、或「auto」" #, c-format -msgid "%s: Invalid width value '%s'\n" -msgstr "%s：無效的寬度「%s」\n" +msgid "%s: Invalid width value '%s'" +msgstr "%s：無效的寬度「%s」" #, c-format -msgid "%s: Key not specified\n" -msgstr "%s：未指定鍵\n" +msgid "%s: Key not specified" +msgstr "%s：未指定鍵" #, c-format -msgid "%s: Long flag '%s' already defined\n" -msgstr "%s：定義過長旗標「%s」了\n" +msgid "%s: Long flag '%s' already defined" +msgstr "%s：定義過長旗標「%s」了" #, c-format -msgid "%s: Missing -- separator\n" -msgstr "%s：缺少 -- 分隔\n" +msgid "%s: Missing -- separator" +msgstr "%s：缺少 -- 分隔" #, c-format msgid "%s: New limit cannot be an empty string" msgstr "%s：新的限制不能是空字串" #, c-format -msgid "%s: No binding found for key '%s'\n" -msgstr "%s：找不到按鍵「%s」的綁定\n" +msgid "%s: No binding found for key '%s'" +msgstr "%s：找不到按鍵「%s」的綁定" #, c-format -msgid "%s: No binding found for key sequence '%s'\n" -msgstr "%s：找不到按鍵序列「%s」的綁定\n" +msgid "%s: No binding found for key sequence '%s'" +msgstr "%s：找不到按鍵序列「%s」的綁定" #, c-format -msgid "%s: No blocks defined\n" -msgstr "%s：沒有定義事件阻塞\n" +msgid "%s: No blocks defined" +msgstr "%s：沒有定義事件阻塞" #, c-format -msgid "%s: No suitable job: %d\n" -msgstr "%s：沒有合式的作業：%d\n" +msgid "%s: No suitable job: %d" +msgstr "%s：沒有合式的作業：%d" #, c-format msgid "%s: No suitable job: %s" msgstr "%s：沒有合式的作業：%s" #, c-format -msgid "%s: Not inside of loop\n" -msgstr "%s：不在迴圈裡面\n" +msgid "%s: Not inside of loop" +msgstr "%s：不在迴圈裡面" #, c-format msgid "%s: Number out of range" @@ -574,16 +547,16 @@ msgid "%s: Number was empty" msgstr "%s：數字空白" #, c-format -msgid "%s: Options %s and %s cannot be used together\n" -msgstr "%s：選項 %s 和 %s 不能同時使用\n" +msgid "%s: Options %s and %s cannot be used together" +msgstr "%s：選項 %s 和 %s 不能同時使用" #, c-format -msgid "%s: Padding should be a character '%s'\n" -msgstr "%s：填充應為一個字元，卻收到了「%s」\n" +msgid "%s: Padding should be a character '%s'" +msgstr "%s：填充應為一個字元，卻收到了「%s」" #, c-format -msgid "%s: Permission denied: '%s'\n" -msgstr "%s：權限不足：「%s」\n" +msgid "%s: Permission denied: '%s'" +msgstr "%s：權限不足：「%s」" #, c-format msgid "%s: Regular expression compile error: %s" @@ -598,24 +571,20 @@ msgid "%s: Resource limit not available on this operating system" msgstr "%s：資源用量限制無法在此作業系統上使用" #, c-format -msgid "%s: STEP must be a positive integer\n" -msgstr "%s：STEP 必須是正整數\n" +msgid "%s: Short flag '%c' already defined" +msgstr "%s：定義過短旗標「%c」了" #, c-format -msgid "%s: Short flag '%c' already defined\n" -msgstr "%s：定義過短旗標「%c」了\n" +msgid "%s: Short flag '%c' invalid, must be alphanum or '#'" +msgstr "%s：短旗標「%c」無效，必須是字母、數字、或「#」" #, c-format -msgid "%s: Short flag '%c' invalid, must be alphanum or '#'\n" -msgstr "%s：短旗標「%c」無效，必須是字母、數字、或「#」\n" +msgid "%s: The directory '%s' does not exist" +msgstr "%s：目錄「%s」不存在" #, c-format -msgid "%s: The directory '%s' does not exist\n" -msgstr "%s：目錄「%s」不存在\n" - -#, c-format -msgid "%s: The variable '%s' does not exist\n" -msgstr "%s：變數「%s」不存在\n" +msgid "%s: The variable '%s' does not exist" +msgstr "%s：變數「%s」不存在" #, c-format msgid "%s: There are no jobs" @@ -626,32 +595,32 @@ msgid "%s: There are no suitable jobs" msgstr "%s：沒有合式的作業" #, c-format -msgid "%s: Too many levels of symbolic links: '%s'\n" -msgstr "%s：太多層象徵式連結：「%s」\n" +msgid "%s: Too many levels of symbolic links: '%s'" +msgstr "%s：太多層象徵式連結：「%s」" #, c-format -msgid "%s: Too many long-only options\n" -msgstr "%s：太多僅有長旗標的選項\n" +msgid "%s: Too many long-only options" +msgstr "%s：太多僅有長旗標的選項" #, c-format -msgid "%s: Tried to change the read-only variable '%s'\n" -msgstr "%s：試圖變更唯讀變數「%s」\n" +msgid "%s: Tried to change the read-only variable '%s'" +msgstr "%s：試圖變更唯讀變數「%s」" #, c-format -msgid "%s: Tried to modify the special variable '%s' to an invalid value\n" -msgstr "%s：試圖將特殊變數「%s」修改為無效的值\n" +msgid "%s: Tried to modify the special variable '%s' to an invalid value" +msgstr "%s：試圖將特殊變數「%s」修改為無效的值" #, c-format -msgid "%s: Tried to modify the special variable '%s' with the wrong scope\n" -msgstr "%s：試圖以錯的作用域修改特殊變數「%s」\n" +msgid "%s: Tried to modify the special variable '%s' with the wrong scope" +msgstr "%s：試圖以錯的作用域修改特殊變數「%s」" #, c-format -msgid "%s: Unknown color '%s'\n" -msgstr "%s：未知的顏色「%s」\n" +msgid "%s: Unknown color '%s'" +msgstr "%s：未知的顏色「%s」" #, c-format -msgid "%s: Unknown error trying to locate directory '%s'\n" -msgstr "%s：定位目錄「%s」時發生未知錯誤\n" +msgid "%s: Unknown error trying to locate directory '%s'" +msgstr "%s：定位目錄「%s」時發生未知錯誤" #, c-format msgid "%s: Unknown input function '%s'" @@ -666,12 +635,12 @@ msgid "%s: Warning: Option '%s' was removed and is now ignored" msgstr "%s：警告：選項「%s」已移除，忽略之" #, c-format -msgid "%s: `set --show` does not allow slices with the var names\n" -msgstr "%s：「set --show」不允許使用切片\n" +msgid "%s: `set --show` does not allow slices with the var names" +msgstr "%s：「set --show」不允許使用切片" #, c-format -msgid "%s: array index out of bounds\n" -msgstr "%s：陣列索引越界\n" +msgid "%s: array index out of bounds" +msgstr "%s：陣列索引越界" #, c-format msgid "%s: called with no arguments. This will be an error in future." @@ -698,16 +667,16 @@ msgid "%s: cannot both path and unpath" msgstr "%s：不能同時標為路徑和取消標為路徑" #, c-format -msgid "%s: column %s exceeds line length\n" -msgstr "%s：第 %s 欄超過了行的長度\n" +msgid "%s: column %s exceeds line length" +msgstr "%s：第 %s 欄超過了行的長度" #, c-format -msgid "%s: exclusive flag '%s' is not valid\n" -msgstr "%s：互斥旗標「%s」無效\n" +msgid "%s: exclusive flag '%s' is not valid" +msgstr "%s：互斥旗標「%s」無效" #, c-format -msgid "%s: exclusive flag string '%s' is not valid\n" -msgstr "%s：互斥旗標字串「%s」無效\n" +msgid "%s: exclusive flag string '%s' is not valid" +msgstr "%s：互斥旗標字串「%s」無效" #, c-format msgid "%s: expected %d arguments; got %d" @@ -730,8 +699,8 @@ msgid "%s: function name required" msgstr "%s：需要函式名稱" #, c-format -msgid "%s: given %d indexes but %d values\n" -msgstr "%s：指定了 %d 個索引卻有 %d 個值\n" +msgid "%s: given %d indexes but %d values" +msgstr "%s：指定了 %d 個索引卻有 %d 個值" #, c-format msgid "%s: invalid conversion specification" @@ -746,8 +715,8 @@ msgid "%s: invalid option combination, %s" msgstr "%s：無效的選項組合，%s" #, c-format -msgid "%s: invalid underline style: %s\n" -msgstr "%s：無效的底線樣式：%s\n" +msgid "%s: invalid underline style: %s" +msgstr "%s：無效的底線樣式：%s" #, c-format msgid "%s: job %d ('%s') was stopped and has been signalled to continue." @@ -762,20 +731,16 @@ msgid "%s: missing argument" msgstr "%s：缺少引數" #, c-format -msgid "%s: missing filename argument or input redirection\n" -msgstr "%s：缺少檔案名稱引數或輸入重新導向\n" +msgid "%s: missing filename argument or input redirection" +msgstr "%s：缺少檔案名稱引數或輸入重新導向" #, c-format msgid "%s: missing subcommand" msgstr "%s：缺少子命令" #, c-format -msgid "%s: nothing to choose from\n" -msgstr "%s：沒得選擇\n" - -#, c-format -msgid "%s: realpath failed: %s\n" -msgstr "%s：realpath 失敗：%s\n" +msgid "%s: nothing to choose from" +msgstr "%s：沒得選擇" #, c-format msgid "%s: scope can be only one of: universal function global local" @@ -786,36 +751,36 @@ msgid "%s: setting cursor while evaluating 'complete --arguments' is not yet sup msgstr "%s：尚不支援於執行「complete --arguments」時設定游標" #, c-format -msgid "%s: stdin is closed\n" -msgstr "%s：stdin 已關閉\n" +msgid "%s: stdin is closed" +msgstr "%s：stdin 已關閉" #, c-format -msgid "%s: successfully set universal '%s'; but a global by that name shadows it\n" -msgstr "%s：成功設定了通域變數「%s」，但有同名的全域變數遮蔽了它\n" +msgid "%s: successfully set universal '%s'; but a global by that name shadows it" +msgstr "%s：成功設定了通域變數「%s」，但有同名的全域變數遮蔽了它" #, c-format -msgid "%s: the -k/--key syntax is no longer supported. See `bind --help` and `bind --key-names`\n" -msgstr "%s：-k/--key 語法不再支援。參見「bind --help」和「bind --key-names」\n" +msgid "%s: the -k/--key syntax is no longer supported. See `bind --help` and `bind --key-names`" +msgstr "%s：-k/--key 語法不再支援。參見「bind --help」和「bind --key-names」" #, c-format -msgid "%s: there is no line %s\n" -msgstr "%s：沒有第 %s 行\n" +msgid "%s: there is no line %s" +msgstr "%s：沒有第 %s 行" #, c-format msgid "%s: too many arguments" msgstr "%s：太多引數" #, c-format -msgid "%s: usage of -i for --silent is deprecated. Please use -s or --silent instead.\n" -msgstr "%s：以 -i 表示 --silent 的作法已棄用。請改用 -s 或 --silent。\n" +msgid "%s: usage of -i for --silent is deprecated. Please use -s or --silent instead." +msgstr "%s：以 -i 表示 --silent 的作法已棄用。請改用 -s 或 --silent。" #, c-format msgid "%s: value not completely converted (can't convert '%s')" msgstr "%s：值未完全轉換（無法轉換「%s」）" #, c-format -msgid "%s: variable '%s' is read-only\n" -msgstr "%s：變數「%s」是唯讀的\n" +msgid "%s: variable '%s' is read-only" +msgstr "%s：變數「%s」是唯讀的" # 第一個 %s 是刪節號。此字串出現在按下 的清單太長的情況。 #, c-format @@ -847,12 +812,19 @@ msgid "'}' does not take arguments. Did you forget a ';'?" msgstr "「}」不需要引數。你是不是忘了「;」？" #, c-format -msgid "(Type 'help %s' for related documentation)\n" -msgstr "（輸入「help %s」來查閱相關文件）\n" +msgid "(%s)" +msgstr "（%s）" + +#, c-format +msgid "(Type 'help %s' for related documentation)" +msgstr "（輸入「help %s」來查閱相關文件）" msgid "(no matches)" msgstr "（無匹配）" +msgid "(read-only)" +msgstr "（唯讀）" + #, c-format msgid ", copied in %s @ line %d" msgstr "，從 %s 第 %d 行複製" @@ -1046,8 +1018,8 @@ msgid "Error when renaming file: %s" msgstr "重新命名檔案時發生錯誤：%s" #, c-format -msgid "Error while reading file %s\n" -msgstr "讀取檔案 %s 時發生錯誤\n" +msgid "Error while reading file %s" +msgstr "讀取檔案 %s 時發生錯誤" msgid "Errors reported by exec (on by default)" msgstr "exec 回報的錯誤（預設開啟）" @@ -1296,8 +1268,8 @@ msgid "Missing operator" msgstr "缺少運算子" #, c-format -msgid "Modification of read-only variable \"%s\" is not allowed\n" -msgstr "不允許修改唯讀變數「%s」\n" +msgid "Modification of read-only variable \"%s\" is not allowed" +msgstr "不允許修改唯讀變數「%s」" msgid "Negate exit status of job" msgstr "反轉作業的結束狀態" @@ -1367,12 +1339,16 @@ msgstr "請在啟動 fish 前先設定 %s 或 HOME 環境變數。" msgid "Polite quit request" msgstr "有禮的結束請求" +#, c-format +msgid "Position must be one of: %s" +msgstr "" + msgid "Power failure" msgstr "電源中斷" #, c-format -msgid "Press ctrl-%c again to exit\n" -msgstr "再次按下 ctrl-%c 來離開\n" +msgid "Press ctrl-%c again to exit" +msgstr "再次按下 ctrl-%c 來離開" msgid "Print arguments" msgstr "印出引數" @@ -1765,6 +1741,10 @@ msgstr "陣列索引值從 1 開始而非 0。" msgid "autoloading" msgstr "自動載入" +#, c-format +msgid "builtin %s: %s failed: %s" +msgstr "內建命令 %s：%s 失敗：%s" + #, c-format msgid "builtin %s: %s: %s" msgstr "內建命令 %s：%s：%s" @@ -1773,10 +1753,6 @@ msgstr "內建命令 %s：%s：%s" msgid "builtin %s: Invalid arg: %s" msgstr "內建命令 %s：無效的引數：%s" -#, c-format -msgid "builtin %s: realpath failed: %s" -msgstr "內建命令 %s：realpath 失敗：%s" - msgid "builtin history delete --exact requires --case-sensitive" msgstr "內建命令 history delete --exact 需要 --case-sensitive" @@ -1884,8 +1860,8 @@ msgid "stopped" msgstr "已停止" #, c-format -msgid "switch: Expected at most one argument, got %u\n" -msgstr "switch：預期至多有一個引數，卻收到 %u 個\n" +msgid "switch: Expected at most one argument, got %u" +msgstr "switch：預期至多有一個引數，卻收到 %u 個" msgid "symlink" msgstr "象徵式連結" diff --git a/src/bin/fish.rs b/src/bin/fish.rs index e16613bed..0ce2f47e9 100644 --- a/src/bin/fish.rs +++ b/src/bin/fish.rs @@ -23,7 +23,7 @@ fish_indent, fish_key_reader, shared::{ BUILTIN_ERR_MISSING, BUILTIN_ERR_UNEXP_ARG, BUILTIN_ERR_UNKNOWN, STATUS_CMD_ERROR, - STATUS_CMD_OK, STATUS_CMD_UNKNOWN, + STATUS_CMD_OK, STATUS_CMD_UNKNOWN, VERSION_STRING_TEMPLATE, }, }, common::{ @@ -302,8 +302,8 @@ fn fish_parse_opt(args: &mut [WString], opts: &mut FishCmdOpts) -> ControlFlow opts.enable_private_mode = true, 'v' => { printf!( - "%s", - wgettext_fmt!("%s, version %s\n", PACKAGE_NAME, fish::BUILD_VERSION) + "%s\n", + wgettext_fmt!(VERSION_STRING_TEMPLATE, PACKAGE_NAME, fish::BUILD_VERSION) ); return ControlFlow::Break(0); } @@ -590,10 +590,12 @@ fn throwing_main() -> i32 { }); res = reader_read(parser, f.as_raw_fd(), &IoChain::new()); if res.is_err() { - flogf!( + flog!( warning, - wgettext!("Error while reading file %s\n"), - path.to_string_lossy() + sprintf!( + "%s\n", + wgettext_fmt!("Error while reading file %s", path.to_string_lossy()) + ) ); } } diff --git a/src/builtins/abbr.rs b/src/builtins/abbr.rs index a6d73c4ea..2b092d86f 100644 --- a/src/builtins/abbr.rs +++ b/src/builtins/abbr.rs @@ -8,6 +8,14 @@ use fish_common::help_section; use pcre2::utf32::{Regex, RegexBuilder}; +localizable_consts! { + NAME_CANNOT_BE_EMPTY + "%s %s: Name cannot be empty" + + ABBR_CANNOT_HAVE_SPACES + "%s %s: Abbreviation '%s' cannot have spaces in the word" +} + const CMD: &wstr = L!("abbr"); #[derive(Default, Debug)] @@ -51,8 +59,8 @@ fn validate(&mut self, streams: &mut IoStreams) -> bool { } if cmds.len() > 1 { - streams.err.append(&wgettext_fmt!( - "%s: Cannot combine options %s\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Cannot combine options %s", CMD, join(&cmds, L!(", ")) )); @@ -66,30 +74,40 @@ fn validate(&mut self, streams: &mut IoStreams) -> bool { self.add = !self.args.is_empty(); } + localizable_consts! { + OPTION_REQUIRES_ARG + "%s: %s option requires %s" + } if !self.add && self.position.is_some() { - streams.err.append(&wgettext_fmt!( - "%s: --position option requires --add\n", - CMD + streams.err.appendln(&wgettext_fmt!( + OPTION_REQUIRES_ARG, + CMD, + "--position", + "--add", )); return false; } if !self.add && self.regex_pattern.is_some() { streams .err - .append(&wgettext_fmt!("%s: --regex option requires --add\n", CMD)); + .appendln(&wgettext_fmt!(OPTION_REQUIRES_ARG, CMD, "--regex", "--add")); return false; } if !self.add && self.function.is_some() { - streams.err.append(&wgettext_fmt!( - "%s: --function option requires --add\n", - CMD + streams.err.appendln(&wgettext_fmt!( + OPTION_REQUIRES_ARG, + CMD, + "--function", + "--add", )); return false; } if !self.add && self.set_cursor_marker.is_some() { - streams.err.append(&wgettext_fmt!( - "%s: --set-cursor option requires --add\n", - CMD + streams.err.appendln(&wgettext_fmt!( + OPTION_REQUIRES_ARG, + CMD, + "--set-cursor", + "--add", )); return false; } @@ -98,8 +116,8 @@ fn validate(&mut self, streams: &mut IoStreams) -> bool { .as_ref() .is_some_and(|m| m.is_empty()) { - streams.err.append(&wgettext_fmt!( - "%s: --set-cursor argument cannot be empty\n", + streams.err.appendln(&wgettext_fmt!( + "%s: --set-cursor argument cannot be empty", CMD )); return false; @@ -195,8 +213,8 @@ fn abbr_show(opts: &Options, streams: &mut IoStreams, parser: &Parser) -> Builti fn abbr_list(opts: &Options, streams: &mut IoStreams) -> BuiltinResult { let subcmd = L!("--list"); if !opts.args.is_empty() { - streams.err.append(&wgettext_fmt!( - "%s %s: Unexpected argument -- '%s'\n", + streams.err.appendln(&wgettext_fmt!( + "%s %s: Unexpected argument -- '%s'", CMD, subcmd, &opts.args[0] @@ -219,8 +237,8 @@ fn abbr_rename(opts: &Options, streams: &mut IoStreams) -> BuiltinResult { let subcmd = L!("--rename"); if opts.args.len() != 2 { - streams.err.append(&wgettext_fmt!( - "%s %s: Requires exactly two arguments\n", + streams.err.appendln(&wgettext_fmt!( + "%s %s: Requires exactly two arguments", CMD, subcmd )); @@ -231,13 +249,13 @@ fn abbr_rename(opts: &Options, streams: &mut IoStreams) -> BuiltinResult { if old_name.is_empty() || new_name.is_empty() { streams .err - .append(&wgettext_fmt!("%s %s: Name cannot be empty\n", CMD, subcmd)); + .appendln(&wgettext_fmt!(NAME_CANNOT_BE_EMPTY, CMD, subcmd)); return Err(STATUS_INVALID_ARGS); } if contains_whitespace(new_name) { - streams.err.append(&wgettext_fmt!( - "%s %s: Abbreviation '%s' cannot have spaces in the word\n", + streams.err.appendln(&wgettext_fmt!( + ABBR_CANNOT_HAVE_SPACES, CMD, subcmd, new_name.as_utfstr() @@ -250,8 +268,8 @@ fn abbr_rename(opts: &Options, streams: &mut IoStreams) -> BuiltinResult { .iter() .any(|a| a.name == *old_name && a.commands == opts.commands) { - streams.err.append(&wgettext_fmt!( - "%s %s: No abbreviation named %s with the specified command restrictions\n", + streams.err.appendln(&wgettext_fmt!( + "%s %s: No abbreviation named %s with the specified command restrictions", CMD, subcmd, old_name.as_utfstr() @@ -264,8 +282,8 @@ fn abbr_rename(opts: &Options, streams: &mut IoStreams) -> BuiltinResult { .any(|a| a.name == *new_name && a.commands == opts.commands) { if opts.commands.is_empty() { - streams.err.append(&wgettext_fmt!( - "%s %s: Abbreviation %s already exists, cannot rename %s\n", + streams.err.appendln(&wgettext_fmt!( + "%s %s: Abbreviation %s already exists, cannot rename %s", CMD, subcmd, new_name.as_utfstr(), @@ -281,8 +299,8 @@ fn abbr_rename(opts: &Options, streams: &mut IoStreams) -> BuiltinResult { cmd_list.push_utfstr(&escape_string(cmd, style)); } - streams.err.append(&wgettext_fmt!( - "%s %s: Abbreviation %s already exists for commands %s, cannot rename %s\n", + streams.err.appendln(&wgettext_fmt!( + "%s %s: Abbreviation %s already exists for commands %s, cannot rename %s", CMD, subcmd, new_name.as_utfstr(), @@ -321,8 +339,8 @@ fn abbr_add(opts: &Options, streams: &mut IoStreams) -> BuiltinResult { let subcmd = L!("--add"); if opts.args.len() < 2 && opts.function.is_none() { - streams.err.append(&wgettext_fmt!( - "%s %s: Requires at least two arguments\n", + streams.err.appendln(&wgettext_fmt!( + "%s %s: Requires at least two arguments", CMD, subcmd )); @@ -332,13 +350,13 @@ fn abbr_add(opts: &Options, streams: &mut IoStreams) -> BuiltinResult { if opts.args.is_empty() || opts.args[0].is_empty() { streams .err - .append(&wgettext_fmt!("%s %s: Name cannot be empty\n", CMD, subcmd)); + .appendln(&wgettext_fmt!(NAME_CANNOT_BE_EMPTY, CMD, subcmd)); return Err(STATUS_INVALID_ARGS); } let name = &opts.args[0]; if name.chars().any(|c| c.is_whitespace()) { - streams.err.append(&wgettext_fmt!( - "%s %s: Abbreviation '%s' cannot have spaces in the word\n", + streams.err.appendln(&wgettext_fmt!( + ABBR_CANNOT_HAVE_SPACES, CMD, subcmd, name.as_utfstr() @@ -400,8 +418,8 @@ fn abbr_add(opts: &Options, streams: &mut IoStreams) -> BuiltinResult { // Abbreviation function names disallow spaces. // This is to prevent accidental usage of e.g. `--function 'string replace'` if !valid_func_name(function) || contains_whitespace(function) { - streams.err.append(&wgettext_fmt!( - "%s: Invalid function name: %s\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Invalid function name: %s", CMD, function.as_utfstr() )); @@ -546,10 +564,9 @@ pub fn abbr(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> Bui 'c' => opts.commands.push(w.woptarg.map(|x| x.to_owned()).unwrap()), 'p' => { if opts.position.is_some() { - streams.err.append(&wgettext_fmt!( - "%s: Cannot specify multiple positions\n", - CMD - )); + streams + .err + .appendln(&wgettext_fmt!("%s: Cannot specify multiple positions", CMD)); return Err(STATUS_INVALID_ARGS); } if w.woptarg == Some(L!("command")) { @@ -557,21 +574,25 @@ pub fn abbr(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> Bui } else if w.woptarg == Some(L!("anywhere")) { opts.position = Some(Position::Anywhere); } else { - streams.err.append(&wgettext_fmt!( - "%s: Invalid position '%s'\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Invalid position '%s'", CMD, w.woptarg.unwrap_or_default() )); - streams - .err - .append(L!("Position must be one of: command, anywhere.\n")); + streams.err.appendln(&wgettext_fmt!( + "Position must be one of: %s", + // Use a single argument here to avoid having to update translations when + // the number of options changes. + "command, anywhere", + )); + return Err(STATUS_INVALID_ARGS); } } 'r' => { if opts.regex_pattern.is_some() { - streams.err.append(&wgettext_fmt!( - "%s: Cannot specify multiple regex patterns\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Cannot specify multiple regex patterns", CMD )); return Err(STATUS_INVALID_ARGS); @@ -580,8 +601,8 @@ pub fn abbr(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> Bui } SET_CURSOR_SHORT => { if opts.set_cursor_marker.is_some() { - streams.err.append(&wgettext_fmt!( - "%s: Cannot specify multiple set-cursor options\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Cannot specify multiple set-cursor options", CMD )); return Err(STATUS_INVALID_ARGS); diff --git a/src/builtins/argparse.rs b/src/builtins/argparse.rs index 7e97d7bfd..34ac7fcda 100644 --- a/src/builtins/argparse.rs +++ b/src/builtins/argparse.rs @@ -11,7 +11,10 @@ localizable_consts!( BUILTIN_ERR_INVALID_OPT_SPEC - "%s: Invalid option spec '%s' at char '%c'\n" + "%s: Invalid option spec '%s' at char '%c'" + + MISSING_DOUBLE_HYPHEN_SEPARATOR + "%s: Missing -- separator" ); #[derive(Default)] @@ -168,8 +171,8 @@ fn parse_exclusive_args(opts: &mut ArgParseCmdOpts, streams: &mut IoStreams) -> for raw_xflags in &opts.raw_exclusive_flags { let xflags: Vec<_> = raw_xflags.split(',').collect(); if xflags.len() < 2 { - streams.err.append(&wgettext_fmt!( - "%s: exclusive flag string '%s' is not valid\n", + streams.err.appendln(&wgettext_fmt!( + "%s: exclusive flag string '%s' is not valid", opts.name, raw_xflags )); @@ -186,8 +189,8 @@ fn parse_exclusive_args(opts: &mut ArgParseCmdOpts, streams: &mut IoStreams) -> // It's a long flag we store as its short flag equivalent. exclusive_set.push(*short_equiv); } else { - streams.err.append(&wgettext_fmt!( - "%s: exclusive flag '%s' is not valid\n", + streams.err.appendln(&wgettext_fmt!( + "%s: exclusive flag '%s' is not valid", opts.name, flag )); @@ -215,8 +218,8 @@ fn parse_flag_modifiers<'args>( && s.char_at(0) != '!' && s.char_at(0) != '&' { - streams.err.append(&wgettext_fmt!( - "%s: Implicit int short flag '%c' does not allow modifiers like '%c'\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Implicit int short flag '%c' does not allow modifiers like '%c'", opts.name, opt_spec.short_flag, s.char_at(0) @@ -250,7 +253,7 @@ fn parse_flag_modifiers<'args>( if s.char_at(0) == '!' { if opt_spec.arg_type == ArgType::NoArgument { - streams.err.append(&wgettext_fmt!( + streams.err.appendln(&wgettext_fmt!( BUILTIN_ERR_INVALID_OPT_SPEC, opts.name, option_spec, @@ -262,7 +265,7 @@ fn parse_flag_modifiers<'args>( // Move cursor to the end so we don't expect a long flag. s = s.slice_from(s.char_count()); } else if !s.is_empty() { - streams.err.append(&wgettext_fmt!( + streams.err.appendln(&wgettext_fmt!( BUILTIN_ERR_INVALID_OPT_SPEC, opts.name, option_spec, @@ -277,8 +280,8 @@ fn parse_flag_modifiers<'args>( } if opts.options.contains_key(&opt_spec.short_flag) { - streams.err.append(&wgettext_fmt!( - "%s: Short flag '%c' already defined\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Short flag '%c' already defined", opts.name, opt_spec.short_flag )); @@ -298,6 +301,10 @@ fn parse_option_spec_sep<'args>( counter: &mut u32, streams: &mut IoStreams, ) -> bool { + localizable_consts! { + IMPLICIT_INT_FLAG_ALREADY_DEFINED + "%s: Implicit int flag '%c' already defined" + } let mut s = *opt_spec_str; let mut i = 1usize; // C++ used -1 to check for # here, we instead adjust opt_spec_str to start one earlier @@ -309,8 +316,8 @@ fn parse_option_spec_sep<'args>( *counter += 1; } if opts.implicit_int_flag != '\0' { - streams.err.append(&wgettext_fmt!( - "%s: Implicit int flag '%c' already defined\n", + streams.err.appendln(&wgettext_fmt!( + IMPLICIT_INT_FLAG_ALREADY_DEFINED, opts.name, opts.implicit_int_flag )); @@ -328,7 +335,7 @@ fn parse_option_spec_sep<'args>( opt_spec.short_flag_valid = false; i += 1; if i == s.char_count() { - streams.err.append(&wgettext_fmt!( + streams.err.appendln(&wgettext_fmt!( BUILTIN_ERR_INVALID_OPT_SPEC, opts.name, option_spec, @@ -340,7 +347,7 @@ fn parse_option_spec_sep<'args>( '/' => { i += 1; // the struct is initialized assuming short_flag_valid should be true if i == s.char_count() { - streams.err.append(&wgettext_fmt!( + streams.err.appendln(&wgettext_fmt!( BUILTIN_ERR_INVALID_OPT_SPEC, opts.name, option_spec, @@ -351,8 +358,8 @@ fn parse_option_spec_sep<'args>( } '#' => { if opts.implicit_int_flag != '\0' { - streams.err.append(&wgettext_fmt!( - "%s: Implicit int flag '%c' already defined\n", + streams.err.appendln(&wgettext_fmt!( + IMPLICIT_INT_FLAG_ALREADY_DEFINED, opts.name, opts.implicit_int_flag )); @@ -395,8 +402,8 @@ fn parse_option_spec<'args>( streams: &mut IoStreams, ) -> bool { if option_spec.is_empty() { - streams.err.append(&wgettext_fmt!( - "%s: An option spec must have at least a short or a long flag\n", + streams.err.appendln(&wgettext_fmt!( + "%s: An option spec must have at least a short or a long flag", opts.name )); return false; @@ -405,8 +412,8 @@ fn parse_option_spec<'args>( let mut s = option_spec; if !fish_iswalnum(s.char_at(0)) && s.char_at(0) != '#' && !(s.char_at(0) == '/' && s.len() > 1) { - streams.err.append(&wgettext_fmt!( - "%s: Short flag '%c' invalid, must be alphanum or '#'\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Short flag '%c' invalid, must be alphanum or '#'", opts.name, s.char_at(0) )); @@ -432,8 +439,8 @@ fn parse_option_spec<'args>( if long_flag_char_count > 0 { opt_spec.long_flag = s.slice_to(long_flag_char_count); if opts.long_to_short_flag.contains_key(opt_spec.long_flag) { - streams.err.append(&wgettext_fmt!( - "%s: Long flag '%s' already defined\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Long flag '%s' already defined", opts.name, opt_spec.long_flag )); @@ -481,7 +488,7 @@ fn collect_option_specs<'args>( if *optind == argc { streams .err - .append(&wgettext_fmt!("%s: Missing -- separator\n", cmd)); + .appendln(&wgettext_fmt!(MISSING_DOUBLE_HYPHEN_SEPARATOR, cmd)); return Err(STATUS_INVALID_ARGS); } @@ -503,7 +510,7 @@ fn collect_option_specs<'args>( if counter > counter_max { streams .err - .append(&wgettext_fmt!("%s: Too many long-only options\n", cmd)); + .appendln(&wgettext_fmt!("%s: Too many long-only options", cmd)); return Err(STATUS_INVALID_ARGS); } @@ -557,8 +564,8 @@ fn parse_cmd_opts<'args>( } else if kind == L!("none") { ArgType::NoArgument } else { - streams.err.append(&wgettext_fmt!( - "%s: Invalid --unknown-arguments value '%s'\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Invalid --unknown-arguments value '%s'", cmd, kind )); @@ -574,8 +581,8 @@ fn parse_cmd_opts<'args>( opts.min_args = { let x = fish_wcstol(w.woptarg.unwrap()).unwrap_or(-1); if x < 0 { - streams.err.append(&wgettext_fmt!( - "%s: Invalid --min-args value '%s'\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Invalid --min-args value '%s'", cmd, w.woptarg.unwrap() )); @@ -588,8 +595,8 @@ fn parse_cmd_opts<'args>( opts.max_args = { let x = fish_wcstol(w.woptarg.unwrap()).unwrap_or(-1); if x < 0 { - streams.err.append(&wgettext_fmt!( - "%s: Invalid --max-args value '%s'\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Invalid --max-args value '%s'", cmd, w.woptarg.unwrap() )); @@ -643,7 +650,7 @@ fn parse_cmd_opts<'args>( // The user didn't specify any option specs. streams .err - .append(&wgettext_fmt!("%s: Missing -- separator\n", cmd)); + .appendln(&wgettext_fmt!(MISSING_DOUBLE_HYPHEN_SEPARATOR, cmd)); return Err(STATUS_INVALID_ARGS); } diff --git a/src/builtins/bind.rs b/src/builtins/bind.rs index 735496646..48ab41750 100644 --- a/src/builtins/bind.rs +++ b/src/builtins/bind.rs @@ -353,14 +353,14 @@ fn insert( ); if !self.opts.silent { if seq.len() == 1 { - streams.err.append(&wgettext_fmt!( - "%s: No binding found for key '%s'\n", + streams.err.appendln(&wgettext_fmt!( + "%s: No binding found for key '%s'", cmd, seq[0] )); } else { - streams.err.append(&wgettext_fmt!( - "%s: No binding found for key sequence '%s'\n", + streams.err.appendln(&wgettext_fmt!( + "%s: No binding found for key sequence '%s'", cmd, eseq )); @@ -452,8 +452,8 @@ fn parse_cmd_opts( 'f' => opts.mode = BIND_FUNCTION_NAMES, 'h' => opts.print_help = true, 'k' => { - streams.err.append(&wgettext_fmt!( - "%s: the -k/--key syntax is no longer supported. See `bind --help` and `bind --key-names`\n", + streams.err.appendln(&wgettext_fmt!( + "%s: the -k/--key syntax is no longer supported. See `bind --help` and `bind --key-names`", cmd, )); return Err(STATUS_INVALID_ARGS); @@ -567,7 +567,7 @@ pub fn bind( _ => { streams .err - .append(&wgettext_fmt!("%s: Invalid state\n", cmd)); + .appendln(&wgettext_fmt!("%s: Invalid state", cmd)); return Err(STATUS_CMD_ERROR); } } diff --git a/src/builtins/block.rs b/src/builtins/block.rs index d689f7701..75df3dbb0 100644 --- a/src/builtins/block.rs +++ b/src/builtins/block.rs @@ -84,8 +84,8 @@ pub fn block(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) -> Bu if opts.erase { if opts.scope != Scope::Unset { - streams.err.append(&wgettext_fmt!( - "%s: Can not specify scope when removing block\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Can not specify scope when removing block", cmd )); return Err(STATUS_INVALID_ARGS); @@ -94,7 +94,7 @@ pub fn block(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) -> Bu if parser.global_event_blocks.load(Ordering::Relaxed) == 0 { streams .err - .append(&wgettext_fmt!("%s: No blocks defined\n", cmd)); + .appendln(&wgettext_fmt!("%s: No blocks defined", cmd)); return Err(STATUS_CMD_ERROR); } parser.global_event_blocks.fetch_sub(1, Ordering::Relaxed); diff --git a/src/builtins/breakpoint.rs b/src/builtins/breakpoint.rs index c19738b31..58d3b1d6e 100644 --- a/src/builtins/breakpoint.rs +++ b/src/builtins/breakpoint.rs @@ -28,8 +28,8 @@ pub fn breakpoint(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) .block_at_index(1) .is_none_or(|b| b.typ() == BlockType::breakpoint) { - streams.err.append(&wgettext_fmt!( - "%s: Command not valid at an interactive prompt\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Command not valid at an interactive prompt", cmd, )); return Err(STATUS_ILLEGAL_CMD); diff --git a/src/builtins/cd.rs b/src/builtins/cd.rs index 410f6dd0d..73bcc7f96 100644 --- a/src/builtins/cd.rs +++ b/src/builtins/cd.rs @@ -16,6 +16,11 @@ // The cd builtin. Changes the current directory to the one specified or to $HOME if none is // specified. The directory can be relative to any directory in the CDPATH variable. pub fn cd(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) -> BuiltinResult { + localizable_consts! { + DIR_DOES_NOT_EXIST + "%s: The directory '%s' does not exist" + } + let Some(&cmd) = args.first() else { return Err(STATUS_INVALID_ARGS); }; @@ -41,7 +46,7 @@ pub fn cd(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) -> Built None => { streams .err - .append(&wgettext_fmt!("%s: Could not find home directory\n", cmd)); + .appendln(&wgettext_fmt!("%s: Could not find home directory", cmd)); return Err(STATUS_CMD_ERROR); } } @@ -49,8 +54,8 @@ pub fn cd(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) -> Built // Stop `cd ""` from crashing if dir_in.is_empty() { - streams.err.append(&wgettext_fmt!( - "%s: Empty directory '%s' does not exist\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Empty directory '%s' does not exist", cmd, dir_in )); @@ -64,11 +69,9 @@ pub fn cd(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) -> Built let dirs = path_apply_cdpath(dir_in, &pwd, vars); if dirs.is_empty() { - streams.err.append(&wgettext_fmt!( - "%s: The directory '%s' does not exist\n", - cmd, - dir_in - )); + streams + .err + .appendln(&wgettext_fmt!(DIR_DOES_NOT_EXIST, cmd, dir_in)); if !parser.is_interactive() { streams.err.append(&parser.current_line()); @@ -141,35 +144,33 @@ pub fn cd(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) -> Built if best_errno == ENOTDIR { streams .err - .append(&wgettext_fmt!("%s: '%s' is not a directory\n", cmd, dir_in)); + .appendln(&wgettext_fmt!("%s: '%s' is not a directory", cmd, dir_in)); } else if !broken_symlink.is_empty() { - streams.err.append(&wgettext_fmt!( - "%s: '%s' is a broken symbolic link to '%s'\n", + streams.err.appendln(&wgettext_fmt!( + "%s: '%s' is a broken symbolic link to '%s'", cmd, broken_symlink, broken_symlink_target )); } else if best_errno == ELOOP { - streams.err.append(&wgettext_fmt!( - "%s: Too many levels of symbolic links: '%s'\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Too many levels of symbolic links: '%s'", cmd, dir_in )); } else if best_errno == ENOENT { - streams.err.append(&wgettext_fmt!( - "%s: The directory '%s' does not exist\n", - cmd, - dir_in - )); + streams + .err + .appendln(&wgettext_fmt!(DIR_DOES_NOT_EXIST, cmd, dir_in)); } else if best_errno == EACCES || best_errno == EPERM { streams .err - .append(&wgettext_fmt!("%s: Permission denied: '%s'\n", cmd, dir_in)); + .appendln(&wgettext_fmt!("%s: Permission denied: '%s'", cmd, dir_in)); } else { errno::set_errno(Errno(best_errno)); wperror(L!("cd")); - streams.err.append(&wgettext_fmt!( - "%s: Unknown error trying to locate directory '%s'\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Unknown error trying to locate directory '%s'", cmd, dir_in )); diff --git a/src/builtins/commandline.rs b/src/builtins/commandline.rs index 8d989a8c4..19c00f6d3 100644 --- a/src/builtins/commandline.rs +++ b/src/builtins/commandline.rs @@ -527,7 +527,7 @@ pub fn commandline(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) else { streams .err - .append(&wgettext_fmt!("%s: there is no line %s\n", cmd, arg)); + .appendln(&wgettext_fmt!("%s: there is no line %s", cmd, arg)); builtin_print_error_trailer(parser, streams.err, cmd); return Err(STATUS_INVALID_ARGS); }; @@ -540,8 +540,8 @@ pub fn commandline(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) let next_line_offset = get_offset_from_line(&rstate.text, line_index + 1).unwrap_or(rstate.text.len()); if line_offset + new_coord > next_line_offset { - streams.err.append(&wgettext_fmt!( - "%s: column %s exceeds line length\n", + streams.err.appendln(&wgettext_fmt!( + "%s: column %s exceeds line length", cmd, arg )); diff --git a/src/builtins/complete.rs b/src/builtins/complete.rs index d3c12a604..ed8dedec5 100644 --- a/src/builtins/complete.rs +++ b/src/builtins/complete.rs @@ -243,6 +243,11 @@ fn builtin_complete_print( /// The complete builtin. Used for specifying programmable tab-completions. Calls the functions in /// complete.rs for any heavy lifting. pub fn complete(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> BuiltinResult { + localizable_consts! { + OPTION_REQUIRES_NON_EMPTY_STRING + "%s: %s requires a non-empty string" + } + let cmd = argv[0]; let argc = argv.len(); let mut result_mode = CompletionMode::default(); @@ -321,8 +326,8 @@ pub fn complete(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> cmd_to_complete.push(tmp); } } else { - streams.err.append(&wgettext_fmt!( - "%s: Invalid token '%s'\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Invalid token '%s'", cmd, w.woptarg.unwrap() )); @@ -342,9 +347,11 @@ pub fn complete(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> let arg = w.woptarg.unwrap(); short_opt.extend(arg.chars()); if arg.is_empty() { - streams - .err - .append(&wgettext_fmt!("%s: -s requires a non-empty string\n", cmd,)); + streams.err.appendln(&wgettext_fmt!( + OPTION_REQUIRES_NON_EMPTY_STRING, + cmd, + "-s", + )); return Err(STATUS_INVALID_ARGS); } } @@ -352,9 +359,11 @@ pub fn complete(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> let arg = w.woptarg.unwrap(); gnu_opt.push(arg); if arg.is_empty() { - streams - .err - .append(&wgettext_fmt!("%s: -l requires a non-empty string\n", cmd,)); + streams.err.appendln(&wgettext_fmt!( + OPTION_REQUIRES_NON_EMPTY_STRING, + cmd, + "-l", + )); return Err(STATUS_INVALID_ARGS); } } @@ -362,9 +371,11 @@ pub fn complete(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> let arg = w.woptarg.unwrap(); old_opt.push(arg); if arg.is_empty() { - streams - .err - .append(&wgettext_fmt!("%s: -o requires a non-empty string\n", cmd,)); + streams.err.appendln(&wgettext_fmt!( + OPTION_REQUIRES_NON_EMPTY_STRING, + cmd, + "-o", + )); return Err(STATUS_INVALID_ARGS); } } @@ -469,11 +480,9 @@ pub fn complete(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> prefix.push_str(": "); if let Err(err_text) = detect_errors_in_argument_list(&comp, &prefix) { - streams.err.append(&wgettext_fmt!( - "%s: %s: contains a syntax error\n", - cmd, - comp - )); + streams + .err + .appendln(&wgettext_fmt!("%s: %s: contains a syntax error", cmd, comp)); streams.err.appendln(&err_text); return Err(STATUS_CMD_ERROR); } diff --git a/src/builtins/contains.rs b/src/builtins/contains.rs index 6a40c802a..a19427604 100644 --- a/src/builtins/contains.rs +++ b/src/builtins/contains.rs @@ -73,7 +73,7 @@ pub fn contains(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) -> } else { streams .err - .append(&wgettext_fmt!("%s: Key not specified\n", cmd)); + .appendln(&wgettext_fmt!("%s: Key not specified", cmd)); } Err(STATUS_CMD_ERROR) diff --git a/src/builtins/fg.rs b/src/builtins/fg.rs index c7eefd08b..53922f2ba 100644 --- a/src/builtins/fg.rs +++ b/src/builtins/fg.rs @@ -60,11 +60,11 @@ pub fn fg(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> Built if found_job { streams .err - .append(&wgettext_fmt!("%s: Ambiguous job\n", cmd)); + .appendln(&wgettext_fmt!("%s: Ambiguous job", cmd)); } else { streams .err - .append(&wgettext_fmt!("%s: '%s' is not a job\n", cmd, argv[optind])); + .appendln(&wgettext_fmt!("%s: '%s' is not a job", cmd, argv[optind])); } builtin_print_error_trailer(parser, streams.err, cmd); @@ -79,15 +79,15 @@ pub fn fg(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> Built { streams .err - .append(&wgettext_fmt!("%s: No suitable job: %d\n", cmd, pid)); + .appendln(&wgettext_fmt!("%s: No suitable job: %d", cmd, pid)); job_pos = None; job = None; } else { let (pos, j) = j.unwrap(); job_pos = Some(pos); job = if !j.wants_job_control() { - streams.err.append(&wgettext_fmt!( - "%s: Can't put job %d, '%s' to foreground because it is not under job control\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Can't put job %d, '%s' to foreground because it is not under job control", cmd, pid, j.command() diff --git a/src/builtins/fish_indent.rs b/src/builtins/fish_indent.rs index 4c3917e77..32c6d8e55 100644 --- a/src/builtins/fish_indent.rs +++ b/src/builtins/fish_indent.rs @@ -1008,7 +1008,7 @@ enum OutputType { } 'v' => { streams.out.appendln(&wgettext_fmt!( - "%s, version %s", + VERSION_STRING_TEMPLATE, get_program_name(), crate::BUILD_VERSION )); @@ -1061,7 +1061,7 @@ enum OutputType { let cmd = "fish_indent"; streams .err - .append(&wgettext_fmt!("%s: stdin is closed\n", cmd)); + .appendln(&wgettext_fmt!(BUILTIN_ERR_STDIN_CLOSED, cmd)); return Err(STATUS_CMD_ERROR); }; let mut buf = vec![]; diff --git a/src/builtins/fish_key_reader.rs b/src/builtins/fish_key_reader.rs index e33a23bac..0ecf0afe9 100644 --- a/src/builtins/fish_key_reader.rs +++ b/src/builtins/fish_key_reader.rs @@ -59,8 +59,8 @@ fn should_exit( { return true; } - streams.err.append(&wgettext_fmt!( - "Press ctrl-%c again to exit\n", + streams.err.appendln(&wgettext_fmt!( + "Press ctrl-%c again to exit", char::from(modes.control_chars[evt] + 0x60) )); return false; @@ -202,7 +202,7 @@ fn parse_flags( } 'v' => { streams.out.appendln(&wgettext_fmt!( - "%s, version %s", + VERSION_STRING_TEMPLATE, get_program_name(), crate::BUILD_VERSION )); diff --git a/src/builtins/function.rs b/src/builtins/function.rs index 04655d568..95deb8d87 100644 --- a/src/builtins/function.rs +++ b/src/builtins/function.rs @@ -90,8 +90,8 @@ fn parse_cmd_opts( return Err(STATUS_INVALID_ARGS); } if !read_only_ok && is_read_only(varname) { - streams.err.append(&wgettext_fmt!( - "%s: variable '%s' is read-only\n", + streams.err.appendln(&wgettext_fmt!( + "%s: variable '%s' is read-only", cmd, varname )); diff --git a/src/builtins/functions.rs b/src/builtins/functions.rs index ca5f9e943..40616554d 100644 --- a/src/builtins/functions.rs +++ b/src/builtins/functions.rs @@ -116,6 +116,11 @@ pub fn functions(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) - return Err(STATUS_INVALID_ARGS); }; + localizable_consts! { + FUNCTION_DOES_NOT_EXIST + "%s: Function '%s' does not exist" + } + let mut opts = FunctionsCmdOpts::default(); let mut optind = 0; @@ -157,8 +162,8 @@ pub fn functions(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) - if let Some(desc) = opts.description { if args.len() != 1 { - streams.err.append(&wgettext_fmt!( - "%s: Expected exactly one function name\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Expected exactly one function name", cmd )); builtin_print_error_trailer(parser, streams.err, cmd); @@ -167,11 +172,9 @@ pub fn functions(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) - let current_func = args[0]; if !function::exists(current_func, parser) { - streams.err.append(&wgettext_fmt!( - "%s: Function '%s' does not exist\n", - cmd, - current_func - )); + streams + .err + .appendln(&wgettext_fmt!(FUNCTION_DOES_NOT_EXIST, cmd, current_func)); builtin_print_error_trailer(parser, streams.err, cmd); return Err(STATUS_CMD_ERROR); } @@ -265,9 +268,11 @@ pub fn functions(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) - if !opts.handlers_type.unwrap_or(L!("")).is_empty() && !event::EVENT_FILTER_NAMES.contains(&opts.handlers_type.unwrap()) { - streams.err.append(&wgettext_fmt!( - "%s: Expected generic | variable | signal | exit | job-id for --handlers-type\n", - cmd + streams.err.appendln(&wgettext_fmt!( + "%s: Expected %s for %s", + cmd, + "generic | variable | signal | exit | job-id", + "--handlers-type", )); return Err(STATUS_INVALID_ARGS); } @@ -305,8 +310,8 @@ pub fn functions(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) - if opts.copy { if args.len() != 2 { - streams.err.append(&wgettext_fmt!( - "%s: Expected exactly two names (current function name, and new function name)\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Expected exactly two names (current function name, and new function name)", cmd )); builtin_print_error_trailer(parser, streams.err, cmd); @@ -316,18 +321,16 @@ pub fn functions(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) - let new_func = args[1]; if !function::exists(current_func, parser) { - streams.err.append(&wgettext_fmt!( - "%s: Function '%s' does not exist\n", - cmd, - current_func - )); + streams + .err + .appendln(&wgettext_fmt!(FUNCTION_DOES_NOT_EXIST, cmd, current_func)); builtin_print_error_trailer(parser, streams.err, cmd); return Err(STATUS_CMD_ERROR); } if !valid_func_name(new_func) || parser_keywords_is_reserved(new_func) { - streams.err.append(&wgettext_fmt!( - "%s: Illegal function name '%s'\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Illegal function name '%s'", cmd, new_func )); @@ -336,8 +339,8 @@ pub fn functions(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) - } if function::exists(new_func, parser) { - streams.err.append(&wgettext_fmt!( - "%s: Function '%s' already exists. Cannot create copy of '%s'\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Function '%s' already exists. Cannot create copy of '%s'", cmd, new_func, current_func diff --git a/src/builtins/math.rs b/src/builtins/math.rs index 9cf5059c2..80163a450 100644 --- a/src/builtins/math.rs +++ b/src/builtins/math.rs @@ -69,7 +69,7 @@ fn parse_cmd_opts( if scale < 0 || scale > 15 { streams .err - .append(&wgettext_fmt!("%s: %s: invalid scale\n", cmd, optarg)); + .appendln(&wgettext_fmt!("%s: %s: invalid scale", cmd, optarg)); return Err(STATUS_INVALID_ARGS); } // We know the value is in the range [0, 15] @@ -89,7 +89,7 @@ fn parse_cmd_opts( } else { streams .err - .append(&wgettext_fmt!("%s: %s: invalid mode\n", cmd, optarg)); + .appendln(&wgettext_fmt!("%s: %s: invalid mode", cmd, optarg)); return Err(STATUS_INVALID_ARGS); } } @@ -102,8 +102,8 @@ fn parse_cmd_opts( } else { let base = fish_wcstoi(optarg).unwrap_or(-1); if base != 8 && base != 16 { - streams.err.append(&wgettext_fmt!( - "%s: %s: invalid base value\n", + streams.err.appendln(&wgettext_fmt!( + "%s: %s: invalid base value", cmd, optarg )); diff --git a/src/builtins/pwd.rs b/src/builtins/pwd.rs index 6e1d570fd..2a4008cd3 100644 --- a/src/builtins/pwd.rs +++ b/src/builtins/pwd.rs @@ -52,9 +52,10 @@ pub fn pwd(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> Buil if let Some(real_pwd) = wrealpath(&pwd) { pwd = real_pwd; } else { - streams.err.append(&wgettext_fmt!( - "%s: realpath failed: %s\n", + streams.err.appendln(&wgettext_fmt!( + "%s: %s failed: %s", cmd, + "realpath", errno().to_string() )); return Err(STATUS_CMD_ERROR); diff --git a/src/builtins/random.rs b/src/builtins/random.rs index e0c4b562e..be08cd375 100644 --- a/src/builtins/random.rs +++ b/src/builtins/random.rs @@ -58,7 +58,7 @@ pub fn random(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> B if arg_count == 1 { streams .err - .append(&wgettext_fmt!("%s: nothing to choose from\n", cmd)); + .appendln(&wgettext_fmt!("%s: nothing to choose from", cmd)); return Err(STATUS_INVALID_ARGS); } @@ -124,9 +124,11 @@ fn parse_ull(streams: &mut IoStreams, cmd: &wstr, num: &wstr) -> Result return Err(STATUS_INVALID_ARGS), Ok(0) => { - streams - .err - .append(&wgettext_fmt!("%s: STEP must be a positive integer\n", cmd,)); + streams.err.appendln(&wgettext_fmt!( + "%s: %s must be a positive integer", + cmd, + "STEP" + )); return Err(STATUS_INVALID_ARGS); } Ok(x) => step = x, diff --git a/src/builtins/read.rs b/src/builtins/read.rs index 329799116..62d30f472 100644 --- a/src/builtins/read.rs +++ b/src/builtins/read.rs @@ -122,8 +122,8 @@ fn parse_cmd_opts( opts.delimiter = Some(w.woptarg.unwrap().to_owned()); } 'i' => { - streams.err.append(&wgettext_fmt!( - "%s: usage of -i for --silent is deprecated. Please use -s or --silent instead.\n", + streams.err.appendln(&wgettext_fmt!( + "%s: usage of -i for --silent is deprecated. Please use -s or --silent instead.", cmd )); return Err(STATUS_INVALID_ARGS); @@ -147,8 +147,8 @@ fn parse_cmd_opts( opts.nchars = match fish_wcstoi(w.woptarg.unwrap()) { Ok(n) if n >= 0 => NonZeroUsize::new(n.try_into().unwrap()), Err(wutil::Error::Overflow) => { - streams.err.append(&wgettext_fmt!( - "%s: Argument '%s' is out of range\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Argument '%s' is out of range", cmd, w.woptarg.unwrap() )); @@ -449,20 +449,21 @@ fn validate_read_args( parser: &Parser, streams: &mut IoStreams, ) -> BuiltinResult { + localizable_consts! { + OPTIONS_CANNOT_BE_COMBINED + "%s: Options %s and %s cannot be used together" + } if opts.prompt.is_some() && opts.prompt_str.is_some() { - streams.err.append(&wgettext_fmt!( - "%s: Options %s and %s cannot be used together\n", - cmd, - "-p", - "-P", - )); + streams + .err + .appendln(&wgettext_fmt!(OPTIONS_CANNOT_BE_COMBINED, cmd, "-p", "-P",)); builtin_print_error_trailer(parser, streams.err, cmd); return Err(STATUS_INVALID_ARGS); } if opts.delimiter.is_some() && opts.one_line { - streams.err.append(&wgettext_fmt!( - "%s: Options %s and %s cannot be used together\n", + streams.err.appendln(&wgettext_fmt!( + OPTIONS_CANNOT_BE_COMBINED, cmd, "--delimiter", "--line" @@ -470,8 +471,8 @@ fn validate_read_args( return Err(STATUS_INVALID_ARGS); } if opts.one_line && opts.split_null { - streams.err.append(&wgettext_fmt!( - "%s: Options %s and %s cannot be used together\n", + streams.err.appendln(&wgettext_fmt!( + OPTIONS_CANNOT_BE_COMBINED, cmd, "-z", "--line" @@ -610,7 +611,7 @@ pub fn read(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> Bui if streams.is_stdin_closed() { streams .err - .append(&wgettext_fmt!("%s: stdin is closed\n", cmd)); + .appendln(&wgettext_fmt!(BUILTIN_ERR_STDIN_CLOSED, cmd)); return Err(STATUS_CMD_ERROR); } diff --git a/src/builtins/realpath.rs b/src/builtins/realpath.rs index ab8dbf9d1..5b0e49f07 100644 --- a/src/builtins/realpath.rs +++ b/src/builtins/realpath.rs @@ -104,12 +104,12 @@ pub fn realpath(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) -> } else { path_apply_working_directory(arg, &realpwd) }; - streams.out.append(&normalize_path(&absolute_arg, false)); - streams.out.append(L!("\n")); + streams.out.appendln(&normalize_path(&absolute_arg, false)); } else { streams.err.appendln(&wgettext_fmt!( - "builtin %s: realpath failed: %s", + "builtin %s: %s failed: %s", cmd, + "realpath", errno().to_string() )); had_error = true; diff --git a/src/builtins/set.rs b/src/builtins/set.rs index 5b0e22c91..d33ae3f7e 100644 --- a/src/builtins/set.rs +++ b/src/builtins/set.rs @@ -23,14 +23,6 @@ }; use fish_common::help_section; -localizable_consts!( - MISMATCHED_ARGS - "%s: given %d indexes but %d values\n" - - UVAR_ERR - "%s: successfully set universal '%s'; but a global by that name shadows it\n" -); - #[derive(Debug, Clone)] struct Options { print_help: bool, @@ -327,7 +319,11 @@ fn warn_if_uvar_shadows_global( && parser.is_interactive() && parser.vars().getf(dest, EnvMode::GLOBAL).is_some() { - streams.err.append(&wgettext_fmt!(UVAR_ERR, cmd, dest)); + streams.err.appendln(&wgettext_fmt!( + "%s: successfully set universal '%s'; but a global by that name shadows it", + cmd, + dest + )); } } @@ -335,29 +331,29 @@ fn handle_env_return(retval: EnvStackSetResult, cmd: &wstr, key: &wstr, streams: match retval { EnvStackSetResult::Ok => (), EnvStackSetResult::Perm => { - streams.err.append(&wgettext_fmt!( - "%s: Tried to change the read-only variable '%s'\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Tried to change the read-only variable '%s'", cmd, key )); } EnvStackSetResult::Scope => { - streams.err.append(&wgettext_fmt!( - "%s: Tried to modify the special variable '%s' with the wrong scope\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Tried to modify the special variable '%s' with the wrong scope", cmd, key )); } EnvStackSetResult::Invalid => { - streams.err.append(&wgettext_fmt!( - "%s: Tried to modify the special variable '%s' to an invalid value\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Tried to modify the special variable '%s' to an invalid value", cmd, key )); } EnvStackSetResult::NotFound => { - streams.err.append(&wgettext_fmt!( - "%s: The variable '%s' does not exist\n", + streams.err.appendln(&wgettext_fmt!( + "%s: The variable '%s' does not exist", cmd, key )); @@ -396,11 +392,10 @@ impl std::fmt::Display for EnvArrayParseError { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { writeln!( f, - "{}", + "{}\n", match self { EnvArrayParseError::InvalidIndex(varname) => - wgettext_fmt!("%s: Invalid index starting at '%s'\n", "set", varname) - .to_string(), + wgettext_fmt!("%s: Invalid index starting at '%s'", "set", varname).to_string(), } ) } @@ -436,12 +431,8 @@ fn split_var_and_indexes<'a>( ) -> Option> { match split_var_and_indexes_internal(arg, mode, vars) { Ok(split) => Some(split), - Err(EnvArrayParseError::InvalidIndex(varname)) => { - streams.err.append(&wgettext_fmt!( - "%s: Invalid index starting at '%s'\n", - "set", - &varname, - )); + Err(env_array_parse_error) => { + streams.err.append(&format!("{env_array_parse_error}")); None } } @@ -677,7 +668,9 @@ fn show_scope(var_name: &wstr, scope: EnvMode, streams: &mut IoStreams, vars: &d // HACK: PWD can be set, depending on how you ask. // For our purposes it's read-only. if EnvVar::flags_for(var_name).contains(EnvVarFlags::READ_ONLY) { - streams.out.append(wgettext!(" (read-only)\n")); + streams + .out + .appendln(" ".chars().chain(wgettext!("(read-only)").chars())); } else { streams.out.append('\n'); } @@ -711,6 +704,10 @@ fn show_scope(var_name: &wstr, scope: EnvMode, streams: &mut IoStreams, vars: &d /// Show mode. Show information about the named variable(s). fn show(cmd: &wstr, parser: &Parser, streams: &mut IoStreams, args: &[&wstr]) -> BuiltinResult { + localizable_consts! { + ORIGINALLY_INHERITED_AS + "$%s: originally inherited as |%s|" + } let vars = parser.vars(); if args.is_empty() { // show all vars @@ -730,11 +727,9 @@ fn show(cmd: &wstr, parser: &Parser, streams: &mut IoStreams, args: &[&wstr]) -> inherited, EscapeStringStyle::Script(EscapeFlags::NO_PRINTABLES | EscapeFlags::NO_QUOTED), ); - streams.out.append(&wgettext_fmt!( - "$%s: originally inherited as |%s|\n", - name, - escaped_val - )); + streams + .out + .appendln(&wgettext_fmt!(ORIGINALLY_INHERITED_AS, name, escaped_val)); } } } else { @@ -746,8 +741,8 @@ fn show(cmd: &wstr, parser: &Parser, streams: &mut IoStreams, args: &[&wstr]) -> } if arg.contains('[') { - streams.err.append(&wgettext_fmt!( - "%s: `set --show` does not allow slices with the var names\n", + streams.err.appendln(&wgettext_fmt!( + "%s: `set --show` does not allow slices with the var names", cmd )); builtin_print_error_trailer(parser, streams.err, cmd); @@ -762,11 +757,9 @@ fn show(cmd: &wstr, parser: &Parser, streams: &mut IoStreams, args: &[&wstr]) -> inherited, EscapeStringStyle::Script(EscapeFlags::NO_PRINTABLES | EscapeFlags::NO_QUOTED), ); - streams.out.append(&wgettext_fmt!( - "$%s: originally inherited as |%s|\n", - arg, - escaped_val - )); + streams + .out + .appendln(&wgettext_fmt!(ORIGINALLY_INHERITED_AS, arg, escaped_val)); } } } @@ -989,7 +982,7 @@ fn set_internal( if *ind <= 0 { streams .err - .append(&wgettext_fmt!("%s: array index out of bounds\n", cmd)); + .appendln(&wgettext_fmt!("%s: array index out of bounds", cmd)); builtin_print_error_trailer(parser, streams.err, cmd); return Err(STATUS_INVALID_ARGS); } @@ -1006,8 +999,8 @@ fn set_internal( // Argument count and index count must agree. if split.indexes.len() != argv.len() { - streams.err.append(&wgettext_fmt!( - MISMATCHED_ARGS, + streams.err.appendln(&wgettext_fmt!( + "%s: given %d indexes but %d values", cmd, split.indexes.len(), argv.len() diff --git a/src/builtins/set_color.rs b/src/builtins/set_color.rs index 6d548b550..547dfb4c7 100644 --- a/src/builtins/set_color.rs +++ b/src/builtins/set_color.rs @@ -99,12 +99,12 @@ pub fn set_color(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) - Err(UnknownColor(arg)) => { streams .err - .append(&wgettext_fmt!("%s: Unknown color '%s'\n", argv[0], arg)); + .appendln(&wgettext_fmt!("%s: Unknown color '%s'", argv[0], arg)); return Err(STATUS_INVALID_ARGS); } Err(UnknownUnderlineStyle(arg)) => { - streams.err.append(&wgettext_fmt!( - "%s: invalid underline style: %s\n", + streams.err.appendln(&wgettext_fmt!( + "%s: invalid underline style: %s", argv[0], arg )); diff --git a/src/builtins/shared.rs b/src/builtins/shared.rs index bbaf304df..92ea79da7 100644 --- a/src/builtins/shared.rs +++ b/src/builtins/shared.rs @@ -108,10 +108,21 @@ pub BUILTIN_ERR_COULD_NOT_FIND_JOB "%s: Could not find job '%d'" + pub BUILTIN_ERR_STDIN_CLOSED + "%s: stdin is closed" + + pub BUILTIN_ERR_INVALID_MAX_MATCHES + "%s: Invalid max matches value '%s'" + + pub BUILTIN_ERR_INVALID_MAX_VALUE + "%s: Invalid max value '%s'" + /// The send stuff to foreground message. pub FG_MSG "Send job %d (%s) to foreground" + pub VERSION_STRING_TEMPLATE + "%s, version %s" ); // Return values (`$status` values for fish scripts) for various situations. @@ -712,8 +723,8 @@ pub fn builtin_print_error_trailer(parser: &Parser, b: &mut OutputStream, cmd: & if !stacktrace.is_empty() { b.appendln(&stacktrace); } - b.append(&wgettext_fmt!( - "(Type 'help %s' for related documentation)\n", + b.appendln(&wgettext_fmt!( + "(Type 'help %s' for related documentation)", cmd )); } @@ -980,8 +991,8 @@ fn parsed_pid( match pid { Ok(pid @ 1..) => Ok(Pid::new(pid)), _ => { - streams.err.append(&wgettext_fmt!( - "%s: '%s' is not a valid process ID\n", + streams.err.appendln(&wgettext_fmt!( + "%s: '%s' is not a valid process ID", cmd, arg )); @@ -1050,7 +1061,7 @@ pub fn builtin_break_continue( if !has_loop { streams .err - .append(&wgettext_fmt!("%s: Not inside of loop\n", argv[0])); + .appendln(&wgettext_fmt!("%s: Not inside of loop", argv[0])); return Err(STATUS_CMD_ERROR); } @@ -1101,8 +1112,8 @@ pub fn parse_from_opt( arg: &wstr, ) -> Result { Self::try_from(arg).map_err(|()| { - streams.err.append(&wgettext_fmt!( - "%s: Invalid value for '--color' option: '%s'. Expected 'always', 'never', or 'auto'\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Invalid value for '--color' option: '%s'. Expected 'always', 'never', or 'auto'", cmd, arg )); diff --git a/src/builtins/source.rs b/src/builtins/source.rs index d840722aa..d7d69e935 100644 --- a/src/builtins/source.rs +++ b/src/builtins/source.rs @@ -39,14 +39,14 @@ pub fn source(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) -> B if streams.is_stdin_closed() { streams .err - .append(&wgettext_fmt!("%s: stdin is closed\n", cmd)); + .appendln(&wgettext_fmt!(BUILTIN_ERR_STDIN_CLOSED, cmd)); return Err(STATUS_CMD_ERROR); } // Either a bare `source` which means to implicitly read from stdin or an explicit `-`. if argc == optind && isatty(streams.stdin_fd()) { // Don't implicitly read from the terminal. - streams.err.append(&wgettext_fmt!( - "%s: missing filename argument or input redirection\n", + streams.err.appendln(&wgettext_fmt!( + "%s: missing filename argument or input redirection", cmd )); return Err(STATUS_CMD_ERROR); @@ -60,8 +60,8 @@ pub fn source(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) -> B } Err(_) => { let esc = escape(args[optind]); - streams.err.append(&wgettext_fmt!( - "%s: Error encountered while sourcing file '%s':\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Error encountered while sourcing file '%s':", cmd, &esc )); @@ -97,8 +97,8 @@ pub fn source(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) -> B Ok(_) => BuiltinResult::from_dynamic(parser.get_last_status()), Err(err) => { let esc = escape(&func_filename); - streams.err.append(&wgettext_fmt!( - "%s: Error while reading file '%s'\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Error while reading file '%s'", cmd, if esc == "-" { L!("") } else { &esc } )); diff --git a/src/builtins/string.rs b/src/builtins/string.rs index d1ab84b14..2445d332a 100644 --- a/src/builtins/string.rs +++ b/src/builtins/string.rs @@ -195,8 +195,8 @@ fn print_error(&self, args: &[&wstr], streams: &mut IoStreams) { string_error!(streams, "%s: %s", cmd, marker); } InvalidCaptureGroupName(name) => { - streams.err.append(&wgettext_fmt!( - "Modification of read-only variable \"%s\" is not allowed\n", + streams.err.appendln(&wgettext_fmt!( + "Modification of read-only variable \"%s\" is not allowed", name )); } @@ -245,8 +245,7 @@ fn print_error( use StringError::*; match self { InvalidArgs(msg) => { - streams.err.append(L!("string ")); - streams.err.append(msg); + streams.err.appendln("string ".chars().chain(msg.chars())); } NotANumber => { string_error!(streams, BUILTIN_ERR_NOT_NUMBER, cmd, optarg.unwrap()); diff --git a/src/builtins/string/escape.rs b/src/builtins/string/escape.rs index 6cc976f87..c976dccb9 100644 --- a/src/builtins/string/escape.rs +++ b/src/builtins/string/escape.rs @@ -21,7 +21,7 @@ fn parse_opt(&mut self, name: &wstr, c: char, arg: Option<&wstr>) -> Result<(), self.style = arg .unwrap() .try_into() - .map_err(|_| invalid_args!("%s: Invalid escape style '%s'\n", name, arg))?; + .map_err(|_| invalid_args!("%s: Invalid escape style '%s'", name, arg))?; } _ => return Err(StringError::UnknownOption), } diff --git a/src/builtins/string/match.rs b/src/builtins/string/match.rs index 7d582b378..fb67f76f6 100644 --- a/src/builtins/string/match.rs +++ b/src/builtins/string/match.rs @@ -56,7 +56,7 @@ fn parse_opt(&mut self, _n: &wstr, c: char, arg: Option<&wstr>) -> Result<(), St .and_then(|v| NonZeroUsize::new(v as usize)) .ok_or_else(|| { StringError::InvalidArgs(wgettext_fmt!( - "%s: Invalid max matches value '%s'\n", + BUILTIN_ERR_INVALID_MAX_MATCHES, _n, arg )) diff --git a/src/builtins/string/pad.rs b/src/builtins/string/pad.rs index cefd941d0..afbb32cfa 100644 --- a/src/builtins/string/pad.rs +++ b/src/builtins/string/pad.rs @@ -36,7 +36,7 @@ fn parse_opt(&mut self, name: &wstr, c: char, arg: Option<&wstr>) -> Result<(), 'c' => { let [pad_char] = arg.unwrap().as_char_slice() else { return Err(invalid_args!( - "%s: Padding should be a character '%s'\n", + "%s: Padding should be a character '%s'", name, arg )); @@ -44,7 +44,7 @@ fn parse_opt(&mut self, name: &wstr, c: char, arg: Option<&wstr>) -> Result<(), let pad_char_width = fish_wcwidth(*pad_char); if pad_char_width <= 0 { return Err(invalid_args!( - "%s: Invalid padding character of width zero '%s'\n", + "%s: Invalid padding character of width zero '%s'", name, arg )); @@ -56,7 +56,7 @@ fn parse_opt(&mut self, name: &wstr, c: char, arg: Option<&wstr>) -> Result<(), 'w' => { self.width = fish_wcstol(arg.unwrap())? .try_into() - .map_err(|_| invalid_args!("%s: Invalid width value '%s'\n", name, arg))?; + .map_err(|_| invalid_args!("%s: Invalid width value '%s'", name, arg))?; } 'C' => self.center = true, _ => return Err(StringError::UnknownOption), diff --git a/src/builtins/string/repeat.rs b/src/builtins/string/repeat.rs index be92766b7..2aa9e17f0 100644 --- a/src/builtins/string/repeat.rs +++ b/src/builtins/string/repeat.rs @@ -23,14 +23,14 @@ fn parse_opt(&mut self, name: &wstr, c: char, arg: Option<&wstr>) -> Result<(), self.count = Some( fish_wcstol(arg.unwrap())? .try_into() - .map_err(|_| invalid_args!("%s: Invalid count value '%s'\n", name, arg))?, + .map_err(|_| invalid_args!("%s: Invalid count value '%s'", name, arg))?, ); } 'm' => { self.max = Some( fish_wcstol(arg.unwrap())? .try_into() - .map_err(|_| invalid_args!("%s: Invalid max value '%s'\n", name, arg))?, + .map_err(|_| invalid_args!(BUILTIN_ERR_INVALID_MAX_VALUE, name, arg))?, ); } 'q' => self.quiet = true, diff --git a/src/builtins/string/replace.rs b/src/builtins/string/replace.rs index 5bf4bef72..5575f52ef 100644 --- a/src/builtins/string/replace.rs +++ b/src/builtins/string/replace.rs @@ -43,7 +43,7 @@ fn parse_opt(&mut self, _n: &wstr, c: char, arg: Option<&wstr>) -> Result<(), St .and_then(|v| NonZeroUsize::new(v as usize)) .ok_or_else(|| { StringError::InvalidArgs(wgettext_fmt!( - "%s: Invalid max matches value '%s'\n", + BUILTIN_ERR_INVALID_MAX_MATCHES, _n, arg )) diff --git a/src/builtins/string/shorten.rs b/src/builtins/string/shorten.rs index ca4400f02..f0bbdeadc 100644 --- a/src/builtins/string/shorten.rs +++ b/src/builtins/string/shorten.rs @@ -49,7 +49,7 @@ fn parse_opt( self.max = Some( fish_wcstol(arg.unwrap())? .try_into() - .map_err(|_| invalid_args!("%s: Invalid max value '%s'\n", name, arg))?, + .map_err(|_| invalid_args!(BUILTIN_ERR_INVALID_MAX_VALUE, name, arg))?, ); } 'N' => self.no_newline = true, diff --git a/src/builtins/string/split.rs b/src/builtins/string/split.rs index 4d140093f..6e8fe7373 100644 --- a/src/builtins/string/split.rs +++ b/src/builtins/string/split.rs @@ -119,17 +119,17 @@ fn parse_opt(&mut self, name: &wstr, c: char, arg: Option<&wstr>) -> Result<(), 'm' => { self.max = fish_wcstol(arg.unwrap())? .try_into() - .map_err(|_| invalid_args!("%s: Invalid max value '%s'\n", name, arg))?; + .map_err(|_| invalid_args!(BUILTIN_ERR_INVALID_MAX_VALUE, name, arg))?; } 'n' => self.no_empty = true, 'f' => { self.fields = arg.unwrap().try_into().map_err(|e| match e { FieldParseError::Number => StringError::NotANumber, FieldParseError::Range => { - invalid_args!("%s: Invalid range value for field '%s'\n", name, arg) + invalid_args!("%s: Invalid range value for field '%s'", name, arg) } FieldParseError::Field => { - invalid_args!("%s: Invalid fields value '%s'\n", name, arg) + invalid_args!("%s: Invalid fields value '%s'", name, arg) } })?; } diff --git a/src/builtins/string/sub.rs b/src/builtins/string/sub.rs index e81002a5a..9e032f07e 100644 --- a/src/builtins/string/sub.rs +++ b/src/builtins/string/sub.rs @@ -22,23 +22,24 @@ impl StringSubCommand<'_> for Sub { fn parse_opt(&mut self, name: &wstr, c: char, arg: Option<&wstr>) -> Result<(), StringError> { match c { 'l' => { - self.length = - Some(fish_wcstol(arg.unwrap())?.try_into().map_err(|_| { - invalid_args!("%s: Invalid length value '%s'\n", name, arg) - })?); + self.length = Some( + fish_wcstol(arg.unwrap())? + .try_into() + .map_err(|_| invalid_args!("%s: Invalid length value '%s'", name, arg))?, + ); } 's' => { self.start = Some( fish_wcstol(arg.unwrap())? .try_into() - .map_err(|_| invalid_args!("%s: Invalid start value '%s'\n", name, arg))?, + .map_err(|_| invalid_args!("%s: Invalid start value '%s'", name, arg))?, ); } 'e' => { self.end = Some( fish_wcstol(arg.unwrap())? .try_into() - .map_err(|_| invalid_args!("%s: Invalid end value '%s'\n", name, arg))?, + .map_err(|_| invalid_args!("%s: Invalid end value '%s'", name, arg))?, ); } 'q' => self.quiet = true, diff --git a/src/builtins/string/unescape.rs b/src/builtins/string/unescape.rs index 08f3e5daa..5ba9a556d 100644 --- a/src/builtins/string/unescape.rs +++ b/src/builtins/string/unescape.rs @@ -23,7 +23,7 @@ fn parse_opt(&mut self, name: &wstr, c: char, arg: Option<&wstr>) -> Result<(), self.style = arg .unwrap() .try_into() - .map_err(|_| invalid_args!("%s: Invalid style value '%s'\n", name, arg))?; + .map_err(|_| invalid_args!("%s: Invalid style value '%s'", name, arg))?; } _ => return Err(StringError::UnknownOption), } diff --git a/src/builtins/type.rs b/src/builtins/type.rs index ebc1cf9b3..f88c99c3c 100644 --- a/src/builtins/type.rs +++ b/src/builtins/type.rs @@ -158,7 +158,8 @@ pub fn r#type(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> B } } else { streams.out.append(&wgettext_fmt!("%s is a function", arg)); - streams.out.append(&wgettext_fmt!(" (%s)\n", comment)); + streams.out.append(" "); + streams.out.appendln(&wgettext_fmt!("(%s)", comment)); } } else if opts.get_type { streams.out.appendln(L!("function")); @@ -176,7 +177,7 @@ pub fn r#type(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> B return Ok(SUCCESS); } if !opts.get_type { - streams.out.append(&wgettext_fmt!("%s is a builtin\n", arg)); + streams.out.appendln(&wgettext_fmt!("%s is a builtin", arg)); } else if opts.get_type { streams.out.append(L!("builtin\n")); } @@ -204,7 +205,7 @@ pub fn r#type(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> B if opts.path || opts.force_path { streams.out.appendln(path); } else { - streams.out.append(&wgettext_fmt!("%s is %s\n", arg, path)); + streams.out.appendln(&wgettext_fmt!("%s is %s", arg, path)); } } else if opts.get_type { streams.out.appendln(L!("file")); @@ -222,7 +223,7 @@ pub fn r#type(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> B if found == 0 && !opts.query && !opts.path { streams .err - .append(&wgettext_fmt!("%s: Could not find '%s'\n", L!("type"), arg)); + .appendln(&wgettext_fmt!("%s: Could not find '%s'", L!("type"), arg)); } } diff --git a/src/builtins/wait.rs b/src/builtins/wait.rs index ccb5c1016..cbc46fab8 100644 --- a/src/builtins/wait.rs +++ b/src/builtins/wait.rs @@ -199,8 +199,8 @@ pub fn wait(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> Bui continue; }; if !find_wait_handles(WaitHandleQuery::Pid(pid), parser, &mut wait_handles) { - streams.err.append(&wgettext_fmt!( - "%s: Could not find a job with process ID '%d'\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Could not find a job with process ID '%d'", cmd, pid, )); @@ -208,8 +208,8 @@ pub fn wait(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> Bui } else { // argument is process name if !find_wait_handles(WaitHandleQuery::ProcName(item), parser, &mut wait_handles) { - streams.err.append(&wgettext_fmt!( - "%s: Could not find child processes with the name '%s'\n", + streams.err.appendln(&wgettext_fmt!( + "%s: Could not find child processes with the name '%s'", cmd, item, )); diff --git a/src/parse_execution.rs b/src/parse_execution.rs index 1ed9090b3..c8beaec4b 100644 --- a/src/parse_execution.rs +++ b/src/parse_execution.rs @@ -1108,13 +1108,17 @@ fn run_switch_statement( } ExpandResultCode::ok => { if switch_values_expanded.len() > 1 { - return report_error!( + let mut error = wgettext_fmt!( + "switch: Expected at most one argument, got %u", + switch_values_expanded.len() + ); + error.push('\n'); + return report_error_formatted!( self, ctx, STATUS_INVALID_ARGS, &statement.argument, - "switch: Expected at most one argument, got %u\n", - switch_values_expanded.len() + error ); } } diff --git a/tests/checks/abbr.fish b/tests/checks/abbr.fish index abedb2ce1..caec134db 100644 --- a/tests/checks/abbr.fish +++ b/tests/checks/abbr.fish @@ -117,7 +117,7 @@ echo $status abbr --add grape --position nowhere juice echo $status # CHECKERR: abbr: Invalid position 'nowhere' -# CHECKERR: Position must be one of: command, anywhere. +# CHECKERR: Position must be one of: command, anywhere # CHECK: 2 abbr --add grape --position anywhere juice @@ -190,7 +190,7 @@ abbr --list abbr --add bogus --position never stuff # CHECKERR: abbr: Invalid position 'never' -# CHECKERR: Position must be one of: command, anywhere. +# CHECKERR: Position must be one of: command, anywhere abbr --add bogus --position anywhere --position command stuff # CHECKERR: abbr: Cannot specify multiple positions