From f05dcd5f766790986b83ff9d5854a8e6ae31dccd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 5 Nov 2024 03:03:16 +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/kcms/xwayland/kcm_kwinxwayland.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kcms/xwayland/kcm_kwinxwayland.json b/src/kcms/xwayland/kcm_kwinxwayland.json index 930a75944a..fe2c34a5a1 100644 --- a/src/kcms/xwayland/kcm_kwinxwayland.json +++ b/src/kcms/xwayland/kcm_kwinxwayland.json @@ -10,7 +10,7 @@ "Description[ca]": "Seleccioneu les tecles que seran disponibles globalment a les aplicacions X11 antigues", "Description[cs]": "Vyberte, které klávesy budou globálně dostupné pro staré aplikace X11", "Description[da]": "Vælg hvilke taster, der vil være globalt tilgængelige for ældre X11-apps", - "Description[de]": "Wählen Sie die klassischen X11-Anwendungen zur Verfügung stehenden Tasten", + "Description[de]": "Wählen Sie, welche Tasten für alte X11-Anwendungen global zur Verfügung stehen", "Description[en_GB]": "Select which keys will be globally available to legacy X11 apps", "Description[eo]": "Elektu kiuj ŝlosiloj estos ĉie haveblaj al heredaj X11-aplikoj", "Description[es]": "Seleccionar las teclas que estarán disponibles globalmente para las aplicaciones X11 heredadas",