Commit 762d6aed 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 0d615dcf
Pipeline #79355 skipped
......@@ -54,7 +54,7 @@ Name[ug]=ئوكسېگىن
Name[uk]=Oxygen
Name[wa]=Ocsidjinne
Name[x-test]=xxOxygenxx
Name[zh_CN]=Oxygen
Name[zh_CN]=轻氧
Name[zh_TW]=Oxygen
Description=KBlocks Oxygen theme for KDE 4
Description[bs]=Tema KBlocks kisik za KDE 4
......@@ -104,7 +104,7 @@ Description[tr]=KDE 4 için KBlocks Oxygen Teması
Description[uk]=Тема KBlocks Oxygen для KDE 4
Description[wa]=Tinme Ocsidjinne di KBlocks po KDE 4
Description[x-test]=xxKBlocks Oxygen theme for KDE 4xx
Description[zh_CN]=为 KDE 4 设计的 KBlocks 绿氧主题
Description[zh_CN]=为 KDE 4 设计的 KBlocks 氧主题
Description[zh_TW]=KBlocks KDE4 Oxygen 外觀主題
VersionFormat=1
Author=Johann-Ollivier Lapeyre
......
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