Hello community, here is the log from the commit of package libkomparediff2 for openSUSE:Factory checked in at 2017-08-24 17:49:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkomparediff2 (Old) and /work/SRC/openSUSE:Factory/.libkomparediff2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkomparediff2" Thu Aug 24 17:49:01 2017 rev:48 rq:516468 version:17.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libkomparediff2/libkomparediff2.changes 2017-07-25 11:33:55.787133022 +0200 +++ /work/SRC/openSUSE:Factory/.libkomparediff2.new/libkomparediff2.changes 2017-08-24 17:49:02.400811193 +0200 @@ -1,0 +2,17 @@ +Fri Aug 11 22:46:23 UTC 2017 - [email protected] + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : + * Use Q_DECL_OVERRIDE + +------------------------------------------------------------------- +Sat Aug 5 18:19:27 UTC 2017 - [email protected] + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + +------------------------------------------------------------------- Old: ---- libkomparediff2-17.04.3.tar.xz New: ---- libkomparediff2-17.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkomparediff2.spec ++++++ --- /var/tmp/diff_new_pack.WsLIlF/_old 2017-08-24 17:49:03.216696275 +0200 +++ /var/tmp/diff_new_pack.WsLIlF/_new 2017-08-24 17:49:03.228694585 +0200 @@ -1,7 +1,7 @@ # # spec file for package libkomparediff2 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,14 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_without lang %define soname 5 Name: libkomparediff2 -Version: 17.04.3 +Version: 17.08.0 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: A library to compare files and strings License: (GPL-2.0+ and LGPL-2.0+) and BSD-2-Clause @@ -62,7 +63,9 @@ %package %{soname} Summary: A library to compare files and strings Group: System/Libraries +%if %{with lang} Recommends: %{name}-lang +%endif Provides: %{name} = %{version} %description %{soname} @@ -95,9 +98,10 @@ %files devel %defattr(-,root,root) -%{_kf5_prefix}/include/libkomparediff2/ -%{_kf5_libdir}/cmake/LibKompareDiff2/ +%doc COPYING* +%{_kf5_cmakedir}/LibKompareDiff2/ %{_kf5_libdir}/libkomparediff2.so +%{_kf5_prefix}/include/libkomparediff2/ %if %{with lang} %files lang -f %{name}.lang ++++++ libkomparediff2-17.04.3.tar.xz -> libkomparediff2-17.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-17.04.3/cvsdiffparser.h new/libkomparediff2-17.08.0/cvsdiffparser.h --- old/libkomparediff2-17.04.3/cvsdiffparser.h 2017-04-03 02:40:33.000000000 +0200 +++ new/libkomparediff2-17.08.0/cvsdiffparser.h 2017-06-02 07:37:55.000000000 +0200 @@ -32,25 +32,25 @@ virtual ~CVSDiffParser(); protected: - virtual enum Kompare::Format determineFormat(); + enum Kompare::Format determineFormat() Q_DECL_OVERRIDE; protected: // virtual bool parseContextDiffHeader(); - virtual bool parseEdDiffHeader(); - virtual bool parseNormalDiffHeader(); - virtual bool parseRCSDiffHeader(); + bool parseEdDiffHeader() Q_DECL_OVERRIDE; + bool parseNormalDiffHeader() Q_DECL_OVERRIDE; + bool parseRCSDiffHeader() Q_DECL_OVERRIDE; // virtual bool parseUnifiedDiffHeader(); // virtual bool parseContextHunkHeader(); - virtual bool parseEdHunkHeader(); + bool parseEdHunkHeader() Q_DECL_OVERRIDE; // virtual bool parseNormalHunkHeader(); - virtual bool parseRCSHunkHeader(); + bool parseRCSHunkHeader() Q_DECL_OVERRIDE; // virtual bool parseUnifiedHunkHeader(); // virtual bool parseContextHunkBody(); - virtual bool parseEdHunkBody(); + bool parseEdHunkBody() Q_DECL_OVERRIDE; // virtual bool parseNormalHunkBody(); - virtual bool parseRCSHunkBody(); + bool parseRCSHunkBody() Q_DECL_OVERRIDE; // virtual bool parseUnifiedHunkBody(); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-17.04.3/diffparser.h new/libkomparediff2-17.08.0/diffparser.h --- old/libkomparediff2-17.04.3/diffparser.h 2017-04-03 02:40:33.000000000 +0200 +++ new/libkomparediff2-17.08.0/diffparser.h 2017-06-02 07:37:55.000000000 +0200 @@ -28,7 +28,7 @@ virtual ~DiffParser(); protected: - virtual enum Kompare::Format determineFormat(); + enum Kompare::Format determineFormat() Q_DECL_OVERRIDE; }; } // End of namespace Diff2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-17.04.3/diffsettings.h new/libkomparediff2-17.08.0/diffsettings.h --- old/libkomparediff2-17.04.3/diffsettings.h 2017-04-03 02:40:33.000000000 +0200 +++ new/libkomparediff2-17.08.0/diffsettings.h 2017-06-02 07:37:55.000000000 +0200 @@ -33,8 +33,8 @@ virtual ~DiffSettings(); public: // some virtual functions that will be overloaded from the base class - virtual void loadSettings( KConfig* config ); - virtual void saveSettings( KConfig* config ); + void loadSettings( KConfig* config ) Q_DECL_OVERRIDE; + void saveSettings( KConfig* config ) Q_DECL_OVERRIDE; public: QString m_diffProgram; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-17.04.3/perforceparser.h new/libkomparediff2-17.08.0/perforceparser.h --- old/libkomparediff2-17.04.3/perforceparser.h 2017-04-03 02:40:33.000000000 +0200 +++ new/libkomparediff2-17.08.0/perforceparser.h 2017-06-02 07:37:55.000000000 +0200 @@ -28,13 +28,13 @@ virtual ~PerforceParser(); protected: - virtual bool parseContextDiffHeader(); - virtual bool parseNormalDiffHeader(); - virtual bool parseRCSDiffHeader(); - virtual bool parseUnifiedDiffHeader(); + bool parseContextDiffHeader() Q_DECL_OVERRIDE; + bool parseNormalDiffHeader() Q_DECL_OVERRIDE; + bool parseRCSDiffHeader() Q_DECL_OVERRIDE; + bool parseUnifiedDiffHeader() Q_DECL_OVERRIDE; protected: - virtual enum Kompare::Format determineFormat(); + enum Kompare::Format determineFormat() Q_DECL_OVERRIDE; }; } // End of namespace Diff2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-17.04.3/po/bg/libkomparediff2.po new/libkomparediff2-17.08.0/po/bg/libkomparediff2.po --- old/libkomparediff2-17.04.3/po/bg/libkomparediff2.po 2017-07-11 02:23:59.000000000 +0200 +++ new/libkomparediff2-17.08.0/po/bg/libkomparediff2.po 2017-08-11 02:45:03.000000000 +0200 @@ -1,4 +1,5 @@ -# translation of kompare.po to Bulgarian +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. # # Zlatko Popov <[email protected]>, 2006, 2008. # Yasen Pramatarov <[email protected]>, 2009. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-17.04.3/po/tr/libkomparediff2.po new/libkomparediff2-17.08.0/po/tr/libkomparediff2.po --- old/libkomparediff2-17.04.3/po/tr/libkomparediff2.po 2017-07-11 02:23:59.000000000 +0200 +++ new/libkomparediff2-17.08.0/po/tr/libkomparediff2.po 2017-08-11 02:45:04.000000000 +0200 @@ -14,8 +14,8 @@ "POT-Creation-Date: 2016-11-19 20:17+0100\n" "PO-Revision-Date: 2014-06-08 14:01+0000\n" "Last-Translator: Volkan Gezer <[email protected]>\n" -"Language-Team: Turkish " -"(http://www.transifex.com/projects/p/kdesdk-k-tr/language/tr/)\n" +"Language-Team: Turkish (http://www.transifex.com/projects/p/kdesdk-k-tr/"; +"language/tr/)\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-17.04.3/po/zh_CN/libkomparediff2.po new/libkomparediff2-17.08.0/po/zh_CN/libkomparediff2.po --- old/libkomparediff2-17.04.3/po/zh_CN/libkomparediff2.po 2017-07-11 02:23:59.000000000 +0200 +++ new/libkomparediff2-17.08.0/po/zh_CN/libkomparediff2.po 2017-08-11 02:45:04.000000000 +0200 @@ -1,27 +1,20 @@ -# translation of kompare.po to 简体中文 -# Copyright (C) 2002,2003, 2004, 2008, 2009 Free Software Foundation, Inc. -# -# Li Zongliang <[email protected]>, 2001,2002. -# Xiong Jiang <[email protected]>, 2002,2003. -# Levin Du <[email protected]>, 2004. -# Ni Hui <[email protected]>, 2008, 2009, 2010, 2012. -# Lie Ex <[email protected]>, 2008, 2009. -# FengChao <[email protected]>, 2011. -# Weng Xuetian <[email protected]>, 2011. msgid "" msgstr "" -"Project-Id-Version: kompare\n" +"Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:17+0100\n" -"PO-Revision-Date: 2012-05-28 11:20+0800\n" -"Last-Translator: Ni Hui <[email protected]>\n" -"Language-Team: Chinese Simplified <[email protected]>\n" +"PO-Revision-Date: 2017-08-05 09:36-0400\n" +"Last-Translator: guoyunhebrave <[email protected]>\n" +"Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: kdeorg\n" +"X-Crowdin-Language: zh-CN\n" +"X-Crowdin-File: /kf5-stable/messages/kdesdk/libkomparediff2.pot\n" #: komparemodellist.cpp:74 #, kde-format @@ -135,752 +128,3 @@ "The diff is malformed. Some lines could not be parsed and will not be " "displayed in the diff view." msgstr "diff 无效。某些行无法解析并且不会显示在 diff 视图中。" - -#~ msgctxt "NAME OF TRANSLATORS" -#~ msgid "Your names" -#~ msgstr "KDE 中国" - -#~ msgctxt "EMAIL OF TRANSLATORS" -#~ msgid "Your emails" -#~ msgstr "[email protected]" - -#~ msgid "Could not load our KompareViewPart." -#~ msgstr "无法加载部件 KompareViewPart。" - -#~ msgid "Navigation" -#~ msgstr "导航" - -#~ msgid "Could not load our KompareNavigationPart." -#~ msgstr "无法加载部件 KompareNavigationPart。" - -#~ msgid "&Open Diff..." -#~ msgstr "打开 diff 文件(&O)..." - -#~ msgid "&Compare Files..." -#~ msgstr "比较文件(&C)..." - -#~ msgid "&Blend URL with Diff..." -#~ msgstr "合并 diff 到 URL(&B)..." - -#~ msgid "Show T&ext View" -#~ msgstr "显示文本视图(&E)" - -#~ msgid " 0 of 0 differences " -#~ msgstr "无差异" - -#~ msgid " 0 of 0 files " -#~ msgstr "无文件" - -#~ msgid " %2 of %1 file " -#~ msgid_plural " %2 of %1 files " -#~ msgstr[0] " %1 个文件中的 %2 个 " - -#~ msgid " %1 file " -#~ msgid_plural " %1 files " -#~ msgstr[0] " %1 个文件 " - -#~ msgid " %2 of %1 difference, %3 applied " -#~ msgid_plural " %2 of %1 differences, %3 applied " -#~ msgstr[0] " %1 个差异中的 %2 个，%3 个已应用 " - -#~ msgid " %1 difference " -#~ msgid_plural " %1 differences " -#~ msgstr[0] " %1 个差异 " - -#~ msgid "Blend File/Folder with diff Output" -#~ msgstr "合并 diff 输出到文件/文件夹" - -#~ msgid "File/Folder" -#~ msgstr "文件/文件夹" - -#~ msgid "Diff Output" -#~ msgstr "Diff 输出" - -#~ msgid "Blend" -#~ msgstr "合并" - -#~ msgid "Blend this file or folder with the diff output" -#~ msgstr "合并 diff 输出到此文件或文件夹" - -#~ 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 "" -#~ "如果您在此对话框中输入了文件或文件夹名称，以及包含 diff 输出的文件，则此按" -#~ "钮可以使用。单击此按钮后，将打开 kompare 的主视图，输入的文件或文件夹中的" -#~ "文件将会与 diff 输出混合，这样您就可以将差异应用到文件了。" - -#~ 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 "" -#~ "在对话框的字段中输入了两个文件名或文件夹名，此按钮才可用，\n" -#~ "按下它，将开始比较所输入的文件或文件夹。" - -#~ 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 行的修改" - -#~ msgid "Changed %1 line" -#~ msgid_plural "Changed %1 lines" -#~ msgstr[0] "更改了 %1 行" - -#~ msgid "Applied: Insertion of %1 line undone" -#~ msgid_plural "Applied: Insertion of %1 lines undone" -#~ msgstr[0] "应用结果：未完成 %1 行的插入" - -#~ msgid "Inserted %1 line" -#~ msgid_plural "Inserted %1 lines" -#~ msgstr[0] "插入了 %1 行" - -#~ msgid "Applied: Deletion of %1 line undone" -#~ msgid_plural "Applied: Deletion of %1 lines undone" -#~ msgstr[0] "应用结果：未完成 %1 行的删除" - -#~ msgid "Deleted %1 line" -#~ msgid_plural "Deleted %1 lines" -#~ msgstr[0] "删除了 %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 "全部保存(&A)" - -#~ msgid "Save &Diff..." -#~ msgstr "保存差异文件(&D)..." - -#~ msgid "Swap Source with Destination" -#~ msgstr "交换源文件和目标文件" - -#~ msgid "Show Statistics" -#~ msgstr "显示统计信息" - -#~ msgid "Refresh Diff" -#~ msgstr "刷新 Diff" - -#~ 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 "Diff 选项" - -#~ 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 "运行 diff..." - -#~ msgid "Parsing diff output..." -#~ msgstr "分析 diff 输出..." - -#~ 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 的 diff 结果" - -#~ msgid "Blending diff output from %1 into file %2" -#~ msgstr "合并 %1 的 diff 结果到文件 %2" - -#~ msgid "Blending diff output from %1 into folder %2" -#~ msgstr "合并 %1 的 diff 结果到文件夹 %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 "统一" - -#~ 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 "没有 diff 文件，或没有比较两个文件，因为统计信息不可用。" - -#~ msgid "Diff Statistics" -#~ msgstr "Diff 统计" - -#~ 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" -#~ "diff结果中的文件个数：%1\n" -#~ "格式：%2\n" -#~ "\n" -#~ "当前旧文件：%3\n" -#~ "当前新文件：%4\n" -#~ "\n" -#~ "相同个数：%5\n" -#~ "差异个数：%6" - -#~ msgid "&File" -#~ msgstr "文件(&F)" - -#~ msgid "&Difference" -#~ msgstr "差异(&D)" - -#~ msgid "&Settings" -#~ msgstr "设置(&S)" - -#~ msgid "Preferences" -#~ msgstr "首选项" - -#~ msgid "View" -#~ msgstr "视图" - -#~ msgid "View Settings" -#~ msgstr "视图设置" - -#~ msgid "Diff" -#~ msgstr "Diff" - -#~ msgid "Diff Settings" -#~ msgstr "Diff 设置" - -#~ msgid "Run Diff In" -#~ msgstr "运行 diff 在" - -#~ msgid "Command Line" -#~ msgstr "命令行" - -#~ msgid "cd dir && diff -udHprNa -- source destination" -#~ msgstr "cd 目录 && 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 "" -#~ "File used for excluding files cannot be found, please specify another " -#~ "file." -#~ msgstr "找不到用于排除的文件。请另行指定文件。" - -#~ msgid "Diff Program" -#~ msgstr "diff 程序" - -#~ 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 "" -#~ "在此可以选择另外一个 diff 程序。在 Solaris 上，标准 diff 程序不支持 GNU 版" -#~ "本的所有选项，因此可以选择 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 "" -#~ "选择 diff 产生结果的格式。统一(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，这样使得 diff 容易阅读，且能应用于大多数场合。" -#~ "多于 3 行一般是不需要的。" - -#~ msgid "General" -#~ msgstr "常规" - -#~ msgid "&Treat new files as empty" -#~ msgstr "将新文件作为空文件处理(&T)" - -#~ msgid "This option corresponds to the -N diff option." -#~ msgstr "对应于 diff 的 -N 选项。" - -#~ msgid "" -#~ "With this option enabled diff will treat a file that only exists in one " -#~ "of the directories as empty in the other directory. This means that the " -#~ "file is compared with an empty file and because of this will appear as " -#~ "one big insertion or deletion." -#~ msgstr "" -#~ "启用此选项时，差异对比程序会将仅存在于两个目录之一，另一个目录里不存在的文" -#~ "件当作空文件处理。这就意味着此文件可能会在差异对比结果中产生较大的新增或删" -#~ "除内容。" - -#~ msgid "&Look for smaller changes" -#~ msgstr "查找较小的修改(&L)" - -#~ msgid "This corresponds to the -d diff option." -#~ msgstr "对应于 diff 的 -d 选项。" - -#~ msgid "" -#~ "With this option enabled diff will try a little harder (at the cost of " -#~ "more memory) to find fewer changes." -#~ msgstr "" -#~ "启用此选项时，差异对比程序会试图使用内存开销较大的算法去查找较小的修改。" - -#~ msgid "O&ptimize for large files" -#~ msgstr "优化大文件(&P)" - -#~ msgid "This corresponds to the -H diff option." -#~ msgstr "对应于 diff 的 -H 选项。" - -#~ msgid "" -#~ "This option lets diff makes better diffs when using large files. The " -#~ "definition of large is nowhere to be found though." -#~ msgstr "启用此选项时，差异对比程序会优化大文件。" - -#~ msgid "&Ignore changes in case" -#~ msgstr "忽略大小写变化(&I)" - -#~ msgid "This corresponds to the -i diff option." -#~ msgstr "对应于 diff 的 -i 选项。" - -#~ msgid "" -#~ "With this option to ignore changes in case enabled, diff will not " -#~ "indicate a difference when something in one file is changed into " -#~ "SoMEthing in the other file." -#~ msgstr "" -#~ "启用此选项时，差异对比程序会忽略大小写的变化，比如一个文件中的 something " -#~ "单词在另一个文件中是 SoMEthing 时，程序不会将其视作不同。" - -#~ msgid "Ignore regexp:" -#~ msgstr "忽略正则表达式：" - -#~ msgid "This option corresponds to the -I diff option." -#~ msgstr "对应于 diff 的 -I 选项。" - -#~ msgid "" -#~ "When this checkbox is enabled, an option to diff is given that will make " -#~ "diff ignore lines that match the regular expression." -#~ msgstr "" -#~ "启用此选项时，将对差异对比程序给定一个正则表达式，符合此表达式的行会被差异" -#~ "对比程序忽略。" - -#~ msgid "" -#~ "Add the regular expression here that you want to use\n" -#~ "to ignore lines that match it." -#~ msgstr "在此添加正则表达式，匹配到的行将被忽略。" - -#~ msgid "&Edit..." -#~ msgstr "编辑(&E)..." - -#~ 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 "输出时将制表符扩展成空格(&X)" - -#~ msgid "This option corresponds to the -t diff option." -#~ msgstr "对应于 diff 的 -t 选项。" - -#~ msgid "" -#~ "This option does not always produce the right result. Due to this " -#~ "expansion Kompare may have problems applying the change to the " -#~ "destination file." -#~ msgstr "" -#~ "此选项有时可能产生不正确的结果，因此 Kompare 在将差异结果应用到目标文件时" -#~ "可能会有问题。" - -#~ msgid "I&gnore added or removed empty lines" -#~ msgstr "忽略增加或删除的空行(&G)" - -#~ msgid "This option corresponds to the -B diff option." -#~ msgstr "对应于 diff 的 -B 选项。" - -#~ msgid "" -#~ "This can be very useful in situations where code has been reorganized and " -#~ "empty lines have been added or removed to improve legibility." -#~ msgstr "" -#~ "当为易读性考虑，有人代码进行过格式重排，以及增减过空行的情况下，此选项十分" -#~ "有用。" - -#~ msgid "Ig&nore changes in the amount of whitespace" -#~ msgstr "忽略空白字符个数的变化(&N)" - -#~ msgid "This option corresponds to the -b diff option." -#~ msgstr "对应于 diff 的 -b 选项。" - -#~ msgid "" -#~ "If you are uninterested in differences arising due to, for example, " -#~ "changes in indentation, then use this option." -#~ msgstr "如果您对诸如缩进数量不同一类差异不感兴趣时，可使用此选项。" - -#~ msgid "Ign&ore all whitespace" -#~ msgstr "忽略所有空白字符(&O)" - -#~ msgid "This option corresponds to the -w diff option." -#~ msgstr "对应于 diff 的 -w 选项。" - -#~ msgid "" -#~ "This is useful for seeing the significant changes without being " -#~ "overwhelmed by all the white space changes." -#~ msgstr "" -#~ "如果您想忽略空白字符修改，只要查看最关键的文件改变时，此选项十分有用。" - -#~ msgid "Igno&re changes due to tab expansion" -#~ msgstr "忽略制表符扩展所带来的变化(&R)" - -#~ msgid "This option corresponds to the -E diff option." -#~ msgstr "对应于 diff 的 -E 选项。" - -#~ msgid "" -#~ "If there is a change because tabs have been expanded into spaces in the " -#~ "other file, then this option will make sure that these do not show up. " -#~ "Kompare currently has some problems applying such changes so be careful " -#~ "when you use this option." -#~ msgstr "" -#~ "如果在一个文件中发生过诸如制表符被扩展为空格等改变时，此选项会确保此类改变" -#~ "不被显现出来。Kompare 现在在应用这类差异时可能会有一些问题，如果您使用此选" -#~ "项，请务必小心。" - -#~ 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 "如果选上，可以在右边文本框输入 shell 模式或从列表中选择。" - -#~ msgid "" -#~ "Here you can enter or remove a shell pattern or select one or more " -#~ "entries from the list." -#~ msgstr "这里可以输入或删除 shell 模式或从列表中选择一个或多个模式。" - -#~ msgid "File with Filenames to Exclude" -#~ msgstr "要排除的文件名称" - -#~ 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 "" -#~ "这里可以输入在文件夹比较时要忽略的文件的 URL，该 URL 含有 shell 模式。" - -#~ 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 "本程序查看文件间的差异，并可以生成 diff 结果" - -#~ msgid "Kompare" -#~ msgstr "Kompare" - -#~ 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-2012 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 diff 查看器" - -#~ 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，并假定其为 diff 结果。URL1 亦可以是“-”，表示从标准输入读" -#~ "取，应用例子为“cvs diff | kompare -o -”。Kompare 会检查能否找到原始文件，" -#~ "然后合并原始文件并将结果显示在查看器中，“-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 应为 diff 结果而 URL1 则是要被合并的文件或文件" -#~ "夹。" - -#~ msgid "" -#~ "Disables the check for automatically finding the original file(s) when " -#~ "using '-' as URL with the -o option." -#~ msgstr "当使用“-o”选项且 URL 为“-”时，不自动检查原始文件的存在。" - -#~ 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 "找不到部件 KompareNavigationPart。"
