From d4127c609455a6d45a48623ef3cef1aca4526d11 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Wed, 23 Jul 2014 22:11:48 +0000 Subject: [PATCH] [UPDATE] Update the translation for English, Chinese and French. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1264 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/installer/nativeLang/chinese.xml | 18 +++++++++++++++++ PowerEditor/installer/nativeLang/english.xml | 20 +++++++++++++++++-- PowerEditor/installer/nativeLang/french.xml | 18 +++++++++++++++++ PowerEditor/src/Notepad_plus.rc | 2 +- .../src/WinControls/Preference/preference.rc | 4 ++-- PowerEditor/src/localization.cpp | 7 +++++++ 6 files changed, 64 insertions(+), 5 deletions(-) diff --git a/PowerEditor/installer/nativeLang/chinese.xml b/PowerEditor/installer/nativeLang/chinese.xml index 31ba7794..542b200a 100644 --- a/PowerEditor/installer/nativeLang/chinese.xml +++ b/PowerEditor/installer/nativeLang/chinese.xml @@ -266,6 +266,7 @@ + @@ -604,6 +605,7 @@ + @@ -719,6 +721,11 @@ + + + + + @@ -760,6 +767,16 @@ + + + + + + + + + + @@ -782,6 +799,7 @@ + diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index 3c7b56bb..8878e2d8 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -255,6 +255,7 @@ + @@ -596,6 +597,7 @@ + @@ -714,8 +716,12 @@ + + + + + - @@ -757,7 +763,16 @@ - + + + + + + + + + + @@ -779,6 +794,7 @@ + diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml index ca4b8af6..c6998720 100644 --- a/PowerEditor/installer/nativeLang/french.xml +++ b/PowerEditor/installer/nativeLang/french.xml @@ -276,6 +276,7 @@ + @@ -618,6 +619,7 @@ + @@ -733,6 +735,11 @@ + + + + + @@ -774,6 +781,16 @@ + + + + + + + + + + @@ -802,6 +819,7 @@ + diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index dc99c1bd..993c54bd 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -831,7 +831,7 @@ BEGIN POPUP "&?" BEGIN MENUITEM "Help Contents", IDM_HELP - MENUITEM "Command Line Arguments", IDM_CMDLINEARGUMENTS + MENUITEM "Command Line Arguments...", IDM_CMDLINEARGUMENTS MENUITEM SEPARATOR MENUITEM "Notepad++ Home", IDM_HOMESWEETHOME MENUITEM "Notepad++ Project Page", IDM_PROJECTPAGE diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc index 3b1065cb..ebe67f0c 100644 --- a/PowerEditor/src/WinControls/Preference/preference.rc +++ b/PowerEditor/src/WinControls/Preference/preference.rc @@ -130,7 +130,7 @@ BEGIN CONTROL "Auto-indent",IDC_CHECK_MAINTAININDENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,130,150,10 CONTROL "Minimize to system tray",IDC_CHECK_MIN2SYSTRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,145,150,10 CONTROL "Show only filename in title bar",IDC_CHECK_SHORTTITLE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,37,160,217,10 - CONTROL "Backslash is escape character for SQL",IDC_CHECK_BACKSLASHISESCAPECHARACTERFORSQL, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,175,217,10 + CONTROL "Treat backslash as escape character for SQL",IDC_CHECK_BACKSLASHISESCAPECHARACTERFORSQL, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,37,175,217,10 CONTROL "Enable",IDC_CHECK_CLICKABLELINK_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,267,15,140,10 CONTROL "No underline",IDC_CHECK_CLICKABLELINK_NOUNDERLINE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,267,28,140,10 @@ -301,7 +301,7 @@ BEGIN CONTROL "None",IDC_RADIO_BKNONE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,104,90,87,10 CONTROL "Simple backup",IDC_RADIO_BKSIMPLE,"Button",BS_AUTORADIOBUTTON,104,104,111,10 CONTROL "Verbose backup",IDC_RADIO_BKVERBOSE,"Button",BS_AUTORADIOBUTTON,104,117,111,10 - GROUPBOX "Custom Backup Directory",IDC_BLINKRATE_STATIC,95,135,260,40 + GROUPBOX "Custom Backup Directory",IDC_BACKUPDIR_USERCUSTOMDIR_GRPSTATIC,95,135,260,40 CONTROL "",IDC_BACKUPDIR_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,91,132,8,10 RTEXT "Directory :",IDD_BACKUPDIR_STATIC,99,152,40,8 EDITTEXT IDC_BACKUPDIR_EDIT,146,150,179,14,ES_AUTOHSCROLL diff --git a/PowerEditor/src/localization.cpp b/PowerEditor/src/localization.cpp index 17bd542e..3f676923 100644 --- a/PowerEditor/src/localization.cpp +++ b/PowerEditor/src/localization.cpp @@ -813,6 +813,13 @@ void NativeLangSpeaker::changePrefereceDlgLang(PreferenceDlg & preference) preference.renameDialogTitle(TEXT("Delimiter"), nameW); } + changeDlgLang(preference._settingsOnCloudDlg.getHSelf(), "Cloud", titre); + if (titre[0] != '\0') + { + const wchar_t *nameW = wmc->char2wchar(titre, _nativeLangEncoding); + preference.renameDialogTitle(TEXT("Cloud"), nameW); + } + preference.setListSelection(currentSel); }