Commit d3a76362 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 c888ff14
......@@ -28,8 +28,8 @@ 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.
Comment[ca@valencia]=Aquest connector proporciona una finestra per a la visualització variable.
Comment[ca]=Aquest connector proporciona una finestra per al visor variable.
Comment[ca@valencia]=Aquest connector proporciona una finestra per al visor variable.
Comment[de]=Diese Modul stellt ein Ansichtsfenster für Variablen bereit.
Comment[es]=Este complemento proporciona una ventana de visor variable.
Comment[et]=Muutujanäitaja akent pakkuv plugin.
......
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