From 687641c8f25ccbe8a6b8d0c904a7864dbf28ddb5 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 11 May 2011 14:49:07 +0200 Subject: [PATCH] winecfg: Replace the old DXGrab option by the new fullscreen grab option. --- programs/winecfg/Bg.rc | 2 +- programs/winecfg/Cs.rc | 2 +- programs/winecfg/Da.rc | 2 +- programs/winecfg/De.rc | 2 +- programs/winecfg/En.rc | 2 +- programs/winecfg/Es.rc | 2 +- programs/winecfg/Fi.rc | 2 +- programs/winecfg/Fr.rc | 2 +- programs/winecfg/Hu.rc | 2 +- programs/winecfg/It.rc | 2 +- programs/winecfg/Ja.rc | 2 +- programs/winecfg/Ko.rc | 2 +- programs/winecfg/Lt.rc | 2 +- programs/winecfg/Nl.rc | 2 +- programs/winecfg/No.rc | 2 +- programs/winecfg/Pl.rc | 2 +- programs/winecfg/Pt.rc | 4 ++-- programs/winecfg/Ro.rc | 2 +- programs/winecfg/Ru.rc | 2 +- programs/winecfg/Si.rc | 2 +- programs/winecfg/Sr.rc | 2 +- programs/winecfg/Sv.rc | 2 +- programs/winecfg/Tr.rc | 2 +- programs/winecfg/Uk.rc | 2 +- programs/winecfg/Zh.rc | 4 ++-- programs/winecfg/resource.h | 2 +- programs/winecfg/x11drvdlg.c | 17 +++++++++-------- 27 files changed, 37 insertions(+), 36 deletions(-) diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc index 8d729f1a984..9e12757ba24 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc @@ -67,7 +67,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Íàñòðîéêà íà ïðîçîðöèòå ",IDC_STATIC,8,4,244,84 - CONTROL "Ðàçðåøè íà DirectX ïðèëîæåíèÿòà äà çàêëþ÷âàò ìèøêàòà",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Óïðàâëåíèåòî íà ïðîçîðöèòå îò ìåíèäæúðà íà ïðîçîðöè",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "Åìóëèðàé âèðòóàëåí ðàáîòåí ïëîò",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc index dd42f91505a..71fc00f0300 100644 --- a/programs/winecfg/Cs.rc +++ b/programs/winecfg/Cs.rc @@ -68,7 +68,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Nastavení oken ",IDC_STATIC,8,4,244,84 - CONTROL "Povolit aplikacím DirectX zadržet ukazatel myši ve svém oknì",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Povolit správci oken kontrolu nad okny",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "Emulace virtuálního desktopu",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc index 62596f2bdf6..ea9259802dc 100644 --- a/programs/winecfg/Da.rc +++ b/programs/winecfg/Da.rc @@ -65,7 +65,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Vindues indstillinger ",IDC_STATIC,8,4,244,84 - CONTROL "Tillad DirectX programmer at stoppe &musen i at forlade deres vindue",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Tillad vindues manageren at &dekorere vinduerne",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Tillad vindues manageren at styre vinduerne",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "Emulér et virtuel &skrivebord",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index be1aa7d836a..3e4ab43516f 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -64,7 +64,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Fenstereinstellungen ",IDC_STATIC,8,4,244,84 - CONTROL "DirectX-Anwendungen können &Maus einfangen",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Erlaube dem Fenstermanager die Fenster zu &dekorieren",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Erlaube dem Fenstermanager die &Fenster zu kontrollieren",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "&Emuliere einen virtuellen Bildschirm",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 126c3660af3..f3ad6c3bda7 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -64,7 +64,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Window Settings ",IDC_STATIC,8,4,244,84 - CONTROL "Allow DirectX apps to stop the &mouse leaving their window",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Allow the &window manager to control the windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "&Emulate a virtual desktop",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index e0465b40a6e..2507ec0d6d5 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -63,7 +63,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Configuración de ventanas ",IDC_STATIC,8,4,244,84 - CONTROL "Permitir a los programas DirectX retener el ratón en sus ventanas",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Permitir al gestor de ventanas decorar las ventanas",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Permitir al gestor de ventanas controlar las ventanas",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "Emular un escritorio virtual",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc index 0617f3e73d3..3cf26617aa0 100644 --- a/programs/winecfg/Fi.rc +++ b/programs/winecfg/Fi.rc @@ -63,7 +63,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Ikkuna-asetukset ",IDC_STATIC,8,4,244,84 - CONTROL "&Salli DirectX -sovellusten estää kursorin poistuminen ikkunasta",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Salli ikkunaohjelman hallita ikkunoita",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "&Emuloi virtuaalista töypöytää",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 7c3f638f594..64b3d2ac988 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -66,7 +66,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Paramètres des fenêtres ",IDC_STATIC,8,4,244,92 - CONTROL "Permettre aux applications DirectX d'&empêcher la souris de quitter leur fenêtre",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | BS_MULTILINE,15,16,230,16 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,16,230,16 CONTROL "Permettre au gestionnaire de fenêtres de &décorer les fenêtres",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,36,230,8 CONTROL "Permettre au gestionnaire de fenêtres de &contrôler les fenêtres",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,50,230,8 CONTROL "Émuler un bureau virtuel",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc index 7e9d59d2cb5..e02474d0433 100644 --- a/programs/winecfg/Hu.rc +++ b/programs/winecfg/Hu.rc @@ -62,7 +62,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Ablakbeállítások ",IDC_STATIC,8,4,244,84 - CONTROL "A DirectX-es alkalmazások ablakábol nem léphet ki az egérmutató",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Az ablakkezelõ kezelheti az ablakokat",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "Virtuális asztal emulálása",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index 9e9cacf5dd8..02da49b189f 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -66,7 +66,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Impostazioni delle finestre ",IDC_STATIC,8,4,244,84 - CONTROL "Le applicazioni Direct&X impediscono al mouse di lasciare la finestra",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Permetti al gestore delle finestre di &decorare le finestre",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Permetti al &gestore delle finestre di controllare le finestre",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "&Emula un desktop virtuale",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index c3f70f310ae..ba5f5fab143 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -67,7 +67,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 9, "MS Shell Dlg" BEGIN GROUPBOX " ウィンドウ設定 ",IDC_STATIC,8,4,244,84 - CONTROL "DirectX アプリケーションがマウスを確保するのを許可する(&M)",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "ウィンドウ マネージャがウィンドウを装飾するのを許可する(&D)",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "ウィンドウ マネージャがウィンドウを制御するのを許可する(&W)",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "仮想デスクトップをエミュレートする(&D)",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 38f7c37d9a5..2d1304718e2 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -68,7 +68,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 9, "MS Shell Dlg" BEGIN GROUPBOX " 창 설정 ",IDC_STATIC,8,4,244,84 - CONTROL "마우스 커서를 DirectX 프로그램 창안에 잡아두기(&M)",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "창관리자가 Wine창을 꾸미도록 함(&D)",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "창관리자가 Wine창을 관리하도록 함(&W)",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "가상 데스크탑 흉내내기(&E)",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc index d872b4da031..a17085b6946 100644 --- a/programs/winecfg/Lt.rc +++ b/programs/winecfg/Lt.rc @@ -65,7 +65,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Langų nuostatos ",IDC_STATIC,8,4,244,84 - CONTROL "Leisti DirectX programoms sulaikyti &žymeklį savo lange",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Leisti langų tvarkytuvei &dekoruoti langus",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Leisti langų tvarkytuvei kontroliuoti &langus",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "&Emuliuoti virtualų darbalaukį",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index d166a4810ec..625ee53ead0 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -66,7 +66,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Vensterinstellingen ",IDC_STATIC,8,4,244,84 - CONTROL "Een DirectX programma kan de muis in een venster vasthouden.",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Laat de window manager de vensters &decoreren",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Laat de window manager de vensters beheren",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "Emuleer een virtueel bureaublad",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index 61e1010951c..73ceb6d3e1b 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -65,7 +65,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Vinduinnstillinger ",IDC_STATIC,8,4,244,84 - CONTROL "Tillat DirectX-programmer å hindre musen fra å forlate vinduet",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Tillat vindusbehandleren å &dekorere vinduer",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Tillat vindusbehandleren å kontrollere vinduene",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "Vis et virtuelt skrivebord",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc index 53afde932f3..200e807de1c 100644 --- a/programs/winecfg/Pl.rc +++ b/programs/winecfg/Pl.rc @@ -66,7 +66,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Ustawienia okna ",IDC_STATIC,8,4,244,92 - CONTROL "Zezwalaj aplikacjom DirectX na zablokowanie opuszczania okna przez kursor &myszki",IDC_DX_MOUSE_GRAB,"Button",BS_MULTILINE|BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,16 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,16 CONTROL "Pozwól mened¿erowi okien &dekorowaæ okna",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 CONTROL "Pozwól mened¿erowi okien &zarz¹dzaæ oknami Wine",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,52,230,8 CONTROL "Emuluj wirtualny &pulpit",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc index 559d56e84a6..cdff87b6170 100644 --- a/programs/winecfg/Pt.rc +++ b/programs/winecfg/Pt.rc @@ -108,7 +108,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Configurações de Janela ",IDC_STATIC,8,4,244,84 - CONTROL "Permitir aos aplicativos DirectX impedir que o &mouse deixe a janela",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Permitir que o gerenciador de janelas &decore as janelas",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Permitir que o gerenciador de janelas controle as &janelas",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "&Emular uma área de trabalho virtual",IDC_ENABLE_DESKTOP,"Button", @@ -137,7 +137,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Definições da Janela ",IDC_STATIC,8,4,244,184 - CONTROL "Permitir às aplicações DirectX impedir que o &rato deixe a sua janela",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Permitit ao &gestor de janelas controlar as janelas",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "Emular um ecrã &virtual",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc index f80fd2bb06e..e3ea02bdf50 100644 --- a/programs/winecfg/Ro.rc +++ b/programs/winecfg/Ro.rc @@ -64,7 +64,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Setări de fereastră ",IDC_STATIC,8,4,244,84 - CONTROL "Permite aplicațiilor DirectX să rețină &mouse-ul în ferestră",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Permite administratorului de ferestre să &decoreze ferestrele",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Permite administratorului de ferestre să &administreze ferestrele",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "&Emulează un ecran virtual",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 21e73b696a9..1cdc71adcda 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -69,7 +69,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Настройки окна ",IDC_STATIC,8,4,244,84 - CONTROL "Разрешить приложению DirectX удерживать мышь в своём окне",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Разрешить менеджеру окон &декорировать окна",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Разрешить менеджеру окон управлять окнами Wine",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "Эмулировать виртуальный рабочий стол",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc index c12111d0f33..c5604c4f16f 100644 --- a/programs/winecfg/Si.rc +++ b/programs/winecfg/Si.rc @@ -64,7 +64,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Nastavitve oken ",IDC_STATIC,8,4,244,84 - CONTROL "Dovoli DirectX programom, da preprečijo &miški zapuščanje okna",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Dovoli upravljalniku oken, da okra&si okna",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Dovoli upravljalniku &oken, da upravlja z Wine-ovimi okni",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "Uporabi navidezni &zaslon",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/Sr.rc b/programs/winecfg/Sr.rc index 192b0d326e1..98cd62eb7c6 100644 --- a/programs/winecfg/Sr.rc +++ b/programs/winecfg/Sr.rc @@ -65,7 +65,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Podešavanje prozora ",IDC_STATIC,8,4,244,84 - CONTROL "Dozvoli DirectX aplikacijama da zaustave &miša da napuste njihov prozor.",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Dozvoli temi da &ukrasi prozor.",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Dozvoli &menadžeru prozora da upravlja prozorom.",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "&Emulacija veštačkog desktopa.",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc index 885f52a6509..10fc98a3007 100644 --- a/programs/winecfg/Sv.rc +++ b/programs/winecfg/Sv.rc @@ -62,7 +62,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Fönsterinställningar ",IDC_STATIC,8,4,244,84 - CONTROL "Tillåt DirectX-program att stoppa &musen som lämnar dess fönster",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Tillåt fönsterhanteraren att &dekorera fönstren",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Tillåt &fönsterhanteraren att styra fönstren",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "Emulera ett virtuellt skriv&bord",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc index 897f45d5279..13fcfb7027a 100644 --- a/programs/winecfg/Tr.rc +++ b/programs/winecfg/Tr.rc @@ -62,7 +62,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Pencere ayarlarý ",IDC_STATIC,8,4,244,84 - CONTROL "DirectX uygulamalarýnýn fareyi pencere içine kilitlemelerine izin ver",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Pencere yöneticisinin pencereleri yönetmesine izin ver",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "Sanal masaüstü kullan",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/Uk.rc b/programs/winecfg/Uk.rc index 5638975523f..c13941286f0 100644 --- a/programs/winecfg/Uk.rc +++ b/programs/winecfg/Uk.rc @@ -68,7 +68,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Параметри вікна ",IDC_STATIC,8,4,244,84 - CONTROL "Дозволити додаткам DirectX утримувати &мишу в своєму вікні",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Дозволити менеджеру вікон &декорувати вікна",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Дозволити менеджеру вікон &керувати вікнами",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "&Емулювати віртуальний робочий стіл",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc index ef151095e76..6c71fb85731 100644 --- a/programs/winecfg/Zh.rc +++ b/programs/winecfg/Zh.rc @@ -67,7 +67,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 9, "MS Shell Dlg" BEGIN GROUPBOX " 窗口设置 ",IDC_STATIC,8,4,244,84 - CONTROL "允许 DirectX 程序防止鼠标离开其窗口(&M)",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "允许窗口管理器装饰窗口(&D)",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "允许窗口管理器控制窗口(&W)",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "虚拟桌面(&D)",IDC_ENABLE_DESKTOP,"Button", @@ -248,7 +248,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 9, "MS Shell Dlg" BEGIN GROUPBOX " 視窗設定 ",IDC_STATIC,8,4,244,84 - CONTROL "允許 DirectX 程式防止游標離開它的視窗(&m)",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Automatically capture the mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "允許視窗管理器裝飾視窗(&d)",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "允許視窗管理器控制視窗(&w)",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "模擬一個虛擬桌面(&d)",IDC_ENABLE_DESKTOP,"Button", diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 3bed6aa70b2..f2306925a57 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -151,7 +151,7 @@ /* graphics */ #define IDC_ENABLE_MANAGED 1100 #define IDC_ENABLE_DECORATED 1101 -#define IDC_DX_MOUSE_GRAB 1102 +#define IDC_FULLSCREEN_GRAB 1102 #define IDC_USE_TAKE_FOCUS 1103 #define IDC_DOUBLE_BUFFER 1104 #define IDC_D3D_VSHADER_MODE 1105 diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index d3d7220e19d..4b9398b7753 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -135,11 +135,11 @@ static void init_dialog(HWND dialog) SendDlgItemMessage(dialog, IDC_DESKTOP_WIDTH, EM_LIMITTEXT, RES_MAXLEN, 0); SendDlgItemMessage(dialog, IDC_DESKTOP_HEIGHT, EM_LIMITTEXT, RES_MAXLEN, 0); - buf = get_reg_key(config_key, keypath("X11 Driver"), "DXGrab", "N"); + buf = get_reg_key(config_key, keypath("X11 Driver"), "GrabFullscreen", "N"); if (IS_OPTION_TRUE(*buf)) - CheckDlgButton(dialog, IDC_DX_MOUSE_GRAB, BST_CHECKED); + CheckDlgButton(dialog, IDC_FULLSCREEN_GRAB, BST_CHECKED); else - CheckDlgButton(dialog, IDC_DX_MOUSE_GRAB, BST_UNCHECKED); + CheckDlgButton(dialog, IDC_FULLSCREEN_GRAB, BST_UNCHECKED); HeapFree(GetProcessHeap(), 0, buf); buf = get_reg_key(config_key, keypath("X11 Driver"), "Managed", "Y"); @@ -264,11 +264,12 @@ static void on_enable_decorated_clicked(HWND dialog) { } } -static void on_dx_mouse_grab_clicked(HWND dialog) { - if (IsDlgButtonChecked(dialog, IDC_DX_MOUSE_GRAB) == BST_CHECKED) - set_reg_key(config_key, keypath("X11 Driver"), "DXGrab", "Y"); +static void on_fullscreen_grab_clicked(HWND dialog) +{ + if (IsDlgButtonChecked(dialog, IDC_FULLSCREEN_GRAB) == BST_CHECKED) + set_reg_key(config_key, keypath("X11 Driver"), "GrabFullscreen", "Y"); else - set_reg_key(config_key, keypath("X11 Driver"), "DXGrab", "N"); + set_reg_key(config_key, keypath("X11 Driver"), "GrabFullscreen", "N"); } static void on_d3d_vshader_mode_changed(HWND dialog) { @@ -432,7 +433,7 @@ GraphDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDC_ENABLE_DESKTOP: on_enable_desktop_clicked(hDlg); break; case IDC_ENABLE_MANAGED: on_enable_managed_clicked(hDlg); break; case IDC_ENABLE_DECORATED: on_enable_decorated_clicked(hDlg); break; - case IDC_DX_MOUSE_GRAB: on_dx_mouse_grab_clicked(hDlg); break; + case IDC_FULLSCREEN_GRAB: on_fullscreen_grab_clicked(hDlg); break; case IDC_D3D_PSHADER_MODE: on_d3d_pshader_mode_clicked(hDlg); break; } break; -- 2.11.4.GIT