Commit 30f791d8 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 d0fad804
[Desktop Entry] [Desktop Entry]
Name=Contacts Name=Contacts
Name[ca]=Contactes Name[ca]=Contactes
Name[ca@valencia]=Contactes Name[ca@valencia]=Contactes
Name[cs]=Kontakty Name[cs]=Kontakty
...@@ -27,6 +28,7 @@ Terminal=false ...@@ -27,6 +28,7 @@ Terminal=false
Type=Application Type=Application
Categories=Qt;KDE;System; Categories=Qt;KDE;System;
GenericName=Contacts GenericName=Contacts
GenericName[ca]=Contactes GenericName[ca]=Contactes
GenericName[ca@valencia]=Contactes GenericName[ca@valencia]=Contactes
GenericName[cs]=Kontakty GenericName[cs]=Kontakty
[Global] [Global]
IconName=call-start IconName=call-start
Comment=Phone Comment=Phone
Comment[ca]=Telèfon Comment[ca]=Telèfon
Comment[ca@valencia]=Telèfon Comment[ca@valencia]=Telèfon
Comment[cs]=Telefon Comment[cs]=Telefon
...@@ -26,6 +27,7 @@ Comment[zh_TW]=手機 ...@@ -26,6 +27,7 @@ Comment[zh_TW]=手機
[Event/callMissed] [Event/callMissed]
Name=Missed Call Name=Missed Call
Name[ast]=Llamada perdida
Name[ca]=Trucada perduda Name[ca]=Trucada perduda
Name[ca@valencia]=Trucada perduda Name[ca@valencia]=Trucada perduda
Name[cs]=Zmeškaný hovor Name[cs]=Zmeškaný hovor
...@@ -49,6 +51,7 @@ Name[uk]=Пропущений дзвінок ...@@ -49,6 +51,7 @@ Name[uk]=Пропущений дзвінок
Name[x-test]=xxMissed Callxx Name[x-test]=xxMissed Callxx
Name[zh_TW]=未接來電 Name[zh_TW]=未接來電
Comment=A call has been missed Comment=A call has been missed
Comment[ast]=Perdióse una llamada
Comment[ca]=S'ha perdut una trucada Comment[ca]=S'ha perdut una trucada
Comment[ca@valencia]=S'ha perdut una trucada Comment[ca@valencia]=S'ha perdut una trucada
Comment[en_GB]=A call has been missed Comment[en_GB]=A call has been missed
...@@ -73,6 +76,7 @@ Action=Popup ...@@ -73,6 +76,7 @@ Action=Popup
[Event/ringing] [Event/ringing]
Name=Ringing Name=Ringing
Name[ca]=Sonant Name[ca]=Sonant
Name[ca@valencia]=Sonant Name[ca@valencia]=Sonant
Name[cs]=Zvoní Name[cs]=Zvoní
...@@ -96,6 +100,7 @@ Name[uk]=Дзвінок ...@@ -96,6 +100,7 @@ Name[uk]=Дзвінок
Name[x-test]=xxRingingxx Name[x-test]=xxRingingxx
Name[zh_TW]=響鈴 Name[zh_TW]=響鈴
Comment=The phone is ringing Comment=The phone is ringing
Comment[ast]=El teléfonu ta sonando
Comment[ca]=El telèfon està sonant Comment[ca]=El telèfon està sonant
Comment[ca@valencia]=El telèfon està sonant Comment[ca@valencia]=El telèfon està sonant
Comment[cs]=Telefon zvoní Comment[cs]=Telefon zvoní
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