mirror of
https://github.com/fish-shell/fish-shell.git
synced 2026-06-05 00:01:15 -03:00
gettext: use wgettext_fmt for formatting
Using `wgettext_fmt` instead of `wgettext` + `sprintf` in these cases allows for proper localization of the colons.
This commit is contained in:
committed by
Johannes Altmanninger
parent
a0a60c2d29
commit
aa56359834
@@ -571,6 +571,14 @@ msgstr ""
|
||||
msgid "%s: Not inside of loop\n"
|
||||
msgstr "%s: Nicht innerhalb einer Schleife\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Number out of range"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Number was empty"
|
||||
msgstr "%s: Zahl war leer"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Options %s and %s cannot be used together\n"
|
||||
msgstr ""
|
||||
@@ -1335,9 +1343,6 @@ msgstr ""
|
||||
msgid "Number out of range"
|
||||
msgstr ""
|
||||
|
||||
msgid "Number was empty"
|
||||
msgstr "Zahl war leer"
|
||||
|
||||
msgid "Only on interactive jobs"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@@ -569,6 +569,14 @@ msgstr ""
|
||||
msgid "%s: Not inside of loop\n"
|
||||
msgstr "%s: Not inside of loop\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Number out of range"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Number was empty"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Options %s and %s cannot be used together\n"
|
||||
msgstr ""
|
||||
@@ -1333,9 +1341,6 @@ msgstr ""
|
||||
msgid "Number out of range"
|
||||
msgstr ""
|
||||
|
||||
msgid "Number was empty"
|
||||
msgstr ""
|
||||
|
||||
msgid "Only on interactive jobs"
|
||||
msgstr "Only on interactive jobs"
|
||||
|
||||
|
||||
@@ -700,6 +700,14 @@ msgstr ""
|
||||
msgid "%s: Not inside of loop\n"
|
||||
msgstr "%s : À l’extérieur de toute boucle\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Number out of range"
|
||||
msgstr "%s : Nombre hors limites"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Number was empty"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Options %s and %s cannot be used together\n"
|
||||
msgstr ""
|
||||
@@ -1464,9 +1472,6 @@ msgstr ""
|
||||
msgid "Number out of range"
|
||||
msgstr "Nombre hors limites"
|
||||
|
||||
msgid "Number was empty"
|
||||
msgstr ""
|
||||
|
||||
msgid "Only on interactive jobs"
|
||||
msgstr "Seulement sur les tâches interactives"
|
||||
|
||||
|
||||
@@ -565,6 +565,14 @@ msgstr ""
|
||||
msgid "%s: Not inside of loop\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Number out of range"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Number was empty"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Options %s and %s cannot be used together\n"
|
||||
msgstr ""
|
||||
@@ -1329,9 +1337,6 @@ msgstr ""
|
||||
msgid "Number out of range"
|
||||
msgstr ""
|
||||
|
||||
msgid "Number was empty"
|
||||
msgstr ""
|
||||
|
||||
msgid "Only on interactive jobs"
|
||||
msgstr "Tylko dla zadań interaktywnych"
|
||||
|
||||
|
||||
@@ -570,6 +570,14 @@ msgstr ""
|
||||
msgid "%s: Not inside of loop\n"
|
||||
msgstr "%s: Não está dentro de laço\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Number out of range"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Number was empty"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Options %s and %s cannot be used together\n"
|
||||
msgstr ""
|
||||
@@ -1334,9 +1342,6 @@ msgstr ""
|
||||
msgid "Number out of range"
|
||||
msgstr ""
|
||||
|
||||
msgid "Number was empty"
|
||||
msgstr ""
|
||||
|
||||
msgid "Only on interactive jobs"
|
||||
msgstr "Somente em tarefas interativas"
|
||||
|
||||
|
||||
@@ -566,6 +566,14 @@ msgstr ""
|
||||
msgid "%s: Not inside of loop\n"
|
||||
msgstr "%s: Inte i en loop\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Number out of range"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Number was empty"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Options %s and %s cannot be used together\n"
|
||||
msgstr ""
|
||||
@@ -1330,9 +1338,6 @@ msgstr ""
|
||||
msgid "Number out of range"
|
||||
msgstr ""
|
||||
|
||||
msgid "Number was empty"
|
||||
msgstr ""
|
||||
|
||||
msgid "Only on interactive jobs"
|
||||
msgstr "Bara för interaktiva jobb"
|
||||
|
||||
|
||||
@@ -592,6 +592,14 @@ msgstr "%s: 没有合适的作业:%s\n"
|
||||
msgid "%s: Not inside of loop\n"
|
||||
msgstr "%s: 不在循环体内部\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Number out of range"
|
||||
msgstr "%s:数字超出范围"
|
||||
|
||||
#, c-format
|
||||
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"
|
||||
@@ -1359,9 +1367,6 @@ msgstr "数字过大"
|
||||
msgid "Number out of range"
|
||||
msgstr "数字超出范围"
|
||||
|
||||
msgid "Number was empty"
|
||||
msgstr "数字为空"
|
||||
|
||||
msgid "Only on interactive jobs"
|
||||
msgstr "只在不活跃的作业上"
|
||||
|
||||
|
||||
@@ -565,6 +565,14 @@ msgstr "%s:沒有合式的作業:%s\n"
|
||||
msgid "%s: Not inside of loop\n"
|
||||
msgstr "%s:不在迴圈裡面\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Number out of range"
|
||||
msgstr "%s:數字超出範圍"
|
||||
|
||||
#, c-format
|
||||
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"
|
||||
@@ -1333,9 +1341,6 @@ msgstr "數字太大"
|
||||
msgid "Number out of range"
|
||||
msgstr "數字超出範圍"
|
||||
|
||||
msgid "Number was empty"
|
||||
msgstr "數字空白"
|
||||
|
||||
msgid "Only on interactive jobs"
|
||||
msgstr "僅限互動式作業"
|
||||
|
||||
|
||||
@@ -208,10 +208,10 @@ fn verify_numeric(&mut self, s: &wstr, end: &wstr, errcode: Option<Error>) {
|
||||
if errcode != None && errcode != Some(Error::InvalidChar) && errcode != Some(Error::Empty) {
|
||||
match errcode.unwrap() {
|
||||
Error::Overflow => {
|
||||
self.fatal_error(sprintf!("%s: %s", s, wgettext!("Number out of range")));
|
||||
self.fatal_error(wgettext_fmt!("%s: Number out of range", s));
|
||||
}
|
||||
Error::Empty => {
|
||||
self.fatal_error(sprintf!("%s: %s", s, wgettext!("Number was empty")));
|
||||
self.fatal_error(wgettext_fmt!("%s: Number was empty", s));
|
||||
}
|
||||
Error::InvalidChar => {
|
||||
panic!("Unreachable");
|
||||
|
||||
Reference in New Issue
Block a user