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
d31abf8d9c
commit
13963d92ef
1 changed files with 1 additions and 1 deletions
|
@ -49,7 +49,7 @@ Name[tr]=KDE Bağlan Göstergesi
|
|||
Name[uk]=Індикатор KDE Connect
|
||||
Name[x-test]=xxKDE Connect Indicatorxx
|
||||
Name[zh_CN]=KDE Connect 指示器
|
||||
Name[zh_TW]=KDE 連線指示符號
|
||||
Name[zh_TW]=KDE 連線指示器
|
||||
Comment=Display information about your devices
|
||||
Comment[ar]=اعرض معلومات عن أجهزتك
|
||||
Comment[az]=Cihazınız haqqında məlumatı gösətrmək
|
||||
|
|
Loading…
Reference in a new issue