diff --git a/Build/Changes.txt b/Build/Changes.txt index e53b96c54..0f4a04f4e 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -32,7 +32,7 @@ GRE - (GRE)pWinNP3 Search in Files Tool ===================================================== -Current RC1 Version 5.20.622.(build_#) (2020-06-22) +Current RC1 Version 5.20.623.(build_#) (2020-06-23) ===================================================== ----------------------------------------------------- diff --git a/Versions/day.txt b/Versions/day.txt index ff39c77bd..379854108 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -622 +623 diff --git a/grepWinNP3/grepWinLicense.txt b/grepWinNP3/grepWinLicense.txt index ac03780fb..35838a1d5 100644 --- a/grepWinNP3/grepWinLicense.txt +++ b/grepWinNP3/grepWinLicense.txt @@ -8,7 +8,7 @@ GNU General Public License v3.0, All Rights Reserved. Original "grepWin" binaries (currently v1.9.2) and corresponding source code (according GPL to v3.0) can be retrived at folowing location https://github.com/stefankueng/grepWin/releases/tag/1.9.2. -Modified "grepWinNP3" binaries (Notepad3 MOD, currently v2.0.x) and corresponding source code +Modified "grepWinNP3" binaries (Notepad3 MOD, currently v2.x.x.x) and corresponding source code (according to GPL v3.0) can be retrived at folowing location: https://github.com/rizonesoft/Notepad3/tree/master/grepWinNP3. diff --git a/grepWinNP3/src/Resources/grepWin.rc2 b/grepWinNP3/src/Resources/grepWin.rc2 index a2f554581..7155ca363 100644 Binary files a/grepWinNP3/src/Resources/grepWin.rc2 and b/grepWinNP3/src/Resources/grepWin.rc2 differ diff --git a/grepWinNP3/translationsNP3/日本語 （日本） [ja-JP].lang b/grepWinNP3/translationsNP3/日本語 （日本） [ja-JP].lang index 546cd2cb7..131fab4f1 100644 --- a/grepWinNP3/translationsNP3/日本語 （日本） [ja-JP].lang +++ b/grepWinNP3/translationsNP3/日本語 （日本） [ja-JP].lang @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# FIRST Translator: Tilt, 2018. # "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -148,7 +148,7 @@ msgstr "ダークモード" #. Resource IDs: (159) msgid "Dark Mode requires at least Win10 v1803, and it must be enabled in the Windows system settings." -msgstr "先に Windows の色の設定から「黒」を選択してください (Win 10 v1803 以上)" +msgstr "ダークモードにはWin 10 v1803 以降が必要です。また先に Windows の色の設定から「黒」を選択してください" #. Resource IDs: (139) msgid "Date modified" @@ -192,15 +192,15 @@ msgstr "除外ディレクトリ(正規表現):" #. Resource IDs: (158) msgid "Ext" -msgstr "" +msgstr "拡張子" #. Resource IDs: (164) msgid "Export resultlist" -msgstr "" +msgstr "検索結果の一覧のエクスポート" #. Resource IDs: (163) msgid "Export results..." -msgstr "" +msgstr "結果のエクスポート..." #. Resource IDs: (1039) msgid "File Names match:\nuse '|' to separate multiple text match patterns, prepen&d '-' to exclude" @@ -240,7 +240,7 @@ msgstr "無効なパスです!" #. Resource IDs: (161) msgid "Inverse search (NOT search string)" -msgstr "" +msgstr "検索結果を反転 (検索語句ではなく)" #. Resource IDs: (1019) msgid "KB" @@ -289,7 +289,7 @@ msgstr "より古い" #. Resource IDs: (1090) msgid "Don't warn when replacing without creating backups" -msgstr "バックアップを作成しない置換時に警告しない" +msgstr "バックアップ作成なしの置換時に警告しない" #. Resource IDs: (1063) msgid "Only one instance" @@ -389,7 +389,7 @@ msgstr "内部検索" #. Resource IDs: (162) msgid "Search in found files" -msgstr "" +msgstr "見つかったファイルから検索" #. Resource IDs: (1018) msgid "Search results" @@ -406,11 +406,11 @@ msgstr "計 %ld 個のファイルを検索, %ld 個のファイルをスキッ #. Resource IDs: (140) msgid "Select Editor Application..." -msgstr "カスタム エディタを指定..." +msgstr "お好みのエディタを選択..." #. Resource IDs: (127) msgid "Select path to search" -msgstr "選択するパスを選択" +msgstr "検索するパスを選択" #. Resource IDs: (1071) msgid "Settings" @@ -450,7 +450,7 @@ msgstr "置換後のテキスト:" #. Resource IDs: (1074) msgid "This adds a new entry to the context menu named 'Open with Editor'" -msgstr "コンテキストメニュー項目に新規エントリを追加 - 'エディタで開く'" +msgstr "コンテキストメニューに「エディタで開く」という新規項目を追加" #. Resource IDs: (1053) msgid "Treat files as UTF-8" @@ -458,7 +458,7 @@ msgstr "ファイルを UTF-8 として扱う" #. Resource IDs: (1045) msgid "Visit our website" -msgstr "公式サイトへ行く" +msgstr "公式サイトを開く" #. Resource IDs: (116) msgid "a regular expression used for searching. Press F1 for more info." @@ -498,15 +498,15 @@ msgstr "検索文字列が含まれていない場合は Shift キーでファ #. Resource IDs: (165) msgid "include file paths" -msgstr "" +msgstr "ファイルパスを出力" #. Resource IDs: (166) msgid "include match line numbers" -msgstr "" +msgstr "一致行の行数を出力" #. Resource IDs: (167) msgid "include match line text" -msgstr "" +msgstr "一致行のテキストを出力" #. Resource IDs: (132) msgid "invalid regex!" diff --git a/language/np3_ja_jp/lexer_ja_jp.rc b/language/np3_ja_jp/lexer_ja_jp.rc index 8e1e8cbdc..0e33d4fdb 100644 --- a/language/np3_ja_jp/lexer_ja_jp.rc +++ b/language/np3_ja_jp/lexer_ja_jp.rc @@ -461,9 +461,9 @@ BEGIN IDS_LEX_STR_63361 "置換" IDS_LEX_STR_63362 "修飾子" IDS_LEX_STR_63363 "タグ" - IDS_LEX_STR_63364 "Property Name" - IDS_LEX_STR_63365 "LD Keyword" - IDS_LEX_STR_63366 "ESC Sequence" + IDS_LEX_STR_63364 "プロパティ名" + IDS_LEX_STR_63365 "LD キーワード" + IDS_LEX_STR_63366 "エスケープシーケンス" END STRINGTABLE diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc index 17e40adac..1319252b1 100644 --- a/language/np3_ja_jp/strings_ja_jp.rc +++ b/language/np3_ja_jp/strings_ja_jp.rc @@ -305,7 +305,7 @@ IDS_MUI_STYLEEDIT_HELP "\ 設定書式(各指定は省略可能, foreは文字色):\r\n\ font:フォント名; size:[+/-]nn.mm; bold; italic; underline;\r\n\ fore:#ffffff; back:#bbbbbb; eolfilled; indic_gradient\r\n\r\n\ -コピー&ペーストやドラッグ&ドロップでも指定が変更できます。\ +コピーペーストやドラッグドロップでも指定を変更できます。\ " END diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index dda9a4023..5c8fd69ab 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 RC1 diff --git a/src/VersionEx.h b/src/VersionEx.h index 8514a465f..150d13fbd 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,7 +8,7 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 20 -#define VERSION_REV 622 +#define VERSION_REV 623 #define VERSION_BUILD 1 #define SCINTILLA_VER 443 #define ONIGURUMA_REGEX_VER 6.9.5