Commit 48f19605 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 d0d11e40
......@@ -11,6 +11,7 @@ Name[ko]=연락처
Name[lt]=Adresatai
Name[nl]=Contactpersonen
Name[pt]=Contactos
Name[sl]=Stiki
Name[sv]=Kontakter
Name[uk]=Контакти
Name[x-test]=xxContactsxx
......@@ -33,6 +34,7 @@ GenericName[lt]=Adresatai
GenericName[nl]=Contactpersonen
GenericName[pt]=Contactos
GenericName[sk]=Kontakty
GenericName[sl]=maui-communicator._desktop_
GenericName[sv]=Kontakter
GenericName[uk]=Контакти
GenericName[x-test]=xxContactsxx
......
......@@ -13,6 +13,7 @@ Comment[lt]=Telefonas
Comment[nl]=Telefoon
Comment[pt]=Telefone
Comment[sk]=Telefón
Comment[sl]=Telefon
Comment[sv]=Telefon
Comment[uk]=Телефон
Comment[x-test]=xxPhonexx
......@@ -32,6 +33,7 @@ Name[lt]=Praleistas skambutis
Name[nl]=Gemiste oproep
Name[pt]=Chamada Não Atendida
Name[sk]=Zmeškaný hovor
Name[sl]=Zgrešen klic
Name[sv]=Missat samtal
Name[uk]=Пропущений дзвінок
Name[x-test]=xxMissed Callxx
......@@ -47,6 +49,7 @@ Comment[ko]=부재 중 전화가 있음
Comment[lt]=Buvo praleistas skambutis
Comment[nl]=Er is een gemiste oproep
Comment[pt]=Uma chamada não foi atendida
Comment[sl]=Klic je bil zgrešen
Comment[sv]=Ett samtal har missats
Comment[uk]=Було пропущено дзвінок
Comment[x-test]=xxA call has been missedxx
......@@ -67,6 +70,7 @@ Name[lt]=Skambina
Name[nl]=Bel gaat over
Name[pt]=A tocar
Name[sk]=Zvoní
Name[sl]=Zvonjenje
Name[sv]=Ringer
Name[uk]=Дзвінок
Name[x-test]=xxRingingxx
......@@ -83,6 +87,7 @@ Comment[ko]=수신 전화가 있음
Comment[lt]=Skambina telefonas
Comment[nl]=De telefoon gaat over
Comment[pt]=O telefone está a tocar
Comment[sl]=Telefon zvoni
Comment[sv]=Telefonen ringer
Comment[uk]=Телефон дзвонить
Comment[x-test]=xxThe phone is ringingxx
......
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