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-07-17 01:46:57 +00:00
parent 29d5afaacf
commit 5a9802ae5f
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/plasma-mobile-dev.desktop.cmake
View file

@ -10,6 +10,7 @@ Name[ca]=Plasma Mobile (Desenvolupament)
Name[ca@valencia]=Plasma Mobile (Desenvolupament)
Name[es]=Plasma Mobile (desarrollo)
Name[eu]=Plasma Mugikorra (Garapena)
Name[fi]=Plasma Mobile (kehitys)
Name[fr]=Plasma Mobile (Développement)
Name[ia]=Plasma Mobile (Disveloppamento)
Name[ko]=Plasma 모바일(개발)

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

@ -10,6 +10,7 @@ Name[ca]=Halcyon
Name[ca@valencia]=Halcyon
Name[es]=Halcyon
Name[eu]=Halcyon
Name[fi]=Halcyon
Name[fr]=Halcyon
Name[ia]=Halcyon
Name[ko]=Halcyon
@ -29,6 +30,7 @@ Description[ca]=Una pantalla d'inici del mòbil enfocada a la senzillesa i facil
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.
Description[eu]=Sinpletasuna eta erabilerraztasuna helburu duen mugikorrerako etxeko pantaila bat.
Description[fi]=Yksinkertaisuuteen ja helppokäyttöisyyteen keskittyvä mobiilikotinäyttö.
Description[fr]=Un écran d'accueil pour périphérique mobile, centré sur la simplicité et la facilité d'utilisation.
Description[ko]=간단함과 사용 편의성에 초점을 맞춘 모바일 홈 화면입니다.
Description[nl]=Een startscherm voor een mobiel gericht op eenvoud en gebruiksgemak.