diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-07 22:49:03 -0500 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-07 22:49:03 -0500 |
commit | a21e4da9012f87d2cb8b2c38517efda1999fab05 (patch) | |
tree | fe813787f2d3647b2d220991932c8a1546981bd5 /src/qt/locale/bitcoin_en.ts | |
parent | 06e0f79ae5a4c2c7b3c8232c4544307d4d4940a5 (diff) | |
parent | b5d9c7d9fb2ddf66e414e22e1d599fb0ef0abb07 (diff) | |
download | bitcoin-a21e4da9012f87d2cb8b2c38517efda1999fab05.tar.xz |
Merge branch '0.5.0.x' into 0.5.x
Conflicts:
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_zh_TW.ts
Diffstat (limited to 'src/qt/locale/bitcoin_en.ts')
-rw-r--r-- | src/qt/locale/bitcoin_en.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index 0d57d9b154..122f6d56a5 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -680,7 +680,7 @@ Address: %4 </message> <message> <location filename="../optionsdialog.cpp" line="217"/> - <source>Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended.</source> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1kB. Fee 0.01 recommended.</source> <translation type="unfinished"></translation> </message> <message> @@ -690,7 +690,7 @@ Address: %4 </message> <message> <location filename="../optionsdialog.cpp" line="226"/> - <source>Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended.</source> + <source>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1kB. Fee 0.01 recommended.</source> <translation type="unfinished"></translation> </message> </context> @@ -1515,7 +1515,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../bitcoinstrings.cpp" line="23"/> - <source>Fee per KB to add to transactions you send + <source>Fee per kB to add to transactions you send </source> <translation type="unfinished"></translation> </message> |