mirror of
https://github.com/gryf/wmaker.git
synced 2026-01-06 13:54:12 +01:00
tomka's i18n fixes
This commit is contained in:
@@ -205,7 +205,7 @@ createPanel(Panel *p)
|
||||
WMSetButtonText(panel->wrapB, _("Always open submenus inside the screen, instead of scrolling.\nNote: this is annoying."));
|
||||
|
||||
panel->autoB = WMCreateSwitchButton(panel->optF);
|
||||
WMResizeWidget(panel->autoB, 440, 20);
|
||||
WMResizeWidget(panel->autoB, 440, 32);
|
||||
WMMoveWidget(panel->autoB, 25, 45);
|
||||
WMSetButtonText(panel->autoB, _("Scroll off-screen menus when pointer is moved over them."));
|
||||
|
||||
|
||||
@@ -94,26 +94,10 @@ typedef struct _Panel {
|
||||
|
||||
|
||||
|
||||
static char *modifierNames[] = {
|
||||
"Shift",
|
||||
"Lock",
|
||||
"Control",
|
||||
"Mod1",
|
||||
"Mod2",
|
||||
"Mod3",
|
||||
"Mod4",
|
||||
"Mod5"
|
||||
};
|
||||
static char *modifierNames[8];
|
||||
|
||||
|
||||
static char *buttonNames[] = {
|
||||
"None",
|
||||
"Btn1 (left)",
|
||||
"Btn2 (middle)",
|
||||
"Btn3 (right)",
|
||||
"Btn4",
|
||||
"Btn5"
|
||||
};
|
||||
static char *buttonNames[6];
|
||||
|
||||
|
||||
#define DELAY(i) ((i)*75+170)
|
||||
@@ -599,7 +583,7 @@ createPanel(Panel *p)
|
||||
WMReleaseFont(font);
|
||||
WMReleaseColor(color);
|
||||
}
|
||||
WMSetLabelText(panel->ddelaL, "msec");
|
||||
WMSetLabelText(panel->ddelaL, _("msec"));
|
||||
|
||||
WMMapSubwidgets(panel->ddelaF);
|
||||
|
||||
@@ -810,6 +794,22 @@ Panel*
|
||||
InitMouseSettings(WMScreen *scr, WMWidget *parent)
|
||||
{
|
||||
_Panel *panel;
|
||||
|
||||
modifierNames[0] = wstrdup(_("Shift"));
|
||||
modifierNames[1] = wstrdup(_("Lock"));
|
||||
modifierNames[2] = wstrdup(_("Control"));
|
||||
modifierNames[3] = wstrdup(_("Mod1"));
|
||||
modifierNames[4] = wstrdup(_("Mod2"));
|
||||
modifierNames[5] = wstrdup(_("Mod3"));
|
||||
modifierNames[6] = wstrdup(_("Mod4"));
|
||||
modifierNames[7] = wstrdup(_("Mod5"));
|
||||
|
||||
buttonNames[0] = wstrdup(_("None"));
|
||||
buttonNames[1] = wstrdup(_("Btn1 (left)"));
|
||||
buttonNames[2] = wstrdup(_("Btn2 (middle)"));
|
||||
buttonNames[3] = wstrdup(_("Btn3 (right)"));
|
||||
buttonNames[4] = wstrdup(_("Btn4"));
|
||||
buttonNames[5] = wstrdup(_("Btn5"));
|
||||
|
||||
panel = wmalloc(sizeof(_Panel));
|
||||
memset(panel, 0, sizeof(_Panel));
|
||||
|
||||
@@ -72,11 +72,16 @@ borderCallback(WMWidget *w, void *data)
|
||||
i = WMGetSliderValue(panel->borderS);
|
||||
|
||||
if (i == 0)
|
||||
WMSetLabelText(panel->borderL, "OFF");
|
||||
else {
|
||||
sprintf(buffer, "%i pixel%s", i, i>1 ? "s" : "");
|
||||
WMSetLabelText(panel->borderL, buffer);
|
||||
}
|
||||
sprintf(buffer, _("OFF"));
|
||||
else if (i == 1)
|
||||
sprintf(buffer, _("1 pixel"));
|
||||
else if (i <= 4)
|
||||
/* 2-4 */
|
||||
sprintf(buffer, _("%i pixels"), i);
|
||||
else
|
||||
/* >4 */
|
||||
sprintf(buffer, _("%i pixels "), i); /* note space! */
|
||||
WMSetLabelText(panel->borderL, buffer);
|
||||
}
|
||||
|
||||
|
||||
@@ -297,17 +302,17 @@ createPanel(Panel *p)
|
||||
WMSetSliderAction(panel->borderS, borderCallback, panel);
|
||||
|
||||
panel->borderL = WMCreateLabel(panel->borderF);
|
||||
WMResizeWidget(panel->borderL, 50, 15);
|
||||
WMResizeWidget(panel->borderL, 100, 15);
|
||||
WMMoveWidget(panel->borderL, 105, 20);
|
||||
|
||||
panel->lrB = WMCreateSwitchButton(panel->borderF);
|
||||
WMMoveWidget(panel->lrB, 20, 40);
|
||||
WMResizeWidget(panel->lrB, 90, 30);
|
||||
WMResizeWidget(panel->lrB, 100, 30);
|
||||
WMSetButtonText(panel->lrB, _("Left/Right"));
|
||||
|
||||
panel->tbB = WMCreateSwitchButton(panel->borderF);
|
||||
WMMoveWidget(panel->tbB, 120, 40);
|
||||
WMResizeWidget(panel->tbB, 90, 30);
|
||||
WMResizeWidget(panel->tbB, 100, 30);
|
||||
WMSetButtonText(panel->tbB, _("Top/Bottom"));
|
||||
|
||||
|
||||
|
||||
@@ -654,7 +654,7 @@ browseImageCallback(WMWidget *w, void *data)
|
||||
ipath = wstrdup(wgethomedir());
|
||||
|
||||
if (WMRunModalFilePanelForDirectory(opanel, panel->win, ipath,
|
||||
"Open Image", NULL)) {
|
||||
_("Open Image"), NULL)) {
|
||||
char *path, *fullpath;
|
||||
char *tmp, *tmp2;
|
||||
|
||||
@@ -935,7 +935,7 @@ SetTexturePanelTexture(TexturePanel *panel, char *name, proplist_t texture)
|
||||
updateTGradImage(panel);
|
||||
|
||||
updateSGradButtons(panel);
|
||||
} else wwarning("could not load file '%s': %s", panel->imageFile,
|
||||
} else wwarning(_("could not load file '%s': %s"), panel->imageFile,
|
||||
RMessageForError(RErrorCode));
|
||||
|
||||
/*...............................................*/
|
||||
@@ -1054,7 +1054,7 @@ SetTexturePanelTexture(TexturePanel *panel, char *name, proplist_t texture)
|
||||
|
||||
bad_texture:
|
||||
str = PLGetDescription(texture);
|
||||
wwarning("error creating texture %s", str);
|
||||
wwarning(_("error creating texture %s"), str);
|
||||
wfree(str);
|
||||
|
||||
}
|
||||
|
||||
@@ -397,8 +397,8 @@ createPanel(Panel *p)
|
||||
WMMoveWidget(panel->resL, 95, 20);
|
||||
|
||||
panel->resaB = WMCreateRadioButton(panel->resF);
|
||||
WMMoveWidget(panel->resaB, 130, 12);
|
||||
WMResizeWidget(panel->resaB, 70, 30);
|
||||
WMMoveWidget(panel->resaB, 130, 14);
|
||||
WMResizeWidget(panel->resaB, 70, 26);
|
||||
WMSetButtonText(panel->resaB, _("Resist"));
|
||||
|
||||
panel->resrB = WMCreateRadioButton(panel->resF);
|
||||
@@ -420,7 +420,7 @@ createPanel(Panel *p)
|
||||
panel->tranB = WMCreateSwitchButton(panel->tranF);
|
||||
WMMoveWidget(panel->tranB, 10, 5);
|
||||
WMResizeWidget(panel->tranB, 250, 30);
|
||||
WMSetButtonText(panel->tranB, _("Open dialogs in same workspace as their owners"));
|
||||
WMSetButtonText(panel->tranB, _("Open dialogs in same workspace\nas their owners"));
|
||||
|
||||
WMMapSubwidgets(panel->tranF);
|
||||
|
||||
|
||||
@@ -21,7 +21,6 @@ POTFILES = \
|
||||
$(top_builddir)/WPrefs.app/Menu.c \
|
||||
$(top_builddir)/WPrefs.app/MenuPreferences.c \
|
||||
$(top_builddir)/WPrefs.app/MouseSettings.c \
|
||||
$(top_builddir)/WPrefs.app/NoMenuAlert.c \
|
||||
$(top_builddir)/WPrefs.app/Paths.c \
|
||||
$(top_builddir)/WPrefs.app/Preferences.c \
|
||||
$(top_builddir)/WPrefs.app/TexturePanel.c \
|
||||
@@ -30,7 +29,6 @@ POTFILES = \
|
||||
$(top_builddir)/WPrefs.app/Workspace.c \
|
||||
$(top_builddir)/WPrefs.app/double.c \
|
||||
$(top_builddir)/WPrefs.app/editmenu.c \
|
||||
$(top_builddir)/WPrefs.app/MenuGuru.c \
|
||||
$(top_builddir)/WPrefs.app/xmodifier.c
|
||||
|
||||
SUFFIXES = .po .mo
|
||||
|
||||
@@ -20,5 +20,5 @@ ru.po Russian Igor P. Roboul <igor@srcso.sochi.su>
|
||||
de.po German Bernd Eggert <Bernd.Eggert@t-online.de>
|
||||
hu.po Hungarian Horvath Szabolcs <horvathsz@penguinpowered.com>
|
||||
bg.po Bulgarian Slavei Karadjov <slaff@exco.net>
|
||||
menu.sk Slovak judas@hell <tomka@oalevice.sk>
|
||||
sk.po Slovak judas@hell <tomka@oalevice.sk>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user