This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project wmaker-crm.git.
The branch, next has been updated via ab348c6dc8a02187d54c9de1acc896348eab741d (commit) via 7caadb48de21af4764b3416c9ab252400e922178 (commit) via d6dc62649b526c52d23c3a9260e9a421f6b23871 (commit) via 9f8363dc14eab89b7591e7160531cd4ab22d9ccc (commit) via 51ad8b7dc1e9299c58675b650ccb17ab625fa0f2 (commit) via 546c148ac0e834db43035e7aabc2afa26ee6103c (commit) via 9ee94f8777d3b8e57911814cd07028115dc5e466 (commit) via f5167ae12d15384e809a0e3ffb28840ee3b61264 (commit) from a2328d9842b521cbeab4cb71afb9bea6c47dae86 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/wmaker-crm.git/commit/ab348c6dc8a02187d54c9de1acc896348eab741d commit ab348c6dc8a02187d54c9de1acc896348eab741d Author: Christophe CURIS <christophe.cu...@free.fr> Date: Fri May 9 21:29:13 2014 +0200 Add attribute 'noreturn' to a few functions pointed by clang Signed-off-by: Christophe CURIS <christophe.cu...@free.fr> diff --git a/test/wtest.c b/test/wtest.c index 37f285d9..00b12509 100644 --- a/test/wtest.c +++ b/test/wtest.c @@ -8,6 +8,8 @@ * TODO: remake */ +#include "config.h" + #include <stdio.h> #include <stdlib.h> #include <X11/Xlib.h> @@ -15,6 +17,11 @@ #include <X11/Xproto.h> #include <WMaker.h> +#ifdef HAVE_STDNORETURN +#include <stdnoreturn.h> +#endif + + static char bits[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff @@ -34,7 +41,7 @@ static void callback(int item) printf("pushed item %in", item); } -static void quit(int item) +static noreturn void quit(int item) { /* * This parameter is not used, but because we're a call-back we have a fixed diff --git a/util/wmsetbg.c b/util/wmsetbg.c index ee4780fb..b52f9500 100644 --- a/util/wmsetbg.c +++ b/util/wmsetbg.c @@ -100,7 +100,7 @@ typedef struct BackgroundTexture { int height; } BackgroundTexture; -static void quit(int rcode) +static noreturn void quit(int rcode) { WMReleaseApplication(); exit(rcode); http://repo.or.cz/w/wmaker-crm.git/commit/7caadb48de21af4764b3416c9ab252400e922178 commit 7caadb48de21af4764b3416c9ab252400e922178 Author: Christophe CURIS <christophe.cu...@free.fr> Date: Fri May 9 21:29:12 2014 +0200 WPrefs: Updated translation source strings against source code Some strings have been changed in the source code, this patch is updating the corresponding 'msgid' in the 'po' files so that the translated words will be found, and will not be lost in case of an automatic update on the file. Signed-off-by: Christophe CURIS <christophe.cu...@free.fr> diff --git a/WPrefs.app/po/bg.po b/WPrefs.app/po/bg.po index c795f015..d3677d5b 100644 --- a/WPrefs.app/po/bg.po +++ b/WPrefs.app/po/bg.po @@ -1624,7 +1624,7 @@ msgstr "Скорост на мишката" # ../../WPrefs.app/MouseSettings.c:508 #: ../../WPrefs.app/MouseSettings.c:507 -msgid "Acceler.:" +msgid "Accel.:" msgstr "Ускорение" # ../../WPrefs.app/MouseSettings.c:521 diff --git a/WPrefs.app/po/ca.po b/WPrefs.app/po/ca.po index 74a20369..762b6e2e 100644 --- a/WPrefs.app/po/ca.po +++ b/WPrefs.app/po/ca.po @@ -1429,8 +1429,8 @@ msgid "Mouse Speed" msgstr "Velocitat del ratolí" #: ../../WPrefs.app/MouseSettings.c:507 -msgid "Acceler.:" -msgstr "Acceler.:" +msgid "Accel.:" +msgstr "Accel.:" #: ../../WPrefs.app/MouseSettings.c:520 msgid "Threshold:" diff --git a/WPrefs.app/po/cs.po b/WPrefs.app/po/cs.po index 02c16e2f..7e692273 100644 --- a/WPrefs.app/po/cs.po +++ b/WPrefs.app/po/cs.po @@ -1304,7 +1304,7 @@ msgid "Mouse Speed" msgstr "Rychlost myši" #: ../MouseSettings.c:507 -msgid "Acceler.:" +msgid "Accel.:" msgstr "Zrychl.:" #: ../MouseSettings.c:520 diff --git a/WPrefs.app/po/de.po b/WPrefs.app/po/de.po index 43dd2a42..19d3af5f 100644 --- a/WPrefs.app/po/de.po +++ b/WPrefs.app/po/de.po @@ -1333,7 +1333,7 @@ msgid "Mouse Speed" msgstr "Mausgeschwindigkeit" #: ../../WPrefs.app/MouseSettings.c:465 -msgid "Acceler.:" +msgid "Accel.:" msgstr "Beschl.:" #: ../../WPrefs.app/MouseSettings.c:476 diff --git a/WPrefs.app/po/es.po b/WPrefs.app/po/es.po index 8a79a00b..1c4db6b7 100644 --- a/WPrefs.app/po/es.po +++ b/WPrefs.app/po/es.po @@ -1342,7 +1342,7 @@ msgid "Mouse Speed" msgstr "Velocidad del Ratón" #: ../../WPrefs.app/MouseSettings.c:507 -msgid "Acceler.:" +msgid "Accel.:" msgstr "Aceleración" #: ../../WPrefs.app/MouseSettings.c:520 diff --git a/WPrefs.app/po/fi.po b/WPrefs.app/po/fi.po index 4c233bf9..3370b8de 100644 --- a/WPrefs.app/po/fi.po +++ b/WPrefs.app/po/fi.po @@ -1511,7 +1511,7 @@ msgid "Mouse Speed" msgstr "Hiiren nopeus" #: ../../WPrefs.app/MouseSettings.c:507 -msgid "Acceler.:" +msgid "Accel.:" msgstr "Kiihdytys:" #: ../../WPrefs.app/MouseSettings.c:520 diff --git a/WPrefs.app/po/fr.po b/WPrefs.app/po/fr.po index 40acd802..d7958695 100644 --- a/WPrefs.app/po/fr.po +++ b/WPrefs.app/po/fr.po @@ -1437,7 +1437,7 @@ msgid "Mouse Speed" msgstr "Vitesse de la souris" #: ../../WPrefs.app/MouseSettings.c:507 -msgid "Acceler.:" +msgid "Accel.:" msgstr "Accélér. :" #: ../../WPrefs.app/MouseSettings.c:520 diff --git a/WPrefs.app/po/it.po b/WPrefs.app/po/it.po index c5191d8a..904f6362 100644 --- a/WPrefs.app/po/it.po +++ b/WPrefs.app/po/it.po @@ -1540,8 +1540,8 @@ msgid "Mouse Speed" msgstr "Velocità del mouse" #: ../../WPrefs.app/MouseSettings.c:507 -msgid "Acceler.:" -msgstr "Acceler.:" +msgid "Accel.:" +msgstr "Accel.:" #: ../../WPrefs.app/MouseSettings.c:520 msgid "Threshold:" diff --git a/WPrefs.app/po/ja.po b/WPrefs.app/po/ja.po index 2775bcf1..ea5e5efb 100644 --- a/WPrefs.app/po/ja.po +++ b/WPrefs.app/po/ja.po @@ -1346,7 +1346,7 @@ msgid "Mouse Speed" msgstr "マウスの速度" #: ../../WPrefs.app/MouseSettings.c:465 -msgid "Acceler.:" +msgid "Accel.:" msgstr "加速度.:" #: ../../WPrefs.app/MouseSettings.c:476 diff --git a/WPrefs.app/po/ko.po b/WPrefs.app/po/ko.po index 062be052..a985e875 100644 --- a/WPrefs.app/po/ko.po +++ b/WPrefs.app/po/ko.po @@ -1531,7 +1531,7 @@ msgid "could not load icon %s" msgstr "아이콘 %s를 읽어들일 수 없음" #: ../../WPrefs.app/MouseSettings.c:468 -msgid "Acceler.:" +msgid "Accel.:" msgstr "가속.:" #: ../../WPrefs.app/MouseSettings.c:479 diff --git a/WPrefs.app/po/pt.po b/WPrefs.app/po/pt.po index bcff1c34..8b1c12fa 100644 --- a/WPrefs.app/po/pt.po +++ b/WPrefs.app/po/pt.po @@ -1295,7 +1295,7 @@ msgid "Mouse Speed" msgstr "Velocidade do Mouse" #: ../../WPrefs.app/MouseSettings.c:508 -msgid "Acceler.:" +msgid "Accel.:" msgstr "Aceler.:" #: ../../WPrefs.app/MouseSettings.c:521 diff --git a/WPrefs.app/po/ru.po b/WPrefs.app/po/ru.po index cd07b6fc..2d49c1cc 100644 --- a/WPrefs.app/po/ru.po +++ b/WPrefs.app/po/ru.po @@ -1409,7 +1409,7 @@ msgid "Mouse Speed" msgstr "Скорость мыши" #: ../../WPrefs.app/MouseSettings.c:507 -msgid "Acceler.:" +msgid "Accel.:" msgstr "Ускор.:" #: ../../WPrefs.app/MouseSettings.c:520 diff --git a/WPrefs.app/po/sk.po b/WPrefs.app/po/sk.po index 66ac09fa..8a21ae23 100644 --- a/WPrefs.app/po/sk.po +++ b/WPrefs.app/po/sk.po @@ -1329,7 +1329,7 @@ msgid "Mouse Speed" msgstr "Rýchlosť myši" #: ../../WPrefs.app/MouseSettings.c:507 -msgid "Acceler.:" +msgid "Accel.:" msgstr "Zrýchl.:" #: ../../WPrefs.app/MouseSettings.c:520 diff --git a/WPrefs.app/po/zh_CN.po b/WPrefs.app/po/zh_CN.po index 46d6ed36..6e372d1f 100644 --- a/WPrefs.app/po/zh_CN.po +++ b/WPrefs.app/po/zh_CN.po @@ -1217,7 +1217,7 @@ msgid "Mouse Speed" msgstr "鼠标速度" #: ../../WPrefs.app/MouseSettings.c:553 -msgid "Acceler.:" +msgid "Accel.:" msgstr "加速值:" #: ../../WPrefs.app/MouseSettings.c:566 diff --git a/WPrefs.app/po/zh_TW.po b/WPrefs.app/po/zh_TW.po index f710a6b4..36db2375 100644 --- a/WPrefs.app/po/zh_TW.po +++ b/WPrefs.app/po/zh_TW.po @@ -1294,7 +1294,7 @@ msgid "Mouse Speed" msgstr "滑鼠速度" #: ../../WPrefs.app/MouseSettings.c:507 -msgid "Acceler.:" +msgid "Accel.:" msgstr "加速值:" #: ../../WPrefs.app/MouseSettings.c:520 http://repo.or.cz/w/wmaker-crm.git/commit/d6dc62649b526c52d23c3a9260e9a421f6b23871 commit d6dc62649b526c52d23c3a9260e9a421f6b23871 Author: Christophe CURIS <christophe.cu...@free.fr> Date: Fri May 9 21:29:11 2014 +0200 WPrefs: Make Opaque Move/Resize less cramped in the Window Handling panel The icons were too tightly packed into their buttons and were not even fully displayed, and the label of the checkbox could be split on 2 lines unnecessarily. Signed-off-by: Christophe CURIS <christophe.cu...@free.fr> diff --git a/WPrefs.app/WindowHandling.c b/WPrefs.app/WindowHandling.c index 38f2b16f..9d7ab54d 100644 --- a/WPrefs.app/WindowHandling.c +++ b/WPrefs.app/WindowHandling.c @@ -354,8 +354,8 @@ static void createPanel(Panel * p) WMWidgetView(panel->opaqF)); panel->opaqB = WMCreateButton(panel->opaqF, WBTToggle); - WMResizeWidget(panel->opaqB, 48,48); - WMMoveWidget(panel->opaqB, 18, 20); + WMResizeWidget(panel->opaqB, 54, 54); + WMMoveWidget(panel->opaqB, 14, 20); WMSetButtonImagePosition(panel->opaqB, WIPImageOnly); path = LocateImage(NON_OPAQUE_MOVE_PIXMAP); @@ -385,8 +385,8 @@ static void createPanel(Panel * p) panel->opaqresizeB = WMCreateButton(panel->opaqF, WBTToggle); - WMResizeWidget(panel->opaqresizeB, 48,48); - WMMoveWidget(panel->opaqresizeB, 86, 20); + WMResizeWidget(panel->opaqresizeB, 54, 54); + WMMoveWidget(panel->opaqresizeB, 82, 20); WMSetButtonImagePosition(panel->opaqresizeB, WIPImageOnly); path = LocateImage(NON_OPAQUE_RESIZE_PIXMAP); @@ -414,8 +414,8 @@ static void createPanel(Panel * p) } panel->opaqkeybB = WMCreateSwitchButton(panel->opaqF); - WMResizeWidget(panel->opaqkeybB, 100, 25); - WMMoveWidget(panel->opaqkeybB, 18, 76); + WMResizeWidget(panel->opaqkeybB, 122, 25); + WMMoveWidget(panel->opaqkeybB, 14, 79); WMSetButtonText(panel->opaqkeybB, _("by keyboard")); WMMapSubwidgets(panel->opaqF); http://repo.or.cz/w/wmaker-crm.git/commit/9f8363dc14eab89b7591e7160531cd4ab22d9ccc commit 9f8363dc14eab89b7591e7160531cd4ab22d9ccc Author: Christophe CURIS <christophe.cu...@free.fr> Date: Fri May 9 21:29:10 2014 +0200 WMaker: rationalised the use of flags for window icons in the switchpanel The flags were stored as 'char' but it is more logical to use int which is "the natural size for integer on the host" and may help future evolution if new flags are added; The array is created with an initial size consistent with the number of element we feed it with in 'makeWindowFlagsArray', this avoids a bunch of realloc; Fixed the type conversion that was not right, as pointed by clang. Signed-off-by: Christophe CURIS <christophe.cu...@free.fr> diff --git a/src/switchpanel.c b/src/switchpanel.c index 98a296d3..16083658 100644 --- a/src/switchpanel.c +++ b/src/switchpanel.c @@ -109,8 +109,8 @@ static void changeImage(WSwitchPanel *panel, int idecks, int selected, Bool dim, { WMFrame *icon = NULL; RImage *image = NULL; - char flags = 0; - char desired = 0; + int flags; + int desired = 0; /* This whole function is a no-op if we aren't drawing the panel */ if (!wPreferences.swtileImage) @@ -118,7 +118,7 @@ static void changeImage(WSwitchPanel *panel, int idecks, int selected, Bool dim, icon = WMGetFromArray(panel->icons, idecks); image = WMGetFromArray(panel->images, idecks); - flags = (char) (uintptr_t) WMGetFromArray(panel->flags, idecks); + flags = (int) (uintptr_t) WMGetFromArray(panel->flags, idecks); if (selected) desired |= ICON_SELECTED; @@ -227,7 +227,7 @@ static void scrollIcons(WSwitchPanel *panel, int delta) for (i = panel->firstVisible; i < panel->firstVisible + panel->visibleCount; i++) { if (i == panel->current) continue; - dim = ((char) (uintptr_t) WMGetFromArray(panel->flags, i) & ICON_DIM); + dim = ((int) (uintptr_t) WMGetFromArray(panel->flags, i) & ICON_DIM); changeImage(panel, i, 0, dim, True); } } @@ -403,11 +403,11 @@ static WMArray *makeWindowListArray(WWindow *curwin, int include_unmapped, Bool static WMArray *makeWindowFlagsArray(int count) { - WMArray *flags = WMCreateArray(1); + WMArray *flags = WMCreateArray(count); int i; for (i = 0; i < count; i++) - WMAddToArray(flags, (char) 0); + WMAddToArray(flags, (void *) 0); return flags; } http://repo.or.cz/w/wmaker-crm.git/commit/51ad8b7dc1e9299c58675b650ccb17ab625fa0f2 commit 51ad8b7dc1e9299c58675b650ccb17ab625fa0f2 Author: Christophe CURIS <christophe.cu...@free.fr> Date: Fri May 9 21:29:09 2014 +0200 WINGs: Removed checks for code that can't fail In the function 'wdefaultspathfordomain' there was a check to make sure the generated path would fit in the allocated area, but this allocated area is sized precisely to fit the path, so it cannot fail. In the function 'getCurrentFileName' there were checks to make sure the generated result string would fit in the allocated area, but this allocated area is sized precisely to fit the path, so it cannot fail. Signed-off-by: Christophe CURIS <christophe.cu...@free.fr> diff --git a/WINGs/userdefaults.c b/WINGs/userdefaults.c index 876371d8..6b55e8cf 100644 --- a/WINGs/userdefaults.c +++ b/WINGs/userdefaults.c @@ -90,13 +90,10 @@ char *wdefaultspathfordomain(const char *domain) slen = strlen(gspath) + strlen(DEFAULTS_DIR) + strlen(domain) + 4; path = wmalloc(slen); - if (wstrlcpy(path, gspath, slen) >= slen || - wstrlcat(path, DEFAULTS_DIR, slen) >= slen || - wstrlcat(path, "/", slen) >= slen || - wstrlcat(path, domain, slen) >= slen) { - wfree(path); - return NULL; - } + strcpy(path, gspath); + strcat(path, DEFAULTS_DIR); + strcat(path, "/"); + strcat(path, domain); return path; } diff --git a/WINGs/wfilepanel.c b/WINGs/wfilepanel.c index 6dc8babb..0f128195 100644 --- a/WINGs/wfilepanel.c +++ b/WINGs/wfilepanel.c @@ -823,23 +823,14 @@ static char *getCurrentFileName(WMFilePanel * panel) slen = strlen(path) + strlen(file) + 1; ret = wmalloc(slen); - if (*file != '/' && - wstrlcat(ret, path, slen) >= slen) - goto error; + if (file[0] != '/') + strcpy(ret, path); - if (wstrlcat(ret, file, slen) >= slen) - goto error; + strcat(ret, file); wfree(file); wfree(path); return ret; - -error: - wfree(file); - wfree(path); - wfree(ret); - - return NULL; } http://repo.or.cz/w/wmaker-crm.git/commit/546c148ac0e834db43035e7aabc2afa26ee6103c commit 546c148ac0e834db43035e7aabc2afa26ee6103c Author: Christophe CURIS <christophe.cu...@free.fr> Date: Fri May 9 21:29:08 2014 +0200 WINGs: safer cleanup in the 'WMReleaseApplication' function The function would not behave correctly if called twice, and the library may re-use de-allocated pointers if calling WINGs functions after calling this function. The goal is for our library to behave as cleanly as possible, so that users may have a clearer hint in case of misuse on their side to debug the problem. Signed-off-by: Christophe CURIS <christophe.cu...@free.fr> diff --git a/WINGs/wapplication.c b/WINGs/wapplication.c index 1478ced9..90874c06 100644 --- a/WINGs/wapplication.c +++ b/WINGs/wapplication.c @@ -62,14 +62,18 @@ void WMReleaseApplication(void) { W_ReleaseNotificationCenter(); - if (WMApplication.applicationName) + if (WMApplication.applicationName) { wfree(WMApplication.applicationName); + WMApplication.applicationName = NULL; + } - for (i = 0; i < WMApplication.argc; i++) - wfree(WMApplication.argv[i]); + if (WMApplication.argv) { + for (i = 0; i < WMApplication.argc; i++) + wfree(WMApplication.argv[i]); - if (WMApplication.argv) wfree(WMApplication.argv); + WMApplication.argv = NULL; + } } void WMSetResourcePath(const char *path) http://repo.or.cz/w/wmaker-crm.git/commit/9ee94f8777d3b8e57911814cd07028115dc5e466 commit 9ee94f8777d3b8e57911814cd07028115dc5e466 Author: Christophe CURIS <christophe.cu...@free.fr> Date: Fri May 9 21:29:07 2014 +0200 WINGs: removed unused variable in syslog messaging code As pointed by the commpiler, the variable 'syslog_prefix' is not used in the code, so it is removed. Signed-off-by: Christophe CURIS <christophe.cu...@free.fr> diff --git a/WINGs/error.c b/WINGs/error.c index d61621fb..739fa5e7 100644 --- a/WINGs/error.c +++ b/WINGs/error.c @@ -74,7 +74,6 @@ void __wmessage(const char *func, const char *file, int line, int type, const ch int truncated = 0; #ifdef HAVE_SYSLOG int syslog_priority = LOG_INFO; - const char *syslog_prefix = "INFO"; #endif if (linemax == 0) { @@ -107,21 +106,18 @@ void __wmessage(const char *func, const char *file, int line, int type, const ch strncat(buf, _("fatal: "), linemax - 1 - strlen(buf)); #ifdef HAVE_SYSLOG syslog_priority = LOG_CRIT; - syslog_prefix = "FATAL"; #endif break; case WMESSAGE_TYPE_ERROR: strncat(buf, _("error: "), linemax - 1 - strlen(buf)); #ifdef HAVE_SYSLOG syslog_priority = LOG_ERR; - syslog_prefix = "ERROR"; #endif break; case WMESSAGE_TYPE_WARNING: strncat(buf, _("warning: "), linemax - 1 - strlen(buf)); #ifdef HAVE_SYSLOG syslog_priority = LOG_WARNING; - syslog_prefix = "WARNING"; #endif break; case WMESSAGE_TYPE_MESSAGE: http://repo.or.cz/w/wmaker-crm.git/commit/f5167ae12d15384e809a0e3ffb28840ee3b61264 commit f5167ae12d15384e809a0e3ffb28840ee3b61264 Author: Christophe CURIS <christophe.cu...@free.fr> Date: Fri May 9 21:29:06 2014 +0200 WUtil: Aligned msgid for error message translations against latest code Due to some old and recent patches, the msgid used for translating the error messages were not in line with the source code, now they are. Signed-off-by: Christophe CURIS <christophe.cu...@free.fr> diff --git a/WINGs/po/bg.po b/WINGs/po/bg.po index b901dd67..005c2366 100644 --- a/WINGs/po/bg.po +++ b/WINGs/po/bg.po @@ -29,16 +29,16 @@ msgid "Error %d" msgstr "Грешка %d" #: ../../WINGs/error.c:110 -msgid " warning: " +msgid "warning: " msgstr "внимание: " #: ../../WINGs/error.c:137 -msgid " fatal error: " -msgstr " критична грешка: " +msgid "fatal: " +msgstr "критична грешка: " #: ../../WINGs/error.c:163 ../../WINGs/error.c:192 -msgid " error: " -msgstr " грешка: " +msgid "error: " +msgstr "грешка: " #: ../../WINGs/findfile.c:48 #, c-format diff --git a/WINGs/po/ca.po b/WINGs/po/ca.po index 4add27c7..cf06ed1a 100644 --- a/WINGs/po/ca.po +++ b/WINGs/po/ca.po @@ -34,16 +34,16 @@ msgid "Error %d" msgstr "Error %d" #: ../../WINGs/error.c:110 -msgid " warning: " -msgstr ": atenció: " +msgid "warning: " +msgstr "atenció: " #: ../../WINGs/error.c:137 -msgid " fatal error: " -msgstr ": error fatal: " +msgid "fatal: " +msgstr "error fatal: " #: ../../WINGs/error.c:163 ../../WINGs/error.c:192 -msgid " error: " -msgstr ": error: " +msgid "error: " +msgstr "error: " #: ../../WINGs/findfile.c:48 #, c-format diff --git a/WINGs/po/cs.po b/WINGs/po/cs.po index 250ba060..336ed76a 100644 --- a/WINGs/po/cs.po +++ b/WINGs/po/cs.po @@ -68,16 +68,16 @@ msgid "Error %d" msgstr "Chyba %d" #: ../../WINGs/error.c:112 -msgid " warning: " -msgstr " varovíní: " +msgid "warning: " +msgstr "varovíní: " #: ../../WINGs/error.c:139 -msgid " fatal error: " -msgstr " fatální chyba: " +msgid "fatal: " +msgstr "fatální chyba: " #: ../../WINGs/error.c:165 ../../WINGs/error.c:194 -msgid " error: " -msgstr " chyba: " +msgid "error: " +msgstr "chyba: " #: ../../WINGs/findfile.c:50 #, c-format diff --git a/WINGs/po/de.po b/WINGs/po/de.po index 2673400c..e2fcc947 100644 --- a/WINGs/po/de.po +++ b/WINGs/po/de.po @@ -35,16 +35,16 @@ msgid "Error %d" msgstr "Fehler %d" #: ../../WINGs/error.c:110 -msgid " warning: " -msgstr " Warnung: " +msgid "warning: " +msgstr "warnung: " #: ../../WINGs/error.c:137 -msgid " fatal error: " -msgstr " fataler Fehler: " +msgid "fatal: " +msgstr "fataler Fehler: " #: ../../WINGs/error.c:163 ../../WINGs/error.c:192 -msgid " error: " -msgstr " Fehler: " +msgid "error: " +msgstr "fehler: " #: ../../WINGs/findfile.c:48 #, c-format diff --git a/WINGs/po/fr.po b/WINGs/po/fr.po index 6489b479..173f30c6 100644 --- a/WINGs/po/fr.po +++ b/WINGs/po/fr.po @@ -30,16 +30,16 @@ msgid "Error %d" msgstr "Erreur %d" #: ../../WINGs/error.c:110 -msgid " warning: " -msgstr " Avertissement : " +msgid "warning: " +msgstr "avertissement : " #: ../../WINGs/error.c:137 -msgid " fatal error: " -msgstr " erreur fatale : " +msgid "fatal: " +msgstr "erreur fatale : " #: ../../WINGs/error.c:163 ../../WINGs/error.c:192 -msgid " error: " -msgstr " erreur : " +msgid "error: " +msgstr "erreur : " #: ../../WINGs/findfile.c:48 #, c-format diff --git a/WINGs/po/hu.po b/WINGs/po/hu.po index 753edc44..d7debb85 100644 --- a/WINGs/po/hu.po +++ b/WINGs/po/hu.po @@ -25,7 +25,7 @@ msgid "error: " msgstr "hiba: " #: ../../../wmaker-crm/WINGs/error.c:131 -msgid "warn: " +msgid "warning: " msgstr "figyelmeztetés: " #: ../../../wmaker-crm/WINGs/findfile.c:58 diff --git a/WINGs/po/sk.po b/WINGs/po/sk.po index c45266c7..2aed0704 100644 --- a/WINGs/po/sk.po +++ b/WINGs/po/sk.po @@ -39,16 +39,16 @@ msgid "Error %d" msgstr "Chyba %d" #: ../../WINGs/error.c:110 -msgid " warning: " -msgstr " varovanie: " +msgid "warning: " +msgstr "varovanie: " #: ../../WINGs/error.c:137 -msgid " fatal error: " -msgstr " fatálna chyba: " +msgid "fatal: " +msgstr "fatálna chyba: " #: ../../WINGs/error.c:163 ../../WINGs/error.c:192 -msgid " error: " -msgstr " chyba: " +msgid "error: " +msgstr "chyba: " #: ../../WINGs/findfile.c:48 #, c-format ----------------------------------------------------------------------- Summary of changes: WINGs/error.c | 4 ---- WINGs/po/bg.po | 10 +++++----- WINGs/po/ca.po | 12 ++++++------ WINGs/po/cs.po | 12 ++++++------ WINGs/po/de.po | 12 ++++++------ WINGs/po/fr.po | 12 ++++++------ WINGs/po/hu.po | 2 +- WINGs/po/sk.po | 12 ++++++------ WINGs/userdefaults.c | 11 ++++------- WINGs/wapplication.c | 12 ++++++++---- WINGs/wfilepanel.c | 15 +++------------ WPrefs.app/WindowHandling.c | 12 ++++++------ WPrefs.app/po/bg.po | 2 +- WPrefs.app/po/ca.po | 4 ++-- WPrefs.app/po/cs.po | 2 +- WPrefs.app/po/de.po | 2 +- WPrefs.app/po/es.po | 2 +- WPrefs.app/po/fi.po | 2 +- WPrefs.app/po/fr.po | 2 +- WPrefs.app/po/it.po | 4 ++-- WPrefs.app/po/ja.po | 2 +- WPrefs.app/po/ko.po | 2 +- WPrefs.app/po/pt.po | 2 +- WPrefs.app/po/ru.po | 2 +- WPrefs.app/po/sk.po | 2 +- WPrefs.app/po/zh_CN.po | 2 +- WPrefs.app/po/zh_TW.po | 2 +- src/switchpanel.c | 12 ++++++------ test/wtest.c | 9 ++++++++- util/wmsetbg.c | 2 +- 30 files changed, 89 insertions(+), 94 deletions(-) repo.or.cz automatic notification. Contact project admin crma...@gmail.com if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive no reply. -- wmaker-crm.git ("The Window Maker window manager") -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.