Merge pull request #2881 from Diapolo/translations_rem_newline

remove a newline from a string in init.cpp

src/init.cpp

@@ -504,7 +504,7 @@ bool AppInit2(boost::thread_group& threadGroup)
 
     // Wallet file must be a plain filename without a directory
     if (strWalletFile != boost::filesystem::basename(strWalletFile) + boost::filesystem::extension(strWalletFile))
-        return InitError(strprintf(_("Wallet %s resides outside data directory %s\n"), strWalletFile.c_str(), strDataDir.c_str()));
+        return InitError(strprintf(_("Wallet %s resides outside data directory %s"), strWalletFile.c_str(), strDataDir.c_str()));
 
     // Make sure only a single Bitcoin process is using the data directory.
     boost::filesystem::path pathLockFile = GetDataDir() / ".lock";

src/qt/bitcoinstrings.cpp

@@ -208,7 +208,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Use the test network"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Verifying blocks..."),
 QT_TRANSLATE_NOOP("bitcoin-core", "Verifying wallet..."),
-QT_TRANSLATE_NOOP("bitcoin-core", "Wallet %s resides outside data directory %s\n"),
+QT_TRANSLATE_NOOP("bitcoin-core", "Wallet %s resides outside data directory %s"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin to complete"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Warning"),
 QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete, upgrade required!"),

src/qt/locale/bitcoin_en.ts

@@ -2716,10 +2716,8 @@ for example: alertnotify=echo %%s | mail -s "Bitcoin Alert" admin@foo.
     </message>
     <message>
         <location line="+1"/>
-        <source>Wallet %s resides outside data directory %s
+        <source>Wallet %s resides outside data directory %s</source>
-</source>
+        <translation>Wallet %s resides outside data directory %s</translation>
-        <translation>Wallet %s resides outside data directory %s
-</translation>
     </message>
     <message>
         <location line="+4"/>