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
d709b5b198
commit
040f30e33e
3 changed files with 4 additions and 1 deletions
|
@ -23,6 +23,7 @@ Name[pt_BR]=Configurações do plugin Procurar Este Dispositivo
|
|||
Name[sv]=Inställningar av insticksprogrammet Hitta apparaten
|
||||
Name[uk]=Параметри додатка пошуку пристрою
|
||||
Name[x-test]=xxFind This Device plugin settingsxx
|
||||
Name[zh_CN]=查找此设备插件设置
|
||||
Name[zh_TW]=尋找此裝置的外掛設定
|
||||
|
||||
Categories=Qt;KDE;X-KDE-settings-kdeconnect;
|
||||
|
|
|
@ -617,7 +617,7 @@ Name[sv]=Generell underrättelse
|
|||
Name[tr]=Genel Bildirim
|
||||
Name[uk]=Загальне сповіщення
|
||||
Name[x-test]=xxGeneric Notificationxx
|
||||
Name[zh_CN]=一般通知
|
||||
Name[zh_CN]=常规通知
|
||||
Name[zh_TW]=通用通知
|
||||
Comment=Notification received
|
||||
Comment[ar]=استُلم إخطار
|
||||
|
|
|
@ -17,6 +17,7 @@ Name[pt_BR]=KDE Connect SMS
|
|||
Name[sv]=KDE-anslut SMS
|
||||
Name[uk]=KDE Connect SMS
|
||||
Name[x-test]=xxKDE Connect SMSxx
|
||||
Name[zh_CN]=KDE Connect 短信
|
||||
Name[zh_TW]=KDE 連線簡訊
|
||||
GenericName=SMS
|
||||
GenericName[ca]=SMS
|
||||
|
@ -56,6 +57,7 @@ Comment[pt_BR]=Mensagem de texto
|
|||
Comment[sv]=Textmeddelanden
|
||||
Comment[uk]=Обмін текстовими повідомленнями
|
||||
Comment[x-test]=xxText Messagingxx
|
||||
Comment[zh_CN]=短信
|
||||
Comment[zh_TW]=純文字簡訊
|
||||
Exec=kdeconnect-sms
|
||||
Icon=kdeconnect
|
||||
|
|
Loading…
Reference in a new issue