Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libkomparediff2 for openSUSE:Factory
checked in at 2022-07-09 17:00:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libkomparediff2 (Old)
and /work/SRC/openSUSE:Factory/.libkomparediff2.new.1523 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkomparediff2"
Sat Jul 9 17:00:46 2022 rev:107 rq:987703 version:22.04.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/libkomparediff2/libkomparediff2.changes
2022-06-12 17:38:37.986097576 +0200
+++
/work/SRC/openSUSE:Factory/.libkomparediff2.new.1523/libkomparediff2.changes
2022-07-09 17:01:53.888694047 +0200
@@ -1,0 +2,8 @@
+Tue Jul 5 17:04:00 UTC 2022 - Christophe Giboudeaux <[email protected]>
+
+- Update to 22.04.3
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/gear/22.04.3/
+
+-------------------------------------------------------------------
Old:
----
libkomparediff2-22.04.2.tar.xz
libkomparediff2-22.04.2.tar.xz.sig
New:
----
libkomparediff2-22.04.3.tar.xz
libkomparediff2-22.04.3.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libkomparediff2.spec ++++++
--- /var/tmp/diff_new_pack.w9FNZZ/_old 2022-07-09 17:01:55.420696349 +0200
+++ /var/tmp/diff_new_pack.w9FNZZ/_new 2022-07-09 17:01:55.424696355 +0200
@@ -21,7 +21,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
%bcond_without released
Name: libkomparediff2
-Version: 22.04.2
+Version: 22.04.3
Release: 0
Summary: A library to compare files and strings
License: (GPL-2.0-or-later AND LGPL-2.0-or-later) AND BSD-2-Clause
++++++ libkomparediff2-22.04.2.tar.xz -> libkomparediff2-22.04.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkomparediff2-22.04.2/po/bg/libkomparediff2.po
new/libkomparediff2-22.04.3/po/bg/libkomparediff2.po
--- old/libkomparediff2-22.04.2/po/bg/libkomparediff2.po 2022-06-07
09:14:30.000000000 +0200
+++ new/libkomparediff2-22.04.3/po/bg/libkomparediff2.po 2022-07-05
06:38:03.000000000 +0200
@@ -3,73 +3,66 @@
#
# Zlatko Popov <[email protected]>, 2006, 2008.
# Yasen Pramatarov <[email protected]>, 2009.
+# Mincho Kondarev <[email protected]>, 2022.
msgid ""
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2021-07-22 00:18+0000\n"
-"PO-Revision-Date: 2009-09-17 22:29+0300\n"
-"Last-Translator: Yasen Pramatarov <[email protected]>\n"
-"Language-Team: Bulgarian <[email protected]>\n"
+"PO-Revision-Date: 2022-06-29 11:36+0200\n"
+"Last-Translator: Mincho Kondarev <[email protected]>\n"
+"Language-Team: Bulgarian <[email protected]>\n"
"Language: bg\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 22.04.2\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: komparemodellist.cpp:58
-#, fuzzy, kde-format
-#| msgid "&Apply Difference"
+#, kde-format
msgctxt "@action"
msgid "&Apply Difference"
msgstr "&?????????????????? ???? ??????????????????"
#: komparemodellist.cpp:62
-#, fuzzy, kde-format
-#| msgid "Un&apply Difference"
+#, kde-format
msgctxt "@action"
msgid "Un&apply Difference"
msgstr "&???????????? ?????????????????????? ???? ??????????????????"
#: komparemodellist.cpp:66
-#, fuzzy, kde-format
-#| msgid "App&ly All"
+#, kde-format
msgctxt "@action"
msgid "App&ly All"
msgstr "&?????????????????? ???? ????????????"
#: komparemodellist.cpp:70
-#, fuzzy, kde-format
-#| msgid "&Unapply All"
+#, kde-format
msgctxt "@action"
msgid "&Unapply All"
msgstr "&???????????? ???? ?????????????????? ???? ????????????"
#: komparemodellist.cpp:80
-#, fuzzy, kde-format
-#| msgid "P&revious File"
+#, kde-format
msgctxt "@action"
msgid "P&revious File"
msgstr "??&?????????????? ????????"
#: komparemodellist.cpp:84
-#, fuzzy, kde-format
-#| msgid "N&ext File"
+#, kde-format
msgctxt "@action"
msgid "N&ext File"
msgstr "&?????????????? ????????"
#: komparemodellist.cpp:88
-#, fuzzy, kde-format
-#| msgid "&Previous Difference"
+#, kde-format
msgctxt "@action"
msgid "&Previous Difference"
msgstr "&???????????????? ??????????????"
#: komparemodellist.cpp:92
-#, fuzzy, kde-format
-#| msgid "&Next Difference"
+#, kde-format
msgctxt "@action"
msgid "&Next Difference"
msgstr "&???????????????? ??????????????"
@@ -152,718 +145,5 @@
"The diff is malformed. Some lines could not be parsed and will not be "
"displayed in the diff view."
msgstr ""
-
-#~ msgctxt "NAME OF TRANSLATORS"
-#~ msgid "Your names"
-#~ msgstr "???????? ????????????????????,???????????? ??????????"
-
-#~ msgctxt "EMAIL OF TRANSLATORS"
-#~ msgid "Your emails"
-#~ msgstr "[email protected],[email protected]"
-
-#~ msgid "Could not load our KompareViewPart."
-#~ msgstr "KompareViewPart ???? ???????? ???? ???????? ????????????????."
-
-#~ msgid "Navigation"
-#~ msgstr "??????????????????"
-
-#~ msgid "Could not load our KompareNavigationPart."
-#~ msgstr "KompareViewPart ???? ???????? ???? ???????? ????????????????."
-
-#~ msgid "&Open Diff..."
-#~ msgstr "&???????????????? ???? ??????????????..."
-
-#~ msgid "&Compare Files..."
-#~ msgstr "&???????????????????? ???? ??????????????..."
-
-#~ msgid "&Blend URL with Diff..."
-#~ msgstr "&???????????????? ???? URL ?? ??????????????..."
-
-#~ msgid "Show T&ext View"
-#~ msgstr "?????????????????? ???? ???????????? \"&??????????\""
-
-#~ msgid " 0 of 0 differences "
-#~ msgstr " 0 o?? 0 ??????????????"
-
-#~ msgid " 0 of 0 files "
-#~ msgstr " 0 ???? 0 ??????????"
-
-#~ msgid " %2 of %1 file "
-#~ msgid_plural " %2 of %1 files "
-#~ msgstr[0] " %2 ???? %1 ???????? "
-#~ msgstr[1] " %2 ???? %1 ?????????? "
-
-#~ msgid " %1 file "
-#~ msgid_plural " %1 files "
-#~ msgstr[0] " %1 ???????? "
-#~ msgstr[1] " %1 ?????????? "
-
-#~ msgid " %2 of %1 difference, %3 applied "
-#~ msgid_plural " %2 of %1 differences, %3 applied "
-#~ msgstr[0] " %2 ???? %1 ??????????????, %3 ?????????????????? "
-#~ msgstr[1] " %2 ???? %1 ??????????????, %3 ?????????????????? "
-
-#~ msgid " %1 difference "
-#~ msgid_plural " %1 differences "
-#~ msgstr[0] " %1 ?????????????? "
-#~ msgstr[1] " %1 ?????????????? "
-
-#~ msgid "Blend File/Folder with diff Output"
-#~ msgstr "???????????????? ???? ????????/?????????? ?? ??????????????
??????????"
-
-#~ msgid "File/Folder"
-#~ msgstr "????????/????????????????????"
-
-#~ msgid "Diff Output"
-#~ msgstr "?????????? ???? ??????????????"
-
-#~ msgid "Blend"
-#~ msgstr "????????????????"
-
-#~ msgid "Blend this file or folder with the diff output"
-#~ msgstr "???????????????? ???? ???????? ???????????????????? ??????
?????????? ?? ?????????????????? ?????????? ???? ??????????????"
-
-#~ msgid ""
-#~ "If you have entered a file or folder name and a file that contains diff "
-#~ "output in the fields in this dialog then this button will be enabled and "
-#~ "pressing it will open kompare's main view where the output of the entered "
-#~ "file or files from the folder are mixed with the diff output so you can "
-#~ "then apply the difference(s) to a file or to the files. "
-#~ msgstr ""
-#~ "?????? ?????? ???????????? ?????? ???? ???????? ?????? ??????????, ??
???????? ???????? ?? ?????????? ?? ?????????????????? "
-#~ "??????????, ???????????? ?????????????? ???? ???????? ??????????????.
???????????? ???? ??????????????????, ???? ???? ???????????? "
-#~ "????????????????, ???????????? ???? ?????????????? ??????????????????
??????????, ???????? ???? ?????????? ???????????? ???? "
-#~ "?????????????????? ??????????????????(??) ?????? ????????(??????). "
-
-#~ msgid "Compare Files or Folders"
-#~ msgstr "???????????????????? ???? ?????????????? ?? ??????????"
-
-#~ msgid "Source"
-#~ msgstr "????????????????"
-
-#~ msgid "Destination"
-#~ msgstr "??????"
-
-#~ msgid "Compare"
-#~ msgstr "????????????????????"
-
-#~ msgid "Compare these files or folders"
-#~ msgstr "???????????????????? ???? ???????? ?????????????? ?????? ??????????"
-
-#~ msgid ""
-#~ "If you have entered 2 filenames or 2 folders in the fields in this dialog "
-#~ "then this button will be enabled and pressing it will start a comparison "
-#~ "of the entered files or folders. "
-#~ msgstr ""
-#~ "?????? ?? ???????????????? ?????? ???????????? 2 ?????????? ????
?????????????? ?????? 2 ??????????, ???????????? ???????? "
-#~ "?????????? ???? ???????? ??????????????, ?? ?????? ??????????????????????
???? ???? ?????????????? ???????????????????? ???? "
-#~ "???????????????????? ?????????????? ?????? ??????????. "
-
-#~ msgid "Text View"
-#~ msgstr "???????????? \"??????????\""
-
-#~ msgid "Source Folder"
-#~ msgstr "???????????????????? ????????????????"
-
-#~ msgid "Destination Folder"
-#~ msgstr "???????????????? ????????????????????"
-
-#~ msgid "Source File"
-#~ msgstr "???????? ????????????????"
-
-#~ msgid "Destination File"
-#~ msgstr "???????????? ????????"
-
-#~ msgid "Source Line"
-#~ msgstr "?????? ????????????????"
-
-#~ msgid "Destination Line"
-#~ msgstr "???????????? ??????"
-
-#~ msgid "Difference"
-#~ msgstr "??????????????"
-
-#, fuzzy
-#~| msgid "Applied: Changes made to %1 line undone"
-#~| msgid_plural "Applied: Changes made to %1 lines undone"
-#~ msgid "Applied: Changes made to %1 line undone"
-#~ msgid_plural "Applied: Changes made to %1 lines undone"
-#~ msgstr[0] "??????????????????: ?????????????????? ?? %1 ?????? ????
????????????????"
-#~ msgstr[1] "??????????????????: ?????????????????? ?? %1 ???????? ????
????????????????"
-
-#~ msgid "Changed %1 line"
-#~ msgid_plural "Changed %1 lines"
-#~ msgstr[0] "???????????????? %1 ??????"
-#~ msgstr[1] "?????????????????? %1 ????????"
-
-#~ msgid "Applied: Insertion of %1 line undone"
-#~ msgid_plural "Applied: Insertion of %1 lines undone"
-#~ msgstr[0] "??????????????????: ???????????????????? ???? %1 ?????? ??
????????????????"
-#~ msgstr[1] "??????????????????: ???????????????????? ???? %1 ???????? ??
????????????????"
-
-#~ msgid "Inserted %1 line"
-#~ msgid_plural "Inserted %1 lines"
-#~ msgstr[0] "?????????????? %1 ??????"
-#~ msgstr[1] "???????????????? %1 ????????"
-
-#~ msgid "Applied: Deletion of %1 line undone"
-#~ msgid_plural "Applied: Deletion of %1 lines undone"
-#~ msgstr[0] "??????????????????: ?????????????????????? ???? %1 ?????? ??
????????????????"
-#~ msgstr[1] "??????????????????: ?????????????????????? ???? %1 ???????? ??
????????????????"
-
-#~ msgid "Deleted %1 line"
-#~ msgid_plural "Deleted %1 lines"
-#~ msgstr[0] "???????????? %1 ??????"
-#~ msgstr[1] "?????????????? %1 ????????"
-
-#~ msgid "Unknown"
-#~ msgstr "????????????????????"
-
-#~ msgid "KompareNavTreePart"
-#~ msgstr "KompareNavTreePart"
-
-#~ msgid "John Firebaugh"
-#~ msgstr "John Firebaugh"
-
-#~ msgid "Author"
-#~ msgstr "??????????"
-
-#~ msgid "Otto Bruggeman"
-#~ msgstr "Otto Bruggeman"
-
-#~ msgid "Save &All"
-#~ msgstr "?????????? ???? &????????????"
-
-#~ msgid "Save &Diff..."
-#~ msgstr "?????????? ???? &??????????????????..."
-
-#~ msgid "Swap Source with Destination"
-#~ msgstr "?????????????????? ???? ?????????????????? ??
??????????????????????????"
-
-#~ msgid "Show Statistics"
-#~ msgstr "?????????????????? ???? ????????????????????"
-
-#~ msgid "Refresh Diff"
-#~ msgstr "???????????????????? ???? ??????????????????"
-
-#~ msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-#~ msgstr "<qt>?????????????? (URL) <b>%1</b> ???? ???????? ???? ????????
??????????????.</qt>"
-
-#~ msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
-#~ msgstr "<qt>?????????????? (URL) <b>%1</b> ???? ???????????????????? ????
??????????????????.</qt>"
-
-#~ msgid "Diff Options"
-#~ msgstr "?????????? ???? ??????????????"
-
-#~ msgid "*.diff *.dif *.patch|Patch Files"
-#~ msgstr "*.diff *.dif *.patch|????????????"
-
-#~ msgid "Save .diff"
-#~ msgstr "?????????? ???? .diff"
-
-#~ msgid "The file exists or is write-protected; do you want to overwrite it?"
-#~ msgstr ""
-#~ "???????????? ???????????????????? ?????? ?? ?????????????? ????
??????????. ???????????? ???? ???? ???????? ?????????????????????"
-
-#~ msgid "File Exists"
-#~ msgstr "???????????? ????????????????????"
-
-#~ msgid "Overwrite"
-#~ msgstr "????????????????"
-
-#~ msgid "Do Not Overwrite"
-#~ msgstr "?????? ????????????????"
-
-#~ msgid "KomparePart"
-#~ msgstr "KomparePart"
-
-#~ msgid "Kevin Kofler"
-#~ msgstr "Kevin Kofler"
-
-#~ msgid "Running diff..."
-#~ msgstr "???????????????? ???? ??????????????..."
-
-#~ msgid "Parsing diff output..."
-#~ msgstr "?????????????????? ???? ?????????????? ???? ??????????????????..."
-
-#~ msgid "Comparing file %1 with file %2"
-#~ msgstr "???????????????????? ???? ???????? %1 ?? ???????? %2"
-
-#~ msgid "Comparing files in %1 with files in %2"
-#~ msgstr "???????????????????? ???? ?????????????? ?? %1 ?? ?????????????? ??
%2"
-
-#~ msgid "Viewing diff output from %1"
-#~ msgstr "?????????????? ???? ?????????????????? ???? %1"
-
-#~ msgid "Blending diff output from %1 into file %2"
-#~ msgstr "???????????????? ???? ?????????????????? ????%1 ?????? ???????? %2"
-
-#~ msgid "Blending diff output from %1 into folder %2"
-#~ msgstr "???????????????? ???? ?????????????????? ????%1 ?????? ??????????
%2"
-
-#~ msgid ""
-#~ "You have made changes to the destination file(s).\n"
-#~ "Would you like to save them?"
-#~ msgstr ""
-#~ "???????????????????? ?????????????? ?? ?????????????? ????????(??????).\n"
-#~ "???????????? ???? ???? ???? ?????????????????"
-
-#~ msgid "Save Changes?"
-#~ msgstr "?????????? ???? ???????????????????"
-
-#~ msgid "Unified"
-#~ msgstr "Unified"
-
-#~ msgid "Context"
-#~ msgstr "????????????????"
-
-#~ msgid "RCS"
-#~ msgstr "RCS"
-
-#~ msgid "Ed"
-#~ msgstr "Ed"
-
-#~ msgid "Normal"
-#~ msgstr "????????????????"
-
-#~ msgid ""
-#~ "No diff file, or no 2 files have been diffed. Therefore no stats are "
-#~ "available."
-#~ msgstr ""
-#~ "?????? ???????? ???????? ?? ??????????????, ?????? ???? ????
???????????????? ?????? ??????????. ???????????????????????? ???????? "
-#~ "????????????????????."
-
-#~ msgid "Diff Statistics"
-#~ msgstr "???????????????????? ???? ??????????????"
-
-#~ msgid ""
-#~ "Statistics:\n"
-#~ "\n"
-#~ "Old file: %1\n"
-#~ "New file: %2\n"
-#~ "\n"
-#~ "Format: %3\n"
-#~ "Number of hunks: %4\n"
-#~ "Number of differences: %5"
-#~ msgstr ""
-#~ "????????????????????:\n"
-#~ "\n"
-#~ "???????? ????????: %1\n"
-#~ "?????? ????????: %2\n"
-#~ "\n"
-#~ "????????????: %3\n"
-#~ "???????? ??????????????: %4\n"
-#~ "???????? ??????????????: %5"
-
-#~ msgid ""
-#~ "Statistics:\n"
-#~ "\n"
-#~ "Number of files in diff file: %1\n"
-#~ "Format: %2\n"
-#~ "\n"
-#~ "Current old file: %3\n"
-#~ "Current new file: %4\n"
-#~ "\n"
-#~ "Number of hunks: %5\n"
-#~ "Number of differences: %6"
-#~ msgstr ""
-#~ "????????????????????:\n"
-#~ "\n"
-#~ "???????? ?????????????? ?????? ?????????? ???? ??????????????: %1\n"
-#~ "Format: %2\n"
-#~ "\n"
-#~ "?????????? ???????? ????????: %3\n"
-#~ "?????????? ?????? ????????: %4\n"
-#~ "\n"
-#~ "???????? ??????????????: %5\n"
-#~ "???????? ??????????????: %6"
-
-#~ msgid "&File"
-#~ msgstr "&????????"
-
-#~ msgid "&Difference"
-#~ msgstr "&??????????????"
-
-#~ msgid "&Settings"
-#~ msgstr "&??????????????????"
-
-#~ msgid "Preferences"
-#~ msgstr "??????????????????"
-
-#~ msgid "View"
-#~ msgstr "????????????"
-
-#~ msgid "View Settings"
-#~ msgstr "?????????????????? ???? ????????????"
-
-#~ msgid "Diff"
-#~ msgstr "??????????????"
-
-#~ msgid "Diff Settings"
-#~ msgstr "?????????????????? ???? ??????????????"
-
-#~ msgid "Run Diff In"
-#~ msgstr "???????????????????? ???? Diff ??"
-
-#~ msgid "Command Line"
-#~ msgstr "???????????????? ??????"
-
-#~ msgid "cd dir && diff -udHprNa -- source destination"
-#~ msgstr "cd dir && diff -udHprNa -- ???????????? ????????????????"
-
-#~ msgid "Options"
-#~ msgstr "??????????????????"
-
-#~ msgid "Look for smaller changes"
-#~ msgstr "?????????????? ???? ?????????? ??????????????"
-
-#~ msgid "Optimize for large files"
-#~ msgstr "???????????????????????? ???? ???????????? ??????????????"
-
-#~ msgid "Ignore changes in case"
-#~ msgstr "???????????????????? ???? ?????????????????? ?? ??????????????????"
-
-#~ msgid "Expand tabs to spaces"
-#~ msgstr "???????????????????? ???? ?????????????????????????? ????
??????????????????????"
-
-#~ msgid "Ignore added or removed empty lines"
-#~ msgstr "???????????????????? ???? ???????????????? ??????
???????????????????????? ???????????? ????????????"
-
-#~ msgid "Ignore changes in whitespace"
-#~ msgstr "???????????????????? ???? ?????????????????? ?? ??????????????????"
-
-#~ msgid "Show function names"
-#~ msgstr "?????????????????? ?????????????? ???? ??????????????????"
-
-#~ msgid "Compare folders recursively"
-#~ msgstr "???????????????????? ???? ????????????????????????
????????????????????"
-
-#~ msgid "Treat new files as empty"
-#~ msgstr "?????????????????? ???? ?????????????????? ???????? ????????????"
-
-#~ msgid "Format"
-#~ msgstr "????????????"
-
-#~ msgid "Side-by-side"
-#~ msgstr "???????????? ???? ????????????"
-
-#~ msgid "Number of context lines:"
-#~ msgstr "???????? ???????????? ????????????????:"
-
-#~ msgid "Main Toolbar"
-#~ msgstr "???????????? ?????????? ?? ??????????????????????"
-
-#~ msgid "Files"
-#~ msgstr "??????????????"
-
-#~ msgid "Here you can enter the files you want to compare."
-#~ msgstr "?????? ???????????????? ??????????????????, ?????????? ????????????
???? ????????????????"
-
-#~ msgid "Here you can change the options for comparing the files."
-#~ msgstr "?????? ???????????? ???? ?????????????????? ?????????????? ????
???????????????????? ???? ??????????????"
-
-#~ msgid "Appearance"
-#~ msgstr "????????????"
-
-#~ msgid "Here you can change the options for the view."
-#~ msgstr "?????? ???????????? ???? ?????????????????? ?????????????? ????
??????????????"
-
-#~ msgid "Diff Program"
-#~ msgstr "???????????????? ???? ??????????????"
-
-#~ msgid ""
-#~ "You can select a different diff program here. On Solaris the standard "
-#~ "diff program does not support all the options that the GNU version does. "
-#~ "This way you can select that version."
-#~ msgstr ""
-#~ "?????? ???????????? ???? ???????????????? ????????????????
???????????????? ???? ??????????????. ?? Solaris "
-#~ "???????????????????????? ???????????? ???? ???????????????? ????????????
?????????? ???????? GNU ????????????????. ???? ???????? "
-#~ "?????????? ???????????? ???? ???????????????? ????????????????."
-
-#~ msgid ""
-#~ "Select the format of the output generated by diff. Unified is the one "
-#~ "that is used most frequently because it is very readable. The KDE "
-#~ "developers like this format the best so use it for sending patches."
-#~ msgstr ""
-#~ "???????????????? ?????????????? ???? ?????????????????? ?????????? ????
??????????????????. Unified ?? ???????? ??????-"
-#~ "?????????? ????????????????????????, ???????????? ?? ??????????.
???????????????????????????? ???? KDE ??????-?????????? ???? "
-#~ "???????????????? ???? ?????????????????? ???? ????????????."
-
-#~ msgid "Output Format"
-#~ msgstr "???????????? ???? ?????????????????? ??????????"
-
-#~ msgid "Lines of Context"
-#~ msgstr "???????????? ????????????????"
-
-#~ msgid ""
-#~ "The number of context lines is normally 2 or 3. This makes the diff "
-#~ "readable and applicable in most cases. More than 3 lines will only bloat "
-#~ "the diff unnecessarily."
-#~ msgstr ""
-#~ "?????????? ???????????? ???????????????? ???????????????????? ?? 2 ??????
3. ???????? ?????????? ?????????????????? ???????????? ?? "
-#~ "?????????????????? ?? ???????????????? ????????????. ???????????? ???? 3
???????? ???????? ???? ?????????????? ???? ?????????????? "
-#~ "??????????????????."
-
-#~ msgid "General"
-#~ msgstr "????????"
-
-#~ msgid "&Treat new files as empty"
-#~ msgstr "&?????????????????? ???? ???????????? ?????????????????? ????????
????????????"
-
-#~ msgid "This option corresponds to the -N diff option."
-#~ msgstr "???????? ?????????????????????? ???? ?????????????? -N ???? diff."
-
-#~ msgid "&Look for smaller changes"
-#~ msgstr "&?????????????? ???? ?????????? ??????????????"
-
-#~ msgid "This corresponds to the -d diff option."
-#~ msgstr "???????? ?????????????????????? ???? ?????????????? -d ???? diff."
-
-#~ msgid "O&ptimize for large files"
-#~ msgstr "&???????????????????????? ???? ???????????? ??????????????"
-
-#~ msgid "This corresponds to the -H diff option."
-#~ msgstr "???????? ?????????????????????? ???? ?????????????? -H ???? diff."
-
-#~ msgid "&Ignore changes in case"
-#~ msgstr "&???????????????????? ???? ?????????????????? ?? ??????????????????"
-
-#~ msgid "This corresponds to the -i diff option."
-#~ msgstr "???????? ?????????????????????? ???? ?????????????? -i ???? diff."
-
-#~ msgid "Ignore regexp:"
-#~ msgstr "???????????????????? ???? ??????. ????????????:"
-
-#~ msgid "This option corresponds to the -I diff option."
-#~ msgstr "???????? ?????????????????????? ???? ?????????????? -I ???? diff."
-
-#~ msgid ""
-#~ "Add the regular expression here that you want to use\n"
-#~ "to ignore lines that match it."
-#~ msgstr ""
-#~ "?????? ???????????????? ???????????????????? ?????????? ??
????????????????,\n"
-#~ "?????????? ???????????????? ?? ????????, ???? ??????????
????????????????????."
-
-#~ msgid "&Edit..."
-#~ msgstr "&??????????????????????..."
-
-#~ msgid ""
-#~ "Clicking this will open a regular expression dialog where\n"
-#~ "you can graphically create regular expressions."
-#~ msgstr ""
-#~ "?????????????????????? ???? ???????? ?????????????? ???? ????????????
???????????????? ????\n"
-#~ "??????. ??????????, ???????????? ???????????? ???? ??????????????????
???????????? ????????????????."
-
-#~ msgid "Whitespace"
-#~ msgstr "????????????????"
-
-#~ msgid "E&xpand tabs to spaces in output"
-#~ msgstr "&???????????????????? ???? ?????????????????????????? ????
??????????????????"
-
-#~ msgid "This option corresponds to the -t diff option."
-#~ msgstr "???????? ?????????????????????? ???? ?????????????? -t ???? diff."
-
-#~ msgid "I&gnore added or removed empty lines"
-#~ msgstr "&???????????????????? ???? ???????????????? ????????????"
-
-#~ msgid "This option corresponds to the -B diff option."
-#~ msgstr "???????? ?????????????????????? ???? ?????????????? -B ???? diff."
-
-#~ msgid "Ig&nore changes in the amount of whitespace"
-#~ msgstr "&???????????????????? ???? ?????????????????? ?? ????????
??????????????????"
-
-#~ msgid "This option corresponds to the -b diff option."
-#~ msgstr "???????? ?????????????????????? ???? ?????????????? -b ???? diff."
-
-#~ msgid "Ign&ore all whitespace"
-#~ msgstr "&???????????????????? ???? ???????????? ??????????????????"
-
-#~ msgid "This option corresponds to the -w diff option."
-#~ msgstr "???????? ?????????????????????? ???? ?????????????? -w ???? diff."
-
-#~ msgid "Igno&re changes due to tab expansion"
-#~ msgstr "????????????????&???? ???? ?????????????????? ????
???????????????????????? ???? ????????????????????????"
-
-#~ msgid "This option corresponds to the -E diff option."
-#~ msgstr "???????? ?????????????????????? ???? ?????????????? -E ???? dif."
-
-#~ msgid "File Pattern to Exclude"
-#~ msgstr "???????????????????? - ???????????? ???? ????????"
-
-#~ msgid ""
-#~ "If this is checked you can enter a shell pattern in the text box on the "
-#~ "right or select entries from the list."
-#~ msgstr ""
-#~ "?????? ?? ???????????????? ???????? ??????????????, ???????????? ????
???????????????? ???????????? ???? ?????? ???????????? ?????? "
-#~ "???? ???????????????? ???????????????? ???? ??????????????."
-
-#~ msgid ""
-#~ "Here you can enter or remove a shell pattern or select one or more "
-#~ "entries from the list."
-#~ msgstr ""
-#~ "?????? ???????????? ???? ???????????????? ?????? ????????????????????
???????????? ???? ?????? ?????? ???? ???????????????? "
-#~ "???????????????? ???? ??????????????."
-
-#~ msgid "File with Filenames to Exclude"
-#~ msgstr "???????????????????? - ???????? ?? ??????????"
-
-#, fuzzy
-#~| msgid ""
-#~| "If this is checked you can enter a filename in the combo box on the "
-#~| "right."
-#~ msgid "If this is checked you can enter a filename in the combo box below."
-#~ msgstr ""
-#~ "?????? ?? ???????????????? ???????? ??????????????, ???????????? ????
???????????????? ?????? ???? ???????? ?? ???????????? "
-#~ "????????????."
-
-#~ msgid ""
-#~ "Here you can enter the URL of a file with shell patterns to ignore during "
-#~ "the comparison of the folders."
-#~ msgstr ""
-#~ "?????? ???????????? ???? ???????????????? ?????????? ???? ???????? ??????
?????????????? ???? ????????????, ?????????? ???? "
-#~ "?????????? ???????????????????? ???? ?????????? ????
???????????????????????? ???? ??????????????."
-
-#~ msgid ""
-#~ "Any file you select in the dialog that pops up when you click it will be "
-#~ "put in the dialog to the left of this button."
-#~ msgstr ""
-#~ "?????????? ????????, ?????????? ?????????????????? ?? ????????????????????
????????????????, ???? ???????? ???????????????? "
-#~ "?????????????? ???? ????????????."
-
-#~ msgid "Exclude"
-#~ msgstr "????????????????????"
-
-#~ msgid "Encoding"
-#~ msgstr "???????????? ??????????????"
-
-#~ msgid "Colors"
-#~ msgstr "??????????????"
-
-#~ msgid "Removed color:"
-#~ msgstr "???????? ???? ????????????????????:"
-
-#~ msgid "Changed color:"
-#~ msgstr "???????? ???? ??????????????????:"
-
-#~ msgid "Added color:"
-#~ msgstr "???????? ???? ????????????????:"
-
-#~ msgid "Applied color:"
-#~ msgstr "???????? ???? ??????????????????:"
-
-#~ msgid "Mouse Wheel"
-#~ msgstr "?????????????? ???? ??????????????"
-
-#~ msgid "Number of lines:"
-#~ msgstr "???????? ????????????:"
-
-#~ msgid "Tabs to Spaces"
-#~ msgstr "?????????????????????? ?? ??????????????????"
-
-#~ msgid "Number of spaces to convert a tab character to:"
-#~ msgstr "???????? ?????????????????? ?? ?????????? ???? ????????
?????????????????????? ???????? ??????????????????????:"
-
-#~ msgid "Text Font"
-#~ msgstr "?????????? ???? ??????????"
-
-#~ msgid "Font:"
-#~ msgstr "??????????:"
-
-#~ msgid "Size:"
-#~ msgstr "????????????:"
-
-#~ msgid "Fonts"
-#~ msgstr "????????????????"
-
-#~ msgid ""
-#~ "A program to view the differences between files and optionally generate a "
-#~ "diff"
-#~ msgstr ""
-#~ "???????????????? ???? ???????????????? ???? ?????????????? ??????????
?????????????? ?? ???? ???????????????????? ???? ??????????????"
-
-#~ msgid "Kompare"
-#~ msgstr "????????????????????"
-
-#, fuzzy
-#~| msgid ""
-#~| "(c) 2001-2004 John Firebaugh, (c) 2001-2005,2009 Otto Bruggeman, (c) "
-#~| "2004-2005 Jeff Snyder, (c) 2007-2008 Kevin Kofler"
-#~ msgid ""
-#~ "(c) 2001-2004 John Firebaugh, (c) 2001-2005,2009 Otto Bruggeman, (c) "
-#~ "2004-2005 Jeff Snyder, (c) 2007-2012 Kevin Kofler"
-#~ msgstr ""
-#~ "(c) 2001-2004 John Firebaugh, (c) 2001-2005,2009 Otto Bruggeman, (c) "
-#~ "2004-2005 Jeff Snyder, (c) 2007-2008 Kevin Kofler"
-
-#~ msgid "Jeff Snyder"
-#~ msgstr "Jeff Snyder"
-
-#~ msgid "Developer"
-#~ msgstr "??????????????????????"
-
-#~ msgid "Maintainer"
-#~ msgstr "??????????????????"
-
-#~ msgid "Chris Luetchford"
-#~ msgstr "Chris Luetchford"
-
-#~ msgid "Kompare icon artist"
-#~ msgstr "?????????? ???? ?????????????? ???? Kompare"
-
-#~ msgid "Malte Starostik"
-#~ msgstr "Malte Starostik"
-
-#~ msgid "A lot of good advice"
-#~ msgstr "?????????? ?????????? ????????????"
-
-#~ msgid "Bernd Gehrmann"
-#~ msgstr "Bernd Gehrmann"
-
-#~ msgid "Cervisia diff viewer"
-#~ msgstr "?????????????? ?????? Cervisia"
-
-#~ msgid "This will compare URL1 with URL2"
-#~ msgstr "???????? ???? ???????????? URL1 ?? URL2"
-
-#~ msgid ""
-#~ "This will open URL1 and expect it to be diff output. URL1 can also be a "
-#~ "'-' and then it will read from standard input. Can be used for instance "
-#~ "for cvs diff | kompare -o -. Kompare will do a check to see if it can "
-#~ "find the original file(s) and then blend the original file(s) into the "
-#~ "diffoutput and show that in the viewer. -n disables the check."
-#~ msgstr ""
-#~ "???????? ???? ???????????? URL1 ?? ???? ???????????? ???? ???? ??????????
???? ??????????????????. URL1 ???????? ???????? "
-#~ "???????? ???? ???????? \"-\" ?? ???????????? ???? ????????
???????????????? ???? ?????????????????? ???? ???????????????????????? "
-#~ "???????????? ??????????. ???????????????? ???????? ???? ????????
???????????????????? ???? cvs diff | kompare -o "
-#~ "-. ???? ?????????? ??????????????????, ???? ???? ???????? ????????
???????? ???? ???????????? ?????????????????????? "
-#~ "????????(??????), ???? ???? ?????????? ?? ???? ????????????
??????????????????. -n ???????????????? ????????????????????."
-
-#~ msgid ""
-#~ "This will blend URL2 into URL1, URL2 is expected to be diff output and "
-#~ "URL1 the file or folder that the diffoutput needs to be blended into. "
-#~ msgstr ""
-#~ "???????? ???? ?????????? URL2 ?? URL1. URL2 ???? ???????????? ????
???????? ?????????????? ???? ??????????????, ?? "
-#~ "URL1 - ???????????? ?????? ????????????????????????, ???????????? ????
???????? ????????????????????. "
-
-#~ msgid ""
-#~ "Disables the check for automatically finding the original file(s) when "
-#~ "using '-' as URL with the -o option."
-#~ msgstr ""
-#~ "?????????????????? ??????????????????, ?????? ????????????
?????????????????????? ???? ?????????????????? ?????????????????????? "
-#~ "????????(??????) ???????? ???????????????????? \"-\" ???????? URL ??
?????????? -o."
-
-#~ msgid ""
-#~ "Use this to specify the encoding when calling it from the command line. "
-#~ "It will default to the local encoding if not specified."
-#~ msgstr ""
-#~ "?????????????????????? ???????? ???? ???? ????????????????
???????????????? ?????????????? ?????? ?????????????????? ?? ???????????????? "
-#~ "??????. ?????? ???? ?? ????????????????, ???? ????????
???????????????????? ???????? ???? ????????????????????????."
-
-#~ msgid "Compare these files or folder"
-#~ msgstr "???????????????????? ???? ???????? ?????????????? ?? ??????????"
-
-#~ msgid "Could not find our KompareViewPart."
-#~ msgstr "KompareViewPart ???? ???????? ???? ???????? ????????????????."
-
-#~ msgid "Could not find our KompareNavigationPart."
-#~ msgstr "KompareViewPart ???? ???????? ???? ???????? ????????????????."
+"?????????????? ???? ?????????????????? ?? ????????????????????
??????????????. ?????????? ???????????? ???? ?????????? ???? ???? "
+"???????????????????? ?? ???????? ???? ???? ???????????????? ?? ??????????????
???? ??????????????????."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libkomparediff2-22.04.2/po/ca@valencia/libkomparediff2.po
new/libkomparediff2-22.04.3/po/ca@valencia/libkomparediff2.po
--- old/libkomparediff2-22.04.2/po/ca@valencia/libkomparediff2.po
2022-06-07 09:14:30.000000000 +0200
+++ new/libkomparediff2-22.04.3/po/ca@valencia/libkomparediff2.po
2022-07-05 06:38:03.000000000 +0200
@@ -51,13 +51,13 @@
#, kde-format
msgctxt "@action"
msgid "P&revious File"
-msgstr "Ficher p&revi"
+msgstr "Fitxer p&revi"
#: komparemodellist.cpp:84
#, kde-format
msgctxt "@action"
msgid "N&ext File"
-msgstr "Ficher s&eg??ent"
+msgstr "Fitxer s&eg??ent"
#: komparemodellist.cpp:88
#, kde-format
@@ -77,8 +77,8 @@
"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff "
"file.</qt>"
msgstr ""
-"<qt>Sense models o diferencies, el ficher <b>%1</b> no ??s cap ficher
??diff?? "
-"v??lit.</qt>"
+"<qt>Sense models o diferencies, el fitxer <b>%1</b> no ??s cap fitxer
??diff?? "
+"v??lid.</qt>"
#: komparemodellist.cpp:262
#, kde-format
@@ -86,7 +86,7 @@
"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
"qt>"
msgstr ""
-"<qt>S'han produ??t problemes durant l'aplicaci?? de ??diff?? <b>%1</b> al
ficher "
+"<qt>S'han produ??t problemes durant l'aplicaci?? de ??diff?? <b>%1</b> al
fitxer "
"<b>%2</b>.</qt>"
#: komparemodellist.cpp:289
@@ -101,13 +101,13 @@
#: komparemodellist.cpp:321 komparemodellist.cpp:679
#, kde-format
msgid "Could not open a temporary file."
-msgstr "No s'ha pogut obrir un ficher temporal."
+msgstr "No s'ha pogut obrir un fitxer temporal."
#: komparemodellist.cpp:369 komparemodellist.cpp:376
#, kde-format
msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
msgstr ""
-"<qt>No s'ha pogut escriure al ficher temporal <b>%1</b>, se suprimix.</qt>"
+"<qt>No s'ha pogut escriure al fitxer temporal <b>%1</b>, se suprimix.</qt>"
#: komparemodellist.cpp:407
#, kde-format
@@ -116,7 +116,7 @@
"The file has not been saved.</qt>"
msgstr ""
"<qt>No s'ha pogut crear el directori de destinaci?? <b>%1</b>.\n"
-"El ficher no ha estat guardat.</qt>"
+"El fitxer no ha estat guardat.</qt>"
#: komparemodellist.cpp:434
#, kde-format
@@ -125,24 +125,24 @@
"b>. The temporary file is still available under: <b>%2</b>. You can manually "
"copy it to the right place.</qt>"
msgstr ""
-"<qt>No s'ha pogut pujar el ficher temporal a la ubicaci?? de destinaci?? <b>"
-"%1</b>. El ficher temporal encara est?? disponible davall: <b>%2</b>. Podeu "
+"<qt>No s'ha pogut pujar el fitxer temporal a la ubicaci?? de destinaci?? <b>"
+"%1</b>. El fitxer temporal encara est?? disponible davall: <b>%2</b>. Podeu "
"copiar-lo manualment al lloc correcte.</qt>"
#: komparemodellist.cpp:513 komparemodellist.cpp:626 komparemodellist.cpp:646
#, kde-format
msgid "Could not parse diff output."
-msgstr "No s'ha pogut analisar l'eixida de ??diff??."
+msgstr "No s'ha pogut analitzar l'eixida de ??diff??."
#: komparemodellist.cpp:529
#, kde-format
msgid "The files are identical."
-msgstr "Els fichers s??n id??ntics."
+msgstr "Els fitxers s??n id??ntics."
#: komparemodellist.cpp:711
#, kde-format
msgid "Could not write to the temporary file."
-msgstr "No s'ha pogut escriure al ficher temporal."
+msgstr "No s'ha pogut escriure al fitxer temporal."
#: komparemodellist.cpp:985
#, kde-format
@@ -150,5 +150,5 @@
"The diff is malformed. Some lines could not be parsed and will not be "
"displayed in the diff view."
msgstr ""
-"??diff?? est?? mal format. Algunes ll??nees no es poden analisar i no es "
+"??diff?? est?? mal format. Algunes l??nies no es poden analitzar i no es "
"mostraran a la vista de difer??ncies."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkomparediff2-22.04.2/po/zh_CN/libkomparediff2.po
new/libkomparediff2-22.04.3/po/zh_CN/libkomparediff2.po
--- old/libkomparediff2-22.04.2/po/zh_CN/libkomparediff2.po 2022-06-07
09:14:30.000000000 +0200
+++ new/libkomparediff2-22.04.3/po/zh_CN/libkomparediff2.po 2022-07-05
06:38:03.000000000 +0200
@@ -13,7 +13,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2021-07-22 00:18+0000\n"
-"PO-Revision-Date: 2022-06-05 04:19\n"
+"PO-Revision-Date: 2022-07-02 11:02\n"
"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
