Git commit cf5119c88c1baf746717dafa77183dcb920e7082 by Dmitry Kazakov. Committed on 23/04/2014 at 12:37. Pushed by dkazakov into branch 'master'.
Fix a bit of translation errors CCMAIL:kde-russian@lists.kde.ru M +2 -2 krita/ui/input/config/kis_input_button.cpp M +7 -7 krita/ui/input/kis_input_manager.cpp M +1 -1 krita/ui/input/kis_input_manager.h M +1 -1 krita/ui/kis_canvas_resource_provider.h http://commits.kde.org/calligra/cf5119c88c1baf746717dafa77183dcb920e7082 diff --git a/krita/ui/input/config/kis_input_button.cpp b/krita/ui/input/config/kis_input_button.cpp index b552901..14f2871 100644 --- a/krita/ui/input/config/kis_input_button.cpp +++ b/krita/ui/input/config/kis_input_button.cpp @@ -137,7 +137,7 @@ void KisInputButton::mouseReleaseEvent(QMouseEvent *) } else { setChecked(true); - setText(i18nc("Waiting for user input", "Input ...")); + setText(i18nc("Waiting for user input", "Input...")); d->resetTimer->start(); d->newInput = true; } @@ -199,7 +199,7 @@ void KisInputButton::keyReleaseEvent(QKeyEvent *event) } else if (event->key() == Qt::Key_Space || event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return) { setChecked(true); - setText(i18nc("Waiting for user input", "Input ...")); + setText(i18nc("Waiting for user input", "Input...")); d->resetTimer->start(); d->newInput = true; } diff --git a/krita/ui/input/kis_input_manager.cpp b/krita/ui/input/kis_input_manager.cpp index 638ad18..740df1e 100644 --- a/krita/ui/input/kis_input_manager.cpp +++ b/krita/ui/input/kis_input_manager.cpp @@ -395,7 +395,7 @@ bool KisInputManager::Private::tryHidePopupPalette() bool KisInputManager::Private::trySetMirrorMode(const QPointF &mousePosition) { if (setMirrorMode) { - canvas->resourceManager()->setResource(KisCanvasResourceProvider::MirrorAxisCenter, canvas->image()->documentToPixel(mousePosition)); + canvas->resourceManager()->setResource(KisCanvasResourceProvider::MirrorAxesCenter, canvas->image()->documentToPixel(mousePosition)); QApplication::restoreOverrideCursor(); setMirrorMode = false; return true; @@ -481,16 +481,16 @@ KisInputManager::KisInputManager(KisCanvas2 *canvas, KisToolProxy *proxy) d->setupActions(); /* - * Temporary solution so we can still set the mirror axis. + * Temporary solution so we can still set the mirror axes. * * TODO: Create a proper interface for this. * There really should be a better way to handle this, one that neither * relies on "hidden" mouse interaction or shortcuts. */ - KAction *setMirrorAxis = new KAction(i18n("Set Mirror Axis"), this); - d->canvas->view()->actionCollection()->addAction("set_mirror_axis", setMirrorAxis); - setMirrorAxis->setShortcut(QKeySequence("Shift+r")); - connect(setMirrorAxis, SIGNAL(triggered(bool)), SLOT(setMirrorAxis())); + KAction *setMirrorAxes = new KAction(i18n("Set Mirror Axes"), this); + d->canvas->view()->actionCollection()->addAction("set_mirror_axes", setMirrorAxes); + setMirrorAxes->setShortcut(QKeySequence("Shift+r")); + connect(setMirrorAxes, SIGNAL(triggered(bool)), SLOT(setMirrorAxes())); connect(KoToolManager::instance(), SIGNAL(changedTool(KoCanvasController*,int)), SLOT(slotToolChanged())); @@ -832,7 +832,7 @@ QTouchEvent *KisInputManager::lastTouchEvent() const return d->lastTouchEvent; } -void KisInputManager::setMirrorAxis() +void KisInputManager::setMirrorAxes() { d->setMirrorMode = true; QApplication::setOverrideCursor(Qt::CrossCursor); diff --git a/krita/ui/input/kis_input_manager.h b/krita/ui/input/kis_input_manager.h index 5ec7e5e..51286d4 100644 --- a/krita/ui/input/kis_input_manager.h +++ b/krita/ui/input/kis_input_manager.h @@ -113,7 +113,7 @@ public: QPointF widgetToDocument(const QPointF &position); public Q_SLOTS: - void setMirrorAxis(); + void setMirrorAxes(); void stopIgnoringEvents(); private Q_SLOTS: diff --git a/krita/ui/kis_canvas_resource_provider.h b/krita/ui/kis_canvas_resource_provider.h index 1a11d0b..e54848d 100644 --- a/krita/ui/kis_canvas_resource_provider.h +++ b/krita/ui/kis_canvas_resource_provider.h @@ -62,7 +62,7 @@ public: CurrentCompositeOp, MirrorHorizontal, MirrorVertical, - MirrorAxisCenter, + MirrorAxesCenter, Opacity, HdrGamma, GlobalAlphaLock, _______________________________________________ kde-russian mailing list kde-russian@lists.kde.ru https://lists.kde.ru/mailman/listinfo/kde-russian