diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-08-29 11:57:44 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-08-29 11:58:20 +0200 |
| commit | 01a1537fe02d24039633821573752a54820da6e6 (patch) | |
| tree | d85009c7cf3405da5c4c836953687bf2b4f84fd7 /src/qt/locale/bitcoin_ka.ts | |
| parent | c165df198d6e9ea7292af0578024113803b8a6a2 (diff) | |
| parent | 0bd04c5dd49e1ebc1ffd1db1cc8c42345924865d (diff) | |
Merge #16638: [0.17] Release preparations for 0.17.2
0bd04c5dd49e1ebc1ffd1db1cc8c42345924865d doc: update release notes for 0.17.2 (fanquake)
6b42df88ce1398042162bfe6dafc9f555f4f7b59 qt: 0.17.2 translation update (fanquake)
c56c9ad7210751de862f0d0122579b626db01fe4 doc: update manpages for 0.17.2 (fanquake)
b4472f502cc7769d9b8a85e46fc8a3b94182f20a build: bump version to 0.17.2 (fanquake)
Pull request description:
Initial preparations for a 0.17.2 release. Needs a look over by laanwj (especially translations). Also need to check that everyone that should be included in the release notes has been included.
#15445 is the last open [0.17.2 milestone](https://github.com/bitcoin/bitcoin/issues?q=is%3Aopen+is%3Apr+milestone%3A0.17.2) tagged PR. I'm not sure that it's a requirement though.
ACKs for top commit:
laanwj:
ACK 0bd04c5dd49e1ebc1ffd1db1cc8c42345924865d
Tree-SHA512: b9017b2372f13188b69d90b3c08ce24abefff55afcbdadd405e47de4c1ba33add90b14222e773f5baa661027703a5285c30a463ff76f35a9b83e0d029f65bdbc
Diffstat (limited to 'src/qt/locale/bitcoin_ka.ts')
| -rw-r--r-- | src/qt/locale/bitcoin_ka.ts | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/qt/locale/bitcoin_ka.ts b/src/qt/locale/bitcoin_ka.ts index 3fd95eb6f5..57053ac62d 100644 --- a/src/qt/locale/bitcoin_ka.ts +++ b/src/qt/locale/bitcoin_ka.ts @@ -200,6 +200,14 @@ <translation>საფულის დაშიფვრა წარუმატებით დამთვრდა</translation> </message> <message> + <source>Wallet encryption failed due to an internal error. Your wallet was not encrypted.</source> + <translation>საფულის დაშიფრვა ვერ მოხდა შიდა შეცდომის გამო. თქვენი საფულე არ არის დაშიფრული.</translation> + </message> + <message> + <source>The supplied passphrases do not match.</source> + <translation>მოწოდებული ფრაზა-პაროლები არ ემთხვევა ერთმანეთს.</translation> + </message> + <message> <source>Wallet unlock failed</source> <translation>საფულის გახსნა წარუმატებლად შესრულდა</translation> </message> |