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:
parent
8cf9276066
commit
b1d478015d
3 changed files with 4 additions and 4 deletions
|
@ -140,7 +140,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
|
||||||
|
|
|
@ -88,7 +88,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
|
||||||
|
|
|
@ -290,7 +290,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
|
||||||
|
|
||||||
|
@ -340,7 +340,7 @@ Name[ta]=தவறிய அழைப்பு
|
||||||
Name[tr]=Yanıtsız Çağrı
|
Name[tr]=Yanıtsı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]=لقد فاتتك مكالمة
|
||||||
|
|
Loading…
Reference in a new issue