aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilip Kaufmann <phil.kaufmann@t-online.de>2013-08-06 10:28:52 +0200
committerPhilip Kaufmann <phil.kaufmann@t-online.de>2013-08-06 10:28:52 +0200
commit265e2657b4d1fa1551787f17c35a35301c32a0e0 (patch)
tree8c6532cc36504bb52d8cd570dc3266f006f11e98 /src
parente07d9f77e9093681f8e419c599615b13bb3aa01d (diff)
remove a newline from a string in init.cpp
- to match all other translatable strings in init.cpp and to simplify translations via Transifex
Diffstat (limited to 'src')
-rw-r--r--src/init.cpp2
-rw-r--r--src/qt/bitcoinstrings.cpp2
-rw-r--r--src/qt/locale/bitcoin_en.ts6
3 files changed, 4 insertions, 6 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 49d6e1fde4..20d334019d 100644
--- a/src/init.cpp
+++ b/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";
diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp
index 534e4f3d46..fc0e53887a 100644
--- a/src/qt/bitcoinstrings.cpp
+++ b/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!"),
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index d7d792a458..5ae067d9b8 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -2716,10 +2716,8 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
- <source>Wallet %s resides outside data directory %s
-</source>
- <translation>Wallet %s resides outside data directory %s
-</translation>
+ <source>Wallet %s resides outside data directory %s</source>
+ <translation>Wallet %s resides outside data directory %s</translation>
</message>
<message>
<location line="+4"/>