Commit d0fad804 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 421335e8
......@@ -3,6 +3,7 @@ Name=Contacts
Name[ca]=Contactes
Name[ca@valencia]=Contactes
Name[cs]=Kontakty
Name[en_GB]=Contacts
Name[es]=Contactos
Name[et]=Kontaktid
Name[fi]=Yhteystiedot
......@@ -29,6 +30,7 @@ GenericName=Contacts
GenericName[ca]=Contactes
GenericName[ca@valencia]=Contactes
GenericName[cs]=Kontakty
GenericName[en_GB]=Contacts
GenericName[es]=Contactos
GenericName[et]=Kontaktid
GenericName[fi]=Yhteystiedot
......
......@@ -4,6 +4,7 @@ Comment=Phone
Comment[ca]=Telèfon
Comment[ca@valencia]=Telèfon
Comment[cs]=Telefon
Comment[en_GB]=Phone
Comment[es]=Teléfono
Comment[et]=Telefon
Comment[fi]=Puhelin
......@@ -28,6 +29,7 @@ Name=Missed Call
Name[ca]=Trucada perduda
Name[ca@valencia]=Trucada perduda
Name[cs]=Zmeškaný hovor
Name[en_GB]=Missed Call
Name[es]=Llamada perdida
Name[et]=Vastamata kõne
Name[fi]=Vastaamaton puhelu
......@@ -49,6 +51,7 @@ Name[zh_TW]=未接來電
Comment=A call has been missed
Comment[ca]=S'ha perdut una trucada
Comment[ca@valencia]=S'ha perdut una trucada
Comment[en_GB]=A call has been missed
Comment[es]=Se ha perdido una llamada
Comment[et]=Vastamata jäänud kõne
Comment[fi]=Vastaamaton puhelu
......@@ -73,6 +76,7 @@ Name=Ringing
Name[ca]=Sonant
Name[ca@valencia]=Sonant
Name[cs]=Zvoní
Name[en_GB]=Ringing
Name[es]=Llamando
Name[et]=Helistamine
Name[fi]=Soi
......@@ -95,6 +99,7 @@ Comment=The phone is ringing
Comment[ca]=El telèfon està sonant
Comment[ca@valencia]=El telèfon està sonant
Comment[cs]=Telefon zvoní
Comment[en_GB]=The phone is ringing
Comment[es]=El teléfono está sonando
Comment[et]=Telefon kutsub
Comment[fi]=Puhelin soi
......
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