Commit 0de9b09a 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 b6baaa8a
......@@ -99,7 +99,7 @@ Description[sv]=Standardtema för Kigo i KDE 4
Description[tr]=KDE4 için Öntanımlı Kigo teması
Description[uk]=Типова тема Kigo для KDE 4
Description[x-test]=xxKigo Default theme for KDE 4xx
Description[zh_CN]= KDE 4 设计的 Kigo 默认主题
Description[zh_CN]=Kigo 在 KDE 4 中的默认主题
Description[zh_TW]=Kigo KDE4 預設主題
VersionFormat=1
Author=Arturo Silva
......
......@@ -82,7 +82,7 @@ Description[sv]=Enkelt Kigo-tema baserat på standardtemat av Arturo Silva
Description[tr]=Düz Kigo teması Arturo Silva'nın Öntanımlı teması üzerinedir
Description[uk]=Проста тема Kigo, заснована на типовій темі, створеній Arturo Silva
Description[x-test]=xxPlain Kigo theme based on Default theme by Arturo Silvaxx
Description[zh_CN]=由 Arturo Silva 设计的基于默认主题纯色 Kigo 主题
Description[zh_CN]=基于默认主题的普通 Kigo 主题,由 Arturo Silva 创作
Description[zh_TW]=基於 Arturo Silva 所做的預設主題修改而成的樸素 Kigo 主題
VersionFormat=1
Author=Frederik Gladhorn
......
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