From c9d1ec9c6afefae830211bfb8ec0570e81a4fef7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 13 Mar 2023 02:49:01 +0000 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- kwin/scripts/convergentwindows/metadata.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kwin/scripts/convergentwindows/metadata.json b/kwin/scripts/convergentwindows/metadata.json index 8bbd6d5b..846a6c68 100644 --- a/kwin/scripts/convergentwindows/metadata.json +++ b/kwin/scripts/convergentwindows/metadata.json @@ -12,6 +12,7 @@ "Name[es]": "Plata Hill", "Name[fi]": "Plata Hill", "Name[fr]": "Plata Hill", + "Name[it]": "Plata Hill", "Name[ka]": "Plata Hill", "Name[nl]": "Plata Hill", "Name[nn]": "Plata Hill", @@ -29,6 +30,7 @@ "Description[es]": "Elimina las decoraciones de las ventanas y maximiza las ventanas solo en la primera pantalla.", "Description[fi]": "Poistaa ikkunakoristeet ja suurentaa ikkunat vain ensimmäisellä näytöllä.", "Description[fr]": "Supprime les décorations de fenêtres et maximise les fenêtres sur le premier écran uniquement.", + "Description[it]": "Rimuove le decorazioni delle finestre e massimizza le finestre solo nella prima schermata.", "Description[ka]": "ფანჯრების მთელ ეკრანზე გაშლა და დეკორაციების მოცილება მხოლოდ პირველ ეკრანზე", "Description[nl]": "Vensterdecoraties worden verwijderd en maximaliseert vensters alleen op het eerste scherm.", "Description[nn]": "Fjernar vindaugspynt og maksimerer vindauge berre på første skjerm.", @@ -46,6 +48,7 @@ "Name[es]": "Ventanas convergentes", "Name[fi]": "Mukautuvat ikkunat", "Name[fr]": "Fenêtres convergentes", + "Name[it]": "Finestre convergenti", "Name[ka]": "კონვერგენტული ფანჯრები", "Name[nl]": "Convergente vensters", "Name[nn]": "Konvergente vindauge",