marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-28 14:43: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-06-20 01:55:01 +00:00
parent 6ed9a7d65a
commit e4f5b54dde
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
containments/homescreens/halcyon/package/metadata.desktop
View file

@ -5,6 +5,7 @@
Encoding=UTF-8
Keywords=
Name=Halcyon
Name[az]=Halcyon
Name[ca]=Halcyon
Name[ca@valencia]=Halcyon
Name[es]=Halcyon
@ -17,7 +18,9 @@ Name[sv]=Halcyon
Name[tr]=Halikon
Name[uk]=Альціон
Name[x-test]=xxHalcyonxx
Name[zh_CN]=Halcyon
Description=A mobile homescreen focused on simplicity and ease-of-use.
Description[az]=Mobil cihazlardakı ev ekranında daha çox sadəlik və istifadə rahatlığı nəzərə alınıb.
Description[ca]=Una pantalla d'inici del mòbil enfocada a la senzillesa i facilitat d'ús.
Description[ca@valencia]=Una pantalla d'inici del mòbil enfocada a la senzillesa i facilitat d'ús.
Description[es]=Pantalla de inicio para móvil centrada en la simplicidad y en la facilidad de uso.
@ -30,6 +33,7 @@ Description[sv]=En hemskärm för mobiler fokuserad på enkelhet och användbarh
Description[tr]=Yalınlığa ve kullanım kolaylığına odaklanmış, taşınabilir bir ana ekran.
Description[uk]=Домашній екран для мобільних пристроїв із акцентом на простоті та зручності.
Description[x-test]=xxA mobile homescreen focused on simplicity and ease-of-use.xx
Description[zh_CN]=简约易用的手机主屏幕应用
Type=Service
X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment

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

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