Commit e34f6730 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 48f19605
......@@ -10,6 +10,7 @@ Name[it]=Contatti
Name[ko]=연락처
Name[lt]=Adresatai
Name[nl]=Contactpersonen
Name[nn]=Kontaktar
Name[pt]=Contactos
Name[sl]=Stiki
Name[sv]=Kontakter
......@@ -32,6 +33,7 @@ GenericName[it]=Contatti
GenericName[ko]=연락처
GenericName[lt]=Adresatai
GenericName[nl]=Contactpersonen
GenericName[nn]=Kontaktar
GenericName[pt]=Contactos
GenericName[sk]=Kontakty
GenericName[sl]=maui-communicator._desktop_
......
......@@ -11,6 +11,7 @@ Comment[it]=Telefono
Comment[ko]=전화
Comment[lt]=Telefonas
Comment[nl]=Telefoon
Comment[nn]=Telefon
Comment[pt]=Telefone
Comment[sk]=Telefón
Comment[sl]=Telefon
......@@ -31,6 +32,7 @@ Name[it]=Chiamata persa
Name[ko]=부재 중 전화
Name[lt]=Praleistas skambutis
Name[nl]=Gemiste oproep
Name[nn]=Tapt oppringing
Name[pt]=Chamada Não Atendida
Name[sk]=Zmeškaný hovor
Name[sl]=Zgrešen klic
......@@ -48,6 +50,7 @@ Comment[it]=Una chiamata è stata persa
Comment[ko]=부재 중 전화가 있음
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[sl]=Klic je bil zgrešen
Comment[sv]=Ett samtal har missats
......@@ -68,6 +71,7 @@ Name[it]=Sta squillando
Name[ko]=전화 오는 중
Name[lt]=Skambina
Name[nl]=Bel gaat over
Name[nn]=Ringjer
Name[pt]=A tocar
Name[sk]=Zvoní
Name[sl]=Zvonjenje
......@@ -86,6 +90,7 @@ Comment[it]=Il telefono sta squillando
Comment[ko]=수신 전화가 있음
Comment[lt]=Skambina telefonas
Comment[nl]=De telefoon gaat over
Comment[nn]=Telefonen ringjer
Comment[pt]=O telefone está a tocar
Comment[sl]=Telefon zvoni
Comment[sv]=Telefonen ringer
......
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