yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests 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 2021-05-04 01:16:46 +00:00
parent 3af5e9c8c4
commit 84c2e4662e
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop
View file

@ -20,6 +20,7 @@ Name[de]=Virtuelle Tastatur
Name[es]=Teclado virtual
Name[it]=Tastiera virtuale
Name[nl]=Virtueel toetsenbord
Name[pl]=Klawiatura ekranowa
Name[sl]=Virtualna tipkovnica
Name[sv]=Virtuellt tangentbord
Name[uk]=Віртуальна клавіатура
@ -31,6 +32,7 @@ Comment[de]=Wählen Sie die zu verwendende virtuelle Tastatur
Comment[es]=Seleccionar el teclado virtual a usar
Comment[it]=Seleziona quale tastiera virtuale utilizzare
Comment[nl]=Het te gebruiken virtuele toetsenbord selecteren
Comment[pl]=Wybierz której klawiatury ekranowej użyć
Comment[sl]=Izberite virtualno tipkovnico za uporabo
Comment[sv]=Välj vilket virtuellt tangentbord som ska användas
Comment[uk]=Вибір віртуальної клавіатури

1
src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop
View file

@ -9,6 +9,7 @@ Name[de]=Virtuelle Tastatur
Name[es]=Teclado virtual
Name[it]=Tastiera virtuale
Name[nl]=Virtueel toetsenbord
Name[pl]=Klawiatura ekranowa
Name[sl]=Virtualna tipkovnica
Name[sv]=Virtuellt tangentbord
Name[uk]=Віртуальна клавіатура