Commit b26cb3d4 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 e34f6730
......@@ -15,7 +15,6 @@ Name[pt]=Contactos
Name[sl]=Stiki
Name[sv]=Kontakter
Name[uk]=Контакти
Name[x-test]=xxContactsxx
Name[zh_TW]=聯絡人
TryExec=contacts
Exec=contacts %U
......@@ -39,7 +38,6 @@ GenericName[sk]=Kontakty
GenericName[sl]=maui-communicator._desktop_
GenericName[sv]=Kontakter
GenericName[uk]=Контакти
GenericName[x-test]=xxContactsxx
GenericName[zh_TW]=聯絡人
StartupNotify=true
Icon=maui-contacts
......
......@@ -17,7 +17,6 @@ Comment[sk]=Telefón
Comment[sl]=Telefon
Comment[sv]=Telefon
Comment[uk]=Телефон
Comment[x-test]=xxPhonexx
Comment[zh_TW]=手機
[Event/callMissed]
......@@ -38,7 +37,6 @@ Name[sk]=Zmeškaný hovor
Name[sl]=Zgrešen klic
Name[sv]=Missat samtal
Name[uk]=Пропущений дзвінок
Name[x-test]=xxMissed Callxx
Name[zh_TW]=未接來電
Comment=A call has been missed
Comment[ca]=S'ha perdut una trucada
......@@ -55,7 +53,6 @@ Comment[pt]=Uma chamada não foi atendida
Comment[sl]=Klic je bil zgrešen
Comment[sv]=Ett samtal har missats
Comment[uk]=Було пропущено дзвінок
Comment[x-test]=xxA call has been missedxx
Comment[zh_TW]=有一通未接來電
Action=Popup
......@@ -77,7 +74,6 @@ Name[sk]=Zvoní
Name[sl]=Zvonjenje
Name[sv]=Ringer
Name[uk]=Дзвінок
Name[x-test]=xxRingingxx
Name[zh_TW]=響鈴
Comment=The phone is ringing
Comment[ca]=El telèfon està sonant
......@@ -95,7 +91,6 @@ Comment[pt]=O telefone está a tocar
Comment[sl]=Telefon zvoni
Comment[sv]=Telefonen ringer
Comment[uk]=Телефон дзвонить
Comment[x-test]=xxThe phone is ringingxx
Comment[zh_TW]=手機正在響鈴
Action=Sound
Sound=Oxygen-Im-Phone-Ring.ogg
......
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