From 7c3baf62fc899cfab8a892c6a31686caa21d005d Mon Sep 17 00:00:00 2001 From: sdottaka Date: Sat, 26 Aug 2023 21:29:36 +0900 Subject: [PATCH] Manual: Use po4a for manual translation (#1994) (4) --- Docs/Manual/update_translations.bat | 2 +- Translations/Docs/Manual/English.pot | 67 +++++++++++++++++++++++++++++++----- Translations/Docs/Manual/Japanese.po | 2 +- 3 files changed, 60 insertions(+), 11 deletions(-) diff --git a/Docs/Manual/update_translations.bat b/Docs/Manual/update_translations.bat index 364bb44bf..326b05ffa 100644 --- a/Docs/Manual/update_translations.bat +++ b/Docs/Manual/update_translations.bat @@ -9,7 +9,7 @@ if "%MSYS_HOME%" == "" ( ( echo #!/bin/bash echo cd $^(cygpath '%CD%'^) -echo po4a --verbose --wrap-po=no --package-name WinMerge --package-version 2.16 --copyright-holder 'Thingamahoochie Software' --msgid-bugs-address https://bugs.winmerge.org/ ./Manual.cfg +echo po4a --verbose --wrap-po newlines --package-name WinMerge --package-version 2.16 --copyright-holder 'Thingamahoochie Software' --msgid-bugs-address https://bugs.winmerge.org/ ./Manual.cfg ) > %MSYS_HOME%\tmp\__update_translations__.sh %MSYS_HOME%\usr\bin\bash.exe -lc /tmp/__update_translations__.sh del %MSYS_HOME%\tmp\__update_translations__.sh diff --git a/Translations/Docs/Manual/English.pot b/Translations/Docs/Manual/English.pot index 06ee9643d..d92e860af 100644 --- a/Translations/Docs/Manual/English.pot +++ b/Translations/Docs/Manual/English.pot @@ -5,7 +5,17 @@ # #, fuzzy msgid "" -msgstr "Project-Id-Version: WinMerge 2.16\nReport-Msgid-Bugs-To: https://bugs.winmerge.org/\nPOT-Creation-Date: 2023-08-26 21:19+0900\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME \nLanguage-Team: LANGUAGE \nLanguage: \nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n" +msgstr "" +"Project-Id-Version: WinMerge 2.16\n" +"Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n" +"POT-Creation-Date: 2023-08-26 21:28+0900\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" #. type: Content of:
#: ./English/About_Doc.xml:3 @@ -7511,7 +7521,9 @@ msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><listitem><screen> #: ./English/Filters.xml:480 #, no-wrap -msgid "\\.c$ ## matches only file names with the extension, <filename>c</filename>.\n\\.c ## matches any extension beginning with <filename>c</filename>, like <filename>cpp</filename> and <filename>com</filename>." +msgid "" +"\\.c$ ## matches only file names with the extension, <filename>c</filename>.\n" +"\\.c ## matches any extension beginning with <filename>c</filename>, like <filename>cpp</filename> and <filename>com</filename>." msgstr "" #. type: Content of: <article><section><section><variablelist><varlistentry><term> @@ -7547,7 +7559,15 @@ msgstr "" #. type: Content of: <article><section><section><example><screen> #: ./English/Filters.xml:510 #, no-wrap -msgid "f: \\.cpp$ ## Match <filename>*.cpp</filename> files\nf: \\.h$ ## Match <filename>*.h</filename> files\nf: ^My ## Match <filename>My*.*</filename> files\nf: Dlg\\. ## Match <filename>*Dlg.*</filename> files\nd: \\\\test$ ## Match <filename>test</filename> folders\nd: ^\\\\Build$ ## Match <filename>Build</filename> folders\nd: Temp$ ## Match <filename>*Temp</filename> folders (for example, <filename>FirstTemp</filename>)\nd: Src ## Match <filename>*Src*</filename> folders" +msgid "" +"f: \\.cpp$ ## Match <filename>*.cpp</filename> files\n" +"f: \\.h$ ## Match <filename>*.h</filename> files\n" +"f: ^My ## Match <filename>My*.*</filename> files\n" +"f: Dlg\\. ## Match <filename>*Dlg.*</filename> files\n" +"d: \\\\test$ ## Match <filename>test</filename> folders\n" +"d: ^\\\\Build$ ## Match <filename>Build</filename> folders\n" +"d: Temp$ ## Match <filename>*Temp</filename> folders (for example, <filename>FirstTemp</filename>)\n" +"d: Src ## Match <filename>*Src*</filename> folders" msgstr "" #. type: Content of: <article><section><section><example><para> @@ -7558,7 +7578,12 @@ msgstr "" #. type: Content of: <article><section><section><example><screen> #: ./English/Filters.xml:521 #, no-wrap -msgid "f: ^\\.#.*$ ## <filename>.#filename.version</filename> files\nf: Dlg\\.c(pp)?$ ## <filename>*Dlg.c</filename> and <filename>*Dlg.cpp</filename> files\nf: ^I.*\\.h$ ## <filename>I*.h</filename> files\nf: Srv[1-9]\\.def$ ## <filename>*Srv1.def</filename> to <filename>*Srv9.def</filename> files\nf: ^[h,k,m] ## <filename>h*.*</filename>, <filename>k*.*</filename>, and <filename>m*.*</filename> files" +msgid "" +"f: ^\\.#.*$ ## <filename>.#filename.version</filename> files\n" +"f: Dlg\\.c(pp)?$ ## <filename>*Dlg.c</filename> and <filename>*Dlg.cpp</filename> files\n" +"f: ^I.*\\.h$ ## <filename>I*.h</filename> files\n" +"f: Srv[1-9]\\.def$ ## <filename>*Srv1.def</filename> to <filename>*Srv9.def</filename> files\n" +"f: ^[h,k,m] ## <filename>h*.*</filename>, <filename>k*.*</filename>, and <filename>m*.*</filename> files" msgstr "" #. type: Content of: <article><section><section><title><indexterm><secondary> @@ -7728,13 +7753,17 @@ msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><formalpara><para><screen> #: ./English/Filters.xml:692 #, no-wrap -msgid "# Jean Sibelius\n# Pekka Himanen" +msgid "" +"# Jean Sibelius\n" +"# Pekka Himanen" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><formalpara><para><screen> #: ./English/Filters.xml:699 #, no-wrap -msgid "# Janne Sibelius\nPekka Himanen" +msgid "" +"# Janne Sibelius\n" +"Pekka Himanen" msgstr "" #. type: Content of: <article><section><section><itemizedlist><listitem><para> @@ -8887,13 +8916,20 @@ msgstr "" #. type: Content of: <article><section><section><orderedlist><listitem><formalpara><para><screen> #: ./English/Intro_diffs.xml:62 #, no-wrap -msgid "It's slow comparing words \nand characters. Instead, \nWinMerge compares lines.\nBelieve it or else." +msgid "" +"It's slow comparing words \n" +"and characters. Instead, \n" +"WinMerge compares lines.\n" +"Believe it or else." msgstr "" #. type: Content of: <article><section><section><orderedlist><listitem><formalpara><para><screen> #: ./English/Intro_diffs.xml:71 #, no-wrap -msgid "It's slow comparing words.\nWinMerge compares lines.\nBelieve it or not." +msgid "" +"It's slow comparing words.\n" +"WinMerge compares lines.\n" +"Believe it or not." msgstr "" #. type: Content of: <article><section><section><orderedlist><listitem><para><inlinemediaobject> @@ -10055,7 +10091,20 @@ msgstr "" #. type: Content of: <article><section><section><screen> #: ./English/Open_paths.xml:453 #, no-wrap -msgid "<?xml version='1.0' encoding='UTF-8'?>\n<project>\n <paths>\n <left>c:\\work\\project1</left>\n <left-readonly>1</left-readonly>\n <middle>c:\\work\\project2</middle>\n <middle-readonly>1</middle-readonly>\n <right>c:\\work\\project3</right>\n <right-readonly>0</right-readonly>\n <filter>Visual C++ loose</filter>\n <subfolders>0</subfolders>\n </paths>\n</project>" +msgid "" +"<?xml version='1.0' encoding='UTF-8'?>\n" +"<project>\n" +" <paths>\n" +" <left>c:\\work\\project1</left>\n" +" <left-readonly>1</left-readonly>\n" +" <middle>c:\\work\\project2</middle>\n" +" <middle-readonly>1</middle-readonly>\n" +" <right>c:\\work\\project3</right>\n" +" <right-readonly>0</right-readonly>\n" +" <filter>Visual C++ loose</filter>\n" +" <subfolders>0</subfolders>\n" +" </paths>\n" +"</project>" msgstr "" #. type: Content of: <article><section><section><para> diff --git a/Translations/Docs/Manual/Japanese.po b/Translations/Docs/Manual/Japanese.po index 120045088..ca9ed2361 100644 --- a/Translations/Docs/Manual/Japanese.po +++ b/Translations/Docs/Manual/Japanese.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WinMerge\n" "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n" -"POT-Creation-Date: 2023-08-26 21:19+0900\n" +"POT-Creation-Date: 2023-08-26 21:28+0900\n" "PO-Revision-Date: 2023-08-26 21:16+0900\n" "Last-Translator: Takashi Sawanaka <sawanaka@d1.dion.ne.jp>\n" "Language-Team: Japanese <winmerge-translate@lists.sourceforge.net>\n" -- 2.11.0