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-06-13 01:21:07 +00:00
parent 86bb4e68ef
commit 943bdc0e64
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

@ -19,6 +19,7 @@ Name[az]=Virtual Klaviatura
Name[ca]=Teclat virtual
Name[cs]=Virtuální klávesnice
Name[de]=Virtuelle Tastatur
Name[en_GB]=Virtual Keyboard
Name[es]=Teclado virtual
Name[fr]=Clavier virtuel
Name[ia]=Claviero virtual
@ -39,6 +40,7 @@ Comment[az]=İstifadə edəcəyiniz klaviaturanı seçin
Comment[ca]=Seleccioneu el teclat virtual a usar
Comment[cs]=Zvolte, kterou virtuální klávesnici použít
Comment[de]=Wählen Sie die zu verwendende virtuelle Tastatur
Comment[en_GB]=Select which virtual keyboard to use
Comment[es]=Seleccionar el teclado virtual a usar
Comment[fr]=Sélectionner quel clavier virtuel utiliser
Comment[ia]=Selectiona qual claviero virtual usar

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

@ -8,6 +8,7 @@ Name[az]=Virtual Klaviatura
Name[ca]=Teclat virtual
Name[cs]=Virtuální klávesnice
Name[de]=Virtuelle Tastatur
Name[en_GB]=Virtual Keyboard
Name[es]=Teclado virtual
Name[fr]=Clavier virtuel
Name[ia]=Claviero virtual