mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-08-02 09:48:50 +00:00
SVN_SILENT made messages (.desktop file) - always resolve ours
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:
parent
70ff2fd0e4
commit
bf6b44c357
1 changed files with 6 additions and 0 deletions
|
|
@ -3,6 +3,12 @@
|
||||||
|
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Name=Virtual Keyboard Toggle
|
Name=Virtual Keyboard Toggle
|
||||||
|
Name[ca]=Commutació del teclat virtual
|
||||||
|
Name[es]=Conmutación del teclado virtual
|
||||||
|
Name[hu]=Virtuális billentyűzet kapcsoló
|
||||||
|
Name[nl]=Omschakeling van virtueel toetsenbord
|
||||||
|
Name[uk]=Перемикання віртуальної клавіатури
|
||||||
|
Name[x-test]=xxVirtual Keyboard Togglexx
|
||||||
Icon=input-keyboard-virtual
|
Icon=input-keyboard-virtual
|
||||||
|
|
||||||
Type=Service
|
Type=Service
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue