From 4cb06a3713175e950cb49b510457fd20bd524f14 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 13 Nov 2022 01:51:17 +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" --- src/effects/windowaperture/package/metadata.json | 2 +- src/kcmkwin/kwinscreenedges/kcm_kwinscreenedges.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/effects/windowaperture/package/metadata.json b/src/effects/windowaperture/package/metadata.json index c620ccae64..dfd02fe90c 100644 --- a/src/effects/windowaperture/package/metadata.json +++ b/src/effects/windowaperture/package/metadata.json @@ -28,7 +28,7 @@ "Description": "Move windows into screen corners", "Description[ar]": "تحرك النوافذ إلى زوايا الشاشة", "Description[bg]": "Преместване на прозорците в ъглите на екрана", - "Description[ca@valencia]": "Mou les finestres cap a les cantonades de la pantalla", + "Description[ca@valencia]": "Mou les finestres cap als cantons de la pantalla", "Description[ca]": "Mou les finestres cap a les cantonades de la pantalla", "Description[es]": "Mover las ventanas a las esquinas de la pantalla", "Description[eu]": "Eraman leihoak pantailako bazterretara", diff --git a/src/kcmkwin/kwinscreenedges/kcm_kwinscreenedges.json b/src/kcmkwin/kwinscreenedges/kcm_kwinscreenedges.json index 42ef091302..643b22a481 100644 --- a/src/kcmkwin/kwinscreenedges/kcm_kwinscreenedges.json +++ b/src/kcmkwin/kwinscreenedges/kcm_kwinscreenedges.json @@ -5,7 +5,7 @@ "Description[ar]": "اضبط زوايا وحواف الشاشة", "Description[az]": "Aktiv ekran künclərini və kənarlarını tənzimləyin", "Description[bg]": "Настройки на активните краища и ъгли на екрана", - "Description[ca@valencia]": "Configura les cantonades i vores actives de la pantalla", + "Description[ca@valencia]": "Configura els cantons i vores actives de la pantalla", "Description[ca]": "Configura les cantonades i vores actives de la pantalla", "Description[de]": "Aktive Bildschirmränder und -ecken einrichten", "Description[en_GB]": "Configure active screen corners and edges",