diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-08-06 04:46:02 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-08-06 04:46:02 -0700 |
| commit | 7b22c8e8ca745a66bbc3867f1bdbc19acf05a67f (patch) | |
| tree | 8c6532cc36504bb52d8cd570dc3266f006f11e98 | |
| parent | e07d9f77e9093681f8e419c599615b13bb3aa01d (diff) | |
| parent | 265e2657b4d1fa1551787f17c35a35301c32a0e0 (diff) | |
| download | bitcoin-7b22c8e8ca745a66bbc3867f1bdbc19acf05a67f.tar.xz | |
Merge pull request #2881 from Diapolo/translations_rem_newline
remove a newline from a string in init.cpp
| -rw-r--r-- | src/init.cpp | 2 | ||||
| -rw-r--r-- | src/qt/bitcoinstrings.cpp | 2 | ||||
| -rw-r--r-- | src/qt/locale/bitcoin_en.ts | 6 |
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 "Bitcoin Alert" 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"/> |