Commit c9eee20f 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 427dfa32
......@@ -13,6 +13,7 @@ Name[lt]=Adresatai
Name[nl]=Contactpersonen
Name[nn]=Kontaktar
Name[pt]=Contactos
Name[pt_BR]=Contatos
Name[sl]=Stiki
Name[sv]=Kontakter
Name[uk]=Контакти
......@@ -37,6 +38,7 @@ GenericName[lt]=Adresatai
GenericName[nl]=Contactpersonen
GenericName[nn]=Kontaktar
GenericName[pt]=Contactos
GenericName[pt_BR]=Contatos
GenericName[sk]=Kontakty
GenericName[sl]=maui-communicator._desktop_
GenericName[sv]=Kontakter
......
......@@ -14,6 +14,7 @@ Comment[lt]=Telefonas
Comment[nl]=Telefoon
Comment[nn]=Telefon
Comment[pt]=Telefone
Comment[pt_BR]=Telefone
Comment[sk]=Telefón
Comment[sl]=Telefon
Comment[sv]=Telefon
......@@ -36,6 +37,7 @@ Name[lt]=Praleistas skambutis
Name[nl]=Gemiste oproep
Name[nn]=Tapt oppringing
Name[pt]=Chamada Não Atendida
Name[pt_BR]=Chamada não atendida
Name[sk]=Zmeškaný hovor
Name[sl]=Zgrešen klic
Name[sv]=Missat samtal
......@@ -55,6 +57,7 @@ Comment[lt]=Buvo praleistas skambutis
Comment[nl]=Er is een gemiste oproep
Comment[nn]=Du mista ei oppringing
Comment[pt]=Uma chamada não foi atendida
Comment[pt_BR]=Uma chamada não foi atendida
Comment[sl]=Klic je bil zgrešen
Comment[sv]=Ett samtal har missats
Comment[uk]=Було пропущено дзвінок
......@@ -77,6 +80,7 @@ Name[lt]=Skambina
Name[nl]=Bel gaat over
Name[nn]=Ringjer
Name[pt]=A tocar
Name[pt_BR]=Tocando
Name[sk]=Zvoní
Name[sl]=Zvonjenje
Name[sv]=Ringer
......@@ -97,6 +101,7 @@ Comment[lt]=Skambina telefonas
Comment[nl]=De telefoon gaat over
Comment[nn]=Telefonen ringjer
Comment[pt]=O telefone está a tocar
Comment[pt_BR]=O telefone está tocando
Comment[sl]=Telefon zvoni
Comment[sv]=Telefonen ringer
Comment[uk]=Телефон дзвонить
......
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