Commit ab9a9162 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 946e93a6
......@@ -49,7 +49,7 @@ Name[zh_CN]=怀旧蓝调
Name[zh_TW]=Nostalgia Blues
Description=A theme for KGoldrunner that brings back that 8-bit look... now in blue!
Description[bs]=Tema za KTragač zlata koja vraća 8-bitni izgled... sada u plavoj boji!
Description[ca]=Un tema per KGoldrunner que us porta l'aparença clàssica dels 8-bits... ara en blau!
Description[ca]=Un tema per KGoldrunner que us porta l'aspecte clàssic dels 8-bits... ara en blau!
Description[ca@valencia]=Un tema per KGoldrunner que vos porta l'aparença clàssica dels 8-bits... ara en blau!
Description[da]=Et tema til KGoldrunner som bringer 8-bit-udseendet tilbage... nu i blåt!
Description[de]=Ein Design für KGoldrunner mit dem alten 8-Bit-Charme ... Jetzt in Blau!
......
......@@ -53,7 +53,7 @@ Name[zh_CN]=怀旧
Name[zh_TW]=Nostalgia
Description=A scalable theme for KGoldrunner that brings back that 8-bit look...
Description[bs]=Skalabilna tema za KTragač zlata koja vraća 8-bitni izgled...
Description[ca]=Un tema per KGoldrunner que us porta l'aparença clàssica dels 8-bits...
Description[ca]=Un tema per KGoldrunner que us porta l'aspecte clàssic dels 8-bits...
Description[ca@valencia]=Un tema per KGoldrunner que vos porta l'aparença clàssica dels 8-bits...
Description[da]=Et skalerbart tema til KGoldrunner som bruger 8-bit-udseendet tilbage...
Description[de]=Ein vergrößerbares Design mit dem alten 8-Bit-Charme ...
......
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