From 3f14425cb2cbfc590c0fa3ed96cff55c02ed1552 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 16 Aug 2017 08:57:21 +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" --- vpn/fortisslvpn/plasmanetworkmanagement_fortisslvpnui.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vpn/fortisslvpn/plasmanetworkmanagement_fortisslvpnui.desktop b/vpn/fortisslvpn/plasmanetworkmanagement_fortisslvpnui.desktop index 3a5bce93..35f6b457 100644 --- a/vpn/fortisslvpn/plasmanetworkmanagement_fortisslvpnui.desktop +++ b/vpn/fortisslvpn/plasmanetworkmanagement_fortisslvpnui.desktop @@ -17,6 +17,7 @@ Name=Fortinet SSLVPN (fortisslvpn) Name[ca]=Fortinet SSLVPN (fortisslvpn) Name[ca@valencia]=Fortinet SSLVPN (fortisslvpn) Name[es]=SSLVPN de Fortinet (fortisslvpn) +Name[eu]=Fortinet SSLVPN (fortisslvpn) Name[fr]=SSLVPN Fortinet (fortisslvpn) Name[gl]=VPN SSL de Fortinet (fortisslvpn) Name[it]=Fortinet SSLVPN (fortisslvpn) @@ -37,6 +38,7 @@ Comment=Fortinet SSLVPN virtual private networks Comment[ca]=Xarxes privades virtuals Fortinet SSLVPN Comment[ca@valencia]=Xarxes privades virtuals Fortinet SSLVPN Comment[es]=Redes privadas virtuales SSLVPN de Fortinet +Comment[eu]=Fortinet SSLVPN alegiazko sare pribatuak Comment[fr]=Réseaux privés virtuels SSLVPN Fortinet Comment[gl]=Redes privadas virtuais SSL de Fortinet Comment[it]=Reti private virtuali Fortinet SSLVPN -- GitLab