On Sun, 11 Apr 2010, Carlos R. Mafra wrote:
> This is odd, and maybe I am doing something wrong. But I checked that
> changing the other "non-label" strings indeed work, so it is definitely
> about the new labels.
>
> Hm?
about the only thing forgotten was to actually make shit call
gettext...
try with this please (i have hard time making anything i18n work, it
did work once, but it must have been an accident, because it hadn't
worked since...)
--
[-]
mkdir /nonexistent
diff --git a/WPrefs.app/FontSimple.c b/WPrefs.app/FontSimple.c
index 765a476..0ab3695 100644
--- a/WPrefs.app/FontSimple.c
+++ b/WPrefs.app/FontSimple.c
@@ -728,3 +728,4 @@ Panel *InitFontSimple(WMScreen * scr, WMWidget * parent)
return panel;
}
+
diff --git a/WPrefs.app/WPrefs.h b/WPrefs.app/WPrefs.h
index 2b1ff09..9933f7e 100644
--- a/WPrefs.app/WPrefs.h
+++ b/WPrefs.app/WPrefs.h
@@ -112,24 +112,10 @@ void AddDeadChildHandler(pid_t pid, void (*handler)(void*), void *data);
#define FRAME_WIDTH 524
#define FRAME_HEIGHT 235
-
-
/*
* Needed for HAVE_LIBINTL_H
*/
-#include "../src/config.h"
-
-#if HAVE_LIBINTL_H && I18N
-# include <libintl.h>
-# define _(text) gettext(text)
-# define N_(text) (text)
-#else
-# define _(text) (text)
-# define N_(text) (text)
-#endif
-
-#endif
-
-
+#include "../src/wconfig.h"
+#endif /* WPREFS_H_ */
diff --git a/src/wconfig.h.in b/src/wconfig.h.in
index f638327..c8bb947 100644
--- a/src/wconfig.h.in
+++ b/src/wconfig.h.in
@@ -409,8 +409,13 @@
#if defined(HAVE_LIBINTL_H) && defined(I18N)
#include <libintl.h>
#define _(text) gettext(text)
+/* Use N_() in initializers, it will make xgettext pick
+ * the string up for translation
+ */
+#define N_(text) (text)
#else
#define _(text) (text)
+#define N_(text) (text)
#endif
#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
diff --git a/util/po/Makefile.am b/util/po/Makefile.am
index 0984915..5bfc627 100644
--- a/util/po/Makefile.am
+++ b/util/po/Makefile.am
@@ -7,7 +7,8 @@ CLEANFILES = wmgenmenu.pot $(CATALOGS)
EXTRA_DIST = de.po
POTFILES = \
- $(top_builddir)/util/wmgenmenu.c
+ $(top_srcdir)/util/wmgenmenu.c \
+ $(top_srcdir)/util/wmgenmenu.h
SUFFIXES = .po .mo
@@ -39,3 +40,4 @@ install-data-local: $(CATALOGS)
$(INSTALL_DATA) -m 644 $$n $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES/wmgenmenu.mo; \
fi; \
done
+
diff --git a/util/wmgenmenu.c b/util/wmgenmenu.c
index 2fef1c9..e978d05 100644
--- a/util/wmgenmenu.c
+++ b/util/wmgenmenu.c
@@ -28,7 +28,7 @@ extern char *__progname;
char *path, *terminal = NULL;
-WMPropList *RMenu, *L1Menu, *L2Menu, *L3Menu;
+WMPropList *RMenu, *L1Menu, *L2Menu, *L3Menu, *L4Menu;
int main(int argc, char *argv[])
{
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
#endif
/*
- * The menu generated is a four-level hierarchy, of which the
+ * The menu generated is a five-level hierarchy, of which the
* top level (RMenu) is only used to hold the others (a single
* PLString, which will be the title of the root menu)
*
@@ -93,11 +93,13 @@ int main(int argc, char *argv[])
*
*/
+ /* Root */
RMenu = WMCreatePLArray(WMCreatePLString(_("Window Maker")), NULL);
+ /* Root -> Applications */
L1Menu = WMCreatePLArray(WMCreatePLString(_("Applications")), NULL);
- /* Submenus in Applications */
+ /* Root -> Applications -> <category> */
find_and_write(_("Terminals"), Terminals, 1); /* always keep terminals the top item */
find_and_write(_("Internet"), Internet, 0);
find_and_write(_("Email"), Email, 0);
@@ -117,7 +119,7 @@ int main(int argc, char *argv[])
find_and_write(_("System"), System, 0);
find_and_write(_("Video"), Video, 0);
find_and_write(_("Chat and Talk"), Chat, 0);
- find_and_write(_("P2P-Network"), P2P, 0);
+ find_and_write(_("P2P Network"), P2P, 0);
find_and_write(_("Games"), Games, 0);
find_and_write(_("OpenSUSE"), OpenSUSE, 0);
find_and_write(_("Mandriva"), Mandriva, 0);
@@ -133,8 +135,10 @@ int main(int argc, char *argv[])
);
WMAddToPLArray(RMenu, L1Menu);
- /* Appearance-related items */
+ /* Root -> Appearance */
L1Menu = WMCreatePLArray(WMCreatePLString(_("Appearance")), NULL);
+
+ /* Root -> Appearance -> Themes */
L2Menu = WMCreatePLArray(
WMCreatePLString(_("Themes")),
WMCreatePLString("OPEN_MENU"),
@@ -143,22 +147,95 @@ int main(int argc, char *argv[])
);
WMAddToPLArray(L1Menu, L2Menu);
+ /* Root -> Appearance -> Styles */
L2Menu = WMCreatePLArray(
- WMCreatePLString(_("Icons")),
+ WMCreatePLString(_("Styles")),
WMCreatePLString("OPEN_MENU"),
- WMCreatePLString("-noext $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+ WMCreatePLString("-noext $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
NULL
);
WMAddToPLArray(L1Menu, L2Menu);
+ /* Root -> Appearance -> Icon Sets */
L2Menu = WMCreatePLArray(
- WMCreatePLString(_("Background")),
+ WMCreatePLString(_("Icon Sets")),
+ WMCreatePLString("OPEN_MENU"),
+ WMCreatePLString("-noext $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+ NULL
+ );
+ WMAddToPLArray(L1Menu, L2Menu);
+
+ /* Root -> Appearance -> Background */
+ L2Menu = WMCreatePLArray(WMCreatePLString(_("Background")), NULL);
+
+ /* Root -> Appearance -> Background -> Solid */
+ L3Menu = WMCreatePLArray(WMCreatePLString(_("Solid")), NULL);
+
+#define SOLID_BACK(label, colorspec) \
+ L4Menu = WMCreatePLArray( \
+ WMCreatePLString(label), \
+ WMCreatePLString("EXEC"), \
+ WMCreatePLString("wdwrite WindowMaker WorkspaceBack '(solid, \"" colorspec "\")'"), \
+ NULL \
+ ); \
+ WMAddToPLArray(L3Menu, L4Menu)
+
+ /* Root -> Appearance -> Background -> Solid -> <color> */
+ SOLID_BACK(_("Black"), "black");
+ SOLID_BACK(_("Blue"), "#505075");
+ SOLID_BACK(_("Indigo"), "#243e6c");
+ SOLID_BACK(_("Bluemarine"), "#243e6c");
+ SOLID_BACK(_("Purple"), "#554466");
+ SOLID_BACK(_("Wheat"), "wheat4");
+ SOLID_BACK(_("Dark Gray"), "#333340");
+ SOLID_BACK(_("Wine"), "#400020");
+#undef SOLID_BACK
+ WMAddToPLArray(L2Menu, L3Menu);
+
+ /* Root -> Appearance -> Background -> Gradient */
+ L3Menu = WMCreatePLArray(WMCreatePLString(_("Gradient")), NULL);
+
+#define GRADIENT_BACK(label, fcolorspec, tcolorspec) \
+ L4Menu = WMCreatePLArray( \
+ WMCreatePLString(label), \
+ WMCreatePLString("EXEC"), \
+ WMCreatePLString("wdwrite WindowMaker WorkspaceBack '(vgradient, \"" \
+ fcolorspec "\", \"" tcolorspec "\"'"), \
+ NULL \
+ ); \
+ WMAddToPLArray(L3Menu, L4Menu)
+
+ /* Root -> Appearance -> Background -> Gradient -> <color> */
+ L4Menu = WMCreatePLArray(
+ WMCreatePLString(_("Sunset")),
+ WMCreatePLString("EXEC"),
+ WMCreatePLString("wdwrite WindowMaker WorkspaceBack "
+ "'(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
+ NULL
+ );
+ WMAddToPLArray(L3Menu, L4Menu);
+ GRADIENT_BACK(_("Sky"), "blue4", "white");
+ GRADIENT_BACK(_("Blue Shades"), "#7080a5", "#101020");
+ GRADIENT_BACK(_("Indigo Shades"), "#746ebc", "#242e4c");
+ GRADIENT_BACK(_("Purple Shades"), "#654c66", "#151426");
+ GRADIENT_BACK(_("Wheat Shades"), "#a09060", "#302010");
+ GRADIENT_BACK(_("Grey Shades"), "#636380", "#131318");
+ GRADIENT_BACK(_("Wine Shades"), "#600040", "#180010");
+#undef GRADIENT_BACK
+ WMAddToPLArray(L2Menu, L3Menu);
+
+ /* Root -> Appearance -> Background -> Images */
+ L3Menu = WMCreatePLArray(
+ WMCreatePLString(_("Images")),
WMCreatePLString("OPEN_MENU"),
WMCreatePLString("-noext $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"),
NULL
);
+ WMAddToPLArray(L2Menu, L3Menu);
+
WMAddToPLArray(L1Menu, L2Menu);
+ /* Root -> Appearance -> Save Theme */
L2Menu = WMCreatePLArray(
WMCreatePLString(_("Save Theme")),
WMCreatePLString("SHEXEC"),
@@ -168,8 +245,9 @@ int main(int argc, char *argv[])
);
WMAddToPLArray(L1Menu, L2Menu);
+ /* Root -> Appearance -> Save IconSet */
L2Menu = WMCreatePLArray(
- WMCreatePLString(_("Save Icons")),
+ WMCreatePLString(_("Save IconSet")),
WMCreatePLString("SHEXEC"),
WMCreatePLString("geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"
"\"%a(IconSet name,Name to save icon set as)\""),
@@ -178,7 +256,7 @@ int main(int argc, char *argv[])
WMAddToPLArray(L1Menu, L2Menu);
WMAddToPLArray(RMenu, L1Menu);
- /* Workspace-related items */
+ /* Root -> Workspaces */
L1Menu = WMCreatePLArray(
WMCreatePLString(_("Workspaces")),
WMCreatePLString("WORKSPACE_MENU"),
@@ -186,6 +264,7 @@ int main(int argc, char *argv[])
);
WMAddToPLArray(RMenu, L1Menu);
+ /* Root -> Workspace */
L1Menu = WMCreatePLArray(WMCreatePLString(_("Workspace")), NULL);
L2Menu = WMCreatePLArray(
WMCreatePLString(_("Hide Others")),
@@ -194,6 +273,7 @@ int main(int argc, char *argv[])
);
WMAddToPLArray(L1Menu, L2Menu);
+ /* Root -> Workspace -> Show All */
L2Menu = WMCreatePLArray(
WMCreatePLString(_("Show All")),
WMCreatePLString("SHOW_ALL"),
@@ -201,6 +281,7 @@ int main(int argc, char *argv[])
);
WMAddToPLArray(L1Menu, L2Menu);
+ /* Root -> Workspace -> Arrange Icons */
L2Menu = WMCreatePLArray(
WMCreatePLString(_("Arrange Icons")),
WMCreatePLString("ARRANGE_ICONS"),
@@ -208,6 +289,7 @@ int main(int argc, char *argv[])
);
WMAddToPLArray(L1Menu, L2Menu);
+ /* Root -> Workspace -> Refresh */
L2Menu = WMCreatePLArray(
WMCreatePLString(_("Refresh")),
WMCreatePLString("REFRESH"),
@@ -215,6 +297,7 @@ int main(int argc, char *argv[])
);
WMAddToPLArray(L1Menu, L2Menu);
+ /* Root -> Workspace -> Save Session */
L2Menu = WMCreatePLArray(
WMCreatePLString(_("Save Session")),
WMCreatePLString("SAVE_SESSION"),
@@ -222,6 +305,7 @@ int main(int argc, char *argv[])
);
WMAddToPLArray(L1Menu, L2Menu);
+ /* Root -> Workspace -> Clear Session */
L2Menu = WMCreatePLArray(
WMCreatePLString(_("Clear Session")),
WMCreatePLString("CLEAR_SESSION"),
@@ -230,7 +314,7 @@ int main(int argc, char *argv[])
WMAddToPLArray(L1Menu, L2Menu);
WMAddToPLArray(RMenu, L1Menu);
- /* Configuration-related items */
+ /* Root -> Configure Window Maker */
L1Menu = WMCreatePLArray(
WMCreatePLString(_("Configure Window Maker")),
WMCreatePLString("EXEC"),
@@ -239,6 +323,7 @@ int main(int argc, char *argv[])
);
WMAddToPLArray(RMenu, L1Menu);
+ /* Root -> Info Panel */
L1Menu = WMCreatePLArray(
WMCreatePLString(_("Info Panel")),
WMCreatePLString("INFO_PANEL"),
@@ -246,6 +331,7 @@ int main(int argc, char *argv[])
);
WMAddToPLArray(RMenu, L1Menu);
+ /* Root -> Restart Window Maker */
L1Menu = WMCreatePLArray(
WMCreatePLString(_("Restart Window Maker")),
WMCreatePLString("RESTART"),
@@ -253,10 +339,10 @@ int main(int argc, char *argv[])
);
WMAddToPLArray(RMenu, L1Menu);
- /* Other window managers */
+ /* Root -> Other Window Managers [-> <other window manager> ...] */
other_window_managers();
- /* XLock */
+ /* Root -> Lock Screen */
t = wfindfile(path, "xlock");
if (t) {
L1Menu = WMCreatePLArray(
@@ -269,7 +355,7 @@ int main(int argc, char *argv[])
wfree(t);
}
- /* Exit */
+ /* Root -> Exit Window Maker */
L1Menu = WMCreatePLArray(
WMCreatePLString(_("Exit Window Maker")),
WMCreatePLString("EXIT"),
@@ -307,10 +393,10 @@ static void find_and_write(char *group, char *list[][2], int this_is_terminals)
if (t) {
/* find a terminal to be used for cmnds that need a terminal */
if (this_is_terminals && !terminal)
- terminal = wstrdup(list[i][0]);
+ terminal = wstrdup(list[i][1]);
if (*(argv[argc-1]) != '!') {
L3Menu = WMCreatePLArray(
- WMCreatePLString(list[i][0]),
+ WMCreatePLString(_(list[i][0])),
WMCreatePLString("EXEC"),
WMCreatePLString(list[i][1]),
NULL
@@ -324,8 +410,9 @@ static void find_and_write(char *group, char *list[][2], int this_is_terminals)
while (ptr >= comm && (*ptr == '!' || isspace(*ptr)))
*ptr-- = '\0';
snprintf(buf, sizeof(buf), "%s -e %s", terminal ? terminal : "xterm" , comm);
+ /* Root -> Applications -> <category> -> <application> */
L3Menu = WMCreatePLArray(
- WMCreatePLString(list[i][0]),
+ WMCreatePLString(_(list[i][0])),
WMCreatePLString("EXEC"),
WMCreatePLString(buf),
NULL
@@ -365,7 +452,8 @@ static void other_window_managers(void)
while (other_wm[i][0]) {
t = wfindfile(path, other_wm[i][1]);
if (t) {
- snprintf(buf, sizeof(buf), _("Start %s"), other_wm[i][0]);
+ snprintf(buf, sizeof(buf), _("Start %s"), _(other_wm[i][0]));
+ /* Root -> Other Window Managers -> <other window manager> */
L2Menu = WMCreatePLArray(
WMCreatePLString(buf),
WMCreatePLString("RESTART"),
diff --git a/util/wmgenmenu.h b/util/wmgenmenu.h
index b1cf5a8..6c98aa6 100644
--- a/util/wmgenmenu.h
+++ b/util/wmgenmenu.h
@@ -6,384 +6,392 @@
*/
char *Terminals[MAX_NR_APPS][2] = {
- { "xterm", "xterm -bg black -fg white +sb +sm -fn 10x20 -sl 4000 -cr yellow" },
- { "mrxvt", "mrxvt -rv -shade 00 -vb +sb +sm -tr -sl 2000 -trt -itabbg black -hb -tabfg yellow -fn 10x20 -cr yellow" },
- { "Konsole", "konsole" },
+ { N_("xterm"), "xterm -bg black -fg white +sb +sm -fn 10x20 -sl 4000 -cr yellow" },
+ { N_("mrxvt"), "mrxvt -rv -shade 00 -vb +sb +sm -tr -sl 2000 -trt -itabbg black -hb -tabfg yellow -fn 10x20 -cr yellow" },
+ { N_("Konsole"), "konsole" },
{ NULL, NULL }
};
char *File_managers[MAX_NR_APPS][2] = {
- { "Dolphin", "dolphin" },
- { "Thunar", "thunar" },
- { "ROX filer", "rox" },
- { "GWorkspace", "GWorkspace" },
- { "Midnight Commander", "mc !" },
- { "XFTree", "xftree" },
- { "Konqueror", "konqueror" },
- { "Nautilus", "nautilus --no-desktop" },
- { "FSViewer", "fsviewer" },
- { "Xfe", "xfe" },
+ { N_("Dolphin"), "dolphin" },
+ { N_("Thunar"), "thunar" },
+ { N_("ROX filer"), "rox" },
+ { N_("GWorkspace"), "GWorkspace" },
+ { N_("Midnight Commander"), "mc !" },
+ { N_("XFTree"), "xftree" },
+ { N_("Konqueror"), "konqueror" },
+ { N_("Nautilus"), "nautilus --no-desktop" },
+ { N_("FSViewer"), "fsviewer" },
+ { N_("Xfe"), "xfe" },
{ NULL, NULL }
};
char *Mathematics[MAX_NR_APPS][2] = {
- { "Xmaxima", "xmaxima" },
- { "Maxima", "maxima !" },
- { "Maple", "maple" },
- { "Scilab", "scilab" },
- { "bc", "bc !" },
- { "KCalc", "kcalc" },
- { "XCalc", "xcalc" },
- { "Mathematica", "mathematica" },
- { "Math", "math" }, /* what's this? */
- { "Free42", "free42" },
- { "X48", "x48" },
+ { N_("Xmaxima"), "xmaxima" },
+ { N_("Maxima"), "maxima !" },
+ { N_("Maple"), "maple" },
+ { N_("Scilab"), "scilab" },
+ { N_("bc"), "bc !" },
+ { N_("KCalc"), "kcalc" },
+ { N_("XCalc"), "xcalc" },
+ { N_("Mathematica"), "mathematica" },
+ { N_("Math"), "math" }, /* command-line Mathematica */
+ { N_("Free42"), "free42" },
+ { N_("X48"), "x48" },
{ NULL, NULL }
};
char *Astronomy[MAX_NR_APPS][2] = {
- { "Xplns", "xplns" },
- { "Stellarium", "stellarium" },
+ { N_("Xplns"), "xplns" },
+ { N_("Stellarium"), "stellarium" },
{ NULL, NULL }
};
char *Graphics[MAX_NR_APPS][2] = {
- { "GIMP", "gimp" },
- { "Sodipodi", "sodipodi" },
- { "Inkscape", "inkscape" },
- { "KIllustrator", "killustrator" },
- { "Krayon", "krayon" },
- { "KPovModeler", "kpovmodeler" },
- { "XBitmap", "bitmap" },
- { "XPaint", "xpaint" },
- { "XFig", "xfig" },
- { "KPaint", "kpaint" },
- { "Blender", "blender" },
- { "KSnapshot", "ksnapshot" },
- { "GPhoto", "gphoto" },
- { "Dia", "dia" },
- { "CompuPic", "compupic" },
- { "GQview", "gqview" },
- { "Geeqie", "geeqie" },
- { "KView", "kview" },
- { "Pixie", "pixie" },
- { "ImageMagick Display", "display" },
- { "XV", "xv" },
- { "Eye of GNOME", "eog" },
- { "Quick Image Viewer", "qiv" },
+ { N_("GIMP"), "gimp" },
+ { N_("Sodipodi"), "sodipodi" },
+ { N_("Inkscape"), "inkscape" },
+ { N_("KIllustrator"), "killustrator" },
+ { N_("Krayon"), "krayon" },
+ { N_("KPovModeler"), "kpovmodeler" },
+ { N_("XBitmap"), "bitmap" },
+ { N_("XPaint"), "xpaint" },
+ { N_("XFig"), "xfig" },
+ { N_("KPaint"), "kpaint" },
+ { N_("Blender"), "blender" },
+ { N_("KSnapshot"), "ksnapshot" },
+ { N_("GPhoto"), "gphoto" },
+ { N_("Dia"), "dia" },
+ { N_("CompuPic"), "compupic" },
+ { N_("GQview"), "gqview" },
+ { N_("Geeqie"), "geeqie" },
+ { N_("KView"), "kview" },
+ { N_("Pixie"), "pixie" },
+ { N_("ImageMagick Display"), "display" },
+ { N_("XV"), "xv" },
+ { N_("Eye of GNOME"), "eog" },
+ { N_("Quick Image Viewer"), "qiv" },
{ NULL, NULL },
};
char *Multimedia[MAX_NR_APPS][2] = {
- { "Audacious", "audacious2" },
- { "Kaffeine", "kaffeine", },
- { "Audacity", "audacity" },
- { "XMMS", "xmms" },
- { "K9Copy", "k9copy" },
- { "AcidRip", "acidrip" },
- { "Avidemux", "avidemux2_gtk" },
- { "GQmpeg", "gqmpeg" },
- { "Freeamp", "freeamp" },
- { "RealPlayer", "realplay" },
- { "KMid", "kmid" },
- { "Kmidi", "kmidi" },
- { "Gtcd", "gtcd" },
- { "Grip", "grip" },
- { "AVIplay", "aviplay" },
- { "Gtv", "gtv" },
- { "VLC", "vlc" },
- { "Sinek", "sinek" },
- { "xine", "xine" },
- { "aKtion", "aktion" },
- { "Gcd", "gcd" },
- { "XawTV", "xawtv" },
- { "X-CD-Roast", "xcdroast" },
- { "XPlayCD", "xplaycd" },
+ { N_("Audacious"), "audacious2" },
+ { N_("Kaffeine"), "kaffeine", },
+ { N_("Audacity"), "audacity" },
+ { N_("XMMS"), "xmms" },
+ { N_("K9Copy"), "k9copy" },
+ { N_("AcidRip"), "acidrip" },
+ { N_("Avidemux"), "avidemux2_gtk" },
+ { N_("GQmpeg"), "gqmpeg" },
+ { N_("Freeamp"), "freeamp" },
+ { N_("RealPlayer"), "realplay" },
+ { N_("KMid"), "kmid" },
+ { N_("Kmidi"), "kmidi" },
+ { N_("Gtcd"), "gtcd" },
+ { N_("Grip"), "grip" },
+ { N_("AVIplay"), "aviplay" },
+ { N_("Gtv"), "gtv" },
+ { N_("VLC"), "vlc" },
+ { N_("Sinek"), "sinek" },
+ { N_("xine"), "xine" },
+ { N_("aKtion"), "aktion" },
+ { N_("Gcd"), "gcd" },
+ { N_("XawTV"), "xawtv" },
+ { N_("X-CD-Roast"), "xcdroast" },
+ { N_("XPlayCD"), "xplaycd" },
{ NULL, NULL}
};
char *Internet[MAX_NR_APPS][2] = {
- { "Chromium", "chromium" },
- { "Chromium", "chromium-browser" },
- { "Google Chrome", "google-chrome" },
- { "Mozilla Firefox", "firefox" },
- { "Galeon", "galeon" },
- { "SkipStone", "skipstone" },
- { "Konqueror", "konqueror" },
- { "Dillo", "dillo" },
- { "Epiphany", "epiphany" },
- { "Opera", "opera" },
- { "Midori", "midori" },
- { "Mozilla SeaMonkey", "seamonkey" },
- { "Kazehakase", "kazehakase" },
- { "Links", "links !" },
- { "Lynx", "lynx !" },
- { "W3M", "w3m !" },
+ { N_("Chromium"), "chromium" },
+ { N_("Chromium"), "chromium-browser" },
+ { N_("Google Chrome"), "google-chrome" },
+ { N_("Mozilla Firefox"), "firefox" },
+ { N_("Galeon"), "galeon" },
+ { N_("SkipStone"), "skipstone" },
+ { N_("Konqueror"), "konqueror" },
+ { N_("Dillo"), "dillo" },
+ { N_("Epiphany"), "epiphany" },
+ { N_("Opera"), "opera" },
+ { N_("Midori"), "midori" },
+ { N_("Mozilla SeaMonkey"), "seamonkey" },
+ { N_("Kazehakase"), "kazehakase" },
+ { N_("Links"), "links !" },
+ { N_("Lynx"), "lynx !" },
+ { N_("W3M"), "w3m !" },
{ NULL, NULL }
};
char *Email[MAX_NR_APPS][2] = {
- { "Mozilla Thunderbird", "thunderbird" },
- { "Mutt", "mutt !" },
- { "GNUMail", "GNUMail" },
- { "Evolution", "evolution" },
- { "Kleopatra", "kleopatra" },
- { "Sylpheed", "sylpheed" },
- { "Spruce", "spruce" },
- { "KMail", "kmail" },
- { "Exmh", "exmh" },
- { "Pine", "pine !" },
- { "ELM", "elm !" },
- { "Alpine", "alpine !" },
+ { N_("Mozilla Thunderbird"), "thunderbird" },
+ { N_("Mutt"), "mutt !" },
+ { N_("GNUMail"), "GNUMail" },
+ { N_("Evolution"), "evolution" },
+ { N_("Kleopatra"), "kleopatra" },
+ { N_("Sylpheed"), "sylpheed" },
+ { N_("Spruce"), "spruce" },
+ { N_("KMail"), "kmail" },
+ { N_("Exmh"), "exmh" },
+ { N_("Pine"), "pine !" },
+ { N_("ELM"), "elm !" },
+ { N_("Alpine"), "alpine !" },
{ NULL, NULL }
};
char *Sound[MAX_NR_APPS][2] = {
- { "soundKonverter", "soundkonverter" },
- { "Krecord", "krecord" },
- { "Grecord", "grecord" },
- { "ALSA mixer", "alsamixer !" },
- { "Sound configuration", "sndconfig !" },
- { "aumix", "aumix !" },
- { "Gmix", "gmix" },
+ { N_("soundKonverter"), "soundkonverter" },
+ { N_("Krecord"), "krecord" },
+ { N_("Grecord"), "grecord" },
+ { N_("ALSA mixer"), "alsamixer !" },
+ { N_("Sound configuration"), "sndconfig !" },
+ { N_("aumix"), "aumix !" },
+ { N_("Gmix"), "gmix" },
{ NULL, NULL }
};
char *Editors[MAX_NR_APPS][2] = {
- { "XJed", "xjed" },
- { "Jed", "jed !" },
- { "Emacs", "emacs" },
- { "XEmacs", "xemacs" },
- { "gVIM", "gvim" },
- { "vi", "vi !" },
- { "VIM", "vim !" },
- { "gedit", "gedit" },
- { "KEdit", "kedit" },
- { "XEdit", "xedit" },
- { "KWrite", "kwrite" },
- { "Kate", "kate" },
- { "Pico", "pico !" },
- { "Nano", "nano !" },
- { "Joe", "joe !" },
+ { N_("XJed"), "xjed" },
+ { N_("Jed"), "jed !" },
+ { N_("Emacs"), "emacs" },
+ { N_("XEmacs"), "xemacs" },
+ { N_("gVIM"), "gvim" },
+ { N_("vi"), "vi !" },
+ { N_("VIM"), "vim !" },
+ { N_("gedit"), "gedit" },
+ { N_("KEdit"), "kedit" },
+ { N_("XEdit"), "xedit" },
+ { N_("KWrite"), "kwrite" },
+ { N_("Kate"), "kate" },
+ { N_("Pico"), "pico !" },
+ { N_("Nano"), "nano !" },
+ { N_("Joe"), "joe !" },
{ NULL, NULL }
};
char *Comics[MAX_NR_APPS][2] = {
- { "Omnia data", "omnia_data" },
- { "Comix", "comix" },
- { "QComicBook", "qcomicbook" },
+ { N_("Omnia data"), "omnia_data" },
+ { N_("Comix"), "comix" },
+ { N_("QComicBook"), "qcomicbook" },
{ NULL, NULL }
};
char *Viewers[MAX_NR_APPS][2] = {
- { "Evince", "evince" },
- { "KGhostView", "kghostview" },
- { "gv", "gv" },
- { "GGv", "ggv" },
- { "Xdvi", "xdvi" },
- { "KDVI", "kdvi" },
- { "Xpdf", "xpdf" },
- { "Adobe Reader", "acroread" },
- { "Gless", "gless" },
+ { N_("Evince"), "evince" },
+ { N_("KGhostView"), "kghostview" },
+ { N_("gv"), "gv" },
+ { N_("GGv"), "ggv" },
+ { N_("Xdvi"), "xdvi" },
+ { N_("KDVI"), "kdvi" },
+ { N_("Xpdf"), "xpdf" },
+ { N_("Adobe Reader"), "acroread" },
+ { N_("Gless"), "gless" },
{ NULL, NULL }
};
char *Utilities[MAX_NR_APPS][2] = {
- { "Google Desktop", "gdlinux" },
- { "K3B", "k3b" },
- { "gtkfind", "gtkfind" },
- { "gdict", "gdict" },
- { "gpsdrive", "gpsdrive" },
- { "wfcmgr", "wfcmgr" },
- { "switch", "switch" },
- { "kaddressbook", "kaddressbook" },
- { "kab", "kab" },
- { "kfind", "kfind" },
- { "oclock", "oclock" },
- { "rclock", "rclock" },
- { "xclock", "xclock" },
- { "kppp", "kppp" },
+ { N_("Google Desktop"), "gdlinux" },
+ { N_("K3B"), "k3b" },
+ { N_("gtkfind"), "gtkfind" },
+ { N_("gdict"), "gdict" },
+ { N_("gpsdrive"), "gpsdrive" },
+ { N_("wfcmgr"), "wfcmgr" },
+ { N_("switch"), "switch" },
+ { N_("kaddressbook"), "kaddressbook" },
+ { N_("kab"), "kab" },
+ { N_("kfind"), "kfind" },
+ { N_("oclock"), "oclock" },
+ { N_("rclock"), "rclock" },
+ { N_("xclock"), "xclock" },
+ { N_("kppp"), "kppp" },
{ NULL, NULL }
};
char *Video[MAX_NR_APPS][2] = {
- { "kaffeine", "kaffeine" },
- { "gnomemeeting", "gnomemeeting" },
+ { N_("Kaffeine"), "kaffeine" },
+ { N_("Ekiga"), "Ekiga" },
{ NULL, NULL }
};
char *Chat[MAX_NR_APPS][2] = {
- { "Pidgin", "pidgin" },
- { "Skype", "skype" },
- { "Gizmo", "gizmo" },
- { "Kopete", "kopete" },
- { "XChat", "xchat" },
- { "KVIrc", "kvirc" },
- { "BitchX", "BitchX !" },
- { "EPIC", "epic !" },
- { "EPIC4", "epic4 !" },
- { "Irssi", "irssi !" },
- { "TinyIRC", "tinyirc !" },
- { "Ksirc", "ksirc" },
- { "gtalk", "gtalk" },
- { "GnomeICU", "gnome-icu" },
- { "Licq", "licq" },
- { "aMSN", "amsn" },
+ { N_("Pidgin"), "pidgin" },
+ { N_("Skype"), "skype" },
+ { N_("Gizmo"), "gizmo" },
+ { N_("Kopete"), "kopete" },
+ { N_("XChat"), "xchat" },
+ { N_("KVIrc"), "kvirc" },
+ { N_("BitchX"), "BitchX !" },
+ { N_("EPIC"), "epic !" },
+ { N_("EPIC4"), "epic4 !" },
+ { N_("Irssi"), "irssi !" },
+ { N_("TinyIRC"), "tinyirc !" },
+ { N_("Ksirc"), "ksirc" },
+ { N_("gtalk"), "gtalk" },
+ { N_("GnomeICU"), "gnome-icu" },
+ { N_("Licq"), "licq" },
+ { N_("aMSN"), "amsn" },
{ NULL, NULL }
};
char *P2P[MAX_NR_APPS][2] = {
- { "aMule", "amule" },
- { "gFTP", "gftp" },
- { "Smb4K", "smb4k" },
- { "KTorrent", "ktorrent" },
- { "bittorrent-gui", "bittorrent-gui" },
- { "ftp", "ftp !" },
- { "sftp", "sftp !" },
- { "pavuk", "pavuk" },
- { "gtm", "gtm !" },
- { "gnut", "gnut !" },
- { "gtk-gnutella", "gtk-gnutella" },
- { "gnutmeg", "gnutmeg" },
+ { N_("aMule"), "amule" },
+ { N_("gFTP"), "gftp" },
+ { N_("Smb4K"), "smb4k" },
+ { N_("KTorrent"), "ktorrent" },
+ { N_("BitTorrent GUI"), "bittorrent-gui" },
+ { N_("ftp"), "ftp !" },
+ { N_("sftp"), "sftp !" },
+ { N_("Pavuk"), "pavuk" },
+ { N_("gtm"), "gtm !" },
+ { N_("Gnut"), "gnut !" },
+ { N_("GTK Gnutella"), "gtk-gnutella" },
+ { N_("Gnutmeg"), "gnutmeg" },
{ NULL, NULL }
};
char *Games[MAX_NR_APPS][2] = {
- { "FlightGear Flight Simulator", "fgfs" },
- { "Tremulous", "tremulous" },
- { "xboard", "xboard" },
- { "gnome-chess", "gnome-chess" },
- { "Quake 2", "quake2" },
- { "Quake 3", "quake3" },
- { "q3ut2", "q3ut2" },
- { "Soldier of Fortune", "sof" },
- { "rune", "rune" },
- { "tribes2", "tribes2" },
- { "Unreal Tournament", "unreal" },
- { "descent3", "descent3" },
- { "myth2", "myth2" },
- { "rt2", "rt2" },
- { "heretic2", "heretic2" },
- { "kohan", "kohan" },
- { "xqf", "xqf" },
+ { N_("FlightGear Flight Simulator"), "fgfs" },
+ { N_("Tremulous"), "tremulous" },
+ { N_("XBoard"), "xboard" },
+ { N_("GNOME Chess"), "gnome-chess" },
+ { N_("Quake 2"), "quake2" },
+ { N_("Quake 3"), "quake3" },
+ { N_("Quake 3: Urban Terror 2"), "q3ut2" },
+ { N_("Soldier of Fortune"), "sof" },
+ { N_("Rune"), "rune" },
+ { N_("Tribes 2"), "tribes2" },
+ { N_("Unreal Tournament"), "unreal" },
+ { N_("Descent 3"), "descent3" },
+ { N_("Myth 2"), "myth2" },
+ { N_("Sauerbraten"), "sauerbraten" },
+ { N_("Sauerbraten"), "sauer_client" },
+ { N_("Railroad Tycoon 2"), "rt2" },
+ { N_("Heretic 2"), "heretic2" },
+ { N_("Kohan"), "kohan" },
+ { N_("XQF"), "xqf" },
{ NULL, NULL }
};
char *Office[MAX_NR_APPS][2] = {
- { "OpenOffice.org Writer", "oowriter" },
- { "OpenOffice.org Calc", "oocalc" },
- { "ooconfigimport", "ooconfigimport" },
- { "OpenOffice.org Draw", "oodraw" },
- { "OpenOffice.org Impress", "ooimpress" },
- { "OpenOffice.org Math", "oomath" },
- { "OpenOffice.org", "ooffice" },
- { "AbiWord", "abiword" },
- { "KWord", "kword" },
- { "smath", "smath" },
- { "swriterkpresenter", "swriterkpresenter" },
- { "LyX", "lyx" },
- { "Klyx", "klyx" },
- { "GnuCash", "gnucash" },
- { "Gnumeric", "gnumeric" },
- { "KSpread", "kspread" },
- { "kchart", "kchart" },
- { "GnomeCal", "gnomecal" },
- { "gnomecard", "gnomecard" },
- { "korganizer", "korganizer" },
+ { N_("OpenOffice.org Writer"), "oowriter" },
+ { N_("OpenOffice.org Calc"), "oocalc" },
+ { N_("OpenOffice.org Draw"), "oodraw" },
+ { N_("OpenOffice.org Impress"), "ooimpress" },
+ { N_("OpenOffice.org Math"), "oomath" },
+ { N_("OpenOffice.org"), "ooffice" },
+ { N_("StarOffice Writer"), "swriter" },
+ { N_("StarOffice Calc"), "scalc" },
+ { N_("StarOffice Draw"), "sdraw" },
+ { N_("StarOffice Impress"), "simpress" },
+ { N_("StarOffice Math"), "smath" },
+ { N_("StarOffice"), "soffice" },
+ { N_("AbiWord"), "abiword" },
+ { N_("KWord"), "kword" },
+ { N_("KPresenter"), "kpresenter" },
+ { N_("KSpread"), "kspread" },
+ { N_("KChart"), "kchart" },
+ { N_("KOrganizer"), "Korganizer" },
+ { N_("LyX"), "lyx" },
+ { N_("Klyx"), "klyx" },
+ { N_("GnuCash"), "gnucash" },
+ { N_("Gnumeric"), "gnumeric" },
+ { N_("GnomeCal"), "gnomecal" },
+ { N_("GnomeCard"), "gnomecard" },
{ NULL, NULL }
};
char *Development[MAX_NR_APPS][2] = {
- { "gitk", "gitk" },
- { "gitview", "gitview" },
- { "qgit", "qgit" },
- { "git-gui", "git-gui" },
- { "glimmer", "glimmer" },
- { "glade", "glade" },
- { "kdevelop", "kdevelop" },
- { "designer", "designer" },
- { "kbabel", "kbabel" },
- { "idle", "idle" },
- { "ghex", "ghex" },
- { "hexedit", "hexedit !" },
- { "memprof", "memprof" },
- { "tclsh", "tclsh !" },
- { "gdb", "gdb !" },
- { "xxgdb", "xxgdb" },
- { "xev", "xev !" },
+ { N_("gitk"), "gitk" },
+ { N_("gitview"), "gitview" },
+ { N_("qgit"), "qgit" },
+ { N_("git-gui"), "git-gui" },
+ { N_("glimmer"), "glimmer" },
+ { N_("glade"), "glade" },
+ { N_("kdevelop"), "kdevelop" },
+ { N_("designer"), "designer" },
+ { N_("kbabel"), "kbabel" },
+ { N_("idle"), "idle" },
+ { N_("ghex"), "ghex" },
+ { N_("hexedit"), "hexedit !" },
+ { N_("memprof"), "memprof" },
+ { N_("tclsh"), "tclsh !" },
+ { N_("gdb"), "gdb !" },
+ { N_("xxgdb"), "xxgdb" },
+ { N_("xev"), "xev !" },
{ NULL, NULL }
};
char *System[MAX_NR_APPS][2] = {
- { "Iotop", "iotop -d 4 --only !" },
- { "iostat", "iostat -p -k 5 !" },
- { "keybconf", "keybconf" },
- { "gtop", "gtop" },
- { "top", "top !" },
- { "kpm", "kpm" },
- { "gw", "gw" },
- { "gnomecc", "gnomecc" },
- { "gkrellm", "gkrellm" },
- { "tksysv", "tksysv" },
- { "ksysv", "ksysv" },
- { "gnome-ppp", "gnome-ppp" },
+ { N_("Iotop"), "iotop -d 4 --only !" },
+ { N_("Iostat"), "iostat -p -k 5 !" },
+ { N_("keybconf"), "keybconf" },
+ { N_("GNOME System Monitor"), "gtop" },
+ { N_("top"), "top !" },
+ { N_("KDE Process Monitor"), "kpm" },
+ { N_("gw"), "gw" },
+ { N_("GNOME Control Center"), "gnomecc" },
+ { N_("GKrellM"), "gkrellm" },
+ { N_("tksysv"), "tksysv" },
+ { N_("ksysv"), "ksysv" },
+ { N_("GNOME PPP"), "gnome-ppp" },
{ NULL, NULL }
};
char *OpenSUSE[MAX_NR_APPS][2] = {
- { "yast2", "yast2" },
- { "yast", "yast !" },
- { "systemsettings", "systemsettings" },
- { "umtsmon", "umtsmon" },
+ { N_("YaST 2"), "yast2" },
+ { N_("YaST"), "yast !" },
+ { N_("System Settings"), "systemsettings" },
+ { N_("UMTSMon"), "umtsmon" },
{ NULL, NULL }
};
char *Mandriva[MAX_NR_APPS][2] = {
- { "draknetcenter", "draknetcenter" },
- { "rpmdrake", "rpmdrake" },
- { "harddrake", "harddrake" },
- { "drakconf", "drakconf" },
- { "MandrakeUpdate", "MandrakeUpdate" },
- { "Xdrakres", "Xdrakres" },
+ { N_("DrakNetCenter"), "draknetcenter" },
+ { N_("RPMDrake"), "rpmdrake" },
+ { N_("HardDrake"), "harddrake" },
+ { N_("DrakConf"), "drakconf" },
+ { N_("MandrakeUpdate"), "MandrakeUpdate" },
+ { N_("XDrakRes"), "Xdrakres" },
{ NULL, NULL }
};
char *WindowMaker[MAX_NR_APPS][2] = {
- { "wmnet", "wmnet -d 100000 -Weth0" },
- { "wmpower", "wmpower" },
- { "wmlaptop2", "wmlaptop2" },
- { "wmwifi", "wmwifi -s" },
- { "wmifinfo", "wmifinfo" },
- { "wmWeather", "wmWeather" },
- { "wmstickynotes", "wmstickynotes" },
- { "wmmixer++", "wmmixer++ -w" },
- { "wmWeather", "wmWeather -m -s EDDB" },
- { "wmcpuload", "wmcpuload" },
- { "wmcpufreq", "wmcpufreq" },
- { "wmclockmon", "wmclockmon" },
- { "wmnd", "wmnd" },
- { "wmCalclock", "wmCalclock -S" },
- { "wmtime", "wmtime" },
- { "wmdate", "wmdate" },
- { "wmmon", "wmmon" },
- { "wmsysmon", "wmsysmon" },
- { "wmSMPmon", "wmSMPmon" },
- { "wmifs", "wmifs" },
- { "wmnd", "wmnd" },
- { "wmbutton", "wmbutton" },
- { "wmxmms", "wmxmms" },
- { "wmpower", "wmpower" },
- { "wmagnify", "wmagnify" },
+ { N_("Docker"), "docker -wmaker" },
+ { N_("WM Net"), "wmnet -d 100000 -Weth0" },
+ { N_("WM Power"), "wmpower" },
+ { N_("WM Laptop"), "wmlaptop2" },
+ { N_("WM WiFi"), "wmwifi -s" },
+ { N_("WM IfInfo"), "wmifinfo" },
+ { N_("WM Weather"), "wmWeather" },
+ { N_("WM Sticky Notes"), "wmstickynotes" },
+ { N_("WM Mixer"), "wmmixer++ -w" },
+ { N_("WM Weather"), "wmWeather -m -s EDDB" },
+ { N_("WM CPU Load"), "wmcpuload" },
+ { N_("WM CPU Freq"), "wmcpufreq" },
+ { N_("WM Clock Mon"), "wmclockmon" },
+ { N_("WM Network Devices"), "wmnd" },
+ { N_("WM Calendar & Clock"), "wmCalclock -S" },
+ { N_("WM Time"), "wmtime" },
+ { N_("WM Date"), "wmdate" },
+ { N_("WM System Monitor"), "wmmon" },
+ { N_("WM System Monitor"), "wmsysmon" },
+ { N_("WM SMP Monitor"), "wmSMPmon" },
+ { N_("WM Interfaces"), "wmifs" },
+ { N_("WM button"), "wmbutton" },
+ { N_("WM xmms"), "wmxmms" },
+ { N_("WM Power"), "wmpower" },
+ { N_("WM Magnify"), "wmagnify" },
{ NULL, NULL }
};
char *other_wm[MAX_WMS][2] = {
- { "IceWM", "icewm" },
- { "KWin", "kwin" },
- { "twm", "twm" },
- { "Fluxbox", "fluxbox" },
- { "Blackbox", "blackbox" },
- { "ion", "ion" },
- { "MWM", "mwm" },
+ { N_("IceWM"), "icewm" },
+ { N_("KWin"), "kwin" },
+ { N_("twm"), "twm" },
+ { N_("Fluxbox"), "fluxbox" },
+ { N_("Blackbox"), "blackbox" },
+ { N_("Ion"), "ion" },
+ { N_("Motif Window Manager"), "mwm" },
+ { N_("FVWM"), "fvwm" },
{ NULL, NULL }
};
+
