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-06-11 01:42:04 +00:00
parent 1445b44ce9
commit 23b4ad1f0e
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@ Keywords=
Name=Halcyon
Name[ca]=Halcyon
Name[es]=Halcyon
Name[fr]=Halcyon
Name[nl]=Halcyon
Name[tr]=Halikon
Name[uk]=Альціон
@ -14,6 +15,7 @@ Name[x-test]=xxHalcyonxx
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[fr]=Un écran d'accueil pour périphérique mobile, centré sur la simplicité et la facilité d'utilisation.
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]=Домашній екран для мобільних пристроїв із акцентом на простоті та зручності.