gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

wmaker: update error message to have only one string to be translated

Browse Source 
As a previous patch modified some instances of the error message to include
more information to the user, it is a good idea to update also the other
uses of the message, so that:
 - people helping on translation will have less messages to translate
 - this mean we provide more information to the user in these places too,
which can help him solve the problem

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
This commit is contained in:
Christophe CURIS
2014-11-15 19:40:53 +01:00
committed by Carlos R. Mafra
parent 65e5f452ec
commit 285a926539
28 changed files with 62 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
po/be.po
View File

@@ -1263,8 +1263,8 @@ msgstr "%s: немагчыма адкрыць ці апрацаваць файл
#: ../src/rootmenu.c:1212 ../src/rootmenu.c:1315 #: ../src/rootmenu.c:1212 ../src/rootmenu.c:1315
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s: немагчыма адкрыць файл меню" msgstr "немагчыма адкрыць файл меню \"%s\": %s"
#: ../src/rootmenu.c:1239 #: ../src/rootmenu.c:1239
#, c-format #, c-format

4
po/bg.po
View File

@@ -1557,8 +1557,8 @@ msgstr "%s: не може да се отвори/обработи от пред
# ../src/rootmenu.c:1123 ../src/rootmenu.c:1224 # ../src/rootmenu.c:1123 ../src/rootmenu.c:1224
#: ../src/rootmenu.c:1212 ../src/rootmenu.c:1315 #: ../src/rootmenu.c:1212 ../src/rootmenu.c:1315
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s: не може да се отвори файлът меню" msgstr "не може да се отвори файлът меню \"%s\": %s"
# ../src/rootmenu.c:1150 # ../src/rootmenu.c:1150
#: ../src/rootmenu.c:1239 #: ../src/rootmenu.c:1239

4
po/bs.po
View File

@@ -745,8 +745,8 @@ msgid "%s:could not open/preprocess menu file"
msgstr "%s:ne mogu otvoriti/preprocesirati datoteku izbornika" msgstr "%s:ne mogu otvoriti/preprocesirati datoteku izbornika"
#: ../src/rootmenu.c:1079 ../src/rootmenu.c:1180 #: ../src/rootmenu.c:1079 ../src/rootmenu.c:1180
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s: ne mogu otvoriti datoteku izbornika" msgstr "ne mogu otvoriti datoteku izbornika \"%s\": %s"
#: ../src/rootmenu.c:1106 #: ../src/rootmenu.c:1106
msgid "%s:invalid menu file. MENU command is missing" msgid "%s:invalid menu file. MENU command is missing"

4
po/ca.po
View File

@@ -1299,8 +1299,8 @@ msgstr "%s: no s'ha pogut obrir/preprocessar el fitxer de menú"
#: ../src/rootmenu.c:1217 ../src/rootmenu.c:1321 #: ../src/rootmenu.c:1217 ../src/rootmenu.c:1321
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s: no s'ha pogut obrir el fitxer de menú" msgstr "no s'ha pogut obrir el fitxer de menú \"%s\": %s"
#: ../src/rootmenu.c:1244 #: ../src/rootmenu.c:1244
#, c-format #, c-format

4
po/cs.po
View File

@@ -1221,8 +1221,8 @@ msgstr "%s: nelze otevřít nebo předzpracovat soubor s menu"
#: ../src/rootmenu.c:1175 ../src/rootmenu.c:1277 #: ../src/rootmenu.c:1175 ../src/rootmenu.c:1277
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s:nelze otevřít soubor s menu" msgstr "nelze otevřít soubor s menu \"%s\": %s"
#: ../src/rootmenu.c:1202 #: ../src/rootmenu.c:1202
#, c-format #, c-format

4
po/da.po
View File

@@ -1483,8 +1483,8 @@ msgstr "%s:kunne ikke åbne/forbehandle menufil"
# ../src/rootmenu.c:1126 ../src/rootmenu.c:1227 # ../src/rootmenu.c:1126 ../src/rootmenu.c:1227
#: ../src/rootmenu.c:1212 ../src/rootmenu.c:1314 #: ../src/rootmenu.c:1212 ../src/rootmenu.c:1314
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s:kunne ikke åbne menufil" msgstr "kunne ikke åbne menufil \"%s\": %s"
# ../src/rootmenu.c:1153 # ../src/rootmenu.c:1153
#: ../src/rootmenu.c:1239 #: ../src/rootmenu.c:1239

4
po/de.po
View File

@@ -1164,8 +1164,8 @@ msgstr "%s: Menüdatei konnte nicht geöffnet/bearbeitet werden"
#: ../src/rootmenu.c:1106 ../src/rootmenu.c:1203 #: ../src/rootmenu.c:1106 ../src/rootmenu.c:1203
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s: Menüdatei konnte nicht geöffnet werden" msgstr "Menüdatei \"%s\" konnte nicht geöffnet werden: %s"
#: ../src/rootmenu.c:1132 #: ../src/rootmenu.c:1132
#, c-format #, c-format

4
po/es.po
View File

@@ -1161,8 +1161,8 @@ msgstr "%s:no se pudo abrir/preprocesar el fichero de menú"
#: ../src/rootmenu.c:1105 ../src/rootmenu.c:1199 #: ../src/rootmenu.c:1105 ../src/rootmenu.c:1199
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s:no se pudo abrir el fichero del menú" msgstr "no se pudo abrir el fichero del menú \"%s\": %s"
#: ../src/rootmenu.c:1131 #: ../src/rootmenu.c:1131
#, c-format #, c-format

4
po/et.po
View File

@@ -1147,8 +1147,8 @@ msgstr "%s:menüüfaili pole võimalik avada või eeltöödelda"
#: ../src/rootmenu.c:1064 ../src/rootmenu.c:1149 #: ../src/rootmenu.c:1064 ../src/rootmenu.c:1149
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s:menüüfaili pole võimalik avada" msgstr "menüüfaili \"%s\" pole võimalik avada: %s"
#: ../src/rootmenu.c:1084 #: ../src/rootmenu.c:1084
#, c-format #, c-format

4
po/fi.po
View File

@@ -1210,8 +1210,8 @@ msgstr "%s: valikkotiedostoa ei voitu avata/esikäsitellä"
#: ../src/rootmenu.c:1174 ../src/rootmenu.c:1276 #: ../src/rootmenu.c:1174 ../src/rootmenu.c:1276
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s: valikkotiedoston avaus ei onnistunut" msgstr "valikkotiedoston \"%s\" avaus ei onnistunut: %s"
#: ../src/rootmenu.c:1201 #: ../src/rootmenu.c:1201
#, c-format #, c-format

4
po/fr.po
View File

@@ -1283,8 +1283,8 @@ msgstr "%s : échec à l'ouverture ou au traitement du fichier de menu."
#: ../src/rootmenu.c:1217 ../src/rootmenu.c:1320 #: ../src/rootmenu.c:1217 ../src/rootmenu.c:1320
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s : l'ouverture du fichier de menu a échoué." msgstr "l'ouverture du fichier de menu \"%s\" a échoué: %s"
#: ../src/rootmenu.c:1244 #: ../src/rootmenu.c:1244
#, c-format #, c-format

4
po/gl.po
View File

@@ -1061,8 +1061,8 @@ msgstr "%s:non foi posible abrir/preprocesar ficheiro de menú"
#: ../src/rootmenu.c:1123 ../src/rootmenu.c:1224 #: ../src/rootmenu.c:1123 ../src/rootmenu.c:1224
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s:non foi posible abri-lo ficheiro de menú" msgstr "non foi posible abri-lo ficheiro de menú \"%s\": %s"
#: ../src/rootmenu.c:1150 #: ../src/rootmenu.c:1150
#, c-format #, c-format

4
po/hr.po
View File

@@ -744,8 +744,8 @@ msgid "%s:could not open/preprocess menu file"
msgstr "%s:ne mogu otvoriti/preprocesirati datoteku izbornika" msgstr "%s:ne mogu otvoriti/preprocesirati datoteku izbornika"
#: ../src/rootmenu.c:1079 ../src/rootmenu.c:1180 #: ../src/rootmenu.c:1079 ../src/rootmenu.c:1180
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s: ne mogu otvoriti datoteku izbornika" msgstr "ne mogu otvoriti datoteku izbornika \"%s\": %s"
#: ../src/rootmenu.c:1106 #: ../src/rootmenu.c:1106
msgid "%s:invalid menu file. MENU command is missing" msgid "%s:invalid menu file. MENU command is missing"

4
po/hu.po
View File

@@ -1179,8 +1179,8 @@ msgstr "szintaktikai hiba a menü fájlban: hiányzó END kulcsszó"
#: ../../wmaker-crm/src/rootmenu.c:1049 ../../wmaker-crm/src/rootmenu.c:1138 #: ../../wmaker-crm/src/rootmenu.c:1049 ../../wmaker-crm/src/rootmenu.c:1138
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s: nem tudom megnyitni a menü fájlt" msgstr "nem tudom megnyitni a menü fájlt \"%s\": %s"
#: ../../wmaker-crm/src/rootmenu.c:1072 #: ../../wmaker-crm/src/rootmenu.c:1072
msgid "invalid menu file, MENU command is missing" msgid "invalid menu file, MENU command is missing"

5
po/it.po
View File

@@ -1234,11 +1234,10 @@ msgstr "impossibile generare gli argomenti per il preprocessore del file di men
msgid "%s:could not open/preprocess menu file" msgid "%s:could not open/preprocess menu file"
msgstr "%s: impossibile aprire/preelaborare il file di menù" msgstr "%s: impossibile aprire/preelaborare il file di menù"
# FIXME UPSTREAM<
#: ../src/rootmenu.c:1217 ../src/rootmenu.c:1321 #: ../src/rootmenu.c:1217 ../src/rootmenu.c:1321
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s: impossibile aprire il file di menù" msgstr "impossibile aprire il file di menù \"%s\": %s"
# FIXME UPSTREAM< # FIXME UPSTREAM<
#: ../src/rootmenu.c:1244 #: ../src/rootmenu.c:1244

4
po/ja.po
View File

@@ -1137,8 +1137,8 @@ msgstr "%s:メニューファイルのオープン／プリプロセスができ
#: ../src/rootmenu.c:1105 ../src/rootmenu.c:1199 #: ../src/rootmenu.c:1105 ../src/rootmenu.c:1199
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s:メニューファイルを開けません" msgstr "メニューファイルを開けません \"%s\": %s"
#: ../src/rootmenu.c:1131 #: ../src/rootmenu.c:1131
#, c-format #, c-format

4
po/ko.po
View File

@@ -1121,8 +1121,8 @@ msgstr "메뉴 파일에서 문법 오류: END 선언 없음"
#: ../src/rootmenu.c:1025 ../src/rootmenu.c:1114 #: ../src/rootmenu.c:1025 ../src/rootmenu.c:1114
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s:메뉴 파일을 열 수 없음" msgstr "메뉴 파일을 열 수 없음 \"%s\": %s"
#: ../src/rootmenu.c:1048 #: ../src/rootmenu.c:1048
msgid "invalid menu file, MENU command is missing" msgid "invalid menu file, MENU command is missing"

4
po/ms.po
View File

@@ -1244,8 +1244,8 @@ msgstr "%s:tak dapat membuka/mempraproses fail menu)"
#: ../src/rootmenu.c:1209 ../src/rootmenu.c:1311 #: ../src/rootmenu.c:1209 ../src/rootmenu.c:1311
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s: tak dapat membuka fail menu" msgstr "tak dapat membuka fail menu \"%s\": %s"
#: ../src/rootmenu.c:1236 #: ../src/rootmenu.c:1236
#, c-format #, c-format

4
po/nl.po
View File

@@ -1204,8 +1204,8 @@ msgstr "ongeldig menu, geen menutitel opgegeven"
#: ../src/rootmenu.c:1096 ../src/rootmenu.c:1156 #: ../src/rootmenu.c:1096 ../src/rootmenu.c:1156
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s:kon menubestand niet openen" msgstr "kon menubestand \"%s\" niet openen: %s"
#: ../src/rootmenu.c:1264 ../src/rootmenu.c:1336 ../src/rootmenu.c:1375 #: ../src/rootmenu.c:1264 ../src/rootmenu.c:1336 ../src/rootmenu.c:1375
#, c-format #, c-format

4
po/no.po
View File

@@ -484,8 +484,8 @@ msgstr "%s:kunne ikke åpne/behandle meny filen"
#: ../src/rootmenu.c:685 ../src/rootmenu.c:767 #: ../src/rootmenu.c:685 ../src/rootmenu.c:767
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s:kunne ikke åpne meny filen" msgstr "kunne ikke åpne meny filen \"%s\": %s"
#: ../src/rootmenu.c:698 #: ../src/rootmenu.c:698
#, c-format #, c-format

4
po/pl.po
View File

@@ -842,8 +842,8 @@ msgstr "%s:nie można otworzyć/przetworzyć pliku menu"
#: ../src/rootmenu.c:1096 ../src/rootmenu.c:1197 #: ../src/rootmenu.c:1096 ../src/rootmenu.c:1197
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s:nie można otworzyć pliku menu" msgstr "nie można otworzyć pliku menu \"%s\": %s"
#: ../src/rootmenu.c:1123 #: ../src/rootmenu.c:1123
#, c-format #, c-format

4
po/pt.po
View File

@@ -1050,8 +1050,8 @@ msgstr "%s:não foi possível abrir/preprocessar arquivo de menu"
#: ../src/rootmenu.c:1123 ../src/rootmenu.c:1224 #: ../src/rootmenu.c:1123 ../src/rootmenu.c:1224
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s:não foi possível abrir arquivo de menu" msgstr "não foi possível abrir arquivo de menu \"%s\": %s"
#: ../src/rootmenu.c:1150 #: ../src/rootmenu.c:1150
#, c-format #, c-format

4
po/ru.po
View File

@@ -1260,8 +1260,8 @@ msgstr "%s:не удалось открыть/предобработать фа
#: ../src/rootmenu.c:1212 ../src/rootmenu.c:1315 #: ../src/rootmenu.c:1212 ../src/rootmenu.c:1315
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s:не удалось открыть файл меню" msgstr "не удалось открыть файл меню \"%s\": %s"
#: ../src/rootmenu.c:1239 #: ../src/rootmenu.c:1239
#, c-format #, c-format

4
po/sk.po
View File

@@ -1308,8 +1308,8 @@ msgstr "%s:nemožno otvoriť alebo predspracovať súbor s menu"
#: ../src/rootmenu.c:1217 ../src/rootmenu.c:1321 #: ../src/rootmenu.c:1217 ../src/rootmenu.c:1321
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s:nemožno otvoriť súbor s menu" msgstr "nemožno otvoriť súbor s menu \"%s\": %s"
#: ../src/rootmenu.c:1244 #: ../src/rootmenu.c:1244
#, c-format #, c-format

4
po/tr.po
View File

@@ -650,8 +650,8 @@ msgid "%s:could not open/preprocess menu file"
msgstr "%s:menü dosyası açılamadı/işlenemedi" msgstr "%s:menü dosyası açılamadı/işlenemedi"
#: ../src/rootmenu.c:1033 ../src/rootmenu.c:1131 #: ../src/rootmenu.c:1033 ../src/rootmenu.c:1131
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s: menü dosyası açılamadı" msgstr "menü dosyası \"%s\" açılamadı: %s"
#: ../src/rootmenu.c:1060 #: ../src/rootmenu.c:1060
msgid "%s:invalid menu file" msgid "%s:invalid menu file"

4
po/zh_CN.po
View File

@@ -990,8 +990,8 @@ msgstr "%s:不能打开或预处理菜单文件"
#: ../src/rootmenu.c:1126 ../src/rootmenu.c:1227 #: ../src/rootmenu.c:1126 ../src/rootmenu.c:1227
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s:不能打开菜单文件" msgstr "不能打开菜单文件 \"%s\": %s"
#: ../src/rootmenu.c:1153 #: ../src/rootmenu.c:1153
#, c-format #, c-format

4
po/zh_TW.po
View File

@@ -1205,8 +1205,8 @@ msgstr "%s: 無法開啟/預先處理選單檔"
#: ../src/rootmenu.c:1217 ../src/rootmenu.c:1321 #: ../src/rootmenu.c:1217 ../src/rootmenu.c:1321
#, c-format #, c-format
msgid "%s:could not open menu file" msgid "could not open menu file \"%s\": %s"
msgstr "%s: 無法開啟選單檔" msgstr "無法開啟選單檔 \"%s\": %s"
#: ../src/rootmenu.c:1244 #: ../src/rootmenu.c:1244
#, c-format #, c-format

10
src/rootmenu.c
View File

@@ -1094,7 +1094,7 @@ static WMenu *readMenuFile(WScreen *scr, const char *file_name)
file = fopen(file_name, "rb"); file = fopen(file_name, "rb");
if (!file) { if (!file) {
werror(_("%s:could not open menu file"), file_name); werror(_("could not open menu file \"%s\": %s"), file_name, strerror(errno));
return NULL; return NULL;
} }
menu = readMenu(scr, file_name, file); menu = readMenu(scr, file_name, file);
@@ -1172,9 +1172,15 @@ static WMenu *readMenuPipe(WScreen * scr, char **file_name)
} }
filename = flat_file + (flat_file[1] == '|' ? 2 : 1); filename = flat_file + (flat_file[1] == '|' ? 2 : 1);
/*
* In case of memory problem, 'popen' will not set the errno, so we initialise it
* to be able to display a meaningful message. For other problems, 'popen' will
* properly set errno, so we'll still get a good message
*/
errno = ENOMEM;
file = popen(filename, "r"); file = popen(filename, "r");
if (!file) { if (!file) {
werror(_("%s:could not open menu file"), filename); werror(_("could not open menu file \"%s\": %s"), filename, strerror(errno));
return NULL; return NULL;
} }
menu = readMenu(scr, flat_file, file); menu = readMenu(scr, flat_file, file);