From 44df1c3d079962b4233aef5e5cd43f0abd9bc7de Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 6 Apr 2018 05:23:01 +0200 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" --- smsapp/org.kde.kdeconnect.sms.desktop | 3 +++ 1 file changed, 3 insertions(+) diff --git a/smsapp/org.kde.kdeconnect.sms.desktop b/smsapp/org.kde.kdeconnect.sms.desktop index e5d7bf114..6a8476b61 100644 --- a/smsapp/org.kde.kdeconnect.sms.desktop +++ b/smsapp/org.kde.kdeconnect.sms.desktop @@ -6,6 +6,7 @@ Name[cs]=KDE Connect SMS Name[de]=KDE-Connect-SMS Name[en_GB]=KDE Connect SMS Name[es]=SMS de KDE Connect +Name[it]=KDE Connect SMS Name[nl]=KDE Connect SMS Name[pt]=SMS do KDE Connect Name[sv]=KDE-anslut SMS @@ -18,6 +19,7 @@ GenericName[cs]=SMS GenericName[de]=SMS GenericName[en_GB]=SMS GenericName[es]=SMS +GenericName[it]=SMS GenericName[nl]=SMS GenericName[pt]=SMS GenericName[sv]=SMS @@ -30,6 +32,7 @@ Comment[ca@valencia]=Missatgeria de text Comment[cs]=Zprávy Comment[en_GB]=Text Messaging Comment[es]=Envío de mensajes de texto +Comment[it]=Messaggi di testo Comment[nl]=Tekstberichten versturen Comment[pt]=Mensagem de Texto Comment[sv]=Textmeddelanden