Hello community, here is the log from the commit of package kompare for openSUSE:Factory checked in at 2018-08-22 14:17:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kompare (Old) and /work/SRC/openSUSE:Factory/.kompare.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kompare" Wed Aug 22 14:17:09 2018 rev:66 rq:630251 version:18.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kompare/kompare.changes 2018-07-18 22:43:41.368999898 +0200 +++ /work/SRC/openSUSE:Factory/.kompare.new/kompare.changes 2018-08-22 14:17:12.301904249 +0200 @@ -1,0 +2,20 @@ +Thu Aug 16 22:05:50 UTC 2018 - [email protected] + +- Update to 18.08.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.08.0.php +- Changes since 18.07.80: + * None + +------------------------------------------------------------------- +Thu Jul 26 13:00:50 UTC 2018 - [email protected] + +- Update to 18.07.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.07.80.php +- Changes since 18.04.3: + * None + +------------------------------------------------------------------- Old: ---- kompare-18.04.3.tar.xz New: ---- kompare-18.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kompare.spec ++++++ --- /var/tmp/diff_new_pack.VuNaDV/_old 2018-08-22 14:17:12.721905244 +0200 +++ /var/tmp/diff_new_pack.VuNaDV/_new 2018-08-22 14:17:12.725905254 +0200 @@ -18,11 +18,11 @@ %bcond_without lang Name: kompare -Version: 18.04.3 +Version: 18.08.0 Release: 0 %define kf5_version 5.26.0 # 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}')} +%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: File Comparator License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/Other @@ -47,9 +47,7 @@ BuildRequires: pkgconfig(Qt5Widgets) Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} -%if %{with lang} Recommends: %{name}-lang -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -63,9 +61,7 @@ %description devel Development files for the File Comparator package -%if %{with lang} %lang_package -%endif %prep %setup -q ++++++ kompare-18.04.3.tar.xz -> kompare-18.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.04.3/org.kde.kompare.appdata.xml new/kompare-18.08.0/org.kde.kompare.appdata.xml --- old/kompare-18.04.3/org.kde.kompare.appdata.xml 2018-06-12 07:36:17.000000000 +0200 +++ new/kompare-18.08.0/org.kde.kompare.appdata.xml 2018-07-18 06:14:54.000000000 +0200 @@ -18,6 +18,7 @@ <name xml:lang="nl">Kompare</name> <name xml:lang="pl">Kompare</name> <name xml:lang="pt">Kompare</name> + <name xml:lang="pt-BR">Kompare</name> <name xml:lang="ru">Kompare</name> <name xml:lang="sk">Kompare</name> <name xml:lang="sl">Kompare</name> @@ -45,6 +46,7 @@ <summary xml:lang="nl">Diff/Patch-hulpprogramma</summary> <summary xml:lang="pl">Interfejs dla diff i patch</summary> <summary xml:lang="pt">Interface para o Diff/Patch</summary> + <summary xml:lang="pt-BR">Interface do diff/patch</summary> <summary xml:lang="ru">Утилита сравнения файлов</summary> <summary xml:lang="sk">Rozhranie Diff/Patch</summary> <summary xml:lang="sl">Začelje za diff/patch</summary> @@ -100,6 +102,7 @@ <p xml:lang="nl">Mogelijkheden:</p> <p xml:lang="pl">Możliwości:</p> <p xml:lang="pt">Funcionalidades:</p> + <p xml:lang="pt-BR">Recursos:</p> <p xml:lang="ru">Возможности:</p> <p xml:lang="sk">Funkcie:</p> <p xml:lang="sl">Zmožnosti:</p> @@ -177,6 +180,7 @@ <li xml:lang="nl">Aanmaken en gebruiken van patches.</li> <li xml:lang="pl">Tworzenie i stosowanie łat.</li> <li xml:lang="pt">Criação e aplicação de modificações ('patches').</li> + <li xml:lang="pt-BR">Criando e aplicando correções.</li> <li xml:lang="sk">Vytváranie a používanie záplat.</li> <li xml:lang="sl">Ustvarjanje in uveljavljanje popravkov.</li> <li xml:lang="sr">Стварање и примењивање закрпа.</li> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.04.3/po/da/kompare.po new/kompare-18.08.0/po/da/kompare.po --- old/kompare-18.04.3/po/da/kompare.po 2018-07-10 02:11:45.000000000 +0200 +++ new/kompare-18.08.0/po/da/kompare.po 2018-08-10 02:11:18.000000000 +0200 @@ -2,7 +2,7 @@ # Danish translation of kompare # Copyright (C). # -# Erik Kjær Pedersen <[email protected]>, 2001,2002, 2003, 2004, 2005. +# Erik Kjær Pedersen <[email protected]>, 2001, 2002, 2003, 2004, 2005. # Rune Rønde Laursen <[email protected]>, 2004. # Martin Schlander <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2018. msgid "" @@ -928,7 +928,7 @@ #: libdialogpages/diffpage.cpp:322 #, kde-format msgid "Ig&nore changes in the amount of whitespace" -msgstr "Ig&norér ændringer i mængden af blanke tegn" +msgstr "Ig&norér ændringer i mængden af blanktegn" #: libdialogpages/diffpage.cpp:323 #, kde-format @@ -947,7 +947,7 @@ #: libdialogpages/diffpage.cpp:326 #, kde-format msgid "Ign&ore all whitespace" -msgstr "Ignorér alle blanke tegn" +msgstr "Ignorér alle blanktegn" #: libdialogpages/diffpage.cpp:327 #, kde-format @@ -961,7 +961,7 @@ "by all the white space changes." msgstr "" "Dette er nyttigt til at se de væsentlige ændringer uden at blive overvældet " -"af alle ændringerne af blanke tegn." +"af alle ændringerne af blanktegn." #: libdialogpages/diffpage.cpp:330 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.04.3/po/gl/kompare.po new/kompare-18.08.0/po/gl/kompare.po --- old/kompare-18.04.3/po/gl/kompare.po 2018-07-10 02:11:45.000000000 +0200 +++ new/kompare-18.08.0/po/gl/kompare.po 2018-08-10 02:11:18.000000000 +0200 @@ -998,8 +998,8 @@ "If this is checked you can enter a shell pattern in the text box on the " "right or select entries from the list." msgstr "" -"Se marca esta opción, poderá inserir un padrón no campo de texto á dereita " -"ou escoller elementos da lista." +"Se marca esta opción, poderá inserir un padrón do intérprete de ordes no " +"campo de texto á dereita ou escoller elementos da lista." #: libdialogpages/diffpage.cpp:356 #, kde-format @@ -1007,8 +1007,8 @@ "Here you can enter or remove a shell pattern or select one or more entries " "from the list." msgstr "" -"Aquí pode inserir ou retirar un padrón ou escoller un ou máis elementos da " -"lista." +"Aquí pode inserir ou retirar un padrón do intérprete de ordes ou escoller un " +"ou máis elementos da lista." #: libdialogpages/diffpage.cpp:366 #, kde-format @@ -1028,8 +1028,8 @@ "Here you can enter the URL of a file with shell patterns to ignore during " "the comparison of the folders." msgstr "" -"Aquí pode inserir o URL dun ficheiro con padróns de nomes para ignorar " -"durante a comparación de cartafoles." +"Aquí pode inserir o URL dun ficheiro con padróns do intérprete de ordes para " +"ignorar durante a comparación de cartafoles." #: libdialogpages/diffpage.cpp:375 #, kde-format @@ -1215,10 +1215,10 @@ "show that in the viewer. -n disables the check." msgstr "" "Isto abrirá URL1 como se fose a saída de «diff». URL1 tamén pode ser un «-», " -"nese caso lerá a entrada estándar. Pode ser usado, por exemplo, para cvs " -"diff | kompare -o -. Kompare fará unha comprobación para confirmar se pode " -"atopar os ficheiros orixinais e entón fusionará os mesmos no resultado de " -"«diff» e mostrará o resultado no visor. A opción -n desactiva a comprobación." +"nese caso lerá a entrada estándar. Pode usarse, por exemplo, para cvs diff | " +"kompare -o -. Kompare fará unha comprobación para confirmar se pode atopar " +"os ficheiros orixinais e entón fusionará os mesmos no resultado de «diff» e " +"mostrará o resultado no visor. A opción -n desactiva a comprobación." #: main.cpp:74 #, kde-format @@ -1244,7 +1244,7 @@ "Use this to specify the encoding when calling it from the command line. It " "will default to the local encoding if not specified." msgstr "" -"Use isto para escoller a codificación cando o invoca desde a liña de ordes. " +"Use isto para indicar a codificación cando o invoca desde a liña de ordes. " "De maneira predeterminada, usará a codificación local." #~ msgid "Overwrite" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.04.3/po/nn/kompare.po new/kompare-18.08.0/po/nn/kompare.po --- old/kompare-18.04.3/po/nn/kompare.po 2018-07-10 02:11:45.000000000 +0200 +++ new/kompare-18.08.0/po/nn/kompare.po 2018-08-10 02:11:18.000000000 +0200 @@ -1,13 +1,13 @@ # Translation of kompare to Norwegian Nynorsk # -# Karl Ove Hufthammer <[email protected]>, 2007, 2008, 2015, 2016. +# Karl Ove Hufthammer <[email protected]>, 2007, 2008, 2015, 2016, 2018. # Eirik U. Birkeland <[email protected]>, 2008, 2009. msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-16 03:28+0100\n" -"PO-Revision-Date: 2016-12-11 14:01+0100\n" +"PO-Revision-Date: 2018-07-17 14:14+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" "Language: nn\n" @@ -93,7 +93,7 @@ #, kde-format msgid " %2 of %1 difference, %3 applied " msgid_plural " %2 of %1 differences, %3 applied " -msgstr[0] " %2 av %1 skilnad, %3 lagd over " +msgstr[0] " %2 av %1 skilnadar, %3 lagd over " msgstr[1] " %2 av %1 skilnadar, %3 lagde over " #: kompare_shell.cpp:255 @@ -561,31 +561,31 @@ #: komparepart/komparesaveoptionsbase.ui:35 #, kde-format msgid "&Context" -msgstr "" +msgstr "&Samanheng" #. i18n: ectx: property (text), widget (QRadioButton, m_NormalRB) #: komparepart/komparesaveoptionsbase.ui:49 #, kde-format msgid "&Normal" -msgstr "" +msgstr "&Vanleg" #. i18n: ectx: property (text), widget (QRadioButton, m_UnifiedRB) #: komparepart/komparesaveoptionsbase.ui:63 #, kde-format msgid "&Unified" -msgstr "" +msgstr "&Sameina" #. i18n: ectx: property (text), widget (QRadioButton, m_SideBySideRB) #: komparepart/komparesaveoptionsbase.ui:73 #, kde-format msgid "&Side-by-side" -msgstr "" +msgstr "&Side-om-side" #. i18n: ectx: property (text), widget (QLabel, m_ContextLinesLabel) #: komparepart/komparesaveoptionsbase.ui:85 libdialogpages/diffpage.cpp:248 #, kde-format msgid "Number of context lines:" -msgstr "Tal på kontekstlinjer:" +msgstr "Talet på samanhengslinjer:" #. i18n: ectx: property (title), widget (QGroupBox, m_OptionsGB) #: komparepart/komparesaveoptionsbase.ui:126 libdialogpages/diffpage.cpp:337 Binary files old/kompare-18.04.3/po/uk/docs/kompare/settings-diff1.png and new/kompare-18.08.0/po/uk/docs/kompare/settings-diff1.png differ Binary files old/kompare-18.04.3/po/uk/docs/kompare/settings-diff2.png and new/kompare-18.08.0/po/uk/docs/kompare/settings-diff2.png differ Binary files old/kompare-18.04.3/po/uk/docs/kompare/settings-diff3.png and new/kompare-18.08.0/po/uk/docs/kompare/settings-diff3.png differ Binary files old/kompare-18.04.3/po/uk/docs/kompare/settings-diff4.png and new/kompare-18.08.0/po/uk/docs/kompare/settings-diff4.png differ Binary files old/kompare-18.04.3/po/uk/docs/kompare/settings-view1.png and new/kompare-18.08.0/po/uk/docs/kompare/settings-view1.png differ Binary files old/kompare-18.04.3/po/uk/docs/kompare/settings-view2.png and new/kompare-18.08.0/po/uk/docs/kompare/settings-view2.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.04.3/po/uk/kompare.po new/kompare-18.08.0/po/uk/kompare.po --- old/kompare-18.04.3/po/uk/kompare.po 2018-07-10 02:11:45.000000000 +0200 +++ new/kompare-18.08.0/po/uk/kompare.po 2018-08-10 02:11:18.000000000 +0200 @@ -1255,7 +1255,7 @@ "'-' as URL with the -o option." msgstr "" "Вимикає перевірку автоматичного пошуку оригінальних файлів при використанні " -"«-» як адресу URL з параметром -o." +"«-» як адреси URL з параметром -o." #: main.cpp:76 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.04.3/po/zh_CN/kompare.po new/kompare-18.08.0/po/zh_CN/kompare.po --- old/kompare-18.04.3/po/zh_CN/kompare.po 2018-07-10 02:11:45.000000000 +0200 +++ new/kompare-18.08.0/po/zh_CN/kompare.po 2018-08-10 02:11:19.000000000 +0200 @@ -13,7 +13,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-16 03:28+0100\n" -"PO-Revision-Date: 2018-07-03 17:42\n" +"PO-Revision-Date: 2018-07-24 08:49\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.04.3/po/zh_TW/kompare.po new/kompare-18.08.0/po/zh_TW/kompare.po --- old/kompare-18.04.3/po/zh_TW/kompare.po 2018-07-10 02:11:45.000000000 +0200 +++ new/kompare-18.08.0/po/zh_TW/kompare.po 2018-08-10 02:11:19.000000000 +0200 @@ -11,7 +11,7 @@ "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-16 03:28+0100\n" -"PO-Revision-Date: 2018-04-29 23:43+0800\n" +"PO-Revision-Date: 2018-03-24 22:13+0800\n" "Last-Translator: pan93412 <[email protected]>\n" "Language-Team: Chinese <[email protected]>\n" "Language: zh_TW\n" @@ -1191,97 +1191,3 @@ "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 "Overwrite" -#~ msgstr "覆寫" - -#~ msgid "Compare these files or folder" -#~ msgstr "比較這些檔案或資料夾" - -#~ msgid "&Apply Difference" -#~ msgstr "套用差異處(&A)" - -#~ msgid "Un&apply Difference" -#~ msgstr "取消套用差異處(&A)" - -#~ msgid "App&ly All" -#~ msgstr "全部套用(&L)" - -#~ msgid "&Unapply All" -#~ msgstr "全部取消套用(&U)" - -#~ msgid "P&revious File" -#~ msgstr "上一個檔案(&R)" - -#~ msgid "&Previous Difference" -#~ msgstr "上一個差異(&P)" - -#~ msgid "&Next Difference" -#~ msgstr "下一個差異(&N)" - -#~ msgid "" -#~ "<qt>No models or no differences, this file: <b>%1</b>, is not a valid " -#~ "diff file.</qt>" -#~ msgstr "<qt>檔案 <b>%1</b> 不是合法的 diff 檔，沒有任何模式或差異處。</qt>" - -#~ msgid "" -#~ "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>." -#~ "</qt>" -#~ msgstr "<qt>套用 <b>%1</b>到檔案 <b>%2</b> 時發生問題。</qt>" - -#~ msgid "" -#~ "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</" -#~ "b>.</qt>" -#~ msgstr "<qt>套用 <b>%1</b>到資料夾 <b>%2</b> 時發生問題。</qt>" - -#~ msgid "Could not open a temporary file." -#~ msgstr "無法開啟暫存檔。" - -#~ msgid "" -#~ "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" -#~ msgstr "<qt>無法寫入暫存檔 <b>%1</b>，暫存檔將被刪除。</qt>" - -#~ msgid "" -#~ "<qt>Could not create destination directory <b>%1</b>.\n" -#~ "The file has not been saved.</qt>" -#~ msgstr "<qt>無法建立目標資料夾 <b>%1</b>。檔案尚未儲存。</qt>" - -#~ msgid "" -#~ "<qt>Could not upload the temporary file to the destination location <b>" -#~ "%1</b>. The temporary file is still available under: <b>%2</b>. You can " -#~ "manually copy it to the right place.</qt>" -#~ msgstr "" -#~ "<qt>無法將暫存檔上傳到目標位置 <b>%1</b>。暫存檔仍然在 <b>%2</b>。您可以手" -#~ "動複製到正確的地方。</qt>" - -#~ msgid "Could not parse diff output." -#~ msgstr "無法分析 diff 輸出。" - -#~ msgid "The files are identical." -#~ msgstr "檔案完全相同。" - -#~ msgid "Could not write to the temporary file." -#~ msgstr "無法寫入暫存檔。" - -#~ msgid "" -#~ "The diff is malformed. Some lines could not be parsed and will not be " -#~ "displayed in the diff view." -#~ msgstr "此 diff 不正確。有些內容無法被解析，因此不會被顯示在檢視中。" - -#~ msgid "Could not find our KompareViewPart." -#~ msgstr "找不到 KompareViewPart。" - -#~ msgid "Could not find our KompareNavigationPart." -#~ msgstr "找不到 KompareNavigationPart。" - -#~ msgid "A&ppearance" -#~ msgstr "外觀(&P)" - -#~ msgid "&Diff" -#~ msgstr "Diff(&D)" - -#~ msgid "&Format" -#~ msgstr "格式(&F)" - -#~ msgid "O&ptions" -#~ msgstr "選項(&P)"
