From 73e29b8d6ef322985541102887920e300acad199 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 5 Mar 2022 02:49:27 +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" --- krfb/org.kde.krfb.virtualmonitor.desktop.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/krfb/org.kde.krfb.virtualmonitor.desktop.cmake b/krfb/org.kde.krfb.virtualmonitor.desktop.cmake index f481b358..421f7dc8 100644 --- a/krfb/org.kde.krfb.virtualmonitor.desktop.cmake +++ b/krfb/org.kde.krfb.virtualmonitor.desktop.cmake @@ -7,6 +7,7 @@ Terminal=false Name=KRFBs Virtual Monitor Name[ca]=Monitor virtual del Krfb Name[ca@valencia]=Monitor virtual del Krfb +Name[cs]=Virtuální monitor KRFB Name[el]=Εικονική οθόνη του KRFB Name[en_GB]=KRFBs Virtual Monitor Name[es]=Monitor virtual de KRFB @@ -28,6 +29,7 @@ Name[zh_CN]=KRBs 虚拟监视器 Comment=Remote Virtual Monitor Comment[ca]=Monitor virtual remot Comment[ca@valencia]=Monitor virtual remot +Comment[cs]=Vzdálený virtuální monitor Comment[el]=Απομακρυσμένη εικονική οθόνη Comment[en_GB]=Remote Virtual Monitor Comment[es]=Monitor virtual remoto