From 08d967af6684c46611a005cf8af6420e12851cc8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 18 Dec 2020 10:01:32 +0100 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/krfb/org.kde.krfb.desktop b/krfb/org.kde.krfb.desktop index 2dbd89f..b7f1932 100755 --- a/krfb/org.kde.krfb.desktop +++ b/krfb/org.kde.krfb.desktop @@ -93,6 +93,7 @@ GenericName[nn]=Skrivebordsdeling (VNC) GenericName[pl]=Współdzielenie pulpitu (VNC) GenericName[pt]=Partilha do Ecrã (VNC) GenericName[pt_BR]=Compartilhamento de ambiente de trabalho (VNC) +GenericName[sk]=Zdieľanie pracovnej plochy (VNC) GenericName[sl]=Souporaba namizja (VNC) GenericName[sv]=Skrivbordsdelning (VNC) GenericName[uk]=Спільні стільниці (VNC)