Commit 0eaa565b authored by Script Kiddy's avatar Script Kiddy

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 75f0cdcd
......@@ -15,7 +15,7 @@ Comment[en_GB]=Tea Cooker
Comment[eo]=Tea infuzilo
Comment[es]=Tetera
Comment[et]=Teekann
Comment[eu]=Te prestaketa
Comment[eu]=Tea prestatzea
Comment[fi]=Teenkeitin
Comment[fr]=Théière
Comment[ga]=Cócaire Tae
......@@ -210,7 +210,7 @@ Name[en_GB]=Tea is getting lonely
Name[eo]=La teo eksentiĝas soleca
Name[es]=El té se está quedando solo
Name[et]=Tee ootab joomist
Name[eu]=Tea bakarrik gelditzen ari da
Name[eu]=Tea zain dago
Name[fi]=Tee tuntee olonsa yksinäiseksi
Name[fr]=Le thé va finir par refroidir
Name[ga]=Tá uaigneas ag teacht ar an tae
......@@ -267,7 +267,7 @@ Comment[en_GB]=Tea is getting lonely.
Comment[eo]=La teo eksentiĝas soleca.
Comment[es]=El té se está quedando solo.
Comment[et]=Tee ootab joomist.
Comment[eu]=Tea bakarrik gelditzen ari da.
Comment[eu]=Tea zain dago.
Comment[fi]=Tee tuntee olonsa yksinäiseksi.
Comment[fr]=Le thé va finir par refroidir.
Comment[ga]=Tá uaigneas ag teacht ar an tae.
......
......@@ -84,7 +84,7 @@ GenericName[en_GB]=Tea Cooker
GenericName[eo]=Tea infuzilo
GenericName[es]=Tetera
GenericName[et]=Teekann
GenericName[eu]=Te prestaketa
GenericName[eu]=Tea prestatzea
GenericName[fa]=چای‌ساز
GenericName[fi]=Teenkeitin
GenericName[fr]=Théière
......
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