Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kompare for openSUSE:Factory checked in at 2026-02-06 19:03:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kompare (Old) and /work/SRC/openSUSE:Factory/.kompare.new.1670 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kompare" Fri Feb 6 19:03:59 2026 rev:154 rq:1331302 version:25.12.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kompare/kompare.changes 2026-01-12 10:20:46.800160054 +0100 +++ /work/SRC/openSUSE:Factory/.kompare.new.1670/kompare.changes 2026-02-06 19:05:02.250700212 +0100 @@ -1,0 +2,10 @@ +Tue Feb 3 10:05:54 UTC 2026 - Christophe Marin <[email protected]> + +- Update to 25.12.2 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/gear/25.12.2/ +- Changes since 25.12.1: + * documentation.yml is no more needed + +------------------------------------------------------------------- Old: ---- kompare-25.12.1.tar.xz kompare-25.12.1.tar.xz.sig New: ---- kompare-25.12.2.tar.xz kompare-25.12.2.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kompare.spec ++++++ --- /var/tmp/diff_new_pack.lkVcEg/_old 2026-02-06 19:05:03.058734172 +0100 +++ /var/tmp/diff_new_pack.lkVcEg/_new 2026-02-06 19:05:03.062734340 +0100 @@ -21,7 +21,7 @@ %bcond_without released Name: kompare -Version: 25.12.1 +Version: 25.12.2 Release: 0 Summary: File Comparator License: GPL-2.0-or-later ++++++ kompare-25.12.1.tar.xz -> kompare-25.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-25.12.1/.gitlab-ci.yml new/kompare-25.12.2/.gitlab-ci.yml --- old/kompare-25.12.1/.gitlab-ci.yml 2026-01-03 11:54:01.000000000 +0100 +++ new/kompare-25.12.2/.gitlab-ci.yml 2026-01-31 10:28:44.000000000 +0100 @@ -8,4 +8,3 @@ - /gitlab-templates/linux-qt6-next.yml - /gitlab-templates/freebsd-qt6.yml - /gitlab-templates/flatpak.yml - - /gitlab-templates/documentation.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-25.12.1/CMakeLists.txt new/kompare-25.12.2/CMakeLists.txt --- old/kompare-25.12.1/CMakeLists.txt 2026-01-03 11:54:01.000000000 +0100 +++ new/kompare-25.12.2/CMakeLists.txt 2026-01-31 10:28:44.000000000 +0100 @@ -3,7 +3,7 @@ # Release Service version, managed by release script set (RELEASE_SERVICE_VERSION_MAJOR "25") set (RELEASE_SERVICE_VERSION_MINOR "12") -set (RELEASE_SERVICE_VERSION_MICRO "1") +set (RELEASE_SERVICE_VERSION_MICRO "2") 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-25.12.1/po/ca@valencia/kompare.po new/kompare-25.12.2/po/ca@valencia/kompare.po --- old/kompare-25.12.1/po/ca@valencia/kompare.po 2026-01-03 11:54:01.000000000 +0100 +++ new/kompare-25.12.2/po/ca@valencia/kompare.po 2026-01-31 10:28:44.000000000 +0100 @@ -643,7 +643,7 @@ "Kompare may have problems applying the change to the destination file." msgstr "" "Esta opció no sempre produïx el resultat correcte. A causa d'esta expansió " -"Kompare pot tindre problemes en aplicar els canvis en el fitxer de " +"Kompare pot tindre problemes mentre s'apliquen els canvis en el fitxer de " "destinació." #: dialogpages/diffpage.cpp:280 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-25.12.1/po/is/kompare.po new/kompare-25.12.2/po/is/kompare.po --- old/kompare-25.12.1/po/is/kompare.po 2026-01-03 11:54:01.000000000 +0100 +++ new/kompare-25.12.2/po/is/kompare.po 2026-01-31 10:28:44.000000000 +0100 @@ -1,19 +1,19 @@ # translation of kompare.po to Icelandic # Björgvin Ragnarsson <[email protected]>, 2004. -# Sveinn í Felli <[email protected]>, 2009, 2015. +# SPDX-FileCopyrightText: 2009, 2015, 2026 Sveinn í Felli <[email protected]> msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2025-11-17 14:42+0000\n" -"PO-Revision-Date: 2015-04-17 11:51+0000\n" +"PO-Revision-Date: 2026-01-17 09:14+0000\n" "Last-Translator: Sveinn í Felli <[email protected]>\n" -"Language-Team: Icelandic <[email protected]>\n" +"Language-Team: Icelandic\n" "Language: is\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 23.08.5\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" "\n" "\n" @@ -21,7 +21,7 @@ #, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Björgvin Ragnarsson,Sveinn í Felli" +msgstr "Björgvin Ragnarsson, Sveinn í Felli" #, kde-format msgctxt "EMAIL OF TRANSLATORS" @@ -29,47 +29,41 @@ msgstr "[email protected], [email protected]" #: app/kompare_shell.cpp:69 -#, fuzzy, kde-format -#| msgid "Could not load our KompareViewPart." +#, kde-format msgid "Could not load our KompareViewPart: %1" -msgstr "Gat ekki hlaðið inn okkar KompareViewPart!" +msgstr "Gat ekki hlaðið inn okkar KompareViewPart: %1" #: app/kompare_shell.cpp:73 -#, fuzzy, kde-format -#| msgid "Navigation" +#, kde-format msgctxt "@title:window" msgid "Navigation" -msgstr "Rötun" +msgstr "Flakk" #: app/kompare_shell.cpp:91 -#, fuzzy, kde-format -#| msgid "Could not load our KompareNavigationPart." +#, kde-format msgid "Could not load our KompareNavigationPart: %1" -msgstr "Gat ekki hlaðið inn okkar KompareNavigationPart!" +msgstr "Gat ekki hlaðið inn okkar KompareNavigationPart: %1" #: app/kompare_shell.cpp:196 -#, fuzzy, kde-format -#| msgid "&Open Diff..." +#, kde-format msgctxt "@action" msgid "&Open Diff..." -msgstr "&Opna Diff..." +msgstr "&Opna diff-mismun..." #: app/kompare_shell.cpp:199 -#, fuzzy, kde-format -#| msgid "&Compare Files..." +#, kde-format msgctxt "@action" msgid "&Compare Files..." msgstr "&Bera saman skrár..." #: app/kompare_shell.cpp:202 -#, fuzzy, kde-format +#, kde-format msgctxt "@action" msgid "&Blend URL with Diff..." -msgstr "Slóð með." +msgstr "&Blanda slóð við mismun..." #: app/kompare_shell.cpp:208 -#, fuzzy, kde-format -#| msgid "Show T&ext View" +#, kde-format msgctxt "@action" msgid "Show T&ext View" msgstr "Sýna T&extasýn" @@ -113,42 +107,37 @@ msgstr[1] " %1 mismunum " #: app/kompare_shell.cpp:328 -#, fuzzy, kde-format -#| msgid "Blend File/Folder with diff Output" +#, kde-format msgctxt "@title:window" msgid "Blend File/Folder with diff Output" -msgstr "Blanda skrá/möppu við diff úttak" +msgstr "Blanda skrá/möppu við diff-mismunaúttak" #: app/kompare_shell.cpp:329 -#, fuzzy, kde-format -#| msgid "File/Folder" +#, kde-format msgctxt "@title:group" msgid "File/Folder" msgstr "Skrá/mappa" #: app/kompare_shell.cpp:330 -#, fuzzy, kde-format -#| msgid "Diff Output" +#, kde-format msgctxt "@title:group" msgid "Diff Output" -msgstr "Diff úttak" +msgstr "Diff-mismunaúttak" #: app/kompare_shell.cpp:333 -#, fuzzy, kde-format -#| msgid "Blend" +#, kde-format msgctxt "@action:button" msgid "Blend" msgstr "Blanda" #: app/kompare_shell.cpp:334 -#, 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 "Blanda þessari skrá eða möppu við diff úttakið" +msgstr "Blanda þessari skrá eða möppu við diff-mismunaúttakið" #: app/kompare_shell.cpp:335 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:whatsthis" msgid "" "If you have entered a file or folder name and a file that contains diff " @@ -157,53 +146,44 @@ "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 "" -"Ef þú hefur skrifað skráar- eða möppunafn og skrá sem inniheldur diff úttak " -"í svæðin á þessum glugga, mun þessi hnappur vera virkjaður og með því að " -"smella á hann opnast aðalgluggi kompare þar sem úttakið af valdri skrá eða " -"skrám úr möppu eru blandaðar saman við diff úttakið svo þú getur síðan " -"virkjað mismuninní skrá eða skrárnar. " +"Ef þú hefur sett inn í svæðin á þessum glugga skráar- eða möppunafn og skrá " +"sem inniheldur diff-mismunaúttak, mun þessi hnappur vera virkjaður og með " +"því að smella á hann opnast aðalgluggi kompare þar sem úttaki valinnar " +"skráar eða skráa úr möppu er blandað saman við diff úttakið svo þú getir " +"síðan sett mismuninn yfir í skrá eða í skrárnar. " #: app/kompare_shell.cpp:358 app/main.cpp:195 -#, fuzzy, kde-format -#| msgid "Compare Files or Folders" +#, kde-format msgctxt "@title:window" msgid "Compare Files or Folders" msgstr "Bera saman skrár eða möppur" #: app/kompare_shell.cpp:359 app/main.cpp:196 -#, fuzzy, kde-format -#| msgid "Source" +#, kde-format msgctxt "@title:group" msgid "Source" msgstr "Uppruni" #: app/kompare_shell.cpp:360 app/main.cpp:197 -#, fuzzy, kde-format -#| msgid "Destination" +#, kde-format msgctxt "@title:group" msgid "Destination" msgstr "Áfangastaður" #: app/kompare_shell.cpp:363 app/main.cpp:200 -#, fuzzy, kde-format -#| msgid "Compare" +#, kde-format msgctxt "@action:button" msgid "Compare" msgstr "Bera saman" #: app/kompare_shell.cpp:364 app/main.cpp:201 -#, fuzzy, kde-format -#| msgid "Compare these files or folders" +#, kde-format msgctxt "@info:tooltip" msgid "Compare these files or folders" msgstr "Bera saman þessar skrár eða möppur" #: app/kompare_shell.cpp:365 app/main.cpp:202 -#, 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 " @@ -215,8 +195,7 @@ "skrám eða möppum." #: app/kompare_shell.cpp:399 -#, fuzzy, kde-format -#| msgid "Text View" +#, kde-format msgctxt "@title:window" msgid "Text View" msgstr "Textasýn" @@ -240,8 +219,7 @@ msgstr "Aðalverkfæraslá" #: app/kompareurldialog.cpp:38 -#, fuzzy, kde-format -#| msgid "Files" +#, kde-format msgctxt "@title:tab" msgid "Files" msgstr "Skrár" @@ -249,24 +227,22 @@ #: app/kompareurldialog.cpp:40 #, kde-format msgid "Here you can enter the files you want to compare." -msgstr "" +msgstr "Hér getur þú gefið upp skrárnar sem þú vilt bera saman." #: app/kompareurldialog.cpp:46 dialogpages/diffpage.cpp:185 #: komparepart/kompareprefdlg.cpp:43 -#, fuzzy, kde-format -#| msgid "Diff" +#, kde-format msgctxt "@title:tab" msgid "Diff" -msgstr "Diff" +msgstr "Mismunur/diff" #: app/kompareurldialog.cpp:48 #, kde-format msgid "Here you can change the options for comparing the files." -msgstr "" +msgstr "Hér getur þú breytt valkostum fyrir samanburð skráa." #: app/kompareurldialog.cpp:53 dialogpages/viewpage.cpp:87 -#, fuzzy, kde-format -#| msgid "Appearance" +#, kde-format msgctxt "@title:tab" msgid "Appearance" msgstr "Útlit" @@ -274,13 +250,15 @@ #: app/kompareurldialog.cpp:55 #, kde-format msgid "Here you can change the options for the view." -msgstr "" +msgstr "Hér getur þú breytt valkostum fyrir ásýndina." #: app/kompareurldialog.cpp:101 #, kde-format msgid "" "File used for excluding files cannot be found, please specify another file." msgstr "" +"Skrá sem notuð er til að undanskilja skrár fannst ekki, prófaðu einhverja " +"aðra skrá." #: app/main.cpp:46 #, kde-format @@ -367,22 +345,22 @@ #: app/main.cpp:59 #, kde-format msgid "Cervisia diff viewer" -msgstr "Cervisia diff skoðari" +msgstr "Cervisia diff-mismunarskoðari" #: app/main.cpp:66 -#, fuzzy, kde-format +#, kde-format msgid "This will compare URL1 with URL2" -msgstr "Þetta mun bera slóð 1 við slóð 2." +msgstr "Þetta mun bera SLÓÐ1 saman við SLÓÐ2." #: app/main.cpp:67 -#, fuzzy, kde-format +#, kde-format msgid "" "This will open URL1 and expect it to be diff output. URL1 can also be a '-' " "and then it will read from standard input. Can be used for instance for cvs " "diff | kompare -o -. Kompare will do a check to see if it can find the " "original file(s) and then blend the original file(s) into the diffoutput and " "show that in the viewer. -n disables the check." -msgstr "Þetta mun opna slóð 1 og búast því það að hún sé" +msgstr "" #: app/main.cpp:68 #, kde-format @@ -406,19 +384,21 @@ msgstr "" #: dialogpages/diffpage.cpp:174 -#, fuzzy, kde-format -#| msgid "Diff Program" +#, kde-format msgctxt "@title:group" msgid "Diff Program" msgstr "Diff forrit" #: dialogpages/diffpage.cpp:179 -#, fuzzy, kde-format +#, kde-format msgid "" "You can select a different diff program here. On Solaris the standard diff " "program does not support all the options that the GNU version does. This way " "you can select that version." -msgstr "Hér getur þú valið annað diff forrit. Á Solaris " +msgstr "" +"Hér getur þú valið annað diff forrit. Á Solaris styður staðlaða diff-" +"mismunaforritið ekki við alla þá valkosti sem GNU-útgáfan gerir. Þarna " +"geturðu tiltekið hvaða útgáfu þú ætlar að nota." #: dialogpages/diffpage.cpp:196 #, kde-format @@ -430,36 +410,31 @@ msgstr "" #: dialogpages/diffpage.cpp:199 -#, fuzzy, kde-format -#| msgid "Output Format" +#, kde-format msgctxt "@title:group" msgid "Output Format" msgstr "Úttakssnið" #: dialogpages/diffpage.cpp:201 -#, fuzzy, kde-format -#| msgid "Context" +#, kde-format msgctxt "@option:radio format type" msgid "Context" msgstr "Samhengi" #: dialogpages/diffpage.cpp:204 -#, fuzzy, kde-format -#| msgid "Normal" +#, kde-format msgctxt "@option:radio format type" msgid "Normal" msgstr "Venjulegt" #: dialogpages/diffpage.cpp:207 -#, fuzzy, kde-format -#| msgid "Unified" +#, kde-format msgctxt "@option:radio format type" msgid "Unified" msgstr "Sameinað" #: dialogpages/diffpage.cpp:215 -#, fuzzy, kde-format -#| msgid "Lines of Context" +#, kde-format msgctxt "@title:group" msgid "Lines of Context" msgstr "Línur af samhengi" @@ -474,36 +449,31 @@ msgstr "" #: dialogpages/diffpage.cpp:220 -#, fuzzy, kde-format -#| msgid "Number of context lines:" +#, kde-format msgctxt "@label:spinbox" msgid "Number of context lines:" msgstr "Fjöldi samhengislína:" #: dialogpages/diffpage.cpp:225 -#, fuzzy, kde-format -#| msgid "Format" +#, kde-format msgctxt "@title:tab" msgid "Format" msgstr "Snið" #: dialogpages/diffpage.cpp:237 -#, fuzzy, kde-format -#| msgid "General" +#, kde-format msgctxt "@title:group" msgid "General" msgstr "Almennt" #: 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 "Fara með nýjar skrár sem &tómar" #: 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 "Þetta samsvarar -N diff valkostinum." @@ -519,15 +489,13 @@ msgstr "" #: dialogpages/diffpage.cpp:244 -#, fuzzy, kde-format -#| msgid "&Look for smaller changes" +#, kde-format msgctxt "@option:check" msgid "&Look for smaller changes" msgstr "&Skoða eftir minniháttar breytingum" #: 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 "Þetta samsvarar -d diff valkostinum." @@ -541,15 +509,13 @@ msgstr "" #: 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 "Besta fyrir stórar skrár" #: 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 "Þetta samsvarar -H diff valkostinum." @@ -563,14 +529,13 @@ msgstr "" #: dialogpages/diffpage.cpp:252 -#, fuzzy, kde-format +#, kde-format msgctxt "@option:check" msgid "&Ignore changes in case" -msgstr "Hunsa \"" +msgstr "&Hunsa breytingar á há-/lágstöfum" #: 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 "Þetta samsvarar -i diff valkostinum." @@ -585,15 +550,13 @@ msgstr "" #: dialogpages/diffpage.cpp:262 -#, fuzzy, kde-format -#| msgid "Ignore regexp:" +#, kde-format msgctxt "@option:check" msgid "Ignore regexp:" msgstr "Hunsa regexp:" #: 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 "Þetta samsvarar -I diff valkostinum." @@ -613,23 +576,23 @@ "Add the regular expression here that you want to use\n" "to ignore lines that match it." msgstr "" +"Bættu við reglulegu segðinni sem þú vilt nota\n" +"til að hunsa línur sem samsvara henni." #: dialogpages/diffpage.cpp:274 -#, fuzzy, kde-format -#| msgid "Whitespace" +#, kde-format msgctxt "@title:group" msgid "Whitespace" msgstr "Bil" #: dialogpages/diffpage.cpp:276 -#, fuzzy, kde-format +#, kde-format msgctxt "@option:check" msgid "E&xpand tabs to spaces in output" -msgstr "Breyta dálkalykli í bil" +msgstr "Breyta dálkalyklum (Tab) í bil í úttaki" #: 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 "Þetta samsvarar -t diff valkostinum." @@ -643,15 +606,13 @@ msgstr "" #: 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 "&Hunsa viðbættar eða fjarlægðar tómar línur" #: 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 "Þetta samsvarar -B diff valkostinum." @@ -665,15 +626,13 @@ msgstr "" #: 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 "H&unsa breytingar í fjölda bila" #: 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 "Þetta samsvarar -b diff valkostinum." @@ -687,14 +646,13 @@ msgstr "" #: dialogpages/diffpage.cpp:288 -#, fuzzy, kde-format +#, kde-format msgctxt "@option:check" msgid "Ign&ore all whitespace" -msgstr "Hunsa breytingar í bilum" +msgstr "Hunsa öll biltákn" #: 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 "Þetta samsvarar -w diff valkostinum." @@ -708,14 +666,13 @@ msgstr "" #: dialogpages/diffpage.cpp:292 -#, fuzzy, kde-format +#, kde-format msgctxt "@option:check" msgid "Igno&re changes due to tab expansion" -msgstr "Hunsa breytingar í bilum" +msgstr "Hunsa b&reytingar vegna útvíkkunar dálkmerkja" #: 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 "Þetta samsvarar -E diff valkostinum." @@ -731,15 +688,13 @@ msgstr "" #: dialogpages/diffpage.cpp:299 -#, fuzzy, kde-format -#| msgid "Options" +#, kde-format msgctxt "@title:tab" msgid "Options" msgstr "Valkostir" #: dialogpages/diffpage.cpp:311 -#, fuzzy, kde-format -#| msgid "File Pattern to Exclude" +#, kde-format msgctxt "@title:group" msgid "File Pattern to Exclude" msgstr "Skráamynstur sem á að hunsa" @@ -761,17 +716,17 @@ msgstr "" #: dialogpages/diffpage.cpp:328 -#, fuzzy, kde-format -#| msgid "File Pattern to Exclude" +#, kde-format msgctxt "@title:group" msgid "File with Filenames to Exclude" -msgstr "Skráamynstur sem á að hunsa" +msgstr "Skrár með skráaheitum sem á að undanskilja" #: dialogpages/diffpage.cpp:329 #, kde-format msgctxt "@info:tooltip" msgid "If this is checked you can enter a filename in the combo box below." msgstr "" +"Ef merkt er við þetta geturðu sett skráarheiti í reitinn hér fyrir neðan." #: dialogpages/diffpage.cpp:333 #, kde-format @@ -790,29 +745,25 @@ msgstr "" #: dialogpages/diffpage.cpp:344 -#, fuzzy, kde-format -#| msgid "Exclude" +#, kde-format msgctxt "@title:tab" msgid "Exclude" msgstr "Útiloka" #: dialogpages/filespage.cpp:39 dialogpages/filespage.cpp:68 -#, fuzzy, kde-format -#| msgid "N&ext File" +#, kde-format msgctxt "@info:tooltip" msgid "Select file" -msgstr "&Næsta skrá" +msgstr "Veldu skrá" #: dialogpages/filespage.cpp:51 dialogpages/filespage.cpp:80 -#, fuzzy, kde-format -#| msgid "Source Folder" +#, kde-format msgctxt "@info:tooltip" msgid "Select folder" -msgstr "Upprunamappa" +msgstr "Veldu möppu" #: dialogpages/filespage.cpp:87 -#, fuzzy, kde-format -#| msgid "Encoding" +#, kde-format msgctxt "@title:group" msgid "Encoding" msgstr "Stafatafla" @@ -821,157 +772,136 @@ #, kde-format msgctxt "@item:inlistbox encoding" msgid "Default" -msgstr "" +msgstr "Sjálfgefið" #: dialogpages/filespage.cpp:126 -#, fuzzy, kde-format -#| msgid "Source Folder" +#, kde-format msgctxt "@title:window" msgid "Select Folder" -msgstr "Upprunamappa" +msgstr "Veldu möppu" #: dialogpages/filespage.cpp:130 -#, fuzzy, kde-format -#| msgid "N&ext File" +#, kde-format msgctxt "@title:window" msgid "Select File" -msgstr "&Næsta skrá" +msgstr "Veldu skrá" #: dialogpages/viewpage.cpp:44 -#, fuzzy, kde-format -#| msgid "Colors" +#, kde-format msgctxt "@title:group" msgid "Colors" msgstr "Litir" #: dialogpages/viewpage.cpp:50 -#, fuzzy, kde-format -#| msgid "Removed color:" +#, kde-format msgctxt "@label:chooser" msgid "Removed color:" msgstr "Fjarlægt litur:" #: dialogpages/viewpage.cpp:54 -#, fuzzy, kde-format -#| msgid "Changed color:" +#, kde-format msgctxt "@label:chooser" msgid "Changed color:" msgstr "Breytt lítur" #: dialogpages/viewpage.cpp:58 -#, fuzzy, kde-format -#| msgid "Added color:" +#, kde-format msgctxt "@label:chooser" msgid "Added color:" msgstr "Bætt við litur:" #: dialogpages/viewpage.cpp:62 -#, fuzzy, kde-format -#| msgid "Applied color:" +#, kde-format msgctxt "@label:chooser" msgid "Applied color:" msgstr "Virkjað litur:" #: dialogpages/viewpage.cpp:66 -#, fuzzy, kde-format -#| msgid "Mouse Wheel" +#, kde-format msgctxt "@title:group" msgid "Mouse Wheel" msgstr "Músarhjól" #: dialogpages/viewpage.cpp:72 -#, fuzzy, kde-format -#| msgid "Number of lines:" +#, kde-format msgctxt "@label:spinbox" msgid "Number of lines:" msgstr "Fjöldi lína:" #: dialogpages/viewpage.cpp:77 -#, fuzzy, kde-format -#| msgid "Tabs to Spaces" +#, kde-format msgctxt "@title:group" msgid "Tabs to Spaces" msgstr "Tab í bil" #: 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 "Fjöldi bila til að breyta tab-stafi í:" #: dialogpages/viewpage.cpp:94 -#, fuzzy, kde-format -#| msgid "Text Font" +#, kde-format msgctxt "@title:group" msgid "Text Font" msgstr "Textaletur" #: dialogpages/viewpage.cpp:98 -#, fuzzy, kde-format -#| msgid "Font:" +#, kde-format msgctxt "@label:listbox" msgid "Font:" msgstr "Letur:" #: dialogpages/viewpage.cpp:103 -#, fuzzy, kde-format -#| msgid "Size:" +#, kde-format msgctxt "@label:spinbox" msgid "Size:" msgstr "Stærð:" #: dialogpages/viewpage.cpp:107 -#, fuzzy, kde-format +#, kde-format msgctxt "@title:tab" msgid "Fonts" -msgstr "Letur:" +msgstr "Letur" #: komparenavtreepart/komparenavtreepart.cpp:53 -#, fuzzy, kde-format -#| msgid "Source Folder" +#, kde-format msgctxt "@title:column" msgid "Source Folder" msgstr "Upprunamappa" #: komparenavtreepart/komparenavtreepart.cpp:59 -#, fuzzy, kde-format -#| msgid "Destination Folder" +#, kde-format msgctxt "@title:column" msgid "Destination Folder" msgstr "Úttaksmappa" #: komparenavtreepart/komparenavtreepart.cpp:66 -#, fuzzy, kde-format -#| msgid "Source File" +#, kde-format msgctxt "@title:column" msgid "Source File" msgstr "Upprunaskrá" #: komparenavtreepart/komparenavtreepart.cpp:67 -#, fuzzy, kde-format -#| msgid "Destination File" +#, kde-format msgctxt "@title:column" msgid "Destination File" msgstr "Úttaksskrá" #: komparenavtreepart/komparenavtreepart.cpp:76 -#, fuzzy, kde-format -#| msgid "Source Line" +#, kde-format msgctxt "@title:column" msgid "Source Line" msgstr "Upprunalína" #: komparenavtreepart/komparenavtreepart.cpp:77 -#, fuzzy, kde-format -#| msgid "Destination Line" +#, kde-format msgctxt "@title:column" msgid "Destination Line" msgstr "Úttakslína" #: komparenavtreepart/komparenavtreepart.cpp:78 -#, fuzzy, kde-format -#| msgid "Difference" +#, kde-format msgctxt "@title:column" msgid "Difference" msgstr "Mismunur" @@ -980,8 +910,8 @@ #, kde-format msgid "Applied: Changes made to %1 line undone" msgid_plural "Applied: Changes made to %1 lines undone" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Virkjað: Breytingar gerðar á %1 línu afturkallaðar" +msgstr[1] "Virkjað: Breytingar gerðar á %1 línum afturkallaðar" #: komparenavtreepart/komparenavtreepart.cpp:456 #, kde-format @@ -994,8 +924,8 @@ #, kde-format msgid "Applied: Insertion of %1 line undone" msgid_plural "Applied: Insertion of %1 lines undone" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Virkjað: Innsetning á %1 línu afturkölluð" +msgstr[1] "Virkjað: Innsetning á %1 línum afturkölluð" #: komparenavtreepart/komparenavtreepart.cpp:464 #, kde-format @@ -1008,8 +938,8 @@ #, kde-format msgid "Applied: Deletion of %1 line undone" msgid_plural "Applied: Deletion of %1 lines undone" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Virkjað: Eyðing á %1 línu afturkölluð" +msgstr[1] "Virkjað: Eyðing á %1 línum afturkölluð" #: komparenavtreepart/komparenavtreepart.cpp:472 #, kde-format @@ -1019,36 +949,31 @@ msgstr[1] "Eyddi %1 línum" #: komparenavtreepart/komparenavtreepart.cpp:627 -#, fuzzy, kde-format -#| msgid "Unknown" +#, kde-format msgctxt "@item directory name not known" msgid "Unknown" msgstr "Óþekkt" #: komparepart/kompare_part.cpp:177 -#, fuzzy, kde-format -#| msgid "Save &All" +#, kde-format msgctxt "@action" msgid "Save &All" msgstr "Vist&a Allt" #: komparepart/kompare_part.cpp:179 -#, fuzzy, kde-format -#| msgid "Save .&diff..." +#, kde-format msgctxt "@action" msgid "Save &Diff..." -msgstr "Vista .&diff..." +msgstr "Vista &diff-mismun..." #: komparepart/kompare_part.cpp:181 -#, fuzzy, kde-format -#| msgid "Swap Source with Destination" +#, kde-format msgctxt "@action" msgid "Swap Source with Destination" msgstr "Víxla á uppruna og áfangastað" #: komparepart/kompare_part.cpp:188 -#, fuzzy, kde-format -#| msgid "Show Statistics" +#, kde-format msgctxt "@action" msgid "Show Statistics" msgstr "Sýna tölfræði" @@ -1057,7 +982,7 @@ #, kde-format msgctxt "@action" msgid "Refresh Diff" -msgstr "" +msgstr "Endurlesa mismun" #: komparepart/kompare_part.cpp:303 komparepart/kompare_part.cpp:316 #, kde-format @@ -1070,73 +995,63 @@ msgstr "<qt>Slóðin <b>%1</b> er ekki til á kerfinu þínu.</qt>" #: komparepart/kompare_part.cpp:542 -#, fuzzy, kde-format -#| msgid "Diff Options" +#, kde-format msgctxt "@title:window" msgid "Diff Options" -msgstr "Diff valkostir" +msgstr "Valkostir diff-mismunar" #: komparepart/kompare_part.cpp:561 -#, fuzzy, kde-format -#| msgid "Save .diff" +#, kde-format msgctxt "@title:window" msgid "Save .diff" msgstr "Vista .diff" #: komparepart/kompare_part.cpp:563 -#, fuzzy, kde-format -#| msgid "*.diff *.dif *.patch|Patch Files" +#, kde-format msgid "Patch Files (*.diff *.dif *.patch)" -msgstr "*.diff *.dif *.patch|Patch skrár" +msgstr "Patch-skrár (*.diff *.dif *.patch)" #: komparepart/kompare_part.cpp:624 -#, fuzzy, kde-format -#| msgid "Running diff..." +#, kde-format msgctxt "@info:status" msgid "Running diff..." msgstr "Keyri diff..." #: komparepart/kompare_part.cpp:627 -#, fuzzy, kde-format -#| msgid "Parsing diff output..." +#, kde-format msgctxt "@info:status" msgid "Parsing diff output..." -msgstr "Þátta diff útták..." +msgstr "Þátta diff-mismunaútták..." #: komparepart/kompare_part.cpp:683 -#, fuzzy, kde-format -#| msgid "Comparing file %1 with file %2" +#, kde-format msgctxt "@info:status" msgid "Comparing file %1 with file %2" msgstr "Ber skrána %1 saman við skrána %2" #: komparepart/kompare_part.cpp:688 -#, 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 "Ber saman skrár í %1 við skrár í %2" #: komparepart/kompare_part.cpp:693 -#, fuzzy, kde-format -#| msgid "Viewing diff output from %1" +#, kde-format msgctxt "@info:status" msgid "Viewing diff output from %1" msgstr "Sýni diff úttak frá %1" #: komparepart/kompare_part.cpp:696 -#, 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 "Blanda diff úttaki frá %1 í skrá %2" +msgstr "Blanda diff-mismunaúttaki frá %1 í skrá %2" #: komparepart/kompare_part.cpp:701 -#, 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 "Blanda diff úttaki frá %1 í möppu %2" +msgstr "Blanda diff-mismunaúttaki frá %1 í möppu %2" #: komparepart/kompare_part.cpp:752 komparepart/kompare_part.cpp:783 #: komparepart/kompare_part.cpp:899 @@ -1150,50 +1065,43 @@ #: komparepart/kompare_part.cpp:754 komparepart/kompare_part.cpp:785 #: komparepart/kompare_part.cpp:901 -#, fuzzy, kde-format -#| msgid "Save Changes?" +#, kde-format msgctxt "@title:window" msgid "Save Changes?" msgstr "Vista breytingar?" #: komparepart/kompare_part.cpp:824 -#, fuzzy, kde-format -#| msgid "Unified" +#, kde-format msgctxt "@item diff format" msgid "Unified" msgstr "Sameinað" #: komparepart/kompare_part.cpp:827 -#, fuzzy, kde-format -#| msgid "Context" +#, kde-format msgctxt "@item diff format" msgid "Context" msgstr "Samhengi" #: komparepart/kompare_part.cpp:830 -#, fuzzy, kde-format -#| msgid "RCS" +#, kde-format msgctxt "@item diff format" msgid "RCS" msgstr "RCS" #: komparepart/kompare_part.cpp:833 -#, fuzzy, kde-format -#| msgid "Ed" +#, kde-format msgctxt "@item diff format" msgid "Ed" -msgstr "Ed" +msgstr "Br" #: komparepart/kompare_part.cpp:836 -#, fuzzy, kde-format -#| msgid "Normal" +#, kde-format msgctxt "@item diff format" msgid "Normal" msgstr "Venjulegt" #: komparepart/kompare_part.cpp:840 -#, fuzzy, kde-format -#| msgid "Unknown" +#, kde-format msgctxt "@item diff format" msgid "Unknown" msgstr "Óþekkt" @@ -1204,16 +1112,15 @@ "No diff file, or no 2 files have been diffed. Therefore no stats are " "available." msgstr "" -"Engin diff skrá, eða engar tvær skrár hafa verið athugaðar. Þess vegna eru " +"Engin diff-skrá, eða engar tvær skrár hafa verið athugaðar. Þess vegna eru " "engar tölfræðiupplýsingar tiltækar." #: komparepart/kompare_part.cpp:858 komparepart/kompare_part.cpp:872 #: komparepart/kompare_part.cpp:888 -#, fuzzy, kde-format -#| msgid "Diff Statistics" +#, kde-format msgctxt "@title:window" msgid "Diff Statistics" -msgstr "Diff tölfræði" +msgstr "Tölfræði diff-mismunar" #: komparepart/kompare_part.cpp:862 #, kde-format @@ -1252,7 +1159,7 @@ msgstr "" "Tölfræði:\n" "\n" -"Fjöldi skráa í diff skrá: %1\n" +"Fjöldi skráa í diff-mismunaskrá: %1\n" "Snið: %2\n" "\n" "Núverandi gamla skrá: %3\n" @@ -1268,32 +1175,28 @@ msgstr "&Mismunur" #: komparepart/kompareprefdlg.cpp:27 -#, fuzzy, kde-format -#| msgid "Preferences" +#, kde-format msgctxt "@title:window" msgid "Preferences" msgstr "Stillingar" #: komparepart/kompareprefdlg.cpp:37 -#, fuzzy, kde-format -#| msgid "View" +#, kde-format msgctxt "@title:tab" msgid "View" msgstr "Skoðun" #: komparepart/kompareprefdlg.cpp:39 -#, fuzzy, kde-format -#| msgid "View Settings" +#, kde-format msgctxt "@title" msgid "View Settings" msgstr "Stillingar sýnar" #: komparepart/kompareprefdlg.cpp:45 -#, fuzzy, kde-format -#| msgid "Diff Settings" +#, kde-format msgctxt "@title" msgid "Diff Settings" -msgstr "Stillingar diff" +msgstr "Stillingar diff-mismunar" #. i18n: ectx: property (title), widget (QGroupBox, m_FormatGB) #: komparepart/komparesaveoptionsbase.ui:29 @@ -1303,10 +1206,9 @@ #. i18n: ectx: property (text), widget (QRadioButton, m_ContextRB) #: komparepart/komparesaveoptionsbase.ui:35 -#, fuzzy, kde-format -#| msgid "Context" +#, kde-format msgid "&Context" -msgstr "Samhengi" +msgstr "Sam&hengi" #. i18n: ectx: property (text), widget (QRadioButton, m_EdRB) #: komparepart/komparesaveoptionsbase.ui:42 @@ -1316,10 +1218,9 @@ #. i18n: ectx: property (text), widget (QRadioButton, m_NormalRB) #: komparepart/komparesaveoptionsbase.ui:49 -#, fuzzy, kde-format -#| msgid "Normal" +#, kde-format msgid "&Normal" -msgstr "Venjulegt" +msgstr "Ve&njulegt" #. i18n: ectx: property (text), widget (QRadioButton, m_RCSRB) #: komparepart/komparesaveoptionsbase.ui:56 @@ -1329,17 +1230,15 @@ #. i18n: ectx: property (text), widget (QRadioButton, m_UnifiedRB) #: komparepart/komparesaveoptionsbase.ui:63 -#, fuzzy, kde-format -#| msgid "Unified" +#, kde-format msgid "&Unified" -msgstr "Sameinað" +msgstr "Sa&meinað" #. i18n: ectx: property (text), widget (QRadioButton, m_SideBySideRB) #: komparepart/komparesaveoptionsbase.ui:73 -#, fuzzy, kde-format -#| msgid "Side-by-side" +#, kde-format msgid "&Side-by-side" -msgstr "Hlið við hlið" +msgstr "H&lið-við-hlið" #. i18n: ectx: property (text), widget (QLabel, m_ContextLinesLabel) #: komparepart/komparesaveoptionsbase.ui:85 @@ -1411,7 +1310,7 @@ #: komparepart/komparesaveoptionsbase.ui:222 #, kde-format msgid "Run Diff In" -msgstr "Keyra mismun/diff í" +msgstr "Keyra diff-mismun í" #. i18n: ectx: property (title), widget (QGroupBox, m_CommandLineGB) #: komparepart/komparesaveoptionsbase.ui:247 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-25.12.1/src/app/org.kde.kompare.appdata.xml new/kompare-25.12.2/src/app/org.kde.kompare.appdata.xml --- old/kompare-25.12.1/src/app/org.kde.kompare.appdata.xml 2026-01-03 11:54:01.000000000 +0100 +++ new/kompare-25.12.2/src/app/org.kde.kompare.appdata.xml 2026-01-31 10:28:44.000000000 +0100 @@ -311,6 +311,7 @@ <category>Development</category> </categories> <releases> + <release version="4.2.25122" date="2026-02-05"/> <release version="4.2.25121" date="2026-01-08"/> <release version="4.2.25120" date="2025-12-11"/> <release version="4.2.25083" date="2025-11-06"/>
