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"
schuay · Jul 20, 2015 · 8e20a4e · 8e20a4e
1 parent 96271a3
commit 8e20a4e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/org.kde.picmi.desktop b/org.kde.picmi.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=picmi
+Name[ast]=picmi
 Name[bs]=picmi
 Name[ca]=picmi
 Name[ca@valencia]=picmi
@@ -86,6 +87,7 @@ GenericName[x-test]=xxLogic Gamexx
 GenericName[zh_CN]=逻辑游戏
 GenericName[zh_TW]=智力遊戲
 Comment=A number logic game
+Comment[ast]=Un xuegu de llóxica numbérica
 Comment[bs]=Logička igra s brojevima
 Comment[ca]=Un joc de lògica de nombres
 Comment[ca@valencia]=Un joc de lògica de nombres

diff --git a/themes/picmi.desktop b/themes/picmi.desktop
@@ -1,6 +1,7 @@
 [KGameTheme]
 VersionFormat=1
 Name=Picmi
+Name[ast]=Picmi
 Name[bs]=Picmi
 Name[ca]=Picmi
 Name[ca@valencia]=Picmi