OSDN Git Service

Merge branch 'master' of https://github.com/winmerge/winmerge into jp
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 25 Dec 2021 00:47:17 +0000 (09:47 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 25 Dec 2021 00:47:17 +0000 (09:47 +0900)
# Conflicts:
# BuildArc.cmd
# SetVersion.cmd
# Translations/WinMerge/ChineseTraditional.po
# Translations/WinMerge/Slovenian.po
# Version.h

48 files changed:
1  2 
BuildArc.cmd
Installer/InnoSetup/WinMergeARM64.is6.iss
Installer/InnoSetup/WinMergeX64.is6.iss
Installer/InnoSetup/WinMergeX64.iss
Installer/InnoSetup/WinMergeX64NonAdmin.iss
Installer/InnoSetup/WinMergeX86.iss
SetVersion.cmd
Src/MainFrm.cpp
Src/Merge.rc
Src/OptionsInit.cpp
Src/resource.h
Translations/WinMerge/Arabic.po
Translations/WinMerge/Basque.po
Translations/WinMerge/Brazilian.po
Translations/WinMerge/Bulgarian.po
Translations/WinMerge/Catalan.po
Translations/WinMerge/ChineseSimplified.po
Translations/WinMerge/ChineseTraditional.po
Translations/WinMerge/Croatian.po
Translations/WinMerge/Czech.po
Translations/WinMerge/Danish.po
Translations/WinMerge/Dutch.po
Translations/WinMerge/English.pot
Translations/WinMerge/Finnish.po
Translations/WinMerge/French.po
Translations/WinMerge/Galician.po
Translations/WinMerge/German.po
Translations/WinMerge/Greek.po
Translations/WinMerge/Hungarian.po
Translations/WinMerge/Italian.po
Translations/WinMerge/Japanese.po
Translations/WinMerge/Korean.po
Translations/WinMerge/Lithuanian.po
Translations/WinMerge/Norwegian.po
Translations/WinMerge/Persian.po
Translations/WinMerge/Polish.po
Translations/WinMerge/Portuguese.po
Translations/WinMerge/Romanian.po
Translations/WinMerge/Russian.po
Translations/WinMerge/Serbian.po
Translations/WinMerge/Sinhala.po
Translations/WinMerge/Slovak.po
Translations/WinMerge/Slovenian.po
Translations/WinMerge/Spanish.po
Translations/WinMerge/Swedish.po
Translations/WinMerge/Turkish.po
Translations/WinMerge/Ukrainian.po
Version.h

diff --cc BuildArc.cmd
Simple merge
  [Setup]
  AppName=WinMerge
  AppVersion={#AppVersion}
- AppVerName=WinMerge {#AppVersion} ARM64
+ AppVerName=WinMerge {#AppVersion} {#ARCH}
  AppPublisher=Thingamahoochie Software
 -AppPublisherURL=https://WinMerge.org/
 -AppSupportURL=https://WinMerge.org/
 -AppUpdatesURL=https://WinMerge.org/
 +AppPublisherURL=https://winmergejp.bitbucket.io
 +AppSupportURL=https://winmergejp.bitbucket.io
 +AppUpdatesURL=https://winmergejp.bitbucket.io
  WizardStyle=modern
  UsePreviousPrivileges=no
  PrivilegesRequiredOverridesAllowed=dialog
  [Setup]\r
  AppName=WinMerge\r
  AppVersion={#AppVersion}\r
- AppVerName=WinMerge {#AppVersion} x64\r
+ AppVerName=WinMerge {#AppVersion} {#ARCH}\r
  AppPublisher=Thingamahoochie Software\r
 -AppPublisherURL=https://WinMerge.org/\r
 -AppSupportURL=https://WinMerge.org/\r
 -AppUpdatesURL=https://WinMerge.org/\r
 +AppPublisherURL=https://winmergejp.bitbucket.io\r
 +AppSupportURL=https://winmergejp.bitbucket.io\r
 +AppUpdatesURL=https://winmergejp.bitbucket.io\r
  WizardStyle=modern\r
  UsePreviousPrivileges=no\r
  PrivilegesRequiredOverridesAllowed=dialog\r
  [Setup]\r
  AppName=WinMerge\r
  AppVersion={#AppVersion}\r
- AppVerName=WinMerge {#AppVersion} x64\r
+ AppVerName=WinMerge {#AppVersion} {#ARCH}\r
  AppPublisher=Thingamahoochie Software\r
 -AppPublisherURL=https://WinMerge.org/\r
 -AppSupportURL=https://WinMerge.org/\r
 -AppUpdatesURL=https://WinMerge.org/\r
 +AppPublisherURL=https://winmergejp.bitbucket.io\r
 +AppSupportURL=https://winmergejp.bitbucket.io\r
 +AppUpdatesURL=https://winmergejp.bitbucket.io\r
  \r
  ; Installer executable's version resource info\r
 -VersionInfoCompany=https://winmerge.org\r
 +VersionInfoCompany=https://winmergejp.bitbucket.io\r
  VersionInfoDescription=WinMerge Installer\r
  VersionInfoVersion={#AppVersion}\r
  \r
  [Setup]
  AppName=WinMerge
  AppVersion={#AppVersion}
- AppVerName=WinMerge {#AppVersion} x64 (Current user, 64-bit)
+ AppVerName=WinMerge {#AppVersion} {#ARCH} (Current user, 64-bit)
  AppPublisher=Thingamahoochie Software
 -AppPublisherURL=https://WinMerge.org/
 -AppSupportURL=https://WinMerge.org/
 -AppUpdatesURL=https://WinMerge.org/
 +AppPublisherURL=https://winmergejp.bitbucket.io
 +AppSupportURL=https://winmergejp.bitbucket.io
 +AppUpdatesURL=https://winmergejp.bitbucket.io
  
  ; Installer executable's version resource info
 -VersionInfoCompany=https://winmerge.org
 +VersionInfoCompany=https://winmergejp.bitbucket.io
  VersionInfoDescription=WinMerge Installer
  VersionInfoVersion={#AppVersion}
  
Simple merge
diff --cc SetVersion.cmd
@@@ -1,8 -1,8 +1,8 @@@
  set MAJOR=2
  set MINOR=16
 -set REVISION=17
 -set PATCHLEVEL=0
 -set STRPRIVATEBUILD=""
 +set REVISION=16
- set PATCHLEVEL=3
- set STRPRIVATEBUILD="jp-3"
++set PATCHLEVEL=4
++set STRPRIVATEBUILD="jp-4"
  
  set RCVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%
  rem set STRVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%
diff --cc Src/MainFrm.cpp
Simple merge
diff --cc Src/Merge.rc
Simple merge
Simple merge
diff --cc Src/resource.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -406,14 -417,11 +417,14 @@@ msgstr "發行說明 (&E)
  
  #, c-format
  msgid "&Translations"
- msgstr "翻譯(&T)"
+ msgstr "翻譯 (&T)"
  
 +msgid "&Check For Updates"
 +msgstr ""
 +
  #, c-format
  msgid "C&onfiguration"
- msgstr "組態(&O)"
+ msgstr "組態 (&O)"
  
  #, c-format
  msgid "&GNU General Public License"
@@@ -4524,122 -4747,7 +4750,126 @@@ msgstr "å¤\96æ\8e\9bç¨\8bå¼\8f管ç·\9a缺å°\91å¤\96æ\8e\9bç
  
  #, c-format
  msgid "Missing quotation mark in plugin pipeline: %1"
- msgstr ""
+ msgstr "外掛程式管線缺少引號:%1"
  
  msgid "Specify plugin arguments"
++<<<<<<< HEAD
 +msgstr ""
 +
 +msgid "Make characters uppercase"
 +msgstr ""
 +
 +msgid "Make characters lowercase"
 +msgstr ""
 +
 +msgid "Remove duplicate lines"
 +msgstr ""
 +
 +msgid "Count duplicate lines"
 +msgstr ""
 +
 +msgid "Sort lines ascending"
 +msgstr ""
 +
 +msgid "Sort lines descending"
 +msgstr ""
 +
 +msgid "Reverse columns"
 +msgstr ""
 +
 +msgid "Reverse lines"
 +msgstr ""
 +
 +msgid "Replace text with another text.\r\nUsage: Replace [-i] [-e] FIND REPLACE\r\n  FIND    - text to find\r\n  REPLACE - text to replace\r\n  -i - ignore case (only for -e)\r\n  -e - treat the specified text as a regular expression"
 +msgstr ""
 +
 +#, c-format
 +msgid "Apply filter command. \r\nUsage: ExecFilterCommand COMMAND\r\n  COMMAND - command to execute. %1 in the command is replaced with the filename."
 +msgstr ""
 +
 +msgid "Tokenize selection. \r\nUsage: Tokenize PATTERNS\r\n  PATTERNS - regular expression for tokenizing. (e.g. [^\\w]+)"
 +msgstr ""
 +
 +msgid "Trim spaces"
 +msgstr ""
 +
 +msgid "Select some columns.\r\nUsage: SelectColumns RANGES\r\n   or: SelectColumns [-v] [-i] [-g] -e PATTERNS\r\n  RANGES   - list of column ranges to select. (e.g. -3,5-10,30-)\r\n  PATTERNS - regular expression\r\n  -v - select non-matching columns\r\n  -i - ignore case\r\n  -g - enable global flag\r\n  -e - use PATTERNS for matching"
 +msgstr ""
 +
 +msgid "Select some lines.\r\nUsage: SelectLines RANGES\r\n   or: SelectLines [-v] [-i] -e PATTERNS\r\n  RANGES   - list of line ranges to select. (e.g. -3,5-10,30-)\r\n  PATTERNS - regular expression\r\n  -v - select non-matching lines\r\n  -i - ignore case\r\n  -e - use PATTERNS for matching"
 +msgstr ""
 +
 +msgid "HTML Prettier with tidy-html5. \r\nArguments: Command line options passed to the tidy command."
 +msgstr ""
 +
 +msgid "JSON Prettier with jq command. \r\nArguments: Filter or command line options passed to the jq command."
 +msgstr ""
 +
 +msgid "XML Prettier with tidy-html5. \r\nArguments: Command line options passed to the tidy command."
 +msgstr ""
 +
 +msgid "YAML Prettier with yq command. \r\nArguments: Filter or command line options passed to the yq command."
 +msgstr ""
 +
 +msgid "Graphviz Visualizer. \r\nArguments: Command line options passed to the dot command."
 +msgstr ""
 +
 +msgid "CSV Querier with q command. \r\nArguments: SQL statement or command line options passed to the q command."
 +msgstr ""
 +
 +msgid "TSV Querier with q command. \r\nArguments: SQL statement or command line options passed to the q command."
 +msgstr ""
 +
 +msgid "JSON Querier with jq command. \r\nArguments: Filter or command line options passed to the jq command."
 +msgstr ""
 +
 +msgid "YAML Querier with yq command. \r\nArguments: Filter or command line options passed to the yq command."
 +msgstr ""
 +
 +msgid "HTML Validator with tidy-html5. \r\nArguments: Command line options passed to the tidy command."
 +msgstr ""
 +
 +msgid "JVM bytecode disassembler with javap. \r\nArguments: Command line options passed to the javap command."
 +msgstr ""
 +
 +msgid "IL disassembler with ildasm. \r\nArguments: Command line options passed to the ildasm command."
 +msgstr ""
 +
 +msgid "Native code disassembler with dumpbin. \r\nArguments: Command line options passed to the dumpbin command."
 +msgstr ""
 +
 +msgid "General content extractor with Apache Tika. \r\nArguments: Command line options passed to the tika-app.jar."
 +msgstr ""
 +
 +msgid "Apply patch using GnuWin32 Patch for Windows"
 +msgstr ""
 +
 +msgid "Display the text content of MS Excel files"
 +msgstr ""
 +
 +msgid "Display the text content of MS PowerPoint files"
 +msgstr ""
 +
 +msgid "Display the text content of MS Visio files"
 +msgstr ""
 +
 +msgid "Display the text content of MS Word files"
 +msgstr ""
 +
 +msgid "Ignore some columns - ignored columns list from the plugin name or the plugin argument"
 +msgstr ""
 +
 +msgid "The plugin ignores comments (//... and /* ... */) in C, C++, PHP and JavaScript files."
 +msgstr ""
 +
 +msgid "Ignore some fields - ignored fields list from the plugin name or the plugin argument"
 +msgstr ""
 +
 +msgid "Prediff Line Filter"
 +msgstr ""
 +
 +msgid "Basic text functions for the context menu"
 +msgstr ""
++=======
+ msgstr "指定外掛程式參數"
++>>>>>>> 8d1ccd6dbcae8adac9c69bf57a6a673cdead1a32
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -404,11 -345,6 +345,9 @@@ msgstr "Opombe ob i&zdaji
  msgid "&Translations"
  msgstr "P&revodi"
  
- #, c-format
 +msgid "&Check For Updates"
 +msgstr ""
 +
  msgid "C&onfiguration"
  msgstr "Nas&tavitve"
  
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc Version.h
+++ b/Version.h
@@@ -1,5 -1,5 +1,5 @@@
- #define FILEVER        2,16,16,3\r
- #define PRODUCTVER     2,16,16,3\r
- #define STRFILEVER     "2.16.16.3"\r
- #define STRPRODUCTVER  "2.16.16.3"\r
- #define STRPRIVATEBUILD "jp-3"\r
 -#define FILEVER        2,16,17,0\r
 -#define PRODUCTVER     2,16,17,0\r
 -#define STRFILEVER     "2.16.17.0"\r
 -#define STRPRODUCTVER  "2.16.17.0"\r
 -#define STRPRIVATEBUILD ""\r
++#define FILEVER        2,16,16,4\r
++#define PRODUCTVER     2,16,16,4\r
++#define STRFILEVER     "2.16.16.4"\r
++#define STRPRODUCTVER  "2.16.16.4"\r
++#define STRPRIVATEBUILD "jp-4"\r