Quoth I,
Either way, since I raised the point I'm happy to go through and
replace all occurrences of the old terminology once we've decided.
The attached patch does just that.
>From b4bea1e6383cfbdde4e943f786cbf6f057fa9052 Mon Sep 17 00:00:00 2001
From: Iain Patterson <w...@iain.cx>
Date: Sun, 15 Jun 2014 08:52:55 +0100
Subject: [PATCH] Consistent terms for switch panel cycling.
The terms "switch panel" and "cycling" have been used in Window Maker
since time immemorial but have not always been applied consistently.
---
NEWS | 16 ++++++++--------
po/de.po | 4 ++--
po/es.po | 6 +++---
po/et.po | 4 ++--
po/hu.po | 4 ++--
po/hy.po | 2 +-
po/it.po | 2 +-
po/ja.po | 4 ++--
po/ko.po | 4 ++--
po/nl.po | 4 ++--
po/zh_TW.po | 2 +-
src/WindowMaker.h | 4 ++--
src/cycling.c | 2 +-
src/defaults.c | 2 +-
src/switchpanel.c | 2 +-
src/winspector.c | 2 +-
16 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/NEWS b/NEWS
index fa55d18..bd81b35 100644
--- a/NEWS
+++ b/NEWS
@@ -67,14 +67,14 @@ You can customize how you want your drawers to auto-expand/collapse and
auto-raise/lower, or you can also completely disable them.
-Improved switchpanel functionality
-----------------------------------
+Improved switch panel functionality
+-----------------------------------
-The switchpanel can be used to switch between windows of the same WM_CLASS,
-for example between all open xterms. If the switchpanel is opened as normal
+The switch panel can be used to switch between windows of the same WM_CLASS,
+for example between all open xterms. If the switch panel is opened as normal
with either the "FocusNextKey" or "FocusPrevKey" shortcut, you can switch to
the next (or previous) window of the same type as the focused window with the
-"GroupNextKey" or "GroupPrevKey" shortcut. If the switchpanel is opened with
+"GroupNextKey" or "GroupPrevKey" shortcut. If the switch panel is opened with
the "GroupNextKey" or "GroupPrevKey" shortcut, it will show only windows of
the same type as the window which was focused at the time the panel was opened,
and no difference will be seen between the two types of window selection
@@ -83,17 +83,17 @@ shortcut.
The new shortcuts can be configured in WPrefs, where they are described as
allowing switching between windows of the same group.
-To maintain consistency with other popular operating systems, the switchpanel
+To maintain consistency with other popular operating systems, the switch panel
is now configured so that it no longer automatically closes when the shift key
is pressed and released.
-To configure the switchpanel so that it does close on release of the shift
+To configure the switch panel so that it does close on release of the shift
key, which was the traditional Window Maker behavior, run the following
command:
$ wdwrite WindowMaker StrictWindozeCycling NO
-If you find yourself regularly opening the switchpanel just to visualize open
+If you find yourself regularly opening the switch panel just to visualize open
windows, you can run the following command to force the first "FocusNextKey"
or similar shortcut to open the panel without switching to a new window.
diff --git a/po/de.po b/po/de.po
index ec5ed3d..669f661 100644
--- a/po/de.po
+++ b/po/de.po
@@ -316,8 +316,8 @@ msgid "Could not load image \"%s\" for option \"%s\""
msgstr "Bild \"%s\"aus Eigenschaft \"%s\" konnte nicht geladen werden"
#: ../src/defaults.c:3142
-msgid "Invalid split sizes for SwitchPanel back image."
-msgstr "Ungültige Unterteilungsangaben für SwitchPanel-Hintergrundbild."
+msgid "Invalid split sizes for switch panel back image."
+msgstr "Ungültige Unterteilungsangaben für switch panel-Hintergrundbild."
#: ../src/defaults.c:3211
#, c-format
diff --git a/po/es.po b/po/es.po
index 88fabc1..7e087e2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -313,8 +313,8 @@ msgid "Could not load image \"%s\" for option \"%s\""
msgstr "No pudo cargar imagen \"%s\" para la opción \"%s\""
#: ../src/defaults.c:2915
-msgid "Invalid split sizes for SwitchPanel back image."
-msgstr "Tamaños de división no válidos para el fondo del SwitchPanel"
+msgid "Invalid split sizes for switch panel back image."
+msgstr "Tamaños de división no válidos para el fondo del switch panel"
#: ../src/defaults.c:2984
#, c-format
@@ -1646,7 +1646,7 @@ msgid "Do not show in the switch panel"
msgstr "No mostrar en panel de cambio de ventanas"
#: ../src/winspector.c:1373
-msgid "Do not include in switchpanel while alternating windows."
+msgid "Do not include in switch panel while cycling windows."
msgstr "No incluir en el panel de cambio de ventanas cuando las ventanas se alternen."
#: ../src/winspector.c:1376
diff --git a/po/et.po b/po/et.po
index 54857e3..0208f0e 100644
--- a/po/et.po
+++ b/po/et.po
@@ -312,7 +312,7 @@ msgid "Could not load image \"%s\" for option \"%s\""
msgstr "Pilti \"%s\" pole võtmele \"%s\" võimalik laadida"
#: ../src/defaults.c:2913
-msgid "Invalid split sizes for SwitchPanel back image."
+msgid "Invalid split sizes for switch panel back image."
msgstr ""
#: ../src/defaults.c:2982
@@ -1617,7 +1617,7 @@ msgid "Do not show in the switch panel"
msgstr "Aknavahetuse paneelil ei näidata"
#: ../src/winspector.c:1371
-msgid "Do not include in switchpanel while alternating windows."
+msgid "Do not include in switch panel while cycling windows."
msgstr "Akende vahetamisel ei näidata aknavahetuse paneelil."
#: ../src/winspector.c:1374
diff --git a/po/hu.po b/po/hu.po
index a07cca6..43418fe 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -302,7 +302,7 @@ msgid "Could not load image \"%s\" for option \"%s\""
msgstr "Nem tudtam betölteni a \"%s\" képet a \"%s\" opcióhoz"
#: ../../wmaker-crm/src/defaults.c:3296
-msgid "Invalid split sizes for SwitchPanel back image."
+msgid "Invalid split sizes for switch panel back image."
msgstr "Ãrvénytelen osztás méret a VáltóPanel háttér képéhez."
#: ../../wmaker-crm/src/defaults.c:3365
@@ -1713,7 +1713,7 @@ msgid "Do not show in the switch panel"
msgstr "Nem jelenik meg a váltó panelen"
#: ../../wmaker-crm/src/winspector.c:1423
-msgid "Do not include in switchpanel while alternating windows."
+msgid "Do not include in switch panel while cycling windows."
msgstr "Ne jelenÃtse meg a váltó panelen aktÃv ablak váltáskor."
#: ../../wmaker-crm/src/winspector.c:1426
diff --git a/po/hy.po b/po/hy.po
index 762eb7d..e2616f7 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -384,7 +384,7 @@ msgid "Could not load image \"%s\" for option \"%s\""
msgstr ""
#: ../src/defaults.c:3622
-msgid "Invalid split sizes for SwitchPanel back image."
+msgid "Invalid split sizes for switch panel back image."
msgstr ""
#: ../src/defaults.c:3695
diff --git a/po/it.po b/po/it.po
index af128a3..6f01593 100644
--- a/po/it.po
+++ b/po/it.po
@@ -326,7 +326,7 @@ msgid "Could not load image \"%s\" for option \"%s\""
msgstr "Impossibile caricare l'immagine \"%s\" per l'opzione \"%s\""
#: ../src/defaults.c:3567
-msgid "Invalid split sizes for SwitchPanel back image."
+msgid "Invalid split sizes for switch panel back image."
msgstr ""
#: ../src/defaults.c:3640
diff --git a/po/ja.po b/po/ja.po
index 887e67b..f0db60a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -300,7 +300,7 @@ msgid "Could not load image \"%s\" for option \"%s\""
msgstr "%s æå®ã§ç»åãèªã¿è¾¼ãã¾ãã: %s"
#: ../src/defaults.c:2913
-msgid "Invalid split sizes for SwitchPanel back image."
+msgid "Invalid split sizes for switch panel back image."
msgstr ""
#: ../src/defaults.c:2982
@@ -1602,7 +1602,7 @@ msgid "Do not show in the switch panel"
msgstr "ã¦ã£ã³ãã¦åæ¿ã«è¡¨ç¤ºããªã"
#: ../src/winspector.c:1373
-msgid "Do not include in switchpanel while alternating windows."
+msgid "Do not include in switch panel while cycling windows."
msgstr "ã¦ã£ã³ãã¦åæ¿ã«ãã®ã¦ã£ã³ãã¦ã表示ãã¾ãã."
#: ../src/winspector.c:1376
diff --git a/po/ko.po b/po/ko.po
index c8e1d33..d2455f7 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -293,7 +293,7 @@ msgid "Could not load image \"%s\" for option \"%s\""
msgstr "ë¤ì ìµì
ì¼ë¡ ì´ë¯¸ì§ \"%s\" 를 ì½ì§ 못íìµëë¤: \"%s\""
#: ../src/defaults.c:3103
-msgid "Invalid split sizes for SwitchPanel back image."
+msgid "Invalid split sizes for switch panel back image."
msgstr "ì¤ìì¹í¨ë ë°°ê²½ ì´ë¯¸ì§ì ë§ì§ ìë í¬ê¸°"
#: ../src/defaults.c:3172
@@ -1602,7 +1602,7 @@ msgid "Do not show in the switch panel"
msgstr "ì í í¨ëì ëì¤ì§ ìê² í¨"
#: ../src/winspector.c:1419
-msgid "Do not include in switchpanel while alternating windows."
+msgid "Do not include in switch panel while cycling windows."
msgstr "ì°½ì ë길 ë ì¤ìì¹í¨ëì í¬í¨íì§ ìëë¤."
#: ../src/winspector.c:1422
diff --git a/po/nl.po b/po/nl.po
index b93c5a9..c3ea0e2 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -290,7 +290,7 @@ msgid "Could not load image \"%s\" for option \"%s\""
msgstr "Kon afbeelding \"%s\" voor optie \"%s\" niet laden"
#: ../src/defaults.c:3300
-msgid "Invalid split sizes for SwitchPanel back image."
+msgid "Invalid split sizes for switch panel back image."
msgstr "Ongeldige deelafmetingen voor achterafbeelding schakelpaneel."
#: ../src/defaults.c:3369
@@ -1718,7 +1718,7 @@ msgid "Do not show in the switch panel"
msgstr "Niet in 't schakelpaneel tonen"
#: ../src/winspector.c:1423
-msgid "Do not include in switchpanel while alternating windows."
+msgid "Do not include in switch panel while cycling windows."
msgstr "Niet in schakelpaneel opnemen, bij wisselen van venster."
#: ../src/winspector.c:1426
diff --git a/po/zh_TW.po b/po/zh_TW.po
index fbe4579..e2ad8db 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -321,7 +321,7 @@ msgid "Could not load image \"%s\" for option \"%s\""
msgstr "ç¡æ³è¼å
¥é¸é
\"%2$s\"çå½±å \"%1$s\""
#: ../src/defaults.c:3567
-msgid "Invalid split sizes for SwitchPanel back image."
+msgid "Invalid split sizes for switch panel back image."
msgstr "ãåæé¢çãåºåçåå²å¤§å°ç¡æã"
#: ../src/defaults.c:3640
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index 012c98c..d021293 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -423,8 +423,8 @@ extern struct WPreferences {
int history_lines; /* history of "Run..." dialog */
char cycle_active_head_only; /* Cycle only windows on the active head */
char cycle_ignore_minimized; /* Ignore minimized windows when cycling */
- char strict_windoze_cycle; /* don't close switchpanel when shift is released */
- char panel_only_open; /* Only open the switchpanel; don't switch */
+ char strict_windoze_cycle; /* don't close switch panel when shift is released */
+ char panel_only_open; /* Only open the switch panel; don't switch */
/* All delays here are in ms. 0 means instant auto-action. */
int clip_auto_raise_delay; /* Delay after which the clip will be raised when entered */
diff --git a/src/cycling.c b/src/cycling.c
index 9331739..cdd4377 100644
--- a/src/cycling.c
+++ b/src/cycling.c
@@ -182,7 +182,7 @@ void StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next, Bool class_only)
} else if (ev.xkey.keycode == returnKey) {
- /* Close the switchpanel without eating the keypress */
+ /* Close the switch panel without eating the keypress */
done = True;
} else if (ev.xkey.keycode != shiftLKey && ev.xkey.keycode != shiftRKey) {
diff --git a/src/defaults.c b/src/defaults.c
index 2f4626f..266684b 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -3317,7 +3317,7 @@ static int setSwPOptions(WScreen * scr, WDefaultEntry * entry, void *tdata, void
if (cwidth <= 0 || cheight <= 0 ||
cwidth >= bgimage->width - 2 || cheight >= bgimage->height - 2)
- wwarning(_("Invalid split sizes for SwitchPanel back image."));
+ wwarning(_("Invalid split sizes for switch panel back image."));
else {
int i;
int swidth, theight;
diff --git a/src/switchpanel.c b/src/switchpanel.c
index 041e167..348d8cf 100644
--- a/src/switchpanel.c
+++ b/src/switchpanel.c
@@ -195,7 +195,7 @@ static void addIconForWindow(WSwitchPanel *panel, WMWidget *parent, WWindow *wwi
if (!image)
image = get_icon_image(panel->scr, wwin->wm_instance, wwin->wm_class, ICON_TILE_SIZE);
- /* We must resize the icon size (~64) to the switchpanel icon size (~48) */
+ /* We must resize the icon size (~64) to the switch panel icon size (~48) */
image = wIconValidateIconSize(image, ICON_SIZE);
WMAddToArray(panel->images, image);
diff --git a/src/winspector.c b/src/winspector.c
index f1289dd..641c7f6 100644
--- a/src/winspector.c
+++ b/src/winspector.c
@@ -1420,7 +1420,7 @@ static void create_tab_window_advanced(WWindow *wwin, InspectorPanel *panel, int
case 3:
caption = _("Do not show in the switch panel");
flag = WFLAGP(wwin, skip_switchpanel);
- descr = _("Do not include in switchpanel while alternating windows.");
+ descr = _("Do not include in switch panel while cycling windows.");
break;
case 4:
caption = _("Do not let it take focus");
--
1.9.0
