Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kompare for openSUSE:Factory checked in at 2022-11-04 17:33:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kompare (Old) and /work/SRC/openSUSE:Factory/.kompare.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kompare" Fri Nov 4 17:33:06 2022 rev:118 rq:1033319 version:22.08.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kompare/kompare.changes 2022-10-15 16:34:57.573793259 +0200 +++ /work/SRC/openSUSE:Factory/.kompare.new.2275/kompare.changes 2022-11-04 17:34:32.780681063 +0100 @@ -1,0 +2,8 @@ +Tue Nov 1 11:20:55 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 22.08.3 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/gear/22.08.3/ + +------------------------------------------------------------------- Old: ---- kompare-22.08.2.tar.xz kompare-22.08.2.tar.xz.sig New: ---- kompare-22.08.3.tar.xz kompare-22.08.3.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kompare.spec ++++++ --- /var/tmp/diff_new_pack.Dx2eGu/_old 2022-11-04 17:34:33.440684477 +0100 +++ /var/tmp/diff_new_pack.Dx2eGu/_new 2022-11-04 17:34:33.444684498 +0100 @@ -20,7 +20,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without released Name: kompare -Version: 22.08.2 +Version: 22.08.3 Release: 0 Summary: File Comparator License: GPL-2.0-only AND GFDL-1.2-only ++++++ kompare-22.08.2.tar.xz -> kompare-22.08.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-22.08.2/CMakeLists.txt new/kompare-22.08.3/CMakeLists.txt --- old/kompare-22.08.2/CMakeLists.txt 2022-10-10 22:22:40.000000000 +0200 +++ new/kompare-22.08.3/CMakeLists.txt 2022-10-30 22:21:51.000000000 +0100 @@ -3,7 +3,7 @@ # Release Service version, managed by release script set (RELEASE_SERVICE_VERSION_MAJOR "22") set (RELEASE_SERVICE_VERSION_MINOR "08") -set (RELEASE_SERVICE_VERSION_MICRO "2") +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-22.08.2/po/es/kompare.po new/kompare-22.08.3/po/es/kompare.po --- old/kompare-22.08.2/po/es/kompare.po 2022-10-11 06:58:07.000000000 +0200 +++ new/kompare-22.08.3/po/es/kompare.po 2022-11-01 01:11:32.000000000 +0100 @@ -3,21 +3,21 @@ # # Miguel Revilla Rodr??guez <y...@miguelrevilla.com>, 2002,2003. # Pablo de Vicente <p.device...@wanadoo.es>, 2005. -# Eloy Cuadra <ecua...@eloihr.net>, 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017, 2020. +# Eloy Cuadra <ecua...@eloihr.net>, 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017, 2020, 2022. # Javier Vi??al <fjvi...@gmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2021-05-17 00:26+0000\n" -"PO-Revision-Date: 2020-05-04 12:18+0200\n" +"PO-Revision-Date: 2022-10-14 21:39+0200\n" "Last-Translator: Eloy Cuadra <ecua...@eloihr.net>\n" "Language-Team: Spanish <kde-l10n...@kde.org>\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 20.04.0\n" +"X-Generator: Lokalize 22.08.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #, kde-format @@ -1045,7 +1045,7 @@ #: komparepart/kompare_part.cpp:305 komparepart/kompare_part.cpp:318 #, kde-format msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" -msgstr "<qt>La URL <b>%1</b> no se pudo descargar.</qt>" +msgstr "<qt>La URL <b>%1</b> no se ha podido descargar.</qt>" #: komparepart/kompare_part.cpp:356 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-22.08.2/po/eu/kompare.po new/kompare-22.08.3/po/eu/kompare.po --- old/kompare-22.08.2/po/eu/kompare.po 2022-10-11 06:58:07.000000000 +0200 +++ new/kompare-22.08.3/po/eu/kompare.po 2022-11-01 01:11:32.000000000 +0100 @@ -1,6 +1,6 @@ # Translation for kompare.po to Euskara/Basque (eu). # Copyright (C) 2003, 2005, 2009 Free Software Foundation, Inc. -# Copyright (C) 2010-2021, This file is copyright: +# Copyright (C) 2010-2022, This file is copyright: # This file is distributed under the same license as the kompare package. # KDE euskaratzeko proiektuko arduraduna <xa...@ni.eus> # @@ -8,20 +8,20 @@ # Marcos <mar...@euskalgnu.org>, 2003, 2005. # Ion Gazta??aga <ion_...@hotmail.com>, 2005. # Ion Gazta??aga <igaztan...@gmail.com>, 2005. -# I??igo Salvador Azurmendi <xa...@euskalnet.net>, 2009, 2011, 2021. +# I??igo Salvador Azurmendi <xa...@euskalnet.net>, 2009, 2011, 2021, 2022. msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2021-05-17 00:26+0000\n" -"PO-Revision-Date: 2021-08-05 19:18+0200\n" +"PO-Revision-Date: 2022-10-16 08:45+0200\n" "Last-Translator: I??igo Salvador Azurmendi <xa...@ni.eus>\n" "Language-Team: Basque <kde-i18n...@kde.org>\n" "Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 21.04.3\n" +"X-Generator: Lokalize 22.08.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #, kde-format @@ -63,11 +63,10 @@ msgstr "&Konparatu fitxategiak..." #: app/kompare_shell.cpp:201 -#, fuzzy, kde-format -#| msgid "&Blend URL with Diff..." +#, kde-format msgctxt "@action" msgid "&Blend URL with Diff..." -msgstr "&Fusionatu URL-a diff-arekin..." +msgstr "&Fusionatu URLa ??Diff??arekin..." #: app/kompare_shell.cpp:207 #, kde-format @@ -114,11 +113,10 @@ msgstr[1] "%1 desberdintasun " #: app/kompare_shell.cpp:327 -#, fuzzy, kde-format -#| msgid "Blend File/Folder with diff Output" +#, kde-format msgctxt "@title:window" msgid "Blend File/Folder with diff Output" -msgstr "Fusionatu fitxategia/direktorioa konparaketa irteerarekin" +msgstr "Fusionatu fitxategia/karpeta ??diff?? irteerakoarekin" #: app/kompare_shell.cpp:328 #, kde-format @@ -133,27 +131,19 @@ msgstr "??Diff??en irteerakoa" #: app/kompare_shell.cpp:332 -#, fuzzy, kde-format -#| msgid "Blend" +#, kde-format msgctxt "@action:button" msgid "Blend" msgstr "Fusionatu" #: app/kompare_shell.cpp:333 -#, fuzzy, kde-format -#| msgid "Blend this file or folder with the diff output" +#, kde-format msgctxt "@info:tooltip" msgid "Blend this file or folder with the diff output" -msgstr "Fusionatu fitxategi edo direktorio hau konparaketaren irteerarekin" +msgstr "Fusionatu fitxategi edo karpeta hau ??diff?? irteerakoarekin" #: app/kompare_shell.cpp:334 -#, fuzzy, kde-format -#| msgid "" -#| "If you have entered a file or folder name and a file that contains diff " -#| "output in the fields in this dialog then this button will be enabled and " -#| "pressing it will open kompare's main view where the output of the entered " -#| "file or files from the folder are mixed with the diff output so you can " -#| "then apply the difference(s) to a file or to the files. " +#, kde-format msgctxt "@infor:whatsthis" msgid "" "If you have entered a file or folder name and a file that contains diff " @@ -162,11 +152,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 "" -"Fitxategi edo direktorio izen bat eta konparaketa irteera duen fitxategi bat " +"Fitxategi edo karpeta izen bat eta konparaketa irteera duen fitxategi bat " "sartu baduzu, botoi hau gaitu egingo da eta hau sakatzean Konpare abiatuko " -"da ikuspegi nagusian. Bertan sartutako fitxategi edo direktorioko " -"fitxategiak konparaketa irteerarekin nahastuko dira. Horrela, " -"desberdintasunak fitxategi edo fitxategiei aplika diezazkiekezu." +"da ikuspegi nagusian. Bertan sartutako fitxategi edo karpetako fitxategiak " +"konparaketa irteerarekin nahastuko dira. Horrela, desberdintasunak fitxategi " +"edo fitxategiei aplika diezazkiekezu." #: app/kompare_shell.cpp:357 app/main.cpp:198 #, kde-format @@ -181,11 +171,10 @@ msgstr "Sorburua" #: app/kompare_shell.cpp:359 app/main.cpp:200 -#, fuzzy, kde-format -#| msgid "Destination" +#, kde-format msgctxt "@title:group" msgid "Destination" -msgstr "Helburua" +msgstr "Norakoa" #: app/kompare_shell.cpp:362 app/main.cpp:203 #, kde-format @@ -200,20 +189,16 @@ msgstr "Konparatu fitxategi edo karpeta hauek" #: app/kompare_shell.cpp:364 app/main.cpp:205 -#, fuzzy, kde-format -#| msgid "" -#| "If you have entered 2 filenames or 2 folders in the fields in this dialog " -#| "then this button will be enabled and pressing it will start a comparison " -#| "of the entered files or folders. " +#, kde-format msgctxt "@info:whatsthis" msgid "" "If you have entered 2 filenames or 2 folders in the fields in this dialog " "then this button will be enabled and pressing it will start a comparison of " "the entered files or folders. " msgstr "" -"2 fitxategi-izen edo 2 direktorio sartu badituzu elkarrizkea-koadro honetan, " -"botoi hau gaituko egingo da eta sakatzean sartutako fitxategi edo " -"direktorioen arteko konparaketa hasiko da." +"Elkarrizkea-koadro honetan 2 fitxategi-izen edo 2 karpeta sartu badituzu, " +"botoi hau gaituko da eta hura sakatzean sartutako fitxategi edo karpeten " +"arteko konparaketa hasiko da." #: app/kompare_shell.cpp:398 #, kde-format @@ -397,8 +382,7 @@ "the file or folder that the diffoutput needs to be blended into. " msgstr "" "Honek URL2 URL1-ean fusionatuko du URL2 konparaketa irteera izatea eta URL1 " -"konparaketa irteera fusionatuko den fitxategi edo direktorioa izatea espero " -"da. " +"konparaketa irteera fusionatuko den fitxategi edo karpeta izatea espero da. " #: app/main.cpp:72 #, kde-format @@ -436,20 +420,16 @@ "Honela, bertsio hura hauta dezakezu." #: dialogpages/diffpage.cpp:196 -#, fuzzy, 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 this format the best so use it for sending patches." +#, kde-format msgctxt "@info:whatsthis" msgid "" "Select the format of the output generated by diff. Unified is the one that " "is used most frequently because it is very readable. The KDE developers like " "this format the best so use it for sending patches." msgstr "" -"Hautatu diff programak sortuko duen irteeraren formatua. Bateratua, gehien " -"erabiltzen den formatua da, oso irakurterreza delako. KDE garatzaileek " -"formatu hau dute gustoko adabakiak bidaltzeko garaian." +"Hautatu ??diff??ek sortuko duen irteerakoaren formatua. Bateratua da gehien " +"erabiltzen den formatua, oso irakurterraza delako. KDE garatzaileek formatu " +"hau dute gustukoen, beraz adabakiak bidaltzeko erabiltzen dute." #: dialogpages/diffpage.cpp:199 #, kde-format @@ -476,34 +456,28 @@ msgstr "Bateratua" #: dialogpages/diffpage.cpp:215 -#, fuzzy, kde-format -#| msgid "Lines of Context" +#, kde-format msgctxt "@title:group" msgid "Lines of Context" -msgstr "Testuinguru lerroak" +msgstr "Testuinguru-lerroak" #: dialogpages/diffpage.cpp:216 dialogpages/diffpage.cpp:221 -#, fuzzy, kde-format -#| 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." +#, 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 "" -"Normalean, testuinguru kopuru 2 edo 3 izan ohi da. Honek konparaketa " -"irakurgarria egiten du eta kasu gehienetan aplika daiteke. 3 lerro baina " -"gehiago hautatzen bada, konparaketa gehiegi handituko litzateke." +"Testuinguru-lerro kopurua, normalean, 2 edo 3koa izan ohi da. Horrek, " +"konparaketa irakurgarria eta aplikagarria egiten du kasurik gehienetan. 3 " +"lerro baino gehiagok konparaketa behar baino gehiago puztuko luke." #: dialogpages/diffpage.cpp:220 -#, fuzzy, kde-format -#| msgid "Number of context lines:" +#, kde-format msgctxt "@label:spinbox" msgid "Number of context lines:" -msgstr "Testuinguru lerro kopurua:" +msgstr "Testuinguru-lerro kopurua:" #: dialogpages/diffpage.cpp:225 #, kde-format @@ -518,26 +492,19 @@ msgstr "Orokorra" #: dialogpages/diffpage.cpp:239 -#, fuzzy, kde-format -#| msgid "&Treat new files as empty" +#, kde-format msgctxt "@option:check" msgid "&Treat new files as empty" -msgstr "&Tratatu fitxategi berriak huts bezala" +msgstr "&Tratatu fitxategi berriak hutsik baleude gisa" #: dialogpages/diffpage.cpp:240 -#, fuzzy, kde-format -#| msgid "This option corresponds to the -N diff option." +#, kde-format msgctxt "@info:tooltip" msgid "This option corresponds to the -N diff option." msgstr "Aukera hau -N diff aukerari dagokio." #: dialogpages/diffpage.cpp:241 -#, fuzzy, kde-format -#| msgid "" -#| "With this option enabled diff will treat a file that only exists in one " -#| "of the directories as empty in the other directory. This means that the " -#| "file is compared with an empty file and because of this will appear as " -#| "one big insertion or deletion." +#, kde-format msgctxt "@info:whatsthis" msgid "" "With this option enabled diff will treat a file that only exists in one of " @@ -545,134 +512,110 @@ "compared with an empty file and because of this will appear as one big " "insertion or deletion." msgstr "" -"Aukera hau gaituta diff-ek direktorioetako bakarrean existitzen den " +"Aukera hau gaituta ??diff??ek direktorioetako bakarrean existitzen den " "fitxategi bat beste direktorioan huts bezala tratatuko du. Honek esan nahi " "du fitxategia fitxategi huts batekin alderatuko duela eta horregatik " "txertatutako edo ezabatutako handi bat bezala azalduko da." #: dialogpages/diffpage.cpp:244 -#, fuzzy, kde-format -#| msgid "&Look for smaller changes" +#, kde-format msgctxt "@option:check" msgid "&Look for smaller changes" -msgstr "&Bilatu aldaketa txikiak" +msgstr "Bi&latu aldaketa txikiagoak" #: dialogpages/diffpage.cpp:245 -#, fuzzy, kde-format -#| msgid "This corresponds to the -d diff option." +#, kde-format msgctxt "@info:tooltip" msgid "This corresponds to the -d diff option." -msgstr "Hau -d konparaketa aukerari dagokio." +msgstr "Hau -d diff aukerari dagokio." #: dialogpages/diffpage.cpp:246 -#, fuzzy, kde-format -#| msgid "" -#| "With this option enabled diff will try a little harder (at the cost of " -#| "more memory) to find fewer changes." +#, kde-format msgctxt "@info:whatsthis" msgid "" "With this option enabled diff will try a little harder (at the cost of more " "memory) to find fewer changes." msgstr "" -"Haukera hau gaituta diff gogorrago saiatuko da (memoria gehiagoren kostuan) " -"aldaketa gutxiago aurkitzeko." +"Aukera hau gaituta, ??diff?? gogorrago saiatuko da (memoria gehiago " +"erabiltzearen kostuarekin) aldaketa gutxiago aurkitzeko." #: dialogpages/diffpage.cpp:248 -#, fuzzy, kde-format -#| msgid "O&ptimize for large files" +#, kde-format msgctxt "@option:check" msgid "O&ptimize for large files" -msgstr "O&ptimizatu fitxategi handientzat" +msgstr "O&ptimizatu fitxategi handietarako" #: dialogpages/diffpage.cpp:249 -#, fuzzy, kde-format -#| msgid "This corresponds to the -H diff option." +#, kde-format msgctxt "@info:tooltip" msgid "This corresponds to the -H diff option." -msgstr "Hau -H konparaketa aukerari dagokio." +msgstr "Hau -H diff aukerari dagokio." #: dialogpages/diffpage.cpp:250 -#, fuzzy, kde-format -#| msgid "" -#| "This option lets diff makes better diffs when using large files. The " -#| "definition of large is nowhere to be found though." +#, kde-format msgctxt "@info:whatsthis" msgid "" "This option lets diff makes better diffs when using large files. The " "definition of large is nowhere to be found though." msgstr "" -"Haukera honek diff-eri diff hobeak egiteko aukera eskaintzen dio fitxategi " -"handiak erabiltzerakoan. Handiaren definizioa inon aurkituko ez den arren." +"Fitxategi handiak erabiltzean, aukera honek, ??diff??eri konparaketa hobeak " +"egiten uzten dio. Handiaren definizioa ez dago inon ordea." #: dialogpages/diffpage.cpp:252 -#, fuzzy, kde-format -#| msgid "&Ignore changes in case" +#, kde-format msgctxt "@option:check" msgid "&Ignore changes in case" -msgstr "Ez &ikusi aldaketak maiuskula/minuskuletan" +msgstr "Ez&ikusi maius./minus. aldaketak" #: dialogpages/diffpage.cpp:253 -#, fuzzy, kde-format -#| msgid "This corresponds to the -i diff option." +#, kde-format msgctxt "@info:tooltip" msgid "This corresponds to the -i diff option." -msgstr "Hau -i konparaketa aukerari dagokio." +msgstr "Hau -i diff aukerari dagokio." #: dialogpages/diffpage.cpp:254 -#, fuzzy, kde-format -#| msgid "" -#| "With this option to ignore changes in case enabled, diff will not " -#| "indicate a difference when something in one file is changed into " -#| "SoMEthing in the other file." +#, kde-format msgctxt "@info:whatsthis" msgid "" "With this option to ignore changes in case enabled, diff will not indicate a " "difference when something in one file is changed into SoMEthing in the other " "file." msgstr "" -"Maius/minus aldaketak baztertzeko aukera hau gaituta, diff-ek ez du " +"Maius/minus aldaketak ezikusteko aukera hau gaituta, ??diff??ek ez du " "adieraziko aldaketa bat fitxategi bateko zerbait beste fitxategiko ZeRBait-" "era aldatzen denean." #: dialogpages/diffpage.cpp:262 -#, fuzzy, kde-format -#| msgid "Ignore regexp:" +#, kde-format msgctxt "@option:check" msgid "Ignore regexp:" -msgstr "Ez ikusi regexp:" +msgstr "Ezikusi adierazpen erregularra:" #: dialogpages/diffpage.cpp:263 -#, fuzzy, kde-format -#| msgid "This option corresponds to the -I diff option." +#, kde-format msgctxt "@info:tooltip" msgid "This option corresponds to the -I diff option." -msgstr "Aukera hau -l konparaketa aukerari dagokio." +msgstr "Aukera hau -l diff aukerari dagokio." #: dialogpages/diffpage.cpp:264 -#, fuzzy, kde-format -#| msgid "" -#| "When this checkbox is enabled, an option to diff is given that will make " -#| "diff ignore lines that match the regular expression." +#, kde-format msgctxt "@info:whatsthis" msgid "" "When this checkbox is enabled, an option to diff is given that will make " "diff ignore lines that match the regular expression." msgstr "" -"Egiaztapen-lauki hau gaituta dagoenean, diff-eri aukera bat pasatuko zaio " -"adierazpen erregularraren lerro parekideak baztertzera eramango duena." +"Egiaztapen-lauki hau gaituta dagoenean, ??diff??eri aukera bat pasatzen zaio, " +"adierazpen erregularrarekin bat datozen lerroak ezikustera eramango duena." #: dialogpages/diffpage.cpp:268 -#, fuzzy, kde-format -#| msgid "" -#| "Add the regular expression here that you want to use\n" -#| "to ignore lines that match it." +#, kde-format msgctxt "@info:tooltip" msgid "" "Add the regular expression here that you want to use\n" "to ignore lines that match it." msgstr "" -"Gehitu erabili bat datozen lerroak ez ikusteko erabili\n" -"nahi duzun espresio erregularra." +"Gehitu hemen, harekin bat datozen lerroak ezikusteko\n" +"erabili nahi duzun adierazpen erregularra." #: dialogpages/diffpage.cpp:274 #, kde-format @@ -681,52 +624,41 @@ msgstr "Zuriunea" #: dialogpages/diffpage.cpp:276 -#, fuzzy, kde-format -#| msgid "E&xpand tabs to spaces in output" +#, kde-format msgctxt "@option:check" msgid "E&xpand tabs to spaces in output" -msgstr "&Zabaldu tabulatzaileak espaziotara irteeran" +msgstr "&Zabaldu tabulatzeak zuriunetara irteerakoan" #: dialogpages/diffpage.cpp:277 -#, fuzzy, kde-format -#| msgid "This option corresponds to the -t diff option." +#, kde-format msgctxt "@info:tooltip" msgid "This option corresponds to the -t diff option." -msgstr "Aukera hau -t konparaketa aukerari dagokio." +msgstr "Aukera hau -t diff aukerari dagokio." #: dialogpages/diffpage.cpp:278 -#, fuzzy, kde-format -#| 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." +#, kde-format msgctxt "@info:whatsthis" 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 "" "Aukera honek ez ditu beti emaitza zuzenak ematen. Hedapen honen ondorioz " -"Kompare-k arazoak izan ditzake helburu fitxategiari aldaketa aplikatzen." +"??Kompare??k helburuko fitxategiari aldaketak ezartzeko arazoak izan ditzake." #: dialogpages/diffpage.cpp:280 -#, fuzzy, kde-format -#| msgid "I&gnore added or removed empty lines" +#, kde-format msgctxt "@option:check" msgid "I&gnore added or removed empty lines" -msgstr "Ez i&kusi gehitutako edo kendutako lerro hutsak" +msgstr "Ezi&kusi gehitutako edo kendutako lerro hutsak" #: dialogpages/diffpage.cpp:281 -#, fuzzy, kde-format -#| msgid "This option corresponds to the -B diff option." +#, kde-format msgctxt "@info:tooltip" msgid "This option corresponds to the -B diff option." -msgstr "Aukera hau -B konparaketa aukerari dagokio." +msgstr "Aukera hau -B diff aukerari dagokio." #: dialogpages/diffpage.cpp:282 -#, fuzzy, kde-format -#| msgid "" -#| "This can be very useful in situations where code has been reorganized and " -#| "empty lines have been added or removed to improve legibility." +#, kde-format msgctxt "@info:whatsthis" msgid "" "This can be very useful in situations where code has been reorganized and " @@ -736,80 +668,63 @@ "berrantolatu eta lerro hutsak erantsi edo kendu diren egoeratan." #: dialogpages/diffpage.cpp:284 -#, fuzzy, kde-format -#| msgid "Ig&nore changes in the amount of whitespace" +#, kde-format msgctxt "@option:check" msgid "Ig&nore changes in the amount of whitespace" -msgstr "Ez ik&usi zurigune kopuru aldaketak" +msgstr "Ezik&usi zuriune kopuru aldaketak" #: dialogpages/diffpage.cpp:285 -#, fuzzy, kde-format -#| msgid "This option corresponds to the -b diff option." +#, kde-format msgctxt "@info:tooltip" msgid "This option corresponds to the -b diff option." -msgstr "Aukera hau -b konparaketa aukerari dagokio." +msgstr "Aukera hau -b diff aukerari dagokio." #: dialogpages/diffpage.cpp:286 -#, fuzzy, kde-format -#| msgid "" -#| "If you are uninterested in differences arising due to, for example, " -#| "changes in indentation, then use this option." +#, kde-format msgctxt "@info:whatsthis" msgid "" "If you are uninterested in differences arising due to, for example, changes " "in indentation, then use this option." msgstr "" "Ez bazaude interesatuta, adibidez, koskaduren aldaketengatik agertzen diren " -"desberdintasunekin, orduan erabili aukera hau." +"ezberdintasunetan, erabili aukera hau." #: dialogpages/diffpage.cpp:288 -#, fuzzy, kde-format -#| msgid "Ign&ore all whitespace" +#, kde-format msgctxt "@option:check" msgid "Ign&ore all whitespace" -msgstr "Ez iku&si zurigune guztiak" +msgstr "Ezik&usi zuriune guztiak" #: dialogpages/diffpage.cpp:289 -#, fuzzy, kde-format -#| msgid "This option corresponds to the -w diff option." +#, kde-format msgctxt "@info:tooltip" msgid "This option corresponds to the -w diff option." -msgstr "Aukera hau -w konparaketa aukerari dagokio." +msgstr "Aukera hau -w diff aukerari dagokio." #: dialogpages/diffpage.cpp:290 -#, fuzzy, kde-format -#| msgid "" -#| "This is useful for seeing the significant changes without being " -#| "overwhelmed by all the white space changes." +#, kde-format msgctxt "@info:whatsthis" msgid "" "This is useful for seeing the significant changes without being overwhelmed " "by all the white space changes." msgstr "" -"Hau erabilgarria da aldaketa esanguratsuak ikusteko zuriune aldaketa guztiek " -"ito zaitzaten gabe." +"Hau erabilgarria da, zuriune aldaketa guztiek ito gabe, aldaketa " +"esanguratsuak ikusteko." #: dialogpages/diffpage.cpp:292 -#, fuzzy, kde-format -#| msgid "Igno&re changes due to tab expansion" +#, kde-format msgctxt "@option:check" msgid "Igno&re changes due to tab expansion" -msgstr "Ez ikus&i tabulatzaile zabalkuntza aldaketak" +msgstr "Eziku&si tabulatzeak zabaltzeagatiko aldaketak" #: dialogpages/diffpage.cpp:293 -#, fuzzy, kde-format -#| msgid "This option corresponds to the -E diff option." +#, kde-format msgctxt "@info:tooltip" msgid "This option corresponds to the -E diff option." -msgstr "Aukera hau -E konparaketa aukerari dagokio." +msgstr "Aukera hau -E diff aukerari dagokio." #: dialogpages/diffpage.cpp:294 -#, fuzzy, kde-format -#| msgid "" -#| "If there is a change because tabs have been expanded into spaces in the " -#| "other file, then this option will make sure that these do not show up. " -#| "Kompare currently has some problems applying such changes so be careful " -#| "when you use this option." +#, kde-format msgctxt "@info:whatsthis" msgid "" "If there is a change because tabs have been expanded into spaces in the " @@ -817,10 +732,10 @@ "Kompare currently has some problems applying such changes so be careful when " "you use this option." msgstr "" -"Aldaketa bat badago tab-ak zuriunetara hedatu direlako beste fitxategian, " -"orduan aukera honek ziurtatuko du hauek ez direla azaltzen. Komparek arazo " -"batzuk ditu horrelako aldaketak ezartzerakoan beraz kontu izan aukera hau " -"erabiltzen duzunean." +"Aldaketa bat badago beste fitxategian tabulatzeak zuriunetara hedatu " +"direlako, aukera honek ziurtatuko du horiek ez direla agertuko. ??Kompare??k, " +"une honetan, halako aldaketak ezartzeko arazo batzuk ditu, beraz kontu izan " +"aukera hau erabiltzen duzunean." #: dialogpages/diffpage.cpp:299 #, kde-format @@ -835,30 +750,24 @@ msgstr "Baztertu beharreko fitxategi eredua" #: dialogpages/diffpage.cpp:312 -#, fuzzy, kde-format -#| msgid "" -#| "If this is checked you can enter a shell pattern in the text box on the " -#| "right or select entries from the list." +#, 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 "" -"Hau hautatzen bada, shell eredu bat sar dezakezu testu-koadroan edo zerrenda " -"sarrerak hauta ditzakezu." +"Hau markatuta badago, oskoleko (??shell??) eredu bat sar dezakezu eskuineko " +"testu-koadroan edo zerrendako sarrerak hauta ditzakezu." #: dialogpages/diffpage.cpp:318 -#, fuzzy, kde-format -#| msgid "" -#| "Here you can enter or remove a shell pattern or select one or more " -#| "entries from the list." +#, 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 "" -"Hemen shell eredu bat sar edo kendu dezakezu edo zerrendako sarrera bat edo " -"gehiago hauta dezakezu." +"Hemen oskoleko (??shell??) eredu bat sar edo ken dezakezu, edo zerrendako " +"sarrera bat edo gehiago hauta dezakezu." #: dialogpages/diffpage.cpp:328 #, kde-format @@ -867,8 +776,7 @@ msgstr "Baztertu beharreko fitxategi-izenak dituen fitxategia" #: dialogpages/diffpage.cpp:329 -#, fuzzy, kde-format -#| msgid "If this is checked you can enter a filename in the combo box below." +#, kde-format msgctxt "@info:tooltip" msgid "If this is checked you can enter a filename in the combo box below." msgstr "" @@ -876,30 +784,24 @@ "konbinatuan." #: dialogpages/diffpage.cpp:333 -#, fuzzy, kde-format -#| msgid "" -#| "Here you can enter the URL of a file with shell patterns to ignore during " -#| "the comparison of the folders." +#, 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 "" -"Hemen direktorioen konparaketetan baztertuko diren shell eredudun fitxategi " -"baten URL-a sar dezakezu." +"Hemen, oskoleko (??shell??) ereduak dituen fitxategi baten URLa sar dezakezu, " +"karpetak konparatzerakoan ezikusi beharrekoak." #: dialogpages/diffpage.cpp:337 -#, fuzzy, kde-format -#| msgid "" -#| "Any file you select in the dialog that pops up when you click it will be " -#| "put in the dialog to the left of this button." +#, kde-format msgctxt "@info:tooltip" msgid "" "Any file you select in the dialog that pops up when you click it will be put " "in the dialog to the left of this button." msgstr "" -"Hemen hautatzen duzun eta klik egitean agertzen den edozein fitxategi, botoi " -"honen ezkerrean dagoen elkarrizketa-koadroan jarriko da." +"Gaineratzen den leihoan hautatzen duzun fitxategi oro, klik egiten " +"diozunean, botoi horren ezkerreko elkarrizketa-koadroan ipiniko da." #: dialogpages/diffpage.cpp:344 #, kde-format @@ -950,32 +852,28 @@ msgstr "Koloreak" #: dialogpages/viewpage.cpp:50 -#, fuzzy, kde-format -#| msgid "Removed color:" +#, kde-format msgctxt "@label:chooser" msgid "Removed color:" msgstr "Kendutakoen kolorea:" #: dialogpages/viewpage.cpp:54 -#, fuzzy, kde-format -#| msgid "Changed color:" +#, kde-format msgctxt "@label:chooser" msgid "Changed color:" -msgstr "Aldatutakoen kolorea" +msgstr "Aldatutakoen kolorea:" #: dialogpages/viewpage.cpp:58 -#, fuzzy, kde-format -#| msgid "Added color:" +#, kde-format msgctxt "@label:chooser" msgid "Added color:" -msgstr "Erantsitakoen kolorea" +msgstr "Gehitutakoen kolorea:" #: dialogpages/viewpage.cpp:62 -#, fuzzy, kde-format -#| msgid "Applied color:" +#, kde-format msgctxt "@label:chooser" msgid "Applied color:" -msgstr "Aplikatutako kolorea" +msgstr "Aplikatutakoen kolorea:" #: dialogpages/viewpage.cpp:66 #, kde-format @@ -990,18 +888,16 @@ msgstr "Lerro kopurua:" #: dialogpages/viewpage.cpp:77 -#, fuzzy, kde-format -#| msgid "Tabs to Spaces" +#, kde-format msgctxt "@title:group" msgid "Tabs to Spaces" -msgstr "Tabulatzaileak zuriguneetara" +msgstr "Tabulatzeak zuriuneetara" #: dialogpages/viewpage.cpp:83 -#, fuzzy, kde-format -#| msgid "Number of spaces to convert a tab character to:" +#, kde-format msgctxt "@label:spinbox" msgid "Number of spaces to convert a tab character to:" -msgstr "Tabulatzailearen ordez idatziko den zurigune kopurua:" +msgstr "Tabulatze baten ordez ipini beharreko zuriune kopurua:" #: dialogpages/viewpage.cpp:94 #, kde-format @@ -1070,13 +966,11 @@ msgstr "Ezberdintasuna" #: komparenavtreepart/komparenavtreepart.cpp:455 -#, fuzzy, kde-format -#| msgid "Applied: Changes made to %1 line undone" -#| msgid_plural "Applied: Changes made to %1 lines undone" +#, kde-format msgid "Applied: Changes made to %1 line undone" msgid_plural "Applied: Changes made to %1 lines undone" -msgstr[0] "Aplikatuta: lerro %1-i egindako aldaketak desegin" -msgstr[1] "da.Aplikatuta: %1 lerroei egindako aldaketak desegin da." +msgstr[0] "Ezarrita: lerro %1i egindako aldaketak desegin dira" +msgstr[1] "Ezarrita: %1 lerrori egindako aldaketak desegin dira" #: komparenavtreepart/komparenavtreepart.cpp:458 #, kde-format @@ -1132,11 +1026,10 @@ msgstr "Gorde ??&Diff??..." #: komparepart/kompare_part.cpp:183 -#, fuzzy, kde-format -#| msgid "Swap Source with Destination" +#, kde-format msgctxt "@action" msgid "Swap Source with Destination" -msgstr "Trukatu iturburua jomugarekin" +msgstr "Trukatu sorburua jomugarekin" #: komparepart/kompare_part.cpp:190 #, kde-format @@ -1185,11 +1078,10 @@ "gainidatzi nahi duzu?" #: komparepart/kompare_part.cpp:569 -#, fuzzy, kde-format -#| msgid "File Exists" +#, kde-format msgctxt "@window:title" msgid "File Exists" -msgstr "Fitxategia existitzen da" +msgstr "Fitxategia badago" #: komparepart/kompare_part.cpp:569 #, kde-format @@ -1198,53 +1090,46 @@ msgstr "Ez gainidatzi" #: komparepart/kompare_part.cpp:653 -#, fuzzy, kde-format -#| msgid "Running diff..." +#, kde-format msgctxt "@info:status" msgid "Running diff..." -msgstr "Diff martxan..." +msgstr "Diff ibiltzen..." #: komparepart/kompare_part.cpp:656 -#, fuzzy, kde-format -#| msgid "Parsing diff output..." +#, kde-format msgctxt "@info:status" msgid "Parsing diff output..." -msgstr "Diff irteera analizatzen..." +msgstr "Diff-en irteera analizatzen..." #: komparepart/kompare_part.cpp:712 -#, fuzzy, kde-format -#| msgid "Comparing file %1 with file %2" +#, kde-format msgctxt "@info:status" msgid "Comparing file %1 with file %2" -msgstr "%1 fitxategia %2 fitxategiarekin konparatzen" +msgstr "%1 fitxategia %2 fitxategiarekin konparatzea" #: komparepart/kompare_part.cpp:717 -#, fuzzy, kde-format -#| msgid "Comparing files in %1 with files in %2" +#, kde-format msgctxt "@info:status" msgid "Comparing files in %1 with files in %2" -msgstr "%1-(e)ko fitxategiak %2-(e)ko fitxategiekin konparatzen" +msgstr "%1(e)ko fitxategiak %2(e)ko fitxategiekin konparatzea" #: komparepart/kompare_part.cpp:722 -#, fuzzy, kde-format -#| msgid "Viewing diff output from %1" +#, kde-format msgctxt "@info:status" msgid "Viewing diff output from %1" -msgstr "%1-(r)en diff irteera ikusten" +msgstr "%1(r)en ??diff??en irteerakoa ikustea" #: komparepart/kompare_part.cpp:725 -#, fuzzy, kde-format -#| msgid "Blending diff output from %1 into file %2" +#, kde-format msgctxt "@info:status" msgid "Blending diff output from %1 into file %2" -msgstr "%1-(r)en diff irteera %2 fitxategian fusionatzen" +msgstr "%1(r)en ??diff??en irteerakoa %2 fitxategian fusionatzea" #: komparepart/kompare_part.cpp:730 -#, fuzzy, kde-format -#| msgid "Blending diff output from %1 into folder %2" +#, kde-format msgctxt "@info:status" msgid "Blending diff output from %1 into folder %2" -msgstr "%1-(r)en diff irteera %2 direktorioan fusionatzen" +msgstr "%1(r)en konparaketaren irteerakoa %2 karpetan fusionatzen" #: komparepart/kompare_part.cpp:781 komparepart/kompare_part.cpp:812 #: komparepart/kompare_part.cpp:927 @@ -1264,11 +1149,10 @@ msgstr "Aldaketak gorde?" #: komparepart/kompare_part.cpp:852 -#, fuzzy, kde-format -#| msgid "Unified" +#, kde-format msgctxt "@item diff format" msgid "Unified" -msgstr "Bateratua" +msgstr "Bateratuta" #: komparepart/kompare_part.cpp:855 #, kde-format @@ -1424,10 +1308,9 @@ #. i18n: ectx: property (text), widget (QRadioButton, m_UnifiedRB) #: komparepart/komparesaveoptionsbase.ui:63 -#, fuzzy, kde-format -#| msgid "Unified" +#, kde-format msgid "&Unified" -msgstr "Bateratua" +msgstr "&Bateratuta" #. i18n: ectx: property (text), widget (QRadioButton, m_SideBySideRB) #: komparepart/komparesaveoptionsbase.ui:73 @@ -1463,25 +1346,25 @@ #: komparepart/komparesaveoptionsbase.ui:152 #, kde-format msgid "Ignore changes in case" -msgstr "Ez ikusi maiuskula/minuskula aldaketak" +msgstr "Ezikusi maiuskula/minuskula aldaketak" #. i18n: ectx: property (text), widget (QCheckBox, m_ExpandTabsCB) #: komparepart/komparesaveoptionsbase.ui:159 #, kde-format msgid "Expand tabs to spaces" -msgstr "Zabaldu tabulatzaileak espaziotara" +msgstr "Zabaldu tabulatzeak zuriunetara" #. i18n: ectx: property (text), widget (QCheckBox, m_IgnoreEmptyLinesCB) #: komparepart/komparesaveoptionsbase.ui:166 #, kde-format msgid "Ignore added or removed empty lines" -msgstr "Ez ikusi gehitutako edo kendutako lerro hutsak" +msgstr "Ezikusi gehitutako edo kendutako lerro hutsak" #. i18n: ectx: property (text), widget (QCheckBox, m_IgnoreWhiteSpaceCB) #: komparepart/komparesaveoptionsbase.ui:173 #, kde-format msgid "Ignore changes in whitespace" -msgstr "Ez ikusi zurigune aldaketak" +msgstr "Ezikusi zuriune aldaketak" #. i18n: ectx: property (text), widget (QCheckBox, m_FunctionNamesCB) #: komparepart/komparesaveoptionsbase.ui:180 @@ -1493,7 +1376,7 @@ #: komparepart/komparesaveoptionsbase.ui:190 #, kde-format msgid "Compare folders recursively" -msgstr "Konparatu direktorioak errekurtsiboki" +msgstr "Konparatu karpetak era errekurtsiboan" #. i18n: ectx: property (text), widget (QCheckBox, m_NewFilesCB) #: komparepart/komparesaveoptionsbase.ui:200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-22.08.2/po/fr/kompare.po new/kompare-22.08.3/po/fr/kompare.po --- old/kompare-22.08.2/po/fr/kompare.po 2022-10-11 06:58:07.000000000 +0200 +++ new/kompare-22.08.3/po/fr/kompare.po 2022-11-01 01:11:32.000000000 +0100 @@ -14,7 +14,7 @@ # Jean-Jacques FINAZZI <mrja...@users.sourceforge.net>, 2008. # Jo??lle Cornavin <jc...@free.fr>, 2009, 2010, 2012, 2013. # Simon Depiets <sdepi...@gmail.com>, 2017. -# Xavier Besnard <xavier.besn...@neuf.fr>, 2020, 2021. +# Xavier Besnard <xavier.besn...@neuf.fr>, 2020, 2021, 2022. # msgid "" msgstr "" @@ -29,7 +29,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 21.08.1\n" +"X-Generator: Lokalize 22.08.1\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-22.08.2/po/it/kompare.po new/kompare-22.08.3/po/it/kompare.po --- old/kompare-22.08.2/po/it/kompare.po 2022-10-11 06:58:07.000000000 +0200 +++ new/kompare-22.08.3/po/it/kompare.po 2022-11-01 01:11:32.000000000 +0100 @@ -3,22 +3,22 @@ # Daniele Medri <mad...@linuxmeeting.net>, 2003. # Federico Zenith <federico.zen...@member.fsf.org>, 2004, 2005, 2007, 2008, 2009, 2010. # Federico Zenith <federico.zen...@member.fsf.org>, 2008, 2011, 2012, 2013, 2014. -# Paolo Zamponi <zapa...@email.it>, 2016, 2017, 2020. +# Paolo Zamponi <zapa...@email.it>, 2016, 2017, 2020, 2022. # msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2021-05-17 00:26+0000\n" -"PO-Revision-Date: 2020-05-07 22:34+0200\n" +"PO-Revision-Date: 2022-10-18 07:50+0200\n" "Last-Translator: Paolo Zamponi <zapa...@email.it>\n" -"Language-Team: Italian <kde-i18n-...@kde.org>\n" +"Language-Team: Italian <kde-i18n...@kde.org>\n" "Language: it\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 20.04.0\n" +"X-Generator: Lokalize 22.08.2\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -33,7 +33,7 @@ #: app/kompare_shell.cpp:69 #, kde-format msgid "Could not load our KompareViewPart." -msgstr "Impossibile caricare il nostro KompareViewPart." +msgstr "Impossibile caricare KompareViewPart." #: app/kompare_shell.cpp:73 #, kde-format @@ -44,7 +44,7 @@ #: app/kompare_shell.cpp:90 #, kde-format msgid "Could not load our KompareNavigationPart." -msgstr "Impossibile caricare il nostro KompareNavigationPart." +msgstr "Impossibile caricare KompareNavigationPart." #: app/kompare_shell.cpp:195 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-22.08.2/po/nn/kompare.po new/kompare-22.08.3/po/nn/kompare.po --- old/kompare-22.08.2/po/nn/kompare.po 2022-10-11 06:58:07.000000000 +0200 +++ new/kompare-22.08.3/po/nn/kompare.po 2022-11-01 01:11:32.000000000 +0100 @@ -1,6 +1,6 @@ # Translation of kompare to Norwegian Nynorsk # -# Karl Ove Hufthammer <k...@huftis.org>, 2007, 2008, 2015, 2016, 2018, 2019, 2020. +# Karl Ove Hufthammer <k...@huftis.org>, 2007, 2008, 2015, 2016, 2018, 2019, 2020, 2022. # Eirik U. Birkeland <eir...@gmail.com>, 2008, 2009. msgid "" msgstr "" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 20.04.3\n" +"X-Generator: Lokalize 22.08.2\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-22.08.2/po/ta/kompare.po new/kompare-22.08.3/po/ta/kompare.po --- old/kompare-22.08.2/po/ta/kompare.po 2022-10-11 06:58:07.000000000 +0200 +++ new/kompare-22.08.3/po/ta/kompare.po 2022-11-01 01:11:32.000000000 +0100 @@ -8,13 +8,13 @@ # Vasee Vaseeharan <va...@ieee.org>, 2004. # Ambalam <tami...@ambalam.com>, 2004. # root <root@localhost.localdomain>, 2004. -# Kishore G <kishor...@gmail.com>, 2021. +# Kishore G <kishor...@gmail.com>, 2021, 2022. msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2021-05-17 00:26+0000\n" -"PO-Revision-Date: 2021-01-18 19:04+0530\n" +"PO-Revision-Date: 2022-10-18 19:45+0530\n" "Last-Translator: Kishore G <kishor...@gmail.com>\n" "Language-Team: Tamil <kde-i18n-...@kde.org>\n" "Language: ta\n" @@ -22,7 +22,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 20.12.1\n" +"X-Generator: Lokalize 22.08.2\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -43,7 +43,7 @@ #, kde-format msgctxt "@title:window" msgid "Navigation" -msgstr "" +msgstr "??????????????????" #: app/kompare_shell.cpp:90 #, kde-format @@ -58,11 +58,10 @@ msgstr "Diff??? ?????????..." #: app/kompare_shell.cpp:198 -#, fuzzy, kde-format -#| msgid "&Compare Files..." +#, kde-format msgctxt "@action" msgid "&Compare Files..." -msgstr "??????????????????????????? ?????????????????????..." +msgstr "&??????????????????????????? ?????????????????????..." #: app/kompare_shell.cpp:201 #, fuzzy, kde-format @@ -72,35 +71,34 @@ msgstr "URL ???????????? Diff??? ??????????????????..." #: app/kompare_shell.cpp:207 -#, fuzzy, kde-format -#| msgid "Show T&ext View" +#, kde-format msgctxt "@action" msgid "Show T&ext View" -msgstr "????????????????????????????????? ??????????????????" +msgstr "&??????????????????????????????????????? ??????????????????" #: app/kompare_shell.cpp:220 #, kde-format msgid " 0 of 0 differences " -msgstr "0 of 0 ??????????????????????????????" +msgstr "0 ???????????????????????????????????? 0" #: app/kompare_shell.cpp:221 #, kde-format msgid " 0 of 0 files " -msgstr "0 of 0 ???????????????????????????" +msgstr "0 ????????????????????????????????? 0" #: app/kompare_shell.cpp:238 #, kde-format msgid " %2 of %1 file " msgid_plural " %2 of %1 files " -msgstr[0] "%1 ????????? %2 ??????????????????" -msgstr[1] "%1 ????????? %2 ??????????????????????????? " +msgstr[0] " %1 ???????????????????????? %2 " +msgstr[1] " %1 ????????????????????????????????? %2 " #: app/kompare_shell.cpp:240 #, kde-format msgid " %1 file " msgid_plural " %1 files " -msgstr[0] "%1 ?????????????????? " -msgstr[1] "%1 ??????????????????????????? " +msgstr[0] " %1 ?????????????????? " +msgstr[1] " %1 ??????????????????????????? " #: app/kompare_shell.cpp:243 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-22.08.2/po/zh_CN/kompare.po new/kompare-22.08.3/po/zh_CN/kompare.po --- old/kompare-22.08.2/po/zh_CN/kompare.po 2022-10-11 06:58:07.000000000 +0200 +++ new/kompare-22.08.3/po/zh_CN/kompare.po 2022-11-01 01:11:32.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2021-05-17 00:26+0000\n" -"PO-Revision-Date: 2022-10-02 15:52\n" +"PO-Revision-Date: 2022-10-30 07:51\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-22.08.2/src/app/org.kde.kompare.appdata.xml new/kompare-22.08.3/src/app/org.kde.kompare.appdata.xml --- old/kompare-22.08.2/src/app/org.kde.kompare.appdata.xml 2022-10-10 22:22:40.000000000 +0200 +++ new/kompare-22.08.3/src/app/org.kde.kompare.appdata.xml 2022-10-30 22:21:51.000000000 +0100 @@ -20,6 +20,7 @@ <name xml:lang="gl">Kompare</name> <name xml:lang="id">Kompare</name> <name xml:lang="it">Kompare</name> + <name xml:lang="ka">Kompare</name> <name xml:lang="ko">Kompare</name> <name xml:lang="nl">Kompare</name> <name xml:lang="nn">Kompare</name> @@ -55,6 +56,7 @@ <summary xml:lang="gl">Interface para Diff e Patch</summary> <summary xml:lang="id">Frontend Diff/Patch</summary> <summary xml:lang="it">Interfaccia a Diff/Patch</summary> + <summary xml:lang="ka">Diff/Patch -?????? ????????????????????????</summary> <summary xml:lang="ko">Diff/Patch ???????????????</summary> <summary xml:lang="nl">Diff/Patch-hulpprogramma</summary> <summary xml:lang="nn">Diff-/Patch-grensesnitt</summary> @@ -127,6 +129,7 @@ <p xml:lang="gl">Funcionalidades:</p> <p xml:lang="id">Fitur:</p> <p xml:lang="it">Caratteristiche:</p> + <p xml:lang="ka">???????????????????????????:</p> <p xml:lang="ko">??????:</p> <p xml:lang="nl">Mogelijkheden:</p> <p xml:lang="nn">Funksjonar:</p> @@ -230,6 +233,7 @@ <li xml:lang="gl">Creaci??n e aplicaci??n de parches.</li> <li xml:lang="id">Penciptaan dan penerapan patch.</li> <li xml:lang="it">Creare ed applica le patch.</li> + <li xml:lang="ka">????????????????????? ?????????????????? ?????? ??????????????????????????????.</li> <li xml:lang="ko">????????? ????????? ???????????????.</li> <li xml:lang="nl">Aanmaken en gebruiken van patches.</li> <li xml:lang="nn">Kan laga og bruk patch-filer.</li> @@ -269,9 +273,9 @@ <category>Development</category> </categories> <releases> + <release version="4.1.22083" date="2022-11-03"/> <release version="4.1.22082" date="2022-10-13"/> <release version="4.1.22081" date="2022-09-08"/> <release version="4.1.22080" date="2022-08-18"/> - <release version="4.1.22043" date="2022-07-07"/> </releases> </component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-22.08.2/src/app/org.kde.kompare.desktop new/kompare-22.08.3/src/app/org.kde.kompare.desktop --- old/kompare-22.08.2/src/app/org.kde.kompare.desktop 2022-10-10 22:22:40.000000000 +0200 +++ new/kompare-22.08.3/src/app/org.kde.kompare.desktop 2022-10-30 22:21:51.000000000 +0100 @@ -29,6 +29,7 @@ Name[is]=Kompare Name[it]=Kompare Name[ja]=Kompare +Name[ka]=Kompare Name[kk]=Kompare Name[km]=Kompare Name[ko]=Kompare @@ -93,6 +94,7 @@ GenericName[is]=Myndr??nt vi??m??t ?? Diff/Patch GenericName[it]=Interfaccia per diff e patch GenericName[ja]=Diff/Patch ????????????????????? +GenericName[ka]=Diff/Patch -?????? ???????????????????????? GenericName[kk]=Diff/Patch ???????????????????? GenericName[km]=?????????????????????????????????????????????????????????????????????????????? Diff/Patch GenericName[ko]=Diff/Patch ??????????????? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-22.08.2/src/komparenavtreepart/komparenavtreepart.desktop.in new/kompare-22.08.3/src/komparenavtreepart/komparenavtreepart.desktop.in --- old/kompare-22.08.2/src/komparenavtreepart/komparenavtreepart.desktop.in 2022-10-10 22:22:40.000000000 +0200 +++ new/kompare-22.08.3/src/komparenavtreepart/komparenavtreepart.desktop.in 2022-10-30 22:21:51.000000000 +0100 @@ -25,6 +25,7 @@ Name[is]=KompareNavTreePart Name[it]=KompareNavTreePart Name[ja]=KompareNavTreePart +Name[ka]=KompareNavTreePart Name[kk]=KompareNavTreePart Name[km]=KompareNavTreePart Name[ko]=KompareNavTreePart diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-22.08.2/src/komparepart/komparepart.desktop.in new/kompare-22.08.3/src/komparepart/komparepart.desktop.in --- old/kompare-22.08.2/src/komparepart/komparepart.desktop.in 2022-10-10 22:22:40.000000000 +0200 +++ new/kompare-22.08.3/src/komparepart/komparepart.desktop.in 2022-10-30 22:21:51.000000000 +0100 @@ -28,6 +28,7 @@ Name[is]=KomparePart Name[it]=KomparePart Name[ja]=KomparePart +Name[ka]=KomparePart Name[kk]=KomparePart Name[km]=KomparePart Name[ko]=KomparePart diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-22.08.2/src/servicemenus/kompare.desktop new/kompare-22.08.3/src/servicemenus/kompare.desktop --- old/kompare-22.08.2/src/servicemenus/kompare.desktop 2022-10-10 22:22:40.000000000 +0200 +++ new/kompare-22.08.3/src/servicemenus/kompare.desktop 2022-10-30 22:21:51.000000000 +0100 @@ -21,6 +21,7 @@ Name[fr]=Comparer des fichiers Name[gl]=Comparar os ficheiros Name[it]=Confronta file +Name[ka]=???????????????????????? ???????????????????????? Name[ko]=?????? ???????????? Name[nl]=Bestanden vergelijken Name[nn]=Samanlikna filer