From 0af23ee7186cb2668808d75aac3fa98be50c0b82 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 7 Aug 2023 02:39:41 +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" --- bin/plasma-mobile-dev.desktop.cmake | 2 +- bin/plasma-mobile.desktop.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/plasma-mobile-dev.desktop.cmake b/bin/plasma-mobile-dev.desktop.cmake index 54122161..c0e4d260 100644 --- a/bin/plasma-mobile-dev.desktop.cmake +++ b/bin/plasma-mobile-dev.desktop.cmake @@ -51,7 +51,7 @@ Comment[et]=KDE Plasma Mobile Comment[eu]=Plasma Mugikorra KDEk egina Comment[fi]=KDE:n Plasma Mobile Comment[fr]=Plasma Mobile par KDE -Comment[gl]=Plasma Mobile de KDE +Comment[gl]=Plasma Mobile de KDE. Comment[hi]=केडीइ द्वारा प्लाज़्मा मोबाइल Comment[hu]=Plasma Mobile a KDE-től Comment[ia]=Plasma Mobile per KDE diff --git a/bin/plasma-mobile.desktop.cmake b/bin/plasma-mobile.desktop.cmake index 3389a68e..2951ae4e 100644 --- a/bin/plasma-mobile.desktop.cmake +++ b/bin/plasma-mobile.desktop.cmake @@ -62,7 +62,7 @@ Comment[et]=KDE Plasma Mobile Comment[eu]=Plasma Mugikorra KDEk egina Comment[fi]=KDE:n Plasma Mobile Comment[fr]=Plasma Mobile par KDE -Comment[gl]=Plasma Mobile de KDE +Comment[gl]=Plasma Mobile de KDE. Comment[hi]=केडीइ द्वारा प्लाज़्मा मोबाइल Comment[hu]=Plasma Mobile a KDE-től Comment[ia]=Plasma Mobile per KDE