From 1d9e67631d0b8b88ac3d836bab8fa92462b97b84 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 12 May 2024 01:19:19 +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.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krfb/org.kde.krfb.desktop b/krfb/org.kde.krfb.desktop index 3a30833d..06339f92 100755 --- a/krfb/org.kde.krfb.desktop +++ b/krfb/org.kde.krfb.desktop @@ -80,7 +80,7 @@ GenericName=Desktop Sharing (VNC) GenericName[ar]=مشاركة سطح المكتب (VNC) GenericName[bg]=Споделяне на работния плот (VNC) GenericName[ca]=Compartició de l'escriptori (VNC) -GenericName[ca@valencia]=Compartició de l'escriptori (VNC) +GenericName[ca@valencia]=Compartiu l'escriptori (VNC) GenericName[cs]=Sdílení pracovní plochy (VNC) GenericName[da]=Skrivebordsdeling (VNC) GenericName[de]=Arbeitsflächen-Freigabe (VNC)