From 03c407cb7d3390f2e59c6d0565380da4d39947d0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 17 Jan 2023 02:03:45 +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/kcms/compositing/kwincompositing.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 cfd634e85a..d0da8ac83f 100644 --- a/src/effects/windowaperture/package/metadata.json +++ b/src/effects/windowaperture/package/metadata.json @@ -66,7 +66,7 @@ "Name[ar]": "إزاحة النوافذ", "Name[be]": "Аконная дыяфрагма", "Name[bg]": "Апертура на прозорци", - "Name[ca@valencia]": "Obertura de la finestra", + "Name[ca@valencia]": "Obriu la finestra", "Name[ca]": "Obertura de la finestra", "Name[cs]": "Mřížka oken", "Name[en_GB]": "Window Aperture", diff --git a/src/kcms/compositing/kwincompositing.json b/src/kcms/compositing/kwincompositing.json index 6962a1c418..c7e05b1df2 100644 --- a/src/kcms/compositing/kwincompositing.json +++ b/src/kcms/compositing/kwincompositing.json @@ -6,7 +6,7 @@ "Description[az]": "İş masası effektləri üçün düzücü ayarları", "Description[be]": "Налады сродку кампазітынгу для эфектаў працоўнага стала", "Description[bg]": "Настройки на композитора за ефекти на работния плот", - "Description[ca@valencia]": "Configuració del compositor per als efectes de l'escriptori", + "Description[ca@valencia]": "Configureu el compositor per als efectes de l'escriptori", "Description[ca]": "Arranjament del compositor per als efectes d'escriptori", "Description[de]": "Compositor-Einstellungen für Arbeitsflächen-Effekte", "Description[en_GB]": "Compositor Settings for Desktop Effects",