Commit cb515bc1 authored by Script Kiddy's avatar Script Kiddy

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 3a2cce7b
......@@ -2,7 +2,6 @@
Type=ServiceType
X-KDE-ServiceType=KRDC/Plugin
Name=KRDC Plugin
Name[ast]=Complementu KRDC
Name[bg]=Приставка KRDC
Name[bs]=KRDC Dodatak
Name[ca]=Connector del KRDC
......
......@@ -3,7 +3,6 @@ Type=Service
X-KDE-ServiceTypes=KRDC/Plugin
Icon=krdc
Name=Konsole
Name[ast]=Konsole
Name[bg]=Konsole
Name[bs]=Konzola
Name[ca]=Konsole
......@@ -61,7 +60,6 @@ Name[x-test]=xxKonsolexx
Name[zh_CN]=Konsole
Name[zh_TW]=終端機_Konsole
Comment=Allows managing SSH or Telnet sessions through KRDC
Comment[ast]=Permite la xestión SSH o sesiones Telnet pente KRDC
Comment[bg]=Управление на сесии на SSH и Telnet през KRDC
Comment[bs]=Dopušta uređivanje SSH ili Telnet sesija kroz KRDC
Comment[ca]=Permet gestionar sessions SSH o Telnet mitjançant el KRDC
......
......@@ -3,7 +3,6 @@ Type=Service
X-KDE-ServiceTypes=KRDC/Plugin
Icon=krdc
Name=NX
Name[ast]=NX
Name[bg]=NX
Name[bs]=NX
Name[ca]=NX
......@@ -59,7 +58,6 @@ Name[x-test]=xxNXxx
Name[zh_CN]=NX
Name[zh_TW]=NX
Comment=Allows managing NX sessions through KRDC
Comment[ast]=Permite la xestión de sesiones NX pente KRDC
Comment[bg]=Управление на сесии на NX с KRDC
Comment[bs]=Dopušta upravljanje NX sesijama kroz KRDC
Comment[ca]=Permet gestionar sessions NX mitjançant el KRDC
......
......@@ -2,7 +2,6 @@
Type=Service
X-KDE-ServiceTypes=KCModule
Name=NX
Name[ast]=NX
Name[bg]=NX
Name[bs]=NX
Name[ca]=NX
......
......@@ -6,7 +6,6 @@ Icon=krdc
Terminal=false
Name=KRDC
Name[ar]=KRDC
Name[ast]=KRDC
Name[bg]=KRDC
Name[bs]=KRDC
Name[ca]=KRDC
......@@ -66,7 +65,6 @@ Name[zh_CN]=KRDC
Name[zh_TW]=遠端桌面_KRDC
GenericName=Remote Desktop Client
GenericName[ar]=عميل سطح المكتب البعيد
GenericName[ast]=Veceru d'escritoriu remotu
GenericName[bg]=Отдалечен работен плот
GenericName[bs]=Klijent udaljene radne površine
GenericName[ca]=Client d'escriptori remot
......
......@@ -3,7 +3,6 @@ Type=Service
X-KDE-ServiceTypes=KRDC/Plugin
Icon=krdc
Name=RDP
Name[ast]=RDP
Name[bg]=RDP
Name[bs]=RDP
Name[ca]=RDP
......@@ -59,7 +58,6 @@ Name[x-test]=xxRDPxx
Name[zh_CN]=RDP
Name[zh_TW]=RDP
Comment=Allows managing RDP sessions through KRDC
Comment[ast]=Permite la xestión de sesiones RDP pente KRDC
Comment[bg]=Управление на сесии на RDP с KRDC
Comment[bs]=Dopušta upravljanje RPD sesijama kroz KRDC
Comment[ca]=Permet gestionar sessions RDP mitjançant el KRDC
......
......@@ -2,7 +2,6 @@
Type=Service
X-KDE-ServiceTypes=KCModule
Name=RDP
Name[ast]=RDP
Name[bg]=RDP
Name[bs]=RDP
Name[ca]=RDP
......
......@@ -7,7 +7,6 @@ Actions=smb2rdc;
[Desktop Action smb2rdc]
Name=Open Remote Desktop Connection to This Machine
Name[ar]=افتح عن بعد سطح المكتب الاتصال إلى هذه الآلة
Name[ast]=Abrir conexón d'escritoriu remotu nesta máquina
Name[bg]=Връзка с отдалечен работно място с избрания компютър
Name[bn]=এই মেশিনে প্রত্যন্ত ডেস্কটপের সংযোগ খোলো
Name[bs]=Otvara udaljenu vezu površi ka ovoj mašini
......
......@@ -3,7 +3,6 @@ Type=Service
X-KDE-ServiceTypes=KRDC/Plugin
Icon=krdc
Name=VNC
Name[ast]=VNC
Name[bg]=VNC
Name[bs]=VNC
Name[ca]=VNC
......@@ -58,7 +57,6 @@ Name[x-test]=xxVNCxx
Name[zh_CN]=VNC
Name[zh_TW]=VNC
Comment=Allows managing VNC sessions through KRDC
Comment[ast]=Permite la xestión de sesiones VNC pente KRDC
Comment[bg]=Управление на сесии на VNC с KRDC
Comment[bs]=Dopušta upravljanje VNC sesijama kroz KRDC
Comment[ca]=Permet gestionar sessions VNC mitjançant el KRDC
......
......@@ -2,7 +2,6 @@
Type=Service
X-KDE-ServiceTypes=KCModule
Name=VNC
Name[ast]=VNC
Name[bg]=VNC
Name[bs]=VNC
Name[ca]=VNC
......
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