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-16 01:23:43 +00:00
parent 07c4057180
commit b2548fe0a9
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,6 +25,8 @@ Name[it]=Tastiera virtuale
Name[nl]=Virtueel toetsenbord
Name[pl]=Klawiatura ekranowa
Name[pt]=Teclado Virtual
Name[pt_BR]=Teclado virtual
Name[sk]=Virtuálna klávesnica
Name[sl]=Virtualna tipkovnica
Name[sv]=Virtuellt tangentbord
Name[uk]=Віртуальна клавіатура
@ -39,6 +41,8 @@ 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[pt]=Seleccionar qual o teclado virtual a usar
Comment[pt_BR]=Selecione qual teclado virtual a ser usado
Comment[sk]=Vyberte, ktorá virtuálna klávesnica sa má použiť
Comment[sl]=Izberite virtualno tipkovnico za uporabo
Comment[sv]=Välj vilket virtuellt tangentbord som ska användas
Comment[uk]=Вибір віртуальної клавіатури

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

@ -14,6 +14,8 @@ Name[it]=Tastiera virtuale
Name[nl]=Virtueel toetsenbord
Name[pl]=Klawiatura ekranowa
Name[pt]=Teclado Virtual
Name[pt_BR]=Teclado virtual
Name[sk]=Virtuálna klávesnica
Name[sl]=Virtualna tipkovnica
Name[sv]=Virtuellt tangentbord
Name[uk]=Віртуальна клавіатура