As pointed by the new script, a number of source file were not included in
the list of files to check for translations.
Took opportunity to make translatable a few of the messages.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
---
po/Makefile.am | 30 +++++++++++++++++++++++++++++-
src/actions.c | 14 ++++++++++++--
src/appmenu.c | 22 +++++++++++-----------
src/xmodifier.c | 8 ++++----
4 files changed, 56 insertions(+), 18 deletions(-)
diff --git a/po/Makefile.am b/po/Makefile.am
index 19dc080..3c5b013 100644
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -10,31 +10,59 @@ EXTRA_DIST = be.po bg.po bs.po ca.po cs.po da.po de.po
el.po es.po et.po \
no.po pl.po pt.po ro.po ru.po sk.po sv.po tr.po zh_CN.po zh_TW.po
POTFILES = \
+ $(top_srcdir)/src/actions.c \
$(top_srcdir)/src/appicon.c \
+ $(top_srcdir)/src/application.c \
+ $(top_srcdir)/src/appmenu.c \
+ $(top_srcdir)/src/balloon.c \
+ $(top_srcdir)/src/client.c \
+ $(top_srcdir)/src/colormap.c \
+ $(top_srcdir)/src/cycling.c \
$(top_srcdir)/src/defaults.c \
$(top_srcdir)/src/dialog.c \
$(top_srcdir)/src/dock.c \
$(top_srcdir)/src/dockedapp.c \
$(top_srcdir)/src/event.c \
$(top_srcdir)/src/framewin.c \
+ $(top_srcdir)/src/geomview.c \
$(top_srcdir)/src/icon.c \
$(top_srcdir)/src/main.c \
$(top_srcdir)/src/menu.c \
$(top_srcdir)/src/misc.c \
$(top_srcdir)/src/monitor.c \
+ $(top_srcdir)/src/motif.c \
+ $(top_srcdir)/src/moveres.c \
+ $(top_srcdir)/src/osdep_bsd.c \
+ $(top_srcdir)/src/osdep_darwin.c \
+ $(top_srcdir)/src/osdep_linux.c \
+ $(top_srcdir)/src/osdep_stub.c \
+ $(top_srcdir)/src/pixmap.c \
+ $(top_srcdir)/src/placement.c \
+ $(top_srcdir)/src/properties.c \
$(top_srcdir)/src/resources.c \
$(top_srcdir)/src/rootmenu.c \
$(top_srcdir)/src/screen.c \
$(top_srcdir)/src/session.c \
+ $(top_srcdir)/src/shutdown.c \
$(top_srcdir)/src/stacking.c \
$(top_srcdir)/src/startup.c \
+ $(top_srcdir)/src/superfluous.c \
+ $(top_srcdir)/src/switchpanel.c \
$(top_srcdir)/src/switchmenu.c \
$(top_srcdir)/src/texture.c \
+ $(top_srcdir)/src/usermenu.c \
+ $(top_srcdir)/src/wcore.c \
$(top_srcdir)/src/wdefaults.c \
$(top_srcdir)/src/window.c \
$(top_srcdir)/src/winmenu.c \
$(top_srcdir)/src/winspector.c \
- $(top_srcdir)/src/workspace.c
+ $(top_srcdir)/src/wmspec.c \
+ $(top_srcdir)/src/workspace.c \
+ $(top_srcdir)/src/wsmap.c \
+ $(top_srcdir)/src/xdnd.c \
+ $(top_srcdir)/src/xinerama.c \
+ $(top_srcdir)/src/xmodifier.c \
+ $(top_srcdir)/src/xutil.c
SUFFIXES = .po .mo
diff --git a/src/actions.c b/src/actions.c
index 1450fdb..4e87746 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -1053,7 +1053,8 @@ static WWindow *recursiveTransientFor(WWindow *wwin)
i--;
}
if (i == 0 && wwin) {
- wwarning("%s has a severely broken WM_TRANSIENT_FOR hint.",
wwin->frame->title);
+ wwarning(_("window \"%s\" has a severely broken
WM_TRANSIENT_FOR hint"),
+ wwin->frame->title);
return NULL;
}
@@ -1151,7 +1152,16 @@ void wIconifyWindow(WWindow *wwin)
set_icon_minipreview(wwin->icon,
mini_preview);
RReleaseImage(mini_preview);
} else {
- wwarning(_("window mini-preview
creation failed"));
+ const char *title;
+ char title_buf[32];
+
+ if (wwin->frame && wwin->frame->title) {
+ title = wwin->frame->title;
+ } else {
+ snprintf(title_buf,
sizeof(title_buf), "(id=0x%lx)", wwin->client_win);
+ title = title_buf;
+ }
+ wwarning(_("creation of mini-preview
failed for window \"%s\""), title);
}
}
}
diff --git a/src/appmenu.c b/src/appmenu.c
index 342cef3..2f2e971 100644
--- a/src/appmenu.c
+++ b/src/appmenu.c
@@ -91,11 +91,11 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win,
char **slist, int coun
char rtext[300];
if (sscanf(slist[*index], "%i %i %n", &command, &code, &pos) < 2 ||
command != wmBeginMenu) {
- wwarning("appmenu: bad menu entry \"%s\" in window %lx",
slist[*index], win);
+ wwarning(_("appmenu: bad menu entry \"%s\" in window %lx"),
slist[*index], win);
return NULL;
}
if (wstrlcpy(title, &slist[*index][pos], sizeof(title)) >=
sizeof(title)) {
- wwarning("appmenu: menu command size exceeded in window %lx",
win);
+ wwarning(_("appmenu: menu command size exceeded in window
%lx"), win);
return NULL;
}
menu = wMenuCreateForApp(scr, title, *index == 1);
@@ -107,7 +107,7 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win,
char **slist, int coun
if (sscanf(slist[*index], "%i", &command) != 1) {
wMenuDestroy(menu, True);
- wwarning("appmenu: bad menu entry \"%s\" in window
%lx", slist[*index], win);
+ wwarning(_("appmenu: bad menu entry \"%s\" in window
%lx"), slist[*index], win);
return NULL;
}
@@ -123,7 +123,7 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win,
char **slist, int coun
if (sscanf(slist[*index], "%i %i %i %i %n",
&command, &ecode, &etag, &enab,
&pos) != 4 || ecode != code) {
wMenuDestroy(menu, True);
- wwarning("appmenu: bad menu entry
\"%s\" in window %lx",
+ wwarning(_("appmenu: bad menu entry
\"%s\" in window %lx"),
slist[*index], win);
return NULL;
}
@@ -133,14 +133,14 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win,
char **slist, int coun
if (sscanf(slist[*index], "%i %i %i %i %s %n",
&command, &ecode, &etag, &enab,
rtext, &pos) != 5 || ecode != code) {
wMenuDestroy(menu, True);
- wwarning("appmenu: bad menu entry
\"%s\" in window %lx",
+ wwarning(_("appmenu: bad menu entry
\"%s\" in window %lx"),
slist[*index], win);
return NULL;
}
wstrlcpy(title, &slist[*index][pos],
sizeof(title));
}
if (!(data = malloc(sizeof(WAppMenuData)))) {
- wwarning("appmenu: out of memory making menu
for window %lx", win);
+ wwarning(_("appmenu: out of memory making menu
for window %lx"), win);
wMenuDestroy(menu, True);
return NULL;
}
@@ -150,7 +150,7 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win,
char **slist, int coun
entry = wMenuAddCallback(menu, title, notifyClient,
data);
if (!entry) {
wMenuDestroy(menu, True);
- wwarning("appmenu: out of memory creating menu
for window %lx", win);
+ wwarning(_("appmenu: out of memory creating
menu for window %lx"), win);
free(data);
return NULL;
}
@@ -169,7 +169,7 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win,
char **slist, int coun
if (sscanf(slist[*index], "%i %i %i %i %i %n",
&command, &ecode, &etag, &enab, &ncode,
&pos) != 5 || ecode != code) {
wMenuDestroy(menu, True);
- wwarning("appmenu: bad menu entry \"%s\" in
window %lx", slist[*index], win);
+ wwarning(_("appmenu: bad menu entry \"%s\" in
window %lx"), slist[*index], win);
return NULL;
}
@@ -183,7 +183,7 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win,
char **slist, int coun
if (!entry) {
wMenuDestroy(menu, True);
wMenuDestroy(submenu, True);
- wwarning("appmenu: out of memory creating menu
for window %lx", win);
+ wwarning(_("appmenu: out of memory creating
menu for window %lx"), win);
return NULL;
}
@@ -191,7 +191,7 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win,
char **slist, int coun
} else {
wMenuDestroy(menu, True);
- wwarning("appmenu: bad menu entry \"%s\" in window
%lx", slist[*index], win);
+ wwarning(_("appmenu: bad menu entry \"%s\" in window
%lx"), slist[*index], win);
return NULL;
}
}
@@ -215,7 +215,7 @@ WMenu *wAppMenuGet(WScreen * scr, Window window)
}
XFree(text_prop.value);
if (strcmp(slist[0], "WMMenu 0") != 0) {
- wwarning("appmenu: unknown version of WMMenu in window %lx:
%s", window, slist[0]);
+ wwarning(_("appmenu: unknown version of WMMenu in window %lx:
%s"), window, slist[0]);
XFreeStringList(slist);
return NULL;
}
diff --git a/src/xmodifier.c b/src/xmodifier.c
index 2fb246c..5208867 100644
--- a/src/xmodifier.c
+++ b/src/xmodifier.c
@@ -131,13 +131,13 @@ static void x_reset_modifier_mapping(Display * display)
inline void modwarn(const char *key_name, int
old_mod, const char *other_key)
{
- wwarning("key %s (0x%x) generates %s,
which is generated by %s",
+ wwarning(_("key %s (0x%x) generates %s,
which is generated by %s"),
key_name, code,
index_to_name(old_mod), other_key);
}
inline void modbarf(const char *key_name, const
char *other_mod)
{
- wwarning("key %s (0x%x) generates %s,
which is nonsensical",
+ wwarning(_("key %s (0x%x) generates %s,
which is nonsensical"),
key_name, code, other_mod);
}
@@ -150,7 +150,7 @@ static void x_reset_modifier_mapping(Display * display)
inline void store_modifier(const char
*key_name, int *old_mod)
{
if (*old_mod && *old_mod !=
modifier_index)
- wwarning("key %s (0x%x)
generates both %s and %s, which is nonsensical",
+ wwarning(_("key %s (0x%x)
generates both %s and %s, which is nonsensical"),
key_name, code,
index_to_name(*old_mod), index_to_name(modifier_index));
if (modifier_index == ShiftMapIndex) {
modbarf(key_name, "ModShift");
@@ -298,7 +298,7 @@ const char *wXModifierToShortcutLabel(int mask)
if (mask == MetaMask)
return "M+";
- wwarning("Can't convert keymask %d to shortcut label", mask);
+ wwarning(_("Can't convert keymask 0x%04X to a shortcut label"), mask);
return NULL;
}
--
2.1.4
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
