Commit 421335e8 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 c9eee20f
......@@ -14,6 +14,7 @@ Name[nl]=Contactpersonen
Name[nn]=Kontaktar
Name[pt]=Contactos
Name[pt_BR]=Contatos
Name[ro]=Contacte
Name[sl]=Stiki
Name[sv]=Kontakter
Name[uk]=Контакти
......@@ -39,6 +40,7 @@ GenericName[nl]=Contactpersonen
GenericName[nn]=Kontaktar
GenericName[pt]=Contactos
GenericName[pt_BR]=Contatos
GenericName[ro]=Contacte
GenericName[sk]=Kontakty
GenericName[sl]=maui-communicator._desktop_
GenericName[sv]=Kontakter
......
......@@ -15,6 +15,7 @@ Comment[nl]=Telefoon
Comment[nn]=Telefon
Comment[pt]=Telefone
Comment[pt_BR]=Telefone
Comment[ro]=Telefon
Comment[sk]=Telefón
Comment[sl]=Telefon
Comment[sv]=Telefon
......@@ -38,6 +39,7 @@ Name[nl]=Gemiste oproep
Name[nn]=Tapt oppringing
Name[pt]=Chamada Não Atendida
Name[pt_BR]=Chamada não atendida
Name[ro]=Apel pierdut
Name[sk]=Zmeškaný hovor
Name[sl]=Zgrešen klic
Name[sv]=Missat samtal
......@@ -58,6 +60,7 @@ 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[ro]=A fost pierdut un apel
Comment[sl]=Klic je bil zgrešen
Comment[sv]=Ett samtal har missats
Comment[uk]=Було пропущено дзвінок
......@@ -81,6 +84,7 @@ Name[nl]=Bel gaat over
Name[nn]=Ringjer
Name[pt]=A tocar
Name[pt_BR]=Tocando
Name[ro]=Sună
Name[sk]=Zvoní
Name[sl]=Zvonjenje
Name[sv]=Ringer
......@@ -102,6 +106,7 @@ 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[ro]=Telefonul sună
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