[Scummvm-cvs-logs] SF.net SVN: scummvm:[49766] scummvm/trunk
sev at users.sourceforge.net
sev at users.sourceforge.net
Tue Jun 15 12:47:31 CEST 2010
Revision: 49766
http://scummvm.svn.sourceforge.net/scummvm/?rev=49766&view=rev
Author: sev
Date: 2010-06-15 10:47:31 +0000 (Tue, 15 Jun 2010)
Log Message:
-----------
GUI: Added in-place hotkeys for widgets.
Now it is possible to specify hotkeys in place for ButtonWidget
and CheckboxWidget (the only widgets with hotkeys now).
Use de-facto standard with putting hotkey between tildes (~).
Like '~O~pen'. The tildes gets stripped before after hotkey
is extracted.
This is done for giving translators possibility to specify
their own hotkeys.
Old hotkeys defined at widget instance creation are left for
leaving possibility to specify non-printable hotkeys such as
Common::ASCII_ESCAPE.
Translation files were updated respectively.
Modified Paths:
--------------
scummvm/trunk/common/messages.cpp
scummvm/trunk/engines/dialogs.cpp
scummvm/trunk/engines/scumm/dialogs.cpp
scummvm/trunk/gui/KeysDialog.cpp
scummvm/trunk/gui/TabWidget.cpp
scummvm/trunk/gui/browser.cpp
scummvm/trunk/gui/chooser.cpp
scummvm/trunk/gui/launcher.cpp
scummvm/trunk/gui/options.cpp
scummvm/trunk/gui/saveload.cpp
scummvm/trunk/gui/themebrowser.cpp
scummvm/trunk/gui/widget.cpp
scummvm/trunk/gui/widget.h
scummvm/trunk/po/POTFILES
scummvm/trunk/po/hu_HU.po
scummvm/trunk/po/ru_RU.po
scummvm/trunk/po/scummvm.pot
Modified: scummvm/trunk/common/messages.cpp
===================================================================
--- scummvm/trunk/common/messages.cpp 2010-06-15 10:46:37 UTC (rev 49765)
+++ scummvm/trunk/common/messages.cpp 2010-06-15 10:47:31 UTC (rev 49766)
@@ -22,14 +22,14 @@
/* 15 */ "AdLib",
/* 16 */ "AdLib emulator:",
/* 17 */ "Add Game...",
- /* 18 */ "Angol",
- /* 19 */ "Antialiased Renderer (16bpp)",
- /* 20 */ "Aspect ratio correction",
- /* 21 */ "Associated key : %s",
- /* 22 */ "Associated key : none",
- /* 23 */ "Atari ST MIDI",
- /* 24 */ "Audio",
- /* 25 */ "Autosave:",
+ /* 18 */ "Antialiased Renderer (16bpp)",
+ /* 19 */ "Aspect ratio correction",
+ /* 20 */ "Associated key : %s",
+ /* 21 */ "Associated key : none",
+ /* 22 */ "Atari ST MIDI",
+ /* 23 */ "Audio",
+ /* 24 */ "Autosave:",
+ /* 25 */ "A~b~out...",
/* 26 */ "C1Available engines:",
/* 27 */ "C1Features compiled in:",
/* 28 */ "C2(built on ",
@@ -77,123 +77,138 @@
/* 70 */ "IBM PCjr",
/* 71 */ "ID:",
/* 72 */ "Invalid Path",
- /* 73 */ "Invalid game path",
- /* 74 */ "Keys",
- /* 75 */ "Language:",
- /* 76 */ "Load",
- /* 77 */ "Load game:",
- /* 78 */ "Load...",
- /* 79 */ "MIDI",
- /* 80 */ "MIDI gain:",
- /* 81 */ "MT-32 Emulation",
- /* 82 */ "Map",
- /* 83 */ "Mass Add...",
- /* 84 */ "Menu",
- /* 85 */ "Misc",
- /* 86 */ "Mixed AdLib/MIDI mode",
- /* 87 */ "Mouse click",
- /* 88 */ "Music driver:",
- /* 89 */ "Music volume:",
- /* 90 */ "Mute All",
- /* 91 */ "Name:",
- /* 92 */ "Never",
- /* 93 */ "No",
- /* 94 */ "No date saved",
- /* 95 */ "No music",
- /* 96 */ "No playtime saved",
- /* 97 */ "No time saved",
- /* 98 */ "None",
- /* 99 */ "OK",
- /* 100 */ "Options",
- /* 101 */ "Options...",
- /* 102 */ "Output rate:",
- /* 103 */ "Override global MIDI settings",
- /* 104 */ "Override global audio settings",
- /* 105 */ "Override global graphic settings",
- /* 106 */ "Override global volume settings",
- /* 107 */ "PC Speaker",
- /* 108 */ "Path not a directory",
- /* 109 */ "Path not a file",
- /* 110 */ "Path not exists",
- /* 111 */ "Paths",
- /* 112 */ "Pause",
- /* 113 */ "Pick the game:",
- /* 114 */ "Platform:",
- /* 115 */ "Playtime: ",
- /* 116 */ "Please select an action",
- /* 117 */ "Plugins Path:",
- /* 118 */ "Press the key to associate",
- /* 119 */ "Quit",
- /* 120 */ "Read permission denied",
- /* 121 */ "Reading failed",
- /* 122 */ "Remap keys",
- /* 123 */ "Remove Game",
- /* 124 */ "Render mode:",
- /* 125 */ "Resume",
- /* 126 */ "Return to Launcher",
- /* 127 */ "SEQ",
- /* 128 */ "SFX volume:",
- /* 129 */ "Save",
- /* 130 */ "Save Path:",
- /* 131 */ "Save Path: ",
- /* 132 */ "Save game:",
- /* 133 */ "Scan complete!",
- /* 134 */ "Scanned %d directories ...",
- /* 135 */ "ScummVM could not find any engine capable of running the selected game!",
- /* 136 */ "ScummVM could not find any game in the specified directory!",
- /* 137 */ "ScummVM couldn't open the specified directory!",
- /* 138 */ "Search:",
- /* 139 */ "Select SoundFont",
- /* 140 */ "Select a Theme",
- /* 141 */ "Select additional game directory",
- /* 142 */ "Select an action and click 'Map'",
- /* 143 */ "Select directory for GUI themes",
- /* 144 */ "Select directory for extra files",
- /* 145 */ "Select directory for plugins",
- /* 146 */ "Select directory for saved games",
- /* 147 */ "Select directory for savegames",
- /* 148 */ "Select directory with game data",
- /* 149 */ "Skip",
- /* 150 */ "Skip line",
- /* 151 */ "SoundFont:",
- /* 152 */ "Speech & Subs",
- /* 153 */ "Speech Only",
- /* 154 */ "Speech and Subtitles",
- /* 155 */ "Speech volume:",
- /* 156 */ "Standard Renderer (16bpp)",
- /* 157 */ "Start",
- /* 158 */ "Subtitle speed:",
- /* 159 */ "Subtitles Only",
- /* 160 */ "Szak\xEDtani",
- /* 161 */ "Tapwave Zodiac",
- /* 162 */ "Text and Speech:",
- /* 163 */ "The chosen directory cannot be written to. Please select another one.",
- /* 164 */ "Theme Path:",
- /* 165 */ "Theme:",
- /* 166 */ "This game ID is already taken. Please choose another one.",
- /* 167 */ "This game does not support loading games from the launcher.",
- /* 168 */ "TiMidity",
- /* 169 */ "Time: ",
- /* 170 */ "True Roland MT-32 (disable GM emulation)",
- /* 171 */ "Unable to locate game data",
- /* 172 */ "Unknown Error",
- /* 173 */ "Unknown error",
- /* 174 */ "Unsupported Color Mode",
- /* 175 */ "Untitled savestate",
- /* 176 */ "User picked target '%s' (gameid '%s')...\n",
- /* 177 */ "Volume",
- /* 178 */ "Windows MIDI",
- /* 179 */ "Write permission denied",
- /* 180 */ "Writing data failed",
- /* 181 */ "Wrong configuration: Both subtitles and speech are off. Assuming subtitles only",
- /* 182 */ "Yamaha Pa1",
- /* 183 */ "Yes",
- /* 184 */ "You have to restart ScummVM to take the effect.",
- /* 185 */ "every 10 mins",
- /* 186 */ "every 15 mins",
- /* 187 */ "every 30 mins",
- /* 188 */ "every 5 mins",
- /* 189 */ "failed\n",
+ /* 73 */ "Keys",
+ /* 74 */ "Language:",
+ /* 75 */ "Load",
+ /* 76 */ "Load game:",
+ /* 77 */ "Load...",
+ /* 78 */ "MIDI",
+ /* 79 */ "MIDI gain:",
+ /* 80 */ "MT-32 Emulation",
+ /* 81 */ "Map",
+ /* 82 */ "Mass Add...",
+ /* 83 */ "Menu",
+ /* 84 */ "Misc",
+ /* 85 */ "Mixed AdLib/MIDI mode",
+ /* 86 */ "Mouse click",
+ /* 87 */ "Music driver:",
+ /* 88 */ "Music volume:",
+ /* 89 */ "Mute All",
+ /* 90 */ "Name:",
+ /* 91 */ "Never",
+ /* 92 */ "No",
+ /* 93 */ "No date saved",
+ /* 94 */ "No music",
+ /* 95 */ "No playtime saved",
+ /* 96 */ "No time saved",
+ /* 97 */ "None",
+ /* 98 */ "OK",
+ /* 99 */ "Options",
+ /* 100 */ "Options...",
+ /* 101 */ "Output rate:",
+ /* 102 */ "Override global MIDI settings",
+ /* 103 */ "Override global audio settings",
+ /* 104 */ "Override global graphic settings",
+ /* 105 */ "Override global volume settings",
+ /* 106 */ "PC Speaker",
+ /* 107 */ "Path not a directory",
+ /* 108 */ "Path not a file",
+ /* 109 */ "Path not exists",
+ /* 110 */ "Paths",
+ /* 111 */ "Pause",
+ /* 112 */ "Pick the game:",
+ /* 113 */ "Platform:",
+ /* 114 */ "Playtime: ",
+ /* 115 */ "Please select an action",
+ /* 116 */ "Plugins Path:",
+ /* 117 */ "Press the key to associate",
+ /* 118 */ "Quit",
+ /* 119 */ "Read permission denied",
+ /* 120 */ "Reading failed",
+ /* 121 */ "Remap keys",
+ /* 122 */ "Remove Game",
+ /* 123 */ "Render mode:",
+ /* 124 */ "Resume",
+ /* 125 */ "Return to Launcher",
+ /* 126 */ "SEQ",
+ /* 127 */ "SFX volume:",
+ /* 128 */ "Save",
+ /* 129 */ "Save Path:",
+ /* 130 */ "Save Path: ",
+ /* 131 */ "Save game:",
+ /* 132 */ "Scan complete!",
+ /* 133 */ "Scanned %d directories ...",
+ /* 134 */ "ScummVM could not find any engine capable of running the selected game!",
+ /* 135 */ "ScummVM could not find any game in the specified directory!",
+ /* 136 */ "ScummVM couldn't open the specified directory!",
+ /* 137 */ "Search:",
+ /* 138 */ "Select SoundFont",
+ /* 139 */ "Select a Theme",
+ /* 140 */ "Select additional game directory",
+ /* 141 */ "Select an action and click 'Map'",
+ /* 142 */ "Select directory for GUI themes",
+ /* 143 */ "Select directory for extra files",
+ /* 144 */ "Select directory for plugins",
+ /* 145 */ "Select directory for saved games",
+ /* 146 */ "Select directory for savegames",
+ /* 147 */ "Select directory with game data",
+ /* 148 */ "Skip",
+ /* 149 */ "Skip line",
+ /* 150 */ "SoundFont:",
+ /* 151 */ "Speech & Subs",
+ /* 152 */ "Speech Only",
+ /* 153 */ "Speech and Subtitles",
+ /* 154 */ "Speech volume:",
+ /* 155 */ "Standard Renderer (16bpp)",
+ /* 156 */ "Start",
+ /* 157 */ "Subtitle speed:",
+ /* 158 */ "Subtitles Only",
+ /* 159 */ "Tapwave Zodiac",
+ /* 160 */ "Text and Speech:",
+ /* 161 */ "The chosen directory cannot be written to. Please select another one.",
+ /* 162 */ "Theme Path:",
+ /* 163 */ "Theme:",
+ /* 164 */ "This game ID is already taken. Please choose another one.",
+ /* 165 */ "This game does not support loading games from the launcher.",
+ /* 166 */ "TiMidity",
+ /* 167 */ "Time: ",
+ /* 168 */ "True Roland MT-32 (disable GM emulation)",
+ /* 169 */ "Unknown Error",
+ /* 170 */ "Unsupported Color Mode",
+ /* 171 */ "Untitled savestate",
+ /* 172 */ "User picked target '%s' (gameid '%s')...\n",
+ /* 173 */ "Volume",
+ /* 174 */ "Windows MIDI",
+ /* 175 */ "Write permission denied",
+ /* 176 */ "Writing data failed",
+ /* 177 */ "Yamaha Pa1",
+ /* 178 */ "Yes",
+ /* 179 */ "You have to restart ScummVM to take the effect.",
+ /* 180 */ "every 10 mins",
+ /* 181 */ "every 15 mins",
+ /* 182 */ "every 30 mins",
+ /* 183 */ "every 5 mins",
+ /* 184 */ "failed\n",
+ /* 185 */ "~A~bout",
+ /* 186 */ "~A~dd Game...",
+ /* 187 */ "~C~ancel",
+ /* 188 */ "~C~lose",
+ /* 189 */ "~E~dit Game...",
+ /* 190 */ "~H~elp",
+ /* 191 */ "~K~eys",
+ /* 192 */ "~L~oad",
+ /* 193 */ "~L~oad...",
+ /* 194 */ "~N~ext",
+ /* 195 */ "~O~K",
+ /* 196 */ "~O~ptions",
+ /* 197 */ "~O~ptions...",
+ /* 198 */ "~P~revious",
+ /* 199 */ "~Q~uit",
+ /* 200 */ "~R~emove Game",
+ /* 201 */ "~R~esume",
+ /* 202 */ "~R~eturn to Launcher",
+ /* 203 */ "~S~ave",
+ /* 204 */ "~S~tart",
NULL
};
@@ -203,7 +218,7 @@
};
static struct _po2c_msg _po2c_lang_ru_RU[] = {
- { 0, "Project-Id-Version: ScummVM VERSION\nReport-Msgid-Bugs-To: scummvm-devel at lists.sf.net\nPOT-Creation-Date: 2010-06-08 17:25+0300\nPO-Revision-Date: 2010-06-08 08:52-0100\nLast-Translator: Eugene Sandulenko <sev at scummvm.org>\nLanguage-Team: Russian\nMIME-Version: 1.0\nContent-Type: text/plain; charset=cp1251\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" },
+ { 0, "Project-Id-Version: ScummVM VERSION\nReport-Msgid-Bugs-To: scummvm-devel at lists.sf.net\nPOT-Creation-Date: 2010-06-10 17:42+0300\nPO-Revision-Date: 2010-06-08 08:52-0100\nLast-Translator: Eugene Sandulenko <sev at scummvm.org>\nLanguage-Team: Russian\nMIME-Version: 1.0\nContent-Type: text/plain; charset=cp1251\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" },
{ 1, " \310\371\363 \357\353\340\343\350\355 \361 \357\356\344\344\345\360\346\352\356\351 \375\362\356\343\356 gameid... " },
{ 2, " \307\340\357\363\361\352\340\376 '%s'\n" },
{ 3, "%s \355\345 \361\354\356\343 \347\340\357\363\361\362\350\362\374 \344\342\350\346\356\352: %s (\366\345\353\374 '%s', \357\363\362\374 '%s')" },
@@ -221,13 +236,14 @@
{ 15, "AdLib" },
{ 16, "\335\354\363\353\377\362\356\360 AdLib:" },
{ 17, "\315\356\342. \350\343\360\340..." },
- { 19, "\320\340\361\362\345\360\350\347\340\362\356\360 \361\356 \361\343\353\340\346\350\342\340\355\350\345\354 (16bpp)" },
- { 20, "\312\356\360\360\345\352\366\350\377 \361\356\356\362\355\356\370\345\355\350\377 \361\362\356\360\356\355" },
- { 21, "\315\340\347\355\340\367\345\355\355\340\377 \352\353\340\342\350\370\340 : %s" },
- { 22, "\315\340\347\355\340\367\345\355\355\340\377 \352\353\340\342\350\370\340 : \355\345\362" },
- { 23, "Atars ST MIDI" },
- { 24, "\300\363\344\350\356" },
- { 25, "\300\342\362\356\361\356\365\360\340\355\345\355\350\345:" },
+ { 18, "\320\340\361\362\345\360\350\347\340\362\356\360 \361\356 \361\343\353\340\346\350\342\340\355\350\345\354 (16bpp)" },
+ { 19, "\312\356\360\360\345\352\366\350\377 \361\356\356\362\355\356\370\345\355\350\377 \361\362\356\360\356\355" },
+ { 20, "\315\340\347\355\340\367\345\355\355\340\377 \352\353\340\342\350\370\340 : %s" },
+ { 21, "\315\340\347\355\340\367\345\355\355\340\377 \352\353\340\342\350\370\340 : \355\345\362" },
+ { 22, "Atars ST MIDI" },
+ { 23, "\300\363\344\350\356" },
+ { 24, "\300\342\362\356\361\356\365\360\340\355\345\355\350\345:" },
+ { 25, "\316 \357~\360~\356\343\360\340\354\354\345..." },
{ 26, "C1\304\356\361\362\363\357\355\373\345 \344\342\350\346\352\350:" },
{ 27, "C1\302\352\353\376\367\345\355\355\373\345 \342 \341\350\353\344 \356\357\366\350\350:" },
{ 28, "C2(\361\356\341\360\340\355 " },
@@ -275,161 +291,191 @@
{ 70, "IBM PCjr" },
{ 71, "ID:" },
{ 72, "\315\345\342\345\360\355\373\351 \357\363\362\374" },
- { 74, "\312\353\340\342\350\370\350" },
- { 75, "\337\347\373\352:" },
- { 76, "\307\340\343\360\363\347\350\362\374" },
- { 77, "\307\340\343\360\363\347\350\362\374 \350\343\360\363:" },
- { 78, "\307\340\343\360...." },
- { 79, "MIDI" },
- { 80, "\323\361\350\353\345\355\350\345 MIDI:" },
- { 81, "\335\354\363\353\377\366\350\377 MT-32" },
- { 82, "\315\340\347\355\340\367\350\362\374" },
- { 83, "\304\356\341. \354\355\356\343\356..." },
- { 84, "\314\345\355\376" },
- { 85, "\320\340\347\355\356\345" },
- { 86, "\321\354\345\370\340\355\355\373\351 \360\345\346\350\354 AdLib/MIDI" },
- { 87, "\312\353\350\352 \354\373\370\374\376" },
- { 88, "\304\360\340\351\342\345\360 \354\363\347\373\352\350:" },
- { 89, "\303\360\356\354\352\356\361\362\374 \354\363\347\373\352\350:" },
- { 90, "\302\373\352\353\376\367\350\362\374 \342\361\270" },
- { 91, "\315\340\347\342\340\355\350\345:" },
- { 92, "\315\350\352\356\343\344\340" },
- { 93, "\315\345\362" },
- { 94, "\304\340\362\340 \355\345 \347\340\357\350\361\340\355\340" },
- { 95, "\301\345\347 \354\363\347\373\352\350" },
- { 96, "\302\360\345\354\377 \350\343\360\373 \355\345 \347\340\357\350\361\340\355\356" },
- { 97, "\302\360\345\354\377 \355\345 \347\340\357\350\361\340\355\356" },
- { 98, "\315\345 \347\340\344\340\355" },
- { 99, "OK" },
- { 100, "\316\357\366\350\350" },
- { 101, "\316\357\366\350\350..." },
- { 102, "\302\373\365\356\344\355\340\377 \367\340\361\362\356\362\340:" },
- { 103, "\317\345\360\345\352\360\373\362\374 \343\353\356\341\340\353\374\355\373\345 \363\361\362\340\355\356\342\352\350 MIDI" },
- { 104, "\317\345\360\345\352\360\373\362\374 \343\353\356\341\340\353\374\355\373\345 \363\361\362\340\355\356\342\352\350 \340\363\344\350\356" },
- { 105, "\317\345\360\345\352\360\373\362\374 \343\353\356\341\340\353\374\355\373\345 \363\361\362\340\355\356\342\352\350 \343\360\340\364\350\352\350" },
- { 106, "\317\345\360\345\352\360\373\362\374 \343\353\356\341\340\353\374\355\373\345 \363\361\362\340\355\356\342\352\350 \343\360\356\354\352\356\361\362\350" },
- { 107, "PC \361\357\350\352\345\360" },
- { 108, "\317\363\362\374 \355\345 \377\342\353\377\345\362\361\377 \344\350\360\345\352\362\356\360\350\345\351" },
- { 109, "\317\363\362\374 \355\345 \377\342\353\377\345\362\361\377 \364\340\351\353\356\354" },
- { 110, "\317\363\362\374 \355\345 \355\340\351\344\345\355" },
- { 111, "\317\363\362\350" },
- { 112, "\317\340\363\347\340" },
- { 113, "\302\373\341\345\360\350\362\345 \350\343\360\363:" },
- { 114, "\317\353\340\362\364\356\360\354\340:" },
- { 115, "\302\360\345\354\377 \350\343\360\373: " },
- { 116, "\317\356\346\340\353\363\351\361\362\340, \342\373\341\345\360\350\362\345 \344\345\351\361\362\342\350\345" },
- { 117, "\317\363\362\374 \352 \357\353\340\343\350\355\340\354:" },
- { 118, "\315\340\346\354\350\362\345 \352\353\340\342\350\370\363 \344\353\377 \355\340\347\355\340\367\345\355\350\377" },
- { 119, "\302\373\365\356\344" },
- { 120, "\315\345\344\356\361\362\340\362\356\367\355\356 \357\360\340\342 \344\353\377 \367\362\345\355\350\377" },
- { 121, "\316\370\350\341\352\340 \367\362\345\355\350\377" },
- { 122, "\317\345\360\345\355\340\347\355\340\367\350\362\374 \352\353\340\342\350\370\350" },
- { 123, "\323\344\340\353\350\362\374 \350\343\360\363" },
- { 124, "\320\345\346\350\354 \360\340\361\362\360\350\360\356\342\340\355\350\377:" },
- { 125, "\317\360\356\344\356\353\346\350\362\374" },
- { 126, "\302\345\360\355\363\362\374\361\377 \342 \343\353\340\342\355\356\345 \354\345\355\376" },
- { 127, "SEQ" },
- { 128, "\303\360\356\354\352\356\361\362\374 \375\364\364\345\352\362\356\342:" },
- { 129, "\307\340\357\350\361\340\362\374" },
- { 130, "\317\363\362\374 \361\356\365\360.: " },
- { 131, "\317\363\362\374 \344\353\377 \361\356\365\360\340\355\345\355\350\351: " },
- { 132, "\321\356\365\360\340\355\350\362\374 \350\343\360\363: " },
- { 133, "\317\356\350\361\352 \347\340\352\356\355\367\345\355!" },
- { 134, "\317\360\356\361\354\356\362\360\345\355\356 %d \344\350\360\345\352\362\356\360\350\351 ..." },
- { 135, "ScummVM \355\345 \361\354\356\343 \355\340\351\362\350 \344\342\350\346\356\352 \344\353\377 \347\340\357\363\361\352\340 \342\373\341\360\340\355\355\356\351 \350\343\360\373!" },
- { 136, "ScummVM \355\345 \354\356\346\345\362 \355\340\351\362\350 \350\343\360\363 \342 \363\352\340\347\340\355\355\356\351 \344\350\360\345\352\362\356\360\350\350!" },
- { 137, "ScummVM \355\345 \354\356\346\345\362 \356\362\352\360\373\362\374 \363\352\340\347\340\355\355\363\376 \344\350\360\345\352\362\356\360\350\376!" },
- { 138, "\317\356\350\361\352:" },
- { 139, "\302\373\341\345\360\350\362\345 SoundFont" },
- { 140, "\302\373\341\345\360\350\362\345 \362\345\354\363" },
- { 141, "\302\373\341\345\360\350\362\345 \344\356\357\356\353\355\350\362\345\353\374\355\363\376 \344\350\360\345\352\362\356\360\350\376 \350\343\360\373" },
- { 142, "\302\373\341\345\360\350\362\345 \344\345\351\361\362\342\350\345 \350 \352\353\350\352\355\350\362\345 '\315\340\347\355\340\367\350\362\374'" },
- { 143, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \344\353\377 \362\345\354 GUI" },
- { 144, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \361 \344\356\357\356\353\355\350\362\345\353\374\355\373\354\350 \364\340\351\353\340\354\350" },
- { 145, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \361 \357\353\340\343\350\355\340\354\350" },
+ { 73, "\312\353\340\342\350\370\350" },
+ { 74, "\337\347\373\352:" },
+ { 75, "\307\340\343\360\363\347\350\362\374" },
+ { 76, "\307\340\343\360\363\347\350\362\374 \350\343\360\363:" },
+ { 77, "\307\340\343\360...." },
+ { 78, "MIDI" },
+ { 79, "\323\361\350\353\345\355\350\345 MIDI:" },
+ { 80, "\335\354\363\353\377\366\350\377 MT-32" },
+ { 81, "\315\340\347\355\340\367\350\362\374" },
+ { 82, "\304\356\341. \354\355\356\343\356..." },
+ { 83, "\314\345\355\376" },
+ { 84, "\320\340\347\355\356\345" },
+ { 85, "\321\354\345\370\340\355\355\373\351 \360\345\346\350\354 AdLib/MIDI" },
+ { 86, "\312\353\350\352 \354\373\370\374\376" },
+ { 87, "\304\360\340\351\342\345\360 \354\363\347\373\352\350:" },
+ { 88, "\303\360\356\354\352\356\361\362\374 \354\363\347\373\352\350:" },
+ { 89, "\302\373\352\353\376\367\350\362\374 \342\361\270" },
+ { 90, "\315\340\347\342\340\355\350\345:" },
+ { 91, "\315\350\352\356\343\344\340" },
+ { 92, "\315\345\362" },
+ { 93, "\304\340\362\340 \355\345 \347\340\357\350\361\340\355\340" },
+ { 94, "\301\345\347 \354\363\347\373\352\350" },
+ { 95, "\302\360\345\354\377 \350\343\360\373 \355\345 \347\340\357\350\361\340\355\356" },
+ { 96, "\302\360\345\354\377 \355\345 \347\340\357\350\361\340\355\356" },
+ { 97, "\315\345 \347\340\344\340\355" },
+ { 98, "OK" },
+ { 99, "\316\357\366\350\350" },
+ { 100, "\316\357\366\350\350..." },
+ { 101, "\302\373\365\356\344\355\340\377 \367\340\361\362\356\362\340:" },
+ { 102, "\317\345\360\345\352\360\373\362\374 \343\353\356\341\340\353\374\355\373\345 \363\361\362\340\355\356\342\352\350 MIDI" },
+ { 103, "\317\345\360\345\352\360\373\362\374 \343\353\356\341\340\353\374\355\373\345 \363\361\362\340\355\356\342\352\350 \340\363\344\350\356" },
+ { 104, "\317\345\360\345\352\360\373\362\374 \343\353\356\341\340\353\374\355\373\345 \363\361\362\340\355\356\342\352\350 \343\360\340\364\350\352\350" },
+ { 105, "\317\345\360\345\352\360\373\362\374 \343\353\356\341\340\353\374\355\373\345 \363\361\362\340\355\356\342\352\350 \343\360\356\354\352\356\361\362\350" },
+ { 106, "PC \361\357\350\352\345\360" },
+ { 107, "\317\363\362\374 \355\345 \377\342\353\377\345\362\361\377 \344\350\360\345\352\362\356\360\350\345\351" },
+ { 108, "\317\363\362\374 \355\345 \377\342\353\377\345\362\361\377 \364\340\351\353\356\354" },
+ { 109, "\317\363\362\374 \355\345 \355\340\351\344\345\355" },
+ { 110, "\317\363\362\350" },
+ { 111, "\317\340\363\347\340" },
+ { 112, "\302\373\341\345\360\350\362\345 \350\343\360\363:" },
+ { 113, "\317\353\340\362\364\356\360\354\340:" },
+ { 114, "\302\360\345\354\377 \350\343\360\373: " },
+ { 115, "\317\356\346\340\353\363\351\361\362\340, \342\373\341\345\360\350\362\345 \344\345\351\361\362\342\350\345" },
+ { 116, "\317\363\362\374 \352 \357\353\340\343\350\355\340\354:" },
+ { 117, "\315\340\346\354\350\362\345 \352\353\340\342\350\370\363 \344\353\377 \355\340\347\355\340\367\345\355\350\377" },
+ { 118, "\302\373\365\356\344" },
+ { 119, "\315\345\344\356\361\362\340\362\356\367\355\356 \357\360\340\342 \344\353\377 \367\362\345\355\350\377" },
+ { 120, "\316\370\350\341\352\340 \367\362\345\355\350\377" },
+ { 121, "\317\345\360\345\355\340\347\355\340\367\350\362\374 \352\353\340\342\350\370\350" },
+ { 122, "\323\344\340\353\350\362\374 \350\343\360\363" },
+ { 123, "\320\345\346\350\354 \360\340\361\362\360\350\360\356\342\340\355\350\377:" },
+ { 124, "\317\360\356\344\356\353\346\350\362\374" },
+ { 125, "\302\345\360\355\363\362\374\361\377 \342 \343\353\340\342\355\356\345 \354\345\355\376" },
+ { 126, "SEQ" },
+ { 127, "\303\360\356\354\352\356\361\362\374 \375\364\364\345\352\362\356\342:" },
+ { 128, "\307\340\357\350\361\340\362\374" },
+ { 129, "\317\363\362\374 \361\356\365\360.: " },
+ { 130, "\317\363\362\374 \344\353\377 \361\356\365\360\340\355\345\355\350\351: " },
+ { 131, "\321\356\365\360\340\355\350\362\374 \350\343\360\363: " },
+ { 132, "\317\356\350\361\352 \347\340\352\356\355\367\345\355!" },
+ { 133, "\317\360\356\361\354\356\362\360\345\355\356 %d \344\350\360\345\352\362\356\360\350\351 ..." },
+ { 134, "ScummVM \355\345 \361\354\356\343 \355\340\351\362\350 \344\342\350\346\356\352 \344\353\377 \347\340\357\363\361\352\340 \342\373\341\360\340\355\355\356\351 \350\343\360\373!" },
+ { 135, "ScummVM \355\345 \354\356\346\345\362 \355\340\351\362\350 \350\343\360\363 \342 \363\352\340\347\340\355\355\356\351 \344\350\360\345\352\362\356\360\350\350!" },
+ { 136, "ScummVM \355\345 \354\356\346\345\362 \356\362\352\360\373\362\374 \363\352\340\347\340\355\355\363\376 \344\350\360\345\352\362\356\360\350\376!" },
+ { 137, "\317\356\350\361\352:" },
+ { 138, "\302\373\341\345\360\350\362\345 SoundFont" },
+ { 139, "\302\373\341\345\360\350\362\345 \362\345\354\363" },
+ { 140, "\302\373\341\345\360\350\362\345 \344\356\357\356\353\355\350\362\345\353\374\355\363\376 \344\350\360\345\352\362\356\360\350\376 \350\343\360\373" },
+ { 141, "\302\373\341\345\360\350\362\345 \344\345\351\361\362\342\350\345 \350 \352\353\350\352\355\350\362\345 '\315\340\347\355\340\367\350\362\374'" },
+ { 142, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \344\353\377 \362\345\354 GUI" },
+ { 143, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \361 \344\356\357\356\353\355\350\362\345\353\374\355\373\354\350 \364\340\351\353\340\354\350" },
+ { 144, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \361 \357\353\340\343\350\355\340\354\350" },
+ { 145, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \344\353\377 \361\356\365\360\340\355\345\355\350\351" },
{ 146, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \344\353\377 \361\356\365\360\340\355\345\355\350\351" },
- { 147, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \344\353\377 \361\356\365\360\340\355\345\355\350\351" },
- { 148, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \361 \364\340\351\353\340\354\350 \350\343\360\373" },
- { 149, "\317\360\356\357\363\361\362\350\362\374" },
- { 150, "\317\360\356\357\363\361\362\350\362\374 \361\362\360\356\352\363" },
- { 151, "SoundFont:" },
- { 152, "\307\342\363\352 \350 \361\363\341." },
- { 153, "\322\356\353\374\352\356 \356\347\342\363\367\352\340" },
- { 154, "\316\347\342\363\367\352\340 \350 \361\363\341\362\350\362\360\373" },
- { 155, "\303\360\356\354\352\356\361\362\374 \356\347\342\363\367\352\350:" },
- { 156, "\321\362\340\355\344\340\360\362\355\373\351 \360\340\361\362\345\360\350\347\340\362\356\360 (16bpp)" },
- { 157, "\317\363\361\352" },
- { 158, "\321\352\356\360\356\361\362\374 \361\363\341\362\350\362\360\356\342:" },
- { 159, "\322\356\353\374\352\356 \361\363\341\362\350\362\360\373" },
- { 161, "Tapware Zodiac" },
- { 162, "\322\345\352\361\362 \350 \356\347\342\363\367\352\340:" },
- { 163, "\315\345 \354\356\343\363 \357\350\361\340\362\374 \342 \342\373\341\360\340\355\355\363\376 \344\350\360\345\352\362\356\360\350\376. \317\356\346\340\353\363\351\361\362\340, \363\352\340\346\350\362\345 \344\360\363\343\363\376." },
- { 164, "\317\363\362\374 \352 \362\345\354\340\354:" },
- { 165, "\322\345\354\340:" },
- { 166, "\335\362\356\362 ID \350\343\360\373 \363\346\345 \350\361\357\356\353\374\347\363\345\362\361\377. \317\356\346\340\353\363\351\361\362\340, \342\373\341\345\360\350\362\345 \344\360\363\343\356\351." },
- { 167, "\335\362\340 \350\343\360\340 \355\345 \357\356\344\344\345\360\346\350\342\340\345\362 \347\340\343\360\363\347\352\363 \361\356\365\360\340\355\345\355\350\351 \367\345\360\345\347 \343\353\340\342\355\356\345 \354\345\355\376." },
- { 168, "TiMidity" },
- { 169, "\302\360\345\354\377: " },
- { 170, "\315\340\361\362\356\377\371\350\351 Roland MT-32 (\347\340\357\360\345\362\350\362\374 \375\354\363\353\377\366\350\376 GM)" },
- { 172, "\315\345\350\347\342\345\361\362\355\340\377 \356\370\350\341\352\340" },
- { 174, "\315\345\357\356\344\344\345\360\346\350\342\340\345\354\373\351 \360\345\346\350\354 \366\342\345\362\340" },
- { 175, "\321\356\365\360\340\355\345\355\350\345 \341\345\347 \350\354\345\355\350" },
- { 176, "\317\356\353\374\347\356\342\340\362\345\353\374 \342\373\341\360\340\353 \366\345\353\374'%s' (gameid '%s')...\n" },
- { 177, "\303\360\356\354\352\356\361\362\374" },
- { 178, "Windows MIDI" },
- { 179, "\315\345\344\356\361\362\340\362\356\367\355\356 \357\360\340\342 \344\353\377 \347\340\357\350\361\350" },
- { 180, "\316\370\350\341\352\340 \347\340\357\350\361\350 \344\340\355\355\373\365" },
- { 182, "Yamaha Pa1" },
- { 183, "\304\340" },
- { 184, "\302\373 \344\356\353\346\355\373 \357\345\360\345\347\340\357\363\361\362\350\362\374 ScummVM \367\362\356\341\373 \357\360\350\354\345\355\350\362\374 \350\347\354\345\355\345\355\350\377." },
- { 185, "\352\340\346\344\373\345 10 \354\350\355\363\362" },
- { 186, "\352\340\346\344\373\345 15 \354\350\355\363\362" },
- { 187, "\352\340\346\344\373\345 30 \354\350\355\363\362" },
- { 188, "\352\340\346\344\373\345 5 \354\350\355\363\362" },
- { 189, "\355\345 \363\344\340\353\356\361\374\n" },
+ { 147, "\302\373\341\345\360\350\362\345 \344\350\360\345\352\362\356\360\350\376 \361 \364\340\351\353\340\354\350 \350\343\360\373" },
+ { 148, "\317\360\356\357\363\361\362\350\362\374" },
+ { 149, "\317\360\356\357\363\361\362\350\362\374 \361\362\360\356\352\363" },
+ { 150, "SoundFont:" },
+ { 151, "\307\342\363\352 \350 \361\363\341." },
+ { 152, "\322\356\353\374\352\356 \356\347\342\363\367\352\340" },
+ { 153, "\316\347\342\363\367\352\340 \350 \361\363\341\362\350\362\360\373" },
+ { 154, "\303\360\356\354\352\356\361\362\374 \356\347\342\363\367\352\350:" },
+ { 155, "\321\362\340\355\344\340\360\362\355\373\351 \360\340\361\362\345\360\350\347\340\362\356\360 (16bpp)" },
+ { 156, "\317\363\361\352" },
+ { 157, "\321\352\356\360\356\361\362\374 \361\363\341\362\350\362\360\356\342:" },
+ { 158, "\322\356\353\374\352\356 \361\363\341\362\350\362\360\373" },
+ { 159, "Tapware Zodiac" },
+ { 160, "\322\345\352\361\362 \350 \356\347\342\363\367\352\340:" },
+ { 161, "\315\345 \354\356\343\363 \357\350\361\340\362\374 \342 \342\373\341\360\340\355\355\363\376 \344\350\360\345\352\362\356\360\350\376. \317\356\346\340\353\363\351\361\362\340, \363\352\340\346\350\362\345 \344\360\363\343\363\376." },
+ { 162, "\317\363\362\374 \352 \362\345\354\340\354:" },
+ { 163, "\322\345\354\340:" },
+ { 164, "\335\362\356\362 ID \350\343\360\373 \363\346\345 \350\361\357\356\353\374\347\363\345\362\361\377. \317\356\346\340\353\363\351\361\362\340, \342\373\341\345\360\350\362\345 \344\360\363\343\356\351." },
+ { 165, "\335\362\340 \350\343\360\340 \355\345 \357\356\344\344\345\360\346\350\342\340\345\362 \347\340\343\360\363\347\352\363 \361\356\365\360\340\355\345\355\350\351 \367\345\360\345\347 \343\353\340\342\355\356\345 \354\345\355\376." },
+ { 166, "TiMidity" },
+ { 167, "\302\360\345\354\377: " },
+ { 168, "\315\340\361\362\356\377\371\350\351 Roland MT-32 (\347\340\357\360\345\362\350\362\374 \375\354\363\353\377\366\350\376 GM)" },
+ { 169, "\315\345\350\347\342\345\361\362\355\340\377 \356\370\350\341\352\340" },
+ { 170, "\315\345\357\356\344\344\345\360\346\350\342\340\345\354\373\351 \360\345\346\350\354 \366\342\345\362\340" },
+ { 171, "\321\356\365\360\340\355\345\355\350\345 \341\345\347 \350\354\345\355\350" },
+ { 172, "\317\356\353\374\347\356\342\340\362\345\353\374 \342\373\341\360\340\353 \366\345\353\374'%s' (gameid '%s')...\n" },
+ { 173, "\303\360\356\354\352\356\361\362\374" },
+ { 174, "Windows MIDI" },
+ { 175, "\315\345\344\356\361\362\340\362\356\367\355\356 \357\360\340\342 \344\353\377 \347\340\357\350\361\350" },
+ { 176, "\316\370\350\341\352\340 \347\340\357\350\361\350 \344\340\355\355\373\365" },
+ { 177, "Yamaha Pa1" },
+ { 178, "\304\340" },
+ { 179, "\302\373 \344\356\353\346\355\373 \357\345\360\345\347\340\357\363\361\362\350\362\374 ScummVM \367\362\356\341\373 \357\360\350\354\345\355\350\362\374 \350\347\354\345\355\345\355\350\377." },
+ { 180, "\352\340\346\344\373\345 10 \354\350\355\363\362" },
+ { 181, "\352\340\346\344\373\345 15 \354\350\355\363\362" },
+ { 182, "\352\340\346\344\373\345 30 \354\350\355\363\362" },
+ { 183, "\352\340\346\344\373\345 5 \354\350\355\363\362" },
+ { 184, "\355\345 \363\344\340\353\356\361\374\n" },
+ { 185, "\316 \357\360\356~\343~\360\340\354\354\345" },
+ { 186, "~\304~\356\341. \350\343\360\363..." },
+ { 187, "\316~\362~\354\345\355\340" },
+ { 188, "~\307~\340\352\360\373\362\374" },
+ { 189, "\310\347~\354~. \350\343\360\363..." },
+ { 190, "~\317~\356\354\356\371\374" },
+ { 191, "~\312~\353\340\342\350\370\350" },
+ { 192, "~\307~\340\343\360\363\347\350\362\374" },
+ { 193, "~\307~\340\343\360...." },
+ { 194, "~\321~\353\345\344" },
+ { 195, "~O~K" },
+ { 196, "~\316~\357\366\350\350" },
+ { 197, "~\316~\357\366\350\350..." },
+ { 198, "~\317~\360\345\344" },
+ { 199, "~\302~\373\365\356\344" },
+ { 200, "~\323~\344\340\353\350\362\374 \350\343\360\363" },
+ { 201, "\317\360\356\344\356\353~\346~\350\362\374" },
+ { 202, "~\302~\345\360\355\363\362\374\361\377 \342 \343\353\340\342\355\356\345 \354\345\355\376" },
+ { 203, "~\307~\340\357\350\361\340\362\374" },
+ { 204, "\317~\363~\361\352" },
{ -1, NULL }
};
static struct _po2c_msg _po2c_lang_hu_HU[] = {
- { 0, "Project-Id-Version: ScummVM VERSION\nReport-Msgid-Bugs-To: scummvm-devel at lists.sourceforge.net\nPOT-Creation-Date: 2009-11-25 07:10-0500\nPO-Revision-Date: 2009-11-25 07:42-0500\nLast-Translator: Alex Bevilacqua <alexbevi at gmail.com>\nLanguage-Team: Hungarian\nMIME-Version: 1.0\nContent-Type: text/plain; charset=ASCII\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=(n != 1);\n" },
+ { 0, "Project-Id-Version: ScummVM VERSION\nReport-Msgid-Bugs-To: scummvm-devel at lists.sf.net\nPOT-Creation-Date: 2010-06-10 17:42+0300\nPO-Revision-Date: 2009-11-25 07:42-0500\nLast-Translator: Alex Bevilacqua <alexbevi at gmail.com>\nLanguage-Team: Hungarian\nMIME-Version: 1.0\nContent-Type: text/plain; charset=cp1250\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=(n != 1);\n" },
{ 11, "<alap\351rtelmezett>" },
+ { 15, "Hang" },
{ 16, "AdLib vezet :" },
- { 20, "Aspect adag korrekci\363" },
- { 24, "Hang" },
- { 25, "Automatikus ment\351s:" },
+ { 19, "Aspect adag korrekci\363" },
+ { 23, "Hang" },
+ { 24, "Automatikus ment\351s:" },
+ { 35, "Hang" },
+ { 41, "<alap\351rtelmezett>" },
{ 51, "K\351pess\351 Roland GS Mode" },
{ 55, "Extra \332tvonal:" },
{ 59, "Teljes k\351perny s m\363d:" },
{ 61, "Lek\351pez eszk\366z GUI:" },
+ { 65, "Extra \332tvonal:" },
{ 67, "Grafik\341val" },
{ 68, "Grafikus m\363d:" },
- { 74, "Kulcsok" },
- { 80, "MIDI nyeres\351g:" },
- { 86, "Vegyes AdLib/MIDI m\363d" },
- { 88, "Zenei vezet :" },
- { 89, "Zene mennyis\351g:" },
- { 90, "Muta \326sszes" },
- { 92, "Soha" },
- { 98, "Semmi" },
- { 99, "Igen" },
- { 102, "Kimeneti teljes\355tm\351ny:" },
+ { 73, "Kulcsok" },
+ { 79, "MIDI nyeres\351g:" },
+ { 85, "Vegyes AdLib/MIDI m\363d" },
+ { 87, "Zenei vezet :" },
+ { 88, "Zene mennyis\351g:" },
+ { 89, "Muta \326sszes" },
+ { 91, "Soha" },
+ { 92, "Semmi" },
+ { 97, "Semmi" },
+ { 98, "Igen" },
+ { 101, "Kimeneti teljes\355tm\351ny:" },
+ { 110, "\326sv\351nyek" },
{ 111, "\326sv\351nyek" },
- { 124, "Renderel\351si m\363d:" },
- { 128, "SFX mennyis\351ge" },
- { 152, "Besz\351d s Feliratok" },
- { 153, "Csak a besz\351d" },
- { 154, "Besz\351d \351s a Feliratok" },
- { 155, "Besz\351d mennyis\351g:" },
- { 158, "Felirat sebess\351g:" },
- { 159, "Csak feliratok" },
- { 162, "Sz\366veg \351s besz\351d:" },
- { 165, "T\351ma:" },
- { 170, "Igaz Roland MT-32 (megb\351n\355t GM emul\341ci\363)" },
- { 177, "Volumene" },
- { 185, "10 percenk\351nt" },
- { 186, "15 percenk\351nt" },
- { 187, "30 percenk\351nt" },
- { 188, "5 percenk\351nt" },
+ { 123, "Renderel\351si m\363d:" },
+ { 127, "SFX mennyis\351ge" },
+ { 129, "Extra \332tvonal:" },
+ { 151, "Besz\351d s Feliratok" },
+ { 152, "Csak a besz\351d" },
+ { 153, "Besz\351d \351s a Feliratok" },
+ { 154, "Besz\351d mennyis\351g:" },
+ { 157, "Felirat sebess\351g:" },
+ { 158, "Csak feliratok" },
+ { 160, "Sz\366veg \351s besz\351d:" },
+ { 163, "T\351ma:" },
+ { 167, "T\351ma:" },
+ { 168, "Igaz Roland MT-32 (megb\351n\355t GM emul\341ci\363)" },
+ { 173, "Volumene" },
+ { 180, "10 percenk\351nt" },
+ { 181, "15 percenk\351nt" },
+ { 182, "30 percenk\351nt" },
+ { 183, "5 percenk\351nt" },
+ { 191, "Kulcsok" },
+ { 195, "Igen" },
{ -1, NULL }
};
@@ -439,7 +485,7 @@
struct _po2c_msg * msgs;
} _po2c_langs[] = {
{ "ru_RU", "cp1251", _po2c_lang_ru_RU },
- { "hu_HU", "ASCII", _po2c_lang_hu_HU },
+ { "hu_HU", "cp1250", _po2c_lang_hu_HU },
{ NULL, NULL, NULL }
};
Modified: scummvm/trunk/engines/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/dialogs.cpp 2010-06-15 10:46:37 UTC (rev 49765)
+++ scummvm/trunk/engines/dialogs.cpp 2010-06-15 10:47:31 UTC (rev 49766)
@@ -86,31 +86,31 @@
StaticTextWidget *version = new StaticTextWidget(this, "GlobalMenu.Version", gScummVMVersionDate);
version->setAlign(Graphics::kTextAlignCenter);
- new GUI::ButtonWidget(this, "GlobalMenu.Resume", _("Resume"), kPlayCmd, 'P');
+ new GUI::ButtonWidget(this, "GlobalMenu.Resume", _("~R~esume"), kPlayCmd, 'P');
- _loadButton = new GUI::ButtonWidget(this, "GlobalMenu.Load", _("Load"), kLoadCmd, 'L');
+ _loadButton = new GUI::ButtonWidget(this, "GlobalMenu.Load", _("~L~oad"), kLoadCmd);
// TODO: setEnabled -> setVisible
_loadButton->setEnabled(_engine->hasFeature(Engine::kSupportsLoadingDuringRuntime));
- _saveButton = new GUI::ButtonWidget(this, "GlobalMenu.Save", _("Save"), kSaveCmd, 'S');
+ _saveButton = new GUI::ButtonWidget(this, "GlobalMenu.Save", _("~S~ave"), kSaveCmd);
// TODO: setEnabled -> setVisible
_saveButton->setEnabled(_engine->hasFeature(Engine::kSupportsSavingDuringRuntime));
- new GUI::ButtonWidget(this, "GlobalMenu.Options", _("Options"), kOptionsCmd, 'O');
+ new GUI::ButtonWidget(this, "GlobalMenu.Options", _("~O~ptions"), kOptionsCmd);
// The help button is disabled by default.
// To enable "Help", an engine needs to use a subclass of MainMenuDialog
// (at least for now, we might change how this works in the future).
- _helpButton = new GUI::ButtonWidget(this, "GlobalMenu.Help", _("Help"), kHelpCmd, 'H');
+ _helpButton = new GUI::ButtonWidget(this, "GlobalMenu.Help", _("~H~elp"), kHelpCmd);
_helpButton->setEnabled(false);
- new GUI::ButtonWidget(this, "GlobalMenu.About", _("About"), kAboutCmd, 'A');
+ new GUI::ButtonWidget(this, "GlobalMenu.About", _("~A~bout"), kAboutCmd);
- _rtlButton = new GUI::ButtonWidget(this, "GlobalMenu.RTL", _("Return to Launcher"), kRTLCmd, 'R');
+ _rtlButton = new GUI::ButtonWidget(this, "GlobalMenu.RTL", _("~R~eturn to Launcher"), kRTLCmd);
_rtlButton->setEnabled(_engine->hasFeature(Engine::kSupportsRTL));
- new GUI::ButtonWidget(this, "GlobalMenu.Quit", _("Quit"), kQuitCmd, 'Q');
+ new GUI::ButtonWidget(this, "GlobalMenu.Quit", _("~Q~uit"), kQuitCmd);
_aboutDialog = new GUI::AboutDialog();
_optionsDialog = new ConfigDialog(_engine->hasFeature(Engine::kSupportsSubtitleOptions));
@@ -298,11 +298,11 @@
// Add the buttons
//
- new GUI::ButtonWidget(this, "GlobalConfig.Ok", _("OK"), GUI::kOKCmd, 'O');
- new GUI::ButtonWidget(this, "GlobalConfig.Cancel", _("Cancel"), GUI::kCloseCmd, 'C');
+ new GUI::ButtonWidget(this, "GlobalConfig.Ok", _("~O~K"), GUI::kOKCmd);
+ new GUI::ButtonWidget(this, "GlobalConfig.Cancel", _("~C~ancel"), GUI::kCloseCmd);
#ifdef SMALL_SCREEN_DEVICE
- new GUI::ButtonWidget(this, "GlobalConfig.Keys", _("Keys"), kKeysCmd, 'K');
+ new GUI::ButtonWidget(this, "GlobalConfig.Keys", _("~K~eys"), kKeysCmd);
_keysDialog = NULL;
#endif
}
Modified: scummvm/trunk/engines/scumm/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/dialogs.cpp 2010-06-15 10:46:37 UTC (rev 49765)
+++ scummvm/trunk/engines/scumm/dialogs.cpp 2010-06-15 10:47:31 UTC (rev 49766)
@@ -26,6 +26,7 @@
#include "common/savefile.h"
#include "common/system.h"
#include "common/events.h"
+#include "common/translation.h"
#include "graphics/scaler.h"
@@ -283,9 +284,9 @@
_numPages = ScummHelp::numPages(_game.id);
- _prevButton = new GUI::ButtonWidget(this, "ScummHelp.Prev", "Previous", kPrevCmd, 'P');
- _nextButton = new GUI::ButtonWidget(this, "ScummHelp.Next", "Next", kNextCmd, 'N');
- new GUI::ButtonWidget(this, "ScummHelp.Close", "Close", GUI::kCloseCmd, 'C');
+ _prevButton = new GUI::ButtonWidget(this, "ScummHelp.Prev", _("~P~revious"), kPrevCmd);
+ _nextButton = new GUI::ButtonWidget(this, "ScummHelp.Next", _("~N~ext"), kNextCmd);
+ new GUI::ButtonWidget(this, "ScummHelp.Close", _("~C~lose"), GUI::kCloseCmd);
_prevButton->clearFlags(WIDGET_ENABLED);
_numLines = HELP_NUM_LINES;
Modified: scummvm/trunk/gui/KeysDialog.cpp
===================================================================
--- scummvm/trunk/gui/KeysDialog.cpp 2010-06-15 10:46:37 UTC (rev 49765)
+++ scummvm/trunk/gui/KeysDialog.cpp 2010-06-15 10:47:31 UTC (rev 49766)
@@ -40,9 +40,9 @@
KeysDialog::KeysDialog(const Common::String &title)
: GUI::Dialog("KeysDialog") {
- new ButtonWidget(this, "KeysDialog.Map", _("Map"), kMapCmd, 0);
- new ButtonWidget(this, "KeysDialog.Ok", _("OK"), kOKCmd, 0);
- new ButtonWidget(this, "KeysDialog.Cancel", _("Cancel"), kCloseCmd, 0);
+ new ButtonWidget(this, "KeysDialog.Map", _("Map"), kMapCmd);
+ new ButtonWidget(this, "KeysDialog.Ok", _("OK"), kOKCmd);
+ new ButtonWidget(this, "KeysDialog.Cancel", _("Cancel"), kCloseCmd);
_actionsList = new ListWidget(this, "KeysDialog.List");
_actionsList->setNumberingMode(kListNumberingZero);
Modified: scummvm/trunk/gui/TabWidget.cpp
===================================================================
--- scummvm/trunk/gui/TabWidget.cpp 2010-06-15 10:46:37 UTC (rev 49765)
+++ scummvm/trunk/gui/TabWidget.cpp 2010-06-15 10:47:31 UTC (rev 49766)
@@ -63,8 +63,8 @@
int x = _w - _butRP - _butW * 2 - 2;
int y = _butTP - _tabHeight;
- _navLeft = new ButtonWidget(this, x, y, _butW, _butH, "<", kCmdLeft, 0);
- _navRight = new ButtonWidget(this, x + _butW + 2, y, _butW, _butH, ">", kCmdRight, 0);
+ _navLeft = new ButtonWidget(this, x, y, _butW, _butH, "<", kCmdLeft);
+ _navRight = new ButtonWidget(this, x + _butW + 2, y, _butW, _butH, ">", kCmdRight);
}
TabWidget::~TabWidget() {
Modified: scummvm/trunk/gui/browser.cpp
===================================================================
--- scummvm/trunk/gui/browser.cpp 2010-06-15 10:46:37 UTC (rev 49765)
+++ scummvm/trunk/gui/browser.cpp 2010-06-15 10:47:31 UTC (rev 49766)
@@ -66,9 +66,9 @@
_backgroundType = GUI::ThemeEngine::kDialogBackgroundPlain;
// Buttons
- new ButtonWidget(this, "Browser.Up", _("Go up"), kGoUpCmd, 0);
- new ButtonWidget(this, "Browser.Cancel", _("Cancel"), kCloseCmd, 0);
- new ButtonWidget(this, "Browser.Choose", _("Choose"), kChooseCmd, 0);
+ new ButtonWidget(this, "Browser.Up", _("Go up"), kGoUpCmd);
+ new ButtonWidget(this, "Browser.Cancel", _("Cancel"), kCloseCmd);
+ new ButtonWidget(this, "Browser.Choose", _("Choose"), kChooseCmd);
}
void BrowserDialog::open() {
Modified: scummvm/trunk/gui/chooser.cpp
===================================================================
--- scummvm/trunk/gui/chooser.cpp 2010-06-15 10:46:37 UTC (rev 49765)
+++ scummvm/trunk/gui/chooser.cpp 2010-06-15 10:47:31 UTC (rev 49766)
@@ -23,6 +23,7 @@
*/
#include "common/system.h"
+#include "common/translation.h"
#include "gui/chooser.h"
#include "gui/GuiManager.h"
#include "gui/ListWidget.h"
@@ -45,8 +46,8 @@
_list->setEditable(false);
// Buttons
- new ButtonWidget(this, dialogId + ".Cancel", "Cancel", kCloseCmd, 0);
- _chooseButton = new ButtonWidget(this, dialogId + ".Choose", "Choose", kChooseCmd, 0);
+ new ButtonWidget(this, dialogId + ".Cancel", _("Cancel"), kCloseCmd);
+ _chooseButton = new ButtonWidget(this, dialogId + ".Choose", _("Choose"), kChooseCmd);
_chooseButton->setEnabled(false);
}
Modified: scummvm/trunk/gui/launcher.cpp
===================================================================
--- scummvm/trunk/gui/launcher.cpp 2010-06-15 10:46:37 UTC (rev 49765)
+++ scummvm/trunk/gui/launcher.cpp 2010-06-15 10:47:31 UTC (rev 49766)
@@ -202,7 +202,7 @@
//
_graphicsTabId = tab->addTab(g_system->getOverlayWidth() > 320 ? _("Graphics") : _("GFX"));
- _globalGraphicsOverride = new CheckboxWidget(tab, "GameOptions_Graphics.EnableTabCheckbox", _("Override global graphic settings"), kCmdGlobalGraphicsOverride, 0);
+ _globalGraphicsOverride = new CheckboxWidget(tab, "GameOptions_Graphics.EnableTabCheckbox", _("Override global graphic settings"), kCmdGlobalGraphicsOverride);
addGraphicControls(tab, "GameOptions_Graphics.");
@@ -211,7 +211,7 @@
//
tab->addTab(_("Audio"));
- _globalAudioOverride = new CheckboxWidget(tab, "GameOptions_Audio.EnableTabCheckbox", _("Override global audio settings"), kCmdGlobalAudioOverride, 0);
+ _globalAudioOverride = new CheckboxWidget(tab, "GameOptions_Audio.EnableTabCheckbox", _("Override global audio settings"), kCmdGlobalAudioOverride);
addAudioControls(tab, "GameOptions_Audio.");
addSubtitleControls(tab, "GameOptions_Audio.");
@@ -221,7 +221,7 @@
//
tab->addTab(_("Volume"));
- _globalVolumeOverride = new CheckboxWidget(tab, "GameOptions_Volume.EnableTabCheckbox", _("Override global volume settings"), kCmdGlobalVolumeOverride, 0);
+ _globalVolumeOverride = new CheckboxWidget(tab, "GameOptions_Volume.EnableTabCheckbox", _("Override global volume settings"), kCmdGlobalVolumeOverride);
addVolumeControls(tab, "GameOptions_Volume.");
@@ -230,7 +230,7 @@
//
tab->addTab(_("MIDI"));
- _globalMIDIOverride = new CheckboxWidget(tab, "GameOptions_MIDI.EnableTabCheckbox", _("Override global MIDI settings"), kCmdGlobalMIDIOverride, 0);
+ _globalMIDIOverride = new CheckboxWidget(tab, "GameOptions_MIDI.EnableTabCheckbox", _("Override global MIDI settings"), kCmdGlobalMIDIOverride);
if (_guioptions & Common::GUIO_NOMIDI)
_globalMIDIOverride->setEnabled(false);
@@ -246,15 +246,15 @@
// in the small version of the GUI.
// GUI: Button + Label for the game path
- new ButtonWidget(tab, "GameOptions_Paths.Gamepath", _("Game Path:"), kCmdGameBrowser, 0);
+ new ButtonWidget(tab, "GameOptions_Paths.Gamepath", _("Game Path:"), kCmdGameBrowser);
_gamePathWidget = new StaticTextWidget(tab, "GameOptions_Paths.GamepathText", gamePath);
// GUI: Button + Label for the additional path
- new ButtonWidget(tab, "GameOptions_Paths.Extrapath", _("Extra Path:"), kCmdExtraBrowser, 0);
+ new ButtonWidget(tab, "GameOptions_Paths.Extrapath", _("Extra Path:"), kCmdExtraBrowser);
_extraPathWidget = new StaticTextWidget(tab, "GameOptions_Paths.ExtrapathText", extraPath);
// GUI: Button + Label for the save path
- new ButtonWidget(tab, "GameOptions_Paths.Savepath", _("Save Path:"), kCmdSaveBrowser, 0);
+ new ButtonWidget(tab, "GameOptions_Paths.Savepath", _("Save Path:"), kCmdSaveBrowser);
_savePathWidget = new StaticTextWidget(tab, "GameOptions_Paths.SavepathText", savePath);
// Activate the first tab
@@ -262,8 +262,8 @@
_tabWidget = tab;
// Add OK & Cancel buttons
- new ButtonWidget(this, "GameOptions.Cancel", _("Cancel"), kCloseCmd, 0);
- new ButtonWidget(this, "GameOptions.Ok", _("OK"), kOKCmd, 0);
+ new ButtonWidget(this, "GameOptions.Cancel", _("Cancel"), kCloseCmd);
+ new ButtonWidget(this, "GameOptions.Ok", _("OK"), kOKCmd);
}
void EditGameDialog::open() {
@@ -497,22 +497,22 @@
new StaticTextWidget(this, "Launcher.Version", gScummVMFullVersion);
#endif
- new ButtonWidget(this, "Launcher.QuitButton", _("Quit"), kQuitCmd, 'Q');
- new ButtonWidget(this, "Launcher.AboutButton", _("About..."), kAboutCmd, 'B');
- new ButtonWidget(this, "Launcher.OptionsButton", _("Options..."), kOptionsCmd, 'O');
+ new ButtonWidget(this, "Launcher.QuitButton", _("~Q~uit"), kQuitCmd);
+ new ButtonWidget(this, "Launcher.AboutButton", _("A~b~out..."), kAboutCmd);
+ new ButtonWidget(this, "Launcher.OptionsButton", _("~O~ptions..."), kOptionsCmd);
_startButton =
- new ButtonWidget(this, "Launcher.StartButton", _("Start"), kStartCmd, 'S');
+ new ButtonWidget(this, "Launcher.StartButton", _("~S~tart"), kStartCmd);
_loadButton =
- new ButtonWidget(this, "Launcher.LoadGameButton", _("Load..."), kLoadGameCmd, 'L');
+ new ButtonWidget(this, "Launcher.LoadGameButton", _("~L~oad..."), kLoadGameCmd);
// Above the lowest button rows: two more buttons (directly below the list box)
_addButton =
- new ButtonWidget(this, "Launcher.AddGameButton", _("Add Game..."), kAddGameCmd, 'A');
+ new ButtonWidget(this, "Launcher.AddGameButton", _("~A~dd Game..."), kAddGameCmd);
_editButton =
- new ButtonWidget(this, "Launcher.EditGameButton", _("Edit Game..."), kEditGameCmd, 'E');
+ new ButtonWidget(this, "Launcher.EditGameButton", _("~E~dit Game..."), kEditGameCmd);
_removeButton =
- new ButtonWidget(this, "Launcher.RemoveGameButton", _("Remove Game"), kRemoveGameCmd, 'R');
+ new ButtonWidget(this, "Launcher.RemoveGameButton", _("~R~emove Game"), kRemoveGameCmd);
// Search box
_searchDesc = 0;
@@ -526,7 +526,7 @@
_searchDesc = new StaticTextWidget(this, "Launcher.SearchDesc", _("Search:"));
_searchWidget = new EditTextWidget(this, "Launcher.Search", _search, kSearchCmd);
- _searchClearButton = new ButtonWidget(this, "Launcher.SearchClearButton", "C", kSearchClearCmd, 0);
+ _searchClearButton = new ButtonWidget(this, "Launcher.SearchClearButton", "C", kSearchClearCmd);
// Add list with game titles
_list = new ListWidget(this, "Launcher.GameList", kListSearchCmd);
Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp 2010-06-15 10:46:37 UTC (rev 49765)
+++ scummvm/trunk/gui/options.cpp 2010-06-15 10:47:31 UTC (rev 49766)
@@ -613,10 +613,10 @@
}
// Fullscreen checkbox
- _fullscreenCheckbox = new CheckboxWidget(boss, prefix + "grFullscreenCheckbox", _("Fullscreen mode"), 0, 0);
+ _fullscreenCheckbox = new CheckboxWidget(boss, prefix + "grFullscreenCheckbox", _("Fullscreen mode"));
// Aspect ratio checkbox
- _aspectCheckbox = new CheckboxWidget(boss, prefix + "grAspectCheckbox", _("Aspect ratio correction"), 0, 0);
+ _aspectCheckbox = new CheckboxWidget(boss, prefix + "grAspectCheckbox", _("Aspect ratio correction"));
_enableGraphicSettings = true;
}
@@ -657,18 +657,18 @@
void OptionsDialog::addMIDIControls(GuiObject *boss, const Common::String &prefix) {
// SoundFont
- _soundFontButton = new ButtonWidget(boss, prefix + "mcFontButton", _("SoundFont:"), kChooseSoundFontCmd, 0);
+ _soundFontButton = new ButtonWidget(boss, prefix + "mcFontButton", _("SoundFont:"), kChooseSoundFontCmd);
_soundFont = new StaticTextWidget(boss, prefix + "mcFontPath", _("None"));
- _soundFontClearButton = new ButtonWidget(boss, prefix + "mcFontClearButton", "C", kClearSoundFontCmd, 0);
+ _soundFontClearButton = new ButtonWidget(boss, prefix + "mcFontClearButton", "C", kClearSoundFontCmd);
// Multi midi setting
- _multiMidiCheckbox = new CheckboxWidget(boss, prefix + "mcMixedCheckbox", _("Mixed AdLib/MIDI mode"), 0, 0);
+ _multiMidiCheckbox = new CheckboxWidget(boss, prefix + "mcMixedCheckbox", _("Mixed AdLib/MIDI mode"));
// Native mt32 setting
- _mt32Checkbox = new CheckboxWidget(boss, prefix + "mcMt32Checkbox", _("True Roland MT-32 (disable GM emulation)"), 0, 0);
+ _mt32Checkbox = new CheckboxWidget(boss, prefix + "mcMt32Checkbox", _("True Roland MT-32 (disable GM emulation)"));
// GS Extensions setting
- _enableGSCheckbox = new CheckboxWidget(boss, prefix + "mcGSCheckbox", _("Enable Roland GS Mode"), 0, 0);
+ _enableGSCheckbox = new CheckboxWidget(boss, prefix + "mcGSCheckbox", _("Enable Roland GS Mode"));
// MIDI gain setting (FluidSynth uses this)
_midiGainDesc = new StaticTextWidget(boss, prefix + "mcMidiGainText", _("MIDI gain:"));
@@ -685,7 +685,7 @@
void OptionsDialog::addSubtitleControls(GuiObject *boss, const Common::String &prefix, int maxSliderVal) {
_subToggleDesc = new StaticTextWidget(boss, prefix + "subToggleDesc", _("Text and Speech:"));
- _subToggleButton = new ButtonWidget(boss, prefix + "subToggleButton", "", kSubtitleToggle, 0);
+ _subToggleButton = new ButtonWidget(boss, prefix + "subToggleButton", "", kSubtitleToggle);
// Subtitle speed
_subSpeedDesc = new StaticTextWidget(boss, prefix + "subSubtitleSpeedDesc", _("Subtitle speed:"));
@@ -707,7 +707,7 @@
_musicVolumeSlider->setMaxValue(Audio::Mixer::kMaxMixerVolume);
_musicVolumeLabel->setFlags(WIDGET_CLEARBG);
- _muteCheckbox = new CheckboxWidget(boss, prefix + "vcMuteCheckbox", _("Mute All"), kMuteAllChanged, 0);
+ _muteCheckbox = new CheckboxWidget(boss, prefix + "vcMuteCheckbox", _("Mute All"), kMuteAllChanged);
_sfxVolumeDesc = new StaticTextWidget(boss, prefix + "vcSfxText", _("SFX volume:"));
@@ -794,24 +794,24 @@
// truncated in the small version of the GUI.
// Save game path
- new ButtonWidget(tab, "GlobalOptions_Paths.SaveButton", _("Save Path: "), kChooseSaveDirCmd, 0);
+ new ButtonWidget(tab, "GlobalOptions_Paths.SaveButton", _("Save Path: "), kChooseSaveDirCmd);
_savePath = new StaticTextWidget(tab, "GlobalOptions_Paths.SavePath", "/foo/bar");
- new ButtonWidget(tab, "GlobalOptions_Paths.ThemeButton", _("Theme Path:"), kChooseThemeDirCmd, 0);
+ new ButtonWidget(tab, "GlobalOptions_Paths.ThemeButton", _("Theme Path:"), kChooseThemeDirCmd);
_themePath = new StaticTextWidget(tab, "GlobalOptions_Paths.ThemePath", _("None"));
- new ButtonWidget(tab, "GlobalOptions_Paths.ExtraButton", _("Extra Path:"), kChooseExtraDirCmd, 0);
+ new ButtonWidget(tab, "GlobalOptions_Paths.ExtraButton", _("Extra Path:"), kChooseExtraDirCmd);
_extraPath = new StaticTextWidget(tab, "GlobalOptions_Paths.ExtraPath", _("None"));
#ifdef DYNAMIC_MODULES
- new ButtonWidget(tab, "GlobalOptions_Paths.PluginsButton", _("Plugins Path:"), kChoosePluginsDirCmd, 0);
+ new ButtonWidget(tab, "GlobalOptions_Paths.PluginsButton", _("Plugins Path:"), kChoosePluginsDirCmd);
_pluginsPath = new StaticTextWidget(tab, "GlobalOptions_Paths.PluginsPath", _("None"));
#endif
#endif
tab->addTab(_("Misc"));
- new ButtonWidget(tab, "GlobalOptions_Misc.ThemeButton", _("Theme:"), kChooseThemeCmd, 0);
+ new ButtonWidget(tab, "GlobalOptions_Misc.ThemeButton", _("Theme:"), kChooseThemeCmd);
_curTheme = new StaticTextWidget(tab, "GlobalOptions_Misc.CurTheme", g_gui.theme()->getThemeName());
@@ -829,7 +829,7 @@
}
#ifdef SMALL_SCREEN_DEVICE
- new ButtonWidget(tab, "GlobalOptions_Misc.KeysButton", _("Keys"), kChooseKeyMappingCmd, 0);
+ new ButtonWidget(tab, "GlobalOptions_Misc.KeysButton", _("Keys"), kChooseKeyMappingCmd);
#endif
// TODO: joystick setting
@@ -858,8 +858,8 @@
_tabWidget = tab;
// Add OK & Cancel buttons
- new ButtonWidget(this, "GlobalOptions.Cancel", _("Cancel"), kCloseCmd, 0);
- new ButtonWidget(this, "GlobalOptions.Ok", _("OK"), kOKCmd, 0);
+ new ButtonWidget(this, "GlobalOptions.Cancel", _("Cancel"), kCloseCmd);
+ new ButtonWidget(this, "GlobalOptions.Ok", _("OK"), kOKCmd);
#ifdef SMALL_SCREEN_DEVICE
_keysDialog = new KeysDialog();
Modified: scummvm/trunk/gui/saveload.cpp
===================================================================
--- scummvm/trunk/gui/saveload.cpp 2010-06-15 10:46:37 UTC (rev 49765)
+++ scummvm/trunk/gui/saveload.cpp 2010-06-15 10:47:31 UTC (rev 49766)
@@ -62,11 +62,11 @@
_playtime = new StaticTextWidget(this, 0, 0, 10, 10, _("No playtime saved"), Graphics::kTextAlignCenter);
// Buttons
- new GUI::ButtonWidget(this, "SaveLoadChooser.Cancel", _("Cancel"), kCloseCmd, 0);
- _chooseButton = new GUI::ButtonWidget(this, "SaveLoadChooser.Choose", buttonLabel, kChooseCmd, 0);
+ new GUI::ButtonWidget(this, "SaveLoadChooser.Cancel", _("Cancel"), kCloseCmd);
+ _chooseButton = new GUI::ButtonWidget(this, "SaveLoadChooser.Choose", buttonLabel, kChooseCmd);
_chooseButton->setEnabled(false);
- _deleteButton = new GUI::ButtonWidget(this, "SaveLoadChooser.Delete", _("Delete"), kDelCmd, 0);
+ _deleteButton = new GUI::ButtonWidget(this, "SaveLoadChooser.Delete", _("Delete"), kDelCmd);
_deleteButton->setEnabled(false);
_delSupport = _metaInfoSupport = _thumbnailSupport = false;
Modified: scummvm/trunk/gui/themebrowser.cpp
===================================================================
--- scummvm/trunk/gui/themebrowser.cpp 2010-06-15 10:46:37 UTC (rev 49765)
+++ scummvm/trunk/gui/themebrowser.cpp 2010-06-15 10:47:31 UTC (rev 49766)
@@ -53,8 +53,8 @@
_backgroundType = GUI::ThemeEngine::kDialogBackgroundPlain;
// Buttons
- new ButtonWidget(this, "Browser.Cancel", _("Cancel"), kCloseCmd, 0);
- new ButtonWidget(this, "Browser.Choose", _("Choose"), kChooseCmd, 0);
+ new ButtonWidget(this, "Browser.Cancel", _("Cancel"), kCloseCmd);
+ new ButtonWidget(this, "Browser.Choose", _("Choose"), kChooseCmd);
}
void ThemeBrowser::open() {
Modified: scummvm/trunk/gui/widget.cpp
===================================================================
--- scummvm/trunk/gui/widget.cpp 2010-06-15 10:46:37 UTC (rev 49765)
+++ scummvm/trunk/gui/widget.cpp 2010-06-15 10:47:31 UTC (rev 49766)
@@ -177,6 +177,51 @@
return !(_flags & WIDGET_INVISIBLE);
}
+uint8 Widget::parseHotkey(const Common::String &label) {
+ if (!label.contains('~'))
+ return 0;
+
+ int state = 0;
+ uint8 hotkey = 0;
+
+ for (uint i = 0; i < label.size() && state != 3; i++) {
+ switch (state) {
+ case 0:
+ if (label[i] == '~')
+ state = 1;
+ break;
+ case 1:
+ if (label[i] != '~') {
+ state = 2;
+ hotkey = label[i];
+ } else
+ state = 0;
+ break;
+ case 2:
+ if (label[i] == '~')
+ state = 3;
+ else
+ state = 0;
+ break;
+ }
+ }
+
+ if (state == 3)
+ return hotkey;
+
+ return 0;
+}
+
+Common::String Widget::cleanupHotkey(const Common::String &label) {
+ Common::String res;
+
+ for (uint i = 0; i < label.size() ; i++)
+ if (label[i] != '~')
+ res = res + label[i];
+
+ return res;
+}
+
#pragma mark -
StaticTextWidget::StaticTextWidget(GuiObject *boss, int x, int y, int w, int h, const Common::String &text, Graphics::TextAlign align)
@@ -228,15 +273,21 @@
#pragma mark -
ButtonWidget::ButtonWidget(GuiObject *boss, int x, int y, int w, int h, const Common::String &label, uint32 cmd, uint8 hotkey)
- : StaticTextWidget(boss, x, y, w, h, label, Graphics::kTextAlignCenter), CommandSender(boss),
- _cmd(cmd), _hotkey(hotkey) {
+ : StaticTextWidget(boss, x, y, w, h, cleanupHotkey(label), Graphics::kTextAlignCenter), CommandSender(boss),
+ _cmd(cmd) {
+
+ if (hotkey == 0)
+ _hotkey = parseHotkey(label);
+
setFlags(WIDGET_ENABLED/* | WIDGET_BORDER*/ | WIDGET_CLEARBG);
_type = kButtonWidget;
}
ButtonWidget::ButtonWidget(GuiObject *boss, const Common::String &name, const Common::String &label, uint32 cmd, uint8 hotkey)
- : StaticTextWidget(boss, name, label), CommandSender(boss),
- _cmd(cmd), _hotkey(hotkey) {
+ : StaticTextWidget(boss, name, cleanupHotkey(label)), CommandSender(boss),
+ _cmd(cmd) {
+ if (hotkey == 0)
+ _hotkey = parseHotkey(label);
setFlags(WIDGET_ENABLED/* | WIDGET_BORDER*/ | WIDGET_CLEARBG);
_type = kButtonWidget;
}
Modified: scummvm/trunk/gui/widget.h
===================================================================
--- scummvm/trunk/gui/widget.h 2010-06-15 10:46:37 UTC (rev 49765)
+++ scummvm/trunk/gui/widget.h 2010-06-15 10:47:31 UTC (rev 49766)
@@ -135,6 +135,9 @@
void setVisible(bool e);
bool isVisible() const;
+ uint8 parseHotkey(const Common::String &label);
+ Common::String cleanupHotkey(const Common::String &label);
+
protected:
void updateState(int oldFlags, int newFlags);
Modified: scummvm/trunk/po/POTFILES
===================================================================
--- scummvm/trunk/po/POTFILES 2010-06-15 10:46:37 UTC (rev 49765)
+++ scummvm/trunk/po/POTFILES 2010-06-15 10:47:31 UTC (rev 49766)
@@ -2,6 +2,7 @@
gui/about.cpp
gui/browser.cpp
+gui/chooser.cpp
gui/error.cpp
gui/GuiManager.cpp
gui/KeysDialog.cpp
@@ -17,6 +18,7 @@
common/error.cpp
engines/dialogs.cpp
+engines/scumm/dialogs.cpp
sound/mididrv.cpp
Modified: scummvm/trunk/po/hu_HU.po
===================================================================
--- scummvm/trunk/po/hu_HU.po 2010-06-15 10:46:37 UTC (rev 49765)
+++ scummvm/trunk/po/hu_HU.po 2010-06-15 10:47:31 UTC (rev 49766)
@@ -1,18 +1,3 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2010-06-08 13:39-0100\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
# LANGUAGE translation for ScummVM.
# Copyright (C) 2009 ScummVM
# This file is distributed under the same license as the ScummVM package.
@@ -21,16 +6,328 @@
msgid ""
msgstr ""
"Project-Id-Version: ScummVM VERSION\n"
-"Report-Msgid-Bugs-To: scummvm-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-11-25 07:10-0500\n"
+"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
+"POT-Creation-Date: 2010-06-10 17:42+0300\n"
"PO-Revision-Date: 2009-11-25 07:42-0500\n"
"Last-Translator: Alex Bevilacqua <alexbevi at gmail.com>\n"
"Language-Team: Hungarian\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=cp1250\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: gui/about.cpp:117
+msgid "C2(built on "
+msgstr ""
+
+#: gui/about.cpp:125
+msgid "C1Features compiled in:"
+msgstr ""
+
+#: gui/about.cpp:132
+msgid "C1Available engines:"
+msgstr ""
+
+#: gui/browser.cpp:69
+msgid "Go up"
+msgstr ""
+
+#: gui/browser.cpp:70 gui/KeysDialog.cpp:45 gui/launcher.cpp:265
+#: gui/massadd.cpp:95 gui/options.cpp:859 gui/saveload.cpp:65
+#: gui/saveload.cpp:157 gui/themebrowser.cpp:56 engines/dialogs.cpp:302
+#: gui/options.cpp:861 gui/chooser.cpp:49
+msgid "Cancel"
+msgstr ""
+
+#: gui/browser.cpp:71 gui/themebrowser.cpp:57 gui/chooser.cpp:50
+msgid "Choose"
+msgstr ""
+
+#: gui/GuiManager.cpp:75
+msgid "Failed to load any GUI theme, aborting"
+msgstr ""
+
+#: gui/GuiManager.cpp:98
+msgid "Close"
+msgstr ""
+
+#: gui/GuiManager.cpp:101
+msgid "Mouse click"
+msgstr ""
+
+#: gui/GuiManager.cpp:104 base/main.cpp:284
+msgid "Display keyboard"
+msgstr ""
+
+#: gui/GuiManager.cpp:107 base/main.cpp:287
+msgid "Remap keys"
+msgstr ""
+
+#: gui/KeysDialog.cpp:43
+msgid "Map"
+msgstr ""
+
+#: gui/KeysDialog.cpp:44 gui/launcher.cpp:266 gui/launcher.cpp:873
+#: gui/launcher.cpp:877 gui/massadd.cpp:92 gui/options.cpp:860
+#: engines/dialogs.cpp:301 gui/options.cpp:862
+msgid "OK"
+msgstr "Igen"
+
+#: gui/KeysDialog.cpp:51
+msgid "Select an action and click 'Map'"
+msgstr ""
+
+#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143
+#, c-format
+msgid "Associated key : %s"
+msgstr ""
+
+#: gui/KeysDialog.cpp:84 gui/KeysDialog.cpp:106 gui/KeysDialog.cpp:145
+#, c-format
+msgid "Associated key : none"
+msgstr ""
+
+#: gui/KeysDialog.cpp:92
+msgid "Please select an action"
+msgstr ""
+
+#: gui/KeysDialog.cpp:108
+msgid "Press the key to associate"
+msgstr ""
+
+#: gui/KeysDialog.cpp:147
+msgid "Choose an action to map"
+msgstr ""
+
+#: gui/launcher.cpp:170
+msgid "Game"
+msgstr ""
+
+#: gui/launcher.cpp:173
+msgid "ID:"
+msgstr ""
+
+#: gui/launcher.cpp:177
+msgid "Name:"
+msgstr ""
+
+#: gui/launcher.cpp:181 gui/options.cpp:839
+msgid "Language:"
+msgstr ""
+
+#: gui/launcher.cpp:183 gui/launcher.cpp:193 gui/options.cpp:73
+#: gui/options.cpp:598 gui/options.cpp:608 gui/options.cpp:842
+#: sound/mididrv.cpp:38 sound/mididrv.cpp:39
+msgid "<default>"
+msgstr "<alap\xE9rtelmezett>"
+
+#: gui/launcher.cpp:191
+msgid "Platform:"
+msgstr ""
+
+#: gui/launcher.cpp:203 gui/options.cpp:749 gui/options.cpp:766
+msgid "Graphics"
+msgstr "Grafik\xE1val"
+
+#: gui/launcher.cpp:203 gui/options.cpp:749 gui/options.cpp:766
+msgid "GFX"
+msgstr ""
+
+#: gui/launcher.cpp:205
+msgid "Override global graphic settings"
+msgstr ""
+
+#: gui/launcher.cpp:212 gui/options.cpp:772
+msgid "Audio"
+msgstr "Hang"
+
+#: gui/launcher.cpp:214
+msgid "Override global audio settings"
+msgstr ""
+
+#: gui/launcher.cpp:222 gui/options.cpp:776
+msgid "Volume"
+msgstr "Volumene"
+
+#: gui/launcher.cpp:224
+msgid "Override global volume settings"
+msgstr ""
+
+#: gui/launcher.cpp:231 gui/options.cpp:784
+msgid "MIDI"
+msgstr ""
+
+#: gui/launcher.cpp:233
+msgid "Override global MIDI settings"
+msgstr ""
+
+#: gui/launcher.cpp:243 gui/options.cpp:790
+msgid "Paths"
+msgstr "\xD6sv\xE9nyek"
+
+#: gui/launcher.cpp:249
+#, fuzzy
+msgid "Game Path:"
+msgstr "Extra \xDAtvonal:"
+
+#: gui/launcher.cpp:253 gui/options.cpp:803
+msgid "Extra Path:"
+msgstr "Extra \xDAtvonal:"
+
+#: gui/launcher.cpp:257
+#, fuzzy
+msgid "Save Path:"
+msgstr "Extra \xDAtvonal:"
+
+#: gui/launcher.cpp:274 gui/launcher.cpp:353 gui/launcher.cpp:398
+#: gui/options.cpp:226 gui/options.cpp:382 gui/options.cpp:480
+#: gui/options.cpp:526 gui/options.cpp:661 gui/options.cpp:801
+#: gui/options.cpp:804 gui/options.cpp:808 gui/options.cpp:883
+#: gui/options.cpp:889 gui/options.cpp:895 gui/options.cpp:903
+#: gui/options.cpp:927 gui/options.cpp:931 gui/options.cpp:937
+#: gui/options.cpp:944 gui/options.cpp:1050 gui/options.cpp:885
+#: gui/options.cpp:891 gui/options.cpp:897 gui/options.cpp:905
+#: gui/options.cpp:929 gui/options.cpp:933 gui/options.cpp:939
+#: gui/options.cpp:946 gui/options.cpp:1045
+msgid "None"
+msgstr "Semmi"
+
+#: gui/launcher.cpp:279 gui/launcher.cpp:357
+#, fuzzy
+msgid "Default"
+msgstr "<alap\xE9rtelmezett>"
+
+#: gui/launcher.cpp:391 gui/options.cpp:1044 gui/options.cpp:1039
+msgid "Select SoundFont"
+msgstr ""
+
+#: gui/launcher.cpp:410 gui/launcher.cpp:548
+msgid "Select directory with game data"
+msgstr ""
+
+#: gui/launcher.cpp:428
+msgid "Select additional game directory"
+msgstr ""
+
+#: gui/launcher.cpp:440
+msgid "Select directory for saved games"
+msgstr ""
+
+#: gui/launcher.cpp:459
+msgid "This game ID is already taken. Please choose another one."
+msgstr ""
+
+#: gui/launcher.cpp:500 engines/dialogs.cpp:113
+msgid "Quit"
+msgstr ""
+
+#: gui/launcher.cpp:501
+msgid "About..."
+msgstr ""
+
+#: gui/launcher.cpp:502
+msgid "Options..."
+msgstr ""
+
+#: gui/launcher.cpp:504
+msgid "Start"
+msgstr ""
+
+#: gui/launcher.cpp:507
+msgid "Load..."
+msgstr ""
+
+#: gui/launcher.cpp:511 gui/launcher.cpp:990
+msgid "Add Game..."
+msgstr ""
+
+#: gui/launcher.cpp:513
+msgid "Edit Game..."
+msgstr ""
+
+#: gui/launcher.cpp:515
+msgid "Remove Game"
+msgstr ""
+
+#: gui/launcher.cpp:526 gui/launcher.cpp:1037
+msgid "Search:"
+msgstr ""
+
+#: gui/launcher.cpp:551 engines/dialogs.cpp:117
+msgid "Load game:"
+msgstr ""
+
+#: gui/launcher.cpp:551 engines/dialogs.cpp:91 engines/dialogs.cpp:117
+msgid "Load"
+msgstr ""
+
+#: gui/launcher.cpp:660
+msgid ""
+"Do you really want to run the mass game detector? This could potentially add "
+"a huge number of games."
+msgstr ""
+
+#: gui/launcher.cpp:661 gui/launcher.cpp:810
+msgid "Yes"
+msgstr ""
+
+#: gui/launcher.cpp:661 gui/launcher.cpp:810
+#, fuzzy
+msgid "No"
+msgstr "Semmi"
+
+#: gui/launcher.cpp:708
+msgid "ScummVM couldn't open the specified directory!"
+msgstr ""
+
+#: gui/launcher.cpp:720
+msgid "ScummVM could not find any game in the specified directory!"
+msgstr ""
+
+#: gui/launcher.cpp:734
+msgid "Pick the game:"
+msgstr ""
+
+#: gui/launcher.cpp:810
+msgid "Do you really want to remove this game configuration?"
+msgstr ""
+
+#: gui/launcher.cpp:873
+msgid "This game does not support loading games from the launcher."
+msgstr ""
+
+#: gui/launcher.cpp:877
+msgid "ScummVM could not find any engine capable of running the selected game!"
+msgstr ""
+
+#: gui/launcher.cpp:989
+msgid "Mass Add..."
+msgstr ""
+
+#: gui/massadd.cpp:79 gui/massadd.cpp:82
+msgid "... progress ..."
+msgstr ""
+
+#: gui/massadd.cpp:244
+#, c-format
+msgid "Scan complete!"
+msgstr ""
+
+#: gui/massadd.cpp:247
+#, c-format
+msgid "Discovered %d new games."
+msgstr ""
+
+#: gui/massadd.cpp:251
+#, c-format
+msgid "Scanned %d directories ..."
+msgstr ""
+
+#: gui/massadd.cpp:254
+#, c-format
+msgid "Discovered %d new games ..."
+msgstr ""
+
#: gui/options.cpp:71
msgid "Never"
msgstr "Soha"
@@ -51,21 +348,16 @@
msgid "every 30 mins"
msgstr "30 percenk\xE9nt"
-#: gui/options.cpp:73 gui/options.cpp:598 gui/options.cpp:608
-#: gui/options.cpp:838
-msgid "<default>"
-msgstr "<alap\xE9rtelmezett>"
-
#: gui/options.cpp:73
-msgid "22 kHz"
+msgid "8 kHz"
msgstr ""
#: gui/options.cpp:73
-msgid "8 kHz"
+msgid "11kHz"
msgstr ""
#: gui/options.cpp:73
-msgid "11kHz"
+msgid "22 kHz"
msgstr ""
#: gui/options.cpp:73
@@ -92,15 +384,6 @@
msgid "Speech & Subs"
msgstr "Besz\xE9d s Feliratok"
-#: gui/options.cpp:226 gui/options.cpp:382 gui/options.cpp:480
-#: gui/options.cpp:526 gui/options.cpp:661 gui/options.cpp:801
-#: gui/options.cpp:804 gui/options.cpp:882 gui/options.cpp:888
-#: gui/options.cpp:894 gui/options.cpp:902 gui/options.cpp:926
-#: gui/options.cpp:930 gui/options.cpp:936 gui/options.cpp:943
-#: gui/options.cpp:1049
-msgid "None"
-msgstr "Semmi"
-
#: gui/options.cpp:595
msgid "Graphics mode:"
msgstr "Grafikus m\xF3d:"
@@ -173,36 +456,6 @@
msgid "Speech volume:"
msgstr "Besz\xE9d mennyis\xE9g:"
-#: gui/options.cpp:743
-msgid ""
-"Wrong configuration: Both subtitles and speech are off. Assuming subtitles "
-"only"
-msgstr ""
-
-#: gui/options.cpp:749
-msgid "Graphics"
-msgstr "Grafik\xE1val"
-
-#: gui/options.cpp:749
-msgid "GFX"
-msgstr ""
-
-#: gui/options.cpp:772
-msgid "Audio"
-msgstr "Hang"
-
-#: gui/options.cpp:776
-msgid "Volume"
-msgstr "Volumene"
-
-#: gui/options.cpp:784
-msgid "MIDI"
-msgstr ""
-
-#: gui/options.cpp:790
-msgid "Paths"
-msgstr "\xD6sv\xE9nyek"
-
#: gui/options.cpp:797
msgid "Save Path: "
msgstr ""
@@ -211,10 +464,6 @@
msgid "Theme Path:"
msgstr ""
-#: gui/options.cpp:803
-msgid "Extra Path:"
-msgstr "Extra \xDAtvonal:"
-
#: gui/options.cpp:807
msgid "Plugins Path:"
msgstr ""
@@ -235,87 +484,390 @@
msgid "Autosave:"
msgstr "Automatikus ment\xE9s:"
-#: gui/options.cpp:832
+#: gui/options.cpp:832 engines/dialogs.cpp:305
msgid "Keys"
msgstr "Kulcsok"
-#: gui/options.cpp:840
-msgid "Angol"
+#: gui/options.cpp:844
+msgid "English"
msgstr ""
-#: gui/options.cpp:858
-msgid "Szak\xEDtani"
-msgstr ""
-
-#: gui/options.cpp:859
-msgid "OK"
-msgstr "Igen"
-
-#: gui/options.cpp:995
+#: gui/options.cpp:996 gui/options.cpp:991
msgid "Select directory for savegames"
msgstr ""
-#: gui/options.cpp:1002
+#: gui/options.cpp:1003 gui/options.cpp:998
msgid "The chosen directory cannot be written to. Please select another one."
msgstr ""
-#: gui/options.cpp:1011
+#: gui/options.cpp:1012 gui/options.cpp:1007
msgid "Select directory for GUI themes"
msgstr ""
-#: gui/options.cpp:1021
+#: gui/options.cpp:1022 gui/options.cpp:1017
msgid "Select directory for extra files"
msgstr ""
-#: gui/options.cpp:1032
+#: gui/options.cpp:1033 gui/options.cpp:1028
msgid "Select directory for plugins"
msgstr ""
-#: gui/options.cpp:1043
-msgid "Select SoundFont"
+#: gui/saveload.cpp:60 gui/saveload.cpp:241
+msgid "No date saved"
msgstr ""
-#: gui/GuiManager.cpp:73
-msgid "Failed to load any GUI theme, aborting"
+#: gui/saveload.cpp:61 gui/saveload.cpp:242
+msgid "No time saved"
msgstr ""
-#: base/main.cpp:98
+#: gui/saveload.cpp:62 gui/saveload.cpp:243
+msgid "No playtime saved"
+msgstr ""
+
+#: gui/saveload.cpp:69 gui/saveload.cpp:157
+msgid "Delete"
+msgstr ""
+
+#: gui/saveload.cpp:156
+msgid "Do you really want to delete this savegame?"
+msgstr ""
+
+#: gui/saveload.cpp:265
+msgid "Date: "
+msgstr ""
+
+#: gui/saveload.cpp:268
+#, fuzzy
+msgid "Time: "
+msgstr "T\xE9ma:"
+
+#: gui/saveload.cpp:273
+msgid "Playtime: "
+msgstr ""
+
+#: gui/saveload.cpp:286 gui/saveload.cpp:353
+msgid "Untitled savestate"
+msgstr ""
+
+#: gui/themebrowser.cpp:46
+msgid "Select a Theme"
+msgstr ""
+
+#: base/main.cpp:105
#, c-format
msgid "User picked target '%s' (gameid '%s')...\n"
msgstr ""
-#: base/main.cpp:99
+#: base/main.cpp:106
msgid " Looking for a plugin supporting this gameid... "
msgstr ""
-#: base/main.cpp:103
+#: base/main.cpp:110
msgid "failed\n"
msgstr ""
-#: base/main.cpp:104
+#: base/main.cpp:111
#, c-format
msgid ""
"%s is an invalid gameid. Use the --list-games option to list supported gameid"
msgstr ""
-#: base/main.cpp:111
+#: base/main.cpp:118
#, c-format
msgid " Starting '%s'\n"
msgstr ""
-#: base/main.cpp:140
-msgid "Invalid game path"
+#: base/main.cpp:147
+#, c-format
+msgid "%s failed to instantiate engine: %s (target '%s', path '%s')"
msgstr ""
-#: base/main.cpp:143
-msgid "Unable to locate game data"
+#: base/main.cpp:204
+#, c-format
+msgid "Engine does not support debug level '%s'"
msgstr ""
-#: base/main.cpp:146
-msgid "Unknown error"
+#: base/main.cpp:272
+msgid "Menu"
msgstr ""
-#: base/main.cpp:149
-#, c-format
-msgid "%s failed to instantiate engine: %s (target '%s', path '%s')"
-msgstr ""
\ No newline at end of file
+#: base/main.cpp:275
+msgid "Skip"
+msgstr ""
+
+#: base/main.cpp:278
+#, fuzzy
+msgid "Pause"
+msgstr "\xD6sv\xE9nyek"
+
+#: base/main.cpp:281
+msgid "Skip line"
+msgstr ""
+
+#: base/main.cpp:393
+msgid "Error running game:"
+msgstr ""
+
+#: base/main.cpp:419 base/main.cpp:420
+msgid "Could not find any engine capable of running the selected game"
+msgstr ""
+
+#: common/error.cpp:43
+msgid "Invalid Path"
+msgstr ""
+
+#: common/error.cpp:44
+msgid "Game Data not found"
+msgstr ""
+
+#: common/error.cpp:45
+msgid "Game Id not supported"
+msgstr ""
+
+#: common/error.cpp:46
+msgid "Unsupported Color Mode"
+msgstr ""
+
+#: common/error.cpp:48
+msgid "Read permission denied"
+msgstr ""
+
+#: common/error.cpp:49
+msgid "Write permission denied"
+msgstr ""
+
+#: common/error.cpp:52
+msgid "Path not exists"
+msgstr ""
+
+#: common/error.cpp:53
+msgid "Path not a directory"
+msgstr ""
+
+#: common/error.cpp:54
+msgid "Path not a file"
+msgstr ""
+
+#: common/error.cpp:56
+msgid "Cannot create file"
+msgstr ""
+
+#: common/error.cpp:57
+msgid "Reading failed"
+msgstr ""
+
+#: common/error.cpp:58
+msgid "Writing data failed"
+msgstr ""
+
+#: common/error.cpp:60 common/error.cpp:71
+msgid "Unknown Error"
+msgstr ""
+
+#: engines/dialogs.cpp:89
+msgid "Resume"
+msgstr ""
+
+#: engines/dialogs.cpp:95 engines/dialogs.cpp:119
+msgid "Save"
+msgstr ""
+
+#: engines/dialogs.cpp:99
+msgid "Options"
+msgstr ""
+
+#: engines/dialogs.cpp:104
+msgid "Help"
+msgstr ""
+
+#: engines/dialogs.cpp:107
+msgid "About"
+msgstr ""
+
+#: engines/dialogs.cpp:109
+msgid "Return to Launcher"
+msgstr ""
+
+#: engines/dialogs.cpp:119
+msgid "Save game:"
+msgstr ""
+
+#: gui/options.cpp:978
+msgid "You have to restart ScummVM to take the effect."
+msgstr ""
+
+#: gui/ThemeEngine.cpp:333
+msgid "Disabled GFX"
+msgstr ""
+
+#: gui/ThemeEngine.cpp:334
+msgid "Standard Renderer (16bpp)"
+msgstr ""
+
+#: gui/ThemeEngine.cpp:336
+msgid "Antialiased Renderer (16bpp)"
+msgstr ""
+
+#: sound/mididrv.cpp:39 sound/mididrv.cpp:40
+msgid "No music"
+msgstr ""
+
+#: sound/mididrv.cpp:42 sound/mididrv.cpp:43
+msgid "Windows MIDI"
+msgstr ""
+
+#: sound/mididrv.cpp:46 sound/mididrv.cpp:47
+msgid "ALSA"
+msgstr ""
+
+#: sound/mididrv.cpp:50 sound/mididrv.cpp:51
+msgid "Atari ST MIDI"
+msgstr ""
+
+#: sound/mididrv.cpp:54 sound/mididrv.cpp:55
+msgid "SEQ"
+msgstr ""
+
+#: sound/mididrv.cpp:58 sound/mididrv.cpp:59
+msgid "DMedia"
+msgstr ""
+
+#: sound/mididrv.cpp:62 sound/mididrv.cpp:63
+msgid "CAMD"
+msgstr ""
+
+#: sound/mididrv.cpp:66 sound/mididrv.cpp:67
+#, fuzzy
+msgid "CoreAudio"
+msgstr "Hang"
+
+#: sound/mididrv.cpp:68 sound/mididrv.cpp:69
+msgid "CoreMIDI"
+msgstr ""
+
+#: sound/mididrv.cpp:73 sound/mididrv.cpp:74
+msgid "Yamaha Pa1"
+msgstr ""
+
+#: sound/mididrv.cpp:75 sound/mididrv.cpp:76
+msgid "Tapwave Zodiac"
+msgstr ""
+
+#: sound/mididrv.cpp:80 sound/mididrv.cpp:81
+msgid "FluidSynth"
+msgstr ""
+
+#: sound/mididrv.cpp:83 sound/mididrv.cpp:84
+msgid "MT-32 Emulation"
+msgstr ""
+
+#: sound/mididrv.cpp:87 sound/mididrv.cpp:88
+#, fuzzy
+msgid "AdLib"
+msgstr "Hang"
+
+#: sound/mididrv.cpp:88 sound/mididrv.cpp:89
+msgid "PC Speaker"
+msgstr ""
+
+#: sound/mididrv.cpp:89 sound/mididrv.cpp:90
+msgid "IBM PCjr"
+msgstr ""
+
+#: sound/mididrv.cpp:90 sound/mididrv.cpp:91
+msgid "Creative Music System"
+msgstr ""
+
+#: sound/mididrv.cpp:91 sound/mididrv.cpp:92
+msgid "FM Towns"
+msgstr ""
+
+#: sound/mididrv.cpp:93 sound/mididrv.cpp:94
+msgid "TiMidity"
+msgstr ""
+
+#: gui/launcher.cpp:500 engines/dialogs.cpp:113
+msgid "~Q~uit"
+msgstr ""
+
+#: gui/launcher.cpp:501
+msgid "A~b~out..."
+msgstr ""
+
+#: gui/launcher.cpp:502
+msgid "~O~ptions..."
+msgstr ""
+
+#: gui/launcher.cpp:504
+msgid "~S~tart"
+msgstr ""
+
+#: gui/launcher.cpp:507
+msgid "~L~oad..."
+msgstr ""
+
+#: gui/launcher.cpp:511
+msgid "~A~dd Game..."
+msgstr ""
+
+#: gui/launcher.cpp:513
+msgid "~E~dit Game..."
+msgstr ""
+
+#: gui/launcher.cpp:515
+msgid "~R~emove Game"
+msgstr ""
+
+#: engines/dialogs.cpp:89
+msgid "~R~esume"
+msgstr ""
+
+#: engines/dialogs.cpp:91
+msgid "~L~oad"
+msgstr ""
+
+#: engines/dialogs.cpp:95
+msgid "~S~ave"
+msgstr ""
+
+#: engines/dialogs.cpp:99
+msgid "~O~ptions"
+msgstr ""
+
+#: engines/dialogs.cpp:104
+msgid "~H~elp"
+msgstr ""
+
+#: engines/dialogs.cpp:107
+msgid "~A~bout"
+msgstr ""
+
+#: engines/dialogs.cpp:109
+msgid "~R~eturn to Launcher"
+msgstr ""
+
+#: engines/dialogs.cpp:301
+#, fuzzy
+msgid "~O~K"
+msgstr "Igen"
+
+#: engines/dialogs.cpp:302
+msgid "~C~ancel"
+msgstr ""
+
+#: engines/dialogs.cpp:305
+#, fuzzy
+msgid "~K~eys"
+msgstr "Kulcsok"
+
+#: engines/scumm/dialogs.cpp:287
+msgid "~P~revious"
+msgstr ""
+
+#: engines/scumm/dialogs.cpp:288
+msgid "~N~ext"
+msgstr ""
+
+#: engines/scumm/dialogs.cpp:289
+msgid "~C~lose"
+msgstr ""
Modified: scummvm/trunk/po/ru_RU.po
===================================================================
--- scummvm/trunk/po/ru_RU.po 2010-06-15 10:46:37 UTC (rev 49765)
+++ scummvm/trunk/po/ru_RU.po 2010-06-15 10:47:31 UTC (rev 49766)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ScummVM VERSION\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-06-08 17:25+0300\n"
+"POT-Creation-Date: 2010-06-10 17:42+0300\n"
"PO-Revision-Date: 2010-06-08 08:52-0100\n"
"Last-Translator: Eugene Sandulenko <sev at scummvm.org>\n"
"Language-Team: Russian\n"
@@ -36,11 +36,11 @@
#: gui/browser.cpp:70 gui/KeysDialog.cpp:45 gui/launcher.cpp:265
#: gui/massadd.cpp:95 gui/options.cpp:859 gui/saveload.cpp:65
#: gui/saveload.cpp:157 gui/themebrowser.cpp:56 engines/dialogs.cpp:302
-#: gui/options.cpp:861
+#: gui/options.cpp:861 gui/chooser.cpp:49
msgid "Cancel"
msgstr "\xCE\xF2\xEC\xE5\xED\xE0"
-#: gui/browser.cpp:71 gui/themebrowser.cpp:57
+#: gui/browser.cpp:71 gui/themebrowser.cpp:57 gui/chooser.cpp:50
msgid "Choose"
msgstr "\xC2\xFB\xE1\xF0\xE0\xF2\xFC"
@@ -118,7 +118,7 @@
#: gui/launcher.cpp:183 gui/launcher.cpp:193 gui/options.cpp:73
#: gui/options.cpp:598 gui/options.cpp:608 gui/options.cpp:842
-#: sound/mididrv.cpp:38
+#: sound/mididrv.cpp:38 sound/mididrv.cpp:39
msgid "<default>"
msgstr "<\xEF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE>"
@@ -707,78 +707,162 @@
msgid "Antialiased Renderer (16bpp)"
msgstr "\xD0\xE0\xF1\xF2\xE5\xF0\xE8\xE7\xE0\xF2\xEE\xF0 \xF1\xEE \xF1\xE3\xEB\xE0\xE6\xE8\xE2\xE0\xED\xE8\xE5\xEC (16bpp)"
-#: sound/mididrv.cpp:39
+#: sound/mididrv.cpp:39 sound/mididrv.cpp:40
msgid "No music"
msgstr "\xC1\xE5\xE7 \xEC\xF3\xE7\xFB\xEA\xE8"
-#: sound/mididrv.cpp:42
+#: sound/mididrv.cpp:42 sound/mididrv.cpp:43
msgid "Windows MIDI"
msgstr "Windows MIDI"
-#: sound/mididrv.cpp:46
+#: sound/mididrv.cpp:46 sound/mididrv.cpp:47
msgid "ALSA"
msgstr "ALSA"
-#: sound/mididrv.cpp:50
+#: sound/mididrv.cpp:50 sound/mididrv.cpp:51
msgid "Atari ST MIDI"
msgstr "Atars ST MIDI"
-#: sound/mididrv.cpp:54
+#: sound/mididrv.cpp:54 sound/mididrv.cpp:55
msgid "SEQ"
msgstr "SEQ"
-#: sound/mididrv.cpp:58
+#: sound/mididrv.cpp:58 sound/mididrv.cpp:59
msgid "DMedia"
msgstr "DMedia"
-#: sound/mididrv.cpp:62
+#: sound/mididrv.cpp:62 sound/mididrv.cpp:63
msgid "CAMD"
msgstr "CAMD"
-#: sound/mididrv.cpp:66
+#: sound/mididrv.cpp:66 sound/mididrv.cpp:67
msgid "CoreAudio"
msgstr "CoreAudio"
-#: sound/mididrv.cpp:68
+#: sound/mididrv.cpp:68 sound/mididrv.cpp:69
msgid "CoreMIDI"
msgstr "CoreMIDI"
-#: sound/mididrv.cpp:73
+#: sound/mididrv.cpp:73 sound/mididrv.cpp:74
msgid "Yamaha Pa1"
msgstr "Yamaha Pa1"
-#: sound/mididrv.cpp:75
+#: sound/mididrv.cpp:75 sound/mididrv.cpp:76
msgid "Tapwave Zodiac"
msgstr "Tapware Zodiac"
-#: sound/mididrv.cpp:80
+#: sound/mididrv.cpp:80 sound/mididrv.cpp:81
msgid "FluidSynth"
msgstr "FluidSynth"
-#: sound/mididrv.cpp:83
+#: sound/mididrv.cpp:83 sound/mididrv.cpp:84
msgid "MT-32 Emulation"
msgstr "\xDD\xEC\xF3\xEB\xFF\xF6\xE8\xFF MT-32"
-#: sound/mididrv.cpp:87
+#: sound/mididrv.cpp:87 sound/mididrv.cpp:88
msgid "AdLib"
msgstr "AdLib"
-#: sound/mididrv.cpp:88
+#: sound/mididrv.cpp:88 sound/mididrv.cpp:89
msgid "PC Speaker"
msgstr "PC \xF1\xEF\xE8\xEA\xE5\xF0"
-#: sound/mididrv.cpp:89
+#: sound/mididrv.cpp:89 sound/mididrv.cpp:90
msgid "IBM PCjr"
msgstr "IBM PCjr"
-#: sound/mididrv.cpp:90
+#: sound/mididrv.cpp:90 sound/mididrv.cpp:91
msgid "Creative Music System"
msgstr "Creative Music System"
-#: sound/mididrv.cpp:91
+#: sound/mididrv.cpp:91 sound/mididrv.cpp:92
msgid "FM Towns"
msgstr "FM Towns"
-#: sound/mididrv.cpp:93
+#: sound/mididrv.cpp:93 sound/mididrv.cpp:94
msgid "TiMidity"
msgstr "TiMidity"
+
+#: gui/launcher.cpp:500 engines/dialogs.cpp:113
+msgid "~Q~uit"
+msgstr "~\xC2~\xFB\xF5\xEE\xE4"
+
+#: gui/launcher.cpp:501
+msgid "A~b~out..."
+msgstr "\xCE \xEF~\xF0~\xEE\xE3\xF0\xE0\xEC\xEC\xE5..."
+
+#: gui/launcher.cpp:502
+msgid "~O~ptions..."
+msgstr "~\xCE~\xEF\xF6\xE8\xE8..."
+
+#: gui/launcher.cpp:504
+msgid "~S~tart"
+msgstr "\xCF~\xF3~\xF1\xEA"
+
+#: gui/launcher.cpp:507
+msgid "~L~oad..."
+msgstr "~\xC7~\xE0\xE3\xF0...."
+
+#: gui/launcher.cpp:511
+msgid "~A~dd Game..."
+msgstr "~\xC4~\xEE\xE1. \xE8\xE3\xF0\xF3..."
+
+#: gui/launcher.cpp:513
+msgid "~E~dit Game..."
+msgstr "\xC8\xE7~\xEC~. \xE8\xE3\xF0\xF3..."
+
+#: gui/launcher.cpp:515
+msgid "~R~emove Game"
+msgstr "~\xD3~\xE4\xE0\xEB\xE8\xF2\xFC \xE8\xE3\xF0\xF3"
+
+#: engines/dialogs.cpp:89
+msgid "~R~esume"
+msgstr "\xCF\xF0\xEE\xE4\xEE\xEB~\xE6~\xE8\xF2\xFC"
+
+#: engines/dialogs.cpp:91
+msgid "~L~oad"
+msgstr "~\xC7~\xE0\xE3\xF0\xF3\xE7\xE8\xF2\xFC"
+
+#: engines/dialogs.cpp:95
+msgid "~S~ave"
+msgstr "~\xC7~\xE0\xEF\xE8\xF1\xE0\xF2\xFC"
+
+#: engines/dialogs.cpp:99
+msgid "~O~ptions"
+msgstr "~\xCE~\xEF\xF6\xE8\xE8"
+
+#: engines/dialogs.cpp:104
+msgid "~H~elp"
+msgstr "~\xCF~\xEE\xEC\xEE\xF9\xFC"
+
+#: engines/dialogs.cpp:107
+msgid "~A~bout"
+msgstr "\xCE \xEF\xF0\xEE~\xE3~\xF0\xE0\xEC\xEC\xE5"
+
+#: engines/dialogs.cpp:109
+msgid "~R~eturn to Launcher"
+msgstr "~\xC2~\xE5\xF0\xED\xF3\xF2\xFC\xF1\xFF \xE2 \xE3\xEB\xE0\xE2\xED\xEE\xE5 \xEC\xE5\xED\xFE"
+
+#: engines/dialogs.cpp:301
+msgid "~O~K"
+msgstr "~O~K"
+
+#: engines/dialogs.cpp:302
+msgid "~C~ancel"
+msgstr "\xCE~\xF2~\xEC\xE5\xED\xE0"
+
+#: engines/dialogs.cpp:305
+msgid "~K~eys"
+msgstr "~\xCA~\xEB\xE0\xE2\xE8\xF8\xE8"
+
+#: engines/scumm/dialogs.cpp:287
+msgid "~P~revious"
+msgstr "~\xCF~\xF0\xE5\xE4"
+
+#: engines/scumm/dialogs.cpp:288
+msgid "~N~ext"
+msgstr "~\xD1~\xEB\xE5\xE4"
+
+#: engines/scumm/dialogs.cpp:289
+msgid "~C~lose"
+msgstr "~\xC7~\xE0\xEA\xF0\xFB\xF2\xFC"
Modified: scummvm/trunk/po/scummvm.pot
===================================================================
--- scummvm/trunk/po/scummvm.pot 2010-06-15 10:46:37 UTC (rev 49765)
+++ scummvm/trunk/po/scummvm.pot 2010-06-15 10:47:31 UTC (rev 49766)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: ScummVM 1.2.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel at lists.sf.net\n"
-"POT-Creation-Date: 2010-06-08 17:25+0300\n"
+"POT-Creation-Date: 2010-06-10 17:42+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -35,11 +35,11 @@
#: gui/browser.cpp:70 gui/KeysDialog.cpp:45 gui/launcher.cpp:265
#: gui/massadd.cpp:95 gui/options.cpp:859 gui/saveload.cpp:65
#: gui/saveload.cpp:157 gui/themebrowser.cpp:56 engines/dialogs.cpp:302
-#: gui/options.cpp:861
+#: gui/options.cpp:861 gui/chooser.cpp:49
msgid "Cancel"
msgstr ""
-#: gui/browser.cpp:71 gui/themebrowser.cpp:57
+#: gui/browser.cpp:71 gui/themebrowser.cpp:57 gui/chooser.cpp:50
msgid "Choose"
msgstr ""
@@ -117,7 +117,7 @@
#: gui/launcher.cpp:183 gui/launcher.cpp:193 gui/options.cpp:73
#: gui/options.cpp:598 gui/options.cpp:608 gui/options.cpp:842
-#: sound/mididrv.cpp:38
+#: sound/mididrv.cpp:38 sound/mididrv.cpp:39
msgid "<default>"
msgstr ""
@@ -702,78 +702,162 @@
msgid "Antialiased Renderer (16bpp)"
msgstr ""
-#: sound/mididrv.cpp:39
+#: sound/mididrv.cpp:39 sound/mididrv.cpp:40
msgid "No music"
msgstr ""
-#: sound/mididrv.cpp:42
+#: sound/mididrv.cpp:42 sound/mididrv.cpp:43
msgid "Windows MIDI"
msgstr ""
-#: sound/mididrv.cpp:46
+#: sound/mididrv.cpp:46 sound/mididrv.cpp:47
msgid "ALSA"
msgstr ""
-#: sound/mididrv.cpp:50
+#: sound/mididrv.cpp:50 sound/mididrv.cpp:51
msgid "Atari ST MIDI"
msgstr ""
-#: sound/mididrv.cpp:54
+#: sound/mididrv.cpp:54 sound/mididrv.cpp:55
msgid "SEQ"
msgstr ""
-#: sound/mididrv.cpp:58
+#: sound/mididrv.cpp:58 sound/mididrv.cpp:59
msgid "DMedia"
msgstr ""
-#: sound/mididrv.cpp:62
+#: sound/mididrv.cpp:62 sound/mididrv.cpp:63
msgid "CAMD"
msgstr ""
-#: sound/mididrv.cpp:66
+#: sound/mididrv.cpp:66 sound/mididrv.cpp:67
msgid "CoreAudio"
msgstr ""
-#: sound/mididrv.cpp:68
+#: sound/mididrv.cpp:68 sound/mididrv.cpp:69
msgid "CoreMIDI"
msgstr ""
-#: sound/mididrv.cpp:73
+#: sound/mididrv.cpp:73 sound/mididrv.cpp:74
msgid "Yamaha Pa1"
msgstr ""
-#: sound/mididrv.cpp:75
+#: sound/mididrv.cpp:75 sound/mididrv.cpp:76
msgid "Tapwave Zodiac"
msgstr ""
-#: sound/mididrv.cpp:80
+#: sound/mididrv.cpp:80 sound/mididrv.cpp:81
msgid "FluidSynth"
msgstr ""
-#: sound/mididrv.cpp:83
+#: sound/mididrv.cpp:83 sound/mididrv.cpp:84
msgid "MT-32 Emulation"
msgstr ""
-#: sound/mididrv.cpp:87
+#: sound/mididrv.cpp:87 sound/mididrv.cpp:88
msgid "AdLib"
msgstr ""
-#: sound/mididrv.cpp:88
+#: sound/mididrv.cpp:88 sound/mididrv.cpp:89
msgid "PC Speaker"
msgstr ""
-#: sound/mididrv.cpp:89
+#: sound/mididrv.cpp:89 sound/mididrv.cpp:90
msgid "IBM PCjr"
msgstr ""
-#: sound/mididrv.cpp:90
+#: sound/mididrv.cpp:90 sound/mididrv.cpp:91
msgid "Creative Music System"
msgstr ""
-#: sound/mididrv.cpp:91
+#: sound/mididrv.cpp:91 sound/mididrv.cpp:92
msgid "FM Towns"
msgstr ""
-#: sound/mididrv.cpp:93
+#: sound/mididrv.cpp:93 sound/mididrv.cpp:94
msgid "TiMidity"
msgstr ""
+
+#: gui/launcher.cpp:500 engines/dialogs.cpp:113
+msgid "~Q~uit"
+msgstr ""
+
+#: gui/launcher.cpp:501
+msgid "A~b~out..."
+msgstr ""
+
+#: gui/launcher.cpp:502
+msgid "~O~ptions..."
+msgstr ""
+
+#: gui/launcher.cpp:504
+msgid "~S~tart"
+msgstr ""
+
+#: gui/launcher.cpp:507
+msgid "~L~oad..."
+msgstr ""
+
+#: gui/launcher.cpp:511
+msgid "~A~dd Game..."
+msgstr ""
+
+#: gui/launcher.cpp:513
+msgid "~E~dit Game..."
+msgstr ""
+
+#: gui/launcher.cpp:515
+msgid "~R~emove Game"
+msgstr ""
+
+#: engines/dialogs.cpp:89
+msgid "~R~esume"
+msgstr ""
+
+#: engines/dialogs.cpp:91
+msgid "~L~oad"
+msgstr ""
+
+#: engines/dialogs.cpp:95
+msgid "~S~ave"
+msgstr ""
+
+#: engines/dialogs.cpp:99
+msgid "~O~ptions"
+msgstr ""
+
+#: engines/dialogs.cpp:104
+msgid "~H~elp"
+msgstr ""
+
+#: engines/dialogs.cpp:107
+msgid "~A~bout"
+msgstr ""
+
+#: engines/dialogs.cpp:109
+msgid "~R~eturn to Launcher"
+msgstr ""
+
+#: engines/dialogs.cpp:301
+msgid "~O~K"
+msgstr ""
+
+#: engines/dialogs.cpp:302
+msgid "~C~ancel"
+msgstr ""
+
+#: engines/dialogs.cpp:305
+msgid "~K~eys"
+msgstr ""
+
+#: engines/scumm/dialogs.cpp:287
+msgid "~P~revious"
+msgstr ""
+
+#: engines/scumm/dialogs.cpp:288
+msgid "~N~ext"
+msgstr ""
+
+#: engines/scumm/dialogs.cpp:289
+msgid "~C~lose"
+msgstr ""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list