marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23: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-03-06 01:48:19 +00:00
parent a6a331f469
commit aa6db65cca
4 changed files with 6 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

@ -5,6 +5,7 @@
Name=Shell Name=Shell
Name[az]=Örtük Name[az]=Örtük
Name[ca]=Intèrpret d'ordres Name[ca]=Intèrpret d'ordres
Name[ca@valencia]=Intèrpret d'ordres
Name[cs]=Shell Name[cs]=Shell
Name[en_GB]=Shell Name[en_GB]=Shell
Name[es]=Intérprete de órdenes Name[es]=Intérprete de órdenes
@ -26,6 +27,7 @@ Name[zh_CN]=外壳程序
Comment=Configure the system shell 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[ca@valencia]=Configura l'intèrpret d'ordres del sistema
Comment[en_GB]=Configure the system shell Comment[en_GB]=Configure the system shell
Comment[es]=Configura el intérprete de órdenes del sistema Comment[es]=Configura el intérprete de órdenes del sistema
Comment[eu]=Konfiguratu sistemaren oskola Comment[eu]=Konfiguratu sistemaren oskola
@ -62,6 +64,7 @@ X-KDE-PluginInfo-EnabledByDefault=true
X-KDE-Keywords=system,shell,panel 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[ca@valencia]=sistema,intèrpret d'ordres,plafó
X-KDE-Keywords[en_GB]=system,shell,panel X-KDE-Keywords[en_GB]=system,shell,panel
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[eu]=sistema,shell,oskola,panela X-KDE-Keywords[eu]=sistema,shell,oskola,panela

1
quicksettings/caffeine/metadata.desktop
View file

@ -5,6 +5,7 @@
Name=Caffeine Name=Caffeine
Name[az]=Caffeine Name[az]=Caffeine
Name[ca]=Caffeine Name[ca]=Caffeine
Name[ca@valencia]=Caffeine
Name[cs]=Caffeine Name[cs]=Caffeine
Name[en_GB]=Caffeine Name[en_GB]=Caffeine
Name[es]=Cafeína Name[es]=Cafeína

1
quicksettings/keyboardtoggle/metadata.desktop
View file

@ -5,6 +5,7 @@
Name=Virtual Keyboard Toggle Name=Virtual Keyboard Toggle
Name[az]=Virtual klaviatura keçidi Name[az]=Virtual klaviatura keçidi
Name[ca]=Commutació del teclat virtual Name[ca]=Commutació del teclat virtual
Name[ca@valencia]=Commutació del teclat virtual
Name[cs]=Přepínání virtuální klávesnice Name[cs]=Přepínání virtuální klávesnice
Name[en_GB]=Virtual Keyboard Toggle Name[en_GB]=Virtual Keyboard Toggle
Name[es]=Conmutación del teclado virtual Name[es]=Conmutación del teclado virtual

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

@ -5,6 +5,7 @@
Name=Power Menu Name=Power Menu
Name[az]=Güc menyusu Name[az]=Güc menyusu
Name[ca]=Power Menu Name[ca]=Power Menu
Name[ca@valencia]=Power Menu
Name[en_GB]=Power Menu Name[en_GB]=Power Menu
Name[es]=Menú de energía Name[es]=Menú de energía
Name[eu]=Energia menua Name[eu]=Energia menua