Commit a9b704c8 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 916aeb14
Pipeline #152522 skipped
......@@ -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]=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[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.
......
......@@ -33,7 +33,7 @@ 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.
Comment[ca@valencia]=Aquest connector afig moltes funcions de cadenes.
Comment[ca@valencia]=Este connector afig moltes funcions de cadenes.
Comment[de]=Ein Modul für viele Zeichenfolgen-Funktionen.
Comment[en_GB]=This plug-in adds many strings functions.
Comment[es]=Este complemento añade muchas funciones de cadena.
......
......@@ -30,7 +30,7 @@ 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 al visor variable.
Comment[ca@valencia]=Aquest connector proporciona una finestra per al visor variable.
Comment[ca@valencia]=Este connector proporciona una finestra per al visor variable.
Comment[de]=Diese Modul stellt ein Ansichtsfenster für Variablen bereit.
Comment[en_GB]=This plug-in provides a variable viewer window.
Comment[es]=Este complemento proporciona una ventana de visor variable.
......
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