diff --git a/po/be.po b/po/be.po index 555c0b80..4b85c676 100644 --- a/po/be.po +++ b/po/be.po @@ -468,13 +468,15 @@ msgstr "" msgid "Window Maker received signal %i." msgstr "Window Maker атрымаў сігнал %i." -#: ../src/dialog.c:1822 +#. Comment for the PO file: the %s is an email address +#: ../src/dialog.c:1632 +#, c-format msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." +"BUGFORM and report it to %s." msgstr "" " Гэты крытычны збой магчыма вызваны памылкамі ў WindowMaker." -"Дашліце запоўненае паведамленне аб памылке (BUGFORM) на bugs@windowmaker.info" +"Дашліце запоўненае паведамленне аб памылке (BUGFORM) на %s" #: ../src/dialog.c:1831 msgid "What do you want to do now?" diff --git a/po/bg.po b/po/bg.po index dfcdecf8..de61b832 100644 --- a/po/bg.po +++ b/po/bg.po @@ -598,12 +598,13 @@ msgstr "" msgid "Window Maker received signal %i." msgstr "Уиндоу Мейкър получи сигнал %i." -# ../src/dialog.c:1564 -#: ../src/dialog.c:1822 +#. Comment for the PO file: the %s is an email address +#: ../src/dialog.c:1632 +#, c-format msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." -msgstr "Възникналата критична грешка вероятно се дължи на програмен дефект. Моля попълнете формуляра от файла BUGFORM и го изпратете на адрес bugs@windowmaker.info." +"BUGFORM and report it to %s." +msgstr "Възникналата критична грешка вероятно се дължи на програмен дефект. Моля попълнете формуляра от файла BUGFORM и го изпратете на адрес %s." # ../src/dialog.c:1572 #: ../src/dialog.c:1831 diff --git a/po/ca.po b/po/ca.po index 2167395b..bd441744 100644 --- a/po/ca.po +++ b/po/ca.po @@ -490,14 +490,15 @@ msgstr "" msgid "Window Maker received signal %i." msgstr "Window Maker ha rebut un senyal %i." -#: ../src/dialog.c:1752 +#. Comment for the PO file: the %s is an email address +#: ../src/dialog.c:1632 +#, c-format msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." +"BUGFORM and report it to %s." msgstr "" " Aquest error fatal probablement ha estat causat per un \"bug\". Si us plau, " -"ompliu el formulari d'error inclòs i envieu-lo a l'adreça bugs@windowmaker." -"org." +"ompliu el formulari d'error inclòs i envieu-lo a l'adreça %s." #: ../src/dialog.c:1761 msgid "What do you want to do now?" diff --git a/po/cs.po b/po/cs.po index f611bf39..3a21117a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -473,13 +473,15 @@ msgstr "" msgid "Window Maker received signal %i." msgstr "Window Maker přijal signál %i." -#: ../src/dialog.c:1705 +#. Comment for the PO file: the %s is an email address +#: ../src/dialog.c:1632 +#, c-format msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." +"BUGFORM and report it to %s." msgstr "" " Tato závažná chyba se vyskytla pravděpodobně v důsledku chyby v kódu Window " -"Makeru. Prosím, vyplňte soubor BUGFORM a zašlete ho na bugs@windowmaker.info " +"Makeru. Prosím, vyplňte soubor BUGFORM a zašlete ho na %s " "(pouze anglicky)" #: ../src/dialog.c:1714 diff --git a/po/da.po b/po/da.po index c5a2c26e..167a1626 100644 --- a/po/da.po +++ b/po/da.po @@ -545,10 +545,10 @@ msgstr "Window Maker modtog signal %i" #: ../src/dialog.c:1790 msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." +"BUGFORM and report it to %s." msgstr "" "en fatal fejl er opstået, sikkert pga. en bug. Udfyld venligst den vedlagte " -"BUGFORM og indberet det til bugs@windowmaker.info." +"BUGFORM og indberet det til %s." # ../src/dialog.c:1458 #: ../src/dialog.c:1799 diff --git a/po/de.po b/po/de.po index e06c8bdb..91640726 100644 --- a/po/de.po +++ b/po/de.po @@ -472,11 +472,10 @@ msgstr "Window Maker erhielt Signal %i" #: ../src/dialog.c:1602 msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." +"BUGFORM and report it to %s." msgstr "" " Dieser fatale Fehler trat möglicherweise wegen eines Bugs auf. Bitte füllen " -"Sie die mitgelieferte BUGFORM aus und schicken Sie sie an bugs@windowmaker." -"info." +"Sie die mitgelieferte BUGFORM aus und schicken Sie sie an %s." #: ../src/dialog.c:1609 msgid "What do you want to do now?" diff --git a/po/el.po b/po/el.po index b5a231c7..c4e486f9 100644 --- a/po/el.po +++ b/po/el.po @@ -307,12 +307,6 @@ msgstr "" msgid "Window Maker received signal %i." msgstr "" -#: ../src/dialog.c:1450 -msgid "" -" This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." -msgstr "" - #: ../src/dialog.c:1458 msgid "What do you want to do now?" msgstr "Τί επιθυμείτε να μάθετε;" diff --git a/po/es.po b/po/es.po index d98ec2e6..02ce09c3 100644 --- a/po/es.po +++ b/po/es.po @@ -492,11 +492,11 @@ msgstr "Window Maker recibió la señal %i." #: ../src/dialog.c:1576 msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." +"BUGFORM and report it to %s." msgstr "" " Este error fatal ocurrió probablemente debido a un fallo.\n" " Por favor rellene el fichero BUGFORM adjunto y envíelo a\n" -" bugs@windowmaker.info." +" %s." #: ../src/dialog.c:1583 msgid "What do you want to do now?" diff --git a/po/et.po b/po/et.po index 8f1570aa..cd970398 100644 --- a/po/et.po +++ b/po/et.po @@ -488,11 +488,11 @@ msgstr "Window Maker võttis vastu signaali %i." #: ../src/dialog.c:1573 msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." +"BUGFORM and report it to %s." msgstr "" " See fataalviga on arvatavasti põhjustatud programmi enese veast. Palun " "täida kaasasolev vigadest teatamise vorm (BUGFORM) ja saada see aadressil " -"bugs@windowmaker.info." +"%s." #: ../src/dialog.c:1580 msgid "What do you want to do now?" diff --git a/po/fi.po b/po/fi.po index ecba64e2..2c0a703f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -466,10 +466,10 @@ msgstr "Window Maker vastaanotti signaalin %i." #: ../src/dialog.c:1707 msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." +"BUGFORM and report it to %s." msgstr "" " Tämä vakava virhe tapahtui luultavasti bugin johdosta. Ole hyvä ja täytä " -"oheinen bugi-kaavake ja lähetä se osoitteeseen bugs@windowmaker.info." +"oheinen bugi-kaavake ja lähetä se osoitteeseen %s." #: ../src/dialog.c:1716 msgid "What do you want to do now?" diff --git a/po/fr.po b/po/fr.po index db67bb72..d93f3a97 100644 --- a/po/fr.po +++ b/po/fr.po @@ -477,13 +477,15 @@ msgstr "" msgid "Window Maker received signal %i." msgstr "Window Maker a reçu le signal %i." -#: ../src/dialog.c:1748 +#. Comment for the PO file: the %s is an email address +#: ../src/dialog.c:1632 +#, c-format msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." +"BUGFORM and report it to %s." msgstr "" " Cette erreur est probablement due à un bogue. Remplissez le formulaire " -"BUGFORM et envoyez-le à bugs@windowmaker.info." +"BUGFORM et envoyez-le à %s." #: ../src/dialog.c:1757 msgid "What do you want to do now?" @@ -1439,14 +1441,6 @@ msgstr "Démarrage d'un autre gestionnaire de fenêtres..." msgid "failed to start alternate window manager. Aborting." msgstr "Impossible de démarrer un autre gestionnaire de fenêtres. Abandon." -#: ../src/startup.c:419 -msgid "" -"a fatal error has occured, probably due to a bug. Please fill the included " -"BUGFORM and report it." -msgstr "" -"Erreur probablement due à un bogue. Merci de remplir le formulaire BUGFORM " -"et de l'envoyer à bugs@windowmaker.info." - #: ../src/startup.c:894 #, c-format msgid "icon size is configured to %i, but it's too small. Using 16, instead\n" diff --git a/po/gl.po b/po/gl.po index 9be7bf29..8790df4d 100644 --- a/po/gl.po +++ b/po/gl.po @@ -360,10 +360,10 @@ msgstr "O Window Maker recibiu un sinal %i." #: ../src/dialog.c:1564 msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." +"BUGFORM and report it to %s." msgstr "" " Este erro grave ocorreu probablemente por mor dun erro do programa. Por " -"favor, encha a BUGFORM incluída (en inglés) e envíea a bugs@windowmaker.info." +"favor, encha a BUGFORM incluída (en inglés) e envíea a %s." #: ../src/dialog.c:1572 msgid "What do you want to do now?" diff --git a/po/hu.po b/po/hu.po index 08e2ac94..77c3f1c4 100644 --- a/po/hu.po +++ b/po/hu.po @@ -492,8 +492,8 @@ msgstr "A Window Maker %i jelzést kapott." #: ../../wmaker-crm/src/dialog.c:1599 msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." -msgstr " Ezt a végzetes hibát valószínűleg egy programozási hiba okozta. Légy szíves töltsd ki a mellékelt BUGFORM kérdőívet és küldd el a bugs@windowmaker.info e-mail címre!" +"BUGFORM and report it to %s." +msgstr " Ezt a végzetes hibát valószínűleg egy programozási hiba okozta. Légy szíves töltsd ki a mellékelt BUGFORM kérdőívet és küldd el a %s e-mail címre!" #: ../../wmaker-crm/src/dialog.c:1606 msgid "What do you want to do now?" diff --git a/po/hy.po b/po/hy.po index e5b9d018..1af2a6b9 100644 --- a/po/hy.po +++ b/po/hy.po @@ -591,10 +591,6 @@ msgstr "" msgid "Window Maker received signal %i." msgstr "Window Maker-ը ընդհունել է %i ազդանշանը" -#: ../src/dialog.c:1769 -msgid " This fatal error occured probably due to a bug. Please fill the included BUGFORM and report it to bugs@windowmaker.org." -msgstr "" - #: ../src/dialog.c:1778 msgid "What do you want to do now?" msgstr "Հիմա ի՞նչ անենք" diff --git a/po/it.po b/po/it.po index 383e3efe..34e637ea 100644 --- a/po/it.po +++ b/po/it.po @@ -527,10 +527,10 @@ msgstr "Window Maker ha ricevuto il segnale %i." #: ../src/dialog.c:1768 msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." +"BUGFORM and report it to %s." msgstr "" " Questo errore fatale è probabilmente dovuto ad un bug. Si prega di " -"compilare il file BUGFORM allegato e inviarlo a bugs@windowmaker.info." +"compilare il file BUGFORM allegato e inviarlo a %s." #: ../src/dialog.c:1777 msgid "What do you want to do now?" diff --git a/po/ja.po b/po/ja.po index 0108a5bb..6612c2c8 100644 --- a/po/ja.po +++ b/po/ja.po @@ -461,10 +461,10 @@ msgstr "Window Maker は シグナル %i を受けました." #: ../src/dialog.c:1576 msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." +"BUGFORM and report it to %s." msgstr "" "この致命的なエラーはバグによるものかもしれません. 同梱のバグフォームを使って " -"bugs@windowmaker.info 宛てにレポートして下さい" +"%s 宛てにレポートして下さい" #: ../src/dialog.c:1583 msgid "What do you want to do now?" diff --git a/po/ko.po b/po/ko.po index 65549f80..8ff19dae 100644 --- a/po/ko.po +++ b/po/ko.po @@ -472,10 +472,10 @@ msgstr "윈도우 메이커가 %i 신호를 받음." #: ../src/dialog.c:1596 msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." +"BUGFORM and report it to %s." msgstr "" "버그로 인해 치명적인 오류가 발생했습니다. BUGFORM을 작성하여 " -"bugs@windowmaker.info로 보내주시길 부탁드립니다." +"%s로 보내주시길 부탁드립니다." #: ../src/dialog.c:1603 msgid "What do you want to do now?" diff --git a/po/ms.po b/po/ms.po index 3533ec66..e51a4b1a 100644 --- a/po/ms.po +++ b/po/ms.po @@ -457,10 +457,10 @@ msgstr "Window Maker menerima isyarat %i." #: ../src/dialog.c:1786 msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." +"BUGFORM and report it to %s." msgstr "" " Ralat fatal ini berlaku kemungkinan disebabkan pepijat. Sila ini BUGFORM " -"yang disertakan dan laporkan ke bugs@windowmaker.info." +"yang disertakan dan laporkan ke %s." #: ../src/dialog.c:1795 msgid "What do you want to do now?" diff --git a/po/nl.po b/po/nl.po index 9d67c586..281d55f8 100644 --- a/po/nl.po +++ b/po/nl.po @@ -535,13 +535,15 @@ msgstr "Onherstelbare fout" msgid "Window Maker received signal %i." msgstr "Window Maker ontving signaal %i." +#. Comment for the PO file: the %s is an email address #: ../src/dialog.c:1632 +#, c-format msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." +"BUGFORM and report it to %s." msgstr "" " Deze onherstelbare fout trad mogelijk op door 'n bug. Vul a.u.b. bijgaand " -"BUGFORM in, en rapporteer 't aan bugs@windowmaker.info." +"BUGFORM in, en rapporteer 't aan %s." #: ../src/dialog.c:1639 msgid "What do you want to do now?" @@ -1162,14 +1164,19 @@ msgid "Window Maker exited due to a crash (signal %i) and will be restarted." msgstr "" "Window Maker sloot af door 'n crash (signaal %i) en zal worden herstart." -#: ../src/osdep_stub.c:17 +#. +#. * 1st %s is a function name +#. * 2nd %s is an email address +#. * 3rd %s is the name of the operating system +#. +#: ../src/osdep_stub.c:23 #, c-format msgid "" -"%s is not implemented on this platform; tell wmaker-dev@windowmaker.org you " -"are running %s release %s version %s" +"%s is not implemented on this platform; tell %s you are running %s release " +"%s version %s" msgstr "" -"%s is niet geïmplementeerd op dit platform; meld wmaker-dev@windowmaker.org " -"dat u %s, uitgave %s, versie %s gebruikt" +"%s is niet geïmplementeerd op dit platform; meld %s dat u %s, uitgave %s, " +"versie %s gebruikt" #: ../src/resources.c:41 #, c-format diff --git a/po/pt.po b/po/pt.po index faa4fb2e..da4bf500 100644 --- a/po/pt.po +++ b/po/pt.po @@ -353,11 +353,10 @@ msgstr "O Window Maker recebeu o sinal %i." #: ../src/dialog.c:1564 msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." +"BUGFORM and report it to %s." msgstr "" " Este erro fatal ocorreu provavelmente devido a uma falha.\n" -" Por favor preencha o arquivo BUGFORM incluído e reporte-o a " -"bugs@windowmaker.info." +" Por favor preencha o arquivo BUGFORM incluído e reporte-o a %s." #: ../src/dialog.c:1572 msgid "What do you want to do now?" diff --git a/po/ru.po b/po/ru.po index da62ca3f..861d8e04 100644 --- a/po/ru.po +++ b/po/ru.po @@ -483,14 +483,15 @@ msgstr "" msgid "Window Maker received signal %i." msgstr "Window Maker: получен сигнал %i." -#: ../src/dialog.c:1822 +#. Comment for the PO file: the %s is an email address +#: ../src/dialog.c:1632 +#, c-format msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." +"BUGFORM and report it to %s." msgstr "" " Эта критическая ошибка, возможно, является результатом ошибки в программе. " -"Пожалуйста, заполните форму в файле BUGFORM и отправьте по адресу " -"bugs@windowmaker.info." +"Пожалуйста, заполните форму в файле BUGFORM и отправьте по адресу %s." #: ../src/dialog.c:1831 msgid "What do you want to do now?" diff --git a/po/sk.po b/po/sk.po index d02bb312..f0ef213a 100644 --- a/po/sk.po +++ b/po/sk.po @@ -494,15 +494,17 @@ msgstr "" msgid "Window Maker received signal %i." msgstr "Window Maker prijal signál %i." -#: ../src/dialog.c:1752 +#. Comment for the PO file: the %s is an email address +#: ../src/dialog.c:1632 +#, c-format msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." +"BUGFORM and report it to %s." msgstr "" -"Táto fatálna chyba sa vyskytla\n" -"pravdepodobne kvôli chybe vo Window Makery.\n" -"Prosím vyplňte priložený BUGFORM a\n" -"pošlite ho na bugs@windowmaker.info." +"Táto fatálna chyba sa vyskytla " +"pravdepodobne kvôli chybe vo Window Makery. " +"Prosím vyplňte priložený BUGFORM a " +"pošlite ho na %s." #: ../src/dialog.c:1761 msgid "What do you want to do now?" diff --git a/po/uk.po b/po/uk.po index e7f293c6..49c8b37c 100644 --- a/po/uk.po +++ b/po/uk.po @@ -480,10 +480,10 @@ msgstr "Window Maker: отримано сигнал %i." #: ../src/dialog.c:1790 msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.org." +"BUGFORM and report it to %s." msgstr "" " Ця критична помилка, можливо, є результатом помилки в програмі. Будь ласка, " -"заповніть форму BUGFORM і відправте її за адресою bugs@windowmaker.org." +"заповніть форму BUGFORM і відправте її за адресою %s." #: ../src/dialog.c:1799 msgid "What do you want to do now?" diff --git a/po/zh_CN.po b/po/zh_CN.po index 57d6eeb4..e58f2722 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -301,10 +301,10 @@ msgstr "Window Maker收到信号%i." #: ../src/dialog.c:1450 msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." +"BUGFORM and report it to %s." msgstr "" "发生一个致命错误,也许是因为一个 bug.请填写好软件中包含的 BUGFORM 并向" -"bugs@windowmaker.info 报告 bug." +"%s 报告 bug." #: ../src/dialog.c:1458 msgid "What do you want to do now?" diff --git a/po/zh_TW.po b/po/zh_TW.po index 3b1c0626..e4d60288 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -513,10 +513,10 @@ msgstr "Window Maker 收到訊號 %i。" #: ../src/dialog.c:1768 msgid "" " This fatal error occured probably due to a bug. Please fill the included " -"BUGFORM and report it to bugs@windowmaker.info." +"BUGFORM and report it to %s." msgstr "" "這個嚴重錯誤可能是因為程式錯誤所致。請填寫附帶的 BUGFORM 並向 " -"bugs@windowmaker.info 提出報告。" +"%s 提出報告。" #: ../src/dialog.c:1777 msgid "What do you want to do now?" diff --git a/src/dialog.c b/src/dialog.c index cb444eeb..3579a652 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -1628,9 +1628,11 @@ int wShowCrashingDialogPanel(int whatSig) WMResizeWidget(panel->note2L, PWIDTH - 20, 100); WMMoveWidget(panel->note2L, 10, 130); WMSetLabelTextAlignment(panel->note2L, WALeft); - WMSetLabelText(panel->note2L, - _(" This fatal error occured probably due to a bug." - " Please fill the included BUGFORM and " "report it to bugs@windowmaker.info.")); + snprintf(buf, sizeof(buf), /* Comment for the PO file: the %s is an email address */ + _(" This fatal error occured probably due to a bug." + " Please fill the included BUGFORM and report it to %s."), + PACKAGE_BUGREPORT); + WMSetLabelText(panel->note2L, buf); WMSetLabelWraps(panel->note2L, True); panel->whatF = WMCreateFrame(panel->win); diff --git a/src/osdep_stub.c b/src/osdep_stub.c index 18b170c4..ca76cab6 100644 --- a/src/osdep_stub.c +++ b/src/osdep_stub.c @@ -13,10 +13,16 @@ Bool GetCommandForPid(int pid, char ***argv, int *argc) if (!notified) { struct utsname un; + /* The comment below is placed in the PO file by xgettext to help translator */ if (uname(&un) != -1) { + /* + * 1st %s is a function name + * 2nd %s is an email address + * 3rd %s is the name of the operating system + */ wwarning(_("%s is not implemented on this platform; " - "tell wmaker-dev@windowmaker.org you are running " - "%s release %s version %s"), __FUNCTION__, + "tell %s you are running %s release %s version %s"), + __FUNCTION__, PACKAGE_BUGREPORT, un.sysname, un.release, un.version); notified = 1; }