Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update translations

Browse Source 
Update english.xml, english_customizable.xml, chinese.xml, french.xml to
7.0
A minor refactoring
This commit is contained in:
Don Ho 2016-08-19 13:39:31 +02:00
parent a43e2db58f
commit fe01f7501b
10 changed files with 77 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PowerEditor/installer/nativeLang/chinese.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<NotepadPlus>
<Native-Langue name="正體中文" filename="chinese.xml" version="6.9.2">
<Native-Langue name="正體中文" filename="chinese.xml" version="7.0">
<Menu>
<Main>
<!-- Main Menu Entries -->
@ -107,6 +107,12 @@
<Item id="42015" name="向下移動現行行列"/>
<Item id="42016" name="轉成大寫"/>
<Item id="42017" name="轉成小寫"/>
<Item id="42067" name="每字第一字母大寫，其他皆小寫"/>
<Item id="42068" name="每字第一字母大寫"/>
<Item id="42069" name="句子第一字母大寫，其他皆小寫"/>
<Item id="42070" name="句子第一字母大寫"/>
<Item id="42071" name="大小寫互換"/>
<Item id="42072" name="隨機大小寫"/>
<Item id="42018" name="開始錄製巨集"/>
<Item id="42019" name="停止錄製巨集"/>
<Item id="42021" name="播放巨集(&amp;P)"/>
@ -232,6 +238,9 @@
<Item id="44094" name="欄標九"/>
<Item id="44095" name="下一個欄標"/>
<Item id="44096" name="上一個欄標"/>
<Item id="44097" name="監視日誌 (tail -f)"/>
<Item id="44098" name="前移欄標"/>
<Item id="44099" name="後移欄標"/>
<Item id="44032" name="全螢幕"/>
<Item id="44033" name="復原字體大小"/>
<Item id="44034" name="保持在最上層"/>
@ -275,6 +284,7 @@
<Item id="47009" name="設定更新程式代理伺服器..."/>
<Item id="47010" name="指令列參數..."/>
<Item id="47011" name="技術支援熱線"/>
<Item id="47012" name="除錯資訊..."/>
<Item id="48005" name="匯入外掛模組..."/>
<Item id="48006" name="匯入主題面板..."/>
<Item id="48018" name="編輯彈跳選單"/>
@ -657,6 +667,8 @@
<Item id="6214" name="啟動現行行列背景顏色"/>
<Item id="6215" name="啟用 smooth font"/>
<Item id="6231" name="邊框寬度"/>
<Item id="6235" name="無邊框"/>
<Item id="6236" name="啟用超出了最後一行捲動功能"/>
</Scintillas>
<NewDoc title="開新文件">
<Item id="6401" name="格式"/>
@ -678,6 +690,7 @@
<Item id="6413" name="預設資料夾 (開啟/儲存)"/>
<Item id="6414" name="依照目前文件"/>
<Item id="6415" name="記住上次使用的資料夾"/>
<Item id="6430" name="使用新式儲存對話框（不含副檔名功能支援）"/>
</DefaultDir>
<FileAssoc title="副檔名連結設定">
@ -815,6 +828,7 @@
<Item id="6333" name="字慧高亮度顯示"/>
<Item id="6334" name="自動檢測字符編碼"/>
<Item id="6335" name="視反斜標號為 SQL 轉義字符"/>
<Item id="6337" name="文件夾工作區檔案副檔名:"/>
<Item id="6114" name="啟動"/>
<Item id="6115" name="自動縮排"/>
<Item id="6117" name="開啟 MRU (Most Recently Used) 功能"/>

15
PowerEditor/installer/nativeLang/english.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<NotepadPlus>
<Native-Langue name="English" filename="english.xml" version="6.9.2">
<Native-Langue name="English" filename="english.xml" version="7.0">
<Menu>
<Main>
<!-- Main Menu Entries -->
@ -114,6 +114,12 @@
<Item id="42066" name="Sort Lines As Decimals (Dot) Descending"/>
<Item id="42016" name="UPPERCASE"/>
<Item id="42017" name="lowercase"/>
<Item id="42067" name="Title Case"/>
<Item id="42068" name="Title Case (blend)"/>
<Item id="42069" name="Sentence case"/>
<Item id="42070" name="Sentence case (blend)"/>
<Item id="42071" name="iNVERT cASE"/>
<Item id="42072" name="ranDOm CasE"/>
<Item id="42018" name="&amp;Start Recording"/>
<Item id="42019" name="&amp;Stop Recording"/>
<Item id="42021" name="&amp;Playback"/>
@ -230,6 +236,9 @@
<Item id="44094" name="9th Tab"/>
<Item id="44095" name="Next Tab"/>
<Item id="44096" name="Previous Tab"/>
<Item id="44097" name="Monitoring (tail -f)"/>
<Item id="44098" name="Move Tab Forward"/>
<Item id="44099" name="Move Tab Backward"/>
<Item id="44032" name="Toggle Full Screen Mode"/>
<Item id="44033" name="Restore Default Zoom"/>
<Item id="44034" name="Always on Top"/>
@ -282,7 +291,7 @@
<Item id="47003" name="Online Documentation"/>
<Item id="47004" name="Notepad++ Community (Forum)"/>
<Item id="47011" name="Live Support"/>
<Item id="47012" name="Debug Info"/>
<Item id="47012" name="Debug Info..."/>
<Item id="47005" name="Get More Plugins"/>
<Item id="47006" name="Update Notepad++"/>
<Item id="47009" name="Set Updater Proxy..."/>
@ -665,6 +674,7 @@
<Item id="6215" name="Enable smooth font"/>
<Item id="6231" name="Border Width"/>
<Item id="6235" name="No edge"/>
<Item id="6236" name="Enable scrolling beyond last line"/>
</Scintillas>
<NewDoc title="New Document">
@ -827,6 +837,7 @@
<Item id="6333" name="Smart Highlighting"/>
<Item id="6334" name="Autodetect character encoding"/>
<Item id="6335" name="Treat backslash as escape character for SQL"/>
<Item id="6337" name="Workspace file ext.:"/>
<Item id="6114" name="Enable"/>
<Item id="6115" name="Auto-indent"/>
<Item id="6117" name="Enable MRU behaviour"/>

19
PowerEditor/installer/nativeLang/english_customizable.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<NotepadPlus>
<Native-Langue name="English" filename="english_customizable.xml" version="6.9.2">
<Native-Langue name="English" filename="english_customizable.xml" version="7.0">
<Menu>
<Main>
<!-- Main Menu Entries -->
@ -114,6 +114,12 @@
<Item id="42066" name="Sort Lines As Decimals (Dot) Descending"/>
<Item id="42016" name="UPPERCASE"/>
<Item id="42017" name="lowercase"/>
<Item id="42067" name="Title Case"/>
<Item id="42068" name="Title Case (blend)"/>
<Item id="42069" name="Sentence case"/>
<Item id="42070" name="Sentence case (blend)"/>
<Item id="42071" name="iNVERT cASE"/>
<Item id="42072" name="ranDOm CasE"/>
<Item id="42018" name="&amp;Start Recording"/>
<Item id="42019" name="&amp;Stop Recording"/>
<Item id="42021" name="&amp;Playback"/>
@ -230,6 +236,9 @@
<Item id="44094" name="9th Tab"/>
<Item id="44095" name="Next Tab"/>
<Item id="44096" name="Previous Tab"/>
<Item id="44097" name="Monitoring (tail -f)"/>
<Item id="44098" name="Move Tab Forward"/>
<Item id="44099" name="Move Tab Backward"/>
<Item id="44032" name="Toggle Full Screen Mode"/>
<Item id="44033" name="Restore Default Zoom"/>
<Item id="44034" name="Always on Top"/>
@ -282,6 +291,7 @@
<Item id="47003" name="Online Documentation"/>
<Item id="47004" name="Notepad++ Community (Forum)"/>
<Item id="47011" name="Live Support"/>
<Item id="47012" name="Debug Info..."/>
<Item id="47005" name="Get More Plugins"/>
<Item id="47006" name="Update Notepad++"/>
<Item id="47009" name="Set Updater Proxy..."/>
@ -362,7 +372,7 @@
<Item id="1659" name="In hidden folders"/>
<Item id="1624" name="Search mode"/>
<Item id="1625" name="Normal"/>
<Item id="1626" name="Extended (\r, \n, \t, \x..., \0)"/>
<Item id="1626" name="Extended (\n, \r, \t, \0, \x...)"/>
<Item id="1660" name="Replace in Files"/>
<Item id="1661" name="Follow current doc."/>
<Item id="1641" name="Find All in Current Document"/>
@ -663,6 +673,8 @@
<Item id="6214" name="Enable current line highlighting"/>
<Item id="6215" name="Enable smooth font"/>
<Item id="6231" name="Border Width"/>
<Item id="6235" name="No edge"/>
<Item id="6236" name="Enable scrolling beyond last line"/>
</Scintillas>
<NewDoc title="New Document">
@ -685,6 +697,7 @@
<Item id="6413" name="Default Directory (Open/Save)"/>
<Item id="6414" name="Follow current document"/>
<Item id="6415" name="Remember last used directory"/>
<Item id="6430" name="Use new style save dialog (without file extension feature)"/>
</DefaultDir>
<FileAssoc title="File Association">
@ -824,6 +837,7 @@
<Item id="6333" name="Smart Highlighting"/>
<Item id="6334" name="Autodetect character encoding"/>
<Item id="6335" name="Treat backslash as escape character for SQL"/>
<Item id="6337" name="Workspace file ext.:"/>
<Item id="6114" name="Enable"/>
<Item id="6115" name="Auto-indent"/>
<Item id="6117" name="Enable MRU behaviour"/>
@ -850,6 +864,7 @@
<Item id="2030" name="Initial number:"/>
<Item id="2031" name="Increase by:"/>
<Item id="2035" name="Leading zeros"/>
<Item id="2036" name="Repeat :"/>
<Item id="2032" name="Format"/>
<Item id="2024" name="Dec"/>
<Item id="2025" name="Oct"/>

16
PowerEditor/installer/nativeLang/french.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<NotepadPlus>
<Native-Langue name="Français" filename="french.xml" version="6.8.2">
<Native-Langue name="Français" filename="french.xml" version="7.0">
<Menu>
<Main>
<!-- Main Menu Entries -->
@ -108,6 +108,12 @@
<Item id="42015" name="Déplacer la ligne actuelle vers le bas"/>
<Item id="42016" name="EN MAJUSCULE"/>
<Item id="42017" name="en minuscule"/>
<Item id="42067" name="Majuscules Dans Les Titres"/>
<Item id="42068" name="Majuscules Dans Les Titres (moins strict)"/>
<Item id="42069" name="Majuscule en début de phrase"/>
<Item id="42070" name="Majuscule en début de phrase (moins strict)"/>
<Item id="42071" name="à L'ENVERS"/>
<Item id="42072" name="ALÉATOiRe"/>
<Item id="42018" name="Démarrer l’enregistrement"/>
<Item id="42019" name="Arrêter l’enregistrement"/>
<Item id="42021" name="Rejouer la macro"/>
@ -244,6 +250,9 @@
<Item id="44094" name="Onglet 9"/>
<Item id="44095" name="Prochain Onglet"/>
<Item id="44096" name="Onglet Précédant"/>
<Item id="44097" name="Surveillance de Log(tail -f)"/>
<Item id="44098" name="Onglet vers Avant"/>
<Item id="44099" name="Onglet vers Après"/>
<Item id="45001" name="Convertir en Format Windows (CR+LF)"/>
<Item id="45002" name="Convertir en Format UNIX (LF)"/>
<Item id="45003" name="Convertir en Format Mac (CR)"/>
@ -282,6 +291,7 @@
<Item id="47009" name="Paramétrer le Proxy d'Updater..."/>
<Item id="47010" name="Arguments de la Ligne de Commande..."/>
<Item id="47011" name="Support en Direct"/>
<Item id="47012" name="Debug Info..."/>
<Item id="48005" name="Importer un complément..."/>
<Item id="48006" name="Importer un thème..."/>
<Item id="48009" name="Raccourcis clavier..."/>
@ -646,6 +656,8 @@
<Item id="6229" name="Aligné"/>
<Item id="6230" name="Indenté"/>
<Item id="6231" name="Largeur de la bordure"/>
<Item id="6235" name="Pas de bordure"/>
<Item id="6236" name="Activer le défilement au-delà de la dernière ligne"/>
</Scintillas>
<NewDoc title="Nouveau document">
<Item id="6401" name="Format des sauts de ligne"/>
@ -667,6 +679,7 @@
<Item id="6413" name="Dossier par défaut (ouvrir/enregistrer)"/>
<Item id="6414" name="Utiliser celui du document actuel"/>
<Item id="6415" name="Mémoriser le dernier dossier utilisé"/>
<Item id="6430" name="Activer le nouveau style de dialogue d'enregistrement (sans l'extension de fichier supporté)"/>
</DefaultDir>
<FileAssoc title="Extensions de fichier">
@ -806,6 +819,7 @@
<Item id="6333" name="Sélectionner et montrer tout"/>
<Item id="6334" name="Détecter l'encodage automatiquement"/>
<Item id="6335" name="Backslash : caractère d'échappement pour SQL"/>
<Item id="6337" name="Ext fichier Espace de travail :"/>
</MISC>
</Preference>
<MultiMacro title="Exécuter une macro en boucle">

6
PowerEditor/src/Notepad_plus.rc
View File

@ -280,8 +280,8 @@ BEGIN
MENUITEM "Title Case (blend)", IDM_EDIT_TITLECASE_BLEND
MENUITEM "&Sentence case", IDM_EDIT_SENTENCECASE_FORCE
MENUITEM "Sentence case (blend)", IDM_EDIT_SENTENCECASE_BLEND
MENUITEM "&iNVERTCASE", IDM_EDIT_INVERTCASE
MENUITEM "&RAnDomCaSe", IDM_EDIT_RANDOMCASE
MENUITEM "&iNVERT cASE", IDM_EDIT_INVERTCASE
MENUITEM "&ranDOm CasE", IDM_EDIT_RANDOMCASE
END
POPUP "Line Operations"
BEGIN
@ -877,7 +877,7 @@ BEGIN
MENUITEM "Update Notepad++", IDM_UPDATE_NPP
MENUITEM "Set Updater Proxy...", IDM_CONFUPDATERPROXY
MENUITEM SEPARATOR
MENUITEM "Debug Info", IDM_DEBUGINFO
MENUITEM "Debug Info...", IDM_DEBUGINFO
MENUITEM "About Notepad++", IDM_ABOUT
END

11
PowerEditor/src/NppBigSwitch.cpp
View File

@ -1318,9 +1318,18 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
return TRUE;
}
case NPPM_INTERNAL_SCROLLBEYONDLASTLINE:
{
const bool endAtLastLine = not (pNppParam->getSVP())._scrollBeyondLastLine;
_mainEditView.execute(SCI_SETENDATLASTLINE, endAtLastLine);
_subEditView.execute(SCI_SETENDATLASTLINE, endAtLastLine);
return TRUE;
}
case NPPM_INTERNAL_SETMULTISELCTION:
{
NppGUI & nppGUI = (NppGUI &)pNppParam->getNppGUI();
NppGUI & nppGUI = const_cast<NppGUI &>(pNppParam->getNppGUI());
_mainEditView.execute(SCI_SETMULTIPLESELECTION, nppGUI._enableMultiSelection);
_subEditView.execute(SCI_SETMULTIPLESELECTION, nppGUI._enableMultiSelection);
return TRUE;

8
PowerEditor/src/NppCommands.cpp
View File

@ -2807,14 +2807,6 @@ void Notepad_plus::command(int id)
}
break;
case IDM_VIEW_SCROLL_BEYOND_LASTLINE:
{
const bool endAtLastLine = not NppParameters::getInstance()->getSVP()._scrollBeyondLastLine;
_mainEditView.execute(SCI_SETENDATLASTLINE, endAtLastLine);
_subEditView.execute(SCI_SETENDATLASTLINE, endAtLastLine);
}
break;
case IDM_VIEW_EDGEBACKGROUND:
case IDM_VIEW_EDGELINE:
case IDM_VIEW_EDGENONE:

6
PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
View File

@ -684,7 +684,7 @@ INT_PTR CALLBACK MarginsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPa
case IDC_CHECK_SCROLLBEYONDLASTLINE:
svp._scrollBeyondLastLine = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_CHECK_SCROLLBEYONDLASTLINE, BM_GETCHECK, 0, 0));
::SendMessage(_hParent, WM_COMMAND, IDM_VIEW_SCROLL_BEYOND_LASTLINE, 0);
::SendMessage(::GetParent(_hParent), NPPM_INTERNAL_SCROLLBEYONDLASTLINE, 0, 0);
return TRUE;
case IDC_CHECK_DISABLEADVANCEDSCROLL:
@ -1828,10 +1828,10 @@ INT_PTR CALLBACK TabSettings::run_dlgProc(UINT Message, WPARAM wParam, LPARAM/*
POINT p;
::GetCursorPos(&p);
int size = tabSizeDlg.doDialog(p);
//Tab size 0 removal
if (size <= 0) return FALSE;
//Tab size 0 removal
::SetDlgItemInt(_hSelf, IDC_TABSIZEVAL_STATIC, size, FALSE);
::SetDlgItemInt(_hSelf, IDC_TABSIZEVAL_DISABLE_STATIC, size, FALSE);

2
PowerEditor/src/menuCmdID.h
View File

@ -343,8 +343,6 @@
#define IDM_VIEW_TAB_MOVEFORWARD (IDM_VIEW + 98)
#define IDM_VIEW_TAB_MOVEBACKWARD (IDM_VIEW + 99)
#define IDM_VIEW_SCROLL_BEYOND_LASTLINE (IDM_VIEW + 100)
#define IDM_VIEW_GOTO_ANOTHER_VIEW 10001
#define IDM_VIEW_CLONE_TO_ANOTHER_VIEW 10002
#define IDM_VIEW_GOTO_NEW_INSTANCE 10003

1
PowerEditor/src/resource.h
View File

@ -408,6 +408,7 @@
#define NPPM_INTERNAL_REMOVEFINDER (NOTEPADPLUS_USER_INTERNAL + 41)
#define NPPM_INTERNAL_RELOADSCROLLTOEND (NOTEPADPLUS_USER_INTERNAL + 42) // Used by Monitoring feature
#define NPPM_INTERNAL_FINDKEYCONFLICTS (NOTEPADPLUS_USER_INTERNAL + 43)
#define NPPM_INTERNAL_SCROLLBEYONDLASTLINE (NOTEPADPLUS_USER_INTERNAL + 44)
//wParam: 0
//lParam: document new index