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-07 01:17:26 +00:00
parent 018177b576
commit 64b4caae95
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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