Commit 72db9383 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 4d96d381
......@@ -23,6 +23,7 @@ Name[tr]=KMuddy
Name[uk]=KMuddy
Name[x-test]=xxKMuddyxx
Name[zh_CN]=KMuddy
Name[zh_TW]=KMuddy
Type=Application
Exec=kmuddy -qwindowtitle %c
Icon=kmuddy
......@@ -49,6 +50,7 @@ GenericName[tr]=MUD istemcisi
GenericName[uk]=Клієнт MUD
GenericName[x-test]=xxMUD clientxx
GenericName[zh_CN]=MUD 客户端
GenericName[zh_TW]=MUD 客戶端
Comment=MUD client
Comment[bs]=MUD klijent
Comment[ca]=Client de MUD
......@@ -71,4 +73,5 @@ Comment[tr]=MUD istemcisi
Comment[uk]=Клієнт MUD
Comment[x-test]=xxMUD clientxx
Comment[zh_CN]=MUD 客户端
Comment[zh_TW]=MUD 客戶端
Terminal=false
......@@ -25,6 +25,7 @@ Comment[tr]=KMuddy Eklentisi
Comment[uk]=Додаток KMuddy
Comment[x-test]=xxKMuddy Pluginxx
Comment[zh_CN]=KMuddy 插件
Comment[zh_TW]=KMuddy 外掛程式
# version of plug-in, used to prevent loading plug-ins with incompatible API
[PropertyDef::X-KMuddy-Version]
......
......@@ -22,6 +22,7 @@ Name[tr]=Profil Dönüştürücü
Name[uk]=Засіб перетворення профілів
Name[x-test]=xxProfile Converterxx
Name[zh_CN]=档案转换器
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.
......@@ -43,6 +44,7 @@ Comment[tr]=Bu eklenti, profilleri eski KMuddy sürümünden dönüştürür.
Comment[uk]=За допомогою цього додатка можна перетворити дані профілів старих версій KMuddy.
Comment[x-test]=xxThis plug-in converts profiles from old KMuddy versions.xx
Comment[zh_CN]=这个插件转换旧版本 KMuddy 档案。
Comment[zh_TW]=此外掛程式可轉換 KMuddy 舊版設定檔。
ServiceTypes=KMuddy/Plugin
Type=Service
X-KDE-Library=kmuddyconverterplugin
......
......@@ -25,6 +25,7 @@ Name[ug]=تېكىستلەر
Name[uk]=Рядки
Name[x-test]=xxStringsxx
Name[zh_CN]=字符串
Name[zh_TW]=字串
Comment=This plug-in adds many strings functions.
Comment[bs]=Ovaj servis daje mnoge stringovne funkcije.
Comment[ca]=Aquest connector afegeix moltes funcions de cadenes.
......@@ -46,6 +47,7 @@ Comment[tr]=Bu eklenti, bir çok dizge fonksiyonu ekler.
Comment[uk]=За допомогою цього додатка реалізовано багато функцій, призначених для обробки рядків.
Comment[x-test]=xxThis plug-in adds many strings functions.xx
Comment[zh_CN]=这个插件提供了许多字符串函数。
Comment[zh_TW]=此外掛程式加入了許多字串函式。
ServiceTypes=KMuddy/Plugin
Type=Service
X-KDE-Library=kmuddystringsplugin
......
......@@ -21,6 +21,7 @@ Name[tr]=Değişken Tetikleyicileri
Name[uk]=Умовні зміни
Name[x-test]=xxVariable Triggersxx
Name[zh_CN]=变量触发器
Name[zh_TW]=變數觸發器
Comment=Adds supports for triggers that fire off variable changes.
Comment[bs]=Daje podršku za prekidače koji aktiviraju na promjene varijabli.
Comment[ca]=Afegeix suport per a desencadenants que activen canvis variables.
......
......@@ -22,6 +22,7 @@ Name[tr]=Değişken Görüntüleyici
Name[uk]=Перегляд змінних
Name[x-test]=xxVariable Viewerxx
Name[zh_CN]=变量查看器
Name[zh_TW]=變數檢視器
Comment=This plug-in provides a variable viewer window.
Comment[bs]=Ovaj servis pruža prozor za pregled varijable.
Comment[ca]=Aquest connector proporciona una finestra per a la visualització variable.
......@@ -43,6 +44,7 @@ Comment[tr]=Bu eklenti, değişken görüntüleyici pencere sağlar.
Comment[uk]=За допомогою цього додатка реалізовано роботу вікна перегляду змінних.
Comment[x-test]=xxThis plug-in provides a variable viewer window.xx
Comment[zh_CN]=该插件提供一个变量查看窗口。
Comment[zh_TW]=此外掛程式提供了變數檢視器視窗。
ServiceTypes=KMuddy/Plugin
Type=Service
X-KDE-Library=kmuddyvarviewerplugin
......
......@@ -23,6 +23,7 @@ Name[tr]=Eklenti Şablonu
Name[uk]=Шаблон додатка
Name[x-test]=xxPlugin Templatexx
Name[zh_CN]=插件模板
Name[zh_TW]=外掛程式範本
Comment=Plugin Template
Comment[bs]=Servisni Predložak
Comment[ca]=Plantilla de connector
......@@ -46,6 +47,7 @@ Comment[tr]=Eklenti Şablonu
Comment[uk]=Шаблон додатка
Comment[x-test]=xxPlugin Templatexx
Comment[zh_CN]=插件模板
Comment[zh_TW]=外掛程式範本
ServiceTypes=KMuddy/Plugin
Type=Service
X-KDE-Library=kmuddyplugintemplate
......
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