From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_00,RCVD_ILLEGAL_IP, SPF_NEUTRAL autolearn=no version=3.2.5 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Dmitry Kazakov To: kde-commits@kde.org X-Commit-Ref: master X-Commit-Project: calligra X-Commit-Folders: krita/ui/input krita/ui/input/config krita/ui X-Commit-Directories: (0) krita/ui/input krita/ui/input/config krita/ui Message-Id: Date: Wed, 23 Apr 2014 12:43:47 +0000 Cc: kde-russian@lists.kde.ru Subject: [kde-russian] [calligra] krita/ui: Fix a bit of translation errors X-BeenThere: kde-russian@lists.kde.ru X-Mailman-Version: 2.1.12 Precedence: list Reply-To: KDE russian translation mailing list List-Id: KDE russian translation mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Apr 2014 12:43:55 -0000 Archived-At: List-Archive: 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/co= nfig/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 =3D true; } @@ -199,7 +199,7 @@ void KisInputButton::keyReleaseEvent(QKeyEvent *event) } else if (event->key() =3D=3D Qt::Key_Space || event->key() =3D=3D Qt::= Key_Enter || event->key() =3D=3D Qt::Key_Return) { setChecked(true); - setText(i18nc("Waiting for user input", "Input ...")); + setText(i18nc("Waiting for user input", "Input...")); d->resetTimer->start(); d->newInput =3D true; } diff --git a/krita/ui/input/kis_input_manager.cpp b/krita/ui/input/kis_inpu= t_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 &mousePositi= on) { if (setMirrorMode) { - canvas->resourceManager()->setResource(KisCanvasResourceProvider::= MirrorAxisCenter, canvas->image()->documentToPixel(mousePosition)); + canvas->resourceManager()->setResource(KisCanvasResourceProvider::= MirrorAxesCenter, canvas->image()->documentToPixel(mousePosition)); QApplication::restoreOverrideCursor(); setMirrorMode =3D 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 =3D new KAction(i18n("Set Mirror Axis"), this); - d->canvas->view()->actionCollection()->addAction("set_mirror_axis", se= tMirrorAxis); - setMirrorAxis->setShortcut(QKeySequence("Shift+r")); - connect(setMirrorAxis, SIGNAL(triggered(bool)), SLOT(setMirrorAxis())); + KAction *setMirrorAxes =3D new KAction(i18n("Set Mirror Axes"), this); + d->canvas->view()->actionCollection()->addAction("set_mirror_axes", se= tMirrorAxes); + setMirrorAxes->setShortcut(QKeySequence("Shift+r")); + connect(setMirrorAxes, SIGNAL(triggered(bool)), SLOT(setMirrorAxes())); = connect(KoToolManager::instance(), SIGNAL(changedTool(KoCanvasControll= er*,int)), SLOT(slotToolChanged())); @@ -832,7 +832,7 @@ QTouchEvent *KisInputManager::lastTouchEvent() const return d->lastTouchEvent; } = -void KisInputManager::setMirrorAxis() +void KisInputManager::setMirrorAxes() { d->setMirrorMode =3D 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,