mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-29 07:03: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
ee113b8cdc
commit
c57b024e4d
4 changed files with 29 additions and 1 deletions
|
|
@ -3,7 +3,23 @@
|
|||
|
||||
[Desktop Entry]
|
||||
Name=Shell
|
||||
Name[az]=Örtük
|
||||
Name[ca]=Intèrpret d'ordres
|
||||
Name[es]=Intérprete de órdenes
|
||||
Name[hu]=Felület
|
||||
Name[nl]=Shell
|
||||
Name[sl]=Shell
|
||||
Name[uk]=Оболонка
|
||||
Name[x-test]=xxShellxx
|
||||
Comment=Configure the system shell
|
||||
Comment[az]=Sistem
|
||||
Comment[ca]=Configura l'intèrpret d'ordres del sistema
|
||||
Comment[es]=Configura el intérprete de órdenes del sistema
|
||||
Comment[hu]=A rendszerfelület beállítása
|
||||
Comment[nl]=De systeem-shell configureren
|
||||
Comment[sl]=Nastavi sistemski shell
|
||||
Comment[uk]=Налаштувати командну оболонку системи
|
||||
Comment[x-test]=xxConfigure the system shellxx
|
||||
Encoding=UTF-8
|
||||
Type=Service
|
||||
Icon=preferences-desktop-plasma
|
||||
|
|
@ -21,5 +37,13 @@ X-KDE-PluginInfo-Category=System Information
|
|||
X-KDE-PluginInfo-License=GPL
|
||||
X-KDE-PluginInfo-EnabledByDefault=true
|
||||
X-KDE-Keywords=system,shell,panel
|
||||
X-KDE-Keywords[az]=sistem,örtük,panel
|
||||
X-KDE-Keywords[ca]=sistema,intèrpret d'ordres,plafó
|
||||
X-KDE-Keywords[es]=sistema,intérprete,intérprete de órdenes,panel
|
||||
X-KDE-Keywords[hu]=rendszer,felület,panel
|
||||
X-KDE-Keywords[nl]=systeem,shell,paneel
|
||||
X-KDE-Keywords[sl]=sistem,shell,kontrolna plošča
|
||||
X-KDE-Keywords[uk]=system,shell,panel,система,оболонка,панель
|
||||
X-KDE-Keywords[x-test]=xxsystemxx,xxshellxx,xxpanelxx
|
||||
X-KDE-ParentApp=kcontrol
|
||||
X-KDE-PluginInfo-Name=kcm_mobileshell
|
||||
|
|
|
|||
|
|
@ -7,7 +7,9 @@ Name[az]=Caffeine
|
|||
Name[ca]=Caffeine
|
||||
Name[es]=Cafeína
|
||||
Name[fr]=Caffeine
|
||||
Name[hu]=Caffeine
|
||||
Name[nl]=Cafeïne
|
||||
Name[sl]=Caffeine
|
||||
Name[sv]=Koffein
|
||||
Name[uk]=Кофеїн
|
||||
Name[x-test]=xxCaffeinexx
|
||||
|
|
|
|||
|
|
@ -7,7 +7,9 @@ Name[az]=Güc menyusu
|
|||
Name[ca]=Power Menu
|
||||
Name[es]=Menú de energía
|
||||
Name[fr]=Menu « Énergie »
|
||||
Name[hu]=Energia menü
|
||||
Name[nl]=Energiemenu
|
||||
Name[sl]=Meni energije
|
||||
Name[sv]=Strömmeny
|
||||
Name[uk]=Меню живлення
|
||||
Name[x-test]=xxPower Menuxx
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ Comment[cs]=Plasma Shell pro telefony
|
|||
Comment[da]=Plasma-skal til telefoner
|
||||
Comment[de]=Plasma-Shell für Telefone
|
||||
Comment[en_GB]=Plasma shell for phones
|
||||
Comment[es]=Interfaz de Plasma para teléfonos
|
||||
Comment[es]=Intérprete de órdenes de Plasma para teléfonos
|
||||
Comment[et]=Plasma kest telefonidele
|
||||
Comment[eu]=Telefonoetarako Plasma oskola
|
||||
Comment[fi]=Plasma-työtila puhelimiin
|
||||
|
|
|
|||
Loading…
Reference in a new issue