diff --git a/contrib/translations/es/es_ES.lng b/contrib/translations/es/es_ES.lng index 278052b83..48fa56079 100644 --- a/contrib/translations/es/es_ES.lng +++ b/contrib/translations/es/es_ES.lng @@ -2747,4 +2747,4 @@ Mostrar estado de disco IDE o CD . :MENU:pc98_use_uskb Usar distribución de teclado US -. \ No newline at end of file +. diff --git a/contrib/translations/ja/ja_JP.lng b/contrib/translations/ja/ja_JP.lng index 8be12746e..c3b4ab8f9 100644 --- a/contrib/translations/ja/ja_JP.lng +++ b/contrib/translations/ja/ja_JP.lng @@ -20,118 +20,118 @@ MOUNT したい場合はここに記載できます。 詳細オプション (設定リファレンスファイル[dosbox-x.reference.full.conf]を参照) . :CONFIG_TOOL -DOSBox-X Configuration Tool +DOSBox-X 設定ツール . :CONFIG_TOOL_EXIT -Exit configuration tool +設定ツールを終了する . :WARNING -Warning +注意 . :YES -Yes +はい . :NO -No +いいえ . :OK OK . :CANCEL -Cancel +キャンセル . :CLOSE -Close +閉じる . :SAVE -Save +保存 . :SAVE_CONFIGURATION -Save configuration +設定を保存 . :SAVE_LANGUAGE -Save language file +言語ファイルを保存 . :SAVE_RESTART -Save & Restart +保存後に再起動 . :PASTE_CLIPBOARD -Paste Clipboard +クリップボードを貼付け . :APPEND_HISTORY -Append History +履歴を追加 . :EXECUTE_NOW -Execute Now +いま実行する . :ADDITION_CONTENT -Additional Content: +設定内容: . :CONTENT -Content: +実行する内容: . :EDIT_FOR -Edit %s +%s を編集 . :HELP_FOR -Help for %s +%s のヘルプ . :CONFIGURATION_FOR -Configuration for %s +%s の設定 . :CONFIGURATION -Configuration +ファイル . :SETTINGS -Settings +設定 . :HELP -Help +ヘルプ . :VISIT_HOMEPAGE -Visit Homepage +ホームページ . :GET_STARTED -Getting Started +始めに . :CDROM_SUPPORT -CD-ROM Support +CD-ROM サポート . :INTRODUCTION -Introduction +紹介 . :ABOUT -About +DOSBox-Xについて . :CONFIGURE_GROUP -Choose a settings group to configure: +設定するグループを選択: . :SHOW_ADVOPT -Show advanced options +詳細オプションの表示 . :USE_PRIMARYCONFIG -Use primary config file +プライマリ設定ファイルを使用 . :USE_PORTABLECONFIG -Use portable config file +ポータブル設定ファイルを使用 . :USE_USERCONFIG -Use user config file +ユーザ設定ファイルを使用 . :CONFIG_SAVETO -Enter filename for the configuration file to save to: +保存する設定ファイルの名前を入力: . :CONFIG_SAVEALL -Save all (including advanced) config options to the configuration file +全て(詳細オプション含む)のオプションを設定ファイルに保存 . :LANG_FILENAME -Enter filename for language file: +言語ファイル名を入力: . :LANG_LANGNAME -Language name (optional): +言語ファイル名 (オプション): . :INTRO_MESSAGE -Welcome to DOSBox-X, a free and complete DOS emulation package.\nDOSBox-X creates a DOS shell which looks like the plain DOS.\nYou can also run Windows 3.x and 95/98 inside the DOS machine. +DOSBox-Xへようこそ。無料で完全なDOSエミュレーションパッケージです。\nDOSBox-Xは一般的なDOSに似たDOSシェルを表示します。\nDOSマシンからWindows 3.x や 95/98を動作させることもできます。 . :DRIVE ドライブ @@ -219,9 +219,9 @@ DOSBox-X's 作業用ディレクトリ: . :PROGRAM_CONFIG_USAGE DOSBox-X コマンドライン設定ユーティリティ 設定可能なオプション: --wc (or -writeconf): パラメータなしの場合: primary loaded fileに書き込み。 --wc (or -writeconf): ファイル名: ファイルを設定用ディレクトリに書き出す。 --wl (or -writelang): ファイル名: 現在の language stringsを書き出す。 +-wc (or -writeconf) パラメータなしの場合: primary loaded fileに書き込み。 +-wc (or -writeconf) ファイル名: ファイルを設定用ディレクトリに書き出す。 +-wl (or -writelang) ファイル名: 現在の language stringsを書き出す。 -ln (or -langname): 言語名を表示(パラメータなしの場合)または指定する。。 -wcp [ファイル名]: プログラムディレクトリに書出す(dosbox-x.conf / ファイル名) -wcd: 設定用ディレクトリにデフォルト設定ファイルを書き出す。 @@ -2707,7 +2707,7 @@ Windowsのドライブを自動マウント フォルダをFDDとしてマウント . :MENU:drive_mountfro -オプション: 書き込み禁止でフォルダをマウント +オプション: 書込禁止でフォルダをマウント . :MENU:drive_mountarc 書庫ファイル(ZIP/7Z)をマウント diff --git a/src/gui/sdl_gui.cpp b/src/gui/sdl_gui.cpp index a656e7a49..3fec78cee 100644 --- a/src/gui/sdl_gui.cpp +++ b/src/gui/sdl_gui.cpp @@ -987,7 +987,7 @@ public: wiw = new GUI::WindowInWindow(this, 5, 5, width-border_left-border_right-10, scroll_h); int button_row_y = first_row_y + scroll_h + 5; - int button_w = 70; + int button_w = 90; int button_pad_w = 10; int button_row_w = ((button_pad_w + button_w) * 3) - button_pad_w; int button_row_cx = (((columns * column_width) - button_row_w) / 2) + 5; @@ -1006,11 +1006,11 @@ public: GUI::Button *b = new GUI::Button(this, button_row_cx, button_row_y, MSG_Get("HELP"), button_w); b->addActionHandler(this); - b = new GUI::Button(this, button_row_cx + (button_w + button_pad_w), button_row_y, MSG_Get("CANCEL"), button_w); + b = new GUI::Button(this, button_row_cx + (button_w + button_pad_w)*2, button_row_y, MSG_Get("CANCEL"), button_w); b->addActionHandler(this); closeButton = b; - b = new GUI::Button(this, button_row_cx + (button_w + button_pad_w)*2, button_row_y, MSG_Get("OK"), button_w); + b = new GUI::Button(this, button_row_cx + (button_w + button_pad_w), button_row_y, MSG_Get("OK"), button_w); int i = 0, j = 0; Property *prop; @@ -1374,14 +1374,14 @@ public: }; class AutoexecEditor : public GUI::ToplevelWindow { - GUI::Button *closeButton = NULL; + GUI::Button *closeButton = NULL, *pasteButton = NULL, *appendButton = NULL; Section_line * section; GUI::Input *content = NULL; public: std::vector cfg_sname; public: AutoexecEditor(GUI::Screen *parent, int x, int y, Section_line *section) : - ToplevelWindow(parent, x, y, 550, 260 + GUI::titlebar_y_stop, ""), section(section) { + ToplevelWindow(parent, x, y, 550, 310 + GUI::titlebar_y_stop, ""), section(section) { if (section == NULL) { LOG_MSG("BUG: AutoexecEditor constructor called with section == NULL\n"); return; @@ -1394,11 +1394,15 @@ public: new GUI::Label(this, 5, 10, MSG_Get("CONTENT")); content = new GUI::Input(this, 5, 30, 550 - 10 - border_left - border_right, 185); content->setText(section->data); - (new GUI::Button(this, 5, 220, MSG_Get("PASTE_CLIPBOARD")))->addActionHandler(this); - if (first_shell) (new GUI::Button(this, 147, 220, MSG_Get("APPEND_HISTORY")))->addActionHandler(this); - if (shell_idle) (new GUI::Button(this, 281, 220, MSG_Get("EXECUTE_NOW")))->addActionHandler(this); - (closeButton = new GUI::Button(this, 391, 220, MSG_Get("CANCEL"), 70))->addActionHandler(this); - (new GUI::Button(this, 461, 220, MSG_Get("OK"), 70))->addActionHandler(this); + (pasteButton = new GUI::Button(this, 5, 220, MSG_Get("PASTE_CLIPBOARD")))->addActionHandler(this); + int last = 25 + pasteButton->getWidth(); + if (first_shell) { + (appendButton = new GUI::Button(this, last, 220, MSG_Get("APPEND_HISTORY")))->addActionHandler(this); + last += 20 + appendButton->getWidth(); + } + if (shell_idle) (new GUI::Button(this, last, 220, MSG_Get("EXECUTE_NOW")))->addActionHandler(this); + (new GUI::Button(this, 180, 260, MSG_Get("OK"), 90))->addActionHandler(this); + (closeButton = new GUI::Button(this, 285, 260, MSG_Get("CANCEL"), 90))->addActionHandler(this); move(parent->getWidth()>this->getWidth()?(parent->getWidth()-this->getWidth())/2:0,parent->getHeight()>this->getHeight()?(parent->getHeight()-this->getHeight())/2:0); } @@ -1483,9 +1487,9 @@ public: Section_prop * section=static_cast(control->GetSection("dosbox")); saveall = new GUI::Checkbox(this, 5, 95, MSG_Get("CONFIG_SAVEALL")); saveall->setChecked(section->Get_bool("show advanced options")); - (saveButton = new GUI::Button(this, 150, 120, MSG_Get("SAVE"), 70))->addActionHandler(this); - (new GUI::Button(this, 240, 120, MSG_Get("SAVE_RESTART"), 140))->addActionHandler(this); - (closeButton = new GUI::Button(this, 400, 120, MSG_Get("CANCEL"), 70))->addActionHandler(this); + (saveButton = new GUI::Button(this, 140, 120, MSG_Get("SAVE"), 70))->addActionHandler(this); + (new GUI::Button(this, 230, 120, MSG_Get("SAVE_RESTART"), 140))->addActionHandler(this); + (closeButton = new GUI::Button(this, 390, 120, MSG_Get("CANCEL"), 90))->addActionHandler(this); move(parent->getWidth()>this->getWidth()?(parent->getWidth()-this->getWidth())/2:0,parent->getHeight()>this->getHeight()?(parent->getHeight()-this->getHeight())/2:0); name->raise(); /* make sure keyboard focus is on the text field, ready for the user */ @@ -1554,8 +1558,8 @@ public: new GUI::Label(this, 5, 60, MSG_Get("LANG_LANGNAME")); lang = new GUI::Input(this, 5, 80, width - 10 - border_left - border_right); lang->setText(langname.c_str()); - (saveButton = new GUI::Button(this, 120, 110, MSG_Get("OK"), 70))->addActionHandler(this); - (closeButton = new GUI::Button(this, 210, 110, MSG_Get("CANCEL"), 70))->addActionHandler(this); + (saveButton = new GUI::Button(this, 100, 110, MSG_Get("OK"), 90))->addActionHandler(this); + (closeButton = new GUI::Button(this, 200, 110, MSG_Get("CANCEL"), 90))->addActionHandler(this); move(parent->getWidth()>this->getWidth()?(parent->getWidth()-this->getWidth())/2:0,parent->getHeight()>this->getHeight()?(parent->getHeight()-this->getHeight())/2:0); name->raise(); /* make sure keyboard focus is on the text field, ready for the user */ @@ -1633,8 +1637,8 @@ public: std::string rates=str.str(); name->setText(rates.c_str()); - (new GUI::Button(this, 120, 60, MSG_Get("CANCEL"), 70))->addActionHandler(this); - (new GUI::Button(this, 210, 60, MSG_Get("OK"), 70))->addActionHandler(this); + (new GUI::Button(this, 100, 60, MSG_Get("OK"), 90))->addActionHandler(this); + (new GUI::Button(this, 200, 60, MSG_Get("CANCEL"), 90))->addActionHandler(this); move(parent->getWidth()>this->getWidth()?(parent->getWidth()-this->getWidth())/2:0,parent->getHeight()>this->getHeight()?(parent->getHeight()-this->getHeight())/2:0); name->raise(); /* make sure keyboard focus is on the text field, ready for the user */ @@ -1675,8 +1679,8 @@ public: std::string cycles=str.str(); name->setText(cycles.c_str()); - (new GUI::Button(this, 120, 60, MSG_Get("CANCEL"), 70))->addActionHandler(this); - (new GUI::Button(this, 210, 60, MSG_Get("OK"), 70))->addActionHandler(this); + (new GUI::Button(this, 100, 60, MSG_Get("OK"), 90))->addActionHandler(this); + (new GUI::Button(this, 200, 60, MSG_Get("CANCEL"), 90))->addActionHandler(this); move(parent->getWidth()>this->getWidth()?(parent->getWidth()-this->getWidth())/2:0,parent->getHeight()>this->getHeight()?(parent->getHeight()-this->getHeight())/2:0); name->raise(); /* make sure keyboard focus is on the text field, ready for the user */ @@ -1731,8 +1735,8 @@ public: end[i]->setText(std::to_string(autosave_end[i]).c_str()); } new GUI::Label(this, 15, 315, "Note: 0 for start slot = use current slot; -1 for start slot = skip saving"); - (new GUI::Button(this, 250, 335, MSG_Get("OK"), 70))->addActionHandler(this); - (new GUI::Button(this, 330, 335, MSG_Get("CANCEL"), 70))->addActionHandler(this); + (new GUI::Button(this, 225, 335, MSG_Get("OK"), 90))->addActionHandler(this); + (new GUI::Button(this, 325, 335, MSG_Get("CANCEL"), 90))->addActionHandler(this); move(parent->getWidth()>this->getWidth()?(parent->getWidth()-this->getWidth())/2:0,parent->getHeight()>this->getHeight()?(parent->getHeight()-this->getHeight())/2:0); } @@ -1776,8 +1780,8 @@ public: std::string cycles=str.str(); name->setText(cycles.c_str()); - (new GUI::Button(this, 120, 60, MSG_Get("CANCEL"), 70))->addActionHandler(this); - (new GUI::Button(this, 210, 60, MSG_Get("OK"), 70))->addActionHandler(this); + (new GUI::Button(this, 100, 60, MSG_Get("OK"), 90))->addActionHandler(this); + (new GUI::Button(this, 200, 60, MSG_Get("CANCEL"), 90))->addActionHandler(this); move(parent->getWidth()>this->getWidth()?(parent->getWidth()-this->getWidth())/2:0,parent->getHeight()>this->getHeight()?(parent->getHeight()-this->getHeight())/2:0); name->raise(); /* make sure keyboard focus is on the text field, ready for the user */ @@ -1812,8 +1816,8 @@ public: name->setText(sec->Get_string("vsyncrate")); else name->setText(""); - (new GUI::Button(this, 120, 70, MSG_Get("CANCEL"), 70))->addActionHandler(this); - (new GUI::Button(this, 210, 70, MSG_Get("OK"), 70))->addActionHandler(this); + (new GUI::Button(this, 100, 70, MSG_Get("OK"), 90))->addActionHandler(this); + (new GUI::Button(this, 200, 70, MSG_Get("CANCEL"), 90))->addActionHandler(this); move(parent->getWidth()>this->getWidth()?(parent->getWidth()-this->getWidth())/2:0,parent->getHeight()>this->getHeight()?(parent->getHeight()-this->getHeight())/2:0); } @@ -1849,8 +1853,8 @@ public: char buffer[6]; sprintf(buffer, "%u", human_readable); name->setText(buffer); - (new GUI::Button(this, 120, 70, MSG_Get("CANCEL"), 70))->addActionHandler(this); - (new GUI::Button(this, 210, 70, MSG_Get("OK"), 70))->addActionHandler(this); + (new GUI::Button(this, 100, 70, MSG_Get("OK"), 90))->addActionHandler(this); + (new GUI::Button(this, 200, 70, MSG_Get("CANCEL"), 90))->addActionHandler(this); move(parent->getWidth()>this->getWidth()?(parent->getWidth()-this->getWidth())/2:0,parent->getHeight()>this->getHeight()?(parent->getHeight()-this->getHeight())/2:0); } @@ -1879,14 +1883,14 @@ protected: GUI::Input *name; public: SetDOSVersion(GUI::Screen *parent, int x, int y, const char *title) : - ToplevelWindow(parent, x, y, 450, 150, title) { + ToplevelWindow(parent, x, y, 410, 140, title) { new GUI::Label(this, 5, 10, "Enter reported DOS version:"); - name = new GUI::Input(this, 5, 30, 400); + name = new GUI::Input(this, 5, 30, 390); char buffer[8]; sprintf(buffer, "%d.%02d", dos.version.major,dos.version.minor); name->setText(buffer); - (new GUI::Button(this, 120, 70, MSG_Get("CANCEL"), 70))->addActionHandler(this); - (new GUI::Button(this, 210, 70, MSG_Get("OK"), 70))->addActionHandler(this); + (new GUI::Button(this, 100, 70, MSG_Get("OK"), 90))->addActionHandler(this); + (new GUI::Button(this, 200, 70, MSG_Get("CANCEL"), 90))->addActionHandler(this); move(parent->getWidth()>this->getWidth()?(parent->getWidth()-this->getWidth())/2:0,parent->getHeight()>this->getHeight()?(parent->getHeight()-this->getHeight())/2:0); } @@ -2210,8 +2214,8 @@ public: imghd4gig->addActionHandler(this); imghd8gig = new GUI::Checkbox(this, 310, 180, "8GB"); imghd8gig->addActionHandler(this); - (new GUI::Button(this, 160, 220, MSG_Get("OK"), 70))->addActionHandler(this); - (new GUI::Button(this, 260, 220, MSG_Get("CANCEL"), 70))->addActionHandler(this); + (new GUI::Button(this, 135, 220, MSG_Get("OK"), 90))->addActionHandler(this); + (new GUI::Button(this, 255, 220, MSG_Get("CANCEL"), 90))->addActionHandler(this); move(parent->getWidth()>this->getWidth()?(parent->getWidth()-this->getWidth())/2:0,parent->getHeight()>this->getHeight()?(parent->getHeight()-this->getHeight())/2:0); }