marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03:09 +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-17 01:53:49 +00:00
parent 925fabc34c
commit 0cf909d51a
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,9 @@ Name[es]=Intérprete de órdenes
Name[fr]=Shell Name[fr]=Shell
Name[hu]=Felület Name[hu]=Felület
Name[nl]=Shell Name[nl]=Shell
Name[ro]=Interpretor
Name[sl]=Shell Name[sl]=Shell
Name[sv]=Skal
Name[uk]=Оболонка Name[uk]=Оболонка
Name[x-test]=xxShellxx Name[x-test]=xxShellxx
Comment=Configure the system shell Comment=Configure the system shell
@ -19,7 +21,9 @@ Comment[es]=Configura el intérprete de órdenes del sistema
Comment[fr]=Configurer le shell du système 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[ro]=Configurează interpretorul sistemului
Comment[sl]=Nastavi sistemski shell Comment[sl]=Nastavi sistemski shell
Comment[sv]=Anpassa systemskalet
Comment[uk]=Налаштувати командну оболонку системи Comment[uk]=Налаштувати командну оболонку системи
Comment[x-test]=xxConfigure the system shellxx Comment[x-test]=xxConfigure the system shellxx
Encoding=UTF-8 Encoding=UTF-8
@ -45,7 +49,9 @@ X-KDE-Keywords[es]=sistema,intérprete,intérprete de órdenes,panel
X-KDE-Keywords[fr]=système, shell, panneau 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[ro]=sistem,interpretor,panou
X-KDE-Keywords[sl]=sistem,shell,kontrolna plošča X-KDE-Keywords[sl]=sistem,shell,kontrolna plošča
X-KDE-Keywords[sv]=system,skal,panel
X-KDE-Keywords[uk]=system,shell,panel,система,оболонка,панель X-KDE-Keywords[uk]=system,shell,panel,система,оболонка,панель
X-KDE-Keywords[x-test]=xxsystemxx,xxshellxx,xxpanelxx X-KDE-Keywords[x-test]=xxsystemxx,xxshellxx,xxpanelxx
X-KDE-ParentApp=kcontrol X-KDE-ParentApp=kcontrol

1
quicksettings/caffeine/metadata.desktop
View file

@ -9,6 +9,7 @@ Name[es]=Cafeína
Name[fr]=Caffeine Name[fr]=Caffeine
Name[hu]=Caffeine Name[hu]=Caffeine
Name[nl]=Cafeïne Name[nl]=Cafeïne
Name[ro]=Cafeină
Name[sl]=Caffeine Name[sl]=Caffeine
Name[sv]=Koffein Name[sv]=Koffein
Name[uk]=Кофеїн Name[uk]=Кофеїн

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

@ -9,6 +9,7 @@ Name[es]=Menú de energía
Name[fr]=Menu « Énergie » Name[fr]=Menu « Énergie »
Name[hu]=Energia menü Name[hu]=Energia menü
Name[nl]=Energiemenu Name[nl]=Energiemenu
Name[ro]=Meniu avansat
Name[sl]=Meni energije Name[sl]=Meni energije
Name[sv]=Strömmeny Name[sv]=Strömmeny
Name[uk]=Меню живлення Name[uk]=Меню живлення