Commit c6486e9d 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 151329c4
......@@ -2,4 +2,4 @@
ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=KAtomic Level
Uncompress=archive
TargetDir=katomic/levels
\ No newline at end of file
TargetDir=katomic/levels
......@@ -85,6 +85,7 @@ LevelCount=83
[Level1]
Name=Water
Name[ast]=Agua
Name[bs]=Voda
Name[ca]=Aigua
Name[ca@valencia]=Aigua
......
[Desktop Entry]
Name=KAtomic
Name[af]=Katomic
Name[ast]=KAtomic
Name[be]=KAtomic
Name[bn]=কে-অ্যাটমিক
Name[br]=KAtomic
......
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