From c604bee9efc86ec71eb8eba715cd4b999e4aa189 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Sat, 19 Oct 2013 16:45:13 +0100 Subject: [PATCH] [loc] misc. fixes * Use IDCANCEL for license dialog * Remove Chinese duplicates * Remove dev debug message --- res/localization/new_translation.loc | 1 + res/localization/rufus.loc | 7 ++----- src/rufus.c | 1 - src/rufus.rc | 12 ++++++------ 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/res/localization/new_translation.loc b/res/localization/new_translation.loc index dcf52312..be021b5e 100644 --- a/res/localization/new_translation.loc +++ b/res/localization/new_translation.loc @@ -78,6 +78,7 @@ t IDC_ABOUT_UPDATES "Updates" # About -> License dialog g IDD_LICENSE t IDD_LICENSE "Rufus License" +t IDCANCEL "Close" # Notifications. You can trigger one of these by using Alt-R and re-launching Rufus g IDD_NOTIFICATION diff --git a/res/localization/rufus.loc b/res/localization/rufus.loc index 37d8b0fe..04f5892a 100644 --- a/res/localization/rufus.loc +++ b/res/localization/rufus.loc @@ -309,7 +309,7 @@ t IDC_ABOUT_UPDATES "Mises à jour" g IDD_LICENSE t IDD_LICENSE "Licence Rufus" -t IDOK "Fermer" +t IDCANCEL "Fermer" g IDD_NOTIFICATION t IDC_MORE_INFO "Plus d'info..." @@ -648,7 +648,7 @@ t IDOK "确定" g IDD_LICENSE t IDD_LICENSE "Rufus 许可证" -t IDOK "取消" +t IDCANCEL "取消" g IDD_NOTIFICATION t IDD_NOTIFICATION "更新方案和设置" @@ -662,9 +662,6 @@ t IDC_LOG_CLEAR "清除日志" t IDC_LOG_SAVE "保存日志" t IDCANCEL "关闭日志" -g IDD_LICENSE -t IDOK "取消" - g IDD_UPDATE_POLICY t IDD_UPDATE_POLICY "更新方案和设置" t IDS_UPDATE_SETTINGS_GRP "设置" diff --git a/src/rufus.c b/src/rufus.c index 6d4ab4be..31b17d40 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -1380,7 +1380,6 @@ void InitDialog(HWND hDlg) SendMessage(GetDlgItem(hDlg, IDC_ADVANCED), BCM_SETIMAGELIST, 0, (LPARAM)&bi_down); // Set the various tooltips - uprintf("Create tooltip got MSG: %s\n", lmprintf(MSG_157)); CreateTooltip(hFileSystem, lmprintf(MSG_157), -1); CreateTooltip(hClusterSize, lmprintf(MSG_158), -1); CreateTooltip(hLabel, lmprintf(MSG_159), -1); diff --git a/src/rufus.rc b/src/rufus.rc index a8b0a7d7..bd01fd2e 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.4.0.288" +CAPTION "Rufus v1.4.0.289" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,291,50,14 @@ -99,7 +99,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Rufus License" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Close",IDOK,278,187,50,14 + DEFPUSHBUTTON "Close",IDCANCEL,278,187,50,14 EDITTEXT IDC_LICENSE_TEXT,7,7,321,176,ES_MULTILINE | ES_READONLY | WS_VSCROLL END @@ -284,8 +284,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,4,0,288 - PRODUCTVERSION 1,4,0,288 + FILEVERSION 1,4,0,289 + PRODUCTVERSION 1,4,0,289 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -302,13 +302,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.4.0.288" + VALUE "FileVersion", "1.4.0.289" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", " 2011-2013 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.4.0.288" + VALUE "ProductVersion", "1.4.0.289" END END BLOCK "VarFileInfo"