Commit c7a53712 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 7f610799
...@@ -68,6 +68,7 @@ Name[uz@cyrillic]=Тармоқ хизматлари ...@@ -68,6 +68,7 @@ Name[uz@cyrillic]=Тармоқ хизматлари
Name[vi]=Dịch vụ mạng Name[vi]=Dịch vụ mạng
Name[wa]=Siervices rantoele Name[wa]=Siervices rantoele
Name[x-test]=xxNetwork Servicesxx Name[x-test]=xxNetwork Servicesxx
Name[zh_CN]=网络服务
Name[zh_HK]=網絡服務 Name[zh_HK]=網絡服務
Name[zh_TW]=網路服務 Name[zh_TW]=網路服務
Type=Link Type=Link
......
...@@ -47,6 +47,7 @@ Name[tr]=DNS-SD Hizmet Keşfi İzleyici ...@@ -47,6 +47,7 @@ Name[tr]=DNS-SD Hizmet Keşfi İzleyici
Name[ug]=DNS-SD مۇلازىمەت بايقىغۇچ كۆزەتكۈچى Name[ug]=DNS-SD مۇلازىمەت بايقىغۇچ كۆزەتكۈچى
Name[uk]=Спостереження за службами DNS-SD Name[uk]=Спостереження за службами DNS-SD
Name[x-test]=xxDNS-SD Service Discovery Monitorxx Name[x-test]=xxDNS-SD Service Discovery Monitorxx
Name[zh_CN]=DNS-SD 服务发现监视器
Name[zh_TW]=DNS-SD 服務發現監控器 Name[zh_TW]=DNS-SD 服務發現監控器
Comment=Monitors the network for DNS-SD services Comment=Monitors the network for DNS-SD services
Comment[ast]=Monitoriza la rede pa servicios DNS-SD Comment[ast]=Monitoriza la rede pa servicios DNS-SD
...@@ -94,6 +95,7 @@ Comment[tr]=Ağı DNS-SD hizmetleri için izler ...@@ -94,6 +95,7 @@ Comment[tr]=Ağı DNS-SD hizmetleri için izler
Comment[ug]=توردىكى DNS-SD مۇلازىمەتلىرىنى كۆزىتىدۇ Comment[ug]=توردىكى DNS-SD مۇلازىمەتلىرىنى كۆزىتىدۇ
Comment[uk]=Спостереження за службами DNS-SD мережі Comment[uk]=Спостереження за службами DNS-SD мережі
Comment[x-test]=xxMonitors the network for DNS-SD servicesxx Comment[x-test]=xxMonitors the network for DNS-SD servicesxx
Comment[zh_CN]=监视网络中的 DNS-SD 服务
Comment[zh_TW]=監控 DNS-SD 服務網路 Comment[zh_TW]=監控 DNS-SD 服務網路
X-KDE-ServiceTypes=KDEDModule X-KDE-ServiceTypes=KDEDModule
X-KDE-ModuleType=Library X-KDE-ModuleType=Library
......
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