Всем доброй ночи!
Уже писал здесь, что не работает перевод для мыши и сенсорной панели для движка libinput.
Совсем случайно удалось это исправить.
Вчера решил упаковать в пакеты модули обоев Video playlist и Video wallpaper отсюда https://store.kde.org/browse/cat/419/
Пришлось прописывать вызовы локализации и делать к ним перевод и CMakeLists.txt.
Если короче, то по такому же принципу решил подправит вызовы локализации и в данном случае.
В итоге, перевод везде начал работать.
И для мыши в иксах, так как у нас в последней Росе используется libinput вместо xinput.
Так же перевод начал работать для сенсорной панели в сеансе wayland, где тоже используется движок libinput.
Фотка настройки мыши http://rgho.st/8p69cBPQN
А тут сенсорной панели http://rgho.st/6rdMzNNC2
Правда с ней ещё нужно разбираться.
Такие строки не могу понять
Right-click (three-finger tap to middle-click)
Middle-click (three-finger tap right-click)
Приложу на всякий случай патчи, вдруг кому-то будут полезны.
--
С Уважением,
С Уважением,
Виктор
victorr2...@yandex.ru
diff -urN plasma-desktop/kcms/mouse/kcm/libinput/main_deviceless.qml plasma-desktop-patched/kcms/mouse/kcm/libinput/main_deviceless.qml
--- plasma-desktop/kcms/mouse/kcm/libinput/main_deviceless.qml 2018-11-07 03:18:21.000000000 +0300
+++ plasma-desktop-patched/kcms/mouse/kcm/libinput/main_deviceless.qml 2018-11-10 01:26:30.491021312 +0300
@@ -62,9 +62,9 @@
// General
Controls.CheckBox {
- Kirigami.FormData.label: i18n("General:")
+ Kirigami.FormData.label: i18nd("kcmmouse", "General:")
id: leftHanded
- text: i18n("Left handed mode")
+ text: i18nd("kcmmouse", "Left handed mode")
function load() {
if (!formLayout.enabled) {
@@ -83,13 +83,13 @@
}
ToolTip {
- text: i18n("Swap left and right buttons.")
+ text: i18nd("kcmmouse", "Swap left and right buttons.")
}
}
Controls.CheckBox {
id: middleEmulation
- text: i18n("Press left and right buttons for middle-click")
+ text: i18nd("kcmmouse", "Press left and right buttons for middle-click")
function load() {
if (!formLayout.enabled) {
@@ -108,7 +108,7 @@
}
ToolTip {
- text: i18n("Clicking left and right button simultaneously sends middle button click.")
+ text: i18nd("kcmmouse", "Clicking left and right button simultaneously sends middle button click.")
}
}
@@ -118,7 +118,7 @@
// Acceleration
Controls.Slider {
- Kirigami.FormData.label: i18n("Pointer speed:")
+ Kirigami.FormData.label: i18nd("kcmmouse", "Pointer speed:")
id: accelSpeed
from: 1
@@ -150,7 +150,7 @@
Layouts.ColumnLayout {
id: accelProfile
spacing: Kirigami.Units.smallSpacing
- Kirigami.FormData.label: i18n("Acceleration profile:")
+ Kirigami.FormData.label: i18nd("kcmmouse", "Acceleration profile:")
Kirigami.FormData.buddyFor: accelProfileFlat
function load() {
@@ -181,20 +181,20 @@
Controls.RadioButton {
id: accelProfileFlat
- text: i18n("Flat")
+ text: i18nd("kcmmouse", "Flat")
ToolTip {
- text: i18n("Cursor moves the same distance as the mouse movement.")
+ text: i18nd("kcmmouse", "Cursor moves the same distance as the mouse movement.")
}
onCheckedChanged: accelProfile.syncCurrent()
}
Controls.RadioButton {
id: accelProfileAdaptive
- text: i18n("Adaptive")
+ text: i18nd("kcmmouse", "Adaptive")
ToolTip {
- text: i18n("Cursor travel distance depends on the mouse movement speed.")
+ text: i18nd("kcmmouse", "Cursor travel distance depends on the mouse movement speed.")
}
onCheckedChanged: accelProfile.syncCurrent()
}
@@ -206,9 +206,9 @@
// Scrolling
Controls.CheckBox {
- Kirigami.FormData.label: i18n("Scrolling:")
+ Kirigami.FormData.label: i18nd("kcmmouse", "Scrolling:")
id: naturalScroll
- text: i18n("Invert scroll direction")
+ text: i18nd("kcmmouse", "Invert scroll direction")
function load() {
enabled = device.supportsNaturalScroll
@@ -223,7 +223,7 @@
}
ToolTip {
- text: i18n("Touchscreen like scrolling.")
+ text: i18nd("kcmmouse", "Touchscreen like scrolling.")
}
}
}
diff -urN plasma-desktop/kcms/mouse/kcm/libinput/main.qml plasma-desktop-patched/kcms/mouse/kcm/libinput/main.qml
--- plasma-desktop/kcms/mouse/kcm/libinput/main.qml 2018-11-07 03:18:21.000000000 +0300
+++ plasma-desktop-patched/kcms/mouse/kcm/libinput/main.qml 2018-11-10 01:25:54.904353927 +0300
@@ -81,7 +81,7 @@
// Device
Controls.ComboBox {
- Kirigami.FormData.label: i18n("Device:")
+ Kirigami.FormData.label: i18nd("kcmmouse", "Device:")
id: deviceSelector
enabled: deviceCount > 1
Layouts.Layout.fillWidth: true
@@ -107,9 +107,9 @@
// General
Controls.CheckBox {
- Kirigami.FormData.label: i18n("General:")
+ Kirigami.FormData.label: i18nd("kcmmouse", "General:")
id: deviceEnabled
- text: i18n("Device enabled")
+ text: i18nd("kcmmouse", "Device enabled")
function load() {
if (!formLayout.enabled) {
@@ -128,13 +128,13 @@
}
ToolTip {
- text: i18n("Accept input through this device.")
+ text: i18nd("kcmmouse", "Accept input through this device.")
}
}
Controls.CheckBox {
id: leftHanded
- text: i18n("Left handed mode")
+ text: i18nd("kcmmouse", "Left handed mode")
function load() {
if (!formLayout.enabled) {
@@ -153,13 +153,13 @@
}
ToolTip {
- text: i18n("Swap left and right buttons.")
+ text: i18nd("kcmmouse", "Swap left and right buttons.")
}
}
Controls.CheckBox {
id: middleEmulation
- text: i18n("Press left and right buttons for middle-click")
+ text: i18nd("kcmmouse", "Press left and right buttons for middle-click")
function load() {
if (!formLayout.enabled) {
@@ -178,7 +178,7 @@
}
ToolTip {
- text: i18n("Clicking left and right button simultaneously sends middle button click.")
+ text: i18nd("kcmmouse", "Clicking left and right button simultaneously sends middle button click.")
}
}
@@ -188,7 +188,7 @@
// Acceleration
Controls.Slider {
- Kirigami.FormData.label: i18n("Pointer speed:")
+ Kirigami.FormData.label: i18nd("kcmmouse", "Pointer speed:")
id: accelSpeed
from: 1
@@ -220,7 +220,7 @@
Layouts.ColumnLayout {
id: accelProfile
spacing: Kirigami.Units.smallSpacing
- Kirigami.FormData.label: i18n("Acceleration profile:")
+ Kirigami.FormData.label: i18nd("kcmmouse", "Acceleration profile:")
Kirigami.FormData.buddyFor: accelProfileFlat
function load() {
@@ -251,20 +251,20 @@
Controls.RadioButton {
id: accelProfileFlat
- text: i18n("Flat")
+ text: i18nd("kcmmouse", "Flat")
ToolTip {
- text: i18n("Cursor moves the same distance as the mouse movement.")
+ text: i18nd("kcmmouse", "Cursor moves the same distance as the mouse movement.")
}
onCheckedChanged: accelProfile.syncCurrent()
}
Controls.RadioButton {
id: accelProfileAdaptive
- text: i18n("Adaptive")
+ text: i18nd("kcmmouse", "Adaptive")
ToolTip {
- text: i18n("Cursor travel distance depends on the mouse movement speed.")
+ text: i18nd("kcmmouse", "Cursor travel distance depends on the mouse movement speed.")
}
onCheckedChanged: accelProfile.syncCurrent()
}
@@ -276,9 +276,9 @@
// Scrolling
Controls.CheckBox {
- Kirigami.FormData.label: i18n("Scrolling:")
+ Kirigami.FormData.label: i18nd("kcmmouse", "Scrolling:")
id: naturalScroll
- text: i18n("Invert scroll direction")
+ text: i18nd("kcmmouse", "Invert scroll direction")
function load() {
enabled = device.supportsNaturalScroll
@@ -293,7 +293,7 @@
}
ToolTip {
- text: i18n("Touchscreen like scrolling.")
+ text: i18nd("kcmmouse", "Touchscreen like scrolling.")
}
}
}
diff -urN plasma-desktop/kcms/touchpad/src/kcm/libinput/main.qml plasma-desktop-patched/kcms/touchpad/src/kcm/libinput/main.qml
--- plasma-desktop/kcms/touchpad/src/kcm/libinput/main.qml 2018-11-07 03:18:21.000000000 +0300
+++ plasma-desktop-patched/kcms/touchpad/src/kcm/libinput/main.qml 2018-11-10 01:20:37.197680856 +0300
@@ -83,7 +83,7 @@
// Device
Controls.ComboBox {
- Kirigami.FormData.label: i18n("Device:")
+ Kirigami.FormData.label: i18nd("kcm_touchpad", "Device:")
id: deviceSelector
enabled: touchpadCount > 1
@@ -110,13 +110,13 @@
// General settings
Controls.CheckBox {
- Kirigami.FormData.label: i18n("General:")
+ Kirigami.FormData.label: i18nd("kcm_touchpad", "General:")
id: deviceEnabled
- text: i18n("Device enabled")
+ text: i18nd("kcm_touchpad", "Device enabled")
hoverEnabled: true
Controls.ToolTip {
- text: i18n("Accept input through this device.")
+ text: i18nd("kcm_touchpad", "Accept input through this device.")
visible: parent.hovered
delay: 1000
}
@@ -140,11 +140,11 @@
Controls.CheckBox {
id: dwt
- text: i18n("Disable while typing")
+ text: i18nd("kcm_touchpad", "Disable while typing")
hoverEnabled: true
Controls.ToolTip {
- text: i18n("Disable touchpad while typing to prevent accidental inputs.")
+ text: i18nd("kcm_touchpad", "Disable touchpad while typing to prevent accidental inputs.")
visible: parent.hovered
delay: 1000
}
@@ -168,11 +168,11 @@
Controls.CheckBox {
id: leftHanded
- text: i18n("Left handed mode")
+ text: i18nd("kcm_touchpad", "Left handed mode")
hoverEnabled: true
Controls.ToolTip {
- text: i18n("Swap left and right buttons.")
+ text: i18nd("kcm_touchpad", "Swap left and right buttons.")
visible: parent.hovered
delay: 1000
}
@@ -196,11 +196,11 @@
Controls.CheckBox {
id: middleEmulation
- text: i18n("Press left and right buttons for middle click")
+ text: i18nd("kcm_touchpad", "Press left and right buttons for middle click")
hoverEnabled: true
Controls.ToolTip {
- text: i18n("Clicking left and right button simultaneously sends middle button click.")
+ text: i18nd("kcm_touchpad", "Clicking left and right button simultaneously sends middle button click.")
visible: parent.hovered
delay: 1000
}
@@ -228,7 +228,7 @@
// Acceleration
Controls.Slider {
- Kirigami.FormData.label: i18n("Pointer speed:")
+ Kirigami.FormData.label: i18nd("kcm_touchpad", "Pointer speed:")
id: accelSpeed
from: 1
@@ -257,7 +257,7 @@
}
Layouts.ColumnLayout {
- Kirigami.FormData.label: i18n("Acceleration profile:")
+ Kirigami.FormData.label: i18nd("kcm_touchpad", "Acceleration profile:")
Kirigami.FormData.buddyFor: accelProfileFlat
id: accelProfile
spacing: Kirigami.Units.smallSpacing
@@ -288,11 +288,11 @@
Controls.RadioButton {
id: accelProfileFlat
- text: i18n("Flat")
+ text: i18nd("kcm_touchpad", "Flat")
hoverEnabled: true
Controls.ToolTip {
- text: i18n("Cursor moves the same distance as finger.")
+ text: i18nd("kcm_touchpad", "Cursor moves the same distance as finger.")
visible: parent.hovered
delay: 1000
}
@@ -301,11 +301,11 @@
Controls.RadioButton {
id: accelProfileAdaptive
- text: i18n("Adaptive")
+ text: i18nd("kcm_touchpad", "Adaptive")
hoverEnabled: true
Controls.ToolTip {
- text: i18n("Cursor travel distance depends on movement speed of finger.")
+ text: i18nd("kcm_touchpad", "Cursor travel distance depends on movement speed of finger.")
visible: parent.hovered
delay: 1000
}
@@ -319,13 +319,13 @@
// Tapping
Controls.CheckBox {
- Kirigami.FormData.label: i18n("Tapping:")
+ Kirigami.FormData.label: i18nd("kcm_touchpad", "Tapping:")
id: tapToClick
- text: i18n("Tap-to-click")
+ text: i18nd("kcm_touchpad", "Tap-to-click")
hoverEnabled: true
Controls.ToolTip {
- text: i18n("Single tap is left button click.")
+ text: i18nd("kcm_touchpad", "Single tap is left button click.")
visible: parent.hovered
delay: 1000
}
@@ -354,11 +354,11 @@
Controls.CheckBox {
id: tapAndDrag
- text: i18n("Tap-and-drag")
+ text: i18nd("kcm_touchpad", "Tap-and-drag")
hoverEnabled: true
Controls.ToolTip {
- text: i18n("Sliding over touchpad directly after tap drags.")
+ text: i18nd("kcm_touchpad", "Sliding over touchpad directly after tap drags.")
visible: parent.hovered
delay: 1000
}
@@ -385,11 +385,11 @@
Controls.CheckBox {
id: tapAndDragLock
- text: i18n("Tap-and-drag lock")
+ text: i18nd("kcm_touchpad", "Tap-and-drag lock")
hoverEnabled: true
Controls.ToolTip {
- text: i18n("Dragging continues after a short finger lift.")
+ text: i18nd("kcm_touchpad", "Dragging continues after a short finger lift.")
visible: parent.hovered
delay: 1000
}
@@ -408,7 +408,7 @@
}
Layouts.ColumnLayout {
- Kirigami.FormData.label: i18n("Two-finger tap:")
+ Kirigami.FormData.label: i18nd("kcm_touchpad", "Two-finger tap:")
Kirigami.FormData.buddyFor: multiTapRightClick
id: multiTap
@@ -417,17 +417,17 @@
function load() {
enabled = touchpad.supportsLmrTapButtonMap && tapToClick.checked
if (touchpad.tapFingerCount > 2) {
- multiTapRightClick.text = i18n("Right-click (three-finger tap to middle-click)")
- multiTapRightClickToolTip.text = i18n("Tap with two fingers to right-click, tap with three fingers to middle-click.")
+ multiTapRightClick.text = i18nd("kcm_touchpad", "Right-click (three-finger tap to middle-click)")
+ multiTapRightClickToolTip.text = i18nd("kcm_touchpad", "Tap with two fingers to right-click, tap with three fingers to middle-click.")
- multiTapMiddleClick.text = i18n("Middle-click (three-finger tap right-click)")
- multiTapMiddleClickToolTip.text = i18n("Tap with two fingers to middle-click, tap with three fingers to right-click.")
+ multiTapMiddleClick.text = i18nd("kcm_touchpad", "Middle-click (three-finger tap right-click)")
+ multiTapMiddleClickToolTip.text = i18nd("kcm_touchpad", "Tap with two fingers to middle-click, tap with three fingers to right-click.")
} else {
- multiTapRightClick.text = i18n("Righ-click")
- multiTapRightClickToolTip.text = i18n("Tap with two fingers to right-click.")
+ multiTapRightClick.text = i18nd("kcm_touchpad", "Righ-click")
+ multiTapRightClickToolTip.text = i18nd("kcm_touchpad", "Tap with two fingers to right-click.")
- multiTapMiddleClick.text = i18n("Middle-click")
- multiTapMiddleClickToolTip.text = i18n("Tap with two fingers to middle-click.")
+ multiTapMiddleClick.text = i18nd("kcm_touchpad", "Middle-click")
+ multiTapMiddleClickToolTip.text = i18nd("kcm_touchpad", "Tap with two fingers to middle-click.")
}
if (!enabled) {
@@ -485,7 +485,7 @@
// Scrolling
Layouts.ColumnLayout {
- Kirigami.FormData.label: i18n("Scrolling:")
+ Kirigami.FormData.label: i18nd("kcm_touchpad", "Scrolling:")
Kirigami.FormData.buddyFor: scrollMethodTwoFingers
id: scrollMethod
@@ -515,11 +515,11 @@
Controls.RadioButton {
id: scrollMethodTwoFingers
- text: i18n("Two fingers")
+ text: i18nd("kcm_touchpad", "Two fingers")
hoverEnabled: true
Controls.ToolTip {
- text: i18n("Slide with two fingers scrolls.")
+ text: i18nd("kcm_touchpad", "Slide with two fingers scrolls.")
visible: parent.hovered
delay: 1000
}
@@ -527,11 +527,11 @@
Controls.RadioButton {
id: scrollMethodTouchpadEdges
- text: i18n("Touchpad edges")
+ text: i18nd("kcm_touchpad", "Touchpad edges")
hoverEnabled: true
Controls.ToolTip {
- text: i18n("Slide on the touchpad edges scrolls.")
+ text: i18nd("kcm_touchpad", "Slide on the touchpad edges scrolls.")
visible: parent.hovered
delay: 1000
}
@@ -541,7 +541,7 @@
Controls.CheckBox {
id: naturalScroll
- text: i18n("Invert scroll direction (Natural scrolling)")
+ text: i18nd("kcm_touchpad", "Invert scroll direction (Natural scrolling)")
function load() {
enabled = touchpad.supportsNaturalScroll
@@ -557,7 +557,7 @@
hoverEnabled: true
Controls.ToolTip {
- text: i18n("Touchscreen like scrolling.")
+ text: i18nd("kcm_touchpad", "Touchscreen like scrolling.")
visible: parent.hovered
delay: 1000
}
_______________________________________________ kde-russian mailing list kde-russian@lists.kde.ru https://lists.kde.ru/mailman/listinfo/kde-russian
