fix: restore old translations due to known translations bug, restore …

…missing files due to git merging with wrong strategy
plone · Dec 9, 2024 · a89608b · a89608b
2 parents 26d4e96 + 5c420c2
commit a89608b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 60 deletions.
diff --git a/packages/volto/locales/it/LC_MESSAGES/volto.po b/packages/volto/locales/it/LC_MESSAGES/volto.po
@@ -2428,7 +2428,7 @@ msgstr "Nessun video selezionato"
 #. Default: "No add-ons found"
 #: components/manage/Controlpanels/VersionOverview
 msgid "No add-ons found"
-msgstr "Nessun add-on trovato"
+msgstr ""
 
 #. Default: "No broken relations found."
 #: components/manage/Controlpanels/Relations/RelationsMatrix

diff --git a/packages/volto/locales/nl/LC_MESSAGES/volto.po b/packages/volto/locales/nl/LC_MESSAGES/volto.po
@@ -234,7 +234,7 @@ msgstr "Modules"
 #. Default: "Add-on Configuration"
 #: components/manage/Controlpanels/Controlpanels
 msgid "Add-on Configuration"
-msgstr "Module configuratie<<<<<<< HEAD"
+msgstr "Module configuratie"
 
 #. Default: "Add-on could not be installed"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
@@ -264,7 +264,7 @@ msgstr "Module succesvol gedeïnstalleerd"
 #. Default: "Add-on upgraded succesfuly"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "Add-on upgraded succesfuly"
-msgstr "Module succesvol bijgewerkt=======>>>>>>> main"
+msgstr "Module succesvol bijgewerkt"
 
 #. Default: "Add-ons"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
@@ -284,7 +284,7 @@ msgstr "Toegevoegd"
 #. Default: "Additional date"
 #: components/manage/Widgets/RecurrenceWidget/Occurences
 msgid "Additional date"
-msgstr "Bijkomende datum<<<<<<< HEAD======="
+msgstr "Bijkomende datum======="
 
 #. Default: "Advanced facet?"
 #: components/manage/Blocks/Search/schema
@@ -438,12 +438,12 @@ msgstr "Automatisch"
 #. Default: "Available"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "Available"
-msgstr "Beschikbaar<<<<<<< HEAD"
+msgstr "Beschikbaa"
 
 #. Default: "Available add-ons"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "Available add-ons"
-msgstr "=======>>>>>>> main"
+msgstr "main"
 
 #. Default: "Available content rules:"
 #: components/manage/Rules/Rules
@@ -1885,12 +1885,12 @@ msgstr "Installeren"
 #. Default: "Installed"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "Installed"
-msgstr "Geïnstalleerd<<<<<<< HEAD"
+msgstr "Geïnstalleerd"
 
 #. Default: "Installed add-ons"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "Installed add-ons"
-msgstr "=======>>>>>>> main"
+msgstr ""
 
 #. Default: "Installed version"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
@@ -2392,12 +2392,12 @@ msgstr "Nieuwsbericht weergave"
 #: components/manage/Contents/ContentsItem
 #: components/manage/Controlpanels/ContentTypes
 msgid "No"
-msgstr "Nee<<<<<<< HEAD"
+msgstr "Nee"
 
 #. Default: "No add-ons available for installation."
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "No Addon available"
-msgstr "=======>>>>>>> main"
+msgstr ""
 
 #. Default: "No installed add-ons."
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
@@ -2417,12 +2417,12 @@ msgstr "Geen transacties geselecteerd"
 #. Default: "No transactions selected to do undo"
 #: components/manage/Controlpanels/UndoControlpanel
 msgid "No Transactions Selected To Do Undo"
-msgstr "Geen transacties geselecteerd om ongedaan te maken<<<<<<< HEAD"
+msgstr "Geen transacties geselecteerd om ongedaan te maken"
 
 #. Default: "No upgrades in this corner. You are up to date. High fives."
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "No Upgrades available"
-msgstr "Geen upgrades in deze hoek. Je bent up-to-date. High five!=======>>>>>>> main"
+msgstr "Geen upgrades in deze hoek. Je bent up-to-date. High five!"
 
 #. Default: "No Video selected"
 #: components/manage/Blocks/Video/VideoSidebar
@@ -2432,7 +2432,7 @@ msgstr "Geen video geselecteerd"
 #. Default: "No add-ons found"
 #: components/manage/Controlpanels/VersionOverview
 msgid "No add-ons found"
