Commit 7aeda5b9 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 9fb7c0cb
......@@ -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.
......@@ -316,7 +316,9 @@ Action=Sound
[Event/popup]
Name=The Tea Cooker
Name[ca]=El cuiner de te
Name[el]=Ο βραστήρας τσαγιού
Name[es]=Tetera
Name[eu]=Te eltzea
Name[fr]=La théière
Name[ko]=차 끓이기 도구
Name[nl]=De Theezetter
......@@ -328,7 +330,9 @@ Name[x-test]=xxThe Tea Cookerxx
Name[zh_TW]=煮茶器
Comment=The Tea Cooker
Comment[ca]=El cuiner de te
Comment[el]=Ο βραστήρας τσαγιού
Comment[es]=Tetera
Comment[eu]=Te eltzea
Comment[fr]=La théière
Comment[ko]=차 끓이기 도구
Comment[nl]=De Theezetter
......
......@@ -79,12 +79,12 @@ GenericName[cs]=Vařič čaje
GenericName[cy]=Tegell Te
GenericName[da]=Tekoger
GenericName[de]=Teekocher
GenericName[el]=Εργαλείο φτιαξίματος τσαγιού
GenericName[el]=Βραστήρας τσαγιού
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