From 0204b30e847b7f4df6bae04fb50edb8ab8f32e2c Mon Sep 17 00:00:00 2001 From: Lucas Zawacki Date: Mon, 16 Jul 2012 22:37:12 -0300 Subject: [PATCH] joy.cpl: Added force feedback direction control. --- dlls/joy.cpl/joy.h | 7 +++++++ dlls/joy.cpl/joy.rc | 4 +++- dlls/joy.cpl/main.c | 51 +++++++++++++++++++++++++++++++++++---------------- po/ar.po | 6 ++++-- po/bg.po | 6 ++++-- po/ca.po | 6 ++++-- po/cs.po | 6 ++++-- po/da.po | 6 ++++-- po/de.po | 6 ++++-- po/el.po | 6 ++++-- po/en.po | 10 +++++++--- po/en_US.po | 10 +++++++--- po/eo.po | 6 ++++-- po/es.po | 6 ++++-- po/fa.po | 6 ++++-- po/fi.po | 6 ++++-- po/fr.po | 6 ++++-- po/he.po | 6 ++++-- po/hi.po | 6 ++++-- po/hu.po | 6 ++++-- po/it.po | 6 ++++-- po/ja.po | 6 ++++-- po/ko.po | 6 ++++-- po/lt.po | 6 ++++-- po/ml.po | 6 ++++-- po/nb_NO.po | 6 ++++-- po/nl.po | 6 ++++-- po/or.po | 6 ++++-- po/pa.po | 6 ++++-- po/pl.po | 6 ++++-- po/pt_BR.po | 6 ++++-- po/pt_PT.po | 6 ++++-- po/rm.po | 6 ++++-- po/ro.po | 6 ++++-- po/ru.po | 6 ++++-- po/sk.po | 6 ++++-- po/sl.po | 6 ++++-- po/sr_RS@cyrillic.po | 6 ++++-- po/sr_RS@latin.po | 6 ++++-- po/sv.po | 6 ++++-- po/te.po | 6 ++++-- po/th.po | 6 ++++-- po/tr.po | 6 ++++-- po/uk.po | 6 ++++-- po/wa.po | 6 ++++-- po/wine.pot | 6 ++++-- po/zh_CN.po | 6 ++++-- po/zh_TW.po | 6 ++++-- 48 files changed, 231 insertions(+), 109 deletions(-) diff --git a/dlls/joy.cpl/joy.h b/dlls/joy.cpl/joy.h index 13efe1be6a1..e40a71bc17f 100644 --- a/dlls/joy.cpl/joy.h +++ b/dlls/joy.cpl/joy.h @@ -59,6 +59,7 @@ struct JoystickData { int chosen_joystick; HWND buttons[TEST_MAX_BUTTONS]; HWND axes[TEST_MAX_AXES]; + HWND ff_axis; BOOL stop; }; @@ -90,6 +91,7 @@ struct JoystickData { #define IDC_FFSELECTCOMBO 2009 #define IDC_FFEFFECTLIST 2010 +#define IDC_FFAXIS 2011 /* constants */ #define TEST_POLL_TIME 100 @@ -110,6 +112,11 @@ struct JoystickData { #define TEST_AXIS_MIN -40 #define TEST_AXIS_MAX 40 +#define FF_AXIS_X 373 +#define FF_AXIS_Y 98 +#define FF_AXIS_SIZE_X 5 +#define FF_AXIS_SIZE_Y 5 + #define FF_PLAY_TIME 2*DI_SECONDS #define FF_PERIOD_TIME FF_PLAY_TIME/4 diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc index 0eb4378ca67..708518bf18f 100644 --- a/dlls/joy.cpl/joy.rc +++ b/dlls/joy.cpl/joy.rc @@ -62,7 +62,9 @@ FONT 8, "Ms Shell Dlg" COMBOBOX IDC_FFSELECTCOMBO, 5, 5, 100, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS LTEXT "Available Effects", IDC_STATIC, 10, 30, 100, 10 LISTBOX IDC_FFEFFECTLIST, 10, 40, 180, 70, WS_TABSTOP | WS_VSCROLL | LBS_NOTIFY - LTEXT "Press any button in the controller to activate the chosen effect.", IDC_STATIC, 10, 110, 210, 25 + LTEXT "Press any button in the controller to activate the chosen effect. The effect direction can be changed with the controller axis.", + IDC_STATIC, 10, 110, 210, 25 + GROUPBOX "Direction", IDC_STATIC, 220, 30, 60, 60 } #define WINE_FILENAME_STR "joy.cpl" diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 5c6ccb2a8f3..c8b4a270cfe 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -67,6 +67,7 @@ static BOOL CALLBACK enum_callback(const DIDEVICEINSTANCEW *instance, void *cont { struct JoystickData *data = context; struct Joystick *joystick; + DIPROPRANGE proprange; DIDEVCAPS caps; if (data->joysticks == NULL) @@ -92,6 +93,16 @@ static BOOL CALLBACK enum_callback(const DIDEVICEINSTANCEW *instance, void *cont if (joystick->forcefeedback) data->num_ff++; + /* Set axis range to ease the GUI visualization */ + proprange.diph.dwSize = sizeof(DIPROPRANGE); + proprange.diph.dwHeaderSize = sizeof(DIPROPHEADER); + proprange.diph.dwHow = DIPH_DEVICE; + proprange.diph.dwObj = 0; + proprange.lMin = TEST_AXIS_MIN; + proprange.lMax = TEST_AXIS_MAX; + + IDirectInputDevice_SetProperty(joystick->device, DIPROP_RANGE, &proprange.diph); + return DIENUM_CONTINUE; } @@ -340,8 +351,6 @@ static void draw_joystick_buttons(HWND hwnd, struct JoystickData* data) static void draw_joystick_axes(HWND hwnd, struct JoystickData* data) { int i; - struct Joystick *joy; - DIPROPRANGE propRange; HINSTANCE hinst = (HINSTANCE) GetWindowLongPtrW(hwnd, GWLP_HINSTANCE); static const WCHAR button_class[] = {'B','u','t','t','o','n','\0'}; static const WCHAR axes_names[TEST_MAX_AXES][7] = { {'X',',','Y','\0'}, {'R','x',',','R','y','\0'}, @@ -349,20 +358,6 @@ static void draw_joystick_axes(HWND hwnd, struct JoystickData* data) static const DWORD axes_idc[TEST_MAX_AXES] = { IDC_TESTGROUPXY, IDC_TESTGROUPRXRY, IDC_TESTGROUPZRZ, IDC_TESTGROUPPOV }; - /* Set axis range to ease the GUI visualization */ - for (i = 0; i < data->num_joysticks; i++) - { - joy = &data->joysticks[i]; - propRange.diph.dwSize = sizeof(DIPROPRANGE); - propRange.diph.dwHeaderSize = sizeof(DIPROPHEADER); - propRange.diph.dwHow = DIPH_DEVICE; - propRange.diph.dwObj = 0; - propRange.lMin = TEST_AXIS_MIN; - propRange.lMax = TEST_AXIS_MAX; - - IDirectInputDevice_SetProperty(joy->device, DIPROP_RANGE, &propRange.diph); - } - for (i = 0; i < TEST_MAX_AXES; i++) { /* Set axis box name */ @@ -453,6 +448,17 @@ static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM * Joystick force feedback testing functions * */ +static void draw_ff_axis(HWND hwnd, struct JoystickData *data) +{ + HINSTANCE hinst = (HINSTANCE) GetWindowLongPtrW(hwnd, GWLP_HINSTANCE); + static WCHAR button_class[] = {'B','u','t','t','o','n','\0'}; + + /* Draw direction axis */ + data->ff_axis = CreateWindowW( button_class, NULL, WS_CHILD | WS_VISIBLE, + FF_AXIS_X, FF_AXIS_Y, + FF_AXIS_SIZE_X, FF_AXIS_SIZE_Y, + hwnd, (HMENU) IDC_FFAXIS, NULL, hinst); +} static void initialize_effects_list(HWND hwnd, struct Joystick* joy) { @@ -500,15 +506,26 @@ static DWORD WINAPI ff_input_thread(void *param) int i; struct Joystick *joy = &data->joysticks[data->chosen_joystick]; int chosen_effect = joy->chosen_effect; + DIEFFECT *dieffect; + DWORD flags = DIEP_AXES | DIEP_DIRECTION | DIEP_NORESTART; /* Skip this if we have no effects */ if (joy->num_effects == 0 || chosen_effect < 0) continue; poll_input(joy, &state); + /* Set ff parameters and draw the axis */ + dieffect = &joy->effects[chosen_effect].params; + dieffect->rgdwAxes[0] = state.lX; + dieffect->rgdwAxes[1] = state.lY; + + SetWindowPos(data->ff_axis, 0, FF_AXIS_X + state.lX, FF_AXIS_Y + state.lY, + 0, 0, SWP_NOZORDER | SWP_NOSIZE); + for (i=0; i < joy->num_buttons; i++) if (state.rgbButtons[i]) { + IDirectInputEffect_SetParameters(joy->effects[chosen_effect].effect, dieffect, flags); IDirectInputEffect_Start(joy->effects[chosen_effect].effect, 1, 0); break; } @@ -646,6 +663,8 @@ static INT_PTR CALLBACK ff_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp } } + draw_ff_axis(hwnd, data); + return TRUE; } diff --git a/po/ar.po b/po/ar.po index 6729491c357..240898bc612 100644 --- a/po/ar.po +++ b/po/ar.po @@ -635,7 +635,7 @@ msgstr "" msgid "Match &Case" msgstr "" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 #, fuzzy msgid "Direction" msgstr "معلومات" @@ -3433,7 +3433,9 @@ msgid "Available Effects" msgstr "" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/bg.po b/po/bg.po index 856e959a7c6..2591038c1af 100644 --- a/po/bg.po +++ b/po/bg.po @@ -642,7 +642,7 @@ msgstr "&Само цели думи" msgid "Match &Case" msgstr "&Чувствителен регистър" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Посока" @@ -3460,7 +3460,9 @@ msgid "Available Effects" msgstr "На&пред" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/ca.po b/po/ca.po index c26ea3b8eae..0816a38ad04 100644 --- a/po/ca.po +++ b/po/ca.po @@ -652,7 +652,7 @@ msgstr "Troba només paraules &completes" msgid "Match &Case" msgstr "&Distingir majúscules de minúscules" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Direcció" @@ -3510,7 +3510,9 @@ msgid "Available Effects" msgstr "Formats disponibles" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/cs.po b/po/cs.po index 042404ff927..045d79b4995 100644 --- a/po/cs.po +++ b/po/cs.po @@ -660,7 +660,7 @@ msgstr "Pouze &celá slova" msgid "Match &Case" msgstr "&Rozlišovat velikost" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Směr" @@ -3509,7 +3509,9 @@ msgid "Available Effects" msgstr "Dostupné formáty" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/da.po b/po/da.po index 6f034979cbb..b17f261f1b2 100644 --- a/po/da.po +++ b/po/da.po @@ -643,7 +643,7 @@ msgstr "&Kun hele ord" msgid "Match &Case" msgstr "Forskel på store/små &bogstaver" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Retning" @@ -3481,7 +3481,9 @@ msgid "Available Effects" msgstr "Tilgængelige formater" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/de.po b/po/de.po index 341cbf773b9..48a7ae145f9 100644 --- a/po/de.po +++ b/po/de.po @@ -635,7 +635,7 @@ msgstr "Nu&r ganzes Wort suchen" msgid "Match &Case" msgstr "Groß-/Klein&schreibung" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Suchrichtung" @@ -3468,7 +3468,9 @@ msgid "Available Effects" msgstr "Verfügbare Formate" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/el.po b/po/el.po index fbb74fbc1a7..a16f189a32b 100644 --- a/po/el.po +++ b/po/el.po @@ -620,7 +620,7 @@ msgstr "Ταίριασμα &Ολόκληρης Λέξης Μόνο" msgid "Match &Case" msgstr "Ταίριασμα &Κεφαλαίων" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Κατεύθυνση" @@ -3395,7 +3395,9 @@ msgid "Available Effects" msgstr "Δ&ιαθέσιμα κουμπιά:" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/en.po b/po/en.po index d5821dbc569..7e9861ee506 100644 --- a/po/en.po +++ b/po/en.po @@ -634,7 +634,7 @@ msgstr "Match &Whole Word Only" msgid "Match &Case" msgstr "Match &Case" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Direction" @@ -3457,8 +3457,12 @@ msgid "Available Effects" msgstr "Available Effects" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." -msgstr "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." +msgstr "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." #: joy.rc:28 msgid "Game Controllers" diff --git a/po/en_US.po b/po/en_US.po index 903658d74c2..ab944a93626 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -634,7 +634,7 @@ msgstr "Match &Whole Word Only" msgid "Match &Case" msgstr "Match &Case" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Direction" @@ -3459,8 +3459,12 @@ msgid "Available Effects" msgstr "Available Effects" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." -msgstr "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." +msgstr "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." #: joy.rc:28 msgid "Game Controllers" diff --git a/po/eo.po b/po/eo.po index 590b9b8fab7..a60e49e8815 100644 --- a/po/eo.po +++ b/po/eo.po @@ -625,7 +625,7 @@ msgstr "Nur tutan &vorton" msgid "Match &Case" msgstr "Atenti &Usklecon" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Direkto" @@ -3376,7 +3376,9 @@ msgid "Available Effects" msgstr "Disponeblaj formatoj" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/es.po b/po/es.po index 94f0235435f..c62262fb156 100644 --- a/po/es.po +++ b/po/es.po @@ -646,7 +646,7 @@ msgstr "Sólo &palabra completa" msgid "Match &Case" msgstr "&Mayúsculas/minúsculas" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Dirección" @@ -3495,7 +3495,9 @@ msgid "Available Effects" msgstr "Formatos disponibles" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/fa.po b/po/fa.po index 0aa6b87bfbf..9712cbe8b33 100644 --- a/po/fa.po +++ b/po/fa.po @@ -635,7 +635,7 @@ msgstr "" msgid "Match &Case" msgstr "" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 #, fuzzy msgid "Direction" msgstr "اطلاعات" @@ -3433,7 +3433,9 @@ msgid "Available Effects" msgstr "" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/fi.po b/po/fi.po index 4da181b3a43..d53d735a5f6 100644 --- a/po/fi.po +++ b/po/fi.po @@ -630,7 +630,7 @@ msgstr "&Koko sana" msgid "Match &Case" msgstr "Kirjaink&oko" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Suunta" @@ -3456,7 +3456,9 @@ msgid "Available Effects" msgstr "Mahdolliset muodot" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/fr.po b/po/fr.po index 12f9bff76d4..72723d28dac 100644 --- a/po/fr.po +++ b/po/fr.po @@ -638,7 +638,7 @@ msgstr "Mots &entiers seulement" msgid "Match &Case" msgstr "Respecter la &casse" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Direction" @@ -3485,7 +3485,9 @@ msgid "Available Effects" msgstr "Formats disponibles" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/he.po b/po/he.po index 891b181c973..12e3b5b35bb 100644 --- a/po/he.po +++ b/po/he.po @@ -641,7 +641,7 @@ msgstr "התאמת מילים &שלמות בלבד" msgid "Match &Case" msgstr "התאמת &רשיות" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "כיוון" @@ -3463,7 +3463,9 @@ msgid "Available Effects" msgstr "התבניות הזמינות" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/hi.po b/po/hi.po index be6cfa22f1b..b2dc1ed1a85 100644 --- a/po/hi.po +++ b/po/hi.po @@ -619,7 +619,7 @@ msgstr "" msgid "Match &Case" msgstr "" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "" @@ -3371,7 +3371,9 @@ msgid "Available Effects" msgstr "" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/hu.po b/po/hu.po index f3ad46139b2..c685dabd2ec 100644 --- a/po/hu.po +++ b/po/hu.po @@ -647,7 +647,7 @@ msgstr "Teljes &szavak keresése" msgid "Match &Case" msgstr "Kis/&nagybetű különbség" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Irány" @@ -3497,7 +3497,9 @@ msgid "Available Effects" msgstr "Elérhető formátumok" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/it.po b/po/it.po index 1ceeda23bc3..4190401d49d 100644 --- a/po/it.po +++ b/po/it.po @@ -653,7 +653,7 @@ msgstr "Solo parole &intere" msgid "Match &Case" msgstr "&Maiuscole/Minuscole" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Direzione" @@ -3510,7 +3510,9 @@ msgid "Available Effects" msgstr "Formati disponibili" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/ja.po b/po/ja.po index d345c798b70..82dc65461c4 100644 --- a/po/ja.po +++ b/po/ja.po @@ -635,7 +635,7 @@ msgstr "単語単位で検索(&W)" msgid "Match &Case" msgstr "大文字と小文字を区別する(&C)" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "検索する方向" @@ -3453,7 +3453,9 @@ msgid "Available Effects" msgstr "利用できる形式" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/ko.po b/po/ko.po index 09cbc37a646..70f0f6049a6 100644 --- a/po/ko.po +++ b/po/ko.po @@ -634,7 +634,7 @@ msgstr "단어 단위로(&W)" msgid "Match &Case" msgstr "대/소문자 구분(&C)" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "방향" @@ -3451,7 +3451,9 @@ msgid "Available Effects" msgstr "가능한 형식" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/lt.po b/po/lt.po index 4d11dc4b378..54aaef32ee5 100644 --- a/po/lt.po +++ b/po/lt.po @@ -634,7 +634,7 @@ msgstr "Tenkina tik &visas žodis" msgid "Match &Case" msgstr "Skirti raidžių &dydį" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Kryptis" @@ -3469,7 +3469,9 @@ msgid "Available Effects" msgstr "Galimi formatai" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/ml.po b/po/ml.po index 6a15883ffc6..85bd0ba33fe 100644 --- a/po/ml.po +++ b/po/ml.po @@ -619,7 +619,7 @@ msgstr "" msgid "Match &Case" msgstr "" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "" @@ -3371,7 +3371,9 @@ msgid "Available Effects" msgstr "" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/nb_NO.po b/po/nb_NO.po index 3ee22d35c41..29dc4707090 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -635,7 +635,7 @@ msgstr "Finn &kun hele ord" msgid "Match &Case" msgstr "Skill &mellom store og små bokstaver" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Retning" @@ -3607,7 +3607,9 @@ msgid "Available Effects" msgstr "Tilgjengelige formater" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/nl.po b/po/nl.po index b2a5d41a292..1555f23bd53 100644 --- a/po/nl.po +++ b/po/nl.po @@ -651,7 +651,7 @@ msgstr "Heel &woord" msgid "Match &Case" msgstr "Gelijke &hoofd-/kleine letters" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Zoekrichting" @@ -3524,7 +3524,9 @@ msgid "Available Effects" msgstr "Beschikbare formaten" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/or.po b/po/or.po index c62c66ff782..43f23fafe3f 100644 --- a/po/or.po +++ b/po/or.po @@ -619,7 +619,7 @@ msgstr "" msgid "Match &Case" msgstr "" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "" @@ -3371,7 +3371,9 @@ msgid "Available Effects" msgstr "" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/pa.po b/po/pa.po index c8627ea57d7..1dbfca4132c 100644 --- a/po/pa.po +++ b/po/pa.po @@ -619,7 +619,7 @@ msgstr "" msgid "Match &Case" msgstr "" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "" @@ -3371,7 +3371,9 @@ msgid "Available Effects" msgstr "" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/pl.po b/po/pl.po index b36492d1278..9514e9c7c75 100644 --- a/po/pl.po +++ b/po/pl.po @@ -640,7 +640,7 @@ msgstr "Uwzględniaj tylko całe &wyrazy" msgid "Match &Case" msgstr "&Uwzględniaj wielkość liter" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Kierunek" @@ -3481,7 +3481,9 @@ msgid "Available Effects" msgstr "Dostępne formaty" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/pt_BR.po b/po/pt_BR.po index 3e2e078bfe4..d8ea3f15fd1 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -652,7 +652,7 @@ msgstr "Palavra &Inteira" msgid "Match &Case" msgstr "&Maiúsculas/minúsculas" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Direção" @@ -3508,7 +3508,9 @@ msgid "Available Effects" msgstr "Formatos Disponíveis" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/pt_PT.po b/po/pt_PT.po index 010b3c0a9eb..4fcea3cd3c3 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -652,7 +652,7 @@ msgstr "Palavra &Inteira" msgid "Match &Case" msgstr "&Maiúsculas/minúsculas" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Direção" @@ -3507,7 +3507,9 @@ msgid "Available Effects" msgstr "Formatos Disponíveis" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/rm.po b/po/rm.po index d8c323e276a..dcb75007056 100644 --- a/po/rm.po +++ b/po/rm.po @@ -632,7 +632,7 @@ msgstr "" msgid "Match &Case" msgstr "" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "" @@ -3399,7 +3399,9 @@ msgid "Available Effects" msgstr "" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/ro.po b/po/ro.po index f8deac04c2b..3abd5100202 100644 --- a/po/ro.po +++ b/po/ro.po @@ -626,7 +626,7 @@ msgstr "&Numai cuvinte întregi" msgid "Match &Case" msgstr "Sensibil la registru" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Direcție" @@ -3467,7 +3467,9 @@ msgid "Available Effects" msgstr "Formate disponibile" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/ru.po b/po/ru.po index b0592cf265c..7db4d9f1430 100644 --- a/po/ru.po +++ b/po/ru.po @@ -635,7 +635,7 @@ msgstr "&Только слово целиком" msgid "Match &Case" msgstr "C &учетом регистра" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Направление" @@ -3474,7 +3474,9 @@ msgid "Available Effects" msgstr "Доступные форматы" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/sk.po b/po/sk.po index eb9deb9a814..69113483094 100644 --- a/po/sk.po +++ b/po/sk.po @@ -653,7 +653,7 @@ msgstr "Len &celé slová" msgid "Match &Case" msgstr "&Rozlišovať malé a veľké písmená" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Smer" @@ -3409,7 +3409,9 @@ msgid "Available Effects" msgstr "Dostupné formáty" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/sl.po b/po/sl.po index 3d0b81c9ce8..fad88ac0e6d 100644 --- a/po/sl.po +++ b/po/sl.po @@ -652,7 +652,7 @@ msgstr "&Samo cele besede" msgid "Match &Case" msgstr "&Razlikuj velikost črk" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Smer iskanja" @@ -3499,7 +3499,9 @@ msgid "Available Effects" msgstr "Razpoložljive oblike" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po index 9a7c1695dc4..9dec9ab1a12 100644 --- a/po/sr_RS@cyrillic.po +++ b/po/sr_RS@cyrillic.po @@ -642,7 +642,7 @@ msgstr "Пронађи само &целу реч" msgid "Match &Case" msgstr "Подударање &малих и великих слова" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Правац" @@ -3491,7 +3491,9 @@ msgid "Available Effects" msgstr "Н&апред" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index 7764f18627d..f7645cd510f 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -688,7 +688,7 @@ msgstr "" msgid "Match &Case" msgstr "" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 #, fuzzy msgid "Direction" msgstr "Opis" @@ -3569,7 +3569,9 @@ msgid "Available Effects" msgstr "N&apred" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/sv.po b/po/sv.po index 1c0a7fe262e..79dba33376f 100644 --- a/po/sv.po +++ b/po/sv.po @@ -633,7 +633,7 @@ msgstr "&Bara hela ord" msgid "Match &Case" msgstr "&Skillnad på stora/små bokstäver" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Riktning" @@ -3451,7 +3451,9 @@ msgid "Available Effects" msgstr "Tillgängliga format" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/te.po b/po/te.po index 4e00f1314e6..02f85ed3df8 100644 --- a/po/te.po +++ b/po/te.po @@ -619,7 +619,7 @@ msgstr "" msgid "Match &Case" msgstr "" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "" @@ -3371,7 +3371,9 @@ msgid "Available Effects" msgstr "" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/th.po b/po/th.po index d091d838d25..0482ea2af7a 100644 --- a/po/th.po +++ b/po/th.po @@ -620,7 +620,7 @@ msgstr "ตรงกันทุกตัวอักษร" msgid "Match &Case" msgstr "พิจารณาตัวเล็ก-ใหญ่" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "ทาง" @@ -3412,7 +3412,9 @@ msgid "Available Effects" msgstr "ทีเลือกได้:" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/tr.po b/po/tr.po index 68583bcf0bb..aea3e024c37 100644 --- a/po/tr.po +++ b/po/tr.po @@ -617,7 +617,7 @@ msgstr "Yalnızca &Tam Sözcükleri Bul" msgid "Match &Case" msgstr "BÜYÜK/küçük Harf &Duyarlı" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Yön" @@ -3366,7 +3366,9 @@ msgid "Available Effects" msgstr "Mevcut biçimler" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/uk.po b/po/uk.po index 432e9d29b91..dd84fab2c10 100644 --- a/po/uk.po +++ b/po/uk.po @@ -643,7 +643,7 @@ msgstr "&Лише слово цілком" msgid "Match &Case" msgstr "Враховувати &реґістр" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Напрям" @@ -3488,7 +3488,9 @@ msgid "Available Effects" msgstr "Доступні формати" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/wa.po b/po/wa.po index a2190d02a87..6f101c53dbe 100644 --- a/po/wa.po +++ b/po/wa.po @@ -628,7 +628,7 @@ msgstr "Mots &etîrs seulmint" msgid "Match &Case" msgstr "Rispecter les &madjuscules/minuscules" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "Direccion" @@ -3418,7 +3418,9 @@ msgid "Available Effects" msgstr "" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/wine.pot b/po/wine.pot index f9bfd13d5bf..c704a98232c 100644 --- a/po/wine.pot +++ b/po/wine.pot @@ -607,7 +607,7 @@ msgstr "" msgid "Match &Case" msgstr "" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "" @@ -3333,7 +3333,9 @@ msgid "Available Effects" msgstr "" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/zh_CN.po b/po/zh_CN.po index 309d8737ac8..5058fd7f18d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -634,7 +634,7 @@ msgstr "全字匹配(&W)" msgid "Match &Case" msgstr "区分大小写(&C)" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "方向" @@ -3386,7 +3386,9 @@ msgid "Available Effects" msgstr "可选格式" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 diff --git a/po/zh_TW.po b/po/zh_TW.po index 1f1df236a48..6a4da362f62 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -623,7 +623,7 @@ msgstr "全字拼寫須符合(&W)" msgid "Match &Case" msgstr "大小寫視為相異(&C)" -#: comdlg32.rc:317 +#: comdlg32.rc:317 joy.rc:67 msgid "Direction" msgstr "方向" @@ -3415,7 +3415,9 @@ msgid "Available Effects" msgstr "可用格式" #: joy.rc:65 -msgid "Press any button in the controller to activate the chosen effect." +msgid "" +"Press any button in the controller to activate the chosen effect. The effect " +"direction can be changed with the controller axis." msgstr "" #: joy.rc:28 -- 2.11.4.GIT