From 5cf84ff1f5b034c3720e80d0eb037719602d7a12 Mon Sep 17 00:00:00 2001 From: Timo Uhlmann Date: Sat, 11 Mar 2017 19:35:27 +0100 Subject: [PATCH 01/63] Fixed linux compile instructions --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6819742c..4791ead7 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ Packaging for your favorite distribution would be a welcome contribution! ### On Linux: -(Tested on Ubuntu 16.04 i386 and Linux Mint 18 "Sarah" - Cinnamon (64-bit)) +(Tested on Ubuntu 16.04 x86, 16.10 x64 and Linux Mint 18 "Sarah" - Cinnamon x64) 1. Install Monero dependencies. @@ -83,15 +83,15 @@ Packaging for your favorite distribution would be a welcome contribution! 5. Install the GUI dependencies. - - For Ubuntu 16.04 i386 + - For Ubuntu 16.04 x86 `sudo apt-get install qtbase5-dev qt5-default qtdeclarative5-dev qml-module-qtquick-controls qml-module-qtquick-xmllistmodel qttools5-dev-tools qml-module-qtquick-dialogs libzbar-dev` - - For Ubuntu 16.04 x64 + - For Ubuntu 16.04+ x64 `sudo apt-get install qtbase5-dev qt5-default qtdeclarative5-dev qtmultimedia5-dev qml-module-qtquick-controls qml-module-qtquick-xmllistmodel qttools5-dev-tools qml-module-qtquick-dialogs qml-module-qt-labs-settings libqt5qml-graphicaleffects libzbar-dev` - - For Linux Mint 18 "Sarah" - Cinnamon (64-bit) + - For Linux Mint 18 "Sarah" - Cinnamon x64 `sudo apt install qml-module-qt-labs-settings qml-module-qtgraphicaleffects libzbar-dev` @@ -101,7 +101,7 @@ Packaging for your favorite distribution would be a welcome contribution! 7. Run the GUI client. - `./release/bin/monero-wallet-gui` + `./build/release/bin/monero-wallet-gui` ### On OS X: From 82cb50994c9cefb897a69889d95d374423a60c98 Mon Sep 17 00:00:00 2001 From: Jonathan Cross Date: Thu, 9 Mar 2017 20:03:12 +0100 Subject: [PATCH 02/63] README: Updating Mac OSX Build notes and adding heading. --- README.md | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 6819742c..9e10b6b7 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +# Monero GUI + Copyright (c) 2014-2017, The Monero Project ## Development Resources @@ -109,28 +111,33 @@ Packaging for your favorite distribution would be a welcome contribution! 2. Install [homebrew](http://brew.sh/) 3. Install [monero](https://github.com/monero-project/monero) dependencies: - `brew install boost --c++11` + `brew install boost --c++11` - `brew install openssl` - to install openssl headers + `brew install openssl` - to install openssl headers - `brew install pkgconfig` + `brew install pkgconfig` - `brew install cmake` + `brew install cmake` -4. Install latest Qt using official installer from [qt.io](https://www.qt.io/download-open-source/) (homebrew version might be outdated). -5. Add Qt bin dir to your path: + `brew install qt5` (or download QT 5.8+ from [qt.io](https://www.qt.io/download-open-source/)) - `export PATH=$PATH:$HOME/Qt/5.7/clang_64/bin` + If you have an older version of Qt installed via homebrew, you can force it to use 5.x like so: - where ```Qt``` is the folder you selected to install Qt. + `brew link --force --overwrite qt5` + +5. Add Qt bin dir to your path. Example: + + `export PATH=$PATH:/usr/local/opt/qt5/bin` + + make sure this is where Qt 5.x is installed on **your** system eg `$HOME/Qt/5.8/clang_64/bin` if you downloaded from qt.io. 6. Grab an up-to-date copy of the monero-core repository. - `git clone https://github.com/monero-project/monero-core.git` + `git clone https://github.com/monero-project/monero-core.git` 7. Go into the repository. - `cd monero-core` + `cd monero-core` 8. Build libwallet From 35cd7889683eccc57a80a529bb125bf62352ad2a Mon Sep 17 00:00:00 2001 From: Lafudoci Date: Mon, 13 Mar 2017 11:57:41 +0800 Subject: [PATCH 03/63] add flag for zh_tw Correct the indication and flag of zh_tw Add lan flag for zh_tw Update traditional Chinese translation Delete monero-core_zh.ts Update traditional Chinese translation Delete monero-core_zh.ts Update traditional Chinese translation Delete monero-core_zh.ts Add files via upload squash Change zh_tw flag title for less controversy squash --- lang/flags/taiwan.png | Bin 0 -> 4100 bytes lang/languages.xml | 4 ++-- qml.qrc | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 lang/flags/taiwan.png diff --git a/lang/flags/taiwan.png b/lang/flags/taiwan.png new file mode 100644 index 0000000000000000000000000000000000000000..4610dbfb6aff3b9727e173368435e4cc3202ef8e GIT binary patch literal 4100 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 + - - - - - + + + + + - - + + - - - + + + From 476fdd4ebe894c32324659760d88a3641f668a38 Mon Sep 17 00:00:00 2001 From: Nano Akron Date: Wed, 22 Mar 2017 23:03:45 +0000 Subject: [PATCH 46/63] Further translations and removal of 'unfinished' tags for Bahasa Indonesia --- translations/monero-core_id.ts | 200 +++++++++++++++++---------------- 1 file changed, 101 insertions(+), 99 deletions(-) diff --git a/translations/monero-core_id.ts b/translations/monero-core_id.ts index e780b0e0..8f6f06da 100644 --- a/translations/monero-core_id.ts +++ b/translations/monero-core_id.ts @@ -141,7 +141,7 @@ command + enter (e.g help) - + command + enter (contoh: membantu) @@ -159,7 +159,7 @@ Use custom settings - + Menggunakan pengaturan yang dipilih oleh Anda @@ -425,7 +425,7 @@ Testnet - Testnet (jaringan pelatihan) + Testnet (jaringan pelatihan) @@ -506,7 +506,7 @@ Balance - Saldo Rekening + Saldo Rekening @@ -549,7 +549,7 @@ Mining with your computer helps strengthen the Monero network. The more that people mine, the harder it is for the network to be attacked, and every little bit helps.<br> <br>Mining also gives you a small chance to earn some Monero. Your computer will create hashes looking for block solutions. If you find a block, you will get the associated reward. Good luck! - + Pertambangan dengan komputer Anda menolong mempertahankan jaringan Monero. Makin banyak orang-orang pertambangan, makin sulit menyerangkan jaringan, dan setiap komputer membantu, memang yang kecil.<br> <br>Pertambangan juga memberikan Anda sebuah kesempatan supaya memenangkan sedikit Monero. Komputer Anda akan menebak untuk kunci blok Monero. Jika Anda menemukan kunci yang pas, Anda akan menang sedikit Monero. Semoga sukses! @@ -776,7 +776,7 @@ with not enough money (%1) - + dengan kurang uang (%1) @@ -791,12 +791,12 @@ 16 hexadecimal characters - + 16 simbol heksadesimal Clear - + Bersih @@ -806,7 +806,7 @@ Amount to receive - + Jumlah untuk terima ReadOnly wallet integrated address displayed here @@ -815,17 +815,17 @@ <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> Tracking <font size='2'> (</font><a href='#'>help</a><font size='2'>)</font> - + <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> Pelacakan <font size='2'> (</font><a href='#'>help</a><font size='2'>)</font> Tracking payments - Pembayaran pelacakan + Pelacakan pembayaran <p><font size='+2'>This is a simple sales tracker:</font></p><p>Click Generate to create a random payment id for a new customer</p> <p>Let your customer scan that QR code to make a payment (if that customer has software which supports QR code scanning).</p><p>This page will automatically scan the blockchain and the tx pool for incoming transactions using this QR code. If you input an amount, it will also check that incoming transactions total up to that amount.</p>It's up to you whether to accept unconfirmed transactions or not. It is likely they'll be confirmed in short order, but there is still a possibility they might not, so for larger values you may want to wait for one or more confirmation(s).</p> - + <p><font size='+2'>Ini pelacakan penjualan yang sederhana:</font></p><p>Pekan Membuat supaya membuat menandai pembayaran yang acak, untuk pelanggan yang baru</p> <p>Pelanggan Anda bisa membayar dengan kode QR (jika ponsel atau komputer mereka bisa membaca kode QR).</p><p>Halaman ini akan memeriksa rantaiblok dan transaksi baru untuk transaksi dari kode QR itu. Jika Anda ingin jumlah yang pas, halaman ini juga bisa periksa jumlah pembayaran sesuai.</p>Anda harus pilih kalau Anda ingin menerima pembayaran yang belum disahkan. Biasanya, transaksi akan dikonfirmasi dalam rantablok dalam berapa menit, tetapi lebih aman kalau Anda menunggu lebih dari satu konfirmasi untuk pembayaran yang besar.</p> @@ -859,7 +859,7 @@ Generate payment ID for integrated address - + Membuat menandai transaksi untuk alamat tergabung (menandai pembayaran sudah termasuk) @@ -1025,7 +1025,7 @@ Embedded Monero version: - + Versi Monero termasuk: @@ -1040,12 +1040,12 @@ Error - Kesalahan + Kesalahan Wrong password - + Kata sandi yang salah @@ -1104,34 +1104,34 @@ Sign - + Menandatangani Please choose a file to sign - + Mohon memilih arsip untuk ditandatangani Select - + Pilih Verify - + Mengesahkan Please choose a file to verify - + Pililah arsip untuk disahkan <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> Signing address <font size='2'> ( Paste in or select from </font> <a href='#'>Address book</a><font size='2'> )</font> - + <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> Alamat menandatangani <font size='2'> ( Merekatkan atau pilih dari </font> <a href='#'>Buku alamat</a><font size='2'> )</font> SIGN @@ -1202,32 +1202,32 @@ Low (x1 fee) - + Rendah (Biaya x1) Medium (x20 fee) - + Sedang (Biaya x20) High (x166 fee) - + Tinggi (Biaya x166) All - + Semua Sent - + Terkirim Received - + Diterima @@ -1235,22 +1235,22 @@ <b>Copy address to clipboard</b> - + <b>Menyalin alamat ke clipboard</b> <b>Send to same destination</b> - + <b>Mengirim ke tujuan yang sama<b> <b>Find similar transactions</b> - + <b>Mencari transaksi yang serupa<b> <b>Remove from address book</b> - + <b>Menghapus dari buku alamat<b> @@ -1258,22 +1258,22 @@ Payment ID - + Menandai pembayaran: Date - Tanggal + Tanggal Block height - + Ketinggian blok Amount - Jumlah + Jumlah @@ -1293,17 +1293,17 @@ Normal - + Biasa Medium - Sedang + Sedang High - Tinggi + Tinggi @@ -1311,17 +1311,17 @@ OpenAlias error - + Kesalahan dengan OpenAlias Privacy level (ringsize %1) - + Kepentingan pribadi (transaksi dalam cincin %1) <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style><font size='2'> (</font><a href='#'>Start daemon</a><font size='2'>)</font> - + <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style><font size='2'> (</font><a href='#'>Mulai jurik</a><font size='2'>)</font> @@ -1336,216 +1336,216 @@ Low (x1 fee) - + Rendah (biaya x1) Medium (x20 fee) - + Sedang (biaya x20) High (x166 fee) - + Tinggi (biaya x166) <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> Address <font size='2'> ( Paste in or select from </font> <a href='#'>Address book</a><font size='2'> )</font> - + <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> Alamat <font size='2'> ( Merekatkan atau memilih dari </font> <a href='#'>Buku alamat</a><font size='2'> )</font> QR Code - + Kode QR Resolve - + Menyelesaikan No valid address found at this OpenAlias address - + Tidak menerima alamat yang sah dari alamat OpenAddress ini Address found, but the DNSSEC signatures could not be verified, so this address may be spoofed - + Alamat ditemukan, tetapi tanda tangan DNSSEC tidak dapat disahkan, jadi adalah kemungkinan alamat ini telah dipalsukan No valid address found at this OpenAlias address, but the DNSSEC signatures could not be verified, so this may be spoofed - + Tidak menerima alamat yang sah dari alamat OpenAddress ini, dan juga tanda tangan DNSSEC tidak dapat disahkan, jadi adalah kemungkinan ini telah dipalsukan Internal error - + Kesalahan internal No address found - + Tidak dapat menemukan alamat Description <font size='2'>( Optional )</font> - + Catatan <font size='2'>( Opsional )</font> Saved to local wallet history - + Sedia dalam riwayat dompet lokal Send - KIRIM + MENGIRIM Show advanced options - + Menunjukkan opsi terperinci Sweep Unmixable - + Menggabungkan transaksi yang tak dapat dicampurkan create tx file - + Membuat arsip transaksi All - + Semua Sign tx file - + Menandatangani arsip transaksi Submit tx file - + Menyerahkan arsip transaksi Rescan spent - + Periksakan lagi yang terhabiskan Error - Kesalahan + Kesalahan Error: - + Kesalahan: Information - Informasi + Informasi Sucessfully rescanned spent outputs - + Keperiksaan yang terkeluar dengan sukses Please choose a file - + >Mohon memilih arsip Can't load unsigned transaction: - + Tidak bisa membuka transaksi yang tidak ditandatangani: Number of transactions: - Jumlah transaksi: + Jumlah transaksi: Transaction #%1 - + Transaksi #%1 Recipient: - + Penerima: payment ID: - + Menandai Pembayaran: Amount: - + Jumlah: Fee: - + Biaya: Ringsize: - + Ukuran cincin: Confirmation - Konfirmasi + Konfirmasi Can't submit transaction: - + Tidak bisa mengirim transaksi: Money sent successfully - + Uang terkirim dengan sukses Wallet is not connected to daemon. - + Dompet tidak dapat menghubung ke jurik Connected daemon is not compatible with GUI. Please upgrade or connect to another daemon - + Jurik yang terhubung tidak cocok dengan GUI. Silahkan meningkatkan jurik atau menghubungkan jurik yang lain Waiting on daemon synchronization to finish - + Menunggu jurik untuk selesai menerima dan memeriksa blok @@ -1629,27 +1629,27 @@ Please upgrade or connect to another daemon Verify that a third party made a payment by supplying: - + Anda bisa periksa pembayaran oleh pihak ketiga dengan: - the recipient address - + - alamat penerima - the transaction ID - + - menandai transaksi - the secret transaction key supplied by the sender - + - rahasia transaksi dari pengirim If a payment had several transactions then each must be checked and the results combined. - + Jika pembayaran termasuk beberapa transaksi, setiapnya harus diperiksa dan hasil ditambah. @@ -1669,17 +1669,17 @@ Please upgrade or connect to another daemon Paste tx ID - + Merekatkan menandai transaksi Paste tx key - + Merekatkan kunci transaksi Check - + Periksa Transaction ID here @@ -1718,7 +1718,7 @@ Please upgrade or connect to another daemon It is very important to write it down as this is the only backup you will need for your wallet. - Sangat penting ini dicatat karena cuma oleh sebagai ini dompet Anda dapat dipulihkan + Sangat penting ini dicatat karena cuma oleh sebagai ini dompet Anda dapat dipulihkan @@ -1746,7 +1746,7 @@ Please upgrade or connect to another daemon Create view only wallet - Membuat dompet hanya untuk menonton + Membuat dompet hanya untuk menonton @@ -1865,7 +1865,7 @@ Please upgrade or connect to another daemon Don't forget to write down your seed. You can view your seed and change your settings on settings page. - + Jangan melupahkan menulis biji acak Anda. Anda bisa lihat biki acak dan mengelola pengaturan di halaman pengaturan. @@ -1901,7 +1901,7 @@ Please upgrade or connect to another daemon Create wallet - + Membuat dompet @@ -2086,12 +2086,14 @@ Please upgrade or connect to another daemon <br>Note: this password cannot be recovered. If you forget it then the wallet will have to be restored from its 25 word mnemonic seed.<br/><br/> <b>Enter a strong password</b> (using letters, numbers, and/or symbols): - + <br>Peringatan: kata sandi ini tidak pernah dapat diperoleh kembali. Jika Anda lupa kata sandi, dompet Anda harus dikembalikan dari kata biji acak.<br/><br/> + <b>Mohon memilih kata sandi yang sulit</b> (dengan huruf, nomor dan/atau simbol): Note: this password cannot be recovered. If you forget it then the wallet will have to be restored from its 25 word mnemonic seed.<br/><br/> <b>Enter a strong password</b> (using letters, numbers, and/or symbols): - Peringatan: kata sandi ini tidak pernah dapat diperoleh kembali + Peringatan: kata sandi ini tidak pernah dapat diperoleh kembali. Jika Anda lupa kata sandi, dompet Anda harus dikembalikan dari kata biji acak.<br/><br/> + <b>Mohon memilih kata sandi yang sulit</b> (dengan huruf, nomor dan/atau simbol): @@ -2120,7 +2122,7 @@ Please upgrade or connect to another daemon Restore wallet - Mengembalikan dompet + Mengembalikan dompet @@ -2132,7 +2134,7 @@ Please upgrade or connect to another daemon Welcome to Monero! - Selamat datang di dunia Monero! + Selamat datang di dunia Monero! @@ -2287,7 +2289,7 @@ Amount: Fee: - + Biaya From 439372ed5e42fbe3ecfb218ccee1198334f5d054 Mon Sep 17 00:00:00 2001 From: MoroccanMalinois Date: Thu, 23 Mar 2017 00:21:34 +0000 Subject: [PATCH 47/63] README: add qml-module-qtmultimedia dependency --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 193c9cf5..b98a4d37 100644 --- a/README.md +++ b/README.md @@ -87,15 +87,15 @@ Packaging for your favorite distribution would be a welcome contribution! - For Ubuntu 16.04 x86 - `sudo apt-get install qtbase5-dev qt5-default qtdeclarative5-dev qml-module-qtquick-controls qml-module-qtquick-xmllistmodel qttools5-dev-tools qml-module-qtquick-dialogs libzbar-dev` + `sudo apt-get install qtbase5-dev qt5-default qtdeclarative5-dev qml-module-qtquick-controls qml-module-qtquick-xmllistmodel qttools5-dev-tools qml-module-qtquick-dialogs` - For Ubuntu 16.04+ x64 - `sudo apt-get install qtbase5-dev qt5-default qtdeclarative5-dev qtmultimedia5-dev qml-module-qtquick-controls qml-module-qtquick-xmllistmodel qttools5-dev-tools qml-module-qtquick-dialogs qml-module-qt-labs-settings libqt5qml-graphicaleffects libzbar-dev` + `sudo apt-get install qtbase5-dev qt5-default qtdeclarative5-dev qtmultimedia5-dev qml-module-qtquick-controls qml-module-qtquick-xmllistmodel qttools5-dev-tools qml-module-qtquick-dialogs qml-module-qt-labs-settings libqt5qml-graphicaleffects qml-module-qtmultimedia` - For Linux Mint 18 "Sarah" - Cinnamon x64 - `sudo apt install qml-module-qt-labs-settings qml-module-qtgraphicaleffects libzbar-dev` + `sudo apt install qml-module-qt-labs-settings qml-module-qtgraphicaleffects` 6. Build the GUI. From 6fbba9f88c34256fa9cd16d3b3ebc0223184b037 Mon Sep 17 00:00:00 2001 From: xmr-eric Date: Thu, 23 Mar 2017 13:30:36 -0400 Subject: [PATCH 48/63] Settlings.qml: Change "Save" button to "Connect" --- pages/Settings.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/Settings.qml b/pages/Settings.qml index b0f7058c..9301a92e 100644 --- a/pages/Settings.qml +++ b/pages/Settings.qml @@ -272,7 +272,7 @@ Rectangle { id: daemonAddrSave Layout.fillWidth: false Layout.leftMargin: 30 - text: qsTr("Save") + translationManager.emptyString + text: qsTr("Connect") + translationManager.emptyString shadowReleasedColor: "#FF4304" shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" From f05f0b73c3db6a4841b8d18e5fdb0757c838366a Mon Sep 17 00:00:00 2001 From: Jaquee Date: Thu, 23 Mar 2017 22:50:57 +0100 Subject: [PATCH 49/63] add WalletManager::useForkRules() --- src/libwalletqt/WalletManager.cpp | 10 ++++++++++ src/libwalletqt/WalletManager.h | 2 ++ 2 files changed, 12 insertions(+) diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp index ad77ad48..95fa0b77 100644 --- a/src/libwalletqt/WalletManager.cpp +++ b/src/libwalletqt/WalletManager.cpp @@ -338,6 +338,16 @@ QString WalletManager::checkUpdates(const QString &software, const QString &subd return QString::fromStdString(std::get<1>(result) + "|" + std::get<2>(result) + "|" + std::get<3>(result) + "|" + std::get<4>(result)); } +bool WalletManager::useForkRules(quint8 required_version) const +{ + quint64 earliest_height; + quint8 version; + m_pimpl->hardForkInfo(version, earliest_height); + return version >= required_version; +} + + + WalletManager::WalletManager(QObject *parent) : QObject(parent) { m_pimpl = Monero::WalletManagerFactory::getWalletManager(); diff --git a/src/libwalletqt/WalletManager.h b/src/libwalletqt/WalletManager.h index 01afc064..592c7920 100644 --- a/src/libwalletqt/WalletManager.h +++ b/src/libwalletqt/WalletManager.h @@ -136,6 +136,8 @@ public: Q_INVOKABLE bool saveQrCode(const QString &, const QString &) const; Q_INVOKABLE QString checkUpdates(const QString &software, const QString &subdir) const; + Q_INVOKABLE bool useForkRules(quint8 version) const; + signals: void walletOpened(Wallet * wallet); From b4cab574bcb7a54e6ce08758209dd53a09a9ac9b Mon Sep 17 00:00:00 2001 From: Lafudoci Date: Fri, 24 Mar 2017 13:05:48 +0800 Subject: [PATCH 50/63] Add simplified Chinese translation (zh_CN) --- lang/languages.xml | 1 + monero-wallet-gui.pro | 3 +- translations/monero-core_zh_CN.ts | 2418 +++++++++++++++++ ...monero-core_zh.ts => monero-core_zh_TW.ts} | 0 4 files changed, 2421 insertions(+), 1 deletion(-) create mode 100644 translations/monero-core_zh_CN.ts rename translations/{monero-core_zh.ts => monero-core_zh_TW.ts} (100%) diff --git a/lang/languages.xml b/lang/languages.xml index 4d1f7faa..7681eb3d 100644 --- a/lang/languages.xml +++ b/lang/languages.xml @@ -29,5 +29,6 @@ List of available languages for your wallet's seed: + diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro index add606e4..b6ea22a3 100644 --- a/monero-wallet-gui.pro +++ b/monero-wallet-gui.pro @@ -291,7 +291,8 @@ TRANSLATIONS = \ # English is default language, no explicit translation file $$PWD/translations/monero-core_nl.ts \ # Dutch $$PWD/translations/monero-core_pl.ts \ # Polish $$PWD/translations/monero-core_ru.ts \ # Russian - $$PWD/translations/monero-core_zh.ts \ # Chinese (Traditional) + $$PWD/translations/monero-core_zh_CN.ts \ # Chinese (Simplified-China) + $$PWD/translations/monero-core_zh_TW.ts \ # Chinese (Traditional-Taiwan) CONFIG(release, debug|release) { DESTDIR = release/bin diff --git a/translations/monero-core_zh_CN.ts b/translations/monero-core_zh_CN.ts new file mode 100644 index 00000000..4c129f0d --- /dev/null +++ b/translations/monero-core_zh_CN.ts @@ -0,0 +1,2418 @@ + + + + + AddressBook + + + Add new entry + 增加付款地址 + + + + Address + 地址 + + + + <b>Tip tekst test</b> + + + + + QRCODE + QR码 + + + + 4... + 4... + + + + Payment ID <font size='2'>(Optional)</font> + 付款 ID <font size='2'>(可选填)</font> + + + + <b>Payment ID</b><br/><br/>A unique user name used in<br/>the address book. It is not a<br/>transfer of information sent<br/>during the transfer + <b>付款 ID</b><br/><br/>在地址簿里<br/>用以区分的使用者名称<br/>这不是付款时<br/>传送的信息 + + + + Paste 64 hexadecimal characters + 贴上16进位字符之地址 + + + + Description <font size='2'>(Optional)</font> + 标记 <font size='2'>(选填)</font> + + + + Give this entry a name or description + 给予这个地址一个名称或标记 + + + + Add + 新增 + + + + Error + 错误 + + + + Invalid address + 无效的地址 + + + + Can't create entry + 无法新增地址 + + + Description <font size='2'>(Local database)</font> + 描述 <font size='2'>(本地信息)</font> + + + + <b>Tip test test</b><br/><br/>test line 2 + + + + ADD + 新增 + + + Payment ID + 付款 ID + + + Description + 标记 + + + + AddressBookTable + + + No more results + 没有更多了 + + + + Payment ID: + 付款 ID: + + + + BasicPanel + + + Locked Balance: + 总余额: + + + + 78.9239845 + 78.9239845 + + + + Available Balance: + 可用余额: + + + + 2324.9239845 + 2324.9239845 + + + + DaemonConsole + + + Close + 关闭 + + + + command + enter (e.g help) + 输入指令后按下enter送出 (范例: help) + + + + DaemonManagerDialog + + + Starting Monero daemon in %1 seconds + 在 %1 秒后启动 Monero 区块同步 + + + + Start daemon (%1) + 引导块块同步程序 (%1) + + + + Use custom settings + 使用自定义设定 + + + + DaemonProgress + + Synchronizing blocks %1/%2 + 同步区块中 %1 / %2 + + + Synchronizing blocks + 同步区块中 + + + + Dashboard + + + Quick transfer + 快速转账 + + + + SEND + 付款 + + + + <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> looking for security level and address book? go to <a href='#'>Transfer</a> tab + <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> 需要安全等级设定或付款地址簿吗? 请至 <a href='#'>Transfer</a> 分页 + + + + DashboardTable + + + No more results + 没有更多了 + + + + Date + 日期 + + + + Balance + 余额 + + + + Amount + 金额 + + + + History + + + selected: + 笔已选择的交易总金额: + + + + Filter transaction history + 交易纪录筛选 + + + + <b>Total amount of selected payments</b> + <b>已选择的付款总金额</b> + + + + Type for incremental search... + 输入筛选条件... + + + + Filter + 筛选 + + + Incremental search + 新增搜寻条件 + + + Search transfers for a given string + 以关键词搜寻付款纪录 + + + Type search string + 输入搜寻关键词 + + + + Date from + 日期从 + + + + + + + + <b>Tip tekst test</b> + + + + + + To + 到 + + + FILTER + 筛选 + + + + Advanced filtering + 进阶筛选 + + + + Type of transaction + 交易种类 + + + + Amount from + 金额从 + + + + HistoryTable + + + Tx ID: + 转账ID (Tx ID): + + + + + Payment ID: + 付款 ID: + + + + Tx key: + 转账密钥 (Tx key): + + + + Tx note: + 转账附注: + + + + Destinations: + 目标: + + + + No more results + 没有更多了 + + + + Details + 细节 + + + + BlockHeight: + 区块高度: + + + + (%1/10 confirmations) + (%1/10 次确认) + + + + UNCONFIRMED + 未确认的交易 + + + + PENDING + 待确认的交易 + + + + Date + 日期 + + + + Amount + 金额 + + + + Fee + 手续费 + + + + LeftPanel + + + Balance + 余额 + + + + Test tip 1<br/><br/>line 2 + + + + + Unlocked balance + 总余额 + + + + Test tip 2<br/><br/>line 2 + + + + + Send + 付款 + + + + Receive + 收款 + + + + R + + + + Verify payment + 确认交易 + + + + K + + + + + History + 历史纪录 + + + + Testnet + 连接到测试用网络 + + + + Address book + 地址簿 + + + + B + + + + + H + + + + + Advanced + 进阶功能 + + + + D + + + + + Mining + 挖矿 + + + + M + + + + + Check payment + 交易检查 + + + + Sign/verify + 签署 / 验证 + + + + E + + + + + S + + + + + I + + + + + Settings + 钱包设定 + + + + MiddlePanel + + Balance: + 总余额: + + + Unlocked Balance: + 可用余额: + + + + Balance + 总余额 + + + + Unlocked Balance + 可用余额 + + + + Mining + + + Solo mining + 独立挖矿 (Solo mining) + + + + (only available for local daemons) + (仅限于使用本地端区块同步程序) + + + Mining helps the Monero network build resilience.<br> + 挖矿可增进 Monero 网络的安全性<br> + + + The more mining is done, the harder it is to attack the network.<br> + 只要越多使用者在挖矿，Monero 网络就会越难以被攻击<br> + + + Mining also gives you a small chance to earn some Monero.<br> + 挖矿也同时提供您机会赚取一些额外的 Monero 币<br> + + + Your computer will search for Monero block solutions.<br> + 您的计算机将被用来寻找 Monero 区块的解答.<br> + + + If you find a block, you will get the associated reward.<br> + 每当您找到一个区块的解答，您即可以获得其附带的奖励金<br> + + + + Mining with your computer helps strengthen the Monero network. The more that people mine, the harder it is for the network to be attacked, and every little bit helps.<br> <br>Mining also gives you a small chance to earn some Monero. Your computer will create hashes looking for block solutions. If you find a block, you will get the associated reward. Good luck! + + + + + CPU threads + CPU线程数量 + + + + (optional) + (选填) + + + + Background mining (experimental) + 背景挖矿 (实验性功能) + + + + Enable mining when running on battery + 允许在使用电池时挖矿 + + + + Manage miner + 挖矿管理 + + + + Start mining + 开始挖矿 + + + + Error starting mining + 启动挖矿时发生错误 + + + + Couldn't start mining.<br> + 无法启动挖矿<br> + + + + Mining is only available on local daemons. Run a local daemon to be able to mine.<br> + 仅能使用本地端区块同步程序以进行挖矿，请先执行本地端区块同步程序<br> + + + + Stop mining + 停止挖矿 + + + + Status: not mining + 状态: 没有在进行挖矿 + + + + Mining at %1 H/s + 目前挖矿速率为 %1 H/s + + + + Not mining + 没有在进行挖矿 + + + + Status: + 状态: + + + + NetworkStatusItem + + + Synchronizing + 同步区块中 + + + + Connected + 已连接 + + + + Wrong version + 版本错误 + + + + Disconnected + 已脱机 + + + + Invalid connection status + 无效的连接状态 + + + + Network status + 网络同步状态 + + + + PasswordDialog + + + Please enter wallet password + 请输入钱包的密码 + + + + Please enter wallet password for:<br> + 请输入以下钱包的密码:<br> + + + + Cancel + 取消 + + + + Ok + 确定 + + + + PrivacyLevelSmall + + LOW + 低 + + + MEDIUM + 中 + + + HIGH + 高 + + + + Low + 低 + + + + Medium + 中 + + + + High + 高 + + + + ProgressBar + + + Establishing connection... + 建立联机中... + + + + Blocks remaining: %1 + 剩余区块数量: %1 + + + + Synchronizing blocks + 同步区块中 + + + + Receive + + + Invalid payment ID + 无效的付款ID + + + + WARNING: no connection to daemon + 警告: 没有与区块同步程序(daemon)建立联机 + + + + in the txpool: %1 + 在交易池中(txpool): %1 + + + + %2 confirmations: %3 (%1) + %2 交易确认: %3 (%1) + + + + 1 confirmation: %2 (%1) + 1 交易确认: %2 (%1) + + + + No transaction found yet... + 目前没有交易... + + + + Transaction found + 已找到交易信息 + + + + %1 transactions found + 已找到 %1 笔交易信息 + + + + with more money (%1) + 尚有金额 (%1) + + + + with not enough money (%1) + 不足金额 (%1) + + + + Address + 地址 + + + + ReadOnly wallet address displayed here + 只读钱包的地址会显示在这 + + + + 16 hexadecimal characters + 16 十六进制字符 + + + + Clear + + + + + Integrated address + 整合地址 + + + + Amount to receive + + + + ReadOnly wallet integrated address displayed here + 只读钱包的整合地址会显示在这 + + + + <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> Tracking <font size='2'> (</font><a href='#'>help</a><font size='2'>)</font> + <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> 追踪中 <font size='2'> (</font><a href='#'>help</a><font size='2'>)</font> + + + + Tracking payments + 追踪支付款 + + + + <p><font size='+2'>This is a simple sales tracker:</font></p><p>Click Generate to create a random payment id for a new customer</p> <p>Let your customer scan that QR code to make a payment (if that customer has software which supports QR code scanning).</p><p>This page will automatically scan the blockchain and the tx pool for incoming transactions using this QR code. If you input an amount, it will also check that incoming transactions total up to that amount.</p>It's up to you whether to accept unconfirmed transactions or not. It is likely they'll be confirmed in short order, but there is still a possibility they might not, so for larger values you may want to wait for one or more confirmation(s).</p> + + + + + Save QrCode + 储存 QR 码 + + + + Failed to save QrCode to + 无法储存 QR 码至 + + + + Save As + 另存为 + + + + Payment ID + 付款 ID + + + 16 or 64 hexadecimal characters + 16 或 64 十六进制字母 + + + + Generate + 产生 + + + + Generate payment ID for integrated address + + + + + Amount + 金额 + + + + RightPanel + + + Twitter + 推特 + + + + News + 最新消息 + + + + Help + 说明 + + + + About + 关于 + + + + SearchInput + + + Search by... + 搜寻条件... + + + + SEARCH + 搜寻 + + + + Settings + + Click button to show seed + 点选显示种子码 + + + Mnemonic seed: + 辅助记忆种子码: + + + It is very important to write it down as this is the only backup you will need for your wallet. + 请注意这是唯一需要备份的钱包信息，请一定要抄写下来。 + + + + Create view only wallet + 创建只读钱包(view only wallet) + + + + Show seed + 显示种子码 + + + + Manage daemon + 管理区块同步程序(daemon) + + + + Start daemon + 引导块块同步程序 + + + + Stop daemon + 停止区块同步程序 + + + + Show status + 显示状态 + + + + Daemon startup flags + 区块同步程序启动flags + + + + (optional) + (选填) + + + + Daemon address + 区块同步程序位置 + + + + Hostname / IP + 主机名 / IP位置 + + + + Port + 通讯端口 + + + + Login (optional) + 登入 (选填) + + + + Username + 使用者名称 + + + + Password + 密码 + + + + Save + 储存 + + + + Layout settings + 版面设定 + + + + Custom decorations + 窗口化自定义 + + + + Log level + 日志层级 + + + + (e.g. *:WARNING,net.p2p:DEBUG) + + + + + Version + 版本 + + + + GUI version: + GUI 版本: + + + + Embedded Monero version: + 内嵌 Monero 版本: + + + + Daemon log + 区块同步程序日志 + + + + Wallet mnemonic seed + 钱包辅助记忆种子码 + + + + Error + 错误 + + + + Wrong password + 密码错误 + + + + Manage wallet + 管理钱包 + + + Close current wallet and open wizard + 关闭当前的钱包然后启动设定精灵 + + + + Close wallet + 关闭钱包 + + + + Sign + + + Good signature + 良好的签署 + + + + This is a good signature + 这份签署没有问题 + + + + Bad signature + 有问题的签署 + + + + This signature did not verify + 这份签署无法通过验证 + + + + Sign a message or file contents with your address: + 用你的地址签署一份讯息或档案内容: + + + + + Either message: + 签署讯息: + + + + Message to sign + 欲签署的讯息 + + + + + Sign + 签署 + + + + Please choose a file to sign + 请选择一个欲签署的档案 + + + + + Select + 选择档案 + + + + + Verify + 验证 + + + + Please choose a file to verify + 请选择一个欲验证的档案 + + + + <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> Signing address <font size='2'> ( Paste in or select from </font> <a href='#'>Address book</a><font size='2'> )</font> + <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> 签署来源之地址<font size='2'> ( 贴上或从</font> <a href='#'>地址簿</a> <font size='2'> 中选择 )</font> + + + SIGN + 签署 + + + + + Or file: + 或档案: + + + SELECT + 选择档案 + + + + Filename with message to sign + 要签署讯息的文件名 + + + + + + + Signature + 签署结果 + + + + Verify a message or file signature from an address: + 验证从某个地址所签署的讯息或档案: + + + + Message to verify + 欲验证的讯息 + + + VERIFY + 验证 + + + + Filename with message to verify + 附带签署讯息的文件名 + + + <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> Signing address <font size='2'> ( Type in or select from </font> <a href='#'>Address</a><font size='2'> book )</font> + <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> 签署的地址 <font size='2'> ( 输入或从簿选择 </font> <a href='#'>Address</a><font size='2'> 簿选择 )</font> + + + + StandardDialog + + + Ok + 确定 + + + + Cancel + 取消 + + + + StandardDropdown + + + Low (x1 fee) + 低 (标准手续费) + + + + Medium (x20 fee) + 中 (20倍手续费) + + + + High (x166 fee) + 高 (166倍手续费) + + + + All + + + + + Sent + + + + + Received + + + + + TableDropdown + + + <b>Copy address to clipboard</b> + + + + + <b>Send to same destination</b> + + + + + <b>Find similar transactions</b> + + + + + <b>Remove from address book</b> + + + + + TableHeader + + + Payment ID + 付款 ID + + + + Date + 日期 + + + + Block height + + + + + Amount + 金额 + + + + TickDelegate + + LOW + 低 + + + MEDIUM + 中 + + + HIGH + 高 + + + + Normal + 正常 + + + + Medium + 中 + + + + High + 高 + + + + Transfer + + + OpenAlias error + OpenAlias 错误 + + + + Privacy level (ringsize %1) + 隐私等级 (ringsize %1)) + + + + <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style><font size='2'> (</font><a href='#'>Start daemon</a><font size='2'>)</font> + <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style><font size='2'> (</font><a href='#'>引导块块同步程序</a><font size='2'>)</font> + + + + Amount + 金额 + + + + Transaction priority + 交易优先程度 + + + all + 全部 + + + + Low (x1 fee) + 低 (标准手续费) + + + + Medium (x20 fee) + 中 (20倍手续费) + + + + High (x166 fee) + 高 (166倍手续费) + + + + <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> Address <font size='2'> ( Paste in or select from </font> <a href='#'>Address book</a><font size='2'> )</font> + <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> 地址<font size='2'> ( 贴上或从</font> <a href='#'>地址簿</a> <font size='2'> 中选择 )</font> + + + + QR Code + QR码 + + + + Resolve + 解析 + + + + No valid address found at this OpenAlias address + 无效的 OpenAlias address 地址 + + + + Address found, but the DNSSEC signatures could not be verified, so this address may be spoofed + 已找到地址，但无法验证其 DNSSEC 的签署，此地址有可能受到欺骗攻击的风险 + + + + No valid address found at this OpenAlias address, but the DNSSEC signatures could not be verified, so this may be spoofed + 无法找到有效地址，但无法验证其 DNSSEC 的签署，此地址有可能受到欺骗攻击的风险 + + + + + Internal error + 内部错误 + + + + No address found + 没有找到地址 + + + + Description <font size='2'>( Optional )</font> + 标记 <font size='2'>( 选填 )</font> + + + + Saved to local wallet history + 储存至本机钱包纪录 + + + + Send + 付款 + + + + Show advanced options + 显示进阶选项 + + + + Sweep Unmixable + 去除无法混币的金额 + + + + create tx file + 建立交易档案(tx file) + + + sign tx file + 签署交易档案(tx file) + + + submit tx file + 提交交易档案(tx file) + + + + All + + + + + Sign tx file + + + + + Submit tx file + + + + + Rescan spent + 重新扫描付款状态 + + + + + + Error + 错误 + + + + Error: + 错误: + + + + + Information + 信息 + + + + Sucessfully rescanned spent outputs + 扫描付款状态的结果 + + + + + Please choose a file + 请选择一个档案 + + + + Can't load unsigned transaction: + 无法加载未签署的交易: + + + + +Number of transactions: + +交易数量: + + + + +Transaction #%1 + +交易 #%1 + + + + +Recipient: + +接收方: + + + + +payment ID: + +付款 ID: + + + + +Amount: + +金额: + + + + +Fee: + +手续费: + + + + +Ringsize: + + + + + Confirmation + 确认 + + + + Can't submit transaction: + 无法送出交易: + + + + Money sent successfully + 已成功完成 Monero 付款 + + + + + Wallet is not connected to daemon. + 钱包没有与区块同步程序(daemon)建立联机。 + + + + Connected daemon is not compatible with GUI. +Please upgrade or connect to another daemon + 已连接的区块同步程序与此GUI钱包不兼容 +请升级区块同步程序或是连接至另一个同步程序 + + + + Waiting on daemon synchronization to finish + 正在等待区块同步程序完成同步 + + + + + + + + or ALL + 或发送全部余额 + + + LOW + 低 + + + MEDIUM + 中 + + + HIGH + 高 + + + Privacy level + 隐私等级 + + + + Transaction cost + 交易所需的花费 + + + <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> Address <font size='2'> ( Type in or select from </font> <a href='#'>Address</a><font size='2'> book )</font> + <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> 地址 <font size='2'> ( 输入地址或从 </font> <a href='#'>Address</a><font size='2'> 簿选择 )</font> + + + + Payment ID <font size='2'>( Optional )</font> + 付款ID <font size='2'>( 可不填 )</font> + + + + 16 or 64 hexadecimal characters + 16 或 64 十六进制字符 + + + Description <font size='2'>( An optional description that will be saved to the local address book if entered )</font> + 标记 <font size='2'>( 选填，将储存在收款地址簿 )</font> + + + SEND + 付款 + + + SWEEP UNMIXABLE + 去除无法混币的金额 + + + + TxKey + + You can verify that a third party made a payment by supplying: + 您可以在此验证第三方的支付，需提供: + + + - the recipient address, + - 接受方的地址, + + + - the transaction ID, + - 该项交易的交易ID + + + - the tx secret key supplied by the sender + - 支付方提供的 tx 密钥 + + + If a payment was made up of several transactions, each transaction must be checked, and the results added + 如果该支付是同时包含数个交易，每一项交易都必须被确认和合并结果 + + + + Verify that a third party made a payment by supplying: + 藉由提供以下信息来验证第三方支付的款项: + + + + - the recipient address + - 接受方的地址 + + + + - the transaction ID + - 交易 ID (transaction ID) + + + + - the secret transaction key supplied by the sender + - 由付款方提供的交易私钥 (secret transaction key) + + + + If a payment had several transactions then each must be checked and the results combined. + 如果该付款包含数个交易，则检查结果将会合并在一起。 + + + + Address + 地址 + + + + Recipient's wallet address + 接受方的钱包地址 + + + + Transaction ID + 交易ID + + + + Paste tx ID + 贴上交易 ID (tx ID) + + + + Paste tx key + 贴上交易密钥 (tx key) + + + + Check + 检查 + + + Transaction ID here + 输入交易ID + + + + Transaction key + 交易密钥 + + + Transaction key here + 输入交易密钥 + + + CHECK + 检查 + + + + WizardConfigure + + + We’re almost there - let’s just configure some Monero preferences + 就快完成了 - Monero 还需要一点设定 + + + + Kickstart the Monero blockchain? + 开始同步 Monero 区块链? + + + It is very important to write it down as this is the only backup you will need for your wallet. You will be asked to confirm the seed in the next screen to ensure it has copied down correctly. + 这是唯一需要备份的钱包信息，请一定要抄写下来。你将会在下一个步骤被要求确认这份种子码以确保你有妥善备份它。 + + + + It is very important to write it down as this is the only backup you will need for your wallet. + 请注意这是唯一需要备份的钱包信息，请一定要抄写下来。 + + + + Enable disk conservation mode? + 启动硬盘节约模式? + + + + Disk conservation mode uses substantially less disk-space, but the same amount of bandwidth as a regular Monero instance. However, storing the full blockchain is beneficial to the security of the Monero network. If you are on a device with limited disk space, then this option is appropriate for you. + 硬盘节约模式能精简区块链的数据而减少硬盘空间的使用量，但保存完整的区块链能加强 Monero 网络的安全性，当您需要在容量较小的硬盘上执行，那么这个功能就很适合您，此功能对于网络带宽的用量没有影响。 + + + + Allow background mining? + 允许程序在背景挖矿吗? + + + + Mining secures the Monero network, and also pays a small reward for the work done. This option will let Monero mine when your computer is on mains power and is idle. It will stop mining when you continue working. + 启动挖矿功能可让 Monero 的系统网络更加安全，且在工作完成时获得小额的奖励金。这个功能只会在计算机插着电源并且闲置时才会自动启动，当您继续使用计算机后即会停止挖矿。 + + + + WizardCreateViewOnlyWallet + + + Create view only wallet + 创建只读钱包(view only wallet) + + + + WizardCreateWallet + + A new wallet has been created for you + 已为您建立一个新的钱包 + + + This is the 25 word mnemonic for your wallet + 这是钱包的25字辅助记忆种子码 + + + + Create a new wallet + 创建一个新的钱包 + + + + WizardDonation + + + Monero development is solely supported by donations + Monero的开发完全由赞助所支持 + + + + Enable auto-donations of? + 启动在每一笔交易金额的? + + + + % of my fee added to each transaction + % 比例自动赞助 + + + + For every transaction, a small transaction fee is charged. This option lets you add an additional amount, as a percentage of that fee, to your transaction to support Monero development. For instance, a 50% autodonation take a transaction fee of 0.005 XMR and add a 0.0025 XMR to support Monero development. + 在每一笔交易中 Monero 系统都会收取小额的手续费，而这个选项则是让你可以增加额外的金额赞助 Monero 的开发，比例以当次交易的手续费计算，譬如 50% 的自动赞助将会从0.005 XMR的手续费算出 0.0025 XMR 的金额赞助给 Monero 开发团队。 + + + + Allow background mining? + 允许程序在背景挖矿吗? + + + + Mining secures the Monero network, and also pays a small reward for the work done. This option will let Monero mine when your computer is on mains power and is idle. It will stop mining when you continue working. + 启动挖矿功能可让 Monero 的网络更加安全，且在工作完成时获得小额的奖励金。这个功能只会在计算机插着电源并且闲置时才会自动启动，当您继续使用计算机后即会停止挖矿。 + + + + WizardFinish + + + + + Enabled + 启用 + + + + + + Disabled + 停用 + + + + Language + 语言 + + + Account name + 账户名称 + + + Seed + 种子码 + + + + Wallet name + 钱包名称 + + + + Backup seed + 备份种子码(seed) + + + + Wallet path + 钱包位置 + + + + Daemon address + 区块同步程序(daemon)位置 + + + + Testnet + 连接到测试用网络 + + + + Restore height + 指定区块高度 + + + + New wallet details: + 新钱包详细信息: + + + + Don't forget to write down your seed. You can view your seed and change your settings on settings page. + 请别忘记写下您的种子码，您随时可以在设定里查看钱包的种子码。 + + + + You’re all set up! + 您已完成所有设定! + + + An overview of your Monero configuration is below: + 以下是您的 Monero 钱包设定总览: + + + You’re all setup! + 您已完成所有设定! + + + + WizardMain + + + A wallet with same name already exists. Please change wallet name + 已有重复的钱包名称存在，请更改钱包名称 + + + + Non-ASCII characters are not allowed in wallet path or account name + 钱包的路径与名称不得使用非ASCII字符 + + + + USE MONERO + 使用 MONERO + + + + Create wallet + 创建钱包 + + + + Success + 成功 + + + + The view only wallet has been created. You can open it by closing this current wallet, clicking the "Open wallet from file" option, and selecting the view wallet in: +%1 + 只读钱包已被建立，您可以在关闭此钱包后使用"以档案开启钱包"的选项，并选择以下的档案: +%1 + + + + Error + 错误 + + + + Abort + 中止 + + + + WizardManageWalletUI + + This is the name of your wallet. You can change it to a different name if you’d like: + 这是您的钱包名称，您也可以自己更改成想要的名称: + + + Restore height + 回复区块高度 + + + + Wallet name + 钱包名称 + + + + Restore from seed + 从种子码(seed)回复 + + + + Restore from keys + 从密钥回复 + + + + Account address (public) + 帐户地址 (公开) + + + + View key (private) + View key (私钥) + + + + Spend key (private) + Spend key (私钥) + + + + Restore height (optional) + 回复特定区块高度 (可选) + + + + Your wallet is stored in + 您的钱包被储存在 + + + + Please choose a directory + 请选择一个目录 + + + + WizardMemoTextInput + + It is very important to write it down as this is the only backup you will need for your wallet. You will be asked to confirm the seed in the next screen to ensure it has copied down correctly. + 这是您唯一需要备份的钱包信息，请一定要抄写下来。您将会在下一个后被要求确认这份种子码以确保你有妥善备份它。 + + + + Enter your 25 word mnemonic seed + 请输入您的 25字种子码(seed) + + + + This seed is <b>very</b> important to write down and keep secret. It is all you need to backup and restore your wallet. + 这种子码是<b>非常重要</b>必须要抄写下来并妥善保管的信息，这是你回复钱包时所需要的所有信息。 + + + + WizardOptions + + + Welcome to Monero! + 欢迎使用 Monero！ + + + + Please select one of the following options: + 请于下面选择您需要的功能: + + + + Create a new wallet + 创建一个新的钱包 + + + + Restore wallet from keys or mnemonic seed + 从密钥或种子码回复钱包 + + + + Open a wallet from file + 以档案开启钱包 + + + + Custom daemon address (optional) + 自定义区块同步程序位置 (可选) + + + This is my first time, I want to create a new account + 这是我第一次使用，我想要创建一个新的账户 + + + I want to recover my account from my 25 word seed + 我想要从一组25字种子码回复我的账户 + + + I want to open a wallet from file + 我想要从档案开启钱包 + + + Please setup daemon address below. + 请在下面设定区块链同步程序的位置。 + + + + Testnet + 连接到测试用网络 + + + + WizardPassword + + Now that your wallet has been created, please set a password for the wallet + 您的新钱包已被建立，请为它设定一组密码 + + + Now that your wallet has been restored, please set a password for the wallet + 您的钱包已被成功回复，请为它设定一组密码 + + + Note that this password cannot be recovered, and if forgotten you will need to restore your wallet from the mnemonic seed you were just given<br/><br/> + Your password will be used to protect your wallet and to confirm actions, so make sure that your password is sufficiently secure. + 请注意:这个密码无法被回复，如果忘记了这组密码，您将需要用刚刚获得的辅助记忆种子码重新回复您的钱包<br/><br/> + 密码将会用来保护您的钱包或确认重要的动作，所以请确认您的密码强度足够安全。 + + + Password + 密码 + + + Confirm password + 确认密码 + + + + + Give your wallet a password + 为您的钱包加上一个密码 + + + + <br>Note: this password cannot be recovered. If you forget it then the wallet will have to be restored from its 25 word mnemonic seed.<br/><br/> + <b>Enter a strong password</b> (using letters, numbers, and/or symbols): + + + + Note: this password cannot be recovered. If you forget it then the wallet will have to be restored from its 25 word mnemonic seed.<br/><br/> + <b>Enter a strong password</b> (using letters, numbers, and/or symbols): + 注意: 这个密码无法被回复，如果您忘记了这个密码，则必须使用25字种子码回复您的钱包。<br/><br/> + <b>请输入足够强度的密码</b> (使用字母, 数字或可搭配符号): + + + + WizardPasswordUI + + + Password + 密码 + + + + Confirm password + 确认密码 + + + + WizardRecoveryWallet + + We're ready to recover your account + 已准备好回复您的钱包 + + + Please enter your 25 word private key + 请输入您的 25字种子码 + + + + Restore wallet + 回复钱包 + + + + WizardWelcome + + Welcome + 欢迎 + + + + Welcome to Monero! + 欢迎使用 Monero！ + + + + Please choose a language and regional format. + 请选择您的语言和地区格式。 + + + + main + + + + + + + + + + Error + 错误 + + + + Couldn't open wallet: + 无法开启这个钱包: + + + Synchronizing blocks %1 / %2 + 同步区块中 %1 / %2 + + + + Unlocked balance (waiting for block) + 可用余额 (等待区块确认中) + + + + Unlocked balance (~%1 min) + 可用余额 ( ~%1 分钟) + + + + Unlocked balance + 可用余额 + + + + Waiting for daemon to start... + 等待区块同步程序启动中... + + + + Waiting for daemon to stop... + 等待区块同步程序停止中... + + + + Daemon failed to start + 区块同步程序启动失败 + + + + Please check your wallet and daemon log for errors. You can also try to start %1 manually. + 请查看您的钱包与区块同步程序日志获得错误讯息，您亦可尝试手动重新启动%1。 + + + + Can't create transaction: Wrong daemon version: + 无法建立此项交易: 区块同步程序版本错误: + + + + + Can't create transaction: + 无法建立此项交易: + + + + + + + No unmixable outputs to sweep + 没有无法混币的输出需要去除 + + + + + Confirmation + 确认 + + + + + Please confirm transaction: + + 请确认此项交易: + + + + + +Address: + +地址: + + + + +Payment ID: + +付款 ID: + + + + + + +Amount: + + +金额: + + + + + +Fee: + 手续费: + + + + + +Ringsize: + + + + + This address received %1 monero, with %2 confirmation(s). + 这个地址收入了 %1 monero，并通过 %2 次的确认。 + + + + Daemon is running + 区块同步程序正在执行中 + + + + Daemon will still be running in background when GUI is closed. + 区块同步程序将在钱包接口关闭后于背景执行。 + + + + Stop daemon + 停止区块同步程序 + + + + New version of monero-wallet-gui is available: %1<br>%2 + 有可用的新版本 Monero 钱包: %1<br>%2 + + + + +Mixin: + + +混币数量: + + + + +Number of transactions: + +交易数量: + + + + + +Description: + + +描述: + + + + Amount is wrong: expected number from %1 to %2 + 金额错误: 数字需介于 %1 到 %2 之间 + + + + Insufficient funds. Unlocked balance: %1 + 资金不足，总余额仅有: %1 + + + + Couldn't send the money: + 无法付款: + + + + Information + 信息 + + + + Money sent successfully: %1 transaction(s) + %1 笔款项已成功发送 + + + + Transaction saved to file: %1 + 已储存 %1 笔交易至档案 + + + + Payment check + 付款确认 + + + + This address received %1 monero, but the transaction is not yet mined + 这个地址已收到 %1 monero币，但这笔交易尚未被矿工确认 + + + This address received %1 monero, with %2 confirmations + 这个地址已收到 %1 monero币，并已经过 %2 次的确认 + + + + This address received nothing + 这个地址没有收到款项 + + + + Balance (syncing) + 总余额 (同步中) + + + + Balance + 总余额 + + + + Please wait... + 请稍后... + + + + Program setup wizard + 程序设定精灵 + + + + Monero + Monero + + + + send to the same destination + 付款至相同地址 + + + diff --git a/translations/monero-core_zh.ts b/translations/monero-core_zh_TW.ts similarity index 100% rename from translations/monero-core_zh.ts rename to translations/monero-core_zh_TW.ts From db306ca8232249416050e1a92be866d968d1bced Mon Sep 17 00:00:00 2001 From: Lafudoci Date: Fri, 24 Mar 2017 13:06:21 +0800 Subject: [PATCH 51/63] refine the artwork of zh_TW lang flag --- lang/flags/taiwan.png | Bin 4100 -> 9085 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/lang/flags/taiwan.png b/lang/flags/taiwan.png index 4610dbfb6aff3b9727e173368435e4cc3202ef8e..a9dc99cac667851a85c08eef81ce208b6b607aff 100644 GIT binary patch literal 9085 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 literal 4100 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 Date: Fri, 24 Mar 2017 15:48:30 +0900 Subject: [PATCH 52/63] japanese translation: added necessary newlines --- translations/monero-core_ja.ts | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/translations/monero-core_ja.ts b/translations/monero-core_ja.ts index f1d139aa..91acb73c 100644 --- a/translations/monero-core_ja.ts +++ b/translations/monero-core_ja.ts @@ -1527,25 +1527,29 @@ Number of transactions: - 取引の数: + +取引の数: Transaction #%1 - 取引 #%1 + +取引 #%1 Recipient: - 受取人: + +受取人: payment ID: - ペイメントID: + +ペイメントID: @@ -1593,7 +1597,8 @@ Ringsize: Connected daemon is not compatible with GUI. Please upgrade or connect to another daemon - 接続しているデーモンにGUIとの互換性がありません。デーモンを更新するか、他のデーモンに接続してください。 + 接続しているデーモンにGUIとの互換性がありません。 +デーモンを更新するか、他のデーモンに接続してください。 @@ -2285,14 +2290,18 @@ Please upgrade or connect to another daemon Amount: - 金額: + + +金額: Ringsize: - リングサイズ: + + +リングサイズ: @@ -2394,14 +2403,17 @@ Fee: Number of transactions: - 取引の数: + +取引の数: Description: - 説明: + + +説明: From 9c4c34d502e7179964061c6af72470e37f9257af Mon Sep 17 00:00:00 2001 From: Jaquee Date: Thu, 23 Mar 2017 22:54:35 +0100 Subject: [PATCH 53/63] Use new fee multipliers after v5 fork requires #1915 --- main.qml | 3 +++ pages/Transfer.qml | 25 ++++++++++++++++++++++++- src/libwalletqt/Wallet.cpp | 5 +++++ src/libwalletqt/Wallet.h | 3 +++ src/libwalletqt/WalletManager.cpp | 10 ---------- src/libwalletqt/WalletManager.h | 2 -- 6 files changed, 35 insertions(+), 13 deletions(-) diff --git a/main.qml b/main.qml index 3e3faf2d..267461d1 100644 --- a/main.qml +++ b/main.qml @@ -286,6 +286,9 @@ ApplicationWindow { leftPanel.networkStatus.connected = status leftPanel.progressBar.visible = (status === Wallet.ConnectionStatus_Connected) && !daemonSynced + // Update fee multiplier dropdown on transfer page + middlePanel.transferView.updatePriorityDropdown(); + // If wallet isnt connected and no daemon is running - Ask if(!walletInitialized && status === Wallet.ConnectionStatus_Disconnected && !daemonManager.running(persistentSettings.testnet)){ daemonManagerDialog.open(); diff --git a/pages/Transfer.qml b/pages/Transfer.qml index ef3a1f3b..d84f26d5 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -195,6 +195,17 @@ Rectangle { ListElement { column1: qsTr("High (x166 fee)") ; column2: ""; priority: PendingTransaction.Priority_High } } + // Priorites after v5 + ListModel { + id: priorityModelV5 + + ListElement { column1: qsTr("Low (x1 fee)") ; column2: ""; priority: 1} + ListElement { column1: qsTr("Default (x4 fee)") ; column2: ""; priority: 2 } + ListElement { column1: qsTr("Medium (x20 fee)") ; column2: ""; priority: 3 } + ListElement { column1: qsTr("High (x166 fee)") ; column2: ""; priority: 4 } + + } + StandardDropdown { id: priorityDropdown anchors.top: transactionPriority.bottom @@ -206,7 +217,6 @@ Rectangle { shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" pressedColor: "#FF4304" - dataModel: priorityModel z: 1 } @@ -700,6 +710,19 @@ Rectangle { console.log("transfer page loaded") updateStatus(); updateMixin(); + updatePriorityDropdown() + } + + function updatePriorityDropdown() { + // Use new fee multipliers after v5 fork + if (typeof currentWallet != "undefined" && currentWallet.useForkRules(5)) { + priorityDropdown.dataModel = priorityModelV5; + priorityDropdown.currentIndex = 1 + } else { + priorityDropdown.dataModel = priorityModel; + priorityDropdown.currentIndex = 0 + } + } //TODO: Add daemon sync status diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp index 96990050..6f397766 100644 --- a/src/libwalletqt/Wallet.cpp +++ b/src/libwalletqt/Wallet.cpp @@ -587,6 +587,11 @@ bool Wallet::rescanSpent() return m_walletImpl->rescanSpent(); } +bool Wallet::useForkRules(quint8 required_version, quint64 earlyBlocks) const +{ + return m_walletImpl->useForkRules(required_version,earlyBlocks); +} + Wallet::Wallet(Monero::Wallet *w, QObject *parent) : QObject(parent) , m_walletImpl(w) diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h index e947ecd0..187df16f 100644 --- a/src/libwalletqt/Wallet.h +++ b/src/libwalletqt/Wallet.h @@ -228,6 +228,9 @@ public: // Rescan spent outputs Q_INVOKABLE bool rescanSpent(); + // check if fork rules should be used + Q_INVOKABLE bool useForkRules(quint8 version, quint64 earlyBlocks) const; + // TODO: setListenter() when it implemented in API signals: // emitted on every event happened with wallet diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp index 95fa0b77..ad77ad48 100644 --- a/src/libwalletqt/WalletManager.cpp +++ b/src/libwalletqt/WalletManager.cpp @@ -338,16 +338,6 @@ QString WalletManager::checkUpdates(const QString &software, const QString &subd return QString::fromStdString(std::get<1>(result) + "|" + std::get<2>(result) + "|" + std::get<3>(result) + "|" + std::get<4>(result)); } -bool WalletManager::useForkRules(quint8 required_version) const -{ - quint64 earliest_height; - quint8 version; - m_pimpl->hardForkInfo(version, earliest_height); - return version >= required_version; -} - - - WalletManager::WalletManager(QObject *parent) : QObject(parent) { m_pimpl = Monero::WalletManagerFactory::getWalletManager(); diff --git a/src/libwalletqt/WalletManager.h b/src/libwalletqt/WalletManager.h index 592c7920..01afc064 100644 --- a/src/libwalletqt/WalletManager.h +++ b/src/libwalletqt/WalletManager.h @@ -136,8 +136,6 @@ public: Q_INVOKABLE bool saveQrCode(const QString &, const QString &) const; Q_INVOKABLE QString checkUpdates(const QString &software, const QString &subdir) const; - Q_INVOKABLE bool useForkRules(quint8 version) const; - signals: void walletOpened(Wallet * wallet); From 46d573e69762859ac638d2ea3ad3df85183614d7 Mon Sep 17 00:00:00 2001 From: Roy Jacobs Date: Fri, 24 Mar 2017 11:49:45 +0100 Subject: [PATCH 54/63] Dutch translation already updated for PR/596 --- translations/monero-core_nl.ts | 220 +++++++++++++++++---------------- 1 file changed, 116 insertions(+), 104 deletions(-) diff --git a/translations/monero-core_nl.ts b/translations/monero-core_nl.ts index cdaed3f0..930465b9 100644 --- a/translations/monero-core_nl.ts +++ b/translations/monero-core_nl.ts @@ -121,12 +121,12 @@ - + Available Balance: Beschikbaar saldo: - + 2324.9239845 @@ -1043,8 +1043,12 @@ + Connect + Verbinden + + Save - Opslaan + Opslaan @@ -1381,7 +1385,7 @@ Privacy niveau - + Transaction cost Transactiekosten @@ -1415,77 +1419,80 @@ + Low (x1 fee) Laag (x1 vergoeding) + Medium (x20 fee) Gemiddeld (x20 vergoeding) + High (x166 fee) Hoog (x166 vergoeding) - + <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> Address <font size='2'> ( Paste in or select from </font> <a href='#'>Address book</a><font size='2'> )</font> <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> Adres <font size='2'> ( Vul in of selecteer uit het </font> <a href='#'>Addresboek</a><font size='2'> )</font> - + QR Code QR-Code - + Resolve Oplossen - + No valid address found at this OpenAlias address Geen geldig adres gevonden onder dit OpenAlias adres - + Address found, but the DNSSEC signatures could not be verified, so this address may be spoofed Adres gevonden, maar DNSSEC handtekeningen konden niet geverifiëerd worden, dus het adres kan mogelijk gespoofed en dus ongeldig zijn - + No valid address found at this OpenAlias address, but the DNSSEC signatures could not be verified, so this may be spoofed Geen geldig adres gevonden onder het opgegeven OpenAlias adres, en de DNSSEC handtekeningen konden niet geverifiëerd worden, dus het adres kan mogelijk gespoofed en dus ongeldig zijn - - + + Internal error Interne fout - + No address found Geen adres gevonden - + Description <font size='2'>( Optional )</font> Omschrijving <font size='2'>( Optioneel )</font> - + Saved to local wallet history Wordt opgeslagen in de lokale portomonnee historie - + Send Verzenden - + Show advanced options Laat geavanceerde opties zien @@ -1494,13 +1501,13 @@ Privacy niveau (ring grootte 5) - + Sweep Unmixable Lastig te vertalen deze. Misschien heeft iemand anders een beter idee dan, "Schoonvegen van niet-te-mengen posten" - + create tx file Maak TX bestand @@ -1518,133 +1525,138 @@ Alles - + + Default (x4 fee) + Normaal (x4 vergoeding) + + + Sign tx file Signeer TX bestand - + Submit tx file Verzend TX bestand - + Rescan spent Doorzoek uitgaven - - - + + + Error Fout - + Error: Fout: - - + + Information Informatie - + Sucessfully rescanned spent outputs Met success the uitgaven doorzocht - - + + Please choose a file Kies een bestand - + Can't load unsigned transaction: Het laden van de niet-ondertekende transactie, is mislukt: - + Number of transactions: Aantal transacties: - + Transaction #%1 Transactie #%1 - + Recipient: Ontvanger: - + payment ID: Betaal-ID: - + Amount: Bedrag: - + Fee: Vergoeding: - + Ringsize: Ringgrootte: - + Confirmation Bevestiging - + Can't submit transaction: Kan transactie niet insturen: - + Money sent successfully Geld is succesvol verstuurd - - + + Wallet is not connected to daemon. Portemonnee is niet verbonden met de node. - + Connected daemon is not compatible with GUI. Please upgrade or connect to another daemon Verbonden node is niet compatibel met de GUI. Graag upgraden of verbinden met een andere node - + Waiting on daemon synchronization to finish Wachten totdat de synchronisatie met de node compleet is @@ -1653,12 +1665,12 @@ Graag upgraden of verbinden met een andere node <style type='text/css'>a {text-decoration: none; color: #FF6C3C; font-size: 14px;}</style> Adres <font size='2'> ( Vul in of selecteer uit het </font> <a href='#'>Adres</a><font size='2'> boek )</font> - + Payment ID <font size='2'>( Optional )</font> Betaal-ID <font size='2'>( Optioneel )</font> - + 16 or 64 hexadecimal characters 16 of 64 hexadecimale karakters @@ -2201,19 +2213,19 @@ Graag upgraden of verbinden met een andere node main - - - - - - - - + + + + + + + + Error Fout - + Couldn't open wallet: Portemonnee kan niet geopend worden: @@ -2222,30 +2234,30 @@ Graag upgraden of verbinden met een andere node Blokken synchroniseren %1 / %2 - + Can't create transaction: Wrong daemon version: Transactie kan niet worden aangemaakt: Verkeerde node-versie: - - - - + + + + No unmixable outputs to sweep Lastig te vertalen, iemand een beter idéé? Er zijn geen niet te mengen bedragen gevonden die opgeschoond kunnen worden - - + + Please confirm transaction: Gelieve de transactie te bevestigen: - - + + Amount: @@ -2262,14 +2274,14 @@ Mixin: Menging: - + Number of transactions: Aantal transacties: - + Description: @@ -2278,22 +2290,22 @@ Description: Omschrijving: - + Amount is wrong: expected number from %1 to %2 Verkeerd bedrag: bedrag tussen %1 en %2 verwacht - + Money sent successfully: %1 transaction(s) Geld succesvol verzonden: %1 transactie(s) - + Payment check Betaling controleren - + This address received %1 monero, but the transaction is not yet mined Dit adres heeft %1 monero ontvangen, maar de transactie is nog niet verwerkt @@ -2302,66 +2314,66 @@ Omschrijving: Dit adres heeft %1 monero ontvangen, met %2 bevestigingen - + This address received nothing Dit adres heeft niets ontvangen - - + + Can't create transaction: Transactie kan niet worden aangemaakt: - + Unlocked balance (waiting for block) Beschikbaar saldo (wachten op blok) - + Unlocked balance (~%1 min) Beschikbaar saldo (~%1 min) - + Unlocked balance Beschikbaar saldo - + Waiting for daemon to start... Wachten tot de node gestart is... - + Waiting for daemon to stop... Wachten tot de node gestopt is... - + Daemon failed to start Het starten van de node is mislukt - + Please check your wallet and daemon log for errors. You can also try to start %1 manually. Graag u portomonnee en node log controleren op fouten. U kunt ook proberen %1 handmatig te starten. - - + + Confirmation Bevestiging - + Address: Adres: - + Payment ID: @@ -2374,15 +2386,15 @@ Amount: Bedrag: - - + + Fee: Vergoeding: - + Ringsize: @@ -2391,77 +2403,77 @@ Ringsize: Ringgrootte: - + Insufficient funds. Unlocked balance: %1 onvoldoende fondsen. Beschikbaar saldo: %1 - + Couldn't send the money: Geld kon niet worden verstuurd: - + Information Informatie - + Transaction saved to file: %1 Transactie opgeslagen naar bestand: %1 - + This address received %1 monero, with %2 confirmation(s). Did adres heeft %1 monero ontvangen, met %2 bevestiging(en). - + Balance (syncing) Saldo (synchroniseren) - + Balance Saldo - + Please wait... Even geduld alstublieft… - + Program setup wizard Installatie-assistent - + Monero Monero - + send to the same destination naar hetzelfde adres verzenden - + Daemon is running Node is gestart - + Daemon will still be running in background when GUI is closed. Node zal nog steeds in de achtergrond blijven lopen als de GUI gesloten is. - + Stop daemon Stop node - + New version of monero-wallet-gui is available: %1<br>%2 Nieuwe monero-wallet-gu versiei is beschikbaar: %1<br>%2 From bd2a336c5e50b166e37c6cc804c114937169561b Mon Sep 17 00:00:00 2001 From: dnaleor Date: Fri, 24 Mar 2017 13:56:45 +0100 Subject: [PATCH 55/63] Update monero-core_eo.ts --- translations/monero-core_eo.ts | 360 +++++++++++++++++---------------- 1 file changed, 181 insertions(+), 179 deletions(-) diff --git a/translations/monero-core_eo.ts b/translations/monero-core_eo.ts index 49d7c490..42dcf74d 100644 --- a/translations/monero-core_eo.ts +++ b/translations/monero-core_eo.ts @@ -21,7 +21,7 @@ QRCODE - + QR kodo @@ -36,12 +36,12 @@ <b>Payment ID</b><br/><br/>A unique user name used in<br/>the address book. It is not a<br/>transfer of information sent<br/>during the transfer - <b>Betaal-ID</b><br/><br/>Unika uzantnomo uzita en<br/>la adresaron. Tio informo ne senditos a<br/>kun la transakcio + <b>Paga-ID</b><br/><br/>Unika uzantnomo uzita en<br/>la adresaron. Tio informo ne senditos a<br/>kun la transakcio Paste 64 hexadecimal characters - + Alguu 64 deksesumajn signojn @@ -56,27 +56,27 @@ Give this entry a name or description - + Donu nomon aŭ priskribon al ĉi tiu enigo Add - + Aldonu Error - Eraro + Eraro Invalid address - + Nevalida adreso Can't create entry - + Neeblas krei enigon Description <font size='2'>(Local database)</font> @@ -84,7 +84,7 @@ ADD - ALDONU + ALDONU Payment ID @@ -136,7 +136,7 @@ Close - + Fermu @@ -161,17 +161,17 @@ Starting Monero daemon in %1 seconds - + Komencado de la demono en %1 sekundoj Start daemon (%1) - + Demonkomencado (%1) Use custom settings - + Uzu proprajn agordojn @@ -255,7 +255,7 @@ Filter - + Filtru Incremental search @@ -355,17 +355,17 @@ (%1/10 confirmations) - + (%1/10 konfirmoj) UNCONFIRMED - + NEKONFIRMITA PENDING - + OKAZONTE @@ -446,12 +446,12 @@ Address book - + Adresaron B - + B @@ -461,27 +461,27 @@ Advanced - + Sperta D - + D Mining - + Minado M - + M Check payment - + Kontrolu pagon @@ -491,7 +491,7 @@ I - + I @@ -501,7 +501,7 @@ E - + E @@ -517,17 +517,17 @@ Unlocked Balance: - Disponebla Saldo: + Disponebla Saldo: - Balance - Saldo + BalanceSaldo Unlocked Balance - + Disponebla saldo @@ -535,87 +535,87 @@ Solo mining - + Propra minado (only available for local daemons) - + (nur disponeblas al lokaj demonoj) Mining with your computer helps strengthen the Monero network. The more that people mine, the harder it is for the network to be attacked, and every little bit helps.<br> <br>Mining also gives you a small chance to earn some Monero. Your computer will create hashes looking for block solutions. If you find a block, you will get the associated reward. Good luck! - + La minado kun via komputilo sekurigas la Monerreto. Se pli da homoj minus, la reto iĝus malpli atakebla. Ĉio gravas. <br> <br>Vi havas malgrandan ŝancon ricevi rekompenco en Monero. Via komputilo kreos haketojn dum serĉi bloksolvojn. Se vi trovas blokon, vi recivos la asociitan rekompencon. Bonŝancon! CPU threads - + CPU fadenoj (optional) - + (malnepre) Background mining (experimental) - + Fona minado (eksperimenta) Enable mining when running on battery - + Ŝalti la minadon kiam uzantas baterion Manage miner - + Adminitru minilon Start mining - + Komencu la minadon Error starting mining - + Eraro dum komenci la minadon Couldn't start mining.<br> - + Neeblis komenci la minadon Mining is only available on local daemons. Run a local daemon to be able to mine.<br> - + La minado nur disponeblas en lokaj demonoj. Lanĉu lokan demonon por ebligi la minadon Stop mining - + Haltigi la minadon Status: not mining - + Stato: ne minado Mining at %1 H/s - + Minante al %1 H/s Not mining - + Ne minado Status: - + Stato: @@ -633,7 +633,7 @@ Synchronizing - + Sinkronigado @@ -691,17 +691,17 @@ Low - + Malalta Medium - + Meza High - + Alta @@ -713,12 +713,12 @@ Establishing connection... - + Starigi konekton... Blocks remaining: %1 - + Restantaj blokoj: %1 @@ -954,7 +954,7 @@ Create view only wallet - + Krei nulegebla monujon @@ -988,17 +988,17 @@ Show status - + Montru statuson Daemon startup flags - + Demonaj startflagoj (optional) - + (malnepra) @@ -1008,17 +1008,17 @@ Login (optional) - + Ensalutu (malnepra) Username - + Uzantnomo Password - Pasvorto + Pasvorto @@ -1028,17 +1028,17 @@ Layout settings - + Aspektagordoj Custom decorations - + Propraj dekoracioj Log level - + Lognivelo @@ -1048,22 +1048,22 @@ Version - + Versio GUI version: - + GUI versio: Embedded Monero version: - + Enkorpigita Monera versio Wallet mnemonic seed - + Mnemonika monujsemo @@ -1108,29 +1108,29 @@ Sign - + Subskribu Please choose a file to sign - + Bonvolu elekti dosieron por subskribi Select - + Slektu Verify - + Kontrolu Please choose a file to verify - + Bonvolu elekti dosieron por kontroli @@ -1202,32 +1202,32 @@ Low (x1 fee) - + Malalta (x1 kosto) Medium (x20 fee) - + Meza (x20 kosto) High (x166 fee) - + Alta (x166 kosto) All - + ĈIUJ Sent - + Sendu Received - + Ricevu @@ -1235,22 +1235,22 @@ <b>Copy address to clipboard</b> - + <b>Kopiu adreson al tondejo</b> <b>Send to same destination</b> - + <b>Sendu al la sama celo</b> <b>Find similar transactions</b> - + <b>Serĉu por similaj transakcioj</b> <b>Remove from address book</b> - + <b>Forigu adreson de adresaro</b> @@ -1258,22 +1258,22 @@ Payment ID - Paga-ID + Paga-ID Date - Dato + Dato Block height - + Blokalteco Amount - Kvanto + Kvanto @@ -1293,17 +1293,17 @@ Normal - + Normala Medium - + Meza High - + Alta @@ -1311,12 +1311,12 @@ OpenAlias error - + OpenAlias eraro Privacy level (ringsize %1) - + Nivelo de privateco @@ -1336,22 +1336,22 @@ All - + Ĉiuj Low (x1 fee) - + Malalta (x1 kosto) Medium (x20 fee) - + Meza (x20 kosto) High (x166 fee) - + Alta (x166 kosto) @@ -1361,185 +1361,186 @@ QR Code - + QR kodo Resolve - + Solvu No valid address found at this OpenAlias address - + Neniu valida Adreso trovitas al ĉi tiu OpenAlias adreso Address found, but the DNSSEC signatures could not be verified, so this address may be spoofed - + Adreso trovitas, sed la DNSSEC subskribojn nekontroleblitas, do la adreso eblas mistifikita No valid address found at this OpenAlias address, but the DNSSEC signatures could not be verified, so this may be spoofed - + Neniu valida Adreso trovitas al ĉi tiu OpenAlias adreso, sed la DNSSEC subskribojn nekontroleblitas, do la adreso eblas mistifikita Internal error - + Interna eraro No address found - + Ne adreso trovitas Description <font size='2'>( Optional )</font> - + Priskribo <font size='2'>( Malnepra )</font> Saved to local wallet history - + Konservita al loka monujhistorio Send - Sendu + Sendu Show advanced options - + Montru spertajn agordojn Transaction cost - + Transakcia kosto Sweep Unmixable - + Balau Nemikseblojn create tx file - + Kreu tr dosieron Sign tx file - + Subskribu tr dosieron Submit tx file - + Sendu tr dosieron Rescan spent - + Reskanu elspezitojn Error - Eraro + Eraro Error: - + Eraro: Information - Informo + Informo Sucessfully rescanned spent outputs - + Sukcese reskanis la elspezitajn eligojn Please choose a file - + Bonvolu elekti dosieron Can't load unsigned transaction: - + Neeblis ŝargi nesubskribitan transakcion: Number of transactions: - + kvanto de transakcioj: Transaction #%1 - + Transakcio #%1 Recipient: - + Ricevanto: payment ID: - + Paga ID: Amount: - + Kvanto: Fee: - + Kosto: Ringsize: - + Ringgrandeco: Confirmation - Konfirmo + Konfirmo Can't submit transaction: - + Neeblas sendi transakcion: Money sent successfully - + Sukcese mono senditas Connected daemon is not compatible with GUI. Please upgrade or connect to another daemon - + Konektita demone ne kongruas kun GUI. +Bonvolu plibonigi aŭ konekti al alia demono LOW @@ -1657,7 +1658,7 @@ Please upgrade or connect to another daemon If a payment had several transactions then each must be checked and the results combined. - + Se pago havis plurajn transakciojn, ĉiu kontrolitos kaj la rezultoj kombinitos. @@ -1738,7 +1739,7 @@ Please upgrade or connect to another daemon Mining secures the Monero network, and also pays a small reward for the work done. This option will let Monero mine when your computer is on mains power and is idle. It will stop mining when you continue working. - La minado sekurigas la Monerreto kaj vi ricevas rekompenceto por la laboro. Tio ĉi opcio ŝaltos la minadon kiam via komputilo uzas la kurentprovizon kaj estas senokupa. La minado haltos kiam vi daŭrigi uzi la komputilon. + La minado sekurigas la Monerreton kaj vi ricevas rekompenceton por la laboro. Tio ĉi opcio ŝaltos la minadon kiam via komputilo uzas la kurentprovizon kaj estas senokupa. La minado haltos kiam vi daŭrigi uzi la komputilon. @@ -1746,7 +1747,7 @@ Please upgrade or connect to another daemon Create view only wallet - + Kreu nurlegeblan monujon @@ -1762,7 +1763,7 @@ Please upgrade or connect to another daemon Create a new wallet - + Kreu novan monujon @@ -1830,12 +1831,12 @@ Please upgrade or connect to another daemon Wallet name - + Monujnomo Backup seed - + Bakupsemo @@ -1901,28 +1902,28 @@ Please upgrade or connect to another daemon Create wallet - + Kreu monujon Success - + Sukcese The view only wallet has been created. You can open it by closing this current wallet, clicking the "Open wallet from file" option, and selecting the view wallet in: %1 - + La nurlegebla monujo kreitas. Vi povas malfermi ĝin se vi fermas la aktualan monujon kaj vi klakas la ""Malfermu monujon de dosiero" opcion, kaj vi elektas la nurlegeblan monujon en: %1 Error - Eraro + Eraro Abort - + Ĉesigiu @@ -1942,37 +1943,37 @@ Please upgrade or connect to another daemon Wallet name - + Monujnomo Restore from seed - + Restaŭru de semo Restore from keys - + Restaŭru de ŝlosiloj Account address (public) - + Monujadreso View key (private) - + Legŝlosilo (privata) Spend key (private) - + Elspezŝlisilo (privata) Restore height (optional) - + Restaŭralteco (malnepra) @@ -1998,12 +1999,12 @@ Please upgrade or connect to another daemon Enter your 25 word mnemonic seed - + Enigu vian 25 mnemonikan vortsemon This seed is <b>very</b> important to write down and keep secret. It is all you need to backup and restore your wallet. - + Ĝi <b>gravegas</b> noti vian semon. Ĝi estas la sola bakupo por restaŭri vian monujon. @@ -2021,22 +2022,22 @@ Please upgrade or connect to another daemon Create a new wallet - + Kreu novan monujon Restore wallet from keys or mnemonic seed - + Restaŭru monujon de ŝlosilojn aŭ mnemonikan semon Open a wallet from file - + Malferm monujon de dosiero Custom daemon address (optional) - + Propra demonadreso (malnepra) This is my first time, I want to create a new account @@ -2094,7 +2095,8 @@ Please upgrade or connect to another daemon <br>Note: this password cannot be recovered. If you forget it then the wallet will have to be restored from its 25 word mnemonic seed.<br/><br/> <b>Enter a strong password</b> (using letters, numbers, and/or symbols): - + <br>Sciu ke tion ĉi pasvorto nerestaŭreblas kaj se vi forgesus ĝin, vi devus restaŭri vian monujon el la 25 mnemoniksemo.<br/><br/> + <b>Certiĝu ke via pasvorto sekuras sufiĉe.</b> (uzu literojn, numerojn kaj/aŭ simbolojn): @@ -2102,12 +2104,12 @@ Please upgrade or connect to another daemon Password - Pasvorto + Pasvorto Confirm password - Konfirmu pasvorton + Konfirmu pasvorton @@ -2123,7 +2125,7 @@ Please upgrade or connect to another daemon Restore wallet - + Restaŭru monujon @@ -2135,7 +2137,7 @@ Please upgrade or connect to another daemon Welcome to Monero! - Bonvenon al Monero! + Bonvenon al Monero! @@ -2237,17 +2239,17 @@ Please upgrade or connect to another daemon Unlocked balance (waiting for block) - + Disponebla saldo (atendante bloko) Unlocked balance (~%1 min) - + Disponebla saldo (~%1 min) Unlocked balance - Disponebla saldo + Disponebla saldo @@ -2262,12 +2264,12 @@ Please upgrade or connect to another daemon Daemon failed to start - + Demono malsukcesis komenci Please check your wallet and daemon log for errors. You can also try to start %1 manually. - + Bonvolu kontroli vian monujon kaj demonlogon por eraroj. Vi povas ankaŭ provu komenci %1 permane. @@ -2286,13 +2288,13 @@ Please upgrade or connect to another daemon Address: - + Adreso: Payment ID: - + Paga ID: @@ -2300,54 +2302,54 @@ Payment ID: Amount: - + Kvanto: Fee: - + Kosto: Ringsize: - + Ringgrandeco: Number of transactions: - + Kvanto de transakcioj: Description: - + Priskribo: Daemon is running - + Demono funkcias Daemon will still be running in background when GUI is closed. - + La demono funkciantos en la fono kiam vi fermas la GUI. Stop daemon - Haltigi demonon + Haltigi demonon New version of monero-wallet-gui is available: %1<br>%2 - + Nova versio de monero-wallet-gui disponeblas: %1<br>%2 Address: @@ -2379,22 +2381,22 @@ Description: Transaction saved to file: %1 - + Transakcio konservitas al dosiero %1 This address received %1 monero, with %2 confirmation(s). - + Tio adreso ricevis %1 monero, kun %2 da konfirmo(j) Balance (syncing) - + Saldo (Sinkronigante) Balance - Saldo + Saldo @@ -2409,7 +2411,7 @@ Description: Monero - + Monero From 8719caad1bd73924e64b44e9efee130af4b3dea6 Mon Sep 17 00:00:00 2001 From: Lafudoci Date: Sat, 25 Mar 2017 00:32:49 +0800 Subject: [PATCH 56/63] fix locale string --- lang/languages.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/languages.xml b/lang/languages.xml index 7681eb3d..7309a6a8 100644 --- a/lang/languages.xml +++ b/lang/languages.xml @@ -29,6 +29,6 @@ List of available languages for your wallet's seed: - - + + From b2827ca1dd03de71c9907d7cab04d933a33c000f Mon Sep 17 00:00:00 2001 From: Lafudoci Date: Sat, 25 Mar 2017 00:33:49 +0800 Subject: [PATCH 57/63] fix filenames --- monero-wallet-gui.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro index b6ea22a3..2035ea6f 100644 --- a/monero-wallet-gui.pro +++ b/monero-wallet-gui.pro @@ -291,8 +291,8 @@ TRANSLATIONS = \ # English is default language, no explicit translation file $$PWD/translations/monero-core_nl.ts \ # Dutch $$PWD/translations/monero-core_pl.ts \ # Polish $$PWD/translations/monero-core_ru.ts \ # Russian - $$PWD/translations/monero-core_zh_CN.ts \ # Chinese (Simplified-China) - $$PWD/translations/monero-core_zh_TW.ts \ # Chinese (Traditional-Taiwan) + $$PWD/translations/monero-core_zh-cn.ts \ # Chinese (Simplified-China) + $$PWD/translations/monero-core_zh-tw.ts \ # Chinese (Traditional-Taiwan) CONFIG(release, debug|release) { DESTDIR = release/bin From 84c8f790b639905d117f8071142a44dfe323cb7a Mon Sep 17 00:00:00 2001 From: Lafudoci Date: Sat, 25 Mar 2017 00:35:17 +0800 Subject: [PATCH 58/63] Rename monero-core_zh_CN.ts to monero-core_zh-cn.ts --- translations/{monero-core_zh_CN.ts => monero-core_zh-cn.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename translations/{monero-core_zh_CN.ts => monero-core_zh-cn.ts} (100%) diff --git a/translations/monero-core_zh_CN.ts b/translations/monero-core_zh-cn.ts similarity index 100% rename from translations/monero-core_zh_CN.ts rename to translations/monero-core_zh-cn.ts From 61266ca17e7eda46241ba96dbb1bb76e08d9c7a5 Mon Sep 17 00:00:00 2001 From: Lafudoci Date: Sat, 25 Mar 2017 00:35:43 +0800 Subject: [PATCH 59/63] Rename monero-core_zh_TW.ts to monero-core_zh-tw.ts --- translations/{monero-core_zh_TW.ts => monero-core_zh-tw.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename translations/{monero-core_zh_TW.ts => monero-core_zh-tw.ts} (100%) diff --git a/translations/monero-core_zh_TW.ts b/translations/monero-core_zh-tw.ts similarity index 100% rename from translations/monero-core_zh_TW.ts rename to translations/monero-core_zh-tw.ts From 5969284de83329cbf2d3a7d976058c17802af9c5 Mon Sep 17 00:00:00 2001 From: dnaleor Date: Fri, 24 Mar 2017 23:02:41 +0100 Subject: [PATCH 60/63] Update monero-core_eo.ts --- translations/monero-core_eo.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/translations/monero-core_eo.ts b/translations/monero-core_eo.ts index 42dcf74d..94525940 100644 --- a/translations/monero-core_eo.ts +++ b/translations/monero-core_eo.ts @@ -26,7 +26,7 @@ 4... - + 4... @@ -521,7 +521,7 @@ - BalanceBalance Saldo @@ -1688,7 +1688,7 @@ Bonvolu plibonigi aŭ konekti al alia demono Check - + Kontrolu @@ -2089,7 +2089,7 @@ Bonvolu plibonigi aŭ konekti al alia demono Give your wallet a password - + Donu pasvorton al via monujo @@ -2282,7 +2282,7 @@ Bonvolu plibonigi aŭ konekti al alia demono Please confirm transaction: - + Bonvolu konfirmu transakcion: From 7c5cf985b56065c272c09535a5fbb2fcbd656a5e Mon Sep 17 00:00:00 2001 From: Jaquee Date: Fri, 24 Mar 2017 23:10:44 +0100 Subject: [PATCH 61/63] enable esperanto --- lang/languages.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/languages.xml b/lang/languages.xml index 4d1f7faa..de329823 100644 --- a/lang/languages.xml +++ b/lang/languages.xml @@ -16,7 +16,7 @@ List of available languages for your wallet's seed: - + From d85dfa4fae2cbedefcd3015d3639c94f1d6fbf54 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Fri, 24 Mar 2017 23:48:49 +0100 Subject: [PATCH 62/63] enable french seeds --- lang/languages.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/languages.xml b/lang/languages.xml index 4d1f7faa..74dfdd27 100644 --- a/lang/languages.xml +++ b/lang/languages.xml @@ -16,10 +16,10 @@ List of available languages for your wallet's seed: - + - + From c3ae7f8c80051ce1587ea1ff04230be22e193150 Mon Sep 17 00:00:00 2001 From: dnaleor Date: Sat, 25 Mar 2017 04:16:19 +0100 Subject: [PATCH 63/63] Update monero-core_eo.ts some additions (forgot to translate some strings) --- translations/monero-core_eo.ts | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/translations/monero-core_eo.ts b/translations/monero-core_eo.ts index 94525940..74de068a 100644 --- a/translations/monero-core_eo.ts +++ b/translations/monero-core_eo.ts @@ -26,7 +26,7 @@ 4... - 4... + 4... @@ -46,7 +46,7 @@ Description <font size='2'>(Optional)</font> - + Priskribo <font size='2'>(Malnepra)</font> @@ -141,7 +141,7 @@ command + enter (e.g help) - + komanda + eniga klavo (ekz. helpu) @@ -441,7 +441,7 @@ Testnet - Testreto + Testreto @@ -555,7 +555,7 @@ (optional) - (malnepre) + (malnepra) @@ -791,12 +791,12 @@ 16 hexadecimal characters - + 16 deksesumaj signoj Clear - + Vakigu @@ -806,7 +806,7 @@ Generate payment ID for integrated address - + Generu pagan ID-on por integrita adreso ReadOnly wallet integrated address displayed here @@ -815,17 +815,17 @@ Save QrCode - + Konservu QR-kodon Failed to save QrCode to - + Malsukcesis konservi QR-kodon Save As - + Konservu Kiel @@ -844,7 +844,7 @@ Amount to receive - + Kvanto por ricevi @@ -1688,7 +1688,7 @@ Bonvolu plibonigi aŭ konekti al alia demono Check - Kontrolu + Kontrolu @@ -1866,7 +1866,7 @@ Bonvolu plibonigi aŭ konekti al alia demono Don't forget to write down your seed. You can view your seed and change your settings on settings page. - + Ne forgesu noti vian semon. Vi povas vidi vian semon kaj ŝanĝi viajn agordojn en la agorda paĝo. An overview of your Monero configuration is below: @@ -2089,7 +2089,7 @@ Bonvolu plibonigi aŭ konekti al alia demono Give your wallet a password - Donu pasvorton al via monujo + Donu pasvorton al via monujo