Commit 0594e0bb 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 4021ed78
......@@ -90,7 +90,7 @@ GenericName[zh_CN]=系统监视器
GenericName[zh_TW]=系統監視器
Comment=Monitor running processes and system performance
Comment[ast]=Supervisa los procesos n'execución y el rindimientu del sistema
Comment[az]=İşləyən proseslərə və Sitemin işinə nəzarət
Comment[az]=İşləyən proseslərə və Sistemin işinə nəzarət
Comment[ca]=Controlador de processos en execució i rendiment del sistema
Comment[ca@valencia]=Controlador de processos en execució i rendiment del sistema
Comment[da]=Overvåg kørende processer og systemets ydelse
......
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