From 565e752a552f00f8134dd6f99684f14b2f267b4c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 9 Mar 2023 02:33:03 +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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kwin/scripts/convergentwindows/metadata.json b/kwin/scripts/convergentwindows/metadata.json index e51e1487..065c1c62 100644 --- a/kwin/scripts/convergentwindows/metadata.json +++ b/kwin/scripts/convergentwindows/metadata.json @@ -8,6 +8,8 @@ "Name[ca@valencia]": "Plata Hill", "Name[ca]": "Plata Hill", "Name[es]": "Plata Hill", + "Name[fr]": "Plata Hill", + "Name[ka]": "Plata Hill", "Name[nl]": "Plata Hill", "Name[sl]": "Plata Hill", "Name[tr]": "Plata Hill", @@ -19,6 +21,8 @@ "Description[ca@valencia]": "Elimina les decoracions de les finestres i maximitza les finestres només en la primera pantalla.", "Description[ca]": "Elimina les decoracions de les finestres i maximitza les finestres només en la primera pantalla.", "Description[es]": "Elimina las decoraciones de las ventanas y maximiza las ventanas solo en la primera pantalla.", + "Description[fr]": "Supprime les décorations de fenêtres et maximise les fenêtres sur le premier écran uniquement.", + "Description[ka]": "ფანჯრების მთელ ეკრანზე გაშლა და დეკორაციების მოცილება მხოლოდ პირველ ეკრანზე", "Description[nl]": "Vensterdecoraties worden verwijderd en maximaliseert vensters alleen op het eerste scherm.", "Description[sl]": "Odstrani dekoracije oken in maksimiziraj okna samo na prvem zaslonu.", "Description[tr]": "Pencere dekorasyonlarını kaldırır ve pencereleri yalnızca ilk ekranda kaplatır.", @@ -31,6 +35,8 @@ "Name[ca@valencia]": "Finestres convergents", "Name[ca]": "Finestres convergents", "Name[es]": "Ventanas convergentes", + "Name[fr]": "Fenêtres convergentes", + "Name[ka]": "კონვერგენტული ფანჯრები", "Name[nl]": "Convergente vensters", "Name[sl]": "Convergent Windows", "Name[tr]": "Yakınsak Pencereler",