Browse Source

remove a newline from a string in init.cpp

- to match all other translatable strings in init.cpp and to simplify
  translations via Transifex
tags/v0.15.1
Philip Kaufmann 7 years ago
parent
commit
265e2657b4
3 changed files with 4 additions and 6 deletions
  1. 1
    1
      src/init.cpp
  2. 1
    1
      src/qt/bitcoinstrings.cpp
  3. 2
    4
      src/qt/locale/bitcoin_en.ts

+ 1
- 1
src/init.cpp View File

@@ -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";

+ 1
- 1
src/qt/bitcoinstrings.cpp View File

@@ -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!"),

+ 2
- 4
src/qt/locale/bitcoin_en.ts View File

@@ -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"/>

Loading…
Cancel
Save