diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-10-15 18:23:33 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-10-15 18:23:33 +0000 |
| commit | 37be168579a9ad1b94d73bc383ba003fe4dbca2d (patch) | |
| tree | 2b9b1135d0e656f174df8eb4310cf4567b6c7f50 /src/qt/locale/bitcoin_uk.ts | |
| parent | a9f8791388ffad16f208bd8ea64d55808e0362a7 (diff) | |
| parent | 747b688b54076c3b35cb37cae7c529f11a18a588 (diff) | |
| download | bitcoin-37be168579a9ad1b94d73bc383ba003fe4dbca2d.tar.xz | |
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
src/qt/locale/bitcoin_cs.ts
src/qt/locale/bitcoin_es.ts
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_zh_CN.ts
Diffstat (limited to 'src/qt/locale/bitcoin_uk.ts')
| -rw-r--r-- | src/qt/locale/bitcoin_uk.ts | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qt/locale/bitcoin_uk.ts b/src/qt/locale/bitcoin_uk.ts index b906d2000d..debf426cd3 100644 --- a/src/qt/locale/bitcoin_uk.ts +++ b/src/qt/locale/bitcoin_uk.ts @@ -1805,11 +1805,6 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation type="unfinished"></translation> </message> <message> - <location filename="../bitcoinstrings.cpp" line="32"/> - <source>An error occurred while setting up the RPC port %i for listening: %s</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../bitcoinstrings.cpp" line="33"/> <source>You must set rpcpassword=<password> in the configuration file: %s @@ -2049,6 +2044,11 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation>Поріг відключення неправильно підєднаних пірів (за замовчуванням: 100)</translation> </message> <message> + <location filename="../bitcoinstrings.cpp" line="32"/> + <source>An error occurred while setting up the RPC port %u for listening: %s</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../bitcoinstrings.cpp" line="72"/> <source>Maximum per-connection send buffer, <n>*1000 bytes (default: 10000)</source> <translation>Максимальній розмір виіхідного буферу на одне з'єднання (за замовчуванням 10000)</translation> |