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-06-16 01:55:25 +00:00
parent af8ef4f9f8
commit 33dcb543f2
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

@ -11,6 +11,7 @@ Name[es]=Halcyon
Name[fr]=Halcyon
Name[nl]=Halcyon
Name[pa]=ਹਲਕਿਆਨ
Name[pt]=Halcyon
Name[sl]=Halcyon
Name[sv]=Halcyon
Name[tr]=Halikon
@ -23,6 +24,7 @@ Description[es]=Pantalla de inicio para móvil centrada en la simplicidad y en l
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[pa]=ਮੋਬਾਈਲ ਮੁੱਖ-ਸਕਰੀਨ, ਜੋ ਕਿ ਸਰਲ ਅਤੇ ਵਰਤਣ ਲਈ ਸੌਖੇ ਟੀਚੇ ਉੱਤੇ ਕੇਂਦਰਿਤ ਹੈ।
Description[pt]=Um ecrã inicial para dispositivos móveis focado na simplicidade e facilidade de uso.
Description[sl]=Mobilni domači zaslon, enostavnega videza in uporabe
Description[sv]=En hemskärm för mobiler fokuserad på enkelhet och användbarhet.
Description[tr]=Yalınlığa ve kullanım kolaylığına odaklanmış, taşınabilir bir ana ekran.