From fd0ebf4f93495da99fb1d40dd97e0dbb67d970a7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 10 Apr 2023 02:20:04 +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 8f054669..a1c342e9 100644 --- a/kwin/scripts/convergentwindows/metadata.json +++ b/kwin/scripts/convergentwindows/metadata.json @@ -10,6 +10,7 @@ "Name[cs]": "Plata Hill", "Name[en_GB]": "Plata Hill", "Name[es]": "Plata Hill", + "Name[eu]": "Plata Hill", "Name[fi]": "Plata Hill", "Name[fr]": "Plata Hill", "Name[ia]": "Plata Hill", @@ -30,6 +31,7 @@ "Description[cs]": "Odstraní dekorace oken a maximalizuje je pouze na první obrazovce.", "Description[en_GB]": "Removes window decorations and maximises windows on the first screen only.", "Description[es]": "Elimina las decoraciones de las ventanas y maximiza las ventanas solo en la primera pantalla.", + "Description[eu]": "Leihoko apaingarriak kendu eta leihoak maximizatzen ditu, lehenengo pantailan bakarrik.", "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[ia]": "Remove decorationes de fenestra e maximiza fenestra solmente sur prime schermo.", @@ -49,6 +51,7 @@ "Name[ca]": "Finestres convergents", "Name[en_GB]": "Convergent Windows", "Name[es]": "Ventanas convergentes", + "Name[eu]": "Leiho konbergenteak", "Name[fi]": "Mukautuvat ikkunat", "Name[fr]": "Fenêtres convergentes", "Name[ia]": "Fenestras Convergente",