Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gnote for openSUSE:Factory checked in at 2026-03-03 16:39:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnote (Old) and /work/SRC/openSUSE:Factory/.gnote.new.29461 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnote" Tue Mar 3 16:39:01 2026 rev:108 rq:1336042 version:49.3 Changes: -------- --- /work/SRC/openSUSE:Factory/gnote/gnote.changes 2025-12-30 12:02:24.157582747 +0100 +++ /work/SRC/openSUSE:Factory/.gnote.new.29461/gnote.changes 2026-03-03 16:40:06.425067446 +0100 @@ -1,0 +2,9 @@ +Sun Mar 1 20:47:06 UTC 2026 - Bjørn Lie <[email protected]> + +- Update to version 49.3: + + Fixes: + - Fix synchronization hang on recoverable failure + - Fix WebDAV synchronization failure when writing manifest file + + Updated translations. + +------------------------------------------------------------------- Old: ---- gnote-49.2.obscpio New: ---- gnote-49.3.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnote.spec ++++++ --- /var/tmp/diff_new_pack.EoPx6j/_old 2026-03-03 16:40:07.073094222 +0100 +++ /var/tmp/diff_new_pack.EoPx6j/_new 2026-03-03 16:40:07.073094222 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnote # -# Copyright (c) 2025 SUSE LLC and contributors +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define glib_version 2.74 Name: gnote -Version: 49.2 +Version: 49.3 Release: 0 Summary: A Port of Tomboy to C++ License: GPL-3.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.EoPx6j/_old 2026-03-03 16:40:07.149097361 +0100 +++ /var/tmp/diff_new_pack.EoPx6j/_new 2026-03-03 16:40:07.161097857 +0100 @@ -3,7 +3,7 @@ <service name="obs_scm" mode="manual"> <param name="scm">git</param> <param name="url">https://gitlab.gnome.org/GNOME/gnote.git</param> - <param name="revision">49.2</param> + <param name="revision">49.3</param> <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param> <param name="versionrewrite-pattern">v?(.*)\+0</param> <param name="versionrewrite-replacement">\1</param> ++++++ gnote-49.2.obscpio -> gnote-49.3.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnote-49.2/NEWS new/gnote-49.3/NEWS --- old/gnote-49.2/NEWS 2025-12-29 18:07:02.000000000 +0100 +++ new/gnote-49.3/NEWS 2026-03-01 21:23:16.000000000 +0100 @@ -1,3 +1,18 @@ +49.3 - 2026-03-01 + +Fixes: + * Fix synchronization hang on recoverable failure + * Fix WebDAV synchronization failure when writing manifest file + +Translations: + * Updated translations: + - Brazilian Portuguese (pt_BR) + - Hungarian (hu) + - Lithuanian (lt) + - Slovenian (sl) + - Swedish (sv) + - Ukrainian (uk) + 49.2 - 2025-12-29 Fixes: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnote-49.2/data/org.gnome.Gnote.appdata.xml.in new/gnote-49.3/data/org.gnome.Gnote.appdata.xml.in --- old/gnote-49.2/data/org.gnome.Gnote.appdata.xml.in 2025-12-29 18:07:02.000000000 +0100 +++ new/gnote-49.3/data/org.gnome.Gnote.appdata.xml.in 2026-03-01 21:23:16.000000000 +0100 @@ -35,6 +35,15 @@ <update_contact>aurimas.cernius_at_mailo.com</update_contact> <content_rating type="oars-1.1"/> <releases> + <release version="49.3" date="2026-03-01"> + <description> + <ul> + <li>Fix synchronization hang on recoverable failure</li> + <li>Fix WebDAV synchronization failure when writing manifest file</li> + <li>Translation updates</li> + </ul> + </description> + </release> <release version="49.2" date="2025-12-29"> <description> <ul> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnote-49.2/meson.build new/gnote-49.3/meson.build --- old/gnote-49.2/meson.build 2025-12-29 18:07:02.000000000 +0100 +++ new/gnote-49.3/meson.build 2026-03-01 21:23:16.000000000 +0100 @@ -1,5 +1,5 @@ project('gnote', 'cpp', - version: '49.2', + version: '49.3', meson_version: '>=0.59.0', default_options: ['cpp_std=c++17'], ) @@ -8,7 +8,7 @@ i18n = import('i18n') gnote_release = meson.project_version().split('.')[0] -libgnote_version_info = '0.0.2' +libgnote_version_info = '0.0.3' glib_version = '>=2.74' gio_dep = dependency('gio-2.0', version: glib_version) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnote-49.2/po/hu.po new/gnote-49.3/po/hu.po --- old/gnote-49.2/po/hu.po 2025-12-29 18:07:02.000000000 +0100 +++ new/gnote-49.3/po/hu.po 2026-03-01 21:23:16.000000000 +0100 @@ -1,5 +1,5 @@ # Hungarian translation for gnote. -# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026 Free Software Foundation, Inc. # This file is distributed under the same license as the gnote package. # # Gabor Torok <gabo at linuxportal dot hu>, 2004. @@ -8,21 +8,21 @@ # Balint Laza <laza at szentkoronaradio dot com>, 2008. # István Nyitrai <sianis at gmail dot com>, 2009. # Lukács Bence <lukacs.bence1 at gmail dot com>, 2012. -# Balázs Úr <ur.balazs at fsf dot hu>, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025. +# Balázs Úr <ur.balazs at fsf dot hu>, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026. # Balázs Meskó <mesko.balazs at fsf dot hu>, 2021. msgid "" msgstr "" "Project-Id-Version: gnote master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnote/issues/\n"; -"POT-Creation-Date: 2025-09-08 20:07+0000\n" -"PO-Revision-Date: 2025-09-09 22:07+0200\n" +"POT-Creation-Date: 2026-02-23 21:05+0000\n" +"PO-Revision-Date: 2026-03-01 14:06+0100\n" "Last-Translator: Balázs Úr <ur.balazs at fsf dot hu>\n" "Language-Team: Hungarian <openscope at fsf dot hu>\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 24.12.3\n" +"X-Generator: Lokalize 25.08.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: data/org.gnome.Gnote.appdata.xml.in:7 data/org.gnome.Gnote.desktop.in:2 @@ -75,7 +75,7 @@ msgstr "Új ablak" #: data/org.gnome.Gnote.desktop.in:23 src/notebooks/notebook.cpp:196 -#: src/notemanagerbase.cpp:282 src/searchnoteswidget.cpp:343 +#: src/notemanagerbase.cpp:297 src/searchnoteswidget.cpp:343 msgid "New Note" msgstr "Új jegyzet" @@ -892,8 +892,8 @@ #: src/plugins/bugzilla/bugzillapreferences.cpp:415 #: src/plugins/exporttohtml/exporttohtmldialog.cpp:45 #: src/notebooks/createnotebookdialog.cpp:65 -#: src/notebooks/notebookmanager.cpp:285 src/note.cpp:65 src/utils.cpp:314 -#: src/utils.cpp:321 +#: src/notebooks/notebookmanager.cpp:285 src/note.cpp:65 src/utils.cpp:330 +#: src/utils.cpp:337 msgid "_Cancel" msgstr "_Mégse" @@ -1467,13 +1467,18 @@ "Úr Balázs <ur dot balazs at fsf dot hu>" #: src/gnote.cpp:286 +#| msgid "" +#| "Copyright © 2010-2025 Aurimas Cernius\n" +#| "Copyright © 2009-2011 Debarshi Ray\n" +#| "Copyright © 2009 Hubert Figuiere\n" +#| "Copyright © 2004-2009 the Tomboy original authors." msgid "" -"Copyright © 2010-2025 Aurimas Cernius\n" +"Copyright © 2010-2026 Aurimas Cernius\n" "Copyright © 2009-2011 Debarshi Ray\n" "Copyright © 2009 Hubert Figuiere\n" "Copyright © 2004-2009 the Tomboy original authors." msgstr "" -"Copyright © 2010-2025 Aurimas Cernius\n" +"Copyright © 2010-2026 Aurimas Cernius\n" "Copyright © 2009-2011 Debarshi Ray\n" "Copyright © 2009 Hubert Figuiere\n" "Copyright © 2004-2009 a Tomboy eredeti szerzői." @@ -1482,80 +1487,87 @@ msgid "A simple and easy to use desktop note-taking application." msgstr "Egyszerű és könnyen használható asztali jegyzetkezelő alkalmazás." -#: src/gnote.cpp:292 +#. TRANSLATORS: +#. * The link to main wiki page in English. You can localize it in subdirectory for your locale and have this link point to it. +#. +#: src/gnote.cpp:294 +msgid "https://gitlab.gnome.org/GNOME/gnote/-/wikis/Gnote"; +msgstr "https://gitlab.gnome.org/GNOME/gnote/-/wikis/Gnote"; + +#: src/gnote.cpp:295 msgid "Homepage" msgstr "Honlap" -#: src/gnote.cpp:296 +#: src/gnote.cpp:299 msgid "Contributors" msgstr "Közreműködők" -#: src/gnote.cpp:507 +#: src/gnote.cpp:510 msgid "Run Gnote in background." msgstr "A Gnote futtatása a háttérben." -#: src/gnote.cpp:508 +#: src/gnote.cpp:511 msgid "Run Gnote as GNOME Shell search provider." msgstr "A Gnote futtatása GNOME parancsértelmező keresőszolgáltatóként." -#: src/gnote.cpp:509 +#: src/gnote.cpp:512 msgid "Specify the path of the directory containing the notes." msgstr "Adja meg a jegyzeteket tartalmazó könyvtár útvonalát." -#: src/gnote.cpp:509 +#: src/gnote.cpp:512 msgid "path" msgstr "útvonal" -#: src/gnote.cpp:510 +#: src/gnote.cpp:513 msgid "Open the search all notes window with the search text." msgstr "A Keresés minden jegyzetben ablak megnyitása a keresőkifejezéssel." -#: src/gnote.cpp:510 src/gnote.cpp:516 +#: src/gnote.cpp:513 src/gnote.cpp:519 msgid "text" msgstr "szöveg" -#: src/gnote.cpp:511 +#: src/gnote.cpp:514 msgid "Print version information." msgstr "Verzióinformációk kiírása." -#: src/gnote.cpp:512 +#: src/gnote.cpp:515 msgid "Create and display a new note, with a optional title." msgstr "Új jegyzet létrehozása és megjelenítése, elhagyható címmel." -#: src/gnote.cpp:512 +#: src/gnote.cpp:515 msgid "title" msgstr "cím" -#: src/gnote.cpp:513 +#: src/gnote.cpp:516 msgid "Open a new window." msgstr "Új ablak megnyitása." -#: src/gnote.cpp:514 +#: src/gnote.cpp:517 msgid "Display the existing note matching title." msgstr "Az illeszkedő című meglévő jegyzet megjelenítése." -#: src/gnote.cpp:514 +#: src/gnote.cpp:517 msgid "title/url" msgstr "cím/url" -#: src/gnote.cpp:515 +#: src/gnote.cpp:518 msgid "Display the 'Start Here' note." msgstr "A „Kezdje itt” jegyzet megjelenítése." -#: src/gnote.cpp:516 +#: src/gnote.cpp:519 msgid "Search and highlight text in the opened note." msgstr "Szöveg keresése és kiemelése megnyitott jegyzetben." -#: src/gnote.cpp:520 +#: src/gnote.cpp:523 msgid "A note taking application" msgstr "Jegyzetkezelő alkalmazás" -#: src/gnote.cpp:520 +#: src/gnote.cpp:523 msgid "Gnote options at launch" msgstr "A Gnote indítási kapcsolói" #. TRANSLATORS: %1: format placeholder for the version string. -#: src/gnote.cpp:704 +#: src/gnote.cpp:707 msgid "Version %1" msgstr "%1 verzió" @@ -1720,15 +1732,15 @@ #. New Note Template #. TRANSLATORS: This is 'New Note' Template, not New 'Note Template' -#: src/notemanagerbase.cpp:101 src/preferencesdialog.cpp:339 +#: src/notemanagerbase.cpp:116 src/preferencesdialog.cpp:339 msgid "New Note Template" msgstr "Új jegyzet sablon" -#: src/notemanagerbase.cpp:334 +#: src/notemanagerbase.cpp:349 msgid "Describe your new note here." msgstr "Ide írhatja a jegyzet tartalmát." -#: src/notemanager.cpp:116 +#: src/notemanager.cpp:118 msgid "" "<note-content xmlns:link=\"http://beatniksoftware.com/tomboy/link\";>Start " "Here\n" @@ -1769,7 +1781,7 @@ "hivatkozást leírva a program automatikusan aláhúzza azt? Kattintson a " "hivatkozásra a jegyzet megnyitásához.</note-content>" -#: src/notemanager.cpp:135 +#: src/notemanager.cpp:137 msgid "" "<note-content>Using Links in Gnote\n" "\n" @@ -1799,31 +1811,31 @@ "automatikusan hivatkozássá alakul.</note-content>" #. Attempt to find an existing Start Here note -#: src/notemanager.cpp:150 src/notemanager.cpp:185 +#: src/notemanager.cpp:152 src/notemanager.cpp:187 msgid "Start Here" msgstr "Kezdje itt" -#: src/notemanager.cpp:154 +#: src/notemanager.cpp:156 msgid "Using Links in Gnote" msgstr "Hivatkozások használata a Gnoteban" -#: src/notemanager.cpp:158 +#: src/notemanager.cpp:160 #, c-format msgid "Error creating start notes: %s" msgstr "Hiba a kezdő jegyzetek létrehozásakor: %s" #. TRANSLATORS: first %s is file, second is error -#: src/notemanager.cpp:173 +#: src/notemanager.cpp:175 #, c-format msgid "Error parsing note XML, skipping \"%s\": %s" msgstr "Hiba a jegyzet XML feldolgozásakor, „%s” kihagyása: %s" -#: src/notemanager.cpp:384 +#: src/notemanager.cpp:386 #, c-format msgid "Error while saving: %s" msgstr "Hiba a mentéskor: %s" -#: src/notemanager.cpp:389 +#: src/notemanager.cpp:391 #, c-format msgid "Did not find note with uri '%s', cannot save" msgstr "Nem volt „%s” URI-val rendelkező jegyzet található, nem lehet menteni" @@ -1980,7 +1992,7 @@ #. Button to close dialog. #: src/preferencesdialog.cpp:178 src/preferencesdialog.cpp:767 #: src/preferencesdialog.cpp:1004 src/preferencesdialog.cpp:1214 -#: src/synchronization/syncdialog.cpp:343 src/utils.cpp:311 +#: src/synchronization/syncdialog.cpp:343 src/utils.cpp:327 msgid "_Close" msgstr "_Bezárás" @@ -2405,7 +2417,7 @@ msgstr[0] "Nem sikerült letölteni %1 jegyzetfrissítést" msgstr[1] "Nem sikerült letölteni %1 jegyzetfrissítést" -#: src/synchronization/filesystemsyncserver.cpp:428 +#: src/synchronization/filesystemsyncserver.cpp:427 #, c-format msgid "" "Exception during server cleanup while committing. Server integrity is OK, " @@ -2415,12 +2427,12 @@ "integritása hibátlan, de néhány fölösleges fájl jelen lehet. A hibaüzenet: " "%s\n" -#: src/synchronization/filesystemsyncserver.cpp:634 +#: src/synchronization/filesystemsyncserver.cpp:633 #, c-format msgid "Error updating lock: %s" msgstr "Hiba a zár frissítésekor: %s" -#: src/synchronization/filesystemsyncserver.cpp:673 +#: src/synchronization/filesystemsyncserver.cpp:672 #, c-format msgid "Error deleting the old synchronization lock \"%s\": %s" msgstr "Hiba a régi szinkronizációs zár („%s”) törlésekor: %s" @@ -2693,12 +2705,12 @@ msgid "Synchronization failed with the following exception: %s" msgstr "A szinkronizálás meghiúsult a következő kivétellel: %s" -#: src/utils.cpp:74 +#: src/utils.cpp:75 #, c-format msgid "Failed to show help: %s" msgstr "Nem sikerült megjeleníteni a súgót: %s" -#: src/utils.cpp:75 +#: src/utils.cpp:76 msgid "" "The \"Gnote Manual\" could not be found. Please verify that your " "installation has been completed successfully." @@ -2706,75 +2718,75 @@ "A „Gnote jegyzetkezelő kézikönyve” nem található. Ellenőrizze, hogy a " "telepítés sikeresen fejeződött-e be." -#: src/utils.cpp:81 +#: src/utils.cpp:82 msgid "Help not found" msgstr "Nem található súgó" #: src/utils.cpp:99 #, c-format -msgid "Failed to open URL: %s" -msgstr "Nem sikerült megnyitni az URL-t: %s" +msgid "Failed to open '%s': %s" +msgstr "A(z) „%s” megnyitása sikertelen: %s" -#: src/utils.cpp:115 +#: src/utils.cpp:131 msgid "Cannot open location" msgstr "Nem lehet megnyitni a helyet" #. TRANSLATORS: argument %1 is time. -#: src/utils.cpp:176 +#: src/utils.cpp:192 msgid "Today, %1" msgstr "Ma, %1" -#: src/utils.cpp:177 +#: src/utils.cpp:193 msgid "Today" msgstr "Ma" #. TRANSLATORS: argument %1 is time. -#: src/utils.cpp:182 +#: src/utils.cpp:198 msgid "Tomorrow, %1" msgstr "Holnap, %1" -#: src/utils.cpp:183 +#: src/utils.cpp:199 msgid "Tomorrow" msgstr "Holnap" #. TRANSLATORS: argument %1 is time. -#: src/utils.cpp:188 +#: src/utils.cpp:204 msgid "Yesterday, %1" msgstr "Tegnap, %1" -#: src/utils.cpp:189 +#: src/utils.cpp:205 msgid "Yesterday" msgstr "Tegnap" #. TRANSLATORS: date in current year. -#: src/utils.cpp:194 +#: src/utils.cpp:210 #, no-c-format msgid "%b %d" msgstr "%b. %-d." #. TRANSLATORS: date in other than current year. -#: src/utils.cpp:198 +#: src/utils.cpp:214 msgid "%b %d %Y" msgstr "%Y %b. %d" #. TRANSLATORS: argument %1 is date, %2 is time. -#: src/utils.cpp:203 +#: src/utils.cpp:219 msgid "%1, %2" msgstr "%1, %2" -#: src/utils.cpp:214 +#: src/utils.cpp:230 msgid "No Date" msgstr "Nincs dátum" -#: src/utils.cpp:308 src/utils.cpp:322 +#: src/utils.cpp:324 src/utils.cpp:338 msgid "_OK" msgstr "_OK" -#: src/utils.cpp:317 +#: src/utils.cpp:333 msgid "_No" msgstr "_Nem" -#: src/utils.cpp:318 +#: src/utils.cpp:334 msgid "_Yes" msgstr "_Igen" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnote-49.2/po/lt.po new/gnote-49.3/po/lt.po --- old/gnote-49.2/po/lt.po 2025-12-29 18:07:02.000000000 +0100 +++ new/gnote-49.3/po/lt.po 2026-03-01 21:23:16.000000000 +0100 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: gnote.master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnote/issues/\n"; -"POT-Creation-Date: 2025-12-28 21:28+0000\n" -"PO-Revision-Date: 2025-12-29 18:56+0200\n" +"POT-Creation-Date: 2026-02-23 21:05+0000\n" +"PO-Revision-Date: 2026-02-28 22:29+0200\n" "Last-Translator: Aurimas Černius <[email protected]>\n" "Language-Team: Lietuvių <[email protected]>\n" "Language: lt\n" @@ -1449,12 +1449,12 @@ #: src/gnote.cpp:286 msgid "" -"Copyright © 2010-2025 Aurimas Cernius\n" +"Copyright © 2010-2026 Aurimas Cernius\n" "Copyright © 2009-2011 Debarshi Ray\n" "Copyright © 2009 Hubert Figuiere\n" "Copyright © 2004-2009 the Tomboy original authors." msgstr "" -"Autorių teisės saugomos © 2010-2025 Aurimas Černius\n" +"Autorių teisės saugomos © 2010-2026 Aurimas Černius\n" "Autorių teisės saugomos © 2009-2011 Debarshi Ray\n" "Autorių teisės saugomos © 2009 Hubert Figuiere\n" "Autorių teisės saugomos © 2004-2009 Tomboy originalo autoriams." @@ -2391,7 +2391,7 @@ msgstr[1] "Nepavyko atsisiųsti %1 raštelių atnaujinimų" msgstr[2] "Nepavyko atsisiųsti %1 raštelių atnaujinimų" -#: src/synchronization/filesystemsyncserver.cpp:428 +#: src/synchronization/filesystemsyncserver.cpp:427 #, c-format msgid "" "Exception during server cleanup while committing. Server integrity is OK, " @@ -2400,12 +2400,12 @@ "Kilo išskirtinė situacija išvalant serverį patvirtinimo metu. Su serverio " "vientisumu bėdų nėra, bet gali būti papildomų failų. Štai klaida: %s\n" -#: src/synchronization/filesystemsyncserver.cpp:634 +#: src/synchronization/filesystemsyncserver.cpp:633 #, c-format msgid "Error updating lock: %s" msgstr "Klaida atnaujinant užraktą: %s" -#: src/synchronization/filesystemsyncserver.cpp:673 +#: src/synchronization/filesystemsyncserver.cpp:672 #, c-format msgid "Error deleting the old synchronization lock \"%s\": %s" msgstr "Klaida trinant seną sinchronizacijos užraktą „%s“: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnote-49.2/po/pt_BR.po new/gnote-49.3/po/pt_BR.po --- old/gnote-49.2/po/pt_BR.po 2025-12-29 18:07:02.000000000 +0100 +++ new/gnote-49.3/po/pt_BR.po 2026-03-01 21:23:16.000000000 +0100 @@ -10,17 +10,17 @@ # Enrico Nicoletto <[email protected]>, 2013-2014, 2020-2021, 2023. # Rafael Fontenelle <[email protected]>, 2013-2025. # Álvaro Burns <>, 2025. -# Juliano de Souza Camargo <[email protected]>, 2024-2025. # Leônidas Araújo <[email protected]>, 2025. +# Juliano de Souza Camargo <[email protected]>, 2024-2026. # msgid "" msgstr "" "Project-Id-Version: gnote master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnote/issues/\n"; -"POT-Creation-Date: 2025-09-28 23:44+0000\n" -"PO-Revision-Date: 2025-10-11 17:37-0300\n" -"Last-Translator: Leônidas Araújo <[email protected]>\n" -"Language-Team: Brazilian Portuguese <br.gnome.org/traducao>\n" +"POT-Creation-Date: 2025-12-29 17:07+0000\n" +"PO-Revision-Date: 2026-01-06 10:03-0300\n" +"Last-Translator: Juliano de Souza Camargo <[email protected]>\n" +"Language-Team: Brazilian Portuguese <https://br.gnome.org/traducao/>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -898,8 +898,8 @@ #: src/plugins/bugzilla/bugzillapreferences.cpp:415 #: src/plugins/exporttohtml/exporttohtmldialog.cpp:45 #: src/notebooks/createnotebookdialog.cpp:65 -#: src/notebooks/notebookmanager.cpp:285 src/note.cpp:65 src/utils.cpp:314 -#: src/utils.cpp:321 +#: src/notebooks/notebookmanager.cpp:285 src/note.cpp:65 src/utils.cpp:330 +#: src/utils.cpp:337 msgid "_Cancel" msgstr "_Cancelar" @@ -1496,8 +1496,8 @@ #. * The link to main wiki page in English. You can localize it in subdirectory for your locale and have this link point to it. #. #: src/gnote.cpp:294 -msgid "https://gitlab.gnome.org/GNOME/gnote/-/blob/master/wiki/main.md"; -msgstr "https://gitlab.gnome.org/GNOME/gnote/-/blob/master/wiki/main.md"; +msgid "https://gitlab.gnome.org/GNOME/gnote/-/wikis/Gnote"; +msgstr "https://gitlab.gnome.org/GNOME/gnote/-/wikis/Gnote"; #: src/gnote.cpp:295 msgid "Homepage" @@ -1992,7 +1992,7 @@ #. Button to close dialog. #: src/preferencesdialog.cpp:178 src/preferencesdialog.cpp:767 #: src/preferencesdialog.cpp:1004 src/preferencesdialog.cpp:1214 -#: src/synchronization/syncdialog.cpp:343 src/utils.cpp:311 +#: src/synchronization/syncdialog.cpp:343 src/utils.cpp:327 msgid "_Close" msgstr "_Fechar" @@ -2707,12 +2707,12 @@ msgid "Synchronization failed with the following exception: %s" msgstr "Sincronização falhou com a seguinte exceção: %s" -#: src/utils.cpp:74 +#: src/utils.cpp:75 #, c-format msgid "Failed to show help: %s" msgstr "Falha ao mostrar ajuda: %s" -#: src/utils.cpp:75 +#: src/utils.cpp:76 msgid "" "The \"Gnote Manual\" could not be found. Please verify that your " "installation has been completed successfully." @@ -2720,75 +2720,75 @@ "O “Manual do Gnote” não foi localizado. Por favor, certifique-se de que a " "sua instalação foi concluída com sucesso." -#: src/utils.cpp:81 +#: src/utils.cpp:82 msgid "Help not found" msgstr "Ajuda não localizada" #: src/utils.cpp:99 #, c-format -msgid "Failed to open URL: %s" -msgstr "Falhou ao abrir URL: %s" +msgid "Failed to open '%s': %s" +msgstr "Falhou ao abrir '%s': %s" -#: src/utils.cpp:115 +#: src/utils.cpp:131 msgid "Cannot open location" msgstr "Não é possível abrir a localização" #. TRANSLATORS: argument %1 is time. -#: src/utils.cpp:176 +#: src/utils.cpp:192 msgid "Today, %1" msgstr "Hoje, %1" -#: src/utils.cpp:177 +#: src/utils.cpp:193 msgid "Today" msgstr "Hoje" #. TRANSLATORS: argument %1 is time. -#: src/utils.cpp:182 +#: src/utils.cpp:198 msgid "Tomorrow, %1" msgstr "Amanhã, %1" -#: src/utils.cpp:183 +#: src/utils.cpp:199 msgid "Tomorrow" msgstr "Amanhã" #. TRANSLATORS: argument %1 is time. -#: src/utils.cpp:188 +#: src/utils.cpp:204 msgid "Yesterday, %1" msgstr "Ontem, %1" -#: src/utils.cpp:189 +#: src/utils.cpp:205 msgid "Yesterday" msgstr "Ontem" #. TRANSLATORS: date in current year. -#: src/utils.cpp:194 +#: src/utils.cpp:210 #, no-c-format msgid "%b %d" msgstr "%b %d" #. TRANSLATORS: date in other than current year. -#: src/utils.cpp:198 +#: src/utils.cpp:214 msgid "%b %d %Y" msgstr "%b %d %Y" #. TRANSLATORS: argument %1 is date, %2 is time. -#: src/utils.cpp:203 +#: src/utils.cpp:219 msgid "%1, %2" msgstr "%1, %2" -#: src/utils.cpp:214 +#: src/utils.cpp:230 msgid "No Date" msgstr "Sem data" -#: src/utils.cpp:308 src/utils.cpp:322 +#: src/utils.cpp:324 src/utils.cpp:338 msgid "_OK" msgstr "_OK" -#: src/utils.cpp:317 +#: src/utils.cpp:333 msgid "_No" msgstr "_Não" -#: src/utils.cpp:318 +#: src/utils.cpp:334 msgid "_Yes" msgstr "_Sim" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnote-49.2/po/sl.po new/gnote-49.3/po/sl.po --- old/gnote-49.2/po/sl.po 2025-12-29 18:07:02.000000000 +0100 +++ new/gnote-49.3/po/sl.po 2026-03-01 21:23:16.000000000 +0100 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: gnote master\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnote/issues/\n"; -"POT-Creation-Date: 2025-12-28 21:28+0000\n" -"PO-Revision-Date: 2025-12-28 23:35+0100\n" +"POT-Creation-Date: 2026-02-23 21:05+0000\n" +"PO-Revision-Date: 2026-02-24 01:07+0100\n" "Last-Translator: Martin Srebotnjak <[email protected]>\n" "Language-Team: Slovenian <[email protected]>\n" "Language: sl\n" @@ -1445,12 +1445,12 @@ #: src/gnote.cpp:286 msgid "" -"Copyright © 2010-2025 Aurimas Cernius\n" +"Copyright © 2010-2026 Aurimas Cernius\n" "Copyright © 2009-2011 Debarshi Ray\n" "Copyright © 2009 Hubert Figuiere\n" "Copyright © 2004-2009 the Tomboy original authors." msgstr "" -"Avtorske pravice © 2010-2025 Aurimas Cernius\n" +"Avtorske pravice © 2010-2026 Aurimas Cernius\n" "Avtorske pravice © 2009-2011 Debarshi Ray\n" "Avtorske pravice © 2009 Hubert Figuiere\n" "Avtorske pravice © 2004-2009 izvorni avtorji Tomboy." @@ -1463,7 +1463,6 @@ #. * The link to main wiki page in English. You can localize it in subdirectory for your locale and have this link point to it. #. #: src/gnote.cpp:294 -#| msgid "https://gitlab.gnome.org/GNOME/gnote/-/blob/master/wiki/main.md"; msgid "https://gitlab.gnome.org/GNOME/gnote/-/wikis/Gnote"; msgstr "https://gitlab.gnome.org/GNOME/gnote/-/wikis/Gnote"; @@ -2392,7 +2391,7 @@ msgstr[2] "Neuspel prenos posodobitev %1 sporočilc" msgstr[3] "Neuspel prenos posodobitev %1 sporočilc" -#: src/synchronization/filesystemsyncserver.cpp:428 +#: src/synchronization/filesystemsyncserver.cpp:427 #, c-format msgid "" "Exception during server cleanup while committing. Server integrity is OK, " @@ -2401,12 +2400,12 @@ "Izjema pri čiščenju strežnika med oddajanjem. Integriteta strežnika je v " "redu, lahko pa da odvečne datoteke plavajo naokoli. Napaka: %s\n" -#: src/synchronization/filesystemsyncserver.cpp:634 +#: src/synchronization/filesystemsyncserver.cpp:633 #, c-format msgid "Error updating lock: %s" msgstr "Napaka pri posodabljanju zaklepanja: %s" -#: src/synchronization/filesystemsyncserver.cpp:673 +#: src/synchronization/filesystemsyncserver.cpp:672 #, c-format msgid "Error deleting the old synchronization lock \"%s\": %s" msgstr "Napaka med brisanjem starega zaklepa usklajevanja \"%s\": %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnote-49.2/po/sv.po new/gnote-49.3/po/sv.po --- old/gnote-49.2/po/sv.po 2025-12-29 18:07:02.000000000 +0100 +++ new/gnote-49.3/po/sv.po 2026-03-01 21:23:16.000000000 +0100 @@ -1,17 +1,17 @@ # Swedish messages for gnote. -# Copyright © 2004-2025 Free Software Foundation, Inc. +# Copyright © 2004-2026 Free Software Foundation, Inc. # Sergej Kotliar <[email protected]>, 2006. # Christian Rose <[email protected]>, 2004, 2005. # Daniel Nylander <[email protected]>, 2006, 2007, 2008, 2009, 2010, 2011, 2012. -# Anders Jonsson <[email protected]>, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025. +# Anders Jonsson <[email protected]>, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025, 2026. # Luna Jernberg <[email protected]>, 2020, 2022, 2023. # msgid "" msgstr "" "Project-Id-Version: gnote\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnote/issues/\n"; -"POT-Creation-Date: 2025-09-28 18:24+0000\n" -"PO-Revision-Date: 2025-09-29 01:43+0200\n" +"POT-Creation-Date: 2026-02-23 21:05+0000\n" +"PO-Revision-Date: 2026-02-24 01:03+0100\n" "Last-Translator: Anders Jonsson <[email protected]>\n" "Language-Team: Swedish <[email protected]>\n" "Language: sv\n" @@ -19,7 +19,7 @@ "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.7\n" +"X-Generator: Poedit 3.8\n" #: data/org.gnome.Gnote.appdata.xml.in:7 data/org.gnome.Gnote.desktop.in:2 #: src/recentchanges.cpp:99 src/recentchanges.cpp:121 @@ -884,8 +884,8 @@ #: src/plugins/bugzilla/bugzillapreferences.cpp:415 #: src/plugins/exporttohtml/exporttohtmldialog.cpp:45 #: src/notebooks/createnotebookdialog.cpp:65 -#: src/notebooks/notebookmanager.cpp:285 src/note.cpp:65 src/utils.cpp:314 -#: src/utils.cpp:321 +#: src/notebooks/notebookmanager.cpp:285 src/note.cpp:65 src/utils.cpp:330 +#: src/utils.cpp:337 msgid "_Cancel" msgstr "A_vbryt" @@ -1461,12 +1461,12 @@ #: src/gnote.cpp:286 msgid "" -"Copyright © 2010-2025 Aurimas Cernius\n" +"Copyright © 2010-2026 Aurimas Cernius\n" "Copyright © 2009-2011 Debarshi Ray\n" "Copyright © 2009 Hubert Figuiere\n" "Copyright © 2004-2009 the Tomboy original authors." msgstr "" -"Copyright © 2010-2025 Aurimas Cernius\n" +"Copyright © 2010-2026 Aurimas Cernius\n" "Copyright © 2009-2011 Debarshi Ray\n" "Copyright © 2009 Hubert Figuiere\n" "Copyright © 2004-2009 De ursprungliga Tomboy-upphovsmännen." @@ -1479,8 +1479,8 @@ #. * The link to main wiki page in English. You can localize it in subdirectory for your locale and have this link point to it. #. #: src/gnote.cpp:294 -msgid "https://gitlab.gnome.org/GNOME/gnote/-/blob/master/wiki/main.md"; -msgstr "https://gitlab.gnome.org/GNOME/gnote/-/blob/master/wiki/main.md"; +msgid "https://gitlab.gnome.org/GNOME/gnote/-/wikis/Gnote"; +msgstr "https://gitlab.gnome.org/GNOME/gnote/-/wikis/sv/home"; #: src/gnote.cpp:295 msgid "Homepage" @@ -1983,7 +1983,7 @@ #. Button to close dialog. #: src/preferencesdialog.cpp:178 src/preferencesdialog.cpp:767 #: src/preferencesdialog.cpp:1004 src/preferencesdialog.cpp:1214 -#: src/synchronization/syncdialog.cpp:343 src/utils.cpp:311 +#: src/synchronization/syncdialog.cpp:343 src/utils.cpp:327 msgid "_Close" msgstr "S_täng" @@ -2407,7 +2407,7 @@ msgstr[0] "Misslyckades med att hämta %1 anteckningsuppdatering" msgstr[1] "Misslyckades med att hämta %1 anteckningsuppdateringar" -#: src/synchronization/filesystemsyncserver.cpp:428 +#: src/synchronization/filesystemsyncserver.cpp:427 #, c-format msgid "" "Exception during server cleanup while committing. Server integrity is OK, " @@ -2416,12 +2416,12 @@ "Undantag under serverstädning vid incheckning. Serverns integritet är OK, " "men det kan finnas några överflödiga filer. Här är felet: %s\n" -#: src/synchronization/filesystemsyncserver.cpp:634 +#: src/synchronization/filesystemsyncserver.cpp:633 #, c-format msgid "Error updating lock: %s" msgstr "Fel vid uppdatering av lås: %s" -#: src/synchronization/filesystemsyncserver.cpp:673 +#: src/synchronization/filesystemsyncserver.cpp:672 #, c-format msgid "Error deleting the old synchronization lock \"%s\": %s" msgstr "Fel vid borttagning av det gamla synkroniseringslåset ”%s”: %s" @@ -2693,12 +2693,12 @@ msgid "Synchronization failed with the following exception: %s" msgstr "Synkronisering misslyckades med följande undantag: %s" -#: src/utils.cpp:74 +#: src/utils.cpp:75 #, c-format msgid "Failed to show help: %s" msgstr "Misslyckades med att visa hjälp: %s" -#: src/utils.cpp:75 +#: src/utils.cpp:76 msgid "" "The \"Gnote Manual\" could not be found. Please verify that your " "installation has been completed successfully." @@ -2706,75 +2706,75 @@ "”Handbok för Gnote-anteckningar” kunde inte hittas. Verifiera att din " "installation har färdigställts korrekt." -#: src/utils.cpp:81 +#: src/utils.cpp:82 msgid "Help not found" msgstr "Hjälp hittades inte" #: src/utils.cpp:99 #, c-format -msgid "Failed to open URL: %s" -msgstr "Misslyckades med att öppna URL: %s" +msgid "Failed to open '%s': %s" +msgstr "Misslyckades med att öppna ”%s”: %s" -#: src/utils.cpp:115 +#: src/utils.cpp:131 msgid "Cannot open location" msgstr "Kan inte öppna plats" #. TRANSLATORS: argument %1 is time. -#: src/utils.cpp:176 +#: src/utils.cpp:192 msgid "Today, %1" msgstr "I dag, %1" -#: src/utils.cpp:177 +#: src/utils.cpp:193 msgid "Today" msgstr "I dag" #. TRANSLATORS: argument %1 is time. -#: src/utils.cpp:182 +#: src/utils.cpp:198 msgid "Tomorrow, %1" msgstr "I morgon, %1" -#: src/utils.cpp:183 +#: src/utils.cpp:199 msgid "Tomorrow" msgstr "I morgon" #. TRANSLATORS: argument %1 is time. -#: src/utils.cpp:188 +#: src/utils.cpp:204 msgid "Yesterday, %1" msgstr "I går, %1" -#: src/utils.cpp:189 +#: src/utils.cpp:205 msgid "Yesterday" msgstr "I går" #. TRANSLATORS: date in current year. -#: src/utils.cpp:194 +#: src/utils.cpp:210 #, no-c-format msgid "%b %d" msgstr "%d %b" #. TRANSLATORS: date in other than current year. -#: src/utils.cpp:198 +#: src/utils.cpp:214 msgid "%b %d %Y" msgstr "%d %b %Y" #. TRANSLATORS: argument %1 is date, %2 is time. -#: src/utils.cpp:203 +#: src/utils.cpp:219 msgid "%1, %2" msgstr "%1, %2" -#: src/utils.cpp:214 +#: src/utils.cpp:230 msgid "No Date" msgstr "Inget datum" -#: src/utils.cpp:308 src/utils.cpp:322 +#: src/utils.cpp:324 src/utils.cpp:338 msgid "_OK" msgstr "_OK" -#: src/utils.cpp:317 +#: src/utils.cpp:333 msgid "_No" msgstr "_Nej" -#: src/utils.cpp:318 +#: src/utils.cpp:334 msgid "_Yes" msgstr "_Ja" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnote-49.2/po/uk.po new/gnote-49.3/po/uk.po --- old/gnote-49.2/po/uk.po 2025-12-29 18:07:02.000000000 +0100 +++ new/gnote-49.3/po/uk.po 2026-03-01 21:23:16.000000000 +0100 @@ -2,13 +2,13 @@ # Copyright (C) 2005 Free Software Foundation, Inc. # Maxim Dziumanenko <[email protected]>, 2010. # Korostil Daniel <[email protected]>, 2011, 2012. -# Yuri Chornoivan <[email protected]>, 2020, 2021, 2022, 2023, 2024, 2025. +# Yuri Chornoivan <[email protected]>, 2020, 2021, 2022, 2023, 2024, 2025, 2026. msgid "" msgstr "" "Project-Id-Version: tomboy\n" "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnote/issues/\n"; -"POT-Creation-Date: 2025-12-28 21:28+0000\n" -"PO-Revision-Date: 2025-12-29 09:40+0200\n" +"POT-Creation-Date: 2026-02-23 21:05+0000\n" +"PO-Revision-Date: 2026-02-24 21:44+0200\n" "Last-Translator: Yuri Chornoivan <[email protected]>\n" "Language-Team: Ukrainian <[email protected]>\n" "Language: uk\n" @@ -1458,13 +1458,18 @@ "Daniel Korostil <[email protected]>" #: src/gnote.cpp:286 +#| msgid "" +#| "Copyright © 2010-2025 Aurimas Cernius\n" +#| "Copyright © 2009-2011 Debarshi Ray\n" +#| "Copyright © 2009 Hubert Figuiere\n" +#| "Copyright © 2004-2009 the Tomboy original authors." msgid "" -"Copyright © 2010-2025 Aurimas Cernius\n" +"Copyright © 2010-2026 Aurimas Cernius\n" "Copyright © 2009-2011 Debarshi Ray\n" "Copyright © 2009 Hubert Figuiere\n" "Copyright © 2004-2009 the Tomboy original authors." msgstr "" -"© Aurimas Cernius, 2010–2025\n" +"© Aurimas Cernius, 2010–2026\n" "© Debarshi Ray, 2009-2011\n" "© Hubert Figuiere, 2009\n" "© Автори Tomboy, 2004–2009." @@ -1477,7 +1482,6 @@ #. * The link to main wiki page in English. You can localize it in subdirectory for your locale and have this link point to it. #. #: src/gnote.cpp:294 -#| msgid "https://gitlab.gnome.org/GNOME/gnote/-/blob/master/wiki/main.md"; msgid "https://gitlab.gnome.org/GNOME/gnote/-/wikis/Gnote"; msgstr "https://gitlab.gnome.org/GNOME/gnote/-/wikis/Gnote"; @@ -2415,7 +2419,7 @@ msgstr[2] "Не вдалося отримати оновлення %1 нотаток" msgstr[3] "Не вдалося отримати оновлення нотатки" -#: src/synchronization/filesystemsyncserver.cpp:428 +#: src/synchronization/filesystemsyncserver.cpp:427 #, c-format msgid "" "Exception during server cleanup while committing. Server integrity is OK, " @@ -2425,12 +2429,12 @@ "даних на сервері все гаразд, але можуть лишитися якісь зайві файли. Ось " "повідомлення про помилку: %s\n" -#: src/synchronization/filesystemsyncserver.cpp:634 +#: src/synchronization/filesystemsyncserver.cpp:633 #, c-format msgid "Error updating lock: %s" msgstr "Помилка під час оновлення блокування: %s" -#: src/synchronization/filesystemsyncserver.cpp:673 +#: src/synchronization/filesystemsyncserver.cpp:672 #, c-format msgid "Error deleting the old synchronization lock \"%s\": %s" msgstr "" @@ -2724,7 +2728,6 @@ #: src/utils.cpp:99 #, c-format -#| msgid "Failed to open URL: %s" msgid "Failed to open '%s': %s" msgstr "Не вдалося відкрити «%s»: %s" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnote-49.2/src/gnote.cpp new/gnote-49.3/src/gnote.cpp --- old/gnote-49.2/src/gnote.cpp 2025-12-29 18:07:02.000000000 +0100 +++ new/gnote-49.3/src/gnote.cpp 2026-03-01 21:23:16.000000000 +0100 @@ -1,7 +1,7 @@ /* * gnote * - * Copyright (C) 2010-2025 Aurimas Cernius + * Copyright (C) 2010-2026 Aurimas Cernius * Copyright (C) 2010 Debarshi Ray * Copyright (C) 2009 Hubert Figuiere * @@ -283,7 +283,7 @@ about->set_program_name("Gnote"); about->set_version(VERSION); about->set_logo_icon_name(IconManager::GNOTE); - about->set_copyright(_("Copyright \xc2\xa9 2010-2025 Aurimas Cernius\n" + about->set_copyright(_("Copyright \xc2\xa9 2010-2026 Aurimas Cernius\n" "Copyright \xc2\xa9 2009-2011 Debarshi Ray\n" "Copyright \xc2\xa9 2009 Hubert Figuiere\n" "Copyright \xc2\xa9 2004-2009 the Tomboy original authors.")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnote-49.2/src/synchronization/filesystemsyncserver.cpp new/gnote-49.3/src/synchronization/filesystemsyncserver.cpp --- old/gnote-49.2/src/synchronization/filesystemsyncserver.cpp 2025-12-29 18:07:02.000000000 +0100 +++ new/gnote-49.3/src/synchronization/filesystemsyncserver.cpp 2026-03-01 21:23:16.000000000 +0100 @@ -1,7 +1,7 @@ /* * gnote * - * Copyright (C) 2012-2013,2017-2023,2025 Aurimas Cernius + * Copyright (C) 2012-2013,2017-2023,2025-2026 Aurimas Cernius * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -326,12 +326,13 @@ } // Write out the new manifest file - sharp::XmlWriter *xml = new sharp::XmlWriter(); - try { - xml->write_start_document(); - xml->write_start_element("", "sync", ""); - xml->write_attribute_string("", "revision", "", TO_STRING(m_new_revision)); - xml->write_attribute_string("", "server-id", "", m_server_id); + Glib::ustring manifest_content; + { + sharp::XmlWriter xml; + xml.write_start_document(); + xml.write_start_element("", "sync", ""); + xml.write_attribute_string("", "revision", "", TO_STRING(m_new_revision)); + xml.write_attribute_string("", "server-id", "", m_server_id); for(std::map<Glib::ustring, Glib::ustring>::iterator iter = notes.begin(); iter != notes.end(); ++iter) { // Don't write out deleted notes @@ -344,26 +345,25 @@ continue; } - xml->write_start_element("", "note", ""); - xml->write_attribute_string("", "id", "", iter->first); - xml->write_attribute_string("", "rev", "", iter->second); - xml->write_end_element(); + xml.write_start_element("", "note", ""); + xml.write_attribute_string("", "id", "", iter->first); + xml.write_attribute_string("", "rev", "", iter->second); + xml.write_end_element(); } // Write out all the updated notes for(auto & note : m_updated_notes) { - xml->write_start_element("", "note", ""); - xml->write_attribute_string("", "id", "", note); - xml->write_attribute_string("", "rev", "", TO_STRING(m_new_revision)); - xml->write_end_element(); + xml.write_start_element("", "note", ""); + xml.write_attribute_string("", "id", "", note); + xml.write_attribute_string("", "rev", "", TO_STRING(m_new_revision)); + xml.write_end_element(); } - xml->write_end_element(); - xml->write_end_document(); - xml->close(); - Glib::ustring xml_content = xml->to_string(); - delete xml; - xml = nullptr; + xml.write_end_element(); + xml.write_end_document(); + xml.close(); + Glib::ustring xml_content = xml.to_string(); + if(manifest_file->query_exists()) { manifest_file->remove(); } @@ -371,13 +371,7 @@ gsize written; stream->write_all(xml_content, written); stream->close(); - } - catch(...) { - if(xml) { - xml->close(); - delete xml; - } - throw; + manifest_content = std::move(xml_content); } @@ -397,7 +391,12 @@ // checks should be implemented. // Copy the /${parent}/${rev}/manifest.xml -> /manifest.xml - manifest_file->copy(m_manifest_path); + { + auto stream = m_manifest_path->create_file(); + gsize written; + stream->write_all(manifest_content, written); + stream->close(); + } try { // Delete /manifest.xml.old diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnote-49.2/src/synchronization/gvfstransfer.hpp new/gnote-49.3/src/synchronization/gvfstransfer.hpp --- old/gnote-49.2/src/synchronization/gvfstransfer.hpp 2025-12-29 18:07:02.000000000 +0100 +++ new/gnote-49.3/src/synchronization/gvfstransfer.hpp 2026-03-01 21:23:16.000000000 +0100 @@ -1,7 +1,7 @@ /* * gnote * - * Copyright (C) 2025 Aurimas Cernius + * Copyright (C) 2025-2026 Aurimas Cernius * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -79,6 +79,9 @@ break; } } + else { + failures = 0; + } } while(failures > 0 && !m_cancel_op->is_cancelled()); ++++++ gnote.obsinfo ++++++ --- /var/tmp/diff_new_pack.EoPx6j/_old 2026-03-03 16:40:08.473152067 +0100 +++ /var/tmp/diff_new_pack.EoPx6j/_new 2026-03-03 16:40:08.485152563 +0100 @@ -1,5 +1,5 @@ name: gnote -version: 49.2 -mtime: 1767028022 -commit: 9c476cf2f010ec96f8fc5b1c392988bbe3df40f7 +version: 49.3 +mtime: 1772396596 +commit: 855265afb3e42585d27ef83aa9f814e6069f6c07
