Commit 0b14720b 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 25d841d9
......@@ -160,6 +160,7 @@ GenericName[zh_TW]=下載管理員
Comment=KGet is a versatile and user-friendly download manager
Comment[ca]=El KGet és un gestor de baixades versàtil i fàcil d'emprar
Comment[ca@valencia]=El KGet és un gestor de baixades versàtil i fàcil d'emprar
Comment[cs]=KGet je všestranný a jednoduše použitelný správce stahování
Comment[de]=KGet ist ein vielseitiges und einfach zu benutzendes Download-Verwaltungsprogramm
Comment[el]=Το KGet είναι ένας ευέλικτος και εύκολος στη χρήση διαχειριστής λήψεων αρχείων
Comment[en_GB]=KGet is a versatile and user-friendly download manager
......
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