Commitca8cf81

l10n daemon script

committed

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"

1 parent82a5336 commitca8cf81Copy full SHA for ca8cf81

File tree

-2

lines changed

-2

lines changed

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ Name[uk]=Космічна дуель`
`68`	`68`	`Name[vi]=KSpaceDuel`
`69`	`69`	`Name[wa]=KSpaceDuel`
`70`	`70`	`Name[xh]=KSpaceDuel`
`71`		`-Name[x-test]=xxKSpaceDuelxx`
`72`	`71`	`Name[zh_CN]=KSpaceDuel`
`73`	`72`	`Name[zh_TW]=KSpaceDuel 決戰星空`
`74`	`73`	`Exec=kspaceduel -qwindowtitle %c`
`@@ -133,7 +132,6 @@ GenericName[tr]=Uzay Macerası Oyunu`
`133`	`132`	`GenericName[ug]=بوشلۇق ئويۇنى`
`134`	`133`	`GenericName[uk]=Космічна аркадна гра — дуель`
`135`	`134`	`GenericName[wa]=Djeu d' årcåde di l' espåce`
`136`		`-GenericName[x-test]=xxSpace Arcade Gamexx`
`137`	`135`	`GenericName[zh_CN]=空间型街机游戏`
`138`	`136`	`GenericName[zh_TW]=街機太空遊戲`
`139`	`137`	`Icon=kspaceduel`

Comments

(0)