Commit 427dfa32 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 371b4a4b
......@@ -5,6 +5,7 @@ Name[ca@valencia]=Contactes
Name[cs]=Kontakty
Name[es]=Contactos
Name[et]=Kontaktid
Name[fi]=Yhteystiedot
Name[fr]=Contacts
Name[it]=Contatti
Name[ko]=연락처
......@@ -28,6 +29,7 @@ GenericName[ca@valencia]=Contactes
GenericName[cs]=Kontakty
GenericName[es]=Contactos
GenericName[et]=Kontaktid
GenericName[fi]=Yhteystiedot
GenericName[fr]=Contacts
GenericName[it]=Contatti
GenericName[ko]=연락처
......
......@@ -6,6 +6,7 @@ Comment[ca@valencia]=Telèfon
Comment[cs]=Telefon
Comment[es]=Teléfono
Comment[et]=Telefon
Comment[fi]=Puhelin
Comment[fr]=Téléphone
Comment[it]=Telefono
Comment[ko]=전화
......@@ -27,6 +28,7 @@ Name[ca@valencia]=Trucada perduda
Name[cs]=Zmeškaný hovor
Name[es]=Llamada perdida
Name[et]=Vastamata kõne
Name[fi]=Vastaamaton puhelu
Name[fr]=Appel manqué
Name[it]=Chiamata persa
Name[ko]=부재 중 전화
......@@ -45,6 +47,7 @@ Comment[ca]=S'ha perdut una trucada
Comment[ca@valencia]=S'ha perdut una trucada
Comment[es]=Se ha perdido una llamada
Comment[et]=Vastamata jäänud kõne
Comment[fi]=Vastaamaton puhelu
Comment[fr]=Un appel a été manqué
Comment[it]=Una chiamata è stata persa
Comment[ko]=부재 중 전화가 있음
......@@ -66,6 +69,7 @@ Name[ca@valencia]=Sonant
Name[cs]=Zvoní
Name[es]=Llamando
Name[et]=Helistamine
Name[fi]=Soi
Name[fr]=Sonnerie en cours
Name[it]=Sta squillando
Name[ko]=전화 오는 중
......@@ -85,6 +89,7 @@ Comment[ca@valencia]=El telèfon està sonant
Comment[cs]=Telefon zvoní
Comment[es]=El teléfono está sonando
Comment[et]=Telefon kutsub
Comment[fi]=Puhelin soi
Comment[fr]=Le téléphone sonne
Comment[it]=Il telefono sta squillando
Comment[ko]=수신 전화가 있음
......
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