A few files were missing from the list of sources files to be translated. Took opportunity to make a few strings translatable.
Signed-off-by: Christophe CURIS <[email protected]> --- WPrefs.app/Appearance.c | 14 +++++++------- WPrefs.app/po/Makefile.am | 12 +++++++++--- WPrefs.app/xmodifier.c | 14 +++++++------- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c index 276933b..7bfbeb0 100644 --- a/WPrefs.app/Appearance.c +++ b/WPrefs.app/Appearance.c @@ -559,10 +559,10 @@ static Pixmap renderTexture(WMScreen * scr, WMPropList * texture, int width, int if (path) { timage = RLoadImage(rc, path, 0); if (!timage) - wwarning("could not load file '%s': %s", path, RMessageForError(RErrorCode)); + wwarning(_("could not load file '%s': %s"), path, RMessageForError(RErrorCode)); wfree(path); } else { - wwarning("could not find file '%s' for %s of texture", str, type); + wwarning(_("could not find file '%s' for texture type %s"), str, type); timage = NULL; } if (!timage) { @@ -610,7 +610,7 @@ static Pixmap renderTexture(WMScreen * scr, WMPropList * texture, int width, int style = RHorizontalGradient; break; default: - wwarning("unknow direction in '%s', falling back to diagonal", type); + wwarning(_("unknow direction in '%s', falling back to diagonal"), type); case 'D': style = RDiagonalGradient; break; @@ -636,7 +636,7 @@ static Pixmap renderTexture(WMScreen * scr, WMPropList * texture, int width, int style = RHorizontalGradient; break; default: - wwarning("unknow direction in '%s', falling back to diagonal", type); + wwarning(_("unknow direction in '%s', falling back to diagonal"), type); case 'D': style = RDiagonalGradient; break; @@ -670,7 +670,7 @@ static Pixmap renderTexture(WMScreen * scr, WMPropList * texture, int width, int style = RHorizontalGradient; break; default: - wwarning("unknow direction in '%s', falling back to diagonal", type); + wwarning(_("unknow direction in '%s', falling back to diagonal"), type); case 'D': style = RDiagonalGradient; break; @@ -717,7 +717,7 @@ static Pixmap renderTexture(WMScreen * scr, WMPropList * texture, int width, int break; default: - wwarning("type '%s' in not a supported type for a texture", type); + wwarning(_("type '%s' in not a supported type for a texture"), type); RReleaseImage(timage); return None; } @@ -1085,7 +1085,7 @@ static void deleteTexture(WMWidget * w, void *data) WMReleasePropList(titem->prop); if (titem->path) { if (remove(titem->path) < 0 && errno != ENOENT) { - werror("could not remove file %s", titem->path); + werror(_("could not remove file %s"), titem->path); } wfree(titem->path); } diff --git a/WPrefs.app/po/Makefile.am b/WPrefs.app/po/Makefile.am index 8656d33..a0a2bcb 100644 --- a/WPrefs.app/po/Makefile.am +++ b/WPrefs.app/po/Makefile.am @@ -15,7 +15,6 @@ POTFILES = \ $(top_srcdir)/WPrefs.app/Focus.c \ $(top_srcdir)/WPrefs.app/FontSimple.c \ $(top_srcdir)/WPrefs.app/Icons.c \ - $(top_srcdir)/WPrefs.app/KeyboardSettings.c \ $(top_srcdir)/WPrefs.app/KeyboardShortcuts.c \ $(top_srcdir)/WPrefs.app/Menu.c \ $(top_srcdir)/WPrefs.app/MenuPreferences.c \ @@ -23,11 +22,18 @@ POTFILES = \ $(top_srcdir)/WPrefs.app/Paths.c \ $(top_srcdir)/WPrefs.app/Preferences.c \ $(top_srcdir)/WPrefs.app/TexturePanel.c \ - $(top_srcdir)/WPrefs.app/Themes.c \ $(top_srcdir)/WPrefs.app/WPrefs.c \ $(top_srcdir)/WPrefs.app/WindowHandling.c \ $(top_srcdir)/WPrefs.app/Workspace.c \ - $(top_srcdir)/WPrefs.app/main.c + $(top_srcdir)/WPrefs.app/double.c \ + $(top_srcdir)/WPrefs.app/editmenu.c \ + $(top_srcdir)/WPrefs.app/main.c \ + $(top_srcdir)/WPrefs.app/xmodifier.c + +# not_yet_fully_implemented +# $(top_srcdir)/WPrefs.app/KeyboardSettings.c \ +# $(top_srcdir)/WPrefs.app/Themes.c \ +# SUFFIXES = .po .mo diff --git a/WPrefs.app/xmodifier.c b/WPrefs.app/xmodifier.c index 1845ada..5c4b261 100644 --- a/WPrefs.app/xmodifier.c +++ b/WPrefs.app/xmodifier.c @@ -122,21 +122,21 @@ static void x_reset_modifier_mapping(Display * display) XModifierKeymap *x_modifier_keymap; #define modwarn(name,old,other) \ - wwarning ("%s (0x%x) generates %s, which is generated by %s.", \ + wwarning(_("%s (0x%x) generates %s which is generated by %s"), \ name, code, index_to_name (old), other) #define modbarf(name,other) \ - wwarning ("%s (0x%x) generates %s, which is nonsensical.", \ + wwarning(_("%s (0x%x) generates %s which is nonsensical"), \ name, code, other) #define check_modifier(name,mask) \ if ((1<<modifier_index) != mask) \ - wwarning ("%s (0x%x) generates %s, which is nonsensical.", \ + wwarning(_("%s (0x%x) generates %s which is nonsensical"), \ name, code, index_to_name (modifier_index)) #define store_modifier(name,old) \ if (old && old != modifier_index) \ - wwarning ("%s (0x%x) generates both %s and %s, which is nonsensical.", \ + wwarning(_("%s (0x%x) generates both %s and %s which is nonsensical"), \ name, code, index_to_name (old), \ index_to_name (modifier_index)); \ if (modifier_index == ShiftMapIndex) modbarf (name,"ModShift"); \ @@ -157,7 +157,7 @@ static void x_reset_modifier_mapping(Display * display) x_modifier_keymap = XGetModifierMapping(display); if (x_modifier_keymap == NULL) { - wwarning("XGetModifierMapping returned NULL, there is no modifiers or no memory.\n"); + wwarning(_("XGetModifierMapping returned NULL, there is no modifiers or no memory")); return; } @@ -265,8 +265,8 @@ static void x_reset_modifier_mapping(Display * display) else if (mode_bit == alt_bit) warn = "Alt", alt_bit = 0; if (warn) { - wwarning("%s is being used for both Mode_switch and %s.", - index_to_name(mode_bit), warn); + wwarning(_("%s is being used for both %s and %s"), + index_to_name(mode_bit), "Mode_switch", warn); } } -- 2.1.4 -- To unsubscribe, send mail to [email protected].
