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-01 01:21:12 +00:00
parent 904c48d563
commit 23e3a9a86f
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

@ -18,6 +18,7 @@ Name[az]=Virtual Klaviatura
Name[ca]=Teclat virtual
Name[de]=Virtuelle Tastatur
Name[es]=Teclado virtual
Name[it]=Tastiera virtuale
Name[nl]=Virtueel toetsenbord
Name[sl]=Virtualna tipkovnica
Name[sv]=Virtuellt tangentbord
@ -28,6 +29,7 @@ Comment[az]=İstifadə edəcəyiniz klaviaturanı seçin
Comment[ca]=Seleccioneu el teclat virtual a usar
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[sl]=Izberite virtualno tipkovnico za uporabo
Comment[sv]=Välj vilket virtuellt tangentbord som ska användas

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

@ -7,6 +7,7 @@ Name[az]=Virtual Klaviatura
Name[ca]=Teclat virtual
Name[de]=Virtuelle Tastatur
Name[es]=Teclado virtual
Name[it]=Tastiera virtuale
Name[nl]=Virtueel toetsenbord
Name[sl]=Virtualna tipkovnica
Name[sv]=Virtuellt tangentbord