From 066b1d8d6b51a5c2fea2b3a1f7618d76cd1269f0 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 17 Nov 2009 16:56:04 +0100
Subject: [PATCH] Shortcut Ctrk-L (Locator Goto Line) broken in most
 translations.

Change the translateable string not to contain a blank.

Task-number: QTCREATORBUG-299
Reviewed-by: Thorbjorn Lindeijer <thorbjorn.lindeijer@nokia.com>
---
 share/qtcreator/translations/qtcreator_de.ts       | 2 +-
 share/qtcreator/translations/qtcreator_es.ts       | 2 +-
 share/qtcreator/translations/qtcreator_fr.ts       | 2 +-
 share/qtcreator/translations/qtcreator_it.ts       | 2 +-
 share/qtcreator/translations/qtcreator_ja.ts       | 2 +-
 share/qtcreator/translations/qtcreator_pl.ts       | 2 +-
 share/qtcreator/translations/qtcreator_ru.ts       | 2 +-
 share/qtcreator/translations/qtcreator_sl.ts       | 2 +-
 src/plugins/texteditor/texteditoractionhandler.cpp | 8 +++++---
 9 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 77c63fb7c7a..4a3cd1891c3 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -14657,7 +14657,7 @@ Die folgenden Encodings scheinen der Datei zu entsprechen:</translation>
     </message>
     <message>
         <location line="+92"/>
-        <source> &lt;line number&gt;</source>
+        <source>&lt;line number&gt;</source>
         <translation>&lt;Zeilennummer&gt;</translation>
     </message>
 </context>
diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts
index 06a78c52d7c..8dddfe5d799 100644
--- a/share/qtcreator/translations/qtcreator_es.ts
+++ b/share/qtcreator/translations/qtcreator_es.ts
@@ -13301,7 +13301,7 @@ The following encodings are likely to fit:</source>
     </message>
     <message>
         <location line="+92"/>
-        <source> &lt;line number&gt;</source>
+        <source>&lt;line number&gt;</source>
         <translation>&lt;número de línea&gt;</translation>
     </message>
 </context>
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index 9144b67c1e4..a3a1e27ff3e 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -12637,7 +12637,7 @@ The following encodings are likely to fit:</source>
     </message>
     <message>
         <location line="+92"/>
-        <source> &lt;line number&gt;</source>
+        <source>&lt;line number&gt;</source>
         <translation type="unfinished">&lt;numéro de ligne&gt;</translation>
     </message>
 </context>
diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts
index 6e9d0781212..bf0eb0b77e4 100644
--- a/share/qtcreator/translations/qtcreator_it.ts
+++ b/share/qtcreator/translations/qtcreator_it.ts
@@ -13272,7 +13272,7 @@ Queste codifiche dovrebbero andare bene:</translation>
     </message>
     <message>
         <location line="+92"/>
-        <source> &lt;line number&gt;</source>
+        <source>&lt;line number&gt;</source>
         <translation>&lt;numero di riga&gt;</translation>
     </message>
 </context>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 8500b11a9dd..5bfed5321a1 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -13278,7 +13278,7 @@ The following encodings are likely to fit:</source>
     </message>
     <message>
         <location line="+92"/>
-        <source> &lt;line number&gt;</source>
+        <source>&lt;line number&gt;</source>
         <translation>&lt;行番号&gt;</translation>
     </message>
 </context>
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index 382130868f2..26c7f6e2b02 100644
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts
@@ -14757,7 +14757,7 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
     </message>
     <message>
         <location line="+92"/>
-        <source> &lt;line number&gt;</source>
+        <source>&lt;line number&gt;</source>
         <translation> &lt;numer linii&gt;</translation>
     </message>
 </context>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index 348d3bf8d2b..65599f122fc 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -15073,7 +15073,7 @@ The following encodings are likely to fit:</source>
     </message>
     <message>
         <location line="+92"/>
-        <source> &lt;line number&gt;</source>
+        <source>&lt;line number&gt;</source>
         <translation> &lt;номер строки&gt;</translation>
     </message>
 </context>
diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts
index 196b3d46411..3dbc9927bee 100644
--- a/share/qtcreator/translations/qtcreator_sl.ts
+++ b/share/qtcreator/translations/qtcreator_sl.ts
@@ -12694,7 +12694,7 @@ Naslednji nabori znakov so verjetno ustrezni:</translation>
     </message>
     <message>
         <location line="+92"/>
-        <source> &lt;line number&gt;</source>
+        <source>&lt;line number&gt;</source>
         <translation>&lt;Å¡tevilka vrstice&gt;</translation>
     </message>
 </context>
diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp
index 5043583a469..9da54ddc10c 100644
--- a/src/plugins/texteditor/texteditoractionhandler.cpp
+++ b/src/plugins/texteditor/texteditoractionhandler.cpp
@@ -362,9 +362,11 @@ void TextEditorActionHandler::gotoAction()
 {
     Locator::LocatorManager *locatorManager = Locator::LocatorManager::instance();
     QTC_ASSERT(locatorManager, return);
-    const QString shortcut = TextEditorPlugin::instance()->lineNumberFilter()->shortcutString();
-    const QString text = tr(" <line number>");
-    locatorManager->show(shortcut + text, 2, text.length()-1);
+    QString locatorString = TextEditorPlugin::instance()->lineNumberFilter()->shortcutString();
+    locatorString += QLatin1Char(' ');
+    const int selectionStart = locatorString.size();
+    locatorString += tr("<line number>");
+    locatorManager->show(locatorString, selectionStart, locatorString.size() - selectionStart);
 }
 
 void TextEditorActionHandler::printAction()
-- 
GitLab