Commit bd90e200 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 a9b704c8
Pipeline #157583 skipped
......@@ -6,7 +6,7 @@ X-KDE-Derived=KPluginInfo
Comment=KMuddy Plugin
Comment[bs]=KMuddy Servis
Comment[ca]=Connector del KMuddy
Comment[ca@valencia]=Connector del KMuddy
Comment[ca@valencia]=Connector de KMuddy
Comment[de]=KMuddy-Modul
Comment[en_GB]=KMuddy Plugin
Comment[es]=Complemento para KMuddy
......
......@@ -30,7 +30,7 @@ Name[zh_TW]=設定檔轉換工具
Comment=This plug-in converts profiles from old KMuddy versions.
Comment[bs]=Ovaj servis pretvara profile iz starih KMuddy verzija.
Comment[ca]=Aquest connector converteix els perfils des de versions antigues del KMuddy.
Comment[ca@valencia]=Este connector converteix els perfils des de versions antigues del KMuddy.
Comment[ca@valencia]=Este connector converteix els perfils des de versions antigues de KMuddy.
Comment[de]=Dieses Modul wandelt Profile älterer KMuddy-Versionen um.
Comment[en_GB]=This plug-in converts profiles from old KMuddy versions.
Comment[es]=Este complemento convierte perfiles desde versiones antiguas de KMuddy.
......
......@@ -3,7 +3,7 @@ Type=Service
Comment=A Mapper for KMuddy
Comment[bs]=Mapper za KMuddy
Comment[ca]=Un mapador per al KMuddy
Comment[ca@valencia]=Un mapador per al KMuddy
Comment[ca@valencia]=Un mapador per a KMuddy
Comment[de]=Ein Mapper für KMuddy
Comment[en_GB]=A Mapper for KMuddy
Comment[es]=Mapeador para KMuddy
......@@ -27,7 +27,7 @@ Comment[zh_CN]=KMuddy 地图编辑器
Name=Kmuddy Mapper
Name[bs]=Kmuddy Mapper
Name[ca]=Mapador del KMuddy
Name[ca@valencia]=Mapador del KMuddy
Name[ca@valencia]=Mapador de KMuddy
Name[de]=Kmuddy-Mapper
Name[en_GB]=Kmuddy Mapper
Name[es]=Mapeador para Kmuddy
......
......@@ -4,7 +4,7 @@ X-KDE-ServiceType=KMuddy/Mapper/Plugin
Name=KMuddy Mapper Tool
Name[bs]=Alat za KMuddy Mapper
Name[ca]=Eina de mapatge del KMuddy
Name[ca@valencia]=Eina de mapatge del KMuddy
Name[ca@valencia]=Eina de mapatge de KMuddy
Name[de]=Kmuddy-Mapper-Werkzeug
Name[en_GB]=KMuddy Mapper Tool
Name[es]=Herramienta mapeadora para KMuddy
......
Supports Markdown
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