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"
This commit is contained in:
l10n daemon script 2021-07-20 02:18:07 +00:00
parent 35942a2982
commit 051bb3d6e9
3 changed files with 4 additions and 4 deletions

View file

@ -130,7 +130,7 @@ Comment[ta]=உங்கள் சாதனங்களை ஒன்றாக்
Comment[tr]=Tüm aygıtlarınızı birleştirin Comment[tr]=Tüm aygıtlarınızı birleştirin
Comment[uk]=Поєднайте усі ваші пристрої Comment[uk]=Поєднайте усі ваші пристрої
Comment[x-test]=xxMake all your devices onexx Comment[x-test]=xxMake all your devices onexx
Comment[zh_CN]= Comment[zh_CN]=
Comment[zh_TW]= Comment[zh_TW]=
Exec=kdeconnect-app Exec=kdeconnect-app
Icon=kdeconnect Icon=kdeconnect

View file

@ -78,7 +78,7 @@ Comment[ta]=உங்கள் சாதனங்களைப் பற்றி
Comment[tr]=Aygıtlarınız hakkında bilgi görüntüleyin Comment[tr]=Aygıtlarınız hakkında bilgi görüntüleyin
Comment[uk]=Показати дані щодо ваших пристроїв Comment[uk]=Показати дані щодо ваших пристроїв
Comment[x-test]=xxDisplay information about your devicesxx Comment[x-test]=xxDisplay information about your devicesxx
Comment[zh_CN]= Comment[zh_CN]=
Comment[zh_TW]= Comment[zh_TW]=
Exec=kdeconnect-indicator Exec=kdeconnect-indicator
Icon=kdeconnect Icon=kdeconnect

View file

@ -271,7 +271,7 @@ Comment[ta]=யாரோ உங்களைக் கூப்பிடுகி
Comment[tr]=Biri sizi arıyor Comment[tr]=Biri sizi arıyor
Comment[uk]=Хтось телефонує вам Comment[uk]=Хтось телефонує вам
Comment[x-test]=xxSomeone is calling youxx Comment[x-test]=xxSomeone is calling youxx
Comment[zh_CN]=人正在呼叫您 Comment[zh_CN]=人正在呼叫您
Comment[zh_TW]=有人打電話給您 Comment[zh_TW]=有人打電話給您
Action=Popup Action=Popup
@ -319,7 +319,7 @@ Name[ta]=தவறிய அழைப்பு
Name[tr]=Cevapsız Çağrı Name[tr]=Cevapsız Çağrı
Name[uk]=Пропущений дзвінок Name[uk]=Пропущений дзвінок
Name[x-test]=xxMissed Callxx Name[x-test]=xxMissed Callxx
Name[zh_CN]=错过的呼叫 Name[zh_CN]=未接来电
Name[zh_TW]=未接來電 Name[zh_TW]=未接來電
Comment=You have a missed call Comment=You have a missed call
Comment[ar]=لقد فاتتك مكالمة Comment[ar]=لقد فاتتك مكالمة