mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23:09 +00:00
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
9b98493232
commit
fcf8980577
3 changed files with 4 additions and 0 deletions
|
|
@ -31,6 +31,7 @@ Name[sk]=Plasma Mobile
|
|||
Name[sv]=Plasma mobil
|
||||
Name[uk]=Мобільна Плазма
|
||||
Name[x-test]=xxPlasma Mobilexx
|
||||
Name[zh_CN]=Plasma Mobile
|
||||
Name[zh_TW]=Plasma 行動
|
||||
Comment=Plasma Mobile by KDE
|
||||
Comment[ca]=Plasma Mòbil, creat per la comunitat KDE
|
||||
|
|
@ -61,5 +62,6 @@ Comment[sk]=Plasma Mobile od KDE
|
|||
Comment[sv]=Plasma mobil av KDE
|
||||
Comment[uk]=Мобільна Плазма від KDE
|
||||
Comment[x-test]=xxPlasma Mobile by KDExx
|
||||
Comment[zh_CN]=KDE Plasma Mobile
|
||||
Comment[zh_TW]=來自 KDE 的 Plasma 行動作業系統
|
||||
X-KDE-PluginInfo-Version=${PROJECT_VERSION}
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@ Comment[sk]=Plasma shell pre telefóny
|
|||
Comment[sv]=Plasma skal för telefoner
|
||||
Comment[uk]=Оболонка Плазми для телефонів
|
||||
Comment[x-test]=xxPlasma shell for phonesxx
|
||||
Comment[zh_CN]=适配手机的 Plasma 外壳
|
||||
Comment[zh_TW]=適用於手機的 Plasma Shell
|
||||
Type=Service
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ Name[sv]=Beröringsprov
|
|||
Name[tr]=Dokunma Testi
|
||||
Name[uk]=Тестування дотику
|
||||
Name[x-test]=xxTouch Testxx
|
||||
Name[zh_CN]=触摸测试
|
||||
Name[zh_TW]=觸控測試
|
||||
|
||||
Categories=Qt;KDE;System;Development;
|
||||
|
|
|
|||
Loading…
Reference in a new issue