-msgstr "======="
+msgstr ""
 
 #. Default: "No broken relations found."
 #: components/manage/Controlpanels/Relations/RelationsMatrix
@@ -3837,12 +3837,12 @@ msgstr "Er zijn fouten opgetreden."
 #. Default: "Third"
 #: components/manage/Widgets/RecurrenceWidget/WeekdayOfTheMonthIndexField
 msgid "Third"
-msgstr "Derde<<<<<<< HEAD"
+msgstr "Derde"
 
 #. Default: "This add-on was updated. Current profile installed version is {installedVersion}. New available profile version is {newVersion}"
 #: components/manage/Controlpanels/Addons/AddonItem
 msgid "This add-on was updated. Current profile installed version is {installedVersion}. New available profile version is {newVersion}"
-msgstr "Deze add-on is bijgewerkt. De momenteel geïnstalleerde profielversie is {installedVersion}. De nieuwe beschikbare profielversie is {newVersion}.=======>>>>>>> main"
+msgstr "Deze add-on is bijgewerkt. De momenteel geïnstalleerde profielversie is {installedVersion}. De nieuwe beschikbare profielversie is {newVersion}."
 
 #. Default: "This has an ongoing working copy in {title}"
 #: components/manage/WorkingCopyToastsFactory/WorkingCopyToastsFactory
@@ -4109,12 +4109,12 @@ msgstr ""
 #. Default: "Updates available"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "Updates available"
-msgstr "Updates beschikbaar<<<<<<< HEAD"
+msgstr "Updates beschikbaar"
 
 #. Default: "Upgradable add-ons"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "Upgradable add-ons"
-msgstr "=======>>>>>>> main"
+msgstr ""
 
 #. Default: "Upgrade"
 #: components/manage/Controlpanels/UpgradeControlPanel

diff --git a/packages/volto/locales/ro/LC_MESSAGES/volto.po b/packages/volto/locales/ro/LC_MESSAGES/volto.po
@@ -236,7 +236,7 @@ msgstr "Extensii Add-on"
 #. Default: "Add-on Configuration"
 #: components/manage/Controlpanels/Controlpanels
 msgid "Add-on Configuration"
-msgstr "Configurare add-on-uri<<<<<<< HEAD"
+msgstr "Configurare add-on-uri"
 
 #. Default: "Add-on could not be installed"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
@@ -266,7 +266,7 @@ msgstr "Extensia add-on a fost dezinstalată cu succes"
 #. Default: "Add-on upgraded succesfuly"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "Add-on upgraded succesfuly"
-msgstr "Extensia add-on a fost actualizată cu succes=======>>>>>>> main"
+msgstr "Extensia add-on a fost actualizată cu succes"
 
 #. Default: "Add-ons"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
@@ -286,7 +286,7 @@ msgstr "Adăugat"
 #. Default: "Additional date"
 #: components/manage/Widgets/RecurrenceWidget/Occurences
 msgid "Additional date"
-msgstr "Dată suplimentară<<<<<<< HEAD======="
+msgstr "Dată suplimentară"
 
 #. Default: "Advanced facet?"
 #: components/manage/Blocks/Search/schema
@@ -2419,12 +2419,12 @@ msgstr "Nu s-au selectat tranzacții"
 #. Default: "No transactions selected to do undo"
 #: components/manage/Controlpanels/UndoControlpanel
 msgid "No Transactions Selected To Do Undo"
-msgstr "Nu s-au selectat tranzacții pentru a le anula<<<<<<< HEAD"
+msgstr "Nu s-au selectat tranzacții pentru a le anula"
 
 #. Default: "No upgrades in this corner. You are up to date. High fives."
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "No Upgrades available"
-msgstr "Nicio actualizare în această zonă. Ești la zi. Bate palma!=======>>>>>>> main"
+msgstr "Nicio actualizare în această zonă. Ești la zi. Bate palma!"
 
 #. Default: "No Video selected"
 #: components/manage/Blocks/Video/VideoSidebar

diff --git a/packages/volto/locales/volto.pot b/packages/volto/locales/volto.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2024-12-06T09:10:16.013Z\n"
+"POT-Creation-Date: 2024-12-09T08:37:15.391Z\n"
 "Last-Translator: Plone i18n <[email protected]>\n"
 "Language-Team: Plone i18n <[email protected]>\n"
 "Content-Type: text/plain; charset=utf-8\n"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml