Commit 84241338 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 4c0736be
...@@ -15,6 +15,7 @@ X-KDE-PluginInfo-License=GPL ...@@ -15,6 +15,7 @@ X-KDE-PluginInfo-License=GPL
X-KDE-PluginInfo-EnabledByDefault=false X-KDE-PluginInfo-EnabledByDefault=false
Name=Juniper SSL VPN (openconnect) Name=Juniper SSL VPN (openconnect)
Name[ca]=VPN SSL Juniper (openconnect) Name[ca]=VPN SSL Juniper (openconnect)
Name[en_GB]=Juniper SSL VPN (openconnect)
Name[es]=VPN Juniper SSL (openconnect) Name[es]=VPN Juniper SSL (openconnect)
Name[eu]=Juniper SSL VPN (openconnect) Name[eu]=Juniper SSL VPN (openconnect)
Name[hu]=Juniper SSL VPN (openconnect) Name[hu]=Juniper SSL VPN (openconnect)
...@@ -31,6 +32,7 @@ Name[uk]=Juniper SSL VPN (openconnect) ...@@ -31,6 +32,7 @@ Name[uk]=Juniper SSL VPN (openconnect)
Name[x-test]=xxJuniper SSL VPN (openconnect)xx Name[x-test]=xxJuniper SSL VPN (openconnect)xx
Comment=Compatible with Juniper Network Connect Comment=Compatible with Juniper Network Connect
Comment[ca]=Compatible amb la Juniper Network Connect Comment[ca]=Compatible amb la Juniper Network Connect
Comment[en_GB]=Compatible with Juniper Network Connect
Comment[es]=Compatible con Juniper Network Connect Comment[es]=Compatible con Juniper Network Connect
Comment[eu]=Juniper Network Connect-ekin bateragarria Comment[eu]=Juniper Network Connect-ekin bateragarria
Comment[hu]=Kompatibilis a Juniper Network Connecttel Comment[hu]=Kompatibilis a Juniper Network Connecttel
......
...@@ -15,6 +15,7 @@ X-KDE-PluginInfo-License=GPL ...@@ -15,6 +15,7 @@ X-KDE-PluginInfo-License=GPL
X-KDE-PluginInfo-EnabledByDefault=false X-KDE-PluginInfo-EnabledByDefault=false
Name=Pulse Connect Secure (openconnect) Name=Pulse Connect Secure (openconnect)
Name[ca]=Pulse Connect Secure (openconnect) Name[ca]=Pulse Connect Secure (openconnect)
Name[en_GB]=Pulse Connect Secure (openconnect)
Name[es]=Pulse Connect Secure (openconnect) Name[es]=Pulse Connect Secure (openconnect)
Name[eu]=Pulse Connect Secure (openconnect) Name[eu]=Pulse Connect Secure (openconnect)
Name[hu]=Pulse Connect Secure (openconnect) Name[hu]=Pulse Connect Secure (openconnect)
...@@ -31,6 +32,7 @@ Name[uk]=Pulse Connect Secure (openconnect) ...@@ -31,6 +32,7 @@ Name[uk]=Pulse Connect Secure (openconnect)
Name[x-test]=xxPulse Connect Secure (openconnect)xx Name[x-test]=xxPulse Connect Secure (openconnect)xx
Comment=Compatible with Pulse Connect Secure SSL VPN Comment=Compatible with Pulse Connect Secure SSL VPN
Comment[ca]=Compatible amb la VPN SSL de Pulse Connect Secure Comment[ca]=Compatible amb la VPN SSL de Pulse Connect Secure
Comment[en_GB]=Compatible with Pulse Connect Secure SSL VPN
Comment[es]=VPN compatible con Pulse Connect Secure SSL Comment[es]=VPN compatible con Pulse Connect Secure SSL
Comment[eu]=Pulse Connect Secure SSL VPN-rekin bateragarria Comment[eu]=Pulse Connect Secure SSL VPN-rekin bateragarria
Comment[hu]=Kompatibilis a Pulse Connect Sevure SSL VPN-nel Comment[hu]=Kompatibilis a Pulse Connect Sevure SSL VPN-nel
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment