mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-08-03 10:14:45 +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
c3e3a4e72f
commit
1445b44ce9
1 changed files with 12 additions and 0 deletions
|
|
@ -5,7 +5,19 @@
|
||||||
Encoding=UTF-8
|
Encoding=UTF-8
|
||||||
Keywords=
|
Keywords=
|
||||||
Name=Halcyon
|
Name=Halcyon
|
||||||
|
Name[ca]=Halcyon
|
||||||
|
Name[es]=Halcyon
|
||||||
|
Name[nl]=Halcyon
|
||||||
|
Name[tr]=Halikon
|
||||||
|
Name[uk]=Альціон
|
||||||
|
Name[x-test]=xxHalcyonxx
|
||||||
Description=A mobile homescreen focused on simplicity and ease-of-use.
|
Description=A mobile homescreen focused on simplicity and ease-of-use.
|
||||||
|
Description[ca]=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.
|
||||||
|
Description[nl]=Een startscherm voor een mobiel gericht op eenvoud en gebruiksgemak.
|
||||||
|
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
|
||||||
Type=Service
|
Type=Service
|
||||||
|
|
||||||
X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment
|
X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue