marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-03 10:14:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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:
l10n daemon script 2022-02-16 01:49:48 +00:00
parent c57b024e4d
commit 925fabc34c
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kcms/mobileshell/package/metadata.desktop
View file

@ -6,6 +6,7 @@ Name=Shell
Name[az]=Örtük Name[az]=Örtük
Name[ca]=Intèrpret d'ordres Name[ca]=Intèrpret d'ordres
Name[es]=Intérprete de órdenes Name[es]=Intérprete de órdenes
Name[fr]=Shell
Name[hu]=Felület Name[hu]=Felület
Name[nl]=Shell Name[nl]=Shell
Name[sl]=Shell Name[sl]=Shell
@ -15,6 +16,7 @@ Comment=Configure the system shell
Comment[az]=Sistem Comment[az]=Sistem
Comment[ca]=Configura l'intèrpret d'ordres del sistema Comment[ca]=Configura l'intèrpret d'ordres del sistema
Comment[es]=Configura el intérprete de órdenes del sistema Comment[es]=Configura el intérprete de órdenes del sistema
Comment[fr]=Configurer le shell du système
Comment[hu]=A rendszerfelület beállítása Comment[hu]=A rendszerfelület beállítása
Comment[nl]=De systeem-shell configureren Comment[nl]=De systeem-shell configureren
Comment[sl]=Nastavi sistemski shell Comment[sl]=Nastavi sistemski shell
@ -40,6 +42,7 @@ X-KDE-Keywords=system,shell,panel
X-KDE-Keywords[az]=sistem,örtük,panel X-KDE-Keywords[az]=sistem,örtük,panel
X-KDE-Keywords[ca]=sistema,intèrpret d'ordres,plafó 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[es]=sistema,intérprete,intérprete de órdenes,panel
X-KDE-Keywords[fr]=système, shell, panneau
X-KDE-Keywords[hu]=rendszer,felület,panel X-KDE-Keywords[hu]=rendszer,felület,panel
X-KDE-Keywords[nl]=systeem,shell,paneel X-KDE-Keywords[nl]=systeem,shell,paneel
X-KDE-Keywords[sl]=sistem,shell,kontrolna plošča X-KDE-Keywords[sl]=sistem,shell,kontrolna plošča

1
quicksettings/caffeine/metadata.desktop
View file

@ -13,6 +13,7 @@ Name[sl]=Caffeine
Name[sv]=Koffein Name[sv]=Koffein
Name[uk]=Кофеїн Name[uk]=Кофеїн
Name[x-test]=xxCaffeinexx Name[x-test]=xxCaffeinexx
Name[zh_CN]=Caffeine
Icon=system-suspend-hibernate Icon=system-suspend-hibernate
Type=Service Type=Service

1
quicksettings/powermenu/package/metadata.desktop
View file

@ -13,6 +13,7 @@ Name[sl]=Meni energije
Name[sv]=Strömmeny Name[sv]=Strömmeny
Name[uk]=Меню живлення Name[uk]=Меню живлення
Name[x-test]=xxPower Menuxx Name[x-test]=xxPower Menuxx
Name[zh_CN]=电源菜单
Icon=system-shutdown-symbolic Icon=system-shutdown-symbolic
Type=Service Type=Service