Commit 257d8f32 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent e209134e
......@@ -12,6 +12,7 @@ Name[az]=Pəncərə fokuslama davranışları
Name[ca]=Comportament del focus de les finestres
Name[cs]=Chování při zaměření na okno
Name[da]=Opførsel af vinduesfokus
Name[de]=Fenster-Fokusverhalten
Name[en_GB]=Window Focus Behaviour
Name[es]=Comportamiento del foco de las ventanas
Name[et]=Akende fookuse käitumine
......
......@@ -14,6 +14,22 @@ X-KDE-OnlyShowOnQtPlatforms=wayland;
X-DocPath=kcontrol/kwinvirtualkeyboard/index.html
Name=Virtual Keyboard
Name[az]=Virtual Klaviatura
Name[ca]=Teclat virtual
Name[de]=Virtuelle Tastatur
Name[es]=Teclado virtual
Name[nl]=Virtueel toetsenbord
Name[sv]=Virtuellt tangentbord
Name[uk]=Віртуальна клавіатура
Name[x-test]=xxVirtual Keyboardxx
Comment=Select which virtual keyboard to use
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[nl]=Het te gebruiken virtuele toetsenbord selecteren
Comment[sv]=Välj vilket virtuellt tangentbord som ska användas
Comment[uk]=Вибір віртуальної клавіатури
Comment[x-test]=xxSelect which virtual keyboard to usexx
Categories=Qt;KDE;
......@@ -3,6 +3,14 @@
[Desktop Entry]
Name=Virtual Keyboard
Name[az]=Virtual Klaviatura
Name[ca]=Teclat virtual
Name[de]=Virtuelle Tastatur
Name[es]=Teclado virtual
Name[nl]=Virtueel toetsenbord
Name[sv]=Virtuellt tangentbord
Name[uk]=Віртуальна клавіатура
Name[x-test]=xxVirtual Keyboardxx
Icon=input-keyboard-virtual
Type=Service
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment