From 50f522b2f7b3f81caf30dfcba0b8b267dcfc7fff Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Thu, 17 Oct 2013 13:48:04 +0200
Subject: Remove most trailing newlines from translated messages.

They are a hassle for translators and reviewers alike.

Change-Id: I07c1b61e8b6719e54fdc1f69cf63f573119a6776
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
 src/plugins/git/gitclient.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/plugins/git/gitclient.cpp')

diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index f74f4d94f1..edb9dcd551 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -3027,9 +3027,9 @@ bool GitClient::getCommitData(const QString &workingDirectory,
 static inline QString msgCommitted(const QString &amendSHA1, int fileCount)
 {
     if (amendSHA1.isEmpty())
-        return GitClient::tr("Committed %n file(s).\n", 0, fileCount);
+        return GitClient::tr("Committed %n file(s).", 0, fileCount) + QLatin1Char('\n');
     if (fileCount)
-        return GitClient::tr("Amended \"%1\" (%n file(s)).\n", 0, fileCount).arg(amendSHA1);
+        return GitClient::tr("Amended \"%1\" (%n file(s)).", 0, fileCount).arg(amendSHA1) + QLatin1Char('\n');
     return GitClient::tr("Amended \"%1\".").arg(amendSHA1);
 }
 
-- 
cgit v1.2.1


From ab71755326eeee537fb9eee157d7fffcd54cb723 Mon Sep 17 00:00:00 2001
From: Petar Perisin <petar.perisin@gmail.com>
Date: Sat, 5 Oct 2013 16:10:54 +0200
Subject: Git: Fix popup message for merge
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ie3ef79343b84d615255b70b786347c57511c3309
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
 src/plugins/git/gitclient.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/plugins/git/gitclient.cpp')

diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index edb9dcd551..70abaa0f6f 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -2665,11 +2665,6 @@ void GitClient::continueCommandIfNeeded(const QString &workingDirectory)
 {
     CommandInProgress command = checkCommandInProgress(workingDirectory);
     switch (command) {
-    case Merge:
-        continuePreviousGitCommand(workingDirectory, tr("Continue Merge"),
-                                   tr("Merge is in progress. What do you want to do?"),
-                                   tr("Continue"), QLatin1String("merge"));
-        break;
     case Rebase:
     case RebaseMerge:
         continuePreviousGitCommand(workingDirectory, tr("Continue Rebase"),
@@ -2677,6 +2672,11 @@ void GitClient::continueCommandIfNeeded(const QString &workingDirectory)
                                    tr("Continue"), QLatin1String("rebase"),
                                    command != RebaseMerge);
         break;
+    case Merge:
+        continuePreviousGitCommand(workingDirectory, tr("Continue Merge"),
+                tr("You need to commit changes to finish merge.\nCommit now?"),
+                tr("Commit"), QLatin1String("merge"));
+        break;
     case Revert:
         continuePreviousGitCommand(workingDirectory, tr("Continue Revert"),
                 tr("You need to commit changes to finish revert.\nCommit now?"),
-- 
cgit v1.2.1