diff --git a/PowerEditor/installer/nativeLang/chinese.xml b/PowerEditor/installer/nativeLang/chinese.xml index 34b61e58..503017e2 100644 --- a/PowerEditor/installer/nativeLang/chinese.xml +++ b/PowerEditor/installer/nativeLang/chinese.xml @@ -28,6 +28,8 @@ + + @@ -71,7 +73,7 @@ - + @@ -87,6 +89,7 @@ + @@ -102,7 +105,24 @@ + + + + + + + + + + + + + + + + + @@ -112,10 +132,10 @@ - - + + @@ -135,7 +155,9 @@ - + + + @@ -178,6 +200,9 @@ + + + @@ -208,6 +233,7 @@ + @@ -217,8 +243,10 @@ + + @@ -255,7 +283,7 @@ - + @@ -294,6 +322,7 @@ + @@ -342,8 +371,8 @@ - + @@ -352,6 +381,8 @@ + + @@ -361,41 +392,160 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -424,6 +574,8 @@ + + @@ -454,8 +606,10 @@ + + - + @@ -467,26 +621,32 @@ - - - + + + + + + + - - - - + + + + + + @@ -513,12 +673,22 @@ + - + + - + + + + + + + + + @@ -542,13 +712,16 @@ - + + + + @@ -557,8 +730,7 @@ - - + diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index c32648eb..197ed635 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -87,6 +87,7 @@ + @@ -101,13 +102,24 @@ + + - - + + + + + + + + + + + @@ -119,6 +131,8 @@ + + @@ -128,6 +142,13 @@ + + + + + + + @@ -136,10 +157,6 @@ - - - - @@ -168,10 +185,8 @@ - - @@ -182,6 +197,10 @@ + + + + @@ -213,6 +232,7 @@ + @@ -222,8 +242,10 @@ + + @@ -231,13 +253,11 @@ - - @@ -303,6 +323,7 @@ + @@ -353,6 +374,7 @@ + @@ -396,39 +418,127 @@ - - - + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -457,6 +567,9 @@ + + + @@ -487,8 +600,11 @@ + + - + + @@ -500,26 +616,34 @@ - - - + + + + + + + - - - - + + + + + + + + @@ -546,12 +670,22 @@ + - + + - + + + + + + + + + @@ -576,13 +710,17 @@ - + + + + + @@ -591,7 +729,8 @@ - + + diff --git a/PowerEditor/installer/nativeLang/english_customizable.xml b/PowerEditor/installer/nativeLang/english_customizable.xml index ba9d28bb..292e6228 100644 --- a/PowerEditor/installer/nativeLang/english_customizable.xml +++ b/PowerEditor/installer/nativeLang/english_customizable.xml @@ -1,8 +1,8 @@ - - -
+ + +
@@ -27,7 +27,8 @@ - + + @@ -38,6 +39,7 @@ + @@ -85,6 +87,7 @@ + @@ -99,13 +102,24 @@ - - - - - - + + + + + + + + + + + + + + + + + @@ -117,6 +131,8 @@ + + @@ -126,6 +142,13 @@ + + + + + + + @@ -134,10 +157,6 @@ - - - - @@ -166,29 +185,33 @@ - - - - + + + + + + - + - + + + @@ -208,8 +231,8 @@ - + @@ -219,8 +242,10 @@ + + @@ -228,13 +253,11 @@ - - - - + +
@@ -251,16 +274,17 @@ - + + - + @@ -279,26 +303,27 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + + @@ -320,10 +345,10 @@ - + - + @@ -349,6 +374,7 @@ + @@ -357,61 +383,172 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -430,6 +567,9 @@ + + + @@ -442,10 +582,10 @@ - + - + @@ -460,12 +600,15 @@ + + - + + - + @@ -473,32 +616,40 @@ - - - + + + + + + + - - - - + + + + + + + + - + @@ -509,22 +660,32 @@ - + - + - + + - + + - + + + + + + + + + @@ -549,24 +710,29 @@ - + + + + + - + - + + - + @@ -574,14 +740,14 @@ - + - + @@ -595,6 +761,66 @@ - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml index 19694482..eea72dfd 100644 --- a/PowerEditor/installer/nativeLang/french.xml +++ b/PowerEditor/installer/nativeLang/french.xml @@ -91,6 +91,7 @@ + @@ -105,6 +106,7 @@ + @@ -118,9 +120,9 @@ + + - - @@ -128,7 +130,10 @@ - + + + + @@ -198,6 +203,7 @@ + @@ -207,10 +213,11 @@ - + + @@ -236,6 +243,7 @@ + @@ -245,6 +253,7 @@ + @@ -382,88 +391,182 @@ - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -517,7 +620,7 @@ - + @@ -532,30 +635,33 @@ + + + + + - - - - - - - + + - - - - + + + + + + + @@ -582,16 +688,25 @@ - + + + + + + + + + + + + + - - - @@ -615,13 +730,15 @@ - + + + @@ -630,7 +747,7 @@ - + diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 78a96ad4..ffe61e32 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -796,7 +796,7 @@ BEGIN MENUITEM "Get More Plugins", IDM_PLUGINSHOME MENUITEM SEPARATOR MENUITEM "Update Notepad++", IDM_UPDATE_NPP - MENUITEM "Set Updater Proxy", IDM_CONFUPDATERPROXY + MENUITEM "Set Updater Proxy...", IDM_CONFUPDATERPROXY MENUITEM SEPARATOR MENUITEM "About Notepad++", IDM_ABOUT END diff --git a/PowerEditor/src/ScitillaComponent/UserDefineDialog.rc b/PowerEditor/src/ScitillaComponent/UserDefineDialog.rc index dbfd504c..0558c91e 100644 --- a/PowerEditor/src/ScitillaComponent/UserDefineDialog.rc +++ b/PowerEditor/src/ScitillaComponent/UserDefineDialog.rc @@ -76,8 +76,8 @@ BEGIN EDITTEXT IDC_OPERATOR2_EDIT,178,47,144,29,ES_MULTILINE | WS_VSCROLL PUSHBUTTON "Styler",IDC_OPERATOR_STYLER,14,28,54,13 GROUPBOX "Operators style",IDC_OPERATOR_DESCGROUP_STATIC,8,14,319,67,BS_CENTER - LTEXT "Operators1",IDC_OPERATOR1_STATIC,82,36,75,10,0,WS_EX_RIGHT - LTEXT "Operators2 (separators required)",IDC_OPERATOR2_STATIC,194,36,124,10,0,WS_EX_RIGHT + LTEXT "Operators 1",IDC_OPERATOR1_STATIC,82,36,75,10,0,WS_EX_RIGHT + LTEXT "Operators 2 (separators required)",IDC_OPERATOR2_STATIC,194,36,124,10,0,WS_EX_RIGHT EDITTEXT IDC_DELIMITER1_BOUNDARYOPEN_EDIT,15,125,144,12,ES_MULTILINE | WS_VSCROLL EDITTEXT IDC_DELIMITER1_ESCAPE_EDIT,15,151,144,12,ES_MULTILINE | WS_VSCROLL EDITTEXT IDC_DELIMITER1_BOUNDARYCLOSE_EDIT,15,175,144,12,ES_MULTILINE | WS_VSCROLL @@ -85,7 +85,7 @@ BEGIN LTEXT "Open: ",IDC_DELIMITER1_BOUNDARYOPEN_STATIC,15,115,144,8 LTEXT "Escape: ",IDC_DELIMITER1_ESCAPE_STATIC,15,140,144,8 LTEXT "Close: ",IDC_DELIMITER1_BOUNDARYCLOSE_STATIC,15,164,144,8 - GROUPBOX "Delimiter1 style",IDC_DELIMITER1_DESCGROUP_STATIC,8,89,156,105,BS_RIGHT + GROUPBOX "Delimiter 1 style",IDC_DELIMITER1_DESCGROUP_STATIC,8,89,156,105,BS_RIGHT EDITTEXT IDC_DELIMITER2_BOUNDARYOPEN_EDIT,178,125,144,12,ES_MULTILINE | WS_VSCROLL EDITTEXT IDC_DELIMITER2_ESCAPE_EDIT,178,151,144,12,ES_MULTILINE | WS_VSCROLL EDITTEXT IDC_DELIMITER2_BOUNDARYCLOSE_EDIT,178,175,144,12,ES_MULTILINE | WS_VSCROLL @@ -93,7 +93,7 @@ BEGIN LTEXT "Open: ",IDC_DELIMITER2_BOUNDARYOPEN_STATIC,178,115,144,8 LTEXT "Escape: ",IDC_DELIMITER2_ESCAPE_STATIC,178,140,144,8 LTEXT "Close: ",IDC_DELIMITER2_BOUNDARYCLOSE_STATIC,178,164,144,8 - GROUPBOX "Delimiter2 style",IDC_DELIMITER2_DESCGROUP_STATIC,172,89,156,105,BS_RIGHT + GROUPBOX "Delimiter 2 style",IDC_DELIMITER2_DESCGROUP_STATIC,172,89,156,105,BS_RIGHT EDITTEXT IDC_DELIMITER3_BOUNDARYOPEN_EDIT,15,241,144,12,ES_MULTILINE | WS_VSCROLL EDITTEXT IDC_DELIMITER3_ESCAPE_EDIT,15,264,144,12,ES_MULTILINE | WS_VSCROLL EDITTEXT IDC_DELIMITER3_BOUNDARYCLOSE_EDIT,15,287,144,12,ES_MULTILINE | WS_VSCROLL @@ -101,7 +101,7 @@ BEGIN LTEXT "Open: ",IDC_DELIMITER3_BOUNDARYOPEN_STATIC,15,230,144,8 LTEXT "Escape: ",IDC_DELIMITER3_ESCAPE_STATIC,15,255,144,8 LTEXT "Close: ",IDC_DELIMITER3_BOUNDARYCLOSE_STATIC,15,276,144,8 - GROUPBOX "Delimiter3 style",IDC_DELIMITER3_DESCGROUP_STATIC,8,204,156,105,BS_RIGHT + GROUPBOX "Delimiter 3 style",IDC_DELIMITER3_DESCGROUP_STATIC,8,204,156,105,BS_RIGHT EDITTEXT IDC_DELIMITER4_BOUNDARYOPEN_EDIT,178,241,144,12,ES_MULTILINE | WS_VSCROLL EDITTEXT IDC_DELIMITER4_ESCAPE_EDIT,178,264,144,12,ES_MULTILINE | WS_VSCROLL EDITTEXT IDC_DELIMITER4_BOUNDARYCLOSE_EDIT,178,287,144,12,ES_MULTILINE | WS_VSCROLL @@ -109,7 +109,7 @@ BEGIN LTEXT "Open: ",IDC_DELIMITER4_BOUNDARYOPEN_STATIC,178,232,144,8 LTEXT "Escape: ",IDC_DELIMITER4_ESCAPE_STATIC,178,255,144,8 LTEXT "Close: ",IDC_DELIMITER4_BOUNDARYCLOSE_STATIC,178,278,144,8 - GROUPBOX "Delimiter4 style",IDC_DELIMITER4_DESCGROUP_STATIC,172,204,156,105,BS_RIGHT + GROUPBOX "Delimiter 4 style",IDC_DELIMITER4_DESCGROUP_STATIC,172,204,156,105,BS_RIGHT EDITTEXT IDC_DELIMITER5_BOUNDARYOPEN_EDIT,15,356,144,12,ES_MULTILINE | WS_VSCROLL EDITTEXT IDC_DELIMITER5_ESCAPE_EDIT,15,381,144,12,ES_MULTILINE | WS_VSCROLL EDITTEXT IDC_DELIMITER5_BOUNDARYCLOSE_EDIT,15,406,144,12,ES_MULTILINE | WS_VSCROLL @@ -117,7 +117,7 @@ BEGIN LTEXT "Open: ",IDC_DELIMITER5_BOUNDARYOPEN_STATIC,15,347,144,8 LTEXT "Escape: ",IDC_DELIMITER5_ESCAPE_STATIC,15,372,144,8 LTEXT "Close: ",IDC_DELIMITER5_BOUNDARYCLOSE_STATIC,15,397,144,8 - GROUPBOX "Delimiter5 style",IDC_DELIMITER5_DESCGROUP_STATIC,8,320,156,105,BS_RIGHT + GROUPBOX "Delimiter 5 style",IDC_DELIMITER5_DESCGROUP_STATIC,8,320,156,105,BS_RIGHT EDITTEXT IDC_DELIMITER6_BOUNDARYOPEN_EDIT,178,356,144,12,ES_MULTILINE | WS_VSCROLL EDITTEXT IDC_DELIMITER6_ESCAPE_EDIT,178,381,144,12,ES_MULTILINE | WS_VSCROLL EDITTEXT IDC_DELIMITER6_BOUNDARYCLOSE_EDIT,178,406,144,12,ES_MULTILINE | WS_VSCROLL @@ -125,7 +125,7 @@ BEGIN LTEXT "Open: ",IDC_DELIMITER6_BOUNDARYOPEN_STATIC,178,347,144,8 LTEXT "Escape: ",IDC_DELIMITER6_ESCAPE_STATIC,178,372,144,8 LTEXT "Close: ",IDC_DELIMITER6_BOUNDARYCLOSE_STATIC,178,397,144,8 - GROUPBOX "Delimiter6 style",IDC_DELIMITER6_DESCGROUP_STATIC,172,320,156,105,BS_RIGHT + GROUPBOX "Delimiter 6 style",IDC_DELIMITER6_DESCGROUP_STATIC,172,320,156,105,BS_RIGHT EDITTEXT IDC_DELIMITER7_BOUNDARYOPEN_EDIT,12,471,144,12,ES_MULTILINE | WS_VSCROLL EDITTEXT IDC_DELIMITER7_ESCAPE_EDIT,11,496,144,12,ES_MULTILINE | WS_VSCROLL EDITTEXT IDC_DELIMITER7_BOUNDARYCLOSE_EDIT,12,521,144,12,ES_MULTILINE | WS_VSCROLL @@ -133,7 +133,7 @@ BEGIN LTEXT "Open: ",IDC_DELIMITER7_BOUNDARYOPEN_STATIC,178,460,144,8 LTEXT "Escape: ",IDC_DELIMITER7_ESCAPE_STATIC,178,487,144,8 LTEXT "Close: ",IDC_DELIMITER7_BOUNDARYCLOSE_STATIC,178,512,144,8 - GROUPBOX "Delimiter7 style",IDC_DELIMITER7_DESCGROUP_STATIC,8,435,156,105,BS_RIGHT + GROUPBOX "Delimiter 7 style",IDC_DELIMITER7_DESCGROUP_STATIC,8,435,156,105,BS_RIGHT EDITTEXT IDC_DELIMITER8_BOUNDARYOPEN_EDIT,178,471,144,12,ES_MULTILINE | WS_VSCROLL EDITTEXT IDC_DELIMITER8_ESCAPE_EDIT,178,496,144,12,ES_MULTILINE | WS_VSCROLL EDITTEXT IDC_DELIMITER8_BOUNDARYCLOSE_EDIT,178,521,144,12,ES_MULTILINE | WS_VSCROLL @@ -141,7 +141,7 @@ BEGIN LTEXT "Open: ",IDC_DELIMITER8_BOUNDARYOPEN_STATIC,15,460,144,8 LTEXT "Escape: ",IDC_DELIMITER8_ESCAPE_STATIC,15,487,144,8 LTEXT "Close: ",IDC_DELIMITER8_BOUNDARYCLOSE_STATIC,15,512,144,8 - GROUPBOX "Delimiter8 style",IDC_DELIMITER8_DESCGROUP_STATIC,172,435,156,105,BS_RIGHT + GROUPBOX "Delimiter 8 style",IDC_DELIMITER8_DESCGROUP_STATIC,172,435,156,105,BS_RIGHT END IDD_KEYWORD_STYLE_DLG DIALOGEX 36, 44, 337, 470 @@ -213,7 +213,7 @@ BEGIN RTEXT "Extras 2:",IDC_NUMBER_EXTRAS2_STATIC,12,345,45,13 RTEXT "Suffix 1:",IDC_NUMBER_SUFFIX1_STATIC,12,372,45,13 RTEXT "Suffix 2:",IDC_NUMBER_SUFFIX2_STATIC,12,399,45,13 - RTEXT "Range : ",IDC_NUMBER_RANGE_STATIC,12,426,45,13 + RTEXT "Range: ",IDC_NUMBER_RANGE_STATIC,12,426,45,13 EDITTEXT IDC_NUMBER_PREFIX1_EDIT,63,264,136,21,ES_MULTILINE | WS_VSCROLL EDITTEXT IDC_NUMBER_PREFIX2_EDIT,63,291,136,21,ES_MULTILINE | WS_VSCROLL EDITTEXT IDC_NUMBER_EXTRAS1_EDIT,63,318,136,21,ES_MULTILINE | WS_VSCROLL diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc index 0b53e344..ff0e38a3 100644 --- a/PowerEditor/src/WinControls/Preference/preference.rc +++ b/PowerEditor/src/WinControls/Preference/preference.rc @@ -198,7 +198,7 @@ BEGIN LTEXT "0",IDC_MAXNBFILEVAL_STATIC,229,52,15,8,WS_TABSTOP CONTROL "Don't check at launch time",IDC_CHECK_DONTCHECKHISTORY, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,121,39,140,10 - GROUPBOX "Display",IDC_STATIC,121,65,225,73,BS_CENTER + GROUPBOX "Display",IDC_DISPLAY_STATIC,121,65,225,73,BS_CENTER CONTROL "In Submenu",IDC_CHECK_INSUBMENU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,132,76,79,10 CONTROL "Only File Name",IDC_RADIO_ONLYFILENAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,133,92,88,10 CONTROL "Full File Name Path",IDC_RADIO_FULLFILENAMEPATH,"Button",BS_AUTORADIOBUTTON,133,106,109,10 @@ -280,7 +280,7 @@ BEGIN COMBOBOX IDC_COMBO_VARLIST,259,24,70,58,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Add",IDC_BUTTON_ADDVAR,337,24,44,12 RTEXT "Variable :",IDC_VAR_STATIC,198,26,59,8 - RTEXT "Which part :",IDC_WHICHPART_STATIC,155,161,80,8 + RTEXT "Here display your variable settings",IDC_WHICHPART_STATIC,155,161,160,8 LTEXT "",IDC_VIEWPANEL_STATIC,242,161,190,8 GROUPBOX "Header and Footer",IDC_HEADERFPPTER_GR_STATIC,150,7,296,172,BS_CENTER END diff --git a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp index 7080053c..d7acc3d3 100644 --- a/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp +++ b/PowerEditor/src/WinControls/Preference/preferenceDlg.cpp @@ -140,7 +140,7 @@ BOOL CALLBACK PreferenceDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPa _wVector.push_back(DlgInfo(&_marginsDlg, TEXT("Editing"), TEXT("Scintillas"))); _wVector.push_back(DlgInfo(&_defaultNewDocDlg, TEXT("New Document"), TEXT("NewDoc"))); _wVector.push_back(DlgInfo(&_defaultDirectoryDlg, TEXT("Default Directory"), TEXT("DefaultDir"))); - _wVector.push_back(DlgInfo(&_recentFilesHistoryDlg, TEXT("Recent Files History"), TEXT("NewDoc"))); + _wVector.push_back(DlgInfo(&_recentFilesHistoryDlg, TEXT("Recent Files History"), TEXT("RecentFilesHistory"))); _wVector.push_back(DlgInfo(&_fileAssocDlg, TEXT("File Association"), TEXT("FileAssoc"))); _wVector.push_back(DlgInfo(&_langMenuDlg, TEXT("Language Menu"), TEXT("LangMenu"))); _wVector.push_back(DlgInfo(&_tabSettings, TEXT("Tab Settings"), TEXT("TabSettings"))); @@ -150,6 +150,7 @@ BOOL CALLBACK PreferenceDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPa _wVector.push_back(DlgInfo(&_settingsDlg, TEXT("MISC."), TEXT("MISC"))); //_ctrlTab.createTabs(_wVector); //_ctrlTab.display(); + makeCategoryList(); RECT rc; getClientRect(rc); diff --git a/PowerEditor/src/WinControls/Preference/preference_rc.h b/PowerEditor/src/WinControls/Preference/preference_rc.h index fcde5cf8..252f8187 100644 --- a/PowerEditor/src/WinControls/Preference/preference_rc.h +++ b/PowerEditor/src/WinControls/Preference/preference_rc.h @@ -174,6 +174,7 @@ #define IDC_RADIO_FULLFILENAMEPATH (IDD_PREFERENCE_NEWDOCSETTING_BOX + 26) #define IDC_RADIO_CUSTOMIZELENTH (IDD_PREFERENCE_NEWDOCSETTING_BOX + 27) #define IDC_CUSTOMIZELENGTHVAL_STATIC (IDD_PREFERENCE_NEWDOCSETTING_BOX + 28) + #define IDC_DISPLAY_STATIC (IDD_PREFERENCE_NEWDOCSETTING_BOX + 29) #define IDD_PREFERENCE_DEFAULTDIRECTORY_BOX 6450 //(IDD_PREFERENCE_BOX + 400) #define IDD_PREFERENCE_RECENTFILESHISTORY_BOX 6460 //(IDD_PREFERENCE_BOX + 400) diff --git a/PowerEditor/src/functionList.xml b/PowerEditor/src/functionList.xml index 2bd18707..b6abc98c 100644 --- a/PowerEditor/src/functionList.xml +++ b/PowerEditor/src/functionList.xml @@ -16,6 +16,7 @@ --> +