CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-23 21:01:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into NewFeatures_grepWinNP3

Browse Source 
# Conflicts:
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
This commit is contained in:
RaiKoHoff 2020-03-30 10:20:48 +02:00
commit b2a22c6a0f
19 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
language/np3_af_za/dialogs_af_za.rc
View File

@ -945,7 +945,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 178
TOPMARGIN, 7
BOTTOMMARGIN, 157
BOTTOMMARGIN, 181
END
IDD_MUI_RECODE, DIALOG

2
language/np3_be_by/dialogs_be_by.rc
View File

@ -945,7 +945,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 178
TOPMARGIN, 7
BOTTOMMARGIN, 157
BOTTOMMARGIN, 181
END
IDD_MUI_RECODE, DIALOG

2
language/np3_de_de/dialogs_de_de.rc
View File

@ -947,7 +947,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 178
TOPMARGIN, 7
BOTTOMMARGIN, 157
BOTTOMMARGIN, 181
END
IDD_MUI_RECODE, DIALOG

2
language/np3_es_es/dialogs_es_es.rc
View File

@ -945,7 +945,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 178
TOPMARGIN, 7
BOTTOMMARGIN, 157
BOTTOMMARGIN, 181
END
IDD_MUI_RECODE, DIALOG

2
language/np3_fr_fr/dialogs_fr_fr.rc
View File

@ -945,7 +945,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 178
TOPMARGIN, 7
BOTTOMMARGIN, 157
BOTTOMMARGIN, 181
END
IDD_MUI_RECODE, DIALOG

2
language/np3_hu_hu/dialogs_hu_hu.rc
View File

@ -945,7 +945,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 178
TOPMARGIN, 7
BOTTOMMARGIN, 157
BOTTOMMARGIN, 181
END
IDD_MUI_RECODE, DIALOG

2
language/np3_it_it/dialogs_it_it.rc
View File

@ -945,7 +945,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 178
TOPMARGIN, 7
BOTTOMMARGIN, 157
BOTTOMMARGIN, 181
END
IDD_MUI_RECODE, DIALOG

2
language/np3_ja_jp/dialogs_ja_jp.rc
View File

@ -945,7 +945,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 178
TOPMARGIN, 7
BOTTOMMARGIN, 157
BOTTOMMARGIN, 181
END
IDD_MUI_RECODE, DIALOG

2
language/np3_ko_kr/dialogs_ko_kr.rc
View File

@ -945,7 +945,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 178
TOPMARGIN, 7
BOTTOMMARGIN, 157
BOTTOMMARGIN, 181
END
IDD_MUI_RECODE, DIALOG

2
language/np3_nl_nl/dialogs_nl_nl.rc
View File

@ -945,7 +945,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 178
TOPMARGIN, 7
BOTTOMMARGIN, 157
BOTTOMMARGIN, 181
END
IDD_MUI_RECODE, DIALOG

2
language/np3_pl_pl/dialogs_pl_pl.rc
View File

@ -945,7 +945,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 178
TOPMARGIN, 7
BOTTOMMARGIN, 157
BOTTOMMARGIN, 181
END
IDD_MUI_RECODE, DIALOG

2
language/np3_pt_br/dialogs_pt_br.rc
View File

@ -945,7 +945,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 178
TOPMARGIN, 7
BOTTOMMARGIN, 157
BOTTOMMARGIN, 181
END
IDD_MUI_RECODE, DIALOG

2
language/np3_pt_br/strings_pt_br.rc
View File

@ -144,7 +144,7 @@ BEGIN
IDS_MUI_ERR_UNICODE2 "Certain characters in the current text are not supported by the selected encoding, and may be replaced by default placeholders when saving. It's recommended to choose another file encoding. Continue?"
IDS_MUI_ERR_DROP "Only one file can be dropped at the same time!"
IDS_MUI_ERR_ACCESSDENIED
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application??"
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application?"
IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com?"
IDS_MUI_WARN_LOAD_BIG_FILE
"Are you sure you want to open this large file?\n\t(size: %s >= %s)!\n(Styling and Syntax Highlighting will not be applied!)"

2
language/np3_ru_ru/dialogs_ru_ru.rc
View File

@ -945,7 +945,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 178
TOPMARGIN, 7
BOTTOMMARGIN, 157
BOTTOMMARGIN, 181
END
IDD_MUI_RECODE, DIALOG

2
language/np3_sk_sk/dialogs_sk_sk.rc
View File

@ -945,7 +945,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 178
TOPMARGIN, 7
BOTTOMMARGIN, 157
BOTTOMMARGIN, 181
END
IDD_MUI_RECODE, DIALOG

2
language/np3_sk_sk/strings_sk_sk.rc
View File

@ -144,7 +144,7 @@ BEGIN
IDS_MUI_ERR_UNICODE2 "Certain characters in the current text are not supported by the selected encoding, and may be replaced by default placeholders when saving. It's recommended to choose another file encoding. Continue?"
IDS_MUI_ERR_DROP "Only one file can be dropped at the same time!"
IDS_MUI_ERR_ACCESSDENIED
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application??"
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application?"
IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com?"
IDS_MUI_WARN_LOAD_BIG_FILE
"Are you sure you want to open this large file?\n\t(size: %s >= %s)!\n(Styling and Syntax Highlighting will not be applied!)"

2
language/np3_sv_se/dialogs_sv_se.rc
View File

@ -945,7 +945,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 178
TOPMARGIN, 7
BOTTOMMARGIN, 157
BOTTOMMARGIN, 181
END
IDD_MUI_RECODE, DIALOG

2
language/np3_tr_tr/strings_tr_tr.rc
View File

@ -144,7 +144,7 @@ BEGIN
IDS_MUI_ERR_UNICODE2 "Certain characters in the current text are not supported by the selected encoding, and may be replaced by default placeholders when saving. It's recommended to choose another file encoding. Continue?"
IDS_MUI_ERR_DROP "Only one file can be dropped at the same time!"
IDS_MUI_ERR_ACCESSDENIED
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application??"
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application?"
IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com?"
IDS_MUI_WARN_LOAD_BIG_FILE
"Are you sure you want to open this large file?\n\t(size: %s >= %s)!\n(Styling and Syntax Highlighting will not be applied!)"

2
language/np3_zh_cn/dialogs_zh_cn.rc
View File

@ -945,7 +945,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 178
TOPMARGIN, 7
BOTTOMMARGIN, 157
BOTTOMMARGIN, 181
END
IDD_MUI_RECODE, DIALOG