diff -pruN 4:22.12.1-1/CMakeLists.txt 4:22.12.3-0ubuntu1/CMakeLists.txt --- 4:22.12.1-1/CMakeLists.txt 2023-01-02 23:52:17.000000000 +0000 +++ 4:22.12.3-0ubuntu1/CMakeLists.txt 2023-02-25 05:10:26.000000000 +0000 @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16) # Release Service version, managed by release script set (RELEASE_SERVICE_VERSION_MAJOR "22") set (RELEASE_SERVICE_VERSION_MINOR "12") -set (RELEASE_SERVICE_VERSION_MICRO "1") +set (RELEASE_SERVICE_VERSION_MICRO "3") set (RELEASE_SERVICE_COMPACT_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}${RELEASE_SERVICE_VERSION_MINOR}${RELEASE_SERVICE_VERSION_MICRO}") # Bump KOMPARE_BASE_VERSION once new features are added diff -pruN 4:22.12.1-1/debian/changelog 4:22.12.3-0ubuntu1/debian/changelog --- 4:22.12.1-1/debian/changelog 2023-01-06 23:05:39.000000000 +0000 +++ 4:22.12.3-0ubuntu1/debian/changelog 2023-03-02 00:41:04.000000000 +0000 @@ -1,11 +1,29 @@ -kompare (4:22.12.1-1) unstable; urgency=medium +kompare (4:22.12.3-0ubuntu1) lunar; urgency=medium - [ Aurélien COUDERC ] - * New upstream release (22.12.1). - * Bump Standards-Version to 4.6.2, no change required. - * Add/update Albert Astals Cid’s master key in upstream signing keys. + * New upstream release (22.12.3) + + -- Rik Mills Thu, 02 Mar 2023 00:41:04 +0000 + +kompare (4:22.12.2-0ubuntu1) lunar; urgency=medium + + * New upstream release (22.12.2) + + -- Simon Quigley Sat, 11 Feb 2023 14:21:30 -0600 + +kompare (4:22.12.1-0ubuntu1) lunar; urgency=medium + + * New upstream release (22.12.1) - -- Aurélien COUDERC Sat, 07 Jan 2023 00:05:39 +0100 + -- Rik Mills Thu, 05 Jan 2023 11:17:11 +0000 + +kompare (4:22.12.0-1ubuntu1) lunar; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Kubuntu Vcs and maintainer fields. + - Update upstream signing key. + - Build dep on libkomparediff2-dev (>= 4:22.12.0~)) + + -- Rik Mills Sun, 01 Jan 2023 17:00:28 +0000 kompare (4:22.12.0-1) unstable; urgency=medium @@ -21,6 +39,81 @@ kompare (4:22.12.0-1) unstable; urgency= -- Aurélien COUDERC Sun, 11 Dec 2022 23:06:39 +0100 +kompare (4:22.12.0-0ubuntu1) lunar; urgency=medium + + * New upstream release (22.12.0) + + -- Rik Mills Fri, 09 Dec 2022 19:12:29 +0000 + +kompare (4:22.11.90-0ubuntu1) lunar; urgency=medium + + * New upstream (RC) release (22.11.90) + + -- Rik Mills Fri, 25 Nov 2022 16:08:46 +0000 + +kompare (4:22.11.80-0ubuntu2) lunar; urgency=medium + + * Fix install files. + + -- Rik Mills Fri, 18 Nov 2022 07:47:20 +0000 + +kompare (4:22.11.80-0ubuntu1) lunar; urgency=medium + + * New upstream (beta) release (22.11.80) + + -- Rik Mills Fri, 18 Nov 2022 07:32:11 +0000 + +kompare (4:22.08.3-0ubuntu1) lunar; urgency=medium + + * New upstream release (22.08.2) + * New upstream release (22.08.3) + + -- Rik Mills Mon, 07 Nov 2022 11:11:57 +0000 + +kompare (4:22.08.1-0ubuntu1) kinetic; urgency=medium + + * New upstream release (22.08.1) + + -- Rik Mills Thu, 08 Sep 2022 07:43:12 +0100 + +kompare (4:22.08.0-0ubuntu1) kinetic; urgency=medium + + * New upstream release (22.08.0) + + -- Rik Mills Wed, 24 Aug 2022 09:52:45 +0100 + +kompare (4:22.04.3-0ubuntu2) kinetic; urgency=medium + + * Update lintian overrides + + -- José Manuel Santamaría Lema Tue, 02 Aug 2022 12:34:38 +0100 + +kompare (4:22.04.3-0ubuntu1) kinetic; urgency=medium + + * New upstream release (22.04.3) + + -- Rik Mills Thu, 07 Jul 2022 09:30:28 +0100 + +kompare (4:22.04.2-0ubuntu1) kinetic; urgency=medium + + * New upstream release (22.04.2) + + -- Rik Mills Thu, 09 Jun 2022 08:04:49 +0100 + +kompare (4:22.04.1-0ubuntu1) kinetic; urgency=medium + + * New upstream release (22.04.1) + + -- Rik Mills Wed, 11 May 2022 21:03:43 +0100 + +kompare (4:22.04.0-0ubuntu1) kinetic; urgency=medium + + * New upstream release (22.04.0) + * Update install files. + * Update lintian overrides. + + -- Rik Mills Mon, 02 May 2022 06:51:12 +0100 + kompare (4:21.12.3-1) unstable; urgency=medium [ Aurélien COUDERC ] @@ -33,6 +126,73 @@ kompare (4:21.12.3-1) unstable; urgency= -- Aurélien COUDERC Mon, 07 Mar 2022 00:03:30 +0100 +kompare (4:21.12.3-0ubuntu1) jammy; urgency=medium + + * New upstream release (21.12.3) + + -- Rik Mills Thu, 03 Mar 2022 10:13:50 +0000 + +kompare (4:21.12.2-0ubuntu1) jammy; urgency=medium + + [ José Manuel Santamaría Lema ] + * Update upstream signing key + + [ Rik Mills ] + * New upstream release (21.12.2) + + -- Rik Mills Thu, 03 Feb 2022 07:20:24 +0000 + +kompare (4:21.12.1-0ubuntu1) jammy; urgency=medium + + * New upstream release (21.12.1) + + -- Rik Mills Thu, 06 Jan 2022 10:28:15 +0000 + +kompare (4:21.12.0-0ubuntu1) jammy; urgency=medium + + [ Rik Mills ] + * New upstream release (21.12.0) + * Set maintainer to Kubuntu Developers. + + [ José Manuel Santamaría Lema ] + * Update upstream signing key + + -- Rik Mills Thu, 09 Dec 2021 11:25:26 +0000 + +kompare (4:21.11.90-0ubuntu2) jammy; urgency=medium + + * Add Kubuntu Vcs fields. + + -- Rik Mills Sun, 28 Nov 2021 19:10:02 +0000 + +kompare (4:21.11.90-0ubuntu1) jammy; urgency=medium + + * New upstream (RC) release (21.11.90) + + -- Rik Mills Fri, 26 Nov 2021 13:20:37 +0000 + +kompare (4:21.11.80-0ubuntu1) jammy; urgency=medium + + * New upstream (beta) release (21.11.80) + + -- Rik Mills Sun, 21 Nov 2021 18:28:22 +0000 + +kompare (4:21.08.3-0ubuntu1) jammy; urgency=medium + + [ José Manuel Santamaría Lema ] + * New upstream release (21.08.2) + + [ Rik Mills ] + * New upstream release (21.08.3) + + -- Rik Mills Mon, 15 Nov 2021 09:43:04 +0000 + +kompare (4:21.08.1-0ubuntu1) impish; urgency=medium + + * New upstream release (21.08.1) + + -- José Manuel Santamaría Lema Thu, 09 Sep 2021 22:36:25 +0100 + kompare (4:21.08.0-1) unstable; urgency=medium [ Norbert Preining ] @@ -41,6 +201,42 @@ kompare (4:21.08.0-1) unstable; urgency= -- Norbert Preining Tue, 17 Aug 2021 12:40:02 +0900 +kompare (4:21.08.0-0ubuntu1) impish; urgency=medium + + * New upstream release (21.08.0) + + -- Rik Mills Thu, 12 Aug 2021 09:05:27 +0100 + +kompare (4:21.07.90-0ubuntu1) impish; urgency=medium + + * New upstream (RC) release (21.07.90) + + -- Rik Mills Mon, 02 Aug 2021 12:59:12 +0100 + +kompare (4:21.07.80-0ubuntu1) impish; urgency=medium + + * New upstream (beta) release (21.07.80) + + -- Rik Mills Sun, 18 Jul 2021 20:36:04 +0100 + +kompare (4:21.04.3-0ubuntu1) impish; urgency=medium + + * New upstream release (21.04.3) + + -- Rik Mills Thu, 08 Jul 2021 11:46:35 +0100 + +kompare (4:21.04.2-0ubuntu1) impish; urgency=medium + + * New upstream release (21.04.2) + + -- Rik Mills Thu, 10 Jun 2021 10:43:27 +0100 + +kompare (4:21.04.1-0ubuntu1) impish; urgency=medium + + * New upstream release (21.04.1) + + -- Rik Mills Thu, 13 May 2021 09:10:05 +0100 + kompare (4:21.04.0-1) experimental; urgency=medium [ Norbert Preining ] @@ -51,6 +247,30 @@ kompare (4:21.04.0-1) experimental; urge -- Norbert Preining Wed, 28 Apr 2021 14:04:40 +0900 +kompare (4:21.04.0-0ubuntu1) impish; urgency=medium + + * New upstream release (21.04.0) + + -- Rik Mills Thu, 29 Apr 2021 01:40:07 +0100 + +kompare (4:20.12.3-0ubuntu1) hirsute; urgency=medium + + * New upstream release (20.12.3) + + -- Rik Mills Thu, 04 Mar 2021 15:23:37 +0000 + +kompare (4:20.12.2-0ubuntu1) hirsute; urgency=medium + + * New upstream release (20.12.2) + + -- Rik Mills Thu, 04 Feb 2021 09:57:17 +0000 + +kompare (4:20.12.1-0ubuntu1) hirsute; urgency=medium + + * New upstream release (20.12.1) + + -- Rik Mills Wed, 20 Jan 2021 23:12:08 +0000 + kompare (4:20.12.0-2) unstable; urgency=medium * Reupload as source-only upload so it can migrate to testing. diff -pruN 4:22.12.1-1/debian/control 4:22.12.3-0ubuntu1/debian/control --- 4:22.12.1-1/debian/control 2023-01-06 23:05:39.000000000 +0000 +++ 4:22.12.3-0ubuntu1/debian/control 2023-03-02 00:41:04.000000000 +0000 @@ -1,7 +1,8 @@ Source: kompare Section: kde Priority: optional -Maintainer: Debian Qt/KDE Maintainers +Maintainer: Kubuntu Developers +XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Aurélien COUDERC , Norbert Preining , Sune Vuorela , @@ -18,14 +19,14 @@ Build-Depends: cmake (>= 3.16~), libkf5parts-dev (>= 5.100.0~), libkf5texteditor-dev (>= 5.100.0~), libkf5widgetsaddons-dev (>= 5.100.0~), - libkomparediff2-dev (>= 4:21.08~), + libkomparediff2-dev (>= 4:22.12.3~), pkg-kde-tools (>= 0.12), qtbase5-dev (>= 5.15.2~), -Standards-Version: 4.6.2 +Standards-Version: 4.6.1 Rules-Requires-Root: no Homepage: https://apps.kde.org/en/kompare -Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kompare -Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kompare.git +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kompare +Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kompare Package: kompare Architecture: any @@ -55,7 +56,8 @@ Description: file difference viewer - kp Package: libkompareinterface-dev Architecture: any Section: libdevel -Depends: libkompareinterface5 (= ${binary:Version}), ${misc:Depends} +Depends: libkompareinterface5 (= ${binary:Version}), + ${misc:Depends}, Description: file difference viewer - kpart interface library development files Kompare displays the differences between files. It can compare the contents of files or directories, as well as create, display, and merge patch diff -pruN 4:22.12.1-1/debian/upstream/signing-key.asc 4:22.12.3-0ubuntu1/debian/upstream/signing-key.asc --- 4:22.12.1-1/debian/upstream/signing-key.asc 2023-01-06 23:05:39.000000000 +0000 +++ 4:22.12.3-0ubuntu1/debian/upstream/signing-key.asc 2023-03-02 00:41:04.000000000 +0000 @@ -1,5 +1,56 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- +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 +hC+sXh0NMOq4pxE= +=Wqdv +-----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- + mQENBFlRpEYBCACecX3F5xzF6wzeXiuBAuHq74bVHON7I89U+ROloEWYUYMRNTz2 l1BkNHWRTTqfmPO7LhMY6g4gOPeQVCwgTGVjI8bn6sJd3SFdeiRvvaFBpmn7SjBd s1rkKKJIjeMUl1w8dFnmf22V0PnhSSepmNwmd8RQnl1umCTSihDJydGxixw6ZNhr @@ -25,102 +76,82 @@ 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 -c3JUKCqOrqVlNJ1d/4+mkshlzwQA2oFzEQ== -=oKnI +TA+HYUzK0ESVpY72lWvH49lNg+ufZ1bKvKI= +=MZJ5 +-----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=PVLg -----END PGP PUBLIC KEY BLOCK----- diff -pruN 4:22.12.1-1/po/bg/kompare.po 4:22.12.3-0ubuntu1/po/bg/kompare.po --- 4:22.12.1-1/po/bg/kompare.po 2023-01-02 23:52:17.000000000 +0000 +++ 4:22.12.3-0ubuntu1/po/bg/kompare.po 2023-02-25 05:10:26.000000000 +0000 @@ -3,80 +3,81 @@ # # Zlatko Popov , 2006, 2008. # Yasen Pramatarov , 2009. +# Mincho Kondarev , 2023. msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2022-10-20 00:54+0000\n" -"PO-Revision-Date: 2009-09-17 22:29+0300\n" -"Last-Translator: Yasen Pramatarov \n" +"PO-Revision-Date: 2023-01-07 16:34+0100\n" +"Last-Translator: Mincho Kondarev \n" "Language-Team: Bulgarian \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" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 22.12.0\n" #, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Ясен Праматаров,Златко Попов" +msgstr "Ясен Праматаров,Златко Попов,Светослав Стефанов" #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "yasen@lindeas.com,zlatkopopov@fsa-bg.org" +msgstr "yasen@lindeas.com,zlatkopopov@fsa-bg.org,svetlisashkov@yahoo.com" #: app/kompare_shell.cpp:69 -#, fuzzy, kde-format +#, kde-format msgid "Could not load our KompareViewPart: %1" -msgstr "KompareViewPart не може да бъде заредена." +msgstr "KompareViewPart не може да бъде заредена: : %1" #: app/kompare_shell.cpp:73 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:window" msgid "Navigation" msgstr "Навигация" #: app/kompare_shell.cpp:91 -#, fuzzy, kde-format +#, kde-format msgid "Could not load our KompareNavigationPart: %1" -msgstr "KompareViewPart не може да бъде заредена." +msgstr "KompareViewPart не може да бъде заредена: %1" #: app/kompare_shell.cpp:196 -#, fuzzy, kde-format +#, kde-format msgctxt "@action" msgid "&Open Diff..." msgstr "&Отваряне на разлики..." #: app/kompare_shell.cpp:199 -#, fuzzy, kde-format +#, kde-format msgctxt "@action" msgid "&Compare Files..." msgstr "&Сравняване на файлове..." #: app/kompare_shell.cpp:202 -#, fuzzy, kde-format +#, kde-format msgctxt "@action" msgid "&Blend URL with Diff..." msgstr "&Смесване на URL с разлики..." #: app/kompare_shell.cpp:208 -#, fuzzy, kde-format +#, kde-format msgctxt "@action" msgid "Show T&ext View" -msgstr "Показване на изглед \"&текст\"" +msgstr "Показване във вид на &текст" #: app/kompare_shell.cpp:221 #, kde-format msgid " 0 of 0 differences " -msgstr " 0 oт 0 разлики" +msgstr " 0 oт 0 разлики " #: app/kompare_shell.cpp:222 #, kde-format msgid " 0 of 0 files " -msgstr " 0 от 0 файла" +msgstr " 0 от 0 файла " #: app/kompare_shell.cpp:239 #, kde-format @@ -107,37 +108,37 @@ msgstr[0] " %1 разлика " msgstr[1] " %1 разлики " #: app/kompare_shell.cpp:328 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:window" msgid "Blend File/Folder with diff Output" msgstr "Смесване на файл/папка с изходни данни" #: app/kompare_shell.cpp:329 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:group" msgid "File/Folder" msgstr "Файл/Директория" #: app/kompare_shell.cpp:330 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:group" msgid "Diff Output" msgstr "Данни за разлика" #: app/kompare_shell.cpp:333 -#, fuzzy, kde-format +#, kde-format msgctxt "@action:button" msgid "Blend" msgstr "Смесване" #: app/kompare_shell.cpp:334 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:tooltip" msgid "Blend this file or folder with the diff output" msgstr "Смесване на тази директория или папка с изходните данни за разлика" #: app/kompare_shell.cpp:335 -#, fuzzy, kde-format +#, kde-format msgctxt "@infor:whatsthis" msgid "" "If you have entered a file or folder name and a file that contains diff " @@ -152,37 +153,37 @@ msgstr "" "разликата(е) към файл(ове). " #: app/kompare_shell.cpp:358 app/main.cpp:198 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:window" msgid "Compare Files or Folders" msgstr "Сравняване на файлове и папки" #: app/kompare_shell.cpp:359 app/main.cpp:199 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:group" msgid "Source" msgstr "Източник" #: app/kompare_shell.cpp:360 app/main.cpp:200 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:group" msgid "Destination" -msgstr "Цел" +msgstr "Целево местоположение" #: app/kompare_shell.cpp:363 app/main.cpp:203 -#, fuzzy, kde-format +#, kde-format msgctxt "@action:button" msgid "Compare" msgstr "Сравняване" #: app/kompare_shell.cpp:364 app/main.cpp:204 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:tooltip" msgid "Compare these files or folders" msgstr "Сравняване на тези файлове или папки" #: app/kompare_shell.cpp:365 app/main.cpp:205 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:whatsthis" msgid "" "If you have entered 2 filenames or 2 folders in the fields in this dialog " @@ -194,10 +195,10 @@ msgstr "" "файлове или папки. " #: app/kompare_shell.cpp:399 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:window" msgid "Text View" -msgstr "Изглед \"текст\"" +msgstr "Изглед като текст" #. i18n: ectx: Menu (file) #: app/kompareui.rc:4 komparepart/komparepartui.rc:4 @@ -218,7 +219,7 @@ msgid "Main Toolbar" msgstr "Главна лента с инструменти" #: app/kompareurldialog.cpp:37 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:tab" msgid "Files" msgstr "Файлове" @@ -226,11 +227,11 @@ msgstr "Файлове" #: app/kompareurldialog.cpp:39 #, kde-format msgid "Here you can enter the files you want to compare." -msgstr "Тук въведете файловете, които искате да сравните" +msgstr "Тук въведете файловете, които искате да сравните." #: app/kompareurldialog.cpp:45 dialogpages/diffpage.cpp:185 #: komparepart/kompareprefdlg.cpp:42 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:tab" msgid "Diff" msgstr "Разлики" @@ -238,24 +239,26 @@ msgstr "Разлики" #: app/kompareurldialog.cpp:47 #, kde-format msgid "Here you can change the options for comparing the files." -msgstr "Тук можете да промените опциите за сравняване на файлове" +msgstr "Тук можете да промените опциите за сравняване на файлове." #: app/kompareurldialog.cpp:53 dialogpages/viewpage.cpp:87 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:tab" msgid "Appearance" -msgstr "Изглед" +msgstr "Външен вид" #: app/kompareurldialog.cpp:55 #, kde-format msgid "Here you can change the options for the view." -msgstr "Тук можете да промените опциите за изгледа" +msgstr "Тук можете да промените опциите за изгледа." #: app/kompareurldialog.cpp:101 #, kde-format msgid "" "File used for excluding files cannot be found, please specify another file." msgstr "" +"Файлът, използван за изключване на файлове, не може да бъде намерен, моля, " +"посочете друг файл." #: app/main.cpp:49 #, kde-format @@ -271,13 +274,13 @@ msgstr "" "Програма за намиране на разлики между файлове и за генериране на разлики" #: app/main.cpp:53 -#, fuzzy, kde-format +#, kde-format 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" +"2004-2005 Jeff Snyder, (c) 2007-2012 Kevin Kofler" #: app/main.cpp:56 #, kde-format @@ -392,7 +395,7 @@ msgstr "" "ред. Ако не е посочите, ще бъде използвана тази по подразбиране." #: dialogpages/diffpage.cpp:174 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:group" msgid "Diff Program" msgstr "Програма за разлики" @@ -409,7 +412,7 @@ msgstr "" "изберете версията." #: dialogpages/diffpage.cpp:196 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:whatsthis" msgid "" "Select the format of the output generated by diff. Unified is the one that " @@ -421,73 +424,73 @@ msgstr "" "изпращане на кръпки." #: dialogpages/diffpage.cpp:199 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:group" msgid "Output Format" msgstr "Формат на изходните данни" #: dialogpages/diffpage.cpp:201 -#, fuzzy, kde-format +#, kde-format msgctxt "@option:radio format type" msgid "Context" msgstr "Контекст" #: dialogpages/diffpage.cpp:204 -#, fuzzy, kde-format +#, kde-format msgctxt "@option:radio format type" msgid "Normal" msgstr "Нормален" #: dialogpages/diffpage.cpp:207 -#, fuzzy, kde-format +#, kde-format msgctxt "@option:radio format type" msgid "Unified" -msgstr "Unified" +msgstr "Унифициран" #: dialogpages/diffpage.cpp:215 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:group" msgid "Lines of Context" -msgstr "Редове контекст" +msgstr "Контекстни редове" #: dialogpages/diffpage.cpp:216 dialogpages/diffpage.cpp:221 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:whatsthis" 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. Това прави разликите четими и " +"Броят контекстни редове обикновено е 2 или 3. Това прави разликите четими и " "приложими в повечето случаи. Повече от 3 реда само ще излишно ще раздуят " "разликите." #: dialogpages/diffpage.cpp:220 -#, fuzzy, kde-format +#, kde-format msgctxt "@label:spinbox" msgid "Number of context lines:" -msgstr "Брой редове контекст:" +msgstr "Брой на контекстните редове:" #: dialogpages/diffpage.cpp:225 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:tab" msgid "Format" msgstr "Формат" #: dialogpages/diffpage.cpp:237 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:group" msgid "General" msgstr "Общи" #: dialogpages/diffpage.cpp:239 -#, fuzzy, kde-format +#, kde-format msgctxt "@option:check" msgid "&Treat new files as empty" -msgstr "&Третиране на новите файловете като празни" +msgstr "&Третиране на новите файлове, като празни" #: dialogpages/diffpage.cpp:240 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:tooltip" msgid "This option corresponds to the -N diff option." msgstr "Това съответства на опцията -N на diff." @@ -501,15 +504,19 @@ msgid "" "compared with an empty file and because of this will appear as one big " "insertion or deletion." msgstr "" +"Когато тази настройка е включена, diff ще третира файл, който съществува " +"само в една от директориите, като празен в другата директория. Това " +"означава, че файлът се сравнява с празен файл и поради това ще изглежда като " +"едно голямо вмъкване или изтриване." #: dialogpages/diffpage.cpp:244 -#, fuzzy, kde-format +#, kde-format msgctxt "@option:check" msgid "&Look for smaller changes" -msgstr "&Търсене на малки промени" +msgstr "&Търсене на по-дребни промени" #: dialogpages/diffpage.cpp:245 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:tooltip" msgid "This corresponds to the -d diff option." msgstr "Това съответства на опцията -d на diff." @@ -521,15 +528,17 @@ msgid "" "With this option enabled diff will try a little harder (at the cost of more " "memory) to find fewer changes." msgstr "" +"Когато тази настройка е включена, diff ще се постарае малко повече (за " +"сметка на повече памет), за да намери по-малко промени." #: dialogpages/diffpage.cpp:248 -#, fuzzy, kde-format +#, kde-format msgctxt "@option:check" msgid "O&ptimize for large files" msgstr "&Оптимизиране за големи файлове" #: dialogpages/diffpage.cpp:249 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:tooltip" msgid "This corresponds to the -H diff option." msgstr "Това съответства на опцията -H на diff." @@ -541,15 +550,17 @@ msgid "" "This option lets diff makes better diffs when using large files. The " "definition of large is nowhere to be found though." msgstr "" +"Тази опция позволява на diff да прави по-добри разлики, когато използва " +"големи файлове. Дефиницията за голям файл обаче не е открита никъде." #: dialogpages/diffpage.cpp:252 -#, fuzzy, kde-format +#, kde-format msgctxt "@option:check" msgid "&Ignore changes in case" msgstr "&Игнориране на промяната в регистъра" #: dialogpages/diffpage.cpp:253 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:tooltip" msgid "This corresponds to the -i diff option." msgstr "Това съответства на опцията -i на diff." @@ -562,15 +573,18 @@ msgid "" "difference when something in one file is changed into SoMEthing in the other " "file." msgstr "" +"Ако тази настройка за игнориране на промените в случая е включена, diff няма " +"да показва разлика, когато нещо в единия файл е променено в Нещо в другия " +"файл." #: dialogpages/diffpage.cpp:262 -#, fuzzy, kde-format +#, kde-format msgctxt "@option:check" msgid "Ignore regexp:" -msgstr "Игнориране на рег. изрази:" +msgstr "Игнориране на регулярните изрази:" #: dialogpages/diffpage.cpp:263 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:tooltip" msgid "This option corresponds to the -I diff option." msgstr "Това съответства на опцията -I на diff." @@ -582,9 +596,11 @@ msgid "" "When this checkbox is enabled, an option to diff is given that will make " "diff ignore lines that match the regular expression." msgstr "" +"Избирането на тази отметка ще накара diff да игнорира редовете, които " +"отговарят на регулярния израз." #: dialogpages/diffpage.cpp:268 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:tooltip" msgid "" "Add the regular expression here that you want to use\n" @@ -594,19 +610,19 @@ msgstr "" "които съвпадат с него, ще бъдат игнорирани." #: dialogpages/diffpage.cpp:274 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:group" msgid "Whitespace" msgstr "Интервал" #: dialogpages/diffpage.cpp:276 -#, fuzzy, kde-format +#, kde-format msgctxt "@option:check" msgid "E&xpand tabs to spaces in output" msgstr "&Разширение на подпрозорците до интервали" #: dialogpages/diffpage.cpp:277 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:tooltip" msgid "This option corresponds to the -t diff option." msgstr "Това съответства на опцията -t на diff." @@ -618,15 +634,17 @@ 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 " +"може да има проблеми с прилагането на промяната в целевия файл." #: dialogpages/diffpage.cpp:280 -#, fuzzy, kde-format +#, kde-format msgctxt "@option:check" msgid "I&gnore added or removed empty lines" -msgstr "&Игнориране на празните редове" +msgstr "&Игнориране на добавени или премахнати празни редове" #: dialogpages/diffpage.cpp:281 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:tooltip" msgid "This option corresponds to the -B diff option." msgstr "Това съответства на опцията -B на diff." @@ -638,15 +656,18 @@ 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 "" +"Това може да бъде много полезно в ситуации, в които кодът е бил " +"реорганизиран и са били добавени или премахнати празни редове, за да се " +"подобри четливостта." #: dialogpages/diffpage.cpp:284 -#, fuzzy, kde-format +#, kde-format msgctxt "@option:check" msgid "Ig&nore changes in the amount of whitespace" msgstr "&Игнориране на промените в броя интервали" #: dialogpages/diffpage.cpp:285 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:tooltip" msgid "This option corresponds to the -b diff option." msgstr "Това съответства на опцията -b на diff." @@ -658,15 +679,17 @@ msgid "" "If you are uninterested in differences arising due to, for example, changes " "in indentation, then use this option." msgstr "" +"Ако не се интересувате от разликите, дължащи се например на промени в " +"отстъпите, използвайте тази опция." #: dialogpages/diffpage.cpp:288 -#, fuzzy, kde-format +#, kde-format msgctxt "@option:check" msgid "Ign&ore all whitespace" msgstr "&Игнориране на всички интервали" #: dialogpages/diffpage.cpp:289 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:tooltip" msgid "This option corresponds to the -w diff option." msgstr "Това съответства на опцията -w на diff." @@ -678,15 +701,17 @@ msgid "" "This is useful for seeing the significant changes without being overwhelmed " "by all the white space changes." msgstr "" +"Това е полезно, за да видите значителните промени, без да бъдете затрупани " +"от всички промени, свързани с празното пространство." #: dialogpages/diffpage.cpp:292 -#, fuzzy, kde-format +#, kde-format msgctxt "@option:check" msgid "Igno&re changes due to tab expansion" msgstr "Игнорира&не на промените от разширението на подпрозореца" #: dialogpages/diffpage.cpp:293 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:tooltip" msgid "This option corresponds to the -E diff option." msgstr "Това съответства на опцията -E на dif." @@ -700,64 +725,68 @@ msgid "" "Kompare currently has some problems applying such changes so be careful when " "you use this option." msgstr "" +"Ако има промяна поради това, че табулаторите са били разширени в интервали в " +"другия файл, тази опция ще гарантира, че те няма да се появят. Понастоящем " +"Kompare има някои проблеми с прилагането на такива промени, така че бъдете " +"внимателни, когато използвате тази опция." #: dialogpages/diffpage.cpp:299 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:tab" msgid "Options" msgstr "Настройки" #: dialogpages/diffpage.cpp:311 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:group" msgid "File Pattern to Exclude" -msgstr "Изключение - шаблон на файл" +msgstr "Шаблон на файл за изключване" #: dialogpages/diffpage.cpp:312 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:tooltip" 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 "" -"Ако е включена тази отметка, можете да въведете шаблон на шел вдясно или да " -"изберете елементи от списъка." +"Ако е включена тази отметка, можете да въведете шаблон на обвивката вдясно " +"или да изберете елементи от списъка." #: dialogpages/diffpage.cpp:318 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:tooltip" msgid "" "Here you can enter or remove a shell pattern or select one or more entries " "from the list." msgstr "" -"Тук можете да въведете или премахнете шаблон на шел или да изберете елементи " -"от списъка." +"Тук можете да въведете или премахнете шаблон на обвивката или да изберете " +"елементи от списъка." #: dialogpages/diffpage.cpp:328 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:group" msgid "File with Filenames to Exclude" -msgstr "Изключение - файл с имена" +msgstr "Файл с имена за изключване" #: dialogpages/diffpage.cpp:329 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:tooltip" msgid "If this is checked you can enter a filename in the combo box below." msgstr "" "Ако е включена тази отметка, можете да въведете име на файл в полето вдясно." #: dialogpages/diffpage.cpp:333 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:tooltip" msgid "" "Here you can enter the URL of a file with shell patterns to ignore during " "the comparison of the folders." msgstr "" -"Тук можете да въведете адрес на файл със шаблони на шелове, които да бъдат " +"Тук можете да въведете адрес на файл със шаблони на обвивки, които да бъдат " "игнорирани по време на сравняването на папките." #: dialogpages/diffpage.cpp:337 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:tooltip" msgid "" "Any file you select in the dialog that pops up when you click it will be put " @@ -767,25 +796,25 @@ msgstr "" "на бутона." #: dialogpages/diffpage.cpp:344 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:tab" msgid "Exclude" msgstr "Изключване" #: dialogpages/filespage.cpp:39 dialogpages/filespage.cpp:68 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:tooltip" msgid "Select file" -msgstr "&Следващ файл" +msgstr "Избиране на файл" #: dialogpages/filespage.cpp:51 dialogpages/filespage.cpp:80 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:tooltip" msgid "Select folder" -msgstr "Директория източник" +msgstr "Избиране на папка" #: dialogpages/filespage.cpp:87 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:group" msgid "Encoding" msgstr "Кодова таблица" @@ -794,142 +823,142 @@ msgstr "Кодова таблица" #, kde-format msgctxt "@item:inlistbox encoding" msgid "Default" -msgstr "" +msgstr "Стандартно" #: dialogpages/filespage.cpp:126 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:window" msgid "Select Folder" -msgstr "Директория източник" +msgstr "Избиране на папка" #: dialogpages/filespage.cpp:130 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:window" msgid "Select File" -msgstr "&Следващ файл" +msgstr "Избиране на файл" #: dialogpages/viewpage.cpp:44 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:group" msgid "Colors" msgstr "Цветове" #: dialogpages/viewpage.cpp:50 -#, fuzzy, kde-format +#, kde-format msgctxt "@label:chooser" msgid "Removed color:" msgstr "Цвят за премахнато:" #: dialogpages/viewpage.cpp:54 -#, fuzzy, kde-format +#, kde-format msgctxt "@label:chooser" msgid "Changed color:" msgstr "Цвят за променено:" #: dialogpages/viewpage.cpp:58 -#, fuzzy, kde-format +#, kde-format msgctxt "@label:chooser" msgid "Added color:" msgstr "Цвят за добавено:" #: dialogpages/viewpage.cpp:62 -#, fuzzy, kde-format +#, kde-format msgctxt "@label:chooser" msgid "Applied color:" msgstr "Цвят за приложено:" #: dialogpages/viewpage.cpp:66 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:group" msgid "Mouse Wheel" msgstr "Колелце на мишката" #: dialogpages/viewpage.cpp:72 -#, fuzzy, kde-format +#, kde-format msgctxt "@label:spinbox" msgid "Number of lines:" msgstr "Брой редове:" #: dialogpages/viewpage.cpp:77 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:group" msgid "Tabs to Spaces" -msgstr "Подпрозорци в интервали" +msgstr "Табулатори към интервали" #: dialogpages/viewpage.cpp:83 -#, fuzzy, kde-format +#, kde-format msgctxt "@label:spinbox" msgid "Number of spaces to convert a tab character to:" -msgstr "Брой интервали в които да бъде конвертиран един подпрозорец:" +msgstr "В колко интеравала да се превръща един табулатор:" #: dialogpages/viewpage.cpp:94 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:group" msgid "Text Font" -msgstr "Шрифт на текст" +msgstr "Шрифт на текста" #: dialogpages/viewpage.cpp:98 -#, fuzzy, kde-format +#, kde-format msgctxt "@label:listbox" msgid "Font:" msgstr "Шрифт:" #: dialogpages/viewpage.cpp:103 -#, fuzzy, kde-format +#, kde-format msgctxt "@label:spinbox" msgid "Size:" msgstr "Размер:" #: dialogpages/viewpage.cpp:107 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:tab" msgid "Fonts" msgstr "Шрифтове" #: komparenavtreepart/komparenavtreepart.cpp:55 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:column" msgid "Source Folder" -msgstr "Директория източник" +msgstr "Изходна папка" #: komparenavtreepart/komparenavtreepart.cpp:61 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:column" msgid "Destination Folder" -msgstr "Отправна директория" +msgstr "Целева папка" #: komparenavtreepart/komparenavtreepart.cpp:68 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:column" msgid "Source File" -msgstr "Файл източник" +msgstr "Изходен файл" #: komparenavtreepart/komparenavtreepart.cpp:69 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:column" msgid "Destination File" msgstr "Целеви файл" #: komparenavtreepart/komparenavtreepart.cpp:78 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:column" msgid "Source Line" -msgstr "Ред източник" +msgstr "Изходен ред" #: komparenavtreepart/komparenavtreepart.cpp:79 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:column" msgid "Destination Line" msgstr "Целеви ред" #: komparenavtreepart/komparenavtreepart.cpp:80 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:column" msgid "Difference" msgstr "Разлика" #: komparenavtreepart/komparenavtreepart.cpp:455 -#, fuzzy, kde-format +#, kde-format msgid "Applied: Changes made to %1 line undone" msgid_plural "Applied: Changes made to %1 lines undone" msgstr[0] "Приложено: Промените в %1 ред са отменени" @@ -971,37 +1000,37 @@ msgstr[0] "Изтрит %1 ред" msgstr[1] "Изтрити %1 реда" #: komparenavtreepart/komparenavtreepart.cpp:628 -#, fuzzy, kde-format +#, kde-format msgctxt "@item directory name not known" msgid "Unknown" -msgstr "Неизвестен" +msgstr "Неизвестено" #: komparepart/kompare_part.cpp:180 -#, fuzzy, kde-format +#, kde-format msgctxt "@action" msgid "Save &All" msgstr "Запис на &всичко" #: komparepart/kompare_part.cpp:182 -#, fuzzy, kde-format +#, kde-format msgctxt "@action" msgid "Save &Diff..." msgstr "Запис на &разликите..." #: komparepart/kompare_part.cpp:184 -#, fuzzy, kde-format +#, kde-format msgctxt "@action" msgid "Swap Source with Destination" -msgstr "Запомняне на източника и направлението" +msgstr "Размяна на източник с крайната цел" #: komparepart/kompare_part.cpp:191 -#, fuzzy, kde-format +#, kde-format msgctxt "@action" msgid "Show Statistics" msgstr "Показване на статистика" #: komparepart/kompare_part.cpp:194 -#, fuzzy, kde-format +#, kde-format msgctxt "@action" msgid "Refresh Diff" msgstr "Обновяване на разликата" @@ -1017,60 +1046,60 @@ msgid "The URL %1 does not ex msgstr "Адресът (URL) %1 не съществува на компютъра." #: komparepart/kompare_part.cpp:545 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:window" msgid "Diff Options" -msgstr "Опции за разлики" +msgstr "Настройки на Diff" #: komparepart/kompare_part.cpp:564 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:window" msgid "Save .diff" msgstr "Запис на .diff" #: komparepart/kompare_part.cpp:566 -#, fuzzy, kde-format +#, kde-format msgid "Patch Files (*.diff *.dif *.patch)" -msgstr "*.diff *.dif *.patch|Кръпки" +msgstr "Файлове с кръпки (*.diff *.dif *.patch)" #: komparepart/kompare_part.cpp:627 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:status" msgid "Running diff..." msgstr "Проверка за разлики..." #: komparepart/kompare_part.cpp:630 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:status" msgid "Parsing diff output..." msgstr "Обработка на данните за разликите..." #: komparepart/kompare_part.cpp:686 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:status" msgid "Comparing file %1 with file %2" msgstr "Сравняване на файл %1 с файл %2" #: komparepart/kompare_part.cpp:691 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:status" msgid "Comparing files in %1 with files in %2" msgstr "Сравняване на файлове в %1 с файлове в %2" #: komparepart/kompare_part.cpp:696 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:status" msgid "Viewing diff output from %1" msgstr "Преглед на разликите от %1" #: komparepart/kompare_part.cpp:699 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:status" msgid "Blending diff output from %1 into file %2" msgstr "Смесване на разликите за%1 във файл %2" #: komparepart/kompare_part.cpp:704 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:status" msgid "Blending diff output from %1 into folder %2" msgstr "Смесване на разликите за%1 във папка %2" @@ -1087,43 +1116,43 @@ msgstr "" #: komparepart/kompare_part.cpp:761 komparepart/kompare_part.cpp:800 #: komparepart/kompare_part.cpp:924 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:window" msgid "Save Changes?" msgstr "Запис на промените?" #: komparepart/kompare_part.cpp:843 -#, fuzzy, kde-format +#, kde-format msgctxt "@item diff format" msgid "Unified" -msgstr "Unified" +msgstr "Унифициран" #: komparepart/kompare_part.cpp:846 -#, fuzzy, kde-format +#, kde-format msgctxt "@item diff format" msgid "Context" msgstr "Контекст" #: komparepart/kompare_part.cpp:849 -#, fuzzy, kde-format +#, kde-format msgctxt "@item diff format" msgid "RCS" msgstr "RCS" #: komparepart/kompare_part.cpp:852 -#, fuzzy, kde-format +#, kde-format msgctxt "@item diff format" msgid "Ed" msgstr "Ed" #: komparepart/kompare_part.cpp:855 -#, fuzzy, kde-format +#, kde-format msgctxt "@item diff format" msgid "Normal" msgstr "Нормален" #: komparepart/kompare_part.cpp:859 -#, fuzzy, kde-format +#, kde-format msgctxt "@item diff format" msgid "Unknown" msgstr "Неизвестен" @@ -1139,7 +1168,7 @@ msgstr "" #: komparepart/kompare_part.cpp:877 komparepart/kompare_part.cpp:891 #: komparepart/kompare_part.cpp:907 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:window" msgid "Diff Statistics" msgstr "Статистика за разлики" @@ -1197,28 +1226,28 @@ msgid "&Difference" msgstr "&Разлика" #: komparepart/kompareprefdlg.cpp:26 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:window" msgid "Preferences" msgstr "Настройки" #: komparepart/kompareprefdlg.cpp:36 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:tab" msgid "View" msgstr "Изглед" #: komparepart/kompareprefdlg.cpp:38 -#, fuzzy, kde-format +#, kde-format msgctxt "@title" msgid "View Settings" -msgstr "Настройки на изглед" +msgstr "Настройки на изгледа" #: komparepart/kompareprefdlg.cpp:44 -#, fuzzy, kde-format +#, kde-format msgctxt "@title" msgid "Diff Settings" -msgstr "Настройки на разлики" +msgstr "Настройки на Diff" #. i18n: ectx: property (title), widget (QGroupBox, m_FormatGB) #: komparepart/komparesaveoptionsbase.ui:29 @@ -1228,9 +1257,9 @@ msgstr "Формат" #. i18n: ectx: property (text), widget (QRadioButton, m_ContextRB) #: komparepart/komparesaveoptionsbase.ui:35 -#, fuzzy, kde-format +#, kde-format msgid "&Context" -msgstr "Контекст" +msgstr "&Контекст" #. i18n: ectx: property (text), widget (QRadioButton, m_EdRB) #: komparepart/komparesaveoptionsbase.ui:42 @@ -1240,9 +1269,9 @@ msgstr "Ed" #. i18n: ectx: property (text), widget (QRadioButton, m_NormalRB) #: komparepart/komparesaveoptionsbase.ui:49 -#, fuzzy, kde-format +#, kde-format msgid "&Normal" -msgstr "Нормален" +msgstr "&Нормален" #. i18n: ectx: property (text), widget (QRadioButton, m_RCSRB) #: komparepart/komparesaveoptionsbase.ui:56 @@ -1252,15 +1281,15 @@ msgstr "RCS" #. i18n: ectx: property (text), widget (QRadioButton, m_UnifiedRB) #: komparepart/komparesaveoptionsbase.ui:63 -#, fuzzy, kde-format +#, kde-format msgid "&Unified" -msgstr "Unified" +msgstr "&Унифициран" #. i18n: ectx: property (text), widget (QRadioButton, m_SideBySideRB) #: komparepart/komparesaveoptionsbase.ui:73 -#, fuzzy, kde-format +#, kde-format msgid "&Side-by-side" -msgstr "Страна по страна" +msgstr "&Един до друг" #. i18n: ectx: property (text), widget (QLabel, m_ContextLinesLabel) #: komparepart/komparesaveoptionsbase.ui:85 @@ -1345,3 +1374,17 @@ msgstr "Команден ред" #, kde-format msgid "cd dir && diff -udHprNa -- source destination" msgstr "cd dir && diff -udHprNa -- целеви източник" + +#~ msgid "The file exists or is write-protected; do you want to overwrite it?" +#~ msgstr "" +#~ "Файлът съществува или е защитен от запис. Искате ли да бъде презаписан?" + +#, fuzzy +#~ msgctxt "@window:title" +#~ msgid "File Exists" +#~ msgstr "Файлът съществува" + +#, fuzzy +#~ msgctxt "@action:button" +#~ msgid "Do Not Overwrite" +#~ msgstr "Без презапис" diff -pruN 4:22.12.1-1/po/ca@valencia/kompare.po 4:22.12.3-0ubuntu1/po/ca@valencia/kompare.po --- 4:22.12.1-1/po/ca@valencia/kompare.po 2023-01-02 23:52:17.000000000 +0000 +++ 4:22.12.3-0ubuntu1/po/ca@valencia/kompare.po 2023-02-25 05:10:26.000000000 +0000 @@ -814,7 +814,7 @@ msgstr "Exclou" #, kde-format msgctxt "@info:tooltip" msgid "Select file" -msgstr "Seleccioneu el fitxer" +msgstr "Seleccioneu un fitxer" #: dialogpages/filespage.cpp:51 dialogpages/filespage.cpp:80 #, kde-format @@ -844,7 +844,7 @@ msgstr "Seleccioneu una carpeta" #, kde-format msgctxt "@title:window" msgid "Select File" -msgstr "Seleccioneu el fitxer" +msgstr "Seleccioneu un fitxer" #: dialogpages/viewpage.cpp:44 #, kde-format @@ -1250,13 +1250,13 @@ msgstr "Visualitza" #, kde-format msgctxt "@title" msgid "View Settings" -msgstr "Configuració de la vista" +msgstr "Configureu la vista" #: komparepart/kompareprefdlg.cpp:44 #, kde-format msgctxt "@title" msgid "Diff Settings" -msgstr "Configuració de «diff»" +msgstr "Configureu «diff»" #. i18n: ectx: property (title), widget (QGroupBox, m_FormatGB) #: komparepart/komparesaveoptionsbase.ui:29 diff -pruN 4:22.12.1-1/po/cs/kompare.po 4:22.12.3-0ubuntu1/po/cs/kompare.po --- 4:22.12.1-1/po/cs/kompare.po 2023-01-02 23:52:17.000000000 +0000 +++ 4:22.12.3-0ubuntu1/po/cs/kompare.po 2023-02-25 05:10:26.000000000 +0000 @@ -1,6 +1,6 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Vít Pelčák , 2011, 2012, 2013, 2014, 2015, 2017, 2019, 2020. +# Vít Pelčák , 2011, 2012, 2013, 2014, 2015, 2017, 2019, 2020, 2023. # Tomáš Chvátal , 2013. # msgid "" @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2022-10-20 00:54+0000\n" -"PO-Revision-Date: 2020-05-26 13:07+0200\n" +"PO-Revision-Date: 2023-01-24 15:30+0100\n" "Last-Translator: Vit Pelcak \n" "Language-Team: Czech \n" "Language: cs\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 20.04.1\n" +"X-Generator: Lokalize 22.12.1\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -29,10 +29,9 @@ msgid "Your emails" msgstr "lukas@kde.org, koty@seznam.cz, tomas.chvatal@gmail.com" #: app/kompare_shell.cpp:69 -#, fuzzy, kde-format -#| msgid "Could not load our KompareViewPart." +#, kde-format msgid "Could not load our KompareViewPart: %1" -msgstr "Nelze načíst komponentu KompareViewPart." +msgstr "Nelze načíst komponentu KompareViewPart: %1" #: app/kompare_shell.cpp:73 #, kde-format @@ -41,10 +40,9 @@ msgid "Navigation" msgstr "Navigace" #: app/kompare_shell.cpp:91 -#, fuzzy, kde-format -#| msgid "Could not load our KompareNavigationPart." +#, kde-format msgid "Could not load our KompareNavigationPart: %1" -msgstr "Nelze načíst komponentu KompareNavigationPart." +msgstr "Nelze načíst komponentu KompareNavigationPart: %1" #: app/kompare_shell.cpp:196 #, kde-format @@ -1325,15 +1323,3 @@ msgstr "Příkazový řádek" #, kde-format msgid "cd dir && diff -udHprNa -- source destination" msgstr "cd dir && diff -udHprNa -- cíl zdroje" - -#~ msgid "The file exists or is write-protected; do you want to overwrite it?" -#~ msgstr "" -#~ "Soubor existuje, ale je chráněn proti zápisu; přejete si jej přepsat?" - -#~ msgctxt "@window:title" -#~ msgid "File Exists" -#~ msgstr "Soubor existuje" - -#~ msgctxt "@action:button" -#~ msgid "Do Not Overwrite" -#~ msgstr "Nepřepisovat" diff -pruN 4:22.12.1-1/po/el/kompare.po 4:22.12.3-0ubuntu1/po/el/kompare.po --- 4:22.12.1-1/po/el/kompare.po 2023-01-02 23:52:17.000000000 +0000 +++ 4:22.12.3-0ubuntu1/po/el/kompare.po 2023-02-25 05:10:26.000000000 +0000 @@ -9,20 +9,20 @@ # Dimitrios Glentadakis , 2011. # Dimitris Kardarakos , 2014. # Petros Vidalis , 2016, 2017, 2018. -# Stelios , 2020. +# Stelios , 2020, 2023. msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2022-10-20 00:54+0000\n" -"PO-Revision-Date: 2020-10-10 20:34+0300\n" +"PO-Revision-Date: 2023-01-07 10:07+0200\n" "Last-Translator: Stelios \n" "Language-Team: Greek \n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 20.04.2\n" +"X-Generator: Lokalize 21.12.3\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #, kde-format @@ -38,10 +38,9 @@ msgstr "" "org, pvidalis@gmail.com" #: app/kompare_shell.cpp:69 -#, fuzzy, kde-format -#| msgid "Could not load our KompareViewPart." +#, kde-format msgid "Could not load our KompareViewPart: %1" -msgstr "Αδύνατο να φορτωθεί το KompareViewPart." +msgstr "Αδυναμία φόρτωσης του KompareViewPart: %1" #: app/kompare_shell.cpp:73 #, kde-format @@ -50,10 +49,9 @@ msgid "Navigation" msgstr "Πλοήγηση" #: app/kompare_shell.cpp:91 -#, fuzzy, kde-format -#| msgid "Could not load our KompareNavigationPart." +#, kde-format msgid "Could not load our KompareNavigationPart: %1" -msgstr "Αδύνατο να φορτωθεί το KompareNavigationPart." +msgstr "Αδυναμία φόρτωσης του δικού μας KompareNavigationPart: %1" #: app/kompare_shell.cpp:196 #, kde-format diff -pruN 4:22.12.1-1/po/fr/kompare.po 4:22.12.3-0ubuntu1/po/fr/kompare.po --- 4:22.12.1-1/po/fr/kompare.po 2023-01-02 23:52:17.000000000 +0000 +++ 4:22.12.3-0ubuntu1/po/fr/kompare.po 2023-02-25 05:10:26.000000000 +0000 @@ -16,20 +16,21 @@ # Simon Depiets , 2017. # Xavier Besnard , 2020, 2021, 2022. # +# Xavier BESNARD , 2023. msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2022-10-20 00:54+0000\n" -"PO-Revision-Date: 2022-10-15 17:49+0200\n" -"Last-Translator: Xavier Besnard \n" -"Language-Team: French \n" +"PO-Revision-Date: 2023-01-10 07:56+0100\n" +"Last-Translator: Xavier BESNARD \n" +"Language-Team: fr\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 22.08.1\n" +"X-Generator: Lokalize 22.12.1\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" @@ -1422,7 +1423,7 @@ msgstr "Ligne de commande" #: komparepart/komparesaveoptionsbase.ui:256 #, kde-format msgid "cd dir && diff -udHprNa -- source destination" -msgstr "cd dir && diff -udHprNa -- source destination" +msgstr "difcd dir && diff -udHprNa -- source destination" #~ msgid "The file exists or is write-protected; do you want to overwrite it?" #~ msgstr "" diff -pruN 4:22.12.1-1/po/ka/kompare.po 4:22.12.3-0ubuntu1/po/ka/kompare.po --- 4:22.12.1-1/po/ka/kompare.po 2023-01-02 23:52:17.000000000 +0000 +++ 4:22.12.3-0ubuntu1/po/ka/kompare.po 2023-02-25 05:10:26.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2022-10-20 00:54+0000\n" -"PO-Revision-Date: 2022-10-06 21:27+0200\n" +"PO-Revision-Date: 2023-02-08 08:11+0100\n" "Last-Translator: Temuri Doghonadze \n" "Language-Team: Georgian \n" "Language: ka\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.1.1\n" +"X-Generator: Poedit 3.2.2\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -31,7 +31,7 @@ msgstr "Temuri.doghonadze@gmail.com" #: app/kompare_shell.cpp:69 #, kde-format msgid "Could not load our KompareViewPart: %1" -msgstr "" +msgstr "KompareViewPart-ის ჩატვირთვის შეცდომა: %1" #: app/kompare_shell.cpp:73 #, kde-format @@ -42,31 +42,31 @@ msgstr "ნავიგაცია" #: app/kompare_shell.cpp:91 #, kde-format msgid "Could not load our KompareNavigationPart: %1" -msgstr "" +msgstr "KompareNavigationPart-ის ჩატვირთვის შეცდომა: %1" #: app/kompare_shell.cpp:196 #, kde-format msgctxt "@action" msgid "&Open Diff..." -msgstr "" +msgstr "სხვაობის &გახსნა..." #: app/kompare_shell.cpp:199 #, kde-format msgctxt "@action" msgid "&Compare Files..." -msgstr "" +msgstr "ფაილების &შედარება..." #: app/kompare_shell.cpp:202 #, kde-format msgctxt "@action" msgid "&Blend URL with Diff..." -msgstr "" +msgstr "&ბმულის სხვაობასთან შერევა..." #: app/kompare_shell.cpp:208 #, kde-format msgctxt "@action" msgid "Show T&ext View" -msgstr "" +msgstr "ტექსტის &ხედის ჩვენება" #: app/kompare_shell.cpp:221 #, kde-format @@ -219,7 +219,7 @@ msgstr "ფაილები" #: app/kompareurldialog.cpp:39 #, kde-format msgid "Here you can enter the files you want to compare." -msgstr "" +msgstr "აქ შეგიძლიათ შეიყვანოთ შესადარებელი ფაილები." #: app/kompareurldialog.cpp:45 dialogpages/diffpage.cpp:185 #: komparepart/kompareprefdlg.cpp:42 @@ -231,7 +231,7 @@ msgstr "Diff" #: app/kompareurldialog.cpp:47 #, kde-format msgid "Here you can change the options for comparing the files." -msgstr "" +msgstr "აქ შეგიძლიათ ფაილების შედარების პარამეტრები შეცვალოთ." #: app/kompareurldialog.cpp:53 dialogpages/viewpage.cpp:87 #, kde-format @@ -242,7 +242,7 @@ msgstr "გარემოს იერ #: app/kompareurldialog.cpp:55 #, kde-format msgid "Here you can change the options for the view." -msgstr "" +msgstr "აქ ხედის მორგება შეგიძლიათ." #: app/kompareurldialog.cpp:101 #, kde-format @@ -312,7 +312,7 @@ msgstr "Chris Luetchford" #: app/main.cpp:60 #, kde-format msgid "Kompare icon artist" -msgstr "" +msgstr "Kompare -ის ხატულის ავტორი" #: app/main.cpp:61 #, kde-format @@ -322,7 +322,7 @@ msgstr "Malte Starostik" #: app/main.cpp:61 #, kde-format msgid "A lot of good advice" -msgstr "" +msgstr "ბევრი სასარგებლო რჩევა" #: app/main.cpp:62 #, kde-format @@ -332,12 +332,12 @@ msgstr "Bernd Gehrmann" #: app/main.cpp:62 #, kde-format msgid "Cervisia diff viewer" -msgstr "" +msgstr "Cervisia -ის სხვაობის ნახვა" #: app/main.cpp:69 #, kde-format msgid "This will compare URL1 with URL2" -msgstr "" +msgstr "შეადარებს URL1-ს და URL2-ს" #: app/main.cpp:70 #, kde-format @@ -374,7 +374,7 @@ msgstr "" #, kde-format msgctxt "@title:group" msgid "Diff Program" -msgstr "" +msgstr "Diff-ის პროგრამა" #: dialogpages/diffpage.cpp:179 #, kde-format @@ -421,7 +421,7 @@ msgstr "გაერთიანებ #, kde-format msgctxt "@title:group" msgid "Lines of Context" -msgstr "" +msgstr "კონტექსტის ხაზები" #: dialogpages/diffpage.cpp:216 dialogpages/diffpage.cpp:221 #, kde-format @@ -436,7 +436,7 @@ msgstr "" #, kde-format msgctxt "@label:spinbox" msgid "Number of context lines:" -msgstr "" +msgstr "კონტექსტის ხაზების რაოდენობა:" #: dialogpages/diffpage.cpp:225 #, kde-format @@ -454,13 +454,13 @@ msgstr "ზოგადი" #, kde-format msgctxt "@option:check" msgid "&Treat new files as empty" -msgstr "" +msgstr "ახალი ფაილების ცარიელად &აღქმა" #: dialogpages/diffpage.cpp:240 #, kde-format msgctxt "@info:tooltip" msgid "This option corresponds to the -N diff option." -msgstr "" +msgstr "ეს პარამეტრი diff-ის -N პარამეტრს შეესაბამება." #: dialogpages/diffpage.cpp:241 #, kde-format @@ -476,13 +476,13 @@ msgstr "" #, kde-format msgctxt "@option:check" msgid "&Look for smaller changes" -msgstr "" +msgstr "&უფრო პატარა ცვლილებების ძებნა" #: dialogpages/diffpage.cpp:245 #, kde-format msgctxt "@info:tooltip" msgid "This corresponds to the -d diff option." -msgstr "" +msgstr "შეესაბამება diff-ის -d პარამეტრს." #: dialogpages/diffpage.cpp:246 #, kde-format @@ -496,13 +496,13 @@ msgstr "" #, kde-format msgctxt "@option:check" msgid "O&ptimize for large files" -msgstr "" +msgstr "&ოპტიმიზაცია დიდი ფაილებისთვის" #: dialogpages/diffpage.cpp:249 #, kde-format msgctxt "@info:tooltip" msgid "This corresponds to the -H diff option." -msgstr "" +msgstr "შეესაბამება diff-ის -H პარამეტრს." #: dialogpages/diffpage.cpp:250 #, kde-format @@ -516,13 +516,13 @@ msgstr "" #, kde-format msgctxt "@option:check" msgid "&Ignore changes in case" -msgstr "" +msgstr "&რეგისტრის ცვლილებების იგნორი" #: dialogpages/diffpage.cpp:253 #, kde-format msgctxt "@info:tooltip" msgid "This corresponds to the -i diff option." -msgstr "" +msgstr "შეესაბამება diff-ის -i პარამეტრს." #: dialogpages/diffpage.cpp:254 #, kde-format @@ -537,13 +537,13 @@ msgstr "" #, kde-format msgctxt "@option:check" msgid "Ignore regexp:" -msgstr "" +msgstr "რეგგამოსის იგნორი:" #: dialogpages/diffpage.cpp:263 #, kde-format msgctxt "@info:tooltip" msgid "This option corresponds to the -I diff option." -msgstr "" +msgstr "შეესაბამება diff-ის -l პარამეტრს." #: dialogpages/diffpage.cpp:264 #, kde-format @@ -565,7 +565,7 @@ msgstr "" #, kde-format msgctxt "@title:group" msgid "Whitespace" -msgstr "" +msgstr "გამოტოვებები" #: dialogpages/diffpage.cpp:276 #, kde-format @@ -577,7 +577,7 @@ msgstr "" #, kde-format msgctxt "@info:tooltip" msgid "This option corresponds to the -t diff option." -msgstr "" +msgstr "ეს პარამეტრი diff-ის -t პარამეტრს შეესაბამება." #: dialogpages/diffpage.cpp:278 #, kde-format @@ -591,13 +591,13 @@ msgstr "" #, kde-format msgctxt "@option:check" msgid "I&gnore added or removed empty lines" -msgstr "" +msgstr "დამატებული ან წაშლილი ცარიელი ხაზების &გამოტოვება" #: dialogpages/diffpage.cpp:281 #, kde-format msgctxt "@info:tooltip" msgid "This option corresponds to the -B diff option." -msgstr "" +msgstr "ეს პარამეტრი diff-ის -B პარამეტრს შეესაბამება." #: dialogpages/diffpage.cpp:282 #, kde-format @@ -617,7 +617,7 @@ msgstr "" #, kde-format msgctxt "@info:tooltip" msgid "This option corresponds to the -b diff option." -msgstr "" +msgstr "ეს პარამეტრი diff-ის -b პარამეტრს შეესაბამება." #: dialogpages/diffpage.cpp:286 #, kde-format @@ -631,7 +631,7 @@ msgstr "" #, kde-format msgctxt "@option:check" msgid "Ign&ore all whitespace" -msgstr "" +msgstr "&გამოტოვებული ადგილების იგნორი" #: dialogpages/diffpage.cpp:289 #, kde-format @@ -679,7 +679,7 @@ msgstr "გამართვა" #, kde-format msgctxt "@title:group" msgid "File Pattern to Exclude" -msgstr "" +msgstr "გამოსარიცხი ფაილის ნიმუში" #: dialogpages/diffpage.cpp:312 #, kde-format @@ -701,7 +701,7 @@ msgstr "" #, kde-format msgctxt "@title:group" msgid "File with Filenames to Exclude" -msgstr "" +msgstr "გამოსარიცხი ფაილის სახელების შემცველი ფაილი" #: dialogpages/diffpage.cpp:329 #, kde-format @@ -879,7 +879,7 @@ msgstr "წყაროს ხაზი" #, kde-format msgctxt "@title:column" msgid "Destination Line" -msgstr "" +msgstr "სამიზნე ხაზი" #: komparenavtreepart/komparenavtreepart.cpp:80 #, kde-format @@ -898,8 +898,8 @@ msgstr[1] "" #, kde-format msgid "Changed %1 line" msgid_plural "Changed %1 lines" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "შეიცვალა %1 ხაზი" +msgstr[1] "შეიცვალა %1 ხაზი" #: komparenavtreepart/komparenavtreepart.cpp:463 #, kde-format @@ -912,8 +912,8 @@ msgstr[1] "" #, kde-format msgid "Inserted %1 line" msgid_plural "Inserted %1 lines" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "ჩასმულია %1 ხაზი" +msgstr[1] "ჩასმულია %1 ხაზი" #: komparenavtreepart/komparenavtreepart.cpp:471 #, kde-format @@ -926,8 +926,8 @@ msgstr[1] "" #, kde-format msgid "Deleted %1 line" msgid_plural "Deleted %1 lines" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "წაშლილია %1 ხაზი" +msgstr[1] "წაშლილია %1 ხაზი" #: komparenavtreepart/komparenavtreepart.cpp:628 #, kde-format @@ -963,12 +963,12 @@ msgstr "სტატისტიკე #, kde-format msgctxt "@action" msgid "Refresh Diff" -msgstr "" +msgstr "სხვაობის განახლება" #: komparepart/kompare_part.cpp:306 komparepart/kompare_part.cpp:319 #, kde-format msgid "The URL %1 cannot be downloaded." -msgstr "" +msgstr "ბმულის %1 გადმოწერა შეუძლებელია." #: komparepart/kompare_part.cpp:357 #, kde-format @@ -985,12 +985,12 @@ msgstr "განსხვავებ #, kde-format msgctxt "@title:window" msgid "Save .diff" -msgstr "" +msgstr ".diff failis Senaxva" #: komparepart/kompare_part.cpp:566 #, kde-format msgid "Patch Files (*.diff *.dif *.patch)" -msgstr "" +msgstr "პაჩის ფაილები (*.diff *.dif *.patch)" #: komparepart/kompare_part.cpp:627 #, kde-format @@ -1047,7 +1047,7 @@ msgstr "" #, kde-format msgctxt "@title:window" msgid "Save Changes?" -msgstr "" +msgstr "შევინახო ცვლილებები?" #: komparepart/kompare_part.cpp:843 #, kde-format @@ -1097,7 +1097,7 @@ msgstr "" #, kde-format msgctxt "@title:window" msgid "Diff Statistics" -msgstr "" +msgstr "Diff-ის სტატისტიკა" #: komparepart/kompare_part.cpp:881 #, kde-format @@ -1197,13 +1197,13 @@ msgstr "&გაერთიანებ #: komparepart/komparesaveoptionsbase.ui:73 #, kde-format msgid "&Side-by-side" -msgstr "" +msgstr "&გვერდიგვერდ" #. i18n: ectx: property (text), widget (QLabel, m_ContextLinesLabel) #: komparepart/komparesaveoptionsbase.ui:85 #, kde-format msgid "Number of context lines:" -msgstr "" +msgstr "კონტექსტის ხაზების რაოდენობა:" #. i18n: ectx: property (title), widget (QGroupBox, m_OptionsGB) #: komparepart/komparesaveoptionsbase.ui:126 @@ -1215,55 +1215,55 @@ msgstr "პარამეტრებ #: komparepart/komparesaveoptionsbase.ui:132 #, kde-format msgid "Look for smaller changes" -msgstr "" +msgstr "უფრო პატარა ცვლილებების ძებნა" #. i18n: ectx: property (text), widget (QCheckBox, m_LargeFilesCB) #: komparepart/komparesaveoptionsbase.ui:142 #, kde-format msgid "Optimize for large files" -msgstr "" +msgstr "დიდი ფაილებისთვის ოპტიმიზაცია" #. i18n: ectx: property (text), widget (QCheckBox, m_IgnoreCaseCB) #: komparepart/komparesaveoptionsbase.ui:152 #, kde-format msgid "Ignore changes in case" -msgstr "" +msgstr "რეგისტრის ცვლილებების იგნორი" #. i18n: ectx: property (text), widget (QCheckBox, m_ExpandTabsCB) #: komparepart/komparesaveoptionsbase.ui:159 #, kde-format msgid "Expand tabs to spaces" -msgstr "" +msgstr "ტაბულაციის გამოტოვებებით შეცვლა" #. i18n: ectx: property (text), widget (QCheckBox, m_IgnoreEmptyLinesCB) #: komparepart/komparesaveoptionsbase.ui:166 #, kde-format msgid "Ignore added or removed empty lines" -msgstr "" +msgstr "დამატებული ან წაშლილი ცარიელი ხაზების გამოტოვება" #. i18n: ectx: property (text), widget (QCheckBox, m_IgnoreWhiteSpaceCB) #: komparepart/komparesaveoptionsbase.ui:173 #, kde-format msgid "Ignore changes in whitespace" -msgstr "" +msgstr "გამოტოვებული ადგილების ცვლილების იგნორი" #. i18n: ectx: property (text), widget (QCheckBox, m_FunctionNamesCB) #: komparepart/komparesaveoptionsbase.ui:180 #, kde-format msgid "Show function names" -msgstr "" +msgstr "ფუნქციის სახელების ჩვენება" #. i18n: ectx: property (text), widget (QCheckBox, m_RecursiveCB) #: komparepart/komparesaveoptionsbase.ui:190 #, kde-format msgid "Compare folders recursively" -msgstr "" +msgstr "საქაღალდეების რეკურსიულად შედარება" #. i18n: ectx: property (text), widget (QCheckBox, m_NewFilesCB) #: komparepart/komparesaveoptionsbase.ui:200 #, kde-format msgid "Treat new files as empty" -msgstr "" +msgstr "ახალი ფაილების ცარიელად აღქმა" #. i18n: ectx: property (title), widget (QGroupBox, GroupBox2) #: komparepart/komparesaveoptionsbase.ui:222 @@ -1281,7 +1281,7 @@ msgstr "ბრძანების ხ #: komparepart/komparesaveoptionsbase.ui:256 #, kde-format msgid "cd dir && diff -udHprNa -- source destination" -msgstr "" +msgstr "cd dir && diff -udHprNa -- საწყისი სამიზნე" #~ msgctxt "@window:title" #~ msgid "File Exists" diff -pruN 4:22.12.1-1/po/pt_BR/docs/kompare/index.docbook 4:22.12.3-0ubuntu1/po/pt_BR/docs/kompare/index.docbook --- 4:22.12.1-1/po/pt_BR/docs/kompare/index.docbook 2023-01-02 23:52:17.000000000 +0000 +++ 4:22.12.3-0ubuntu1/po/pt_BR/docs/kompare/index.docbook 2023-02-25 05:10:26.000000000 +0000 @@ -1,8 +1,5 @@ - - ]> @@ -51,17 +48,15 @@ >&FDLNotice; 22/07/2010 +>05/07/2016 &version; +>4.1.3 (Applications 16.04) O &kompare; é um programa &GUI; que permite ver e reunir as diferenças entre os arquivos de código. O &kompare; pode ser usado para comparar as diferenças entre arquivos ou entre o conteúdo de pastas. O &kompare; suporta uma grande variedade de formatos do 'diff' e oferece várias opções para personalizar o nível de informação que é apresentado. -Este documento descreve o &kompare; na versão &version;. @@ -91,7 +86,11 @@ >Quando duas ou mais pessoas estiverem trabalhando em um arquivo e trocam esta arquivo entre si, torna-se difícil saber que modificações foram feitas em cada versão do arquivo. Abrir a cópia nova e o original, lado-a-lado, no aplicativo usado para criá-los, é uma solução possível mas trabalhosa, lenta e sujeita a erros. Esta situação é uma em que é necessário e útil um programa para mostrar as diferenças. Como seria de se esperar, um nome apropriado para um programa destes seria "diff" (diminutivo de diferença em inglês). Normalmente, o programa 'diff' está instalado na maioria dos sistemas baseados em &Linux; e é usado exatamente para este fim. Os programadores usam normalmente o 'diff', como ferramenta da linha de comando, para mostrar as diferenças entre versões de arquivos de código. Contudo, a utilização do 'diff' não está limitada à apresentação das diferenças nos arquivos de código-fonte, podendo ser usada em vários tipos de arquivos baseados em texto. +>Como seria de se esperar, um nome apropriado para um programa destes seria diff (diminutivo de diferença em inglês). Normalmente, o programa diff está instalado na maioria dos sistemas baseados em &Linux; e é usado exatamente para este fim. Os programadores usam normalmente o 'diff', como ferramenta da linha de comando, para mostrar as diferenças entre versões de arquivos de código. Contudo, a utilização do 'diff' não está limitada à apresentação das diferenças nos arquivos de código-fonte, podendo ser usada em vários tipos de arquivos baseados em texto. O uso do 'diff' na linha de comando poderá ser confusa, a aprendizagem da sintaxe e a decodificação do resultado poderão assustar a maioria das pessoas. Aí é onde o &kompare; entra em jogo. Ao oferecer uma interface gráfica para o programa 'diff', o programa mostra os arquivos de origem e destino lado-a-lado, com todas as diferenças realçadas automaticamente. A partir deste ponto, as alterações num arquivo poderão ser aplicadas sequencialmente ao outro, usando uma base seletiva e controlada. Nem todas as alterações precisam de ser aplicadas e, se você não quiser aplicar uma alteração, ela poderá sempre ser 'anulada'. Quando todas as alterações necessárias tiverem sido aplicadas, elas poderão ser gravadas e aparecerão de forma normal, como acontece no aplicativo usado para criar o arquivo. @@ -100,10 +99,16 @@ >Além de mostrar as diferenças entre um arquivo de origem e um de destino, o &kompare; pode ser usado para criar e ver um arquivo especial, chamado arquivo 'diff'. Este arquivo captura as diferenças entre as duas fontes para um único arquivo, que poderá então ser usado para ver e aplicar as alterações a outra cópia qualquer do arquivo. Por exemplo, se duas pessoas estiverem editando um documento, a primeira pessoa quer fazer alterações e enviar apenas essas alterações à segunda pessoa. Normalmente, a primeira pessoa iria enviar uma cópia completa do documento modificado para a segunda pessoa, que teria depois de comparar o documento modificado, lado-a-lado com a versão não-modificada. O processo é muito semelhante ao descrito nos parágrafos anteriores. Com o &kompare;, a primeira pessoa iria fazer uma cópia local do arquivo a ser modificado, faria as alterações e depois iria comparar o original e a cópia modificada. Agora, ao usar o &kompare;, poderá criar um arquivo 'diff' que captura apenas as alterações feitas. Ele poderá ser enviado para a segunda pessoa, em vez de enviar um arquivo inteiro com os dados e as alterações. Usando o &kompare;, a segunda pessoa poderá ver o arquivo 'diff', compará-lo com a cópia local do documento e aplicar as alterações feitas pela primeira pessoa. Assim, o processo poderá funcionar para várias versões do documento, onde cada pessoa faz as alterações, cria os arquivos 'diff', distribui-os e aplica-os. Este processo é conhecido em inglês como "patching", um termo retirado do programa "patch", que é outra ferramenta da linha de comando, desenhada especificamente para aplicar os arquivos do 'diff'. +>Usando o &kompare;, a segunda pessoa poderá ver o arquivo 'diff', compará-lo com a cópia local do documento e aplicar as alterações feitas pela primeira pessoa. Assim, o processo poderá funcionar para várias versões do documento, onde cada pessoa faz as alterações, cria os arquivos 'diff', distribui-os e aplica-os. Este processo é conhecido em inglês como patching, um termo retirado do programa patch, que é outra ferramenta da linha de comando, desenhada especificamente para aplicar os arquivos do 'diff'. Algumas vezes pode ocorrer que existam várias pessoas editando um arquivo ao mesmo tempo. Nesta situação, é provável que as pessoas façam alterações no documento exatamente na mesma linha. Isto gera um problema porque, sem o devido cuidado, as pessoas poderão estar sobrepondo o trabalho das outras, à medida que se aplicam os arquivos de 'diff' que recebem. Felizmente, os programadores dos programas 'diff' e 'patch' levaram isso em conta e, deste modo, estas ferramentas não irão aplicar essas alterações sem alguma intervenção manual. Quando se atinge este estado, isto é referido como um "conflito". O &kompare; irá mostrar os conflitos, de modo que você possa resolvê-los manualmente, decidindo as alterações que deverão ser aplicadas a um determinado arquivo. +>Algumas vezes pode ocorrer que existam várias pessoas editando um arquivo ao mesmo tempo. Nesta situação, é provável que as pessoas façam alterações no documento exatamente na mesma linha. Isto gera um problema porque, sem o devido cuidado, as pessoas poderão estar sobrepondo o trabalho das outras, à medida que se aplicam os arquivos de 'diff' que recebem. Felizmente, os programadores dos programas 'diff' e 'patch' levaram isso em conta e, deste modo, estas ferramentas não irão aplicar essas alterações sem alguma intervenção manual. Quando se atinge este estado, isto é referido como um conflito. O &kompare; irá mostrar os conflitos, de modo que você possa resolvê-los manualmente, decidindo as alterações que deverão ser aplicadas a um determinado arquivo. O &kompare; também é um ótimo programa para comparar as alterações de arquivos ao nível da pasta. Quando for usado para comparar pastas, o &kompare; examina recursivamente as subpastas e o conteúdo dos seus arquivos, à procura de diferenças. Neste caso, cada um dos arquivos em que foram encontradas diferenças é aberto automaticamente e listado pelo &kompare;, onde é possível navegar facilmente pelos vários arquivos. @@ -126,7 +131,7 @@ >Iniciando o &kompare; Um atalho para iniciar o &kompare; poderá ser encontrado no menu K, no grupo de Desenvolvimento, em Um atalho para iniciar o &kompare; poderá ser encontrado no menu de aplicativos, no grupo Desenvolvimento, em Desenvolvimento Acoplagem - +O painel de navegação pode ser destacado da interface principal, clicando para isso no botão O formato de saída unificado é uma variação do formato de contexto. É considerado melhor que o formato de contexto, porque o resultado é mais compacto, uma vez que omite as linhas de contexto redundantes. - + Referência de comandos - + + +Menu Itens + Menu Arquivo @@ -1319,6 +1315,25 @@ F5 ArquivoAtualizar diferenças +Atualiza a diferença dos caminhos originais. Útil quando você aplicou algumas alterações, salvou-as e deseja ver o que falta. + + + +Arquivo. - + - + - + O menu Diferenças @@ -1537,112 +1552,113 @@ > + + + + +Os menus Configurações e Ajuda +O &kompare; possui os itens dos menus Configurações e Ajuda, comuns do &kde;. Para mais informações, consulte as seções sobre o Menu Configurações e o Menu Ajuda dos Fundamentos do &kde;. + - + O menu Configurações +>Opções da linha de comando + ConfiguraçõesMostrar a Barra de Ferramentas -Ativa ou desativa a visibilidade da barra de ferramentas. - - -ConfiguraçõesMostrar Barra de Estado +>-c Ativa ou desativa a visibilidade da barra de estado.Isto irá comparar URL1 com URL2. + ConfiguraçõesMostrar a Área de Textokompare Mostra a Área de Texto.Isto abrirá URL1 e esperará ser a saída do diff. A URL1 pode também ser um '-' e então ele lerá da entrada padrão. Pode ser usado por exemplo para cvs diff | kompare -o -. O Kompare fará uma verificação para ver se ele pode encontrar os arquivos originais e então misturá-los na saída do diff e mostrar isto num visualizador. A opção desabilita a verificação. + ConfiguraçõesConfigurar atalhos...kompare Mostra a janela para Configurar os Atalhos.Isto mesclará URL2 na URL1, URL2 é esperado ser a saída do diff e URL1 o arquivo ou pasta que a saída do diff precisa estar para mesclar nele. + ConfiguraçõesConfigurar barras de ferramentas...kompare Mostra a janela para Configurar a Barra de Ferramentas.Desabilita a verificação para busca automática dos arquivos originalis quando usar '-' como URL com a opção . + ConfiguraçõesConfigurar o &kompare;...kompare codificação Mostra a janela de Preferências do &kompare;.Use isto para especificar a codificação ao chamá-lo da linha de comando. Seu padrão é a codificação local se não especificado. + - - -O menu Ajuda -&help.menu.documentation; - + @@ -1665,26 +1681,7 @@ >Tradução de Marcus Gama marcus.gama@gmail.com -&underFDL; &underGPL; - - -Instalação - - -Como obter o &kompare; -&install.intro.documentation; - - - -Compilação e instalação -&install.compile.documentation; - - - +> &underFDL; &underGPL; &documentation.index; diff -pruN 4:22.12.1-1/po/ru/kompare.po 4:22.12.3-0ubuntu1/po/ru/kompare.po --- 4:22.12.1-1/po/ru/kompare.po 2023-01-02 23:52:17.000000000 +0000 +++ 4:22.12.3-0ubuntu1/po/ru/kompare.po 2023-02-25 05:10:26.000000000 +0000 @@ -6,20 +6,20 @@ # Alexander Potashev , 2010, 2015. # Julia Dronova , 2012. # Yuri Efremov , 2013. -# Alexander Yavorsky , 2020. +# Alexander Yavorsky , 2020, 2023. msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2022-10-20 00:54+0000\n" -"PO-Revision-Date: 2020-06-14 13:28+0300\n" +"PO-Revision-Date: 2023-02-19 17:03+0300\n" "Last-Translator: Alexander Yavorsky \n" "Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 20.04.2\n" +"X-Generator: Lokalize 21.08.3\n" "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Environment: kde\n" @@ -37,10 +37,9 @@ msgid "Your emails" msgstr "wizardkde@yandex.ru,sergo@bk.ru,translation-team@basealt.ru" #: app/kompare_shell.cpp:69 -#, fuzzy, kde-format -#| msgid "Could not load our KompareViewPart." +#, kde-format msgid "Could not load our KompareViewPart: %1" -msgstr "Не удаётся загрузить компонент KompareViewPart." +msgstr "Ошибка загрузки компонента KompareViewPart: %1" #: app/kompare_shell.cpp:73 #, kde-format @@ -49,10 +48,9 @@ msgid "Navigation" msgstr "Навигация" #: app/kompare_shell.cpp:91 -#, fuzzy, kde-format -#| msgid "Could not load our KompareNavigationPart." +#, kde-format msgid "Could not load our KompareNavigationPart: %1" -msgstr "Не удаётся загрузить компонент KompareNavigationPart." +msgstr "Ошибка загрузки компонента KompareNavigationPart: %1" #: app/kompare_shell.cpp:196 #, kde-format diff -pruN 4:22.12.1-1/po/tr/kompare.po 4:22.12.3-0ubuntu1/po/tr/kompare.po --- 4:22.12.1-1/po/tr/kompare.po 2023-01-02 23:52:17.000000000 +0000 +++ 4:22.12.3-0ubuntu1/po/tr/kompare.po 2023-02-25 05:10:26.000000000 +0000 @@ -6,13 +6,13 @@ # H. İbrahim Güngör , 2011. # obsoleteman , 2008-2009,2012. # Volkan Gezer , 2013, 2015, 2017. -# Emir SARI , 2022. +# Emir SARI , 2022, 2023. msgid "" msgstr "" "Project-Id-Version: kdesdk-kde4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2022-10-20 00:54+0000\n" -"PO-Revision-Date: 2022-12-17 18:59+0300\n" +"PO-Revision-Date: 2023-01-26 21:44+0300\n" "Last-Translator: Emir SARI \n" "Language-Team: Turkish \n" "Language: tr\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 22.12.0\n" +"X-Generator: Lokalize 22.12.1\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -558,7 +558,7 @@ msgstr "" #, kde-format msgctxt "@option:check" msgid "&Ignore changes in case" -msgstr "Büyük/küçük harfi &yok say" +msgstr "BÜYÜK/küçük harf değişikliklerini &yok say" #: dialogpages/diffpage.cpp:253 #, kde-format @@ -574,8 +574,9 @@ msgid "" "difference when something in one file is changed into SoMEthing in the other " "file." msgstr "" -"Bu seçenek ile durumdaki değişikliklerin yok sayılması etkinleştirilir, bir " -"dosyanın başka bir dosyadaki değişikliğini göstermeyecektir." +"Bu seçenek ile BÜYÜK/küçük harf değişikliklerin yok sayılması " +"etkinleştirilir, bir dosyanın başka bir dosyadaki değişikliğini " +"göstermeyecektir." #: dialogpages/diffpage.cpp:262 #, kde-format @@ -1310,13 +1311,13 @@ msgstr "Küçük değişklikleri ara" #: komparepart/komparesaveoptionsbase.ui:142 #, kde-format msgid "Optimize for large files" -msgstr "Büyük dosyaları iyileştir" +msgstr "Büyük dosyaları eniyile" #. i18n: ectx: property (text), widget (QCheckBox, m_IgnoreCaseCB) #: komparepart/komparesaveoptionsbase.ui:152 #, kde-format msgid "Ignore changes in case" -msgstr "Büyük/küçük harf değişikliklerini görmezden gel" +msgstr "BÜYÜK/küçük harf değişikliklerini yok say" #. i18n: ectx: property (text), widget (QCheckBox, m_ExpandTabsCB) #: komparepart/komparesaveoptionsbase.ui:159 @@ -1328,13 +1329,13 @@ msgstr "Sekmeleri boşluğa çevir" #: komparepart/komparesaveoptionsbase.ui:166 #, kde-format msgid "Ignore added or removed empty lines" -msgstr "Yeni ve silinmiş boş satırları görmezden gel" +msgstr "Eklenen veya kaldırılan boş satırları yok say" #. i18n: ectx: property (text), widget (QCheckBox, m_IgnoreWhiteSpaceCB) #: komparepart/komparesaveoptionsbase.ui:173 #, kde-format msgid "Ignore changes in whitespace" -msgstr "Boş satır değişikliklerini görmezden gel" +msgstr "Boşluk değişikliklerini yok say" #. i18n: ectx: property (text), widget (QCheckBox, m_FunctionNamesCB) #: komparepart/komparesaveoptionsbase.ui:180 @@ -1358,7 +1359,7 @@ msgstr "Yeni dosyalara boş gibi davran" #: komparepart/komparesaveoptionsbase.ui:222 #, kde-format msgid "Run Diff In" -msgstr "Diff çalıştır" +msgstr "Diff'i Şurada Çalıştır" #. i18n: ectx: property (title), widget (QGroupBox, m_CommandLineGB) #: komparepart/komparesaveoptionsbase.ui:247 diff -pruN 4:22.12.1-1/po/zh_CN/kompare.po 4:22.12.3-0ubuntu1/po/zh_CN/kompare.po --- 4:22.12.1-1/po/zh_CN/kompare.po 2023-01-02 23:52:17.000000000 +0000 +++ 4:22.12.3-0ubuntu1/po/zh_CN/kompare.po 2023-02-25 05:10:26.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2022-10-20 00:54+0000\n" -"PO-Revision-Date: 2022-12-24 11:45\n" +"PO-Revision-Date: 2023-02-24 12:59\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -pruN 4:22.12.1-1/src/app/org.kde.kompare.appdata.xml 4:22.12.3-0ubuntu1/src/app/org.kde.kompare.appdata.xml --- 4:22.12.1-1/src/app/org.kde.kompare.appdata.xml 2023-01-02 23:52:17.000000000 +0000 +++ 4:22.12.3-0ubuntu1/src/app/org.kde.kompare.appdata.xml 2023-02-25 05:10:26.000000000 +0000 @@ -5,6 +5,7 @@ GPL-2.0+ Kompare قارن + Kompare Kompare Kompare Kompare @@ -42,6 +43,7 @@ Kompare Diff/Patch Frontend برنامج الفروق والرقع + Интерфейс за Diff/Patch Frontal del «diff»/«patch» Frontal de «diff»/«patch» Rozhraní pro Diff/Patch @@ -81,6 +83,7 @@ Kompare is a GUI front-end program that enables differences between source files to be viewed and merged. It can be used to compare differences on files or the contents of folders, and it supports a variety of diff formats and provide many options to customize the information level displayed.

قارن هو برنامج رسومي يمكّن من عرض ودمج الاختلافات بين ملفات المصدر. يمكن استخدامه لمقارنة الاختلافات في الملفات أو محتويات المجلدات ، وهو يدعم مجموعة متنوعة من تنسيقات الاختلافات ويوفر العديد من الخيارات لتخصيص مستوى المعلومات المعروض.

+

Kompare е графична програма, позволяваща да се преглеждат и обединяват разликите между изходните файлове. Тя може да се използва за сравняване на разлики във файлове или в съдържанието на папки, като поддържа различни формати на разлики и предоставя много опции за персонализиране на нивото на показваната информация.

El Kompare és un programa de frontal amb IGU que cerca les diferències entre fitxers de codi font perquè es puguin veure o fusionar. Es pot emprar per a comparar diferències entre fitxers o en el contingut de carpetes. També admet una varietat de formats de «diff» i proporciona moltes opcions per a personalitzar el nivell de la informació mostrada.

Kompare és un programa de frontal amb IGU que busca les diferències entre fitxers de codi font perquè es puguen veure o fusionar. Es pot emprar per a comparar diferències entre fitxers o en el contingut de carpetes. També admet una varietat de formats de «diff» i proporciona moltes opcions per a personalitzar el nivell de la informació mostrada.

Kompare ist ein Programm mit grafischer Bedienungsoberfläche, um Abweichungen zwischen Textdateien zu betrachten und sie zusammenzuführen Kompare kann Abweichungen zwischen einzelnen Dateien oder zwischen Ordnern und deren Inhalt anzeigen. unterstützt eine Vielzahl an Diff-Formaten und bietet viele Einstellungsmöglichkeiten für die Anzeige der Abweichungen.

@@ -115,6 +118,7 @@

Kompare 是一個 GUI 後端程序，允許檢視與合併與原始檔案的差異性。它可以用來比較檔案或資料夾的檔案的差異，且它支援多個差異格式並提供許多選項來自訂資訊顯示的等級。

Features:

الميزات:

+

Възможности:

Característiques:

Característiques:

Vlastnosti:

@@ -152,6 +156,7 @@
  • Comparing differences on files or the contents of folders recursively.
  • مقارنة الاختلافات في الملفات أو محتويات المجلدات تكراريًا.
    • +
  • Рекурсивно сравняване на разликите във файловете или съдържанието на папките.
  • Compara recursivament les diferències en els fitxers o en el contingut de les carpetes.
  • Compara recursivament les diferències en els fitxers o en el contingut de les carpetes.
  • Vergleich des Unterschieds von Dateien oder rekursiven Ordnerinhalten.
    • @@ -165,6 +170,7 @@
  • Comparación de diferenzas entre ficheiros ou cartafoles.
  • Membandingkan perbedaan pada file atau konten folder secara saksama
  • Confronta ricorsivamente le differenze di file o di contenuti di cartelle.
    • +
  • ფაილების ან საქაღალდეების შემცველობის რეკურსიული შედარება.
  • 재귀적으로 파일과 폴더의 차이점을 비교합니다.
  • Verschillen in bestanden of de inhoud van mappen recursief vergelijken.
  • Samanlikning av fil- eller mappeinnhald (rekursivt).
    • @@ -186,6 +192,7 @@
  • 遞迴比較檔案或資料夾內檔案的差異
  • Supports a variety of diff formats and provides many options to customize the information level displayed.
  • يدعم مجموعة متنوعة من التنسيقات المختلفة ويوفر العديد من الخيارات لتخصيص مستوى المعلومات المعروض.
    • +
  • Поддържа различни формати на разлики и предоставя много опции за персонализиране на нивото на показваната информация.
  • Permet una varietat de formats de «diff» i proporciona moltes opcions per a personalitzar el nivell de la informació mostrada.
  • Permet una varietat de formats de «diff» i proporciona moltes opcions per a personalitzar el nivell de la informació mostrada.
  • Unterstützt eine Vielzahl an Diff-Formaten und bietet viele Einstellungsmöglichkeiten für die Anzeige der Abweichungen.
    • @@ -199,6 +206,7 @@
  • É compatíbel con varios formatos de diferenzas e fornece moitas opcións para personalizar o nivel de información que se mostra.
  • Dukungan bermacam format diff dan menyediakan banyak opsi untuk mengkustomisasi tingkat informasi yang didisplaikan.
  • 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 detalj­nivået på informasjonen som vert vist.
    • @@ -220,6 +228,7 @@
  • 支援各種的差異格式、並提供許多的選項以自訂訊息等級顯示。
  • Creating and applying patches.
  • إنشاء الرقع وتطبيقها.
    • +
  • Създаване и прилагане на кръпки.
  • Creació i aplicació de pedaços.
  • Creació i aplicació de pedaços.
  • Patches erstellen und anwenden.
    • @@ -274,9 +283,9 @@ Development + + - - diff -pruN 4:22.12.1-1/src/komparepart/komparepart.desktop.in 4:22.12.3-0ubuntu1/src/komparepart/komparepart.desktop.in --- 4:22.12.1-1/src/komparepart/komparepart.desktop.in 2023-01-02 23:52:17.000000000 +0000 +++ 4:22.12.3-0ubuntu1/src/komparepart/komparepart.desktop.in 2023-02-25 05:10:26.000000000 +0000 @@ -1,17 +1,23 @@ [Desktop Entry] Comment=A part to graphically show the difference between 2 files +Comment[bg]=Част за графично показване на разликата между 2 файла Comment[ca]=Una part per a mostrar gràficament les diferències entre 2 fitxers Comment[ca@valencia]=Una part per a mostrar gràficament les diferències entre 2 fitxers +Comment[cs]=Nástroj pro grafické zobrazení rozdílů mezi dvěma soubory Comment[de]=Eine Komponente zur Darstellung von Unterschieden zwischen zwei Dateien +Comment[el]=Ένα τμήμα για τη γραφική απεικόνιση των διαφορών ανάμεσα σε 2 αρχεία Comment[en_GB]=A part to graphically show the difference between 2 files Comment[es]=Un componente para mostrar gráficamente las diferencias entre dos archivos Comment[eu]=2 fitxategiren arteko diferentzia grafikoki erakusteko atal bat Comment[fr]=Un composant permettant l'affichage graphique des différences entre 2 fichiers Comment[it]=Un componente per mostrare graficamente le differenze tra due file +Comment[ka]=ნაწილი, რომელიც ორ ფაილს შორის განსხვავებებს გრაფიკულად გაჩვენებთ Comment[nl]=Een onderdeel om grafisch het verschil tussen 2 bestanden te tonen +Comment[nn]=Ein del for grafisk vising av forskjellar mellom to filer Comment[pl]=Człon do graficznego pokazania różnicy pomiędzy dwoma plikami Comment[pt]=Uma componente para mostrar de forma gráfica a diferença entre 2 ficheiros Comment[pt_BR]=Um KPart para mostrar graficamente a diferença entre 2 arquivos +Comment[ru]=Компонент для графического сравнения различий между двумя файлами Comment[sl]=Del, ki grafično prikazuje razlike med 2 datotekama Comment[sv]=Ett delprogram för att visa skillnaden mellan två filer grafiskt Comment[ta]=இரண்டு கோப்புகளுக்கு இடையேயான வித்தியாசங்களைக் காட்டும் கூறு diff -pruN 4:22.12.1-1/src/servicemenus/kompare.desktop 4:22.12.3-0ubuntu1/src/servicemenus/kompare.desktop --- 4:22.12.1-1/src/servicemenus/kompare.desktop 2023-01-02 23:52:17.000000000 +0000 +++ 4:22.12.3-0ubuntu1/src/servicemenus/kompare.desktop 2023-02-25 05:10:26.000000000 +0000 @@ -7,6 +7,7 @@ X-KDE-RequiredNumberOfUrls=2 [Desktop Action kompare] Name=Compare Files Name[ar]=قارن الملفات +Name[bg]=Сравняване на файлове Name[ca]=Compara fitxers Name[ca@valencia]=Compara fitxers Name[cs]=Porovnat soubory