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_fi.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_fi.ts')
| -rw-r--r-- | src/qt/locale/bitcoin_fi.ts | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qt/locale/bitcoin_fi.ts b/src/qt/locale/bitcoin_fi.ts index 9337b57aa8..80001d5e4a 100644 --- a/src/qt/locale/bitcoin_fi.ts +++ b/src/qt/locale/bitcoin_fi.ts @@ -1958,11 +1958,6 @@ TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</translation> <translation>Salli DNS haut lisäsolmulle ja yhdistä</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>Virhe valmisteltaessa RPC-portin %i avaamista kuunneltavaksi: %s</translation> - </message> - <message> <location filename="../bitcoinstrings.cpp" line="62"/> <source>Connect only to the specified node</source> <translation>Ota yhteys vain tiettyyn solmuun</translation> @@ -2079,6 +2074,11 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation>Lompakon saldo ei riitä</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>Virhe valmisteltaessa RPC-portin %u avaamista kuunneltavaksi: %s</translation> + </message> + <message> <location filename="../bitcoinstrings.cpp" line="60"/> <source>Maintain at most <n> connections to peers (default: 125)</source> <translation>Pidä enintään <n> yhteyttä verkkoihin (oletus: 125)</translation> |