commit kompare for openSUSE:Leap:15.2
Hello community, here is the log from the commit of package kompare for openSUSE:Leap:15.2 checked in at 2020-06-15 05:28:39 Comparing /work/SRC/openSUSE:Leap:15.2/kompare (Old) and /work/SRC/openSUSE:Leap:15.2/.kompare.new.3606 (New) Package is "kompare" Mon Jun 15 05:28:39 2020 rev:61 rq:813939 version:20.04.2 Changes: --- /work/SRC/openSUSE:Leap:15.2/kompare/kompare.changes2020-05-24 18:07:44.145985364 +0200 +++ /work/SRC/openSUSE:Leap:15.2/.kompare.new.3606/kompare.changes 2020-06-15 05:28:40.333831867 +0200 @@ -1,0 +2,9 @@ +Tue Jun 9 12:15:28 UTC 2020 - Christophe Giboudeaux + +- Update to 20.04.2 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/releases/2020-06-apps-update +- No code change since 20.04.1 + +--- Old: kompare-20.04.1.tar.xz kompare-20.04.1.tar.xz.sig New: kompare-20.04.2.tar.xz kompare-20.04.2.tar.xz.sig Other differences: -- ++ kompare.spec ++ --- /var/tmp/diff_new_pack.hNQRC5/_old 2020-06-15 05:28:40.653832897 +0200 +++ /var/tmp/diff_new_pack.hNQRC5/_new 2020-06-15 05:28:40.657832910 +0200 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kompare -Version:20.04.1 +Version:20.04.2 Release:0 Summary:File Comparator License:GPL-2.0-only AND GFDL-1.2-only ++ kompare-20.04.1.tar.xz -> kompare-20.04.2.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-20.04.1/org.kde.kompare.appdata.xml new/kompare-20.04.2/org.kde.kompare.appdata.xml --- old/kompare-20.04.1/org.kde.kompare.appdata.xml 2020-04-06 10:22:10.0 +0200 +++ new/kompare-20.04.2/org.kde.kompare.appdata.xml 2020-06-02 07:57:23.0 +0200 @@ -83,6 +83,7 @@ Kompare è un programma a interfaccia grafica che permette di visualizzare e fondere le differenze tra file sorgente. Può essere usato per confrontare le differenze di file o dei contenuti di cartelle, e supporta vari formati di differenze; fornisce anche molte opzioni per personalizzare il livello di informazioni visualizzato. Kompare는 원본 파일간 차이점을 시각화하고 합칠 수 있는 GUI 프론트엔드 프로그램입니다. 파일 및 내용, 폴더의 차이점을 비교할 수 있으며 여러 Diff 형식을 지원하고 표시하는 정보를 사용자 정의할 수 있습니다. Kompare; is een GUI front-end-programma dat het mogelijk maakt om de verschillen tussen bronbestanden te bekijken en samen te voegen. Het kan gebruikt worden om bestanden of de inhoud van mappen te vergelijken op verschillen en het ondersteunt een aantal verschillende diff formaten en heeft veel verschillende mogelijkheden voor het aanpassen van de hoeveelheid getoonde informatie. +Kompare er eit program for vising og fletting av forskjeller mellom tekstfiler. Det kan brukast til å samanlikna både einskildfiler og mapper, og det støttar mange ulike diff-format og måtar å tilpassa detaljnivået på informasjonen som vert vist. Kompare jest graficznym interfejsem, który umożliwia oglądanie i scalanie różnic pomiędzy plikami kodu źródłowego. Można go używać do porównywania różnic w plikach lub zawartościach katalogów, obsługuje wiele formatów różnic, a także dostarcza wielu opcji do ustawienia poziomu wyświetlanych informacji. O Kompare é um programa gráfico que permite a visualização e reunião de diferenças entre ficheiros de código. Poderá ser usado para comparar as diferenças nos ficheiros ou no conteúdo das pastas, suportando uma grande variedade de formatos de diferença e oferecendo muitas opções para personalizar o nível de informação apresentado. O Kompare é um programa de interface gráfica que permite que as diferenças entre os arquivos fontes sejam vistas e mescladas. Ele pode ser usado para comparar diferenças em arquivos ou o conteúdo de pastas, e suporta uma variedade de formatos diff e fornece muitas opções de personalização do nível de informação exibido. @@ -174,6 +175,7 @@ Supporta vari formati di differenze, e fornisce anche molte opzioni per personalizzare il livello di informazioni visualizzato. 여러 Diff 형식을 지원하고 표시하는 정보를 사용자 정의할 수 있습니다. Ondersteunt een variëteit van diff-formaten en beidt verschillende mogelijkheden voor het aanpassen van de hoeveelheid getoonde informatie. + Støttar mange ulike diff-format og måtar å tilpassa detaljnivået på informasjonen som vert vist. Obsługuje wiele formatów różnic i dostarcza wielu opcji do ustawienia poziomu wyświetlanych informacji. Suporta uma variedade de formatos de ajuda e oferece muitas opções para personalizar o nível de informação aprese
commit kompare for openSUSE:Leap:15.2
Hello community, here is the log from the commit of package kompare for openSUSE:Leap:15.2 checked in at 2020-05-24 18:07:41 Comparing /work/SRC/openSUSE:Leap:15.2/kompare (Old) and /work/SRC/openSUSE:Leap:15.2/.kompare.new.2738 (New) Package is "kompare" Sun May 24 18:07:41 2020 rev:60 rq:806554 version:20.04.1 Changes: --- /work/SRC/openSUSE:Leap:15.2/kompare/kompare.changes2020-05-12 11:35:02.820077943 +0200 +++ /work/SRC/openSUSE:Leap:15.2/.kompare.new.2738/kompare.changes 2020-05-24 18:07:44.145985364 +0200 @@ -1,0 +2,9 @@ +Fri May 15 15:41:47 UTC 2020 - Luca Beltrame + +- Update to 20.04.1 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/releases/2020-05-apps-update +- No code change since 20.04.0 + +--- @@ -15,2 +23,0 @@ - * For more details please see: - * https://kde.org/announcements/releases/20.04-rc @@ -25,2 +31,0 @@ - * For more details please see: - * https://kde.org/announcements/releases/20.04-beta @@ -41 +46 @@ - * https://www.kde.org/announcements/releases/19.12.3 + * https://kde.org/announcements/releases/2020-03-apps-update @@ -56 +61 @@ - * https://www.kde.org/announcements/releases/19.12.2 + * https://kde.org/announcements/releases/2020-02-apps-update Old: kompare-20.04.0.tar.xz kompare-20.04.0.tar.xz.sig New: kompare-20.04.1.tar.xz kompare-20.04.1.tar.xz.sig Other differences: -- ++ kompare.spec ++ --- /var/tmp/diff_new_pack.21qwDG/_old 2020-05-24 18:07:44.553986247 +0200 +++ /var/tmp/diff_new_pack.21qwDG/_new 2020-05-24 18:07:44.557986256 +0200 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kompare -Version:20.04.0 +Version:20.04.1 Release:0 Summary:File Comparator License:GPL-2.0-only AND GFDL-1.2-only ++ kompare-20.04.0.tar.xz -> kompare-20.04.1.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-20.04.0/po/es/kompare.po new/kompare-20.04.1/po/es/kompare.po --- old/kompare-20.04.0/po/es/kompare.po2020-04-17 02:35:02.0 +0200 +++ new/kompare-20.04.1/po/es/kompare.po2020-05-12 03:21:25.0 +0200 @@ -3,21 +3,21 @@ # # Miguel Revilla Rodríguez , 2002,2003. # Pablo de Vicente , 2005. -# Eloy Cuadra , 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017. +# Eloy Cuadra , 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017, 2020, %Y. # Javier Viñal , 2013. msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-09-07 03:09+0200\n" -"PO-Revision-Date: 2017-10-12 11:28+0100\n" +"PO-Revision-Date: 2020-05-04 12:18+0200\n" "Last-Translator: Eloy Cuadra \n" "Language-Team: Spanish \n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 20.04.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #, kde-format @@ -106,17 +106,17 @@ #: kompare_shell.cpp:336 #, kde-format msgid "Blend File/Folder with diff Output" -msgstr "Fusionar archivo/directorio con salida diff" +msgstr "Fusionar archivo o carpeta con la salida de diff" #: kompare_shell.cpp:337 #, kde-format msgid "File/Folder" -msgstr "Archivo/directorio" +msgstr "Archivo/carpeta" #: kompare_shell.cpp:338 #, kde-format msgid "Diff Output" -msgstr "Salida diff" +msgstr "Salida de diff" #: kompare_shell.cpp:341 #, kde-format @@ -126,7 +126,7 @@ #: kompare_shell.cpp:342 #, kde-format msgid "Blend this file or folder with the diff output" -msgstr "Fusionar este archivo o carpeta con la salida diff" +msgstr "Fusionar este archivo o carpeta con la salida de diff" #: kompare_shell.cpp:343 #, kde-format @@ -147,7 +147,7 @@ #: kompare_shell.cpp:366 main.cpp:203 #, kde-format msgid "Compare Files or Folders" -msgstr "Comparar archivos o directorios" +msgstr "Comparar archivos o carpetas" #: kompare_shell.cpp:367 main.cpp:204 #, kde-format @@ -167,7 +167,7 @@ #: kompare_shell.cpp:372 main.cpp:209 #, kde-format msgid "Compare these files or folders" -msgstr "Comparar estos archivos o directorios" +msgstr "Comparar estos archivos o carpetas" #: kompare_shell.cpp:373 main.cpp:210 #, kde-format @@ -176,9 +176,9 @@ "then this button will be enabled and pressing it will start a comparison of " "the entered files or folders. " msgstr "" -"Si ha introducido 2 nombres de archivos o 2 directorios en los campos de " -"este diálogo, entonces se
commit kompare for openSUSE:Leap:15.2
Hello community, here is the log from the commit of package kompare for openSUSE:Leap:15.2 checked in at 2020-05-12 11:35:01 Comparing /work/SRC/openSUSE:Leap:15.2/kompare (Old) and /work/SRC/openSUSE:Leap:15.2/.kompare.new.2738 (New) Package is "kompare" Tue May 12 11:35:01 2020 rev:59 rq:797430 version:20.04.0 Changes: --- /work/SRC/openSUSE:Leap:15.2/kompare/kompare.changes2020-03-15 07:10:38.664937615 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.kompare.new.2738/kompare.changes 2020-05-12 11:35:02.820077943 +0200 @@ -1,0 +2,34 @@ +Thu Apr 23 12:22:42 UTC 2020 - Luca Beltrame + +- Update to 20.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/2020-04-apps-update +- No code change since 20.03.90 + +--- +Sun Apr 5 20:30:18 UTC 2020 - Luca Beltrame + +- Update to 20.03.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-rc +- Changes since 20.03.80: + * Fix build with Qt 5.15 + +--- +Sun Mar 22 09:17:15 UTC 2020 - Luca Beltrame + +- Update to 20.03.80 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-beta +- Changes since 19.12.3: + * Comment for the moment kregexeditor interface is deprecated + * Fix link: ui.html -> menus.html + * Make it compiles + * Ignore files + * Make it compile without deprecated methods + * Port deprecated methods + +--- Old: kompare-19.12.3.tar.xz kompare-19.12.3.tar.xz.sig New: kompare-20.04.0.tar.xz kompare-20.04.0.tar.xz.sig Other differences: -- ++ kompare.spec ++ --- /var/tmp/diff_new_pack.XLvuRZ/_old 2020-05-12 11:35:03.212078767 +0200 +++ /var/tmp/diff_new_pack.XLvuRZ/_new 2020-05-12 11:35:03.212078767 +0200 @@ -1,7 +1,7 @@ # # spec file for package kompare # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,36 +21,36 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kompare -Version:19.12.3 +Version:20.04.0 Release:0 Summary:File Comparator License:GPL-2.0-only AND GFDL-1.2-only Group: Development/Tools/Other URL:https://www.kde.org/ Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz -%if %{with lang} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig -Source2:applications.keyring -%endif BuildRequires: extra-cmake-modules +BuildRequires: kf5-filesystem +BuildRequires: update-desktop-files BuildRequires: cmake(KF5Codecs) BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5DocTools) -BuildRequires: kf5-filesystem BuildRequires: cmake(KF5IconThemes) BuildRequires: cmake(KF5JobWidgets) BuildRequires: cmake(KF5Parts) BuildRequires: cmake(KF5TextEditor) BuildRequires: cmake(KF5WidgetsAddons) BuildRequires: cmake(LibKompareDiff2) -BuildRequires: update-desktop-files BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5PrintSupport) BuildRequires: cmake(Qt5Widgets) +Recommends: %{name}-lang Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} -Recommends: %{name}-lang +%if %{with lang} +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source2:applications.keyring +%endif %description Tool to visualize changes between two versions of a file. ++ kompare-19.12.3.tar.xz -> kompare-20.04.0.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/.gitignore new/kompare-20.04.0/.gitignore --- old/kompare-19.12.3/.gitignore 1970-01-01 01:00:00.0 +0100 +++ new/kompare-20.04.0/.gitignore 2020-04-06 10:22:10.0 +0200 @@ -0,0 +1,21 @@ +# Ignore the following files +*~ +*.[oa] +*.diff +*.kate-swp +*.kdev4 +.kdev_include_paths +*.kdevelop.pcs +*.moc +*.moc.cpp +*.orig +*.user +.*.swp +.swp.* +Doxyfile +Makefile +avail +random_seed +/build*/ +CMakeLists.txt.user* +*.unc-backup* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/CMake
commit kompare for openSUSE:Leap:15.2
Hello community, here is the log from the commit of package kompare for openSUSE:Leap:15.2 checked in at 2020-03-15 07:10:11 Comparing /work/SRC/openSUSE:Leap:15.2/kompare (Old) and /work/SRC/openSUSE:Leap:15.2/.kompare.new.3160 (New) Package is "kompare" Sun Mar 15 07:10:11 2020 rev:58 rq:784956 version:19.12.3 Changes: --- /work/SRC/openSUSE:Leap:15.2/kompare/kompare.changes2020-02-13 14:39:45.177620995 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.kompare.new.3160/kompare.changes 2020-03-15 07:10:38.664937615 +0100 @@ -1,0 +2,10 @@ +Thu Mar 5 20:36:21 UTC 2020 - Luca Beltrame + +- Update to 19.12.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/releases/19.12.3 +- Changes since 19.12.2: + * appdata: use canonical cdn screenshot location + +--- Old: kompare-19.12.2.tar.xz kompare-19.12.2.tar.xz.sig New: kompare-19.12.3.tar.xz kompare-19.12.3.tar.xz.sig Other differences: -- ++ kompare.spec ++ --- /var/tmp/diff_new_pack.Pgu7Cm/_old 2020-03-15 07:10:39.096937873 +0100 +++ /var/tmp/diff_new_pack.Pgu7Cm/_new 2020-03-15 07:10:39.096937873 +0100 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kompare -Version:19.12.2 +Version:19.12.3 Release:0 Summary:File Comparator License:GPL-2.0-only AND GFDL-1.2-only ++ kompare-19.12.2.tar.xz -> kompare-19.12.3.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.2/org.kde.kompare.appdata.xml new/kompare-19.12.3/org.kde.kompare.appdata.xml --- old/kompare-19.12.2/org.kde.kompare.appdata.xml 2019-09-06 10:51:19.0 +0200 +++ new/kompare-19.12.3/org.kde.kompare.appdata.xml 2020-03-01 08:14:19.0 +0100 @@ -215,7 +215,7 @@ - https://kde.org/images/screenshots/kompare.png + https://cdn.kde.org/screenshots/kompare/kompare.png https://kde.org/applications/development/kompare/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.2/po/ca@valencia/kompare.po new/kompare-19.12.3/po/ca@valencia/kompare.po --- old/kompare-19.12.2/po/ca@valencia/kompare.po 2020-02-04 01:36:08.0 +0100 +++ new/kompare-19.12.3/po/ca@valencia/kompare.po 2020-03-03 01:25:58.0 +0100 @@ -140,11 +140,11 @@ "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 "" -"Si heu entrat en els camps d'aquest diàleg un nom de fitxer o de carpeta i un " -"de fitxer que contindrà l'eixida del diff, aleshores aquest botó serà activat " -"i prement-lo s'obrirà la finestra de vista principal del Kompare, a on el " -"fitxer o fitxers de la carpeta seran mesclats amb l'eixida del diff, de " -"manera que pugueu aplicar la/es diferència/s'a un fitxer o als fitxers. " +"Si heu entrat en els camps d'aquest diàleg un nom de fitxer o de carpeta i " +"un de fitxer que contindrà l'eixida del diff, aleshores aquest botó serà " +"activat i prement-lo s'obrirà la finestra de vista principal del Kompare, a " +"on el fitxer o fitxers de la carpeta seran mesclats amb l'eixida del diff, " +"de manera que pugueu aplicar la/es diferència/s'a un fitxer o als fitxers. " #: kompare_shell.cpp:366 main.cpp:203 #, kde-format @@ -283,7 +283,8 @@ #: komparenavtreepart/komparenavtreepart.cpp:770 #: komparenavtreepart/komparenavtreepart.cpp:771 -#: komparepart/kompare_partfactory.cpp:32 komparepart/kompare_partfactory.cpp:33 +#: komparepart/kompare_partfactory.cpp:32 +#: komparepart/kompare_partfactory.cpp:33 #: komparepart/kompare_partfactory.cpp:34 main.cpp:59 main.cpp:60 #, kde-format msgid "Author" @@ -445,8 +446,8 @@ "No diff file, or no 2 files have been diffed. Therefore no stats are " "available." msgstr "" -"No hi ha el fitxer diff o no s'han comparat 2 fitxers. Per tant, no hi ha cap " -"estadística disponible." +"No hi ha el fitxer diff o no s'han comparat 2 fitxers. Per tant, no hi ha " +"cap estadística disponible." #: komparepart/kompare_part.cpp:895 komparepart/kompare_part.cpp:909 #: komparepart/kompare_part.cpp:925 @@ -726,8 +727,8 @@ #: libdialogpages/diffpage.cpp:226 #, kde-format 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 " +"Select the format of the output generated by diff. Unified is the one that " +"is used most frequently because it
commit kompare for openSUSE:Leap:15.2
Hello community, here is the log from the commit of package kompare for openSUSE:Leap:15.2 checked in at 2020-02-13 14:39:43 Comparing /work/SRC/openSUSE:Leap:15.2/kompare (Old) and /work/SRC/openSUSE:Leap:15.2/.kompare.new.26092 (New) Package is "kompare" Thu Feb 13 14:39:43 2020 rev:57 rq:772005 version:19.12.2 Changes: --- /work/SRC/openSUSE:Leap:15.2/kompare/kompare.changes2020-01-15 15:16:29.518277792 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.kompare.new.26092/kompare.changes 2020-02-13 14:39:45.177620995 +0100 @@ -1,0 +2,14 @@ +Fri Feb 7 08:37:50 UTC 2020 - Christophe Giboudeaux + +- Replace %make_jobs with %cmake_build. + +--- +Wed Feb 5 06:29:24 UTC 2020 - Luca Beltrame + +- Update to 19.12.2 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/releases/19.12.2 +- No code change since 19.12.1 + +--- Old: kompare-19.12.1.tar.xz kompare-19.12.1.tar.xz.sig New: kompare-19.12.2.tar.xz kompare-19.12.2.tar.xz.sig Other differences: -- ++ kompare.spec ++ --- /var/tmp/diff_new_pack.xRAw81/_old 2020-02-13 14:39:45.557621204 +0100 +++ /var/tmp/diff_new_pack.xRAw81/_new 2020-02-13 14:39:45.557621204 +0100 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kompare -Version:19.12.1 +Version:19.12.2 Release:0 Summary:File Comparator License:GPL-2.0-only AND GFDL-1.2-only @@ -75,7 +75,7 @@ export CXXFLAGS="%{optflags} -fPIC" export CFLAGS="%{optflags} -fPIC" %cmake_kf5 -d build -- -DCMAKE_CXXFLAGS="%{optflags}" -DCMAKE_CFLAGS="%{optflags}" -%make_jobs +%cmake_build %install %kf5_makeinstall -C build ++ kompare-19.12.1.tar.xz -> kompare-19.12.2.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.1/po/ca@valencia/kompare.po new/kompare-19.12.2/po/ca@valencia/kompare.po --- old/kompare-19.12.1/po/ca@valencia/kompare.po 2020-01-07 03:19:08.0 +0100 +++ new/kompare-19.12.2/po/ca@valencia/kompare.po 2020-02-04 01:36:08.0 +0100 @@ -1,10 +1,10 @@ # Translation of kompare.po to Catalan (Valencian) -# Copyright (C) 2002-2017 This_file_is_part_of_KDE +# Copyright (C) 2002-2020 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # # Albert Astals Cid , 2002, 2003, 2004, 2005. -# Antoni Bella Pérez , 2003, 2006, 2012, 2014, 2015. +# Antoni Bella Pérez , 2003, 2006, 2012, 2014, 2015, 2020. # Josep Ma. Ferrer , 2007, 2008, 2009, 2010, 2012, 2013, 2014, 2015, 2016, 2017. # Manuel Tortosa , 2009, 2010, 2011, 2012. msgid "" @@ -12,14 +12,14 @@ "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-09-07 03:09+0200\n" -"PO-Revision-Date: 2017-10-11 17:54+0100\n" -"Last-Translator: Josep Ma. Ferrer \n" +"PO-Revision-Date: 2020-01-06 16:58+0100\n" +"Last-Translator: Antoni Bella Pérez \n" "Language-Team: Catalan \n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 20.03.70\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" @@ -140,11 +140,11 @@ "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 "" -"Si heu entrat en els camps d'aquest diàleg un nom de fitxer o de carpeta i " -"un de fitxer que contindrà l'eixida del diff, aleshores aquest botó serà " -"activat i prement-lo s'obrirà la finestra de vista principal del Kompare, a " -"on el fitxer o fitxers de la carpeta seran mesclats amb l'eixida del diff, " -"de manera que pugueu aplicar la/es diferència/s'a un fitxer o als fitxers. " +"Si heu entrat en els camps d'aquest diàleg un nom de fitxer o de carpeta i un " +"de fitxer que contindrà l'eixida del diff, aleshores aquest botó serà activat " +"i prement-lo s'obrirà la finestra de vista principal del Kompare, a on el " +"fitxer o fitxers de la carpeta seran mesclats amb l'eixida del diff, de " +"manera que pugueu aplicar la/es diferència/s'a un fitxer o als fitxers. " #: kompare_shell.cpp:366 main.cpp:203 #, kde-format @@ -283,8 +283,7 @@ #: komparenavtreepart/komparenavtreepart.cpp:770 #: komparenavtreepart/komparenavtreepart.cpp:771 -#: komparepart/kompare_partfactory.cpp:32 -#: kom