From: Zhiyi Zhang zzhang@codeweavers.com
--- po/ar.po | 6 +++ po/ast.po | 6 +++ po/bg.po | 5 ++ po/ca.po | 6 +++ po/cs.po | 6 +++ po/da.po | 6 +++ po/de.po | 6 +++ po/el.po | 5 ++ po/en.po | 4 ++ po/en_US.po | 4 ++ po/eo.po | 6 +++ po/es.po | 6 +++ po/fa.po | 5 ++ po/fi.po | 6 +++ po/fr.po | 6 +++ po/he.po | 6 +++ po/hi.po | 4 ++ po/hr.po | 6 +++ po/hu.po | 6 +++ po/it.po | 6 +++ po/ja.po | 6 +++ po/ko.po | 6 +++ po/lt.po | 6 +++ po/ml.po | 4 ++ po/nb_NO.po | 6 +++ po/nl.po | 6 +++ po/or.po | 4 ++ po/pa.po | 4 ++ po/pl.po | 6 +++ po/pt_BR.po | 6 +++ po/pt_PT.po | 6 +++ po/rm.po | 5 ++ po/ro.po | 6 +++ po/ru.po | 6 +++ po/si.po | 6 +++ po/sk.po | 6 +++ po/sl.po | 6 +++ po/sr_RS@cyrillic.po | 5 ++ po/sr_RS@latin.po | 5 ++ po/sv.po | 6 +++ po/ta.po | 4 ++ po/te.po | 4 ++ po/th.po | 5 ++ po/tr.po | 6 +++ po/uk.po | 6 +++ po/wa.po | 5 ++ po/wine.pot | 4 ++ po/zh_CN.po | 6 +++ po/zh_TW.po | 6 +++ programs/tasklist/tasklist.c | 79 +++++++++++++++++++++++++++--- programs/tasklist/tasklist.h | 9 ++++ programs/tasklist/tasklist.rc | 1 + programs/tasklist/tests/tasklist.c | 43 ++++++++++++++++ 53 files changed, 392 insertions(+), 8 deletions(-)
diff --git a/po/ar.po b/po/ar.po index 7035033cd20..bf531313a6d 100644 --- a/po/ar.po +++ b/po/ar.po @@ -18523,6 +18523,12 @@ msgstr "استخدام الذاكرة" msgid "K" msgstr "حسنًا"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "Error: Invalid key name\n" +msgid "ERROR: Invalid syntax\n" +msgstr "خطأ : اسم المفتاح غير سليم\n" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "م&همة جديدة (تشغيل)..." diff --git a/po/ast.po b/po/ast.po index 8404c993672..1d8d339290c 100644 --- a/po/ast.po +++ b/po/ast.po @@ -17164,6 +17164,12 @@ msgstr "" msgid "K" msgstr "Aceutar"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: La sintaxis nun ye válida. " + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "" diff --git a/po/bg.po b/po/bg.po index 231012e141b..225d0232f24 100644 --- a/po/bg.po +++ b/po/bg.po @@ -17163,6 +17163,11 @@ msgstr "" msgid "K" msgstr "OK"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +msgid "ERROR: Invalid syntax\n" +msgstr "Невалидни знаци в пътя.\n" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "" diff --git a/po/ca.po b/po/ca.po index e62f86697a9..0f34e6a5766 100644 --- a/po/ca.po +++ b/po/ca.po @@ -17443,6 +17443,12 @@ msgstr "Ús de memòria" msgid "K" msgstr "D'acord"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: La sintaxi no és vàlida. " + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Tasca nova (executa...)" diff --git a/po/cs.po b/po/cs.po index d90da4216b9..1e2d93d4aa1 100644 --- a/po/cs.po +++ b/po/cs.po @@ -17927,6 +17927,12 @@ msgstr "Využití paměti" msgid "K" msgstr "OK"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: Neplatná syntaxe. " + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Nová úloha (Spustit...)" diff --git a/po/da.po b/po/da.po index 4698f307985..db9b0dc4f3c 100644 --- a/po/da.po +++ b/po/da.po @@ -18434,6 +18434,12 @@ msgstr "Hukommelse forbrug" msgid "K" msgstr "OK"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "Error: Invalid key name\n" +msgid "ERROR: Invalid syntax\n" +msgstr "Fejl: Ugyldigt nøgle navn\n" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Ny opgave (Kør...)" diff --git a/po/de.po b/po/de.po index 9e9dddf7643..8381cee3917 100644 --- a/po/de.po +++ b/po/de.po @@ -17410,6 +17410,12 @@ msgstr "Speicherauslastung" msgid "K" msgstr "OK"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: Ungültige Syntax. " + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Neuer Task (Ausführen...)" diff --git a/po/el.po b/po/el.po index 7993118c808..9a9f4a773fa 100644 --- a/po/el.po +++ b/po/el.po @@ -16798,6 +16798,11 @@ msgstr "" msgid "K" msgstr ""
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +msgid "ERROR: Invalid syntax\n" +msgstr "Μη έγγυρος(οι) χαρακτήρας(ες) στο μονοπάτι.\n" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "" diff --git a/po/en.po b/po/en.po index a4521ab2f01..a9d5d6f696f 100644 --- a/po/en.po +++ b/po/en.po @@ -17294,6 +17294,10 @@ msgstr "Mem Usage" msgid "K" msgstr "K"
+#: programs/tasklist/tasklist.rc:36 +msgid "ERROR: Invalid syntax\n" +msgstr "ERROR: Invalid syntax\n" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&New Task (Run...)" diff --git a/po/en_US.po b/po/en_US.po index 78b1634ae25..1b7a438b554 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -17294,6 +17294,10 @@ msgstr "Mem Usage" msgid "K" msgstr "K"
+#: programs/tasklist/tasklist.rc:36 +msgid "ERROR: Invalid syntax\n" +msgstr "ERROR: Invalid syntax\n" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&New Task (Run...)" diff --git a/po/eo.po b/po/eo.po index d8c30468e2c..8daca85e4ad 100644 --- a/po/eo.po +++ b/po/eo.po @@ -17486,6 +17486,12 @@ msgstr "" msgid "K" msgstr "Bone"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "Invalid share name.\n" +msgid "ERROR: Invalid syntax\n" +msgstr "Nevalida nomo de kunuzata aparato.\n" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "" diff --git a/po/es.po b/po/es.po index d74ad29837f..35ff69721e2 100644 --- a/po/es.po +++ b/po/es.po @@ -17768,6 +17768,12 @@ msgstr "Uso de Mem" msgid "K" msgstr "Aceptar"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: Sintaxis inválida. " + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Nueva Tarea (Ejecutar...)" diff --git a/po/fa.po b/po/fa.po index 5aaa8e719f3..3d9783df060 100644 --- a/po/fa.po +++ b/po/fa.po @@ -16992,6 +16992,11 @@ msgstr "" msgid "K" msgstr "قبول"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +msgid "ERROR: Invalid syntax\n" +msgstr "پروندههای متنی (*.txt).\n" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "" diff --git a/po/fi.po b/po/fi.po index 126ea2af390..01cb0632d9a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -17267,6 +17267,12 @@ msgstr "Muistin käyttö" msgid "K" msgstr "OK"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: Syntaksi ei kelpaa. " + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Uusi tehtävä (Suorita...)" diff --git a/po/fr.po b/po/fr.po index 220f6721bfb..00e199a7283 100644 --- a/po/fr.po +++ b/po/fr.po @@ -18009,6 +18009,12 @@ msgstr "Mémoire" msgid "K" msgstr "OK"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg : syntaxe invalide. " + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Nouvelle tâche (Exécuter...)" diff --git a/po/he.po b/po/he.po index eb9d560b82f..e74f56ef570 100644 --- a/po/he.po +++ b/po/he.po @@ -17940,6 +17940,12 @@ msgstr "שימוש בזיכרון" msgid "K" msgstr "אישור"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "Error: Invalid key name\n" +msgid "ERROR: Invalid syntax\n" +msgstr "Error: Invalid key name\n" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "משימה &חדשה (הפעלה...)" diff --git a/po/hi.po b/po/hi.po index ad827af1540..4cd0a98235c 100644 --- a/po/hi.po +++ b/po/hi.po @@ -16467,6 +16467,10 @@ msgstr "" msgid "K" msgstr ""
+#: programs/tasklist/tasklist.rc:36 +msgid "ERROR: Invalid syntax\n" +msgstr "" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "" diff --git a/po/hr.po b/po/hr.po index ebe8fb237c0..d537fd018f4 100644 --- a/po/hr.po +++ b/po/hr.po @@ -17894,6 +17894,12 @@ msgstr "Mem uporaba" msgid "K" msgstr "U redu"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "Error: Invalid key name\n" +msgid "ERROR: Invalid syntax\n" +msgstr "Greška: Neispravan naziv ključa\n" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Novi zadatak (Pokreni...)" diff --git a/po/hu.po b/po/hu.po index 88022e96319..5957b5fb67b 100644 --- a/po/hu.po +++ b/po/hu.po @@ -18425,6 +18425,12 @@ msgstr "Memória - (Személyes munkakészlet)" msgid "K" msgstr "OK"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "Error: Invalid key name\n" +msgid "ERROR: Invalid syntax\n" +msgstr "Hiba: Érvénytelen kulcsnév\n" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "Új feladat (f&uttatás...)" diff --git a/po/it.po b/po/it.po index 0b8202cf7be..49eaa2ef94f 100644 --- a/po/it.po +++ b/po/it.po @@ -18512,6 +18512,12 @@ msgstr "Uso della memoria" msgid "K" msgstr "Ok"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "Error: Invalid key name\n" +msgid "ERROR: Invalid syntax\n" +msgstr "Errore: nome della chiave non valido\n" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Nuovo processo (Esegui...)" diff --git a/po/ja.po b/po/ja.po index d7afcaf7748..fe05c12612f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -17304,6 +17304,12 @@ msgstr "メモリ使用量" msgid "K" msgstr "OK"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: 無効な構文です。" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "新しいタスクの実行(&N)..." diff --git a/po/ko.po b/po/ko.po index 38cb26195f8..1af2e5a6aa7 100644 --- a/po/ko.po +++ b/po/ko.po @@ -17244,6 +17244,12 @@ msgstr "메모리 사용량" msgid "K" msgstr "확인"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: 잘못된 구문. " + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "새 작업(&N) (실행...)" diff --git a/po/lt.po b/po/lt.po index 4bce29753e7..bd9e0b2718b 100644 --- a/po/lt.po +++ b/po/lt.po @@ -17319,6 +17319,12 @@ msgstr "Atm naudojimas" msgid "K" msgstr "Gerai"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: Netinkama sintaksė. " + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Nauja užduotis (vykdyti...)" diff --git a/po/ml.po b/po/ml.po index de2441ff6dd..325901ba3fb 100644 --- a/po/ml.po +++ b/po/ml.po @@ -16470,6 +16470,10 @@ msgstr "" msgid "K" msgstr "ശരി"
+#: programs/tasklist/tasklist.rc:36 +msgid "ERROR: Invalid syntax\n" +msgstr "" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "" diff --git a/po/nb_NO.po b/po/nb_NO.po index f891ec370d9..a34852e4967 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -17989,6 +17989,12 @@ msgstr "Minnebruk" msgid "K" msgstr "OK"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: Ugyldig syntaks. " + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Ny oppgave (Kjør...)" diff --git a/po/nl.po b/po/nl.po index 3842d96a81e..7af274d43e1 100644 --- a/po/nl.po +++ b/po/nl.po @@ -17384,6 +17384,12 @@ msgstr "Geheugengebruik" msgid "K" msgstr "OK"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: Foutieve syntax. " + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Nieuwe taak (uitvoeren...)" diff --git a/po/or.po b/po/or.po index 32187fc37ba..7446fea78bf 100644 --- a/po/or.po +++ b/po/or.po @@ -16452,6 +16452,10 @@ msgstr "" msgid "K" msgstr ""
+#: programs/tasklist/tasklist.rc:36 +msgid "ERROR: Invalid syntax\n" +msgstr "" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "" diff --git a/po/pa.po b/po/pa.po index 49d7381fda7..2f727360d4c 100644 --- a/po/pa.po +++ b/po/pa.po @@ -16452,6 +16452,10 @@ msgstr "" msgid "K" msgstr ""
+#: programs/tasklist/tasklist.rc:36 +msgid "ERROR: Invalid syntax\n" +msgstr "" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "" diff --git a/po/pl.po b/po/pl.po index e4e8a254be2..8637c10caba 100644 --- a/po/pl.po +++ b/po/pl.po @@ -17524,6 +17524,12 @@ msgstr "Użycie pamięci" msgid "K" msgstr "OK"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: Nieprawidłowa składnia. " + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Nowe zadanie (Uruchom...)" diff --git a/po/pt_BR.po b/po/pt_BR.po index 3b150a48ee4..62e3721b69e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -17586,6 +17586,12 @@ msgstr "Uso de Memória" msgid "K" msgstr "OK"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: Sintaxe inválida. " + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Nova Tarefa (Executar...)" diff --git a/po/pt_PT.po b/po/pt_PT.po index 4c09c2954aa..d1c5dac5a51 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -18160,6 +18160,12 @@ msgstr "Utilização de Memória" msgid "K" msgstr "OK"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: Sintaxe inválida. " + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Nova Tarefa (Executar...)" diff --git a/po/rm.po b/po/rm.po index 88ef5972eec..085f54bf0f7 100644 --- a/po/rm.po +++ b/po/rm.po @@ -16583,6 +16583,11 @@ msgstr "" msgid "K" msgstr ""
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +msgid "ERROR: Invalid syntax\n" +msgstr "Tuot las datotecas (*.*).\n" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "" diff --git a/po/ro.po b/po/ro.po index b16265bec07..d68f3bbbc84 100644 --- a/po/ro.po +++ b/po/ro.po @@ -18189,6 +18189,12 @@ msgstr "Utilizare memorie" msgid "K" msgstr "OK"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: Sintaxă nevalidă. " + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "Sarcină &nouă (executare...)" diff --git a/po/ru.po b/po/ru.po index 07e75ce067a..f62c674016c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -17553,6 +17553,12 @@ msgstr "Память" msgid "K" msgstr "ОК"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: неверный синтаксис. " + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Новая задача (Выполнить...)" diff --git a/po/si.po b/po/si.po index b635b1a607a..ce493b00d05 100644 --- a/po/si.po +++ b/po/si.po @@ -17217,6 +17217,12 @@ msgstr "මතක භාවිතය" msgid "K" msgstr "හරි"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: අවලංගු රීති." + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "අලුත් කාර්යයක් (ධාවන කරන්න...) (&N)" diff --git a/po/sk.po b/po/sk.po index d571eb4e482..69c37198d89 100644 --- a/po/sk.po +++ b/po/sk.po @@ -17663,6 +17663,12 @@ msgstr "" msgid "K" msgstr "OK"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "Invalid name.\n" +msgid "ERROR: Invalid syntax\n" +msgstr "Nesprávny názov.\n" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Nová úloha (Spusti...)" diff --git a/po/sl.po b/po/sl.po index f15b2a92f4a..281d36cabea 100644 --- a/po/sl.po +++ b/po/sl.po @@ -18449,6 +18449,12 @@ msgstr "Uporaba pomnilnika" msgid "K" msgstr "V redu"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "Error: Invalid key name\n" +msgid "ERROR: Invalid syntax\n" +msgstr "Napaka: neveljavno ime ključa\n" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Novo opravilo (Zaženi ...)" diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po index 1975f5de999..d9d1183cf30 100644 --- a/po/sr_RS@cyrillic.po +++ b/po/sr_RS@cyrillic.po @@ -17739,6 +17739,11 @@ msgstr "" msgid "K" msgstr "У реду"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +msgid "ERROR: Invalid syntax\n" +msgstr "Неисправна синтакса.\n" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "" diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index b163b31492f..4073d77a571 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -17934,6 +17934,11 @@ msgstr "" msgid "K" msgstr "U redu"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +msgid "ERROR: Invalid syntax\n" +msgstr "Neispravna sintaksa.\n" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "" diff --git a/po/sv.po b/po/sv.po index 3140f8971ee..1a2843a1288 100644 --- a/po/sv.po +++ b/po/sv.po @@ -18121,6 +18121,12 @@ msgstr "Minnesanvändning" msgid "K" msgstr "OK"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: Ogiltig syntax. " + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Ny aktivitet (Kör...)" diff --git a/po/ta.po b/po/ta.po index 269c196679d..0913eb07765 100644 --- a/po/ta.po +++ b/po/ta.po @@ -16436,6 +16436,10 @@ msgstr "" msgid "K" msgstr "சரி"
+#: programs/tasklist/tasklist.rc:36 +msgid "ERROR: Invalid syntax\n" +msgstr "" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "" diff --git a/po/te.po b/po/te.po index 612eb530426..81daf55f999 100644 --- a/po/te.po +++ b/po/te.po @@ -16452,6 +16452,10 @@ msgstr "" msgid "K" msgstr ""
+#: programs/tasklist/tasklist.rc:36 +msgid "ERROR: Invalid syntax\n" +msgstr "" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "" diff --git a/po/th.po b/po/th.po index 428e98e52d1..00ee36cc9a4 100644 --- a/po/th.po +++ b/po/th.po @@ -17102,6 +17102,11 @@ msgstr "" msgid "K" msgstr "ตกลง"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +msgid "ERROR: Invalid syntax\n" +msgstr "แฟ้มตํารา (*.txt).\n" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "" diff --git a/po/tr.po b/po/tr.po index b0059097ce1..82624719b08 100644 --- a/po/tr.po +++ b/po/tr.po @@ -17350,6 +17350,12 @@ msgstr "Bellek Kullanımı" msgid "K" msgstr "Tamam"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: Geçersiz sözdizimi. " + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Yeni Görev (Çalıştır...)" diff --git a/po/uk.po b/po/uk.po index 6a5fd71c2c0..6aa152044f2 100644 --- a/po/uk.po +++ b/po/uk.po @@ -17407,6 +17407,12 @@ msgstr "Пам'ять" msgid "K" msgstr "OK"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: Невірний синтаксис. " + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "&Нове завдання (Виконати...)" diff --git a/po/wa.po b/po/wa.po index 1c90c18b6ed..c5c5091946f 100644 --- a/po/wa.po +++ b/po/wa.po @@ -16954,6 +16954,11 @@ msgstr "" msgid "K" msgstr "I Va"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +msgid "ERROR: Invalid syntax\n" +msgstr "Fitchîs tekse (*.txt).\n" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "" diff --git a/po/wine.pot b/po/wine.pot index ba468e297cc..2b9f54a74af 100644 --- a/po/wine.pot +++ b/po/wine.pot @@ -16359,6 +16359,10 @@ msgstr "" msgid "K" msgstr ""
+#: programs/tasklist/tasklist.rc:36 +msgid "ERROR: Invalid syntax\n" +msgstr "" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index c5386615d58..d9447b31f26 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -17063,6 +17063,12 @@ msgstr "内存占用" msgid "K" msgstr "确定"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: 语法无效。" + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "新任务(&N)..." diff --git a/po/zh_TW.po b/po/zh_TW.po index 9ca2f3c80e2..45e5c57de2c 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -17128,6 +17128,12 @@ msgstr "記憶體使用量" msgid "K" msgstr "確定"
+#: programs/tasklist/tasklist.rc:36 +#, fuzzy +#| msgid "reg: Invalid syntax. " +msgid "ERROR: Invalid syntax\n" +msgstr "reg: 無效的語法。 " + #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" msgstr "執行新工作(&N)..." diff --git a/programs/tasklist/tasklist.c b/programs/tasklist/tasklist.c index 48d9b438e84..c8cb8804c3a 100644 --- a/programs/tasklist/tasklist.c +++ b/programs/tasklist/tasklist.c @@ -33,6 +33,14 @@ static int tasklist_message(int msg) return wprintf(msg_buffer); }
+static int tasklist_error(int msg) +{ + WCHAR msg_buffer[MAXSTRING]; + + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); + return fwprintf(stderr, msg_buffer); +} + static PROCESSENTRY32W *enumerate_processes(DWORD *process_count) { unsigned int alloc_count = 128; @@ -112,7 +120,8 @@ static NUMBERFMTW *tasklist_get_memory_format(void) return &format; }
-static void tasklist_get_header(struct tasklist_process_info *header) +static void tasklist_get_header(const struct tasklist_options *options, + struct tasklist_process_info *header) { HMODULE module;
@@ -122,6 +131,14 @@ static void tasklist_get_header(struct tasklist_process_info *header) LoadStringW(module, STRING_SESSION_NAME, header->session_name, ARRAY_SIZE(header->session_name)); LoadStringW(module, STRING_SESSION_NUMBER, header->session_number, ARRAY_SIZE(header->session_number)); LoadStringW(module, STRING_MEM_USAGE, header->memory_usage, ARRAY_SIZE(header->memory_usage)); + if (options->format == LIST) + { + wcscat(header->image_name, L":"); + wcscat(header->pid, L":"); + wcscat(header->session_name, L":"); + wcscat(header->session_number, L":"); + wcscat(header->memory_usage, L":"); + } }
static BOOL tasklist_get_process_info(const PROCESSENTRY32W *process_entry, struct tasklist_process_info *info) @@ -169,14 +186,19 @@ static void tasklist_print(const struct tasklist_options *options) PROCESSENTRY32W *process_list; DWORD process_count, i;
- wprintf(L"\n"); + if (options->format == TABLE) + wprintf(L"\n");
+ tasklist_get_header(options, &header); if (!options->no_header) { - tasklist_get_header(&header); - wprintf(L"%-25.25s %8.8s %-16.16s %11.11s %12.12s\n" - L"========================= ======== ================ =========== ============\n", - header.image_name, header.pid, header.session_name, header.session_number, header.memory_usage); + if (options->format == TABLE) + wprintf(L"%-25.25s %8.8s %-16.16s %11.11s %12.12s\n" + L"========================= ======== ================ =========== ============\n", + header.image_name, header.pid, header.session_name, header.session_number, header.memory_usage); + else if (options->format == CSV) + wprintf(L""%s","%s","%s","%s","%s"\n", + header.image_name, header.pid, header.session_name, header.session_number, header.memory_usage); }
process_list = enumerate_processes(&process_count); @@ -185,8 +207,24 @@ static void tasklist_print(const struct tasklist_options *options) if (!tasklist_get_process_info(&process_list[i], &info)) continue;
- wprintf(L"%-25.25s %8.8s %-16.16s %11.11s %12s\n", - info.image_name, info.pid, info.session_name, info.session_number, info.memory_usage); + if (options->format == TABLE) + wprintf(L"%-25.25s %8.8s %-16.16s %11.11s %12s\n", + info.image_name, info.pid, info.session_name, info.session_number, info.memory_usage); + else if (options->format == CSV) + wprintf(L""%s","%s","%s","%s","%s"\n", + info.image_name, info.pid, info.session_name, info.session_number, info.memory_usage); + else if (options->format == LIST) + wprintf(L"\n" + L"%-13.13s %s\n" + L"%-13.13s %s\n" + L"%-13.13s %s\n" + L"%-13.13s %s\n" + L"%-13.13s %s\n", + header.image_name, info.image_name, + header.pid, info.pid, + header.session_name, info.session_name, + header.session_number, info.session_number, + header.memory_usage, info.memory_usage); } free(process_list); } @@ -211,6 +249,31 @@ int __cdecl wmain(int argc, WCHAR *argv[]) { options.no_header = TRUE; } + else if (!wcsicmp(argv[i], L"/fo")) + { + if (i + 1 >= argc) + { + tasklist_error(STRING_INVALID_SYNTAX); + return 1; + } + else if (!wcsicmp(argv[i + 1], L"TABLE")) + { + options.format = TABLE; + } + else if (!wcsicmp(argv[i + 1], L"CSV")) + { + options.format = CSV; + } + else if (!wcsicmp(argv[i + 1], L"LIST")) + { + options.format = LIST; + } + else + { + tasklist_error(STRING_INVALID_SYNTAX); + return 1; + } + } else { WINE_WARN("Ignoring option %s\n", wine_dbgstr_w(argv[i])); diff --git a/programs/tasklist/tasklist.h b/programs/tasklist/tasklist.h index 6add1f30277..5e4e90960ea 100644 --- a/programs/tasklist/tasklist.h +++ b/programs/tasklist/tasklist.h @@ -27,6 +27,14 @@ #define STRING_SESSION_NUMBER 105 #define STRING_MEM_USAGE 106 #define STRING_K 107 +#define STRING_INVALID_SYNTAX 108 + +enum tasklist_format +{ + TABLE = 0, + CSV = 1, + LIST = 2, +};
struct tasklist_process_info { @@ -40,4 +48,5 @@ struct tasklist_process_info struct tasklist_options { BOOL no_header; + enum tasklist_format format; }; diff --git a/programs/tasklist/tasklist.rc b/programs/tasklist/tasklist.rc index 5b5e72c4a67..f92b0348f72 100644 --- a/programs/tasklist/tasklist.rc +++ b/programs/tasklist/tasklist.rc @@ -32,6 +32,7 @@ STRINGTABLE STRING_SESSION_NUMBER, "Session#" STRING_MEM_USAGE, "Mem Usage" STRING_K, "K" + STRING_INVALID_SYNTAX, "ERROR: Invalid syntax\n" }
#define WINE_FILEDESCRIPTION_STR "Wine tasklist" diff --git a/programs/tasklist/tests/tasklist.c b/programs/tasklist/tests/tasklist.c index 2c4d77855b0..011bfdeb382 100644 --- a/programs/tasklist/tests/tasklist.c +++ b/programs/tasklist/tests/tasklist.c @@ -122,6 +122,48 @@ static void test_no_header(void) ok(!pos, "Got header.\n"); }
+static void test_format(void) +{ + char *pos; + + /* /fo */ + run_tasklist("/fo", 1); + ok(stdout_size == 0, "Unexpected stdout buffer size %ld.\n", stdout_size); + ok(stderr_size > 0, "Unexpected stderr buffer size %ld.\n", stderr_size); + + /* /fo invalid */ + run_tasklist("/fo invalid", 1); + ok(stdout_size == 0, "Unexpected stdout buffer size %ld.\n", stdout_size); + ok(stderr_size > 0, "Unexpected stderr buffer size %ld.\n", stderr_size); + + /* /fo TABLE */ + run_tasklist("/fo TABLE", 0); + ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size); + ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size); + pos = strstr(stdout_buffer, "\r\n" + "Image Name PID Session Name Session# Mem Usage\r\n" + "========================= ======== ================ =========== ============\r\n"); + ok(pos == stdout_buffer, "Got the wrong first line.\n"); + pos = strstr(stdout_buffer, "tasklist.exe"); + ok(!!pos, "Failed to list tasklist.exe.\n"); + + /* /fo CSV */ + run_tasklist("/fo CSV", 0); + ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size); + ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size); + pos = strstr(stdout_buffer, ""Image Name","PID","Session Name","Session#","Mem Usage""); + ok(pos == stdout_buffer, "Got the wrong first line.\n"); + pos = strstr(stdout_buffer, ""tasklist.exe","); + ok(!!pos, "Failed to list tasklist.exe.\n"); + + /* /fo LIST */ + run_tasklist("/fo LIST", 0); + ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size); + ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size); + pos = strstr(stdout_buffer, "Image Name: tasklist.exe"); + ok(!!pos, "Failed to list tasklist.exe.\n"); +} + START_TEST(tasklist) { if (PRIMARYLANGID(GetUserDefaultUILanguage()) != LANG_ENGLISH) @@ -132,4 +174,5 @@ START_TEST(tasklist)
test_basic(); test_no_header(); + test_format(); }