mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-27 22:33:08 +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
8f418a3ee1
commit
3ecc2844fb
1 changed files with 38 additions and 0 deletions
|
|
@ -3,6 +3,44 @@
|
|||
|
||||
[Desktop Entry]
|
||||
Name=Plasma Mobile
|
||||
Name[ast]=Plasma Mobile
|
||||
Name[az]=Plasma Mobil
|
||||
Name[ca]=Plasma Mobile
|
||||
Name[ca@valencia]=Plasma Mobile
|
||||
Name[cs]=Plasma Mobile
|
||||
Name[da]=Plasma Mobile
|
||||
Name[de]=Plasma Mobile
|
||||
Name[en_GB]=Plasma Mobile
|
||||
Name[es]=Plasma Mobile
|
||||
Name[et]=Plasma Mobile
|
||||
Name[eu]=Plasma Mugikorra
|
||||
Name[fi]=Plasma Mobile
|
||||
Name[fr]=Plasma Mobile
|
||||
Name[gl]=Plasma Mobile
|
||||
Name[hi]=प्लाज़्मा मोबाइल
|
||||
Name[hu]=Plasma Mobile
|
||||
Name[ia]=Plasma Mobile
|
||||
Name[id]=Plasma Mobile
|
||||
Name[it]=Plasma Mobile
|
||||
Name[ka]=Plasma Mobile
|
||||
Name[ko]=Plasma 모바일
|
||||
Name[lt]=Plasma mobilioji sąsaja
|
||||
Name[nl]=Plasma-mobiel
|
||||
Name[nn]=Plasma Mobile
|
||||
Name[pa]=ਪਲਾਜ਼ਮਾ ਮੋਬਾਈਲ
|
||||
Name[pl]=Przenośna Plazma
|
||||
Name[pt]=Plasma Mobile
|
||||
Name[pt_BR]=Plasma Mobile
|
||||
Name[ro]=Plasma Mobile
|
||||
Name[ru]=Plasma Mobile
|
||||
Name[sk]=Plasma Mobile
|
||||
Name[sl]=Plasma Mobile
|
||||
Name[sv]=Plasma mobil
|
||||
Name[tr]=Plasma Mobile
|
||||
Name[uk]=Мобільна Плазма
|
||||
Name[x-test]=xxPlasma Mobilexx
|
||||
Name[zh_CN]=Plasma Mobile
|
||||
Name[zh_TW]=Plasma 行動
|
||||
Comment=Plasma workspace for smartphones
|
||||
Comment[ast]=La estaya de trabayu de Plasma pa teléfonos intelixentes
|
||||
Comment[az]=Smartfonlar üçün Plasma iş sahəsi
|
||||
|
|
|
|||
Loading…
Reference in a new issue