diff --git a/LICENSE b/LICENSE index def1a05..281d399 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,619 @@ -Copyright 2018 adityapk + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + Preamble -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. diff --git a/README.md b/README.md index 73e3496..6349bc6 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,11 @@ This is experimental software under active development! SilentDragon contacts a few different external websites to get various bits of data. + * coingecko.com for price data API * explorer.myhush.org for explorer links * dexstats.info for address utilities + * wormhole.myhush.org for Wormhole services This means your IP address is known to these servers. Enable Tor setting in SilentDragon to prevent this, or better yet, use TAILS: https://tails.boum.org/ diff --git a/build.sh b/build.sh index 13d215d..ca0b809 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,8 @@ #!/bin/bash -# Copyright 2019 The Hush Developers +# Copyright 2019-2020 The Hush Developers +# Released under the GPLv3 +set -e UNAME=$(uname) if [ "$UNAME" == "Linux" ] ; then @@ -17,11 +19,13 @@ VERSION=$(cat src/version.h |cut -d\" -f2) echo "Compiling SilentDragon $VERSION with $JOBS threads..." CONF=silentdragon.pro -set -e qbuild () { - qmake $CONF CONFIG+=debug - #lupdate $CONF - #lrelease $CONF + qmake $CONF -spec linux-clang CONFIG+=debug + make -j$JOBS +} + +qbuild_release () { + qmake $CONF -spec linux-clang CONFIG+=release make -j$JOBS } @@ -33,6 +37,8 @@ elif [ "$1" == "linguist" ]; then elif [ "$1" == "cleanbuild" ]; then make clean qbuild +elif [ "$1" == "release" ]; then + qbuild_release else qbuild fi diff --git a/hush-cli b/hush-cli index efa1840..bf45110 100755 --- a/hush-cli +++ b/hush-cli @@ -2,10 +2,20 @@ # Copyright (c) 2019 Hush developers # set working directory to the location of this script +# readlink -f does not always exist DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR +DIR="$( cd "$( dirname "$( readlink "${BASH_SOURCE[0]}" )" )" && pwd )" +cd $DIR NAME=HUSH3 CLI=${KOMODOCLI:-./komodo-cli} -$CLI -ac_name=$NAME "$@" +if [ -f $CLI ]; then + $CLI -ac_name=$NAME "$@" +else + # We prefix our binary when installed + # system wide on Debain system, to prevent clashes + CLI=hush-komodo-cli + $CLI -ac_name=$NAME "$@" +fi diff --git a/res/libsodium/buildlibsodium.sh b/res/libsodium/buildlibsodium.sh index 0eddd9d..b3ae248 100755 --- a/res/libsodium/buildlibsodium.sh +++ b/res/libsodium/buildlibsodium.sh @@ -1,32 +1,64 @@ #!/bin/bash +# Copyright (c) 2019-2020 The Hush developers +# Released under the GPLv3 + +VERSION=1.0.18 +LIB="libsodium" +DIR="$LIB-$VERSION" +FILE="$DIR.tar.gz" +URL=https://github.com/MyHush/libsodium/releases/download/${VERSION}/${FILE} +SHA=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1 # First thing to do is see if libsodium.a exists in the res folder. If it does, then there's nothing to do -if [ -f res/libsodium.a ]; then +if [ -f res/${LIB}.a ]; then exit 0 fi -echo "Building libsodium" +echo "Building $LIB" + +# Go into the libsodium directory +cd res/$LIB +if [ ! -f $FILE ]; then + curl -LO $URL +fi + +echo "$SHA $FILE" | shasum -a 256 --check +# TWO SPACES or sadness sometimes: +# https://unix.stackexchange.com/questions/139891/why-does-verifying-sha256-checksum-with-sha256sum-fail-on-debian-and-work-on-u +echo "$SHA $FILE" | shasum -a 256 --check --status +if [ $? -ne 0 ]; then + FOUNDSHA=$(shasum -a 256 $FILE) + echo "SHA256 mismatch on $FILE!" + echo "$FOUNDSHA did not match $SHA . Aborting..." + exit 1 +fi -# Go into the lib sodium directory -cd res/libsodium -if [ ! -f libsodium-1.0.16.tar.gz ]; then - curl -LO https://download.libsodium.org/libsodium/releases/libsodium-1.0.16.tar.gz +if [ ! -d $DIR ]; then + tar xf $FILE fi -if [ ! -d libsodium-1.0.16 ]; then - tar xf libsodium-1.0.16.tar.gz +# Try to use full core count to build +if [ "$UNAME" == "Linux" ] ; then + JOBS=$(nproc) +elif [ "$UNAME" == "FreeBSD" ] ; then + JOBS=$(nproc) +elif [ "$UNAME" == "Darwin" ] ; then + JOBS=$(sysctl -n hw.ncpu) +else + JOBS=4 fi # Now build it -cd libsodium-1.0.16 +cd $DIR LIBS="" ./configure make clean +echo "Building $LIB with $JOBS cores..." if [[ "$OSTYPE" == "darwin"* ]]; then - make CFLAGS="-mmacosx-version-min=10.11" CPPFLAGS="-mmacosx-version-min=10.11" -j4 + make CFLAGS="-mmacosx-version-min=10.11" CPPFLAGS="-mmacosx-version-min=10.11" -j$JOBS else - make -j4 + make -j$JOBS fi cd .. # copy the library to the parents's res/ folder -cp libsodium-1.0.16/src/libsodium/.libs/libsodium.a ../ +cp $DIR/src/libsodium/.libs/libsodium.a ../ diff --git a/res/silentdragon_de.qm b/res/silentdragon_de.qm index 75018f8..9600219 100644 Binary files a/res/silentdragon_de.qm and b/res/silentdragon_de.qm differ diff --git a/res/silentdragon_de.ts b/res/silentdragon_de.ts index c5adf1f..d45536d 100644 --- a/res/silentdragon_de.ts +++ b/res/silentdragon_de.ts @@ -147,8 +147,8 @@ - - + + Memo Nachricht hinzufügen @@ -175,7 +175,7 @@ - + Miner Fee Gebühr @@ -205,52 +205,82 @@ Alle Adressen ansehen - + + Market + Markt + + + + <html><head/><body><p align="center"><span style=" font-weight:600;">Hush Market Information</span></p></body></html> + <html><head/><body><p align="center"><span style=" font-weight:600;">Hush Markt Information</span></p></body></html> + + + + Market Cap + Marktkapitalisierung + + + + 24H Volume + 24 Stunden Volumen + + + Local Services Lokaler Service - + Longest Chain Blockhöhe des Netzwerks - + Wallet Transactions - + + Chain Transactions + + + + E&xit &Beenden - + + &Report a bug on Github + + + + &Send Duke Feedback &Sende Duke Feedback - + &Hush Discord Discord von &Hush - + &Hush Website &Hush Homepage - + Pay HUSH &URI... Hush Zahlungs &URI - + Request HUSH... Fordere Hush an... - + Validate Address Bestätigte Adresse @@ -293,7 +323,7 @@ - + Export Private Key Privaten Key exportieren @@ -307,118 +337,125 @@ Transaktionen - + hushd Hush Daemon - + You are currently not mining Sie minen momentan nicht - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + Loading... Lade... - + Block height Blöckhöhe - + Notarized Hash Beglaubigter Hash - + Notarized txid Beglaubigte txid - + Notarized Lag Beglaubigungs Verzögerung - + KMD Version KMD Version - + Protocol Version Protokoll Version - + Version Version - + P2P Port P2P Port - + RPC Port RPC Port - + Client Name Client Name - + Next Halving Nächstes Halving - + Network solution rate Netzwerk Leistung - + Connections Verbindungen - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + | | @@ -433,22 +470,22 @@ Sichtbare Adresse (Öffentlich, mit Metadaten) - + &File &Datei - + &Help &Hilfe - + &Apps &Apps - + &Edit &Bearbeiten @@ -457,17 +494,17 @@ &Beenden - + &About &Über - + &Settings &Einstellungen - + Ctrl+P Ctrl+P @@ -476,88 +513,88 @@ &Spenden - + Check github.com for &updates Besuche github.com für weitere &updates - + Sapling &turnstile Sicherheits &Hub - + Ctrl+A, Ctrl+T Ctrl+A, Ctrl+T - + &Import private key &Importiere einen private Key - + &Export all private keys &Exportiere alle private Keys - + &z-board.net &z-board.net - + Ctrl+A, Ctrl+Z Ctrl+A, Ctrl+Z - + Address &book Adress &Buch - + Ctrl+B Ctrl+B - + &Backup wallet.dat &Backup der wallet.dat - - + + Export transactions Exportiere Transaktionen - + Connect mobile &app Verbinde die Smartphone &App - + Ctrl+M Ctrl+M - + Tor configuration is available only when running an embedded hushd. Die Tor konfiguration ist nur möglich, wenn der integrierte hushd client läuft. - + You're using an external hushd. Please restart hushd with -rescan Sie benutzen einen externen hushd clienten. Bitte starten Sie hushd mit folgendem Parameter neu: -rescan - + You're using an external hushd. Please restart hushd with -reindex Sie benutzen einen externen hushd clienten. Bitte starten Sie hushd mit folgendem Parameter neu: -reindex - + Enable Tor Tor aktivieren @@ -566,7 +603,7 @@ Die Verbindung über Tor wurde aktiviert. Um Tor zu benutzen starten Sie bitte Silentdragon neu. - + Disable Tor Tor deaktivieren @@ -603,7 +640,7 @@ Die Keys wurden erfolgreich importiert. Es dauert einige Minuten um die Blockchain zu scannen. Bis dahin ist die Funktion von Silentdragon eingeschränkt - + Private key import rescan finished Scan beendet @@ -636,191 +673,197 @@ Die Keys werden in das verbundene hushd Node importiert - - Restart + + Theme Change - - Please restart SilentDragon to have the theme apply + + + This change can take a few seconds. - + + Currency Change + + + + Connection over Tor has been enabled. To use this feature, you need to restart SilentDragon. Die Verbindung über Tor wurde aktiviert. Um Tor zu benutzen starten Sie bitte Silentdragon neu. - + Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart SilentDragon. Die Verbindung über Tor wurde deaktiviert. Um die Verbingung zu Tor endgültig zu beenden, starten Sie bitte Silentdragon neu. - + SilentDragon needs to restart to rescan/reindex. SilentDragon will now close, please restart SilentDragon to continue Silentdragon muss für den Rescan/Reindex neu gestartet werden. Silentdragon wird nun schließen, bitte starten Sie Silentdragon neu um fortzufahren - + Restart SilentDragon SilentDragon Neustart - + Some feedback about SilentDragon or Hush... Rückmeldung zu Silentdragon oder Hush - + Send Duke some private and shielded feedback about Sende Duke ein anonymes Feedback über - + or SilentDragon oder Silentdragon - + Enter Address to validate Geben Sie die Adresse ein, die überprüft werden soll - + Transparent or Shielded Address: Sichtbare oder verborgene Adresse: - + Paste HUSH URI Füge HUSH URI ein - + Error paying Hush URI Fehler bei der Bezahl HUSH URI - + URI should be of the form 'hush:<addr>?amt=x&memo=y Die URI sollte im folgendem Format sein: 'hush:<Adresse>?Betrag=x&Nachricht=y - + Please paste your private keys here, one per line Bitte füge deinen Privat key, für eine sichere oder transparente Adresse ein. Ein Key pro Zeile - + The keys will be imported into your connected Hush node Die Keys werden in das verbundene hushd Node importiert - + The keys were imported! It may take several minutes to rescan the blockchain. Until then, functionality may be limited Die Keys wurden erfolgreich importiert. Es dauert einige Minuten um die Blockchain zu scannen. Bis dahin ist die Funktion von Silentdragon eingeschränkt - + Error Fehler - + Error exporting transactions, file was not saved Fehler beim exportieren der Transaktion. Die Datei wurde nicht gespeichert. - + No wallet.dat Fehlende Wallet.dat - + Couldn't find the wallet.dat on this computer Ich kann die wallet.dat auf Ihrem Computer nicht finden - + You need to back it up from the machine hushd is running on Die Sicherung geht nur auf dem System, wo hushd aktiv läuft - + Backup wallet.dat Sicherung der wallet.dat - + Couldn't backup Konnte keine Sicherung erstellen - + Couldn't backup the wallet.dat file. Ich konnte die wallet.dat nicht sichern - + You need to back it up manually. Sie müssen die Sicherung manuell durchführen - + These are all the private keys for all the addresses in your wallet Dies sind alle private Keys, für jede Adresse ihres Wallets - + Private key for Private Key für - + Save File Datei speichern - + Unable to open file Kann Datei nicht öffnen - - + + Copy address Adresse kopieren - - - + + + Copied to clipboard In die Zwischenablage kopiert - + Get private key Private Key anzeigen - + Shield balance to Sapling Guthaben auf sichere Adresse (Sapling) verschieben - - + + View on block explorer Im Block explorer anzeigen - + Address Asset Viewer Alle Adressen anschauen - + Convert Address Adresse konvertieren @@ -829,42 +872,47 @@ Zu Sapling übertragen - + Copy txid Kopiere Transaktions ID - + + Copy block explorer link + + + + View Payment Request Zahlungsaufforderung ansehen - + View Memo Nachricht ansehen - + Reply to Antworten an - + Created new t-Addr Neue transparente Adresse erstellen - + Copy Address Adresse kopieren - + Address has been previously used Diese Adresse wurde schon einmal benutzt - + Address is unused Adresse wird nicht genutzt @@ -924,34 +972,38 @@ doesn't look like a z-address Das sieht nicht wie eine sichere Adresse aus - + Change from Änderungen von - + Current balance : aktuelles Guthaben : - + Balance after this Tx: Guthaben nach dieser Transaktion: - + Transaction Error Transaktions Fehler - + Computing transaction: - + + From Address is Invalid! + + + From Address is Invalid - Sender Adresse ist ungültig + Sender Adresse ist ungültig @@ -1207,57 +1259,57 @@ If all else fails, please run hushd manually. MB bei - + This may take several hours, grab some popcorn Dies kann einige Stunden dauern, machen Sie sich einen Kaffee - + There was an error! : Es gab einen Fehler! : - + Downloading blocks Lade Blöcke herunter - + Block height Blockhöhe - + Syncing Synchronisiere - + Connected Verbunden - + testnet: Testnetz: - + Connected to hushd Verbunden zu Hushd - + transaction computing. - + Please enhance your calm and wait for SilentDragon to exit - + Waiting for hushd to exit, y'all @@ -1266,27 +1318,27 @@ If all else fails, please run hushd manually. Hushd hat keine Verbindung zu anderen Teilnehmern - + There was an error connecting to hushd. The error was Es gab einen Fehler bei dem versuch Hushd zu verbinden. Der Fehler war - + Transaction - + The transaction with id Transaktion mit der ID - + failed. The error was gescheitert. Der Fehler war - + failed gescheitert @@ -1295,7 +1347,7 @@ If all else fails, please run hushd manually. Transaktion - + hushd has no peer connections! Network issues? Hushd hat keine Verbindung zu anderen Teilnehmern! Haben Sie Netzwerkprobleme? @@ -1304,24 +1356,24 @@ If all else fails, please run hushd manually. Erzeuge Transaktion. Dies kann einige Minuten dauern. - + Update Available Update verfügbar - + A new release v%1 is available! You have v%2. Would you like to visit the releases page? Eine neue Version v%1 ist verfügbar! Sie benutzen momentan v%2. Möchten Sie unsere Seite besuchen? - + No updates available Keine updates verfügbar - + You already have the latest release v%1 Sie haben bereits die aktuellste Version v%1 @@ -1344,26 +1396,26 @@ Would you like to visit the releases page? Hushd fehler - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. Eine manuelle Verbinung wurde angefragt, aber nicht konfiguriert. Bitte tragen Sie den Host/Port und Benutzer/Passwort im Einstellungsmenü ein. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. Konnte keine Verbindung zum konfigurierten hushd aufbauen. Bitte tragen Sie den Host/Port und Benutzer/Passwort im Einstellungsmenü ein. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Authentifizierung fehlgeschlagen. Der Benutzername / Passwort wurde nicht akzeptiert. Versuche Sie die Daten im Einstellunsgmenü zu ändern. - + Your hushd is starting up. Please wait. Hushd startet. Bitte warten @@ -1372,14 +1424,14 @@ Please set the host/port and user/password in the Edit->Settings menu.Dies kann einige Stunden dauern - - + + Connection Error Verbindungsfehler - - + + Transaction Error Transaktionsfehler @@ -1388,8 +1440,8 @@ Please set the host/port and user/password in the Edit->Settings menu.Beim Senden der Transaktion trat ein Fehler auf. Der Fehler war: - - + + No Connection Keine Verbindung @@ -1468,9 +1520,8 @@ Please set the host/port and user/password in the Edit->Settings menu.Lösche Beschriftung - Tx submitted (right click to copy) txid: - Transaktion übermittelt (Rechtsklick zum kopieren der ID) Transaktions ID: + Transaktion übermittelt (Rechtsklick zum kopieren der ID) Transaktions ID: Locked funds @@ -1517,12 +1568,12 @@ You either have unconfirmed funds or the balance is too low for an automatic mig Über das Silentdragon Wurmloch zum Internet verbunden - + Node is still syncing. Ihr Node synchronisert noch - + No addresses with enough balance to spend! Try sweeping funds into one address @@ -1530,6 +1581,11 @@ You either have unconfirmed funds or the balance is too low for an automatic mig No sapling or transparent addresses with enough balance to spend. Nicht genügend Guthaben für diese Transaktion + + + Transaction submitted (right click to copy) txid: + + RecurringDialog @@ -1685,17 +1741,17 @@ You either have unconfirmed funds or the balance is too low for an automatic mig Optionen - + Check github for updates at startup Besuche github.com für weitere &updates - + Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally. Verbinde zum Tor Netzwerk über den SOCKS Proxy auf 127.0.0.1:9050. Bitte beachten Sie, dass sie den Tor Service erst extern installieren müssen. - + Shielded transactions are saved locally and shown in the transactions tab. If you uncheck this, shielded transactions will not appear in the transactions tab. Sichere Transaktionen werden lokal gespeichert, um im Bereich Transaktionen angezeigt zu werden. Wenn Sie dies nicht wünschen können Sie es deaktivieren. @@ -1706,121 +1762,341 @@ You either have unconfirmed funds or the balance is too low for an automatic mig + Local Currency + + + + + AED + + + + + ARS + + + + + AUD + + + + + BDT + + + + + BHD + + + + + BMD + + + + + BRL + + + + + BTC + + + + + CAD + + + + + CHF + + + + + CLP + + + + + CNY + + + + + CZK + + + + + DKK + + + + + EUR + + + + + GBP + + + + + HKD + + + + + HUF + + + + + IDR + + + + + ILS + + + + + INR + + + + + JPY + + + + + KRW + + + + + KWD + + + + + LKR + + + + + PKR + + + + + MXN + + + + + NOK + + + + + NZD + + + + + RUB + + + + + SAR + + + + + SEK + + + + + SGD + + + + + THB + + + + + TRY + + + + + TWD + + + + + UAH + + + + + USD + + + + + VEF + + + + + VND + + + + + XAG + + + + + XAU + + + + + ZAR + + + + default - + blue - + light - + dark - + Connect via Tor Verbindung über Tor - + Connect to github on startup to check for updates Besuche github.com für weitere &updates - + Connect to the internet to fetch HUSH prices Verbinde zum Internet, um den Preis von Hush zu erfahren - - Fetch HUSH / USD prices + + Fetch HUSH prices Hush / USD Preis laden - + Explorer - + Tx Explorer URL - + Address Explorer URL - + Testnet Tx Explorer URL - + Testnet Address Explorer URL - + Troubleshooting Problemlösung - + Reindex Reindex - + Rescan the blockchain for any missing wallet transactions and to correct your wallet balance. This may take several hours. You need to restart SilentDragon for this to take effect Ich überprüfe nun die Blockchain auf fehlende Transaktionen, und werde Änderungen zu Ihrem Wallet hinzufügen. Dies kann einige Stunden dauern. Sie müssen Silentdragon neu starten bevor dies ausgeführt werden kann. - + Rescan Rescan - + Rebuild the entire blockchain from the genesis block, by rescanning all the block files. This may take several hours to days, depending on your hardware. You need to restart SilentDragon for this to take effect Stelle die Blockchain vom Genesis Block wieder her. Dies kann je nach verwendeter Hardware, mehrere Stunden bis Tage dauern. Sie müssen Silentdragon neustarten um fortzuführen. - + Clear History Verlauf löschen - + Remember shielded transactions An sichere Transaktionen erinnern - + Allow custom fees Benutzerdefinierte Gebühren erlauben - + Allow overriding the default fees when sending transactions. Enabling this option may compromise your privacy since fees are transparent. Erlaube die voreingestellte Gebühr beim versenden einer Transaktion zu ändern. Dies könnte Ihre Privatsphäre verletzen, da Gebühren für jeden sichtbar sind. - + Normally, change from t-Addresses goes to another t-Address. Checking this option will send the change to your shielded sapling address instead. Check this option to increase your privacy. Normalerweise werden Änderung von einer transparenten Adresse zu nächsten gesendet. Wählen Sie diese Option, wenn Sie die Änderungen lieber an eine sichere Adresse senden. Dies erhöht ihre Privatsphäre. - + Shield change from t-Addresses to your sapling address Unsichtbare Änderung von Ihrer transparenten Adresse auf eine sichere. diff --git a/res/silentdragon_es.qm b/res/silentdragon_es.qm index e70a770..8deb1dd 100644 Binary files a/res/silentdragon_es.qm and b/res/silentdragon_es.qm differ diff --git a/res/silentdragon_es.ts b/res/silentdragon_es.ts index db65607..140cc2c 100644 --- a/res/silentdragon_es.ts +++ b/res/silentdragon_es.ts @@ -147,8 +147,8 @@ - - + + Memo Memo @@ -175,7 +175,7 @@ - + Miner Fee Cuota Minera @@ -200,47 +200,72 @@ Tipo De Dirección - + + Market + Mercado + + + + <html><head/><body><p align="center"><span style=" font-weight:600;">Hush Market Information</span></p></body></html> + <html><head/><body><p align="center"><span style=" font-weight:600;">Información de Mercado Hush</span></p></body></html> + + + + Market Cap + Capitalización de Mercado + + + + 24H Volume + Volumen de 24 horas + + + Local Services - + Longest Chain - + Wallet Transactions - + + Chain Transactions + + + + &Send Duke Feedback Enviar comentarios de Duke - + &Hush Discord &Hush Discord - + &Hush Website &Hush Sitio web - + Pay HUSH &URI... Pague HUSH &URI ... - + Request HUSH... Solicitar HUSH ... - + Validate Address Validar dirección @@ -283,7 +308,7 @@ - + Export Private Key Exportar Clave Privada @@ -293,68 +318,75 @@ Transacciones - + hushd hushd - + You are currently not mining Actualmente no estas minando - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + Loading... Cargando... - + Block height Altura del bloque - + Network solution rate Rapidez de solución de red - + Connections Conexiones - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + | | @@ -374,92 +406,92 @@ Ver todas las direcciones - + Notarized Hash Hash Notarizado - + Notarized txid Txid Notarizado - + Notarized Lag Lag Notarizado - + KMD Version Versión KMD - + Protocol Version Versión de protocolo - + Version Versión - + P2P Port Puerto P2P - + RPC Port Puerto RPC - + Client Name Nombre del cliente - + Next Halving Siguiente reducción a la mitad - + &File &Archivo - + &Help &Ayuda - + &Apps &Apps - + &Edit &Editar - + E&xit Salir - + &About &Acerca de - + &Settings &Configuración - + Ctrl+P Ctrl+P @@ -468,103 +500,103 @@ &Donar - + Check github.com for &updates Consulte las actualizaciones en github.com - + Sapling &turnstile Sapling &turnstile - + Ctrl+A, Ctrl+T Ctrl+A, Ctrl+T - + &Import private key Importar clave privada - + &Export all private keys Exportar todas las claves privadas - + &z-board.net z-board.net - + Ctrl+A, Ctrl+Z Ctrl+A, Ctrl+Z - + Address &book Directorio - + Ctrl+B Ctrl+B - + &Backup wallet.dat Respaldar wallet.dat - - + + Export transactions exportación de transacciones - + Connect mobile &app Conectar &aplicación móvil - + Ctrl+M Ctrl+M - + Tor configuration is available only when running an embedded hushd. La configuración de Tor solo está disponible cuando se ejecuta un silencio integrado. - + You're using an external hushd. Please restart hushd with -rescan Estás utilizando hushd externo. Reinicie hushd con -rescan - + You're using an external hushd. Please restart hushd with -reindex Estás utilizando hushd externo. Reinicie hushd con -rescan - + Enable Tor Habilitar Tor - + Connection over Tor has been enabled. To use this feature, you need to restart SilentDragon. Se ha habilitado la conexión a través de Tor. Para usar esta función, debe reiniciar SilentDragon. - + Disable Tor Inhabilitar Tor - + Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart SilentDragon. Se ha deshabilitado la conexión a través de Tor. Para desconectarse por completo de Tor, debe reiniciar SilentDragon. @@ -597,27 +629,17 @@ Las claves fueron importadas. Puede que se demore varios minutos en volver a escanear el blockchain. Hasta entonces, la funcionalidad puede ser limitada. - + Private key import rescan finished Importación de clave privada re-escaneada finalizada - + SilentDragon needs to restart to rescan/reindex. SilentDragon will now close, please restart SilentDragon to continue SilentDragon necesita reiniciarse para volver a escanear / reindexar. SilentDragon ahora se cerrará, reinicie SilentDragon para continuar - - Restart - - - - - Please restart SilentDragon to have the theme apply - - - - + Restart SilentDragon reanudar SilentDragon @@ -630,161 +652,177 @@ Las claves serán importadas en su nodo hushd conectado - + + Theme Change + + + + + + This change can take a few seconds. + + + + + Currency Change + + + + Some feedback about SilentDragon or Hush... Algunos comentarios sobre SilentDragon o Hush ... - + Send Duke some private and shielded feedback about Envíe a Duke comentarios privados y protegidos sobre - + or SilentDragon o SilentDragon - + Enter Address to validate Ingrese la dirección para validar - + Transparent or Shielded Address: Dirección transparente o blindada: - + Paste HUSH URI Pegar HUSH URI - + Error paying Hush URI Error al pagar HUSH URI - + URI should be of the form 'hush:<addr>?amt=x&memo=y URI debe tener la forma 'hush:<addr>?amt=x&memo=y - + Please paste your private keys here, one per line Pegue sus claves privadas aquí, una por línea - + The keys will be imported into your connected Hush node Las claves se importarán a su nodo Hush conectado - + The keys were imported! It may take several minutes to rescan the blockchain. Until then, functionality may be limited Las claves se importarán a su nodo Hush conectado - + Error Error - + Error exporting transactions, file was not saved Error al exportar transacciones, el archivo no se guardó - + No wallet.dat Sin wallet.dat - + Couldn't find the wallet.dat on this computer No se pudo encontrar wallet.dat en esta computadora - + You need to back it up from the machine hushd is running on Necesitas hacer una copia de seguridad de la computadora en la que se está ejecutando hushd - + Backup wallet.dat Respaldar wallet.dat - + Couldn't backup No se pudo hacer una copia de seguridad - + Couldn't backup the wallet.dat file. No se pudo hacer copia de seguridad de wallet.dat - + You need to back it up manually. Necesitas hacer una copia de seguridad manualmente. - + These are all the private keys for all the addresses in your wallet Estas son todas las claves privadas para todas las direcciones en tu billetera - + Private key for Clave privada para - + Save File Guardar Archivo - + Unable to open file No es posible abrir el archivo - - + + Copy address Copiar dirección - - - + + + Copied to clipboard Copiado al portapapeles - + Get private key Obtener clave privada - + Shield balance to Sapling Proteger saldo a Sapling - - + + View on block explorer Ver en el explorador de bloques - + Address Asset Viewer Dirección Asset Espectador - + Convert Address Convertir dirección @@ -793,42 +831,47 @@ Migrar a Sapling - + Copy txid Copiar txid - + + Copy block explorer link + + + + View Payment Request Ver solicitud de pago - + View Memo Ver Memo - + Reply to Responder a - + Created new t-Addr Nuevo dirección t-Addr creada - + Copy Address Dirección de copia - + Address has been previously used La dirección ha sido utilizada previamente - + Address is unused Dirección no utilizada @@ -886,34 +929,38 @@ doesn't look like a z-address no parece una direccion z-Addr - + Change from Cambiar de - + Current balance : Saldo actual : - + Balance after this Tx: Balance después de este Tx: - + Transaction Error Error de Transacción - + Computing transaction: - + + From Address is Invalid! + + + From Address is Invalid - Dirección de envio inválida + Dirección de envio inválida @@ -1030,78 +1077,78 @@ doesn't look like a z-address QObject - - + + No Connection Sin Conexión - + Downloading blocks Descargando Bloques - + Block height Altura del bloque - + Syncing Sincronizando - + Connected Conectando - + testnet: testnet: - + Connected to hushd Conectando a hushd - + hushd has no peer connections! Network issues? ¡Hushd no tiene conexiones entre pares! Problemas de red? - + There was an error connecting to hushd. The error was Hubo un error al conectar con hushd. El error fue - + transaction computing. - + Please enhance your calm and wait for SilentDragon to exit - + Waiting for hushd to exit, y'all - + Transaction - + The transaction with id La transacción con id - + failed. The error was falló. El error fue @@ -1110,7 +1157,7 @@ doesn't look like a z-address Tx - + failed falló @@ -1119,12 +1166,12 @@ doesn't look like a z-address tx computando. Esto puede tomar varios minutos. - + Update Available Actualización disponible - + A new release v%1 is available! You have v%2. Would you like to visit the releases page? @@ -1133,12 +1180,12 @@ Would you like to visit the releases page? ¿Te gustaría visitar la página de lanzamientos? - + No updates available No hay actualizaciones disponibles - + You already have the latest release v%1 Ya tienes la última versión v%1 @@ -1259,7 +1306,7 @@ Not starting embedded hushd because --no-embedded was passed MB a - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1268,7 +1315,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1278,13 +1325,13 @@ Por favor, especificar el host/puerta y usario/contraseña en el menú Editar-&g - + There was an error! : ¡Hubo un error! : - - + + Transaction Error Error De Transacción @@ -1319,23 +1366,23 @@ Si todo falla, por favor ejecutar hushd manualmente. error de hushd - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Autenticación fallida. El usario/contraseña que epecificó no fue aceptado por hushd. Intenta cambiarlo en el menu Editar->Configuración. - + Your hushd is starting up. Please wait. Tu hushd se está iniciando. Por favor espera. - + This may take several hours, grab some popcorn Esto puede tomar varias horas, agarra algunas palomitas de maíz - - + + Connection Error Error de conexión @@ -1344,9 +1391,8 @@ Si todo falla, por favor ejecutar hushd manualmente. Hubo un error al enviar la transacción. El error fue: - Tx submitted (right click to copy) txid: - Tx presentado (clic derecho para copiar) txid: + Tx presentado (clic derecho para copiar) txid: Locked funds @@ -1473,7 +1519,7 @@ El saldo es insuficiente para una migración automática. El nodo aún se está sincronizando. - + No addresses with enough balance to spend! Try sweeping funds into one address @@ -1481,6 +1527,11 @@ El saldo es insuficiente para una migración automática. No sapling or transparent addresses with enough balance to spend. Sin sapling o transparentes con saldo suficiente para gastar. + + + Transaction submitted (right click to copy) txid: + + RecurringDialog @@ -1636,17 +1687,17 @@ El saldo es insuficiente para una migración automática. Opciones - + Check github for updates at startup - + Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally. Conéctese a la red Tor a través del proxy SOCKS que se ejecuta en 127.0.0.1:9050. Tenga en cuenta que tendrá que instalar y ejecutar el servicio Tor externamente. - + Shielded transactions are saved locally and shown in the transactions tab. If you uncheck this, shielded transactions will not appear in the transactions tab. Las transacciones protegidas se guardan localmente y se muestran en la pestaña de transacciones. Si desactivas esto, las transacciones protegidas no aparecerán en la pestaña de transacciones. @@ -1657,121 +1708,336 @@ El saldo es insuficiente para una migración automática. + Local Currency + + + + + AED + + + + + ARS + + + + + AUD + + + + + BDT + + + + + BHD + + + + + BMD + + + + + BRL + + + + + CAD + + + + + CHF + + + + + CLP + + + + + CNY + + + + + CZK + + + + + DKK + + + + + EUR + + + + + GBP + + + + + HKD + + + + + HUF + + + + + IDR + + + + + ILS + + + + + INR + + + + + JPY + + + + + KRW + + + + + KWD + + + + + LKR + + + + + PKR + + + + + MXN + + + + + NOK + + + + + NZD + + + + + RUB + + + + + SAR + + + + + SEK + + + + + SGD + + + + + THB + + + + + TRY + + + + + TWD + + + + + UAH + + + + + USD + + + + + VEF + + + + + VND + + + + + XAG + + + + + XAU + + + + + ZAR + + + + default - + blue - + light - + dark - + Connect via Tor Conectar a través de Tor - + Connect to github on startup to check for updates - + Connect to the internet to fetch HUSH prices - - Fetch HUSH / USD prices + + Fetch HUSH prices - + Explorer - + Tx Explorer URL - + Address Explorer URL - + Testnet Tx Explorer URL - + Testnet Address Explorer URL - + Troubleshooting Solución de problemas - + Reindex Reindex - + Rescan the blockchain for any missing wallet transactions and to correct your wallet balance. This may take several hours. You need to restart SilentDragon for this to take effect Vuelva a escanear la cadena de bloques para detectar transacciones de billetera faltantes y para corregir el saldo de su billetera. Esto puede llevar varias horas. Debe reiniciar SilentDragon para que esto surta efecto - + Rescan Reescanear - + Rebuild the entire blockchain from the genesis block, by rescanning all the block files. This may take several hours to days, depending on your hardware. You need to restart SilentDragon for this to take effect Reconstruya toda la cadena de bloques a partir del bloque de génesis, volviendo a escanear todos los archivos de bloque. Esto puede llevar varias horas o días, dependiendo de su hardware. Debe reiniciar SilentDragon para que esto surta efecto - + Clear History Borrar historial - + Remember shielded transactions Recuerde las transacciones protegidas - + Allow custom fees Permitir tarifas personalizadas - + Allow overriding the default fees when sending transactions. Enabling this option may compromise your privacy since fees are transparent. Permite utilizar tarifas no estándar al enviar transacciones. Habilitar esta opción puede reducir su privacidad porque las tarifas son transparentes. - + Normally, change from t-Addresses goes to another t-Address. Checking this option will send the change to your shielded sapling address instead. Check this option to increase your privacy. Normalmente, el vuelto de las t-Addr va a otra t-Addr. Al marcar esta opción, se enviará el vuelto a su dirección protegida. Marcar esta opción para aumentar tu privacidad. - + Shield change from t-Addresses to your sapling address Proteger el vuelto de direcciones t-Addr a su direccion Sapling diff --git a/res/silentdragon_fi.qm b/res/silentdragon_fi.qm index 26737c8..1980737 100644 Binary files a/res/silentdragon_fi.qm and b/res/silentdragon_fi.qm differ diff --git a/res/silentdragon_fi.ts b/res/silentdragon_fi.ts index d82a41c..1836e6c 100644 --- a/res/silentdragon_fi.ts +++ b/res/silentdragon_fi.ts @@ -150,8 +150,8 @@ - - + + Memo Viesti @@ -178,7 +178,7 @@ - + Miner Fee Siirtomaksu @@ -203,63 +203,93 @@ Osoitteen Tyyppi - + + Market + + + + + <html><head/><body><p align="center"><span style=" font-weight:600;">Hush Market Information</span></p></body></html> + + + + + Market Cap + + + + + 24H Volume + + + + Local Services Paikalliset Palvelut - + Longest Chain Pisin Ketju - + Wallet Transactions - + + Chain Transactions + + + + + &Report a bug on Github + + + + &Send Duke Feedback &Lähetä Dukelle Palautetta - + &Hush Discord &Hush Discord - + &Hush Website &Hush Verkkosivusto - - + + Export transactions Vie tapahtumat - + Pay HUSH &URI... Maksa Hush &URI... - + Connect mobile &app Yhdistä Älypuhelin &Sovellukseen - + Ctrl+M Ctrl+M - + Request HUSH... Pyydä Hush... - + Validate Address Validoi Osoite @@ -307,7 +337,7 @@ - + Export Private Key Vie Salainen Avain @@ -317,118 +347,125 @@ Tapahtumat - + hushd hushd - + You are currently not mining Tällä hetkellä et louhi - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + Loading... Ladataan... - + Block height Lohkokorkeus - + Notarized Hash Notarisoitu Hash - + Notarized txid Notarisoitu txid - + Notarized Lag Notarisoitu Viive - + KMD Version KMD Versio - + Protocol Version Protokollan Versio - + Version Versio - + P2P Port P2P Portti - + RPC Port RPC Portti - + Client Name Asiakasohjelman Nimi - + Next Halving Seuraava Puoliintuminen - + Network solution rate Verkon Louhintanopeus - + Connections Yhteydet - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + | | @@ -448,42 +485,42 @@ Suojaamaton Osoite (Kaikille Näkyvä, Metadataa-Vuotava) - + &File &Tiedosto - + &Help &Apua - + &Apps &Sovellukset - + &Edit &Muokkaa - + E&xit &Poistu - + &About &Tietoja - + &Settings &Asetukset - + Ctrl+P Ctrl+P @@ -492,52 +529,52 @@ &Lahjoita - + Check github.com for &updates Tarkista github.com &päivityksien varalta - + Sapling &turnstile Sapling &turnstile - + Ctrl+A, Ctrl+T Ctrl+A, Ctrl+T - + &Import private key &Tuo salainen avain - + &Export all private keys &Vie kaikki salaiset avaimet - + &z-board.net &z-board.net - + Ctrl+A, Ctrl+Z Ctrl+A, Ctrl+Z - + Address &book &Osoitekirja - + Ctrl+B Ctrl+B - + &Backup wallet.dat &Varmuuskopioi wallet.dat @@ -570,7 +607,7 @@ YOUR_TRANSLATION_HERE - + Private key import rescan finished Salaisen avaimen tuonnin uudelleenskannaus valmis @@ -583,216 +620,222 @@ YOUR_TRANSLATION_HERE - - Restart + + Theme Change + + + + + + This change can take a few seconds. - - Please restart SilentDragon to have the theme apply + + Currency Change - + Tor configuration is available only when running an embedded hushd. Tor-verkon konfigurointi on saatavilla vain kun integroitu hushd on käynnissä. - + You're using an external hushd. Please restart hushd with -rescan Käytät ulkopuolista hushd:ia. Ole hyvä ja käynnistä hushd uudelleen -rescan:lla - + You're using an external hushd. Please restart hushd with -reindex Käytät ulkopuolista hushd:ia. Ole hyvä ja käynnistä hushd uudelleen -reindex:lla - + Enable Tor Ota Tor-verkko käyttöön - + Connection over Tor has been enabled. To use this feature, you need to restart SilentDragon. Yhteys Tor-verkon kautta on otettu käyttöön. Jotta voit käyttää tätä ominaisuutta, sinun on käynnistettävä SilentDragon uudelleen. - + Disable Tor Poista Tor-verkko käytöstä - + Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart SilentDragon. Yhteys Tor-verkon kautta on poistettu käytöstä. Katkaistaksesi Tor-verkon kokonaan, sinun on käynnistettävä SilentDragon uudelleen. - + SilentDragon needs to restart to rescan/reindex. SilentDragon will now close, please restart SilentDragon to continue SilentDragon on käynnistettävä uudelleen, jotta voidaan uudelleenskannata/reindeksoida. SilentDragon sulkeutuu nyt, käynnistä SilentDragon uudelleen jatkaaksesi - + Restart SilentDragon Käynnistä SilentDragon uudelleen - + Some feedback about SilentDragon or Hush... Palautetta SilentDragonista tai Hushista... - + Send Duke some private and shielded feedback about Lähetä Dukelle anonyymiä ja yksityistä palautetta - + or SilentDragon tai SilentDragon - + Enter Address to validate Syötä Osoite vahvistaakesi - + Transparent or Shielded Address: Julkinen tai Suojattu Osoite: - + Paste HUSH URI Liitä Hush URI - + Error paying Hush URI Virhe maksaessa Hush URI - + URI should be of the form 'hush:<addr>?amt=x&memo=y URI:n tulisi olla muodossa 'hush:<osoite>?määrä=x&muistio=y - + Please paste your private keys here, one per line Liitä Salaiset Avaimesi tähän, yksi per rivi - + The keys will be imported into your connected Hush node Avaimet tuodaan sinun yhdistettyyn Hush nodeen - + The keys were imported! It may take several minutes to rescan the blockchain. Until then, functionality may be limited Avaimet tuotiin! Lohkoketjun uudelleenskannaus voi kestää useita minuutteja. Siihen asti toiminnallisuus voi olla rajoitettu - + Error Virhe - + Error exporting transactions, file was not saved Virhe tapahtumien viemisessä, tiedostoa ei tallennettu - + No wallet.dat Ei wallet.dat tiedostoa - + Couldn't find the wallet.dat on this computer Tästä tietokoneesta ei löytynyt wallet.dat-tiedostoa - + You need to back it up from the machine hushd is running on Sinun on varmuuskopioitava se siitä koneesta, missä hushd on käynnissä - + Backup wallet.dat Varmuuskopioi wallet.dat - + Couldn't backup Varmuuskopiointi epäonnistui - + Couldn't backup the wallet.dat file. wallet.dat-tiedostoa ei voitu varmuuskopioida. - + You need to back it up manually. Sinun on varmuuskopioitava se manuaalisesti. - + These are all the private keys for all the addresses in your wallet Tässä ovat kaikki lompakkosi osoitteiden salaiset avaimet - + Private key for Salainen avain - + Save File Tallenna Tiedosto - + Unable to open file Tiedostoa ei voitu avata - - + + Copy address Kopioi osoite - - - + + + Copied to clipboard Kopioitu leikepöydälle - + Get private key Näe Salainen avain - + Shield balance to Sapling Siirrä Saldo Suojattuun (Sapling) osoitteeseen - - + + View on block explorer Näytä lohkoketjussa - + Address Asset Viewer Osoitteen Varojen Katselu - + Convert Address Muunna Osoite @@ -801,42 +844,47 @@ Siirrä Saplingiin - + Copy txid Kopioi Tapahtuman ID - + + Copy block explorer link + + + + View Payment Request Näytä Maksu Pyyntö - + View Memo Näytä Viesti - + Reply to Vastaa - + Created new t-Addr Uusi Suojaamaton osoite luotu - + Copy Address Kopioi Osoite - + Address has been previously used Osoitetta on käytetty aiemmin - + Address is unused Osoite on käyttämätön @@ -896,34 +944,38 @@ doesn't look like a z-address Ei näytä suojatulta Zs-osoitteelta - + Change from Vaihda - + Current balance : Tämänhetkinen saldo : - + Balance after this Tx: Saldo tämän tapahtuman jälkeen: - + Transaction Error Tapahtumavirhe - + Computing transaction: - + + From Address is Invalid! + + + From Address is Invalid - Lähettäjän Osoite on Virheellinen + Lähettäjän Osoite on Virheellinen @@ -1168,62 +1220,62 @@ Integroitua hushdia ei käynnistetä, koska --ei-integroitu ohitettiinMT at - + There was an error! : Tapahtui virhe! : - + Downloading blocks Lataa lohkoja - + Block height Lohkokorkeus - + Syncing Synkronoi - + Connected Yhdistetty - + testnet: testiverkko: - + Connected to hushd Yhdistetty hushd - + hushd has no peer connections! Network issues? hushd:lla ei ole vertaisverkko yhteyksiä! Verkko ongelmia? - + There was an error connecting to hushd. The error was Yhdistettäessä hushd:iin tapahtui virhe. Virhe oli - + transaction computing. - + Update Available Päivitys Saatavilla - + A new release v%1 is available! You have v%2. Would you like to visit the releases page? @@ -1232,22 +1284,22 @@ Would you like to visit the releases page? Haluaisitko vierailla lataus-sivulla? - + No updates available Päivityksiä ei ole saatavilla - + You already have the latest release v%1 Sinulla on jo uusin versio v%1 - + Please enhance your calm and wait for SilentDragon to exit - + Waiting for hushd to exit, y'all @@ -1256,22 +1308,22 @@ Haluaisitko vierailla lataus-sivulla? Odotathan, että SilentDragon sulkeutuu - + Transaction - + The transaction with id Tapahtuma tunnuksella - + failed. The error was epäonnistui. Virhe oli - + failed epäonnistui @@ -1302,7 +1354,7 @@ Haluaisitko vierailla lataus-sivulla? hushd virhe - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1311,7 +1363,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1320,29 +1372,29 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Todennus epäonnistui. Hushd ei hyväksynyt määrittämääsi käyttäjänimeä / salasanaa. Yritä muuttaa niitä Muokkaa-> Asetukset-valikosta - + Your hushd is starting up. Please wait. hushd on käynnistymässä. Ole hyvä ja odota. - + This may take several hours, grab some popcorn Tämä voi viedä useita tunteja, nappaa Fazerin sinistä - - + + Connection Error Yhteysvirhe - - + + Transaction Error Tapahtumavirhe @@ -1351,8 +1403,8 @@ Aseta isäntä/portti ja käyttäjänimi/salasana Muokkaa-> Asetukset-valikos YOUR_TRANSLATION_HERE - - + + No Connection Ei Yhteyttä @@ -1431,9 +1483,8 @@ Aseta isäntä/portti ja käyttäjänimi/salasana Muokkaa-> Asetukset-valikos Poista nimi - Tx submitted (right click to copy) txid: - Tapahtuma lähetetty (kopioi hiiren oikealla painikkeella) txid: + Tapahtuma lähetetty (kopioi hiiren oikealla painikkeella) txid: Locked funds @@ -1480,12 +1531,12 @@ Sinulla on joko vahvistamattomia varoja tai saldo on liian pieni automaattiseen Yhdistetty internetin kautta SilentDragon-madonreikäpalveluun - + Node is still syncing. Nodea synkronoidaan edelleen. - + No addresses with enough balance to spend! Try sweeping funds into one address @@ -1493,6 +1544,11 @@ Sinulla on joko vahvistamattomia varoja tai saldo on liian pieni automaattiseen No sapling or transparent addresses with enough balance to spend. Ei Sapling-suojattuja tai suojaamattomia osoitteita, joilla olisi tarpeeksi saldoa kulutettavana. + + + Transaction submitted (right click to copy) txid: + + RecurringDialog @@ -1648,17 +1704,17 @@ Sinulla on joko vahvistamattomia varoja tai saldo on liian pieni automaattiseen Valinnat - + Check github for updates at startup Tarkista päivitykset githubista käynnistyksen yhteydessä - + Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally. Yhdistä Tor-verkkoon SOCKS-välityspalvelimen kautta, joka toimii 127.0.0.1:9050. Huomaa, että sinun on asennettava ja suoritettava Tor-palvelu ulkoisesti. - + Shielded transactions are saved locally and shown in the transactions tab. If you uncheck this, shielded transactions will not appear in the transactions tab. Suojatut zs-tapahtumat tallennetaan paikallisesti ja ne näkyvät tapahtumat välilehdessä. Jos poistat tämän valinnan, suojatut tapahtumat eivät tule näkyviin Tapahtumat-välilehteen. @@ -1669,121 +1725,341 @@ Sinulla on joko vahvistamattomia varoja tai saldo on liian pieni automaattiseen + Local Currency + + + + + AED + + + + + ARS + + + + + AUD + + + + + BDT + + + + + BHD + + + + + BMD + + + + + BRL + + + + + BTC + + + + + CAD + + + + + CHF + + + + + CLP + + + + + CNY + + + + + CZK + + + + + DKK + + + + + EUR + + + + + GBP + + + + + HKD + + + + + HUF + + + + + IDR + + + + + ILS + + + + + INR + + + + + JPY + + + + + KRW + + + + + KWD + + + + + LKR + + + + + PKR + + + + + MXN + + + + + NOK + + + + + NZD + + + + + RUB + + + + + SAR + + + + + SEK + + + + + SGD + + + + + THB + + + + + TRY + + + + + TWD + + + + + UAH + + + + + USD + + + + + VEF + + + + + VND + + + + + XAG + + + + + XAU + + + + + ZAR + + + + default - + blue - + light - + dark - + Connect via Tor Yhdistä Tor-verkon välityksellä - + Connect to github on startup to check for updates Yhdistä githubiin käynnistäessä tarkistaaksesi päivitykset - + Connect to the internet to fetch HUSH prices Yhdistä Internetiin hakeaksesi HUSH hinnat - - Fetch HUSH / USD prices - Hae HUSH / USD hinnat + + Fetch HUSH prices + Hae HUSH hinnat - + Explorer - + Tx Explorer URL - + Address Explorer URL - + Testnet Tx Explorer URL - + Testnet Address Explorer URL - + Troubleshooting Vianetsintä - + Reindex Reindeksoi - + Rescan the blockchain for any missing wallet transactions and to correct your wallet balance. This may take several hours. You need to restart SilentDragon for this to take effect Uudelleenskannaa lohkoketju puuttuvien lompakkotapahtumien varalta ja lompakon saldon korjaamiseksi. Tämä voi viedä useita tunteja. Sinun on käynnistettävä SilentDragon uudelleen, jotta tämä muutos tulee voimaan - + Rescan Uudelleenskannaa - + Rebuild the entire blockchain from the genesis block, by rescanning all the block files. This may take several hours to days, depending on your hardware. You need to restart SilentDragon for this to take effect Rakenna koko lohkoketju uudelleen syntylohkosta alkaen skannaamalla kaikki lohkotiedostot. Tämä voi viedä useista tunneista päiviin laitteistosta riippuen. Sinun on käynnistettävä SilentDragon uudelleen, jotta tämä tulee voimaan - + Clear History Tyhjennä Historia - + Remember shielded transactions Muista suojatut tapahtumat - + Allow custom fees Salli mukautetut siirtomaksut - + Allow overriding the default fees when sending transactions. Enabling this option may compromise your privacy since fees are transparent. Salli oletusmaksujen muokkaaminen tapahtumia lähetettäessä. Tämän vaihtoehdon ottaminen käyttöön voi vaarantaa yksityisyytesi, koska siirtomaksut ovat suojaamattomia. - + Normally, change from t-Addresses goes to another t-Address. Checking this option will send the change to your shielded sapling address instead. Check this option to increase your privacy. Normaalisti vaihtoraha siirtyy suojaamattomasta osoitteesta toiseen suojaamattomaan osoitteeseen. Jos valitset tämän vaihtoehdon, vaihtoraha lähetetään suojattuun Sapling-osoitteeseesi. Valitse tämä vaihtoehto lisätäksesi yksityisyyttäsi. - + Shield change from t-Addresses to your sapling address Suojaa vaihtoraha suojaamattomasta osoitteesta suojattuun Sapling-osoitteeseen diff --git a/res/silentdragon_fr.qm b/res/silentdragon_fr.qm index 4afdba1..0e41203 100644 Binary files a/res/silentdragon_fr.qm and b/res/silentdragon_fr.qm differ diff --git a/res/silentdragon_fr.ts b/res/silentdragon_fr.ts index 90f1d3a..f38518c 100644 --- a/res/silentdragon_fr.ts +++ b/res/silentdragon_fr.ts @@ -147,8 +147,8 @@ - - + + Memo Mémo @@ -175,7 +175,7 @@ - + Miner Fee I replaced this with "transaction fee" which sounds much better in French.. I hope it's correct too.. Frais de minage @@ -201,42 +201,72 @@ Type d'adresse - + + Market + Marché + + + + <html><head/><body><p align="center"><span style=" font-weight:600;">Hush Market Information</span></p></body></html> + <html><head/><body><p align="center"><span style=" font-weight:600;">Informations sur le marché Hush</span></p></body></html> + + + + Market Cap + Capitalisation boursière + + + + 24H Volume + Volume en 24h + + + Local Services Service local - + Longest Chain Chaîne la plus longue - + Wallet Transactions + Transactions sur portefeuille + + + + Chain Transactions + Transactions sur la chaîne + + + + &Report a bug on Github - + &Send Duke Feedback &Envoyer des commentaires à Duke - + &Hush Discord Discord - + &Hush Website Site internet - + Pay HUSH &URI... Envoyer un paiement HUSH - + Validate Address Valider l'adresse @@ -279,7 +309,7 @@ - + Export Private Key Exporter la clef privée @@ -297,68 +327,75 @@ Transactions - + hushd hushd - + You are currently not mining Vous ne minez pas à présent - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + Loading... Chargement... - + Block height Hauteur de block - + Network solution rate Taux de solution du réseau - + Connections Connections - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + | | @@ -378,92 +415,92 @@ Voir toutes les adresses - + Notarized Hash Hachage notarisé - + Notarized txid Txid Notarisé - + Notarized Lag Lag notarisé - + KMD Version Version KMD - + Protocol Version Version du protocole - + Version Version - + P2P Port Port P2P - + RPC Port Port RPC - + Client Name Nom du client - + Next Halving Prochaine réduction - + &File &Fichier - + &Help &Aide - + &Apps &Applications - + &Edit &Edition - + E&xit Q&uitter - + &About &À propos - + &Settings &Préférences - + Ctrl+P Ctrl+P @@ -472,58 +509,58 @@ &Faire un don - + Check github.com for &updates Vérifier les mises à jour... - + Sapling &turnstile Sapling &turnstile - + Ctrl+A, Ctrl+T Ctrl+A, Ctrl+T - + &Import private key &Importer une clef privée - + &Export all private keys &Exporter toutes les clefs privées - + &z-board.net - - + Ctrl+A, Ctrl+Z Ctrl+A, Ctrl+Z - + Address &book Carnet &d'adresses - + Ctrl+B Ctrl+B - + &Backup wallet.dat &Sauvegarder "wallet.dat" - - + + Export transactions Exporter les transactions @@ -532,52 +569,52 @@ Payer une URI en HUSH - + Connect mobile &app Connection mobile &application - + Ctrl+M Ctrl+M - + Request HUSH... Demander un paiement HUSH - + Tor configuration is available only when running an embedded hushd. La configuration de Tor est disponible uniquement lors de l'exécution du processus hushd intégré. - + You're using an external hushd. Please restart hushd with -rescan Vous utilisez un hushd externe. Veuillez redémarrer hushd avec -rescan - + You're using an external hushd. Please restart hushd with -reindex Vous utilisez un hushd externe. Veuillez redémarrer hushd avec -reindex - + Enable Tor Activer Tor - + Connection over Tor has been enabled. To use this feature, you need to restart SilentDragon. La connection via Tor est activée. Afin d'utiliser cette fonctionnalité, veuillez redémarer SilentDragon. - + Disable Tor Désactiver Tor - + Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart SilentDragon. La connection via Tor a été désactivée. Afin de complètement se déconnecter de Tor, vous devez redémarrer SilentDragon. @@ -610,27 +647,17 @@ Les clefs ont été importées. Cela peut prendre quelque minutes pour rescanner la blockchain. Durant cette période, les fonctionnalités peuvent être limitées - + Private key import rescan finished Rescan de l'import de la clef privée achevé - + SilentDragon needs to restart to rescan/reindex. SilentDragon will now close, please restart SilentDragon to continue SilentDragon doit redémarrer pour rescan/reindex. SilentDragon va maintenant fermer, veuillez redémarrer SilentDragon pour continuer - - Restart - - - - - Please restart SilentDragon to have the theme apply - - - - + Restart SilentDragon Redémarrer SilentDragon @@ -639,12 +666,12 @@ Erreur lors du paiement par URI HUSH - + URI should be of the form 'hush:<addr>?amt=x&memo=y Le format URI doit être comme ceci: 'hush:<addr>?amt=x&memo=y - + Paste HUSH URI Coller le URI HUSH @@ -665,151 +692,167 @@ Les clef seront importées dans votre noeud hushd connecté - + + Theme Change + Changement de thème + + + + + This change can take a few seconds. + Ce changement peut prendre quelques secondes. + + + + Currency Change + Changement de devise + + + Some feedback about SilentDragon or Hush... Quelques commentaires sur SilentDragon ou Hush ... - + Send Duke some private and shielded feedback about Envoyez à Duke des commentaires privés et protégés sur - + or SilentDragon ou SilentDragon - + Enter Address to validate Entrez l'adresse pour valider - + Transparent or Shielded Address: Adresse transparente ou privée: - + Error paying Hush URI Erreur lors du paiement de l'URI - + Please paste your private keys here, one per line Veuillez coller vos clés privées ici, une par ligne - + The keys will be imported into your connected Hush node Les clés seront importées dans votre nœud Hush connecté. - + The keys were imported! It may take several minutes to rescan the blockchain. Until then, functionality may be limited Les clés ont été importées! Une nouvelle analyse de la blockchain peut prendre plusieurs minutes. Durant ce temps, les fonctionnalités peuvent être limitées - + Error Erreur - + Error exporting transactions, file was not saved Erreur lors de l'exportation des transactions. Le fichier n'a pas été sauvegardé. - + No wallet.dat Pas de fichier "wallet.dat" - + Couldn't find the wallet.dat on this computer Impossible de trouver le fichier "wallet.dat" sur cet ordinateur - + You need to back it up from the machine hushd is running on Vous devez effectuer la sauvegarde depuis la machine sur laquelle hushd est en cours d'exécution - + Backup wallet.dat Sauvegarder wallet.dat - + Couldn't backup La sauvegarde n'a pas pu être effectuée - + Couldn't backup the wallet.dat file. Impossible de sauvegarder le fichier "wallet.dat". - + You need to back it up manually. Vous devez le sauvegarder manuellement. - + These are all the private keys for all the addresses in your wallet Ce sont toutes les clés privées pour toutes les adresses de votre portefeuille - + Private key for Clef privée pour - + Save File Sauvegarder le fichier - + Unable to open file Impossible d'ouvrir le fichier - - + + Copy address Copier l'adresse - - - + + + Copied to clipboard Copié dans le presse-papier - + Get private key Obtenir la clef privée - + Shield balance to Sapling Rendre privé le solde vers Sapling - - + + View on block explorer Voir dans l'explorateur de block - + Address Asset Viewer Addresse Asset Viewer - + Convert Address Adresse convertie @@ -818,42 +861,47 @@ Migrer vers Sapling - + Copy txid Copier l'ID de transaction - + + Copy block explorer link + Copier le lien de l'explorateur de blocs + + + View Payment Request Afficher la demande de paiement - + View Memo Voir le mémo - + Reply to Répondre à - + Created new t-Addr Créée une nouvelle t-Adresse - + Copy Address Copier l'adresse - + Address has been previously used L'adresse a été utilisée précédemment. - + Address is unused L'adresse est inutilisée. @@ -912,39 +960,43 @@ doesn't look like a z-address Cette adresse ne semble pas être de type z-Adresse + + + From Address is Invalid! + L'adresse de l'expéditeur n'est pas valide! + Reply to Répondre à - + Change from Changer de - + Current balance : Solde actuel : - + Balance after this Tx: Solde après cette Tx: - + Transaction Error Erreur de transaction - + Computing transaction: - + Transaction en cours : - From Address is Invalid - L'adresse de l'émetteur est invalide + L'adresse de l'émetteur est invalide @@ -1188,86 +1240,86 @@ If all else fails, please run hushd manually. MB à - + This may take several hours, grab some popcorn Cela peut prendre plusieurs heures. Prenez du pop-corn - + There was an error! : Il y avait une erreur! : - + Downloading blocks Blocs en cours de téléchargement - + Block height Hauteur des blocs - + Syncing Synchronisation - + Connected Connecté - + testnet: réseau test: - + Connected to hushd Connecté à hushd - + transaction computing. - + transaction en cours. - + Please enhance your calm and wait for SilentDragon to exit - + Veuillez restez calme et attendre la fermeture de SilentDragon - + Waiting for hushd to exit, y'all - + Veuillez atendre que hushd soit arrêté, vous tous hushd has no peer connections hushd n'a aucune connexion à un pair - + There was an error connecting to hushd. The error was Une erreur est survenue lors de la connection à hushd. L'erreur est - + Transaction - + Transaction - + The transaction with id La transaction avec ID - + failed. The error was a échoué. L'erreur était - + failed a échoué @@ -1276,7 +1328,7 @@ If all else fails, please run hushd manually. Tx - + hushd has no peer connections! Network issues? hushd n'a pas de connexion entre pairs! Problèmes de réseau? @@ -1285,24 +1337,24 @@ If all else fails, please run hushd manually. tx en cours de calcul. Ceci peut prendre quelques minutes. - + Update Available MàJ disponible - + A new release v%1 is available! You have v%2. Would you like to visit the releases page? Voulez-vous visiter la page des nouvelles versions ? - + No updates available Pas de MàJ disponible - + You already have the latest release v%1 Vous utilisez déjà la dernière version v%1 @@ -1325,7 +1377,7 @@ Would you like to visit the releases page? erreur hushd - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1334,7 +1386,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1343,24 +1395,24 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Authentification échouée. Le nom d'utilisateur / mot de passe que vous avez spécifié n'a pas été accepté par hushd. Essayez de le changer dans le menu Edition-> Préférences - + Your hushd is starting up. Please wait. Votre hushd est en cours de démarrage. Veuillez patienter. - - + + Connection Error Erreur de connection - - + + Transaction Error Erreur de transaction @@ -1369,8 +1421,8 @@ Veuillez configurer l'hôte/port et utilisateur/mot de passe dans le menu E Une erreur est survenue en envoyant la transaction. L'erreur est: - - + + No Connection Pas de connection @@ -1449,9 +1501,8 @@ Veuillez configurer l'hôte/port et utilisateur/mot de passe dans le menu E Effacer l'étiquette - Tx submitted (right click to copy) txid: - Tx soumise. (clic droit pour copier) txid: + Tx soumise. (clic droit pour copier) txid: Locked funds @@ -1498,12 +1549,12 @@ Vous avez soit des fonds non confirmés soit le solde est trop petit pour une mi Connecté sur Internet via le service SilentDragon Wormhole - + Node is still syncing. Le nœud est toujours en cours de synchronisation. - + No addresses with enough balance to spend! Try sweeping funds into one address Pas d'adresses avec assez de fonds à dépenser! Essayez de réunir des fonds en une seule adresse @@ -1511,6 +1562,11 @@ Vous avez soit des fonds non confirmés soit le solde est trop petit pour une mi No sapling or transparent addresses with enough balance to spend. Le nœud est toujours en cours de synchronisation. + + + Transaction submitted (right click to copy) txid: + Transaction soumise (clic droit pour copier) txid: + RecurringDialog @@ -1666,142 +1722,362 @@ Vous avez soit des fonds non confirmés soit le solde est trop petit pour une mi Options - + Check github for updates at startup Vérifiez les mises à jour sur Github au démarrage - + Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally. Se connecter au réseau Tor via le proxy SOCKS en cours d'exécution sur 127.0.0.1:9050. Veuillez noter que vous devrez installer et exécuter le service Tor en externe. - + Shielded transactions are saved locally and shown in the transactions tab. If you uncheck this, shielded transactions will not appear in the transactions tab. Les transactions protégées sont enregistrées localement et affichées dans l'onglet transactions. Si vous décochez cette case, les transactions protégées n'apparaîtront pas dans l'onglet des transactions. Theme - + Thème - default + Local Currency + Devise locale + + + + AED - - blue + + ARS - - light + + AUD - - dark + + BDT + + + + + BHD + + + + + BMD + + + + + BRL + + + + + BTC + + + + + CAD + + + + + CHF + + + + + CLP + + + + + CNY + + + + + CZK + + + + + DKK + + + + + EUR + + + + + GBP + + + + + HKD + + + + + HUF + + + + + IDR - + + ILS + + + + + INR + + + + + JPY + + + + + KRW + + + + + KWD + + + + + LKR + + + + + PKR + + + + + MXN + + + + + NOK + + + + + NZD + + + + + RUB + + + + + SAR + + + + + SEK + + + + + SGD + + + + + THB + + + + + TRY + + + + + TWD + + + + + UAH + + + + + USD + + + + + VEF + + + + + VND + + + + + XAG + + + + + XAU + + + + + ZAR + + + + + default + défaut + + + + blue + Bleu + + + + light + Calire + + + + dark + Sombre + + + Connect via Tor Se connecter via Tor - + Connect to github on startup to check for updates Connection à github au démarrage pour vérifier les mises à jour - + Connect to the internet to fetch HUSH prices Connection à Internet pour consulter les prix de HUSH - - Fetch HUSH / USD prices - Consulter les prix HUSH / USD + + Fetch HUSH prices + Consulter les prix HUSH - + Explorer Explorer - + Tx Explorer URL URL Tx Explorer - + Address Explorer URL URL Address Explorer - + Testnet Tx Explorer URL URL Testnet Tx Explorer - + Testnet Address Explorer URL URL Testnet Address Explorer - + Troubleshooting Anomalies - + Reindex Reindex - + Rescan the blockchain for any missing wallet transactions and to correct your wallet balance. This may take several hours. You need to restart SilentDragon for this to take effect Rescanner la blockchain pour détecter toute transaction de portefeuille manquante et corriger le solde de votre portefeuille. Cela peut prendre plusieurs heures. Vous devez redémarrer SilentDragon pour que cela prenne effet - + Rescan Rescan - + Rebuild the entire blockchain from the genesis block, by rescanning all the block files. This may take several hours to days, depending on your hardware. You need to restart SilentDragon for this to take effect Reconstruisez l'intégralité de la blockchain à partir du bloc genesis en analysant à nouveau tous les fichiers de bloc. Cela peut prendre plusieurs heures à plusieurs jours selon votre matériel. Vous devez redémarrer SilentDragon pour que cela prenne effet - + Clear History Effacer l'historique - + Remember shielded transactions Se souvenir des transactions privées - + Allow custom fees Permettre les frais personnalisés - + Allow overriding the default fees when sending transactions. Enabling this option may compromise your privacy since fees are transparent. Permettre le changement des frais par défaut lors de l'envoi de transactions. L'activation de cette option peut compromettre votre confidentialité car les frais sont transparents. - + Normally, change from t-Addresses goes to another t-Address. Checking this option will send the change to your shielded sapling address instead. Check this option to increase your privacy. - Nornalement, le change d'une adresse-t se fait à une autre adresse-t. Sélectionner cette option enverra le change à votre adresse privée Sapling à la place. Cochez cette option pour augmenter votre vie privée. + Normalement, le changement d'une adresse-t se fait à une autre adresse-t. Sélectionnez cette option enverra le change à votre adresse privée Sapling à la place. Cochez cette option pour augmenter votre vie privée. - + Shield change from t-Addresses to your sapling address Rendre privé le changement de la t-Adresse vers la z-Adresse diff --git a/res/silentdragon_hr.qm b/res/silentdragon_hr.qm index da6b496..5c26e1a 100644 Binary files a/res/silentdragon_hr.qm and b/res/silentdragon_hr.qm differ diff --git a/res/silentdragon_hr.ts b/res/silentdragon_hr.ts index 2ca4380..fb9b038 100644 --- a/res/silentdragon_hr.ts +++ b/res/silentdragon_hr.ts @@ -143,8 +143,8 @@ - - + + Memo Poruka (memo) @@ -171,7 +171,7 @@ - + Miner Fee Naknada za rudarenje @@ -237,7 +237,7 @@ - + Export Private Key Izvoz privatnog ključa @@ -247,528 +247,584 @@ Transakcije - + hushd hushd - + You are currently not mining Trenutno ne rudarite - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + Loading... Učitavanje... - + + Market + + + + + <html><head/><body><p align="center"><span style=" font-weight:600;">Hush Market Information</span></p></body></html> + + + + + Market Cap + + + + + 24H Volume + + + + Block height Visina bloka - + Notarized Hash Potvrđen hash - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + | | - + Notarized txid Potvrđen txid - + Notarized Lag Potvrđeno kašnjenje - + KMD Version KMD verzija - + Protocol Version Verzija protokola - + Version Verzija - + P2P Port P2P port - + RPC Port RPC port - + Client Name Ime klijenta - + Next Halving Slijedeći halving - + Local Services Lokalni servisi - + Longest Chain Najduži niz - + Wallet Transactions Transakcije u novčaniku - + + Chain Transactions + + + + Network solution rate Snaga mreže - + Connections Povezanost - + &File &Datoteka - + &Help &Pomoć - + &Apps &Apps - + &Edit &Uredi - + E&xit &Izlaz - + &About &O - + + &Report a bug on Github + + + + &Settings &Postavke - + Ctrl+P Ctrl+P - + &Send Duke Feedback &Pošalji Duke Feedback - + &Hush Discord &Hush Discord - + &Hush Website &Hush Web stranica - + Check github.com for &updates Provjeri na github.com &dopune - + Sapling &turnstile Sapling &čvorište - + Ctrl+A, Ctrl+T Ctrl+A, Ctrl+T - + &Import private key &Uvoz privatnog ključa - + &Export all private keys &Izvoz svih privatnih ključeva - + &z-board.net &z-board.net - + Ctrl+A, Ctrl+Z Ctrl+A, Ctrl+Z - + Address &book Adresna &knjiga - + Ctrl+B Ctrl+B - + &Backup wallet.dat &Sigurnosna kopija wallet.dat - - + + Export transactions Izvoz transakcija - + Pay HUSH &URI... Hush plaćanje &URI... - + Connect mobile &app Spoji mobilnu &app - + Ctrl+M Ctrl+M - + Request HUSH... Zatraži HUSH... - + Validate Address Potvrdi adresu - Restart - Ponovno pokreni + Ponovno pokreni - Please restart SilentDragon to have the theme apply - Molim ponovno pokrenite SilentDragon kako bi primjenili temu + Molim ponovno pokrenite SilentDragon kako bi primjenili temu + + + + Theme Change + - + + + This change can take a few seconds. + + + + + Currency Change + + + + Tor configuration is available only when running an embedded hushd. Tor postavke su dostupne samo ako je pokrenut integrirani hushd. - + You're using an external hushd. Please restart hushd with -rescan Koristite vanjski hushd. Molimo ponovno pokrenite hushd sa -rescan - + You're using an external hushd. Please restart hushd with -reindex Koristite vanjski hushd. Molimo ponovno pokrenite hushd sa -reindex - + Enable Tor Omogući Tor - + Connection over Tor has been enabled. To use this feature, you need to restart SilentDragon. Veza putem Tora je omogućena. Ako želite koristiti ovu značajku, morate ponovno pokrenuti SilentDragon. - + Disable Tor Onemogući Tor - + Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart SilentDragon. Veza putem Tora je onemogućena. Ako se želite potpuno maknuti sa Tora, morate ponovno pokrenuti SilentDragon. - + SilentDragon needs to restart to rescan/reindex. SilentDragon will now close, please restart SilentDragon to continue SilentDragon se mora ponovno pokrenuti za rescan/reindex. SilentDragon će se sada zatvoriti, molimo ponovno pokrenite SilentDragon za nastavak - + Restart SilentDragon Ponovno pokrenite SilentDragon - + Some feedback about SilentDragon or Hush... Neke povratne informacije o SilentDragonu ili Hushu... - + Send Duke some private and shielded feedback about Pošaljite Duke privatnu i zaštićenu povratnu informaciju o - + or SilentDragon ili SilentDragon - + Enter Address to validate Unesite adresu za potvrdu - + Transparent or Shielded Address: Transparentna ili Zaštićena adresa: - + Private key import rescan finished Dovršen rescan uvoza privatnog ključa - + Paste HUSH URI Zalijepi HUSH URI - + Error paying Hush URI Greška prilikom plaćanja Hush URI - + URI should be of the form 'hush:<addr>?amt=x&memo=y URI treba biti formata 'hush:<addr>?amt=x&memo=y - + Please paste your private keys here, one per line Molim vas zalijepite vaše privatne ključeve ovdje, jedan ključ po redu - + The keys will be imported into your connected Hush node Ključevi će biti unešeni u vaš povezani Hush čvor - + The keys were imported! It may take several minutes to rescan the blockchain. Until then, functionality may be limited Ključevi su unešeni. Rescan blockchaina može potrajati i do nekoliko minuta. Do tada su limitirane funkcionalnosti - + Error Greška - + Error exporting transactions, file was not saved Greška prilikom izvoza transakcija, datoteka nije spremljena - + No wallet.dat Nema wallet.dat - + Couldn't find the wallet.dat on this computer Ne mogu pronaći wallet.dat na ovom računalu - + You need to back it up from the machine hushd is running on Morate napraviti sigurnosnu kopiju na računalu na kojem je aktivan hushd - + Backup wallet.dat Sigurnosna kopija wallet.dat - + Couldn't backup Nije moguće napraviti sigurnosnu kopiju - + Couldn't backup the wallet.dat file. Nije moguće napraviti sigurnosnu kopiju wallet.dat datoteke. - + You need to back it up manually. Morate ručno napraviti sigurnosnu kopiju. - + These are all the private keys for all the addresses in your wallet Ovo su svi privatni ključevi svih adresa u vašem novčaniku - + Private key for Privatni ključ za - + Save File Spremi datoteku - + Unable to open file Nije moguće otvoriti datoteku - - + + Copy address Kopirajte adresu - - - + + + Copied to clipboard Kopirano u mađuspremnik - + Get private key Dobavi privatni ključ - + Shield balance to Sapling Zaštiti saldo u Sapling - - + + View on block explorer Pogledaj na blok exploreru - + Address Asset Viewer Preglednik adresa - + Convert Address Pretvorite adresu - + Copy txid Kopitajte txid - + + Copy block explorer link + + + + View Payment Request Pogledajte zahtjev o plaćanju - + View Memo Pogledajte poruku (memo) - + Reply to Odgovorite - + Created new t-Addr Napravljena je nova transparentna adresa - + Copy Address Kopirajte adresu - + Address has been previously used Adresa je već korištena - + Address is unused Adresa nije korištena @@ -828,38 +884,42 @@ doesn't look like a z-address ne izgleda kao z-adresa - + Change from Promijeniti iz - + Current balance : Trenutni saldo : - + Balance after this Tx: Saldo nakon ove Tx: - + Transaction Error Greška u transakciji - + Computing transaction: + + + From Address is Invalid! + + Computing Tx: Računska Tx: - From Address is Invalid - Neispravna adresa pošaljitelja + Neispravna adresa pošaljitelja @@ -1157,7 +1217,7 @@ Ne pokrećem integrirani hushd jer --no-embedded nije prilagođen hushd greška - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1166,7 +1226,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1175,85 +1235,85 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Autorizacija neuspješna. Hushd nije prihvatio korisničko ime / lozinku koju ste unijeli. Pokušajte to promijeniti u Uredi->Postavke meniju - + Your hushd is starting up. Please wait. Hushd se pokreće. Molimo pričekajte. - + This may take several hours, grab some popcorn Ovo može potrajati nekoliko sati, donesite si kokice - - + + Connection Error Greška sa vezom - - + + Transaction Error Greška u transakciji - + There was an error! : Dogodila se greška! : - - + + No Connection Nema veze - + Downloading blocks Preuzimam blokove - + Block height Visina bloka - + Syncing Sinkroniziranje - + Connected Spojeno - + testnet: testnet: - + Connected to hushd Spojeno na hushd - + hushd has no peer connections! Network issues? hushd nema vezu sa točkama na istoj razini! Možda imate problem sa mrežom? - + There was an error connecting to hushd. The error was Pojavila se greška prilikom spajanja na hushd. Greška je - + transaction computing. @@ -1262,12 +1322,12 @@ Molimo postavite host/port i korisnčko ime/lozinku u Uredi->Postavke meniju. tx proračun. Ovo može potrajati nekoliko minuta. - + Update Available Dostupno ažuriranje - + A new release v%1 is available! You have v%2. Would you like to visit the releases page? @@ -1276,22 +1336,22 @@ Would you like to visit the releases page? Želite li posjetiti stranicu sa izadnjima? - + No updates available Nema dostupnih ažuriranja - + You already have the latest release v%1 Već imate najnovije izdanje v%1 - + Please enhance your calm and wait for SilentDragon to exit Molimo pokušajte se strpiti i pričekajte da se SilentDragon zatvori - + Waiting for hushd to exit, y'all Pričekajte da hushd završi @@ -1300,29 +1360,28 @@ Would you like to visit the releases page? Tx - + failed neuspjelo - + Transaction - + The transaction with id Transakcija sa ID - + failed. The error was nesupjela. Greška je - Tx submitted (right click to copy) txid: - Tx poslan (desni klik za kopiranje) txid: + Tx poslan (desni klik za kopiranje) txid: @@ -1355,15 +1414,20 @@ Would you like to visit the releases page? Spojeno preko Interneta putem SilentDragon usluge crvotočine - + Node is still syncing. Čvor se još uvijek sinkronizira. - + No addresses with enough balance to spend! Try sweeping funds into one address Ne možete trošiti jer nema adrese sa dovoljnim saldom. Pokušajte prebaciti sva sredstva na jednu adresu + + + Transaction submitted (right click to copy) txid: + + RecurringDialog @@ -1525,136 +1589,356 @@ Would you like to visit the releases page? + Local Currency + + + + + AED + + + + + ARS + + + + + AUD + + + + + BDT + + + + + BHD + + + + + BMD + + + + + BRL + + + + + BTC + + + + + CAD + + + + + CHF + + + + + CLP + + + + + CNY + + + + + CZK + + + + + DKK + + + + + EUR + + + + + GBP + + + + + HKD + + + + + HUF + + + + + IDR + + + + + ILS + + + + + INR + + + + + JPY + + + + + KRW + + + + + KWD + + + + + LKR + + + + + PKR + + + + + MXN + + + + + NOK + + + + + NZD + + + + + RUB + + + + + SAR + + + + + SEK + + + + + SGD + + + + + THB + + + + + TRY + + + + + TWD + + + + + UAH + + + + + USD + + + + + VEF + + + + + VND + + + + + XAG + + + + + XAU + + + + + ZAR + + + + default početno - + blue plavo - + light svijetlo - + dark tamno - + Connect via Tor Spojite se putem Tora - + Check github for updates at startup Prilikom pokretanja provjetite ažuriranja na githubu - + Remember shielded transactions Zapamtite zaštičene transakcije - + Normally, change from t-Addresses goes to another t-Address. Checking this option will send the change to your shielded sapling address instead. Check this option to increase your privacy. Uobičajeno, razlike se sa jedne t-adrese šalju na drugu t-adresu. Ako odaberete ovu opciju razlika će se poslati na vašu zaštićenu sapling adresu. Odaberite ovu opciju ako želite povećati privatnost. - + Allow overriding the default fees when sending transactions. Enabling this option may compromise your privacy since fees are transparent. Dopusti da se zaobiđu početno postavljene naknade prilikom slanja transakcije. Ako odaberete ovu opciju vaša privatnost će biti narušena jer su maknade transparentne. - + Clear History Obriši povijest - + Shielded transactions are saved locally and shown in the transactions tab. If you uncheck this, shielded transactions will not appear in the transactions tab. Zaštičene transakcije se spremaju lokalno i prikazane su u kartici transakcija. Ako ne odaberete ovo, zaštičene transakcije se neće pojaviti u kartici transakcija. - + Allow custom fees Dopusti prilagodbu naknada - + Shield change from t-Addresses to your sapling address Zaštiti razliku sa t-adrese na sapling adresu - + Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally. Spojite se na Tor mrežu putem SOCKS proxy na 127.0.0.1:9050. Molim vas uzmite u obzir da ćete morati izvana instalirati Tor uslugu. - + Connect to github on startup to check for updates Prilikom pokretanja provjerite ažuriranja na githubu - + Connect to the internet to fetch HUSH prices Spojite se na Internet kako bi dohvatili HUSH cijene - - Fetch HUSH / USD prices - Dohvati HUSH / USD cijene + + Fetch HUSH prices + Dohvati HUSH cijene - + Explorer Preglednik - + Tx Explorer URL Tx preglednik URL - + Address Explorer URL Preglednik adresa URL - + Testnet Tx Explorer URL Testnet Tx Preglednik URL - + Testnet Address Explorer URL Testnet preglednika adresa URL - + Troubleshooting Otklanjanje problema - + Reindex Reindex - + Rescan the blockchain for any missing wallet transactions and to correct your wallet balance. This may take several hours. You need to restart SilentDragon for this to take effect Rescan blockchaina ako vam nedostaju transakcije ili ako je krivi saldo u novčaniku. To može potrajati nekoliko sati. Kako bi imalo učinka morate ponovno poktenuti SilentDragon - + Rescan Rescan - + Rebuild the entire blockchain from the genesis block, by rescanning all the block files. This may take several hours to days, depending on your hardware. You need to restart SilentDragon for this to take effect Izgradite cijeli blockchain iz prvog (genesis) bloka sa rescanom svih datoteka. Ovo bi moglo potrajati nekoliko sati do nekoliko dana ovisno o jačini vašeg računala. Kako bi imalo učinka morate ponovno pokrenuti SilentDragon diff --git a/res/silentdragon_it.qm b/res/silentdragon_it.qm index 34f49db..582f8b8 100644 Binary files a/res/silentdragon_it.qm and b/res/silentdragon_it.qm differ diff --git a/res/silentdragon_it.ts b/res/silentdragon_it.ts index 5e5868f..ff043b6 100644 --- a/res/silentdragon_it.ts +++ b/res/silentdragon_it.ts @@ -151,8 +151,8 @@ - - + + Memo Memo @@ -179,7 +179,7 @@ - + Miner Fee Commissioni di rete @@ -204,47 +204,77 @@ Tipo Indirizzo - + + Market + + + + + <html><head/><body><p align="center"><span style=" font-weight:600;">Hush Market Information</span></p></body></html> + + + + + Market Cap + + + + + 24H Volume + + + + Local Services - + Longest Chain - + Wallet Transactions - + + Chain Transactions + + + + + &Report a bug on Github + + + + &Send Duke Feedback &Invia feedback Duke - + &Hush Discord &Hush Discord - + &Hush Website &Hush Sito web - + Pay HUSH &URI... Paga HUSH &URI... - + Request HUSH... Richiedi HUSH ... - + Validate Address Convalida indirizzo @@ -292,7 +322,7 @@ - + Export Private Key Esporta la chiave privata @@ -302,120 +332,127 @@ Transazioni - + hushd hushd - + You are currently not mining Al momento non stai minando - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + Loading... Caricamento... - + Block height check Ultimo blocco trovato - + Notarized Hash Hash notarile - + Notarized txid Txid notarile - + Notarized Lag Lag notarile - + KMD Version Versione KMD - + Protocol Version Versione protocollo - + Version Versione - + P2P Port Porta P2P - + RPC Port Porta RPC - + Client Name Nome del cliente - + Next Halving Prossima diminuzione - + Network solution rate check Potenza di calcolo Network - + Connections Connessioni attive - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + | | @@ -430,42 +467,42 @@ Indirizzo trasparente (pubblico, con perdite di metadati) - + &File &File - + &Help &Aiuto - + &Apps &Apps - + &Edit &Modifica - + E&xit &Esci - + &About &About - + &Settings &Impostazioni - + Ctrl+P Ctrl+P @@ -474,69 +511,69 @@ &Dona - + Check github.com for &updates Controllo nuovi &aggiornamenti - + Sapling &turnstile Sapling &turnstile - + Ctrl+A, Ctrl+T Ctrl+A, Ctrl+T - + &Import private key &Importa chiave privata - + &Export all private keys &Esporta tutte le chiavi private - + &z-board.net &z-board.net - + Ctrl+A, Ctrl+Z Ctrl+A, Ctrl+Z - + Address &book check Rubrica &Contatti - + Ctrl+B Ctrl+B - + &Backup wallet.dat &Backup wallet.dat - - + + Export transactions Transazioni di esportazione - + Connect mobile &app Connetti &applicazione mobile - + Ctrl+M Ctrl+M @@ -569,62 +606,52 @@ Le chiavi sono state importate. Potrebbero essere necessari alcuni minuti per eseguire nuovamente la scansione della blockchain. Fino ad allora, le funzionalità potrebbero essere limitate - + Private key import rescan finished L'importazione delle chiavi private è stata completata - + Tor configuration is available only when running an embedded hushd. La configurazione Tor è disponibile solo quando si esegue un hushd incorporato. - - Restart - - - - - Please restart SilentDragon to have the theme apply - - - - + You're using an external hushd. Please restart hushd with -rescan Stai usando un hushd esterno. Si prega di riavviare hushd con -rescan - + You're using an external hushd. Please restart hushd with -reindex Stai usando un hushd esterno. Si prega di riavviare hushd con -reindex - + Enable Tor Abilita Tor - + Connection over Tor has been enabled. To use this feature, you need to restart SilentDragon. La connessione tramite Tor è stata abilitata. Per utilizzare questa funzione, è necessario riavviare SilentDragon. - + Disable Tor Disabilita Tor - + Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart SilentDragon. La connessione tramite Tor è stata disabilitata. Per disconnettersi completamente da Tor, è necessario riavviare SilentDragon. - + SilentDragon needs to restart to rescan/reindex. SilentDragon will now close, please restart SilentDragon to continue SilentDragon deve essere riavviato per ripetere la scansione / reindicizzazione. SilentDragon ora si chiuderà, riavviare SilentDragon per continuare - + Restart SilentDragon Riavvia SilentDragon @@ -638,161 +665,177 @@ Le chiavi saranno importate nel tuo nodo hushd - + + Theme Change + + + + + + This change can take a few seconds. + + + + + Currency Change + + + + Some feedback about SilentDragon or Hush... Alcuni feedback su SilentDragon o Hush ... - + Send Duke some private and shielded feedback about Invia a Duke un feedback privato e schermato - + or SilentDragon o SilentDragon - + Enter Address to validate Inserisci un indirizzo per convalidare - + Transparent or Shielded Address: Indirizzo trasparente o schermato: - + Paste HUSH URI Incolla URI HUSH - + Error paying Hush URI Errore nel pagamento dell'URI Hush - + URI should be of the form 'hush:<addr>?amt=x&memo=y L'URI dovrebbe essere nella forma 'hush:<addr>?amt=x&memo=y - + Please paste your private keys here, one per line Incolla qui le tue chiavi private, una per riga - + The keys will be imported into your connected Hush node Le chiavi verranno importate nel nodo Hush collegato - + The keys were imported! It may take several minutes to rescan the blockchain. Until then, functionality may be limited Le chiavi sono state importate! Potrebbero essere necessari alcuni minuti per ripetere la scansione della blockchain. Fino ad allora, la funzionalità potrebbe essere limitata - + Error Errore - + Error exporting transactions, file was not saved Errore durante l'esportazione delle transazioni, il file non è stato salvato - + No wallet.dat Nessun wallet.dat - + Couldn't find the wallet.dat on this computer Impossibile trovare il wallet.dat su questo computer - + You need to back it up from the machine hushd is running on È necessario eseguire il backup dalla macchina su cui hushd è in esecuzione - + Backup wallet.dat Backup wallet.dat - + Couldn't backup Impossibile eseguire il backup - + Couldn't backup the wallet.dat file. Impossibile eseguire il backup del file wallet.dat. - + You need to back it up manually. Devi eseguire il backup manualmente. - + These are all the private keys for all the addresses in your wallet Queste sono le chiavi private per tutti gli indirizzi nel tuo portafoglio - + Private key for Chiave privata per - + Save File Salva File - + Unable to open file Impossibile aprire il file - - + + Copy address Copia indirizzo - - - + + + Copied to clipboard Copiato negli appunti - + Get private key Ottieni una chiave privata - + Shield balance to Sapling Trasferisci il saldo su un indirizzo shielded Sapling - - + + View on block explorer Guarda sul block-explorer - + Address Asset Viewer Addresses Asset Viewer - + Convert Address Converti indirizzo @@ -801,42 +844,47 @@ Migra a Sapling - + Copy txid Copia txid - + + Copy block explorer link + + + + View Payment Request Visualizza richiesta di pagamento - + View Memo Visualizza memo - + Reply to Rispondi a - + Created new t-Addr Crea nuovo t-Addr - + Copy Address Copia indirizzo - + Address has been previously used L'indirizzo è stato precedentemente utilizzato - + Address is unused L'indirizzo non è utilizzato @@ -894,36 +942,40 @@ doesn't look like a z-address Non sembra uno z-address (Shielded) - + Change from Controllare se opportuno inserire Mittente Cambiare da - + Current balance : Bilancio corrente : - + Balance after this Tx: Equilibrio dopo questo Tx: - + Transaction Error Errore di transazione - + Computing transaction: - + + From Address is Invalid! + + + From Address is Invalid Check - L'indirizzo selezionato non è valido + L'indirizzo selezionato non è valido @@ -1167,82 +1219,82 @@ If all else fails, please run hushd manually. MB a - + This may take several hours, grab some popcorn Potrebbero essere necessarie alcune ore, prendi dei popcorn - + There was an error! : C'era un errore! : - + Downloading blocks Scaricando i blocchi - + Block height Altezza ultimo blocco - + Syncing Sincronizzazione in corso - + Connected Connesso - + testnet: testnet: - + Connected to hushd Connesso a hushd - + There was an error connecting to hushd. The error was Si è verificato un errore durante la connessione a hushd. L'errore era - + transaction computing. - + Please enhance your calm and wait for SilentDragon to exit - + Waiting for hushd to exit, y'all - + Transaction - + The transaction with id La transazione con id - + failed. The error was fallito. l'errore era - + failed fallito @@ -1251,7 +1303,7 @@ If all else fails, please run hushd manually. Tx - + hushd has no peer connections! Network issues? hushd non ha connessioni peer! Problemi di rete? @@ -1260,12 +1312,12 @@ If all else fails, please run hushd manually. computazione Tx. Questo può richiedere diversi minuti. - + Update Available Aggiornamento disponibile - + A new release v%1 is available! You have v%2. Would you like to visit the releases page? @@ -1274,12 +1326,12 @@ Would you like to visit the releases page? Vuoi visitare la pagina dei rilasci? - + No updates available Nessun aggiornamento disponibile - + You already have the latest release v%1 Hai già l'ultima versione v%1 @@ -1304,7 +1356,7 @@ Would you like to visit the releases page? hushd errore - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1312,7 +1364,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1321,24 +1373,24 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Autenticazione fallita. Il nome utente/password che hai specificato non sono stati accettati da hushd. Prova a cambiarlo nel menu Modifica-> Impostazioni - + Your hushd is starting up. Please wait. Il tuo hushd si sta avviando. Attendere prego. - - + + Connection Error Errore di Connessione - - + + Transaction Error Errore di transazione @@ -1347,8 +1399,8 @@ Impostare host/porta e utente/password nel menu Modifica-> Impostazioni.Si è verificato un errore durante l'invio della transazione. L'errore era: - - + + No Connection Nessuna connessione @@ -1427,9 +1479,8 @@ Impostare host/porta e utente/password nel menu Modifica-> Impostazioni.elimina l'etichetta - Tx submitted (right click to copy) txid: - Tx inviato (clic destro per copiare) txid: + Tx inviato (clic destro per copiare) txid: Locked funds @@ -1476,12 +1527,12 @@ Avete fondi non confermati o il saldo è troppo basso per una migrazione automat Connesso via Internet tramite il servizio wormhole SilentDragon - + Node is still syncing. Il nodo è ancora in fase di sincronizzazione. - + No addresses with enough balance to spend! Try sweeping funds into one address @@ -1489,6 +1540,11 @@ Avete fondi non confermati o il saldo è troppo basso per una migrazione automat No sapling or transparent addresses with enough balance to spend. Nessun sapling o indirizzi trasparenti con abbastanza equilibrio da spendere. + + + Transaction submitted (right click to copy) txid: + + RecurringDialog @@ -1644,17 +1700,17 @@ Avete fondi non confermati o il saldo è troppo basso per una migrazione automat Opzioni - + Check github for updates at startup - + Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally. Connettiti alla rete Tor tramite proxy SOCKS in esecuzione su 127.0.0.1:9050. Nota che dovrai installare ed eseguire il servizio Tor esternamente. - + Shielded transactions are saved locally and shown in the transactions tab. If you uncheck this, shielded transactions will not appear in the transactions tab. Le transazioni Shielded vengono salvate localmente e visualizzate nella scheda delle transazioni. Se deselezioni questa opzione, le transazioni Shielded non verranno visualizzate nella scheda delle transazioni. @@ -1665,122 +1721,342 @@ Avete fondi non confermati o il saldo è troppo basso per una migrazione automat + Local Currency + + + + + AED + + + + + ARS + + + + + AUD + + + + + BDT + + + + + BHD + + + + + BMD + + + + + BRL + + + + + BTC + + + + + CAD + + + + + CHF + + + + + CLP + + + + + CNY + + + + + CZK + + + + + DKK + + + + + EUR + + + + + GBP + + + + + HKD + + + + + HUF + + + + + IDR + + + + + ILS + + + + + INR + + + + + JPY + + + + + KRW + + + + + KWD + + + + + LKR + + + + + PKR + + + + + MXN + + + + + NOK + + + + + NZD + + + + + RUB + + + + + SAR + + + + + SEK + + + + + SGD + + + + + THB + + + + + TRY + + + + + TWD + + + + + UAH + + + + + USD + + + + + VEF + + + + + VND + + + + + XAG + + + + + XAU + + + + + ZAR + + + + default - + blue - + light - + dark - + Connect via Tor Connetti via Tor - + Connect to github on startup to check for updates - + Connect to the internet to fetch HUSH prices - - Fetch HUSH / USD prices + + Fetch HUSH prices - + Explorer - + Tx Explorer URL - + Address Explorer URL - + Testnet Tx Explorer URL - + Testnet Address Explorer URL - + Troubleshooting Risoluzione dei problemi - + Reindex Reindex - + Rescan the blockchain for any missing wallet transactions and to correct your wallet balance. This may take several hours. You need to restart SilentDragon for this to take effect Riesegui la scansione della blockchain per eventuali transazioni di portafoglio mancanti e per correggere il saldo del tuo portafoglio. Questa operazione potrebbe richiedere diverse ore. È necessario riavviare SilentDragon affinché questo abbia effetto - + Rescan Rescan - + Rebuild the entire blockchain from the genesis block, by rescanning all the block files. This may take several hours to days, depending on your hardware. You need to restart SilentDragon for this to take effect Ricostruisci l'intera blockchain dal blocco genesi, eseguendo nuovamente la scansione di tutti i file di blocco. Questo potrebbe richiedere diverse ore o giorni, a seconda dell'hardware. È necessario riavviare SilentDragon affinché questo abbia effetto - + Clear History Cancellare la cronologia - + Remember shielded transactions Ricorda le transazioni Shielded - + Allow custom fees commissioni? Va bene? Consenti commissioni personalizzate - + Allow overriding the default fees when sending transactions. Enabling this option may compromise your privacy since fees are transparent. Consentire di ignorare le commissioni di default quando si inviano transazioni. L'attivazione di questa opzione potrebbe compromettere la tua privacy in quanto le commissioni sono trasparenti. - + Normally, change from t-Addresses goes to another t-Address. Checking this option will send the change to your shielded sapling address instead. Check this option to increase your privacy. Normalmente, il passaggio da t-Addresses passa a un altro t-Address. Selezionando questa opzione invierai invece la transazione di resto al tuo indirizzo Shielded Sapling. Seleziona questa opzione per aumentare la tua privacy. - + Shield change from t-Addresses to your sapling address check Cambia l'indirizzo Shielded da t-Addresses al tuo indirizzo Sapling diff --git a/res/silentdragon_nl.qm b/res/silentdragon_nl.qm index 9cb6ee7..5070314 100644 Binary files a/res/silentdragon_nl.qm and b/res/silentdragon_nl.qm differ diff --git a/res/silentdragon_nl.ts b/res/silentdragon_nl.ts index 5ff64f7..ff9d928 100644 --- a/res/silentdragon_nl.ts +++ b/res/silentdragon_nl.ts @@ -147,8 +147,8 @@ - - + + Memo Memo @@ -175,7 +175,7 @@ - + Miner Fee Mijners Toeslag @@ -204,42 +204,42 @@ Rescan - + Local Services Lokale Services - + Longest Chain Langste Keten - + &Send Duke Feedback &Verstuur Duke Feedback - + &Hush Discord &Hush Discord - + &Hush Website &Hush site da Internet - + Pay HUSH &URI... Betaal HUSH &URI... - + Request HUSH... Verzoek HUSH... - + Validate Address Adres Bevestigen @@ -282,7 +282,7 @@ - + Export Private Key Exporteer privé Sleutel @@ -292,68 +292,75 @@ Transacties - + hushd hushd - + You are currently not mining Je bent momenteel niet aan het minen - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + Loading... Bezig met Laden... - + Block height Blok Hoogte - + Network solution rate Netwerkoplossings snelheid - + Connections Connecties - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + | | @@ -373,97 +380,127 @@ Alle Adressen Weergeven - + + Market + + + + + <html><head/><body><p align="center"><span style=" font-weight:600;">Hush Market Information</span></p></body></html> + + + + + Market Cap + + + + + 24H Volume + + + + Notarized Hash Notarized Hash - + Notarized txid Notarized txid - + Notarized Lag Notarized Lag - + KMD Version KMD Versie - + Protocol Version Protocol Versie - + Version Versie - + P2P Port P2P Poort - + RPC Port RPV Poort - + Client Name CLient Naam - + Next Halving Volgende Halvering - + Wallet Transactions - + + Chain Transactions + + + + &File &Bestand - + &Help &Hulp - + &Apps &Applicaties - + &Edit &Wijzigen - + E&xit A&fsluiten - + &About &Over - + + &Report a bug on Github + + + + &Settings &Instellingen - + Ctrl+P Ctrl+P @@ -472,103 +509,103 @@ &Doar - + Check github.com for &updates Check github.com voor &updates - + Sapling &turnstile Sapling &turnstile - + Ctrl+A, Ctrl+T Ctrl+A, Ctrl+T - + &Import private key &Importeer privé Sleutel - + &Export all private keys &Exporteer Alle privé Sleutels - + &z-board.net &z-board.net - + Ctrl+A, Ctrl+Z Ctrl+A, Ctrl+Z - + Address &book &Adresboek - + Ctrl+B Ctrl+B - + &Backup wallet.dat &Backup wallet.dat - - + + Export transactions Exporteer Transacties - + Connect mobile &app Verbind met mobiel &app - + Ctrl+M Ctrl+M - + Tor configuration is available only when running an embedded hushd. Tor configuratie is alleen beschikbaar wanneer embedded hushd is uitgevoerd. - + You're using an external hushd. Please restart hushd with -rescan Je gebruikt een externe hushd. Graag hushd opnieuw opstarten met -rescan - + You're using an external hushd. Please restart hushd with -reindex Je gebruikt een externe hushd. Graag hushd opnieuw opstarten met -reindex - + Enable Tor Tor Inschakelen - + Connection over Tor has been enabled. To use this feature, you need to restart SilentDragon. Connectie via Tor is ingeschakeld. Om deze functie te gebruiken moet SilentDragon opnieuw worden opgestart. - + Disable Tor Tor Uitschakelen - + Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart SilentDragon. Connectie via Tor is uitgeschakeld. Om Tor volledig uit te schakelen moet SilentDragon opnieuw worden opgestart. @@ -601,22 +638,17 @@ Chaves importadas. Pode demorar alguns minutos para re-escanear a blockchain. Até lá, funcionalidades poderão estar limitadas - + Private key import rescan finished Prive sleutel import rescan geeindigd - + SilentDragon needs to restart to rescan/reindex. SilentDragon will now close, please restart SilentDragon to continue SilentDragon moet opnieuw opgestart worden om rescan/reindex. SildentDragon zal nu afgesloten worden. Start SilentDragon opnieuw op om te hervatten - - Please restart SilentDragon to have the theme apply - - - - + Restart SilentDragon SilentDragon opnieuw opstarten @@ -629,170 +661,181 @@ As chaves serão importadas em seu nó hushd conectado - + + Theme Change + + + + + + This change can take a few seconds. + + + + + Currency Change + + + + Some feedback about SilentDragon or Hush... Wat feedback over SilentDragon or Hush... - + Send Duke some private and shielded feedback about Verzend Duke anoniem afgeschermde feedback over - + or SilentDragon of SilentDragon - + Enter Address to validate Voer Adres in om te bevestigen - + Transparent or Shielded Address: Transparant of Afgeschermd Adres: - + Paste HUSH URI Plakken HUSH URI - + Error paying Hush URI Error betaling Hush URI - + URI should be of the form 'hush:<addr>?amt=x&memo=y URI should be of the form 'hush:<addr>?amt=x&memo=y - + Please paste your private keys here, one per line Graag hier uw privé sleutels plakken, één per regel - + The keys will be imported into your connected Hush node De sleutels zullen worden geimporteerd in je verbonden Hush node - + The keys were imported! It may take several minutes to rescan the blockchain. Until then, functionality may be limited De sleutels zijn geimporteerd! Het kan een paar minuten duren om de blockchain te scannen. In de tussentijd kunnen de functies gelimiteerd zijn - + Error Error - + Error exporting transactions, file was not saved Error tijdens het exporteren van de transactie, bestand is niet opgeslagen - + No wallet.dat Geen wallet.dat - + Couldn't find the wallet.dat on this computer De wallet.dat file kon niet gevonden worden op deze computer - + You need to back it up from the machine hushd is running on Je moet een backup maken vanuit het apparaat waar hushd op wordt uitgevoerd - + Backup wallet.dat Backup wallet.dat - + Couldn't backup Kon geen backup maken - + Couldn't backup the wallet.dat file. Het is niet mogelijk om het wallet.dat bestand te backuppen. - + You need to back it up manually. Je moet handmatig een backup maken. - + These are all the private keys for all the addresses in your wallet Dit zijn alle privé sleutels voor alle adressen in je wallet - + Private key for privé sleutel voor - + Save File Bestand Opslaan - - - Restart - - Error paying HUSH URI Error betaling HUSH URI - + Unable to open file Niet mogelijk om bestand te openen - - + + Copy address Kopieer Adres - - - + + + Copied to clipboard Gekopieerd naar klemblok - + Get private key Ontvang Persoonlijke Sleutel - + Shield balance to Sapling Afgeschermd Saldo voor Sapling - - + + View on block explorer Geef block weer in de block explorer - + Address Asset Viewer Adres Activakijker - + Convert Address Converteer Adres @@ -801,42 +844,47 @@ Migratie naar Sapling - + Copy txid Kopieer txid - + + Copy block explorer link + + + + View Payment Request Bekijk Betalingsverzoek - + View Memo Memo Weergeven - + Reply to Antwoorden naar - + Created new t-Addr Creëer nieuw t-Adres - + Copy Address Kopieer Adres - + Address has been previously used Adres is vorige keer gebruikt - + Address is unused Adres is ongebruikt @@ -896,34 +944,38 @@ doesn't look like a z-address Lijkt niet op een z-adres - + Change from Verander van - + Current balance : Huidige Saldo : - + Balance after this Tx: Saldo na deze Tx: - + Transaction Error Transactie Fout - + Computing transaction: - + + From Address is Invalid! + + + From Address is Invalid - Van Adres is Ongeldig + Van Adres is Ongeldig @@ -1167,82 +1219,82 @@ Als al het andere faalt, voer hushd dan handmatig uit. MB om - + This may take several hours, grab some popcorn Dit kan enkele uren duren, pak wat popcorn - + There was an error! : Er was een error! : - + Downloading blocks Downloaden van blokken - + Block height Blokhoogte - + Syncing synchroniseren - + Connected Verbonden - + testnet: testnet: - + Connected to hushd Verbinden met hushd - + There was an error connecting to hushd. The error was Er was een fout met het verbinden naar hushd. De fout was - + transaction computing. - + Please enhance your calm and wait for SilentDragon to exit - + Waiting for hushd to exit, y'all - + Transaction - + The transaction with id De transactie met id - + failed. The error was Mislukt. De fout was - + failed Mislukt @@ -1251,7 +1303,7 @@ Als al het andere faalt, voer hushd dan handmatig uit. Tx - + hushd has no peer connections! Network issues? hushd heeft geen peer-connecties! Netwerkproblemen? @@ -1260,12 +1312,12 @@ Als al het andere faalt, voer hushd dan handmatig uit. tx computing. Dit kan enkele minuten duren. - + Update Available Update Beschikbaar - + A new release v%1 is available! You have v%2. Would you like to visit the releases page? @@ -1274,12 +1326,12 @@ Would you like to visit the releases page? Wilt u de releasepagine bezoeken? - + No updates available Geen updates beschikbaar - + You already have the latest release v%1 U heeft al de nieuwste uitgave v%1 @@ -1302,7 +1354,7 @@ Wilt u de releasepagine bezoeken? Hushd fout - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1311,7 +1363,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1320,24 +1372,24 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Verificatie mislukt. De gebruikersnaam / wachtwoord dat u hebt opgegeven is niet geaccepteerd door hushd. Probeer het te veranderen in het menu Bewerken-> Instellingen - + Your hushd is starting up. Please wait. hushd is aan het opstarten. Even geduld AUB. - - + + Connection Error Connectie Fout - - + + Transaction Error Transactie Fout @@ -1346,8 +1398,8 @@ Stel de host / poort en gebruiker / wachtwoord in het menu Bewerken-> Instell Ocorreu um erro enviando a transação. O erro foi: - - + + No Connection Geen Verbinding @@ -1426,9 +1478,8 @@ Stel de host / poort en gebruiker / wachtwoord in het menu Bewerken-> Instell Label Verwijderen - Tx submitted (right click to copy) txid: - Tx toegevoegd (rechter muisknop-klikken om te kopieren) txid: + Tx toegevoegd (rechter muisknop-klikken om te kopieren) txid: Locked funds @@ -1479,12 +1530,12 @@ Je hebt nog onbevestigde transacties of je saldo is te laag voor een automatisch Connectie via het internet via SilentDragon wormhole service - + No addresses with enough balance to spend! Try sweeping funds into one address - + Node is still syncing. Node is nog steeds aan het synchroniseren. @@ -1496,6 +1547,11 @@ Je hebt nog onbevestigde transacties of je saldo is te laag voor een automatisch View on block explorer Geef block weer in de block explorer + + + Transaction submitted (right click to copy) txid: + + RecurringDialog @@ -1699,27 +1755,27 @@ Je hebt nog onbevestigde transacties of je saldo is te laag voor een automatisch Opties - + default - + blue - + light - + dark - + Check github for updates at startup Check github voor updates bij opstarten @@ -1729,112 +1785,332 @@ Je hebt nog onbevestigde transacties of je saldo is te laag voor een automatisch - + Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally. Verbind naar het Tor netwerk via SOCKS proxy uitvoerend op 127.0.0.1:9050. Opmerking is dat je het programma extern moet installeren en moet uitvoeren voor de Tor service. - + Shielded transactions are saved locally and shown in the transactions tab. If you uncheck this, shielded transactions will not appear in the transactions tab. Afgeschermde transacties zijn lokaal opgeslagen en zijn weergegeven in het transactie tabblad. Als je dit vinkje weghaald wordt de afgeschermde transactie niet zichtbaar in het transactie tabblad. - + + Local Currency + + + + + AED + + + + + ARS + + + + + AUD + + + + + BDT + + + + + BHD + + + + + BMD + + + + + BRL + + + + + BTC + + + + + CAD + + + + + CHF + + + + + CLP + + + + + CNY + + + + + CZK + + + + + DKK + + + + + EUR + + + + + GBP + + + + + HKD + + + + + HUF + + + + + IDR + + + + + ILS + + + + + INR + + + + + JPY + + + + + KRW + + + + + KWD + + + + + LKR + + + + + PKR + + + + + MXN + + + + + NOK + + + + + NZD + + + + + RUB + + + + + SAR + + + + + SEK + + + + + SGD + + + + + THB + + + + + TRY + + + + + TWD + + + + + UAH + + + + + USD + + + + + VEF + + + + + VND + + + + + XAG + + + + + XAU + + + + + ZAR + + + + Connect via Tor Connectie via Tor - + Connect to github on startup to check for updates Verbind met github tijdens het opstarten om te checken voor updates - + Connect to the internet to fetch HUSH prices Verbind met het internet om de HUSH prijs op te halen - - Fetch HUSH / USD prices - Haal HUSH / USD prijzen op + + Fetch HUSH prices + Haal HUSH prijzen op - + Explorer - + Tx Explorer URL - + Address Explorer URL - + Testnet Tx Explorer URL - + Testnet Address Explorer URL - + Troubleshooting Probleemoplossing - + Reindex Reindex - + Rescan the blockchain for any missing wallet transactions and to correct your wallet balance. This may take several hours. You need to restart SilentDragon for this to take effect Herscan de blockchain for missende wallet.dat transacties en om je wallet saldo te corrigeren. Dit kan enkele uren duren. U moet SilentDragon opnieuw opstarten om dit te activeren - + Rescan Rescan - + Rebuild the entire blockchain from the genesis block, by rescanning all the block files. This may take several hours to days, depending on your hardware. You need to restart SilentDragon for this to take effect Herbouw de gehele blockchain vanuit het genesis block door het herscannen van alle block bestanden. Dit kan enkele uren duren. U moet SilentDragon opnieuw opstarten om dit te activeren - + Clear History Geschiedenis wissen - + Remember shielded transactions Herinner afgeschermde transacties - + Allow custom fees Aangepaste kosten toestaan - + Allow overriding the default fees when sending transactions. Enabling this option may compromise your privacy since fees are transparent. Sta toe om de standard kosten te overschrijven wanneer een transactie wordt verstuurd. Wanneer dit wordt toegepast kan het zijn dat je transactie zichtbaar is omdat je kosten transparant zijn. - + Normally, change from t-Addresses goes to another t-Address. Checking this option will send the change to your shielded sapling address instead. Check this option to increase your privacy. Normaal gesproken gaat verandering van t-adressen naar een ander t-adres. Als u deze optie inschakelt, wordt de wijziging in plaats daarvan naar uw afgeschermde sapling adres verzonden. Vink deze optie aan om uw privacy te vergroten. - + Shield change from t-Addresses to your sapling address Afgeschermde wijziging van t-Adressen naar jouw sapling adres diff --git a/res/silentdragon_pt.qm b/res/silentdragon_pt.qm index bf20aff..c18891b 100644 Binary files a/res/silentdragon_pt.qm and b/res/silentdragon_pt.qm differ diff --git a/res/silentdragon_pt.ts b/res/silentdragon_pt.ts index 6720b73..6fa2a36 100644 --- a/res/silentdragon_pt.ts +++ b/res/silentdragon_pt.ts @@ -147,8 +147,8 @@ - - + + Memo Anexar recado @@ -175,7 +175,7 @@ - + Miner Fee Taxa de mineração @@ -200,47 +200,77 @@ Tipo de Endereço - + + Market + + + + + <html><head/><body><p align="center"><span style=" font-weight:600;">Hush Market Information</span></p></body></html> + + + + + Market Cap + + + + + 24H Volume + + + + Local Services - + Longest Chain - + Wallet Transactions - + + Chain Transactions + + + + + &Report a bug on Github + + + + &Send Duke Feedback &Enviar feedback do Duke - + &Hush Discord &Hush Discord - + &Hush Website &Hush site da Internet - + Pay HUSH &URI... Pagar HUSH &URI... - + Request HUSH... Solicitação HUSH... - + Validate Address Validar endereço @@ -283,7 +313,7 @@ - + Export Private Key Exportar Chave Privada @@ -293,68 +323,75 @@ Transações - + hushd hushd - + You are currently not mining Você não está minerando atualmente - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + Loading... Carregando... - + Block height Altura do Bloco - + Network solution rate Taxa de soluções da rede - + Connections Conexões - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + | | @@ -374,92 +411,92 @@ Ver todos os endereços - + Notarized Hash Hash Notarizado - + Notarized txid Txid Notarizado - + Notarized Lag Lag Notarizado - + KMD Version Versão KMD - + Protocol Version Versão do protocolo - + Version Versão - + P2P Port Porta P2P - + RPC Port Porta RPC - + Client Name Nome do cliente - + Next Halving Próxima metade - + &File &Arquivo - + &Help &Ajuda - + &Apps &Aplicações - + &Edit &Editar - + E&xit Sair - + &About &Sobre - + &Settings &Preferências - + Ctrl+P Ctrl+P @@ -468,103 +505,103 @@ &Doar - + Check github.com for &updates &Checar github.com por atualizações - + Sapling &turnstile Sapling &turnstile - + Ctrl+A, Ctrl+T Ctrl+A, Ctrl+T - + &Import private key &Importar chave privada - + &Export all private keys &Exportar todas as chaves privadas - + &z-board.net &z-board.net - + Ctrl+A, Ctrl+Z Ctrl+A, Ctrl+Z - + Address &book &Agenda de Endereços - + Ctrl+B Ctrl+B - + &Backup wallet.dat &Salvar wallet.dat - - + + Export transactions Transações de exportação - + Connect mobile &app Conectar &aplicativo móvel - + Ctrl+M Ctrl+M - + Tor configuration is available only when running an embedded hushd. A configuração do Tor está disponível apenas ao executar um hushd incorporado. - + You're using an external hushd. Please restart hushd with -rescan Você está usando um hushd externo. Por favor, reinicie o hushd com -rescan - + You're using an external hushd. Please restart hushd with -reindex Você está usando um hushd externo. Por favor, reinicie o hushd com -reindex - + Enable Tor Ativar Tor - + Connection over Tor has been enabled. To use this feature, you need to restart SilentDragon. A conexão através do Tor foi ativada. Para usar esse recurso, você precisa reiniciar o SilentDragon. - + Disable Tor Desativar Tor - + Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart SilentDragon. A conexão através do Tor foi desativada. Para se desconectar totalmente do Tor, é necessário reiniciar o SilentDragon. @@ -597,27 +634,17 @@ Chaves importadas. Pode demorar alguns minutos para re-escanear a blockchain. Até lá, funcionalidades poderão estar limitadas - + Private key import rescan finished Re-escan de chave privada completo - + SilentDragon needs to restart to rescan/reindex. SilentDragon will now close, please restart SilentDragon to continue O SilentDragon precisa reiniciar para redigitalizar / reindexar. O SilentDragon agora será fechado. Reinicie o SilentDragon para continuar - - Restart - - - - - Please restart SilentDragon to have the theme apply - - - - + Restart SilentDragon Reinicie o SilentDragon @@ -630,161 +657,177 @@ As chaves serão importadas em seu nó hushd conectado - + + Theme Change + + + + + + This change can take a few seconds. + + + + + Currency Change + + + + Some feedback about SilentDragon or Hush... Alguns comentários sobre SilentDragon ou Hush ... - + Send Duke some private and shielded feedback about Envie para Duke algum feedback privado e protegido sobre - + or SilentDragon ou SilentDragon - + Enter Address to validate Digite o endereço para validar - + Transparent or Shielded Address: Endereço transparente ou blindado: - + Paste HUSH URI Colar HUSH URI - + Error paying Hush URI Erro ao pagar o URI do Hush - + URI should be of the form 'hush:<addr>?amt=x&memo=y O URI deve ter o formato - + Please paste your private keys here, one per line Cole suas chaves privadas aqui, uma por linha - + The keys will be imported into your connected Hush node As chaves serão importadas para o nó Hush conectado - + The keys were imported! It may take several minutes to rescan the blockchain. Until then, functionality may be limited As chaves foram importadas! Pode levar alguns minutos para verificar novamente o blockchain. Até lá, a funcionalidade pode ser limitada - + Error Erro - + Error exporting transactions, file was not saved Erro ao exportar transações, o arquivo não foi salvo - + No wallet.dat Nenhum wallet.data - + Couldn't find the wallet.dat on this computer Não foi localizado o wallet.dat nesse computador - + You need to back it up from the machine hushd is running on Você precisar salvar a partir da máquina que hushd está rodando - + Backup wallet.dat Salvar wallet.dat - + Couldn't backup Não foi possível salvar - + Couldn't backup the wallet.dat file. Não foi possível salvar o arquivo wallet.dat. - + You need to back it up manually. Você precisar salvá-lo manualmente. - + These are all the private keys for all the addresses in your wallet YOUR_TRANSLATION_HERE - + Private key for Chave privada para - + Save File Salvar Arquivo - + Unable to open file Não foi possível abrir o arquivo - - + + Copy address Copiar endereço - - - + + + Copied to clipboard Copiado - + Get private key Obter chave privada - + Shield balance to Sapling Blindar saldo para Sapling - - + + View on block explorer Ver no explorador de blocos - + Address Asset Viewer Endereço Asset Viewer - + Convert Address Converter Endereço @@ -793,42 +836,47 @@ Migrar para Sapling - + Copy txid Copiar txid - + + Copy block explorer link + + + + View Payment Request Exibir solicitação de pagamento - + View Memo Ver Recado - + Reply to Responder a - + Created new t-Addr Criar novo t-Addr - + Copy Address Copiar endereço - + Address has been previously used O endereço foi usado anteriormente - + Address is unused Endereço não utilizado @@ -888,34 +936,38 @@ doesn't look like a z-address não se parece com um z-Address - + Change from Troco de - + Current balance : Saldo atual: - + Balance after this Tx: Saldo após este Tx: - + Transaction Error Erro na Transação - + Computing transaction: - + + From Address is Invalid! + + + From Address is Invalid - Endereço de partida inválido + Endereço de partida inválido @@ -1154,82 +1206,82 @@ Se tudo mais falhar, execute o hushd manualmente. MB a - + This may take several hours, grab some popcorn Isso pode levar várias horas, pegue um pouco de pipoca - + There was an error! : Havia um erro! : - + Downloading blocks Baixando blocos - + Block height Altura do bloco - + Syncing Sincronizando - + Connected Conectado - + testnet: testnet: - + Connected to hushd Conectado ao hushd - + There was an error connecting to hushd. The error was Ocorreu um erro conectando ao hushd. O erro foi - + transaction computing. - + Please enhance your calm and wait for SilentDragon to exit - + Waiting for hushd to exit, y'all - + Transaction - + The transaction with id A transação com id - + failed. The error was falhou. O erro foi - + failed falhou @@ -1238,7 +1290,7 @@ Se tudo mais falhar, execute o hushd manualmente. Tx - + hushd has no peer connections! Network issues? O hushd não tem conexões de pares! Problemas de rede? @@ -1247,12 +1299,12 @@ Se tudo mais falhar, execute o hushd manualmente. gerando transação. Isso pode levar alguns minutos. - + Update Available Atualização disponível - + A new release v%1 is available! You have v%2. Would you like to visit the releases page? @@ -1261,12 +1313,12 @@ Would you like to visit the releases page? Você gostaria de visitar a página de lançamentos? - + No updates available Nenhuma atualização disponível - + You already have the latest release v%1 Você já tem a versão mais recente v%1 @@ -1289,7 +1341,7 @@ Would you like to visit the releases page? erro no hushd - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1298,7 +1350,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1307,24 +1359,24 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Autenticação falhou. O usuário/senha especificado não foi aceitado pelo hushd. Tente alterá-los em Editar->Preferências - + Your hushd is starting up. Please wait. Seu hushd está iniciando. Por favor aguarde. - - + + Connection Error Erro na Conexão - - + + Transaction Error Erro na transação @@ -1333,8 +1385,8 @@ Por favor, coloque o host/porta e usuário/senha no menu Editar>Preferências Ocorreu um erro enviando a transação. O erro foi: - - + + No Connection Sem Conexão @@ -1413,9 +1465,8 @@ Por favor, coloque o host/porta e usuário/senha no menu Editar>Preferências Deletar etiqueta - Tx submitted (right click to copy) txid: - Tx enviada (botão-direito para copiar) txid: + Tx enviada (botão-direito para copiar) txid: Locked funds @@ -1462,12 +1513,12 @@ Você possui fundos não confirmados ou o saldo é muito baixo para uma migraç Conectado pela Internet através do serviço SilentDragon wormhole - + Node is still syncing. O nó ainda está sincronizando. - + No addresses with enough balance to spend! Try sweeping funds into one address @@ -1475,6 +1526,11 @@ Você possui fundos não confirmados ou o saldo é muito baixo para uma migraç No sapling or transparent addresses with enough balance to spend. Não há endereços novos ou transparentes com saldo suficiente para gastar. + + + Transaction submitted (right click to copy) txid: + + RecurringDialog @@ -1630,17 +1686,17 @@ Você possui fundos não confirmados ou o saldo é muito baixo para uma migraç Opções - + Check github for updates at startup - + Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally. Conecte-se à rede Tor através do proxy SOCKS executando em 127.0.0.1:9050. Observe que você precisará instalar e executar o serviço Tor externamente. - + Shielded transactions are saved locally and shown in the transactions tab. If you uncheck this, shielded transactions will not appear in the transactions tab. Transações blindadas são salvas localmente e exibidas na aba de transações. Se desmarcado, transações blindadas não aparecerão na aba de transações. @@ -1651,121 +1707,341 @@ Você possui fundos não confirmados ou o saldo é muito baixo para uma migraç + Local Currency + + + + + AED + + + + + ARS + + + + + AUD + + + + + BDT + + + + + BHD + + + + + BMD + + + + + BRL + + + + + BTC + + + + + CAD + + + + + CHF + + + + + CLP + + + + + CNY + + + + + CZK + + + + + DKK + + + + + EUR + + + + + GBP + + + + + HKD + + + + + HUF + + + + + IDR + + + + + ILS + + + + + INR + + + + + JPY + + + + + KRW + + + + + KWD + + + + + LKR + + + + + PKR + + + + + MXN + + + + + NOK + + + + + NZD + + + + + RUB + + + + + SAR + + + + + SEK + + + + + SGD + + + + + THB + + + + + TRY + + + + + TWD + + + + + UAH + + + + + USD + + + + + VEF + + + + + VND + + + + + XAG + + + + + XAU + + + + + ZAR + + + + default - + blue - + light - + dark - + Connect via Tor Conectar via Tor - + Connect to github on startup to check for updates - + Connect to the internet to fetch HUSH prices - - Fetch HUSH / USD prices + + Fetch HUSH prices - + Explorer - + Tx Explorer URL - + Address Explorer URL - + Testnet Tx Explorer URL - + Testnet Address Explorer URL - + Troubleshooting - + Reindex Reindex - + Rescan the blockchain for any missing wallet transactions and to correct your wallet balance. This may take several hours. You need to restart SilentDragon for this to take effect Analise novamente o blockchain em busca de transações ausentes na carteira e corrija seu saldo. Isso pode levar várias horas. Você precisa reiniciar o SilentDragon para que isso entre em vigor - + Rescan Rescan - + Rebuild the entire blockchain from the genesis block, by rescanning all the block files. This may take several hours to days, depending on your hardware. You need to restart SilentDragon for this to take effect Reconstrua toda a blockchain a partir do bloco genesis, redigitalizando todos os arquivos do bloco. Isso pode levar várias horas a dias, dependendo do seu hardware. Você precisa reiniciar o SilentDragon para que isso entre em vigor - + Clear History Limpar histórico - + Remember shielded transactions Lembrar transações blindadas - + Allow custom fees Permitir taxas customizadas - + Allow overriding the default fees when sending transactions. Enabling this option may compromise your privacy since fees are transparent. Permite configurar as taxas de transação manualmente. Ativar essa opção pode comprometer sua privacidade uma vez que as taxas são transparentes na rede. - + Normally, change from t-Addresses goes to another t-Address. Checking this option will send the change to your shielded sapling address instead. Check this option to increase your privacy. Normalmente, trocos de um t-Address vão para outro t-Address. Ativar essa opção irá fazer com que o troco seja encaminhando para um endereço blindado. Ative essa opção para aumentar sua privacidade. - + Shield change from t-Addresses to your sapling address Blinde trocos de t-Addresses para seu endereço Sapling diff --git a/res/silentdragon_ru.qm b/res/silentdragon_ru.qm index bb0899e..e1f7bb1 100644 Binary files a/res/silentdragon_ru.qm and b/res/silentdragon_ru.qm differ diff --git a/res/silentdragon_ru.ts b/res/silentdragon_ru.ts index a138e40..913bf05 100644 --- a/res/silentdragon_ru.ts +++ b/res/silentdragon_ru.ts @@ -163,8 +163,8 @@ - - + + Memo Метка @@ -191,7 +191,7 @@ - + Miner Fee Комиссия майнерам @@ -216,7 +216,7 @@ Тип адреса - + hushd hushd @@ -233,7 +233,7 @@ Запрос safecoin... - + Validate Address Проверить адрес @@ -274,7 +274,7 @@ - + Export Private Key Экспорт приватного ключа @@ -293,259 +293,296 @@ Транзакции - + You are currently not mining Майнинг отключен - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + Loading... Загрузка... - + Block height Высота блока - + Network solution rate Скорость сети - + Connections Подключений - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + | | - + + Market + + + + + <html><head/><body><p align="center"><span style=" font-weight:600;">Hush Market Information</span></p></body></html> + + + + + Market Cap + + + + + 24H Volume + + + + Notarized Hash - + Notarized txid - + Notarized Lag - + KMD Version - + Protocol Version - + Version - + P2P Port - + RPC Port - + Client Name - + Next Halving - + Local Services - + Longest Chain - + Wallet Transactions - + + Chain Transactions + + + + &File &Файл - + &Help &Помощь - + &Apps &Дополнения - + &Edit &Редактировать - + E&xit &Выход - + &About &О кошельке - + + &Report a bug on Github + + + + &Settings &Настройки - + Ctrl+P Ctrl+P - + &Send Duke Feedback &Пожертвование для Duke - + &Hush Discord &Hush Discord - + &Hush Website &Сайт Hush - + Check github.com for &updates &Проверить github.com на обновления - + Sapling &turnstile - + Ctrl+A, Ctrl+T - + &Import private key &Импорт приватного ключа - + &Export all private keys &Экспорт всех приватных ключей - + &z-board.net - + Ctrl+A, Ctrl+Z - + Address &book &Адресная книга - + Ctrl+B Ctrl+B - + &Backup wallet.dat &Сохранить wallet.dat - - + + Export transactions Экспорт транзакций - + Pay HUSH &URI... - + Connect mobile &app - + Ctrl+M - + Request HUSH... @@ -558,32 +595,32 @@ Сообщить об ошибке... - + Enable Tor Включить Tor - + Connection over Tor has been enabled. To use this feature, you need to restart SilentDragon. Соединение через Tor было включено. Чтобы использовать эту функцию, вам нужно перезапустить SilentDragon. - + Disable Tor Отключить Tor - + Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart SilentDragon. Соединение через Tor было отключено. Чтобы полностью отключиться от Tor, вам нужно перезапустить SilentDragon. - + Some feedback about SilentDragon or Hush... - + Send Duke some private and shielded feedback about @@ -596,27 +633,17 @@ Ключи были импортированы. Повторное сканирование блокчейна может занять несколько минут. До тех пор функциональность может быть ограничена - + Private key import rescan finished Повторное сканирование приватного ключа завершено - + SilentDragon needs to restart to rescan/reindex. SilentDragon will now close, please restart SilentDragon to continue SilentDragon необходимо перезапустить для повторного сканирования/переиндексации. Перезапустите SilentDragon, чтобы продолжить - - Restart - - - - - Please restart SilentDragon to have the theme apply - - - - + Restart SilentDragon Перезапуск SilentDragon @@ -633,145 +660,166 @@ Ключи будут импортированы в ваш подключенный узел hushd - + + Theme Change + + + + + + This change can take a few seconds. + + + + + Currency Change + + + + Paste HUSH URI - + Error paying Hush URI - + URI should be of the form 'hush:<addr>?amt=x&memo=y - + Please paste your private keys here, one per line - + The keys will be imported into your connected Hush node - + The keys were imported! It may take several minutes to rescan the blockchain. Until then, functionality may be limited - + Error Ошибка - + Error exporting transactions, file was not saved Ошибка экспорта транзакций, файл не был сохранен - + No wallet.dat Нет wallet.dat - + Couldn't find the wallet.dat on this computer Не удалось найти wallet.dat на этом компьютере - + You need to back it up from the machine hushd is running on Вы должны сделать резервную копию с машины, на которой работает hushd - + Backup wallet.dat Сохранить wallet.dat - + Couldn't backup Не удалось сохранить - + Couldn't backup the wallet.dat file. Не удалось сохранить файл wallet.dat - + You need to back it up manually. Вам нужно сделать резервную копию вручную. - + These are all the private keys for all the addresses in your wallet Это все приватные ключи для всех адресов в вашем кошельке - + Private key for Приватный ключ для - + Save File Сохранить файл - + Unable to open file Невозможно открыть файл - - + + Copy address Скопировать адрес - - - + + + Copied to clipboard Скопировано в буфер обмена - + Get private key Получить приватный ключ - + Shield balance to Sapling Shield balance to Sapling - - + + View on block explorer Посмотреть в проводнике блоков - + Address Asset Viewer - + Convert Address + + + Copy block explorer link + + Migrate to Sapling Migrate to Sapling - + Copy txid Скопировать txid @@ -788,17 +836,17 @@ Обновить - + Tor configuration is available only when running an embedded hushd. Конфигурация Tor доступна только при работе со встроенным hushd. - + You're using an external hushd. Please restart hushd with -rescan Вы используете внешний hushd. Пожалуйста, перезапустите hushd с -rescan - + You're using an external hushd. Please restart hushd with -reindex Вы используете внешний hushd. Пожалуйста, перезапустите hushd с -reindex @@ -875,17 +923,17 @@ Отправить для OleksandrBlack благодарность за - + or SilentDragon или SilentDragon - + Enter Address to validate Введите адрес для проверки - + Transparent or Shielded Address: Прозрачный или экранированный адрес: @@ -906,37 +954,37 @@ Это может занять несколько минут. Загрузка... - + View Payment Request Посмотреть запрос на оплату - + View Memo Посмотреть метку - + Reply to Ответить на - + Created new t-Addr Создать новый t-Addr (R) - + Copy Address Копировать адрес - + Address has been previously used Адрес был ранее использован - + Address is unused Адрес не используется @@ -1004,34 +1052,38 @@ doesn't look like a z-address не похоже на z-адрес - + Change from Изменить с - + Current balance : Текущий баланс : - + Balance after this Tx: Баланс после этой Tx: - + Transaction Error Ошибка транзакции - + Computing transaction: - + + From Address is Invalid! + + + From Address is Invalid - От адреса неверно + От адреса неверно @@ -1262,7 +1314,7 @@ Not starting embedded hushd because --no-embedded was passed ошибка hushd - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1271,27 +1323,27 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Аутентификация не удалась. username / password, которые вы указали, не были приняты hushd. Попробуйте изменить его в меню Редактировать-> Настройки - + Your hushd is starting up. Please wait. Ваш hushd запускается. Пожалуйста, подождите. - + This may take several hours, grab some popcorn - + There was an error! : - + Downloading blocks Загрузка блоков @@ -1300,52 +1352,52 @@ Please set the host/port and user/password in the Edit->Settings menu.Готово! Благодарим Вас за помощь в защите сети Hush, запустив полный узел. - + Block height Высота блоков - + Syncing Синхронизация - + Connected Подключено - + testnet: testnet: - + Connected to hushd Подключен к hushd - + hushd has no peer connections! Network issues? - + There was an error connecting to hushd. The error was При подключении к hushd произошла ошибка. Ошибка - + transaction computing. - + Please enhance your calm and wait for SilentDragon to exit - + Waiting for hushd to exit, y'all @@ -1362,22 +1414,22 @@ Please set the host/port and user/password in the Edit->Settings menu.не подтверждено - + Transaction - + The transaction with id Транзакция с id - + failed. The error was не удалось. Ошибка - + failed ошибка @@ -1394,12 +1446,12 @@ Please set the host/port and user/password in the Edit->Settings menu. tx вычисляется. Это может занять несколько минут. - + Update Available Доступно обновление - + A new release v%1 is available! You have v%2. Would you like to visit the releases page? @@ -1408,12 +1460,12 @@ Would you like to visit the releases page? Хотели бы вы посетить страницу релизов? - + No updates available Нет доступных обновлений - + You already have the latest release v%1 У вас уже есть последняя версия v%1 @@ -1431,7 +1483,7 @@ Would you like to visit the releases page? не удалось. Пожалуйста, проверьте сайт справки для получения дополнительной информации - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1444,14 +1496,14 @@ Please set the host/port and user/password in the Edit->Settings menu.Это может занять несколько часов - - + + Connection Error Ошибка соединения - - + + Transaction Error ">Ошибка транзакции @@ -1460,8 +1512,8 @@ Please set the host/port and user/password in the Edit->Settings menu.Произошла ошибка при отправке транзакции. Ошибка была: - - + + No Connection Нет соединения @@ -1536,9 +1588,8 @@ Please set the host/port and user/password in the Edit->Settings menu.Удалить метку - Tx submitted (right click to copy) txid: - Tx представлен (кликните правой кнопкой мыши, чтобы скопировать) txid: + Tx представлен (кликните правой кнопкой мыши, чтобы скопировать) txid: Locked funds @@ -1589,12 +1640,12 @@ You either have unconfirmed funds or the balance is too low for an automatic mig Подключение через Интернет с помощью сервиса wormhol SilentDragon - + Node is still syncing. Узел все еще синхронизируется. - + No addresses with enough balance to spend! Try sweeping funds into one address @@ -1630,6 +1681,11 @@ You either have unconfirmed funds or the balance is too low for an automatic mig All future payments will be cancelled. Все будущие платежи будут отменены. + + + Transaction submitted (right click to copy) txid: + + RecurringDialog @@ -1921,23 +1977,23 @@ You either have unconfirmed funds or the balance is too low for an automatic mig Опции - + Check github for updates at startup Проверьте github на наличие обновлений при запуске - + Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally. Подключаться к сети Tor через SOCKS-прокси, работающий на 127.0.0.1:9050. Обратите внимание, что вам необходимо устанавливать и запускать сервис Tor извне. - + Connect to the internet to fetch HUSH prices Подключаться к Интернету, чтобы получить текущую цену HUSH - - Fetch HUSH / USD prices + + Fetch HUSH prices Получить цены HUSH/USD @@ -2005,12 +2061,12 @@ You either have unconfirmed funds or the balance is too low for an automatic mig Стандартно, это: 0333b9796526ef8de88712a649d618689a1de1ed1adf9fb5ec415f31e560b1f9a3 - + Shielded transactions are saved locally and shown in the transactions tab. If you uncheck this, shielded transactions will not appear in the transactions tab. Экранированные транзакции сохраняются локально и отображаются на вкладке транзакций. Если снять этот флажок, экранированные транзакции не будут отображаться на вкладке транзакций. - + Connect via Tor Подключаться через Tor @@ -2021,106 +2077,326 @@ You either have unconfirmed funds or the balance is too low for an automatic mig + Local Currency + + + + + AED + + + + + ARS + + + + + AUD + + + + + BDT + + + + + BHD + + + + + BMD + + + + + BRL + + + + + BTC + + + + + CAD + + + + + CHF + + + + + CLP + + + + + CNY + + + + + CZK + + + + + DKK + + + + + EUR + + + + + GBP + + + + + HKD + + + + + HUF + + + + + IDR + + + + + ILS + + + + + INR + + + + + JPY + + + + + KRW + + + + + KWD + + + + + LKR + + + + + PKR + + + + + MXN + + + + + NOK + + + + + NZD + + + + + RUB + + + + + SAR + + + + + SEK + + + + + SGD + + + + + THB + + + + + TRY + + + + + TWD + + + + + UAH + + + + + USD + + + + + VEF + + + + + VND + + + + + XAG + + + + + XAU + + + + + ZAR + + + + default - + blue - + light - + dark - + Connect to github on startup to check for updates Подключаться к github при запуске, чтобы проверить наличие обновлений - + Explorer - + Tx Explorer URL - + Address Explorer URL - + Testnet Tx Explorer URL - + Testnet Address Explorer URL - + Troubleshooting Исправление проблем - + Reindex Reindex - + Rescan the blockchain for any missing wallet transactions and to correct your wallet balance. This may take several hours. You need to restart SilentDragon for this to take effect Повторно сканирует блокчейн для любых пропущенных транзакций кошелька и исправляет баланс вашего кошелька. Это может занять несколько часов. Вам нужно перезапустить SilentDragon, чтобы это вступило в силу - + Rescan Rescan - + Rebuild the entire blockchain from the genesis block, by rescanning all the block files. This may take several hours to days, depending on your hardware. You need to restart SilentDragon for this to take effect Перестраивает весь блокчейн из блока генезиса путем повторного сканирования всех файлов блоков. Это может занять несколько часов или дней, в зависимости от вашего оборудования. Вам нужно перезапустить SilentDragon, чтобы это вступило в силу - + Clear History Очистить историю - + Remember shielded transactions Запоминать экранированные транзакции - + Allow custom fees Разрешить настраиваемую комиссию - + Allow overriding the default fees when sending transactions. Enabling this option may compromise your privacy since fees are transparent. Разрешить изменение размера комиссии по умолчанию при отправке транзакций. Включение этой опции может поставить под угрозу вашу конфиденциальность, так как комисия прозрачна. - + Normally, change from t-Addresses goes to another t-Address. Checking this option will send the change to your shielded sapling address instead. Check this option to increase your privacy. Обычно сдача с прозрачных адресов переходит на другой прозрачный адрес. Если вы выберете эту опцию, вы отправите сдачу на ваш экранированный адрес. Отметьте эту опцию, чтобы увеличить вашу конфиденциальность. - + Shield change from t-Addresses to your sapling address Экранирование сдачи с прозрачных адресов на ваш экранированный адрес diff --git a/res/silentdragon_sr.qm b/res/silentdragon_sr.qm index 9f6af0a..1f86dfc 100644 Binary files a/res/silentdragon_sr.qm and b/res/silentdragon_sr.qm differ diff --git a/res/silentdragon_sr.ts b/res/silentdragon_sr.ts index 0a835a2..804ce32 100644 --- a/res/silentdragon_sr.ts +++ b/res/silentdragon_sr.ts @@ -143,8 +143,8 @@ - - + + Memo Poruka (memo) @@ -171,7 +171,7 @@ - + Miner Fee Naknada za rudarenje @@ -237,7 +237,7 @@ - + Export Private Key Izvoz privatnog ključa @@ -247,528 +247,584 @@ Transakcije - + hushd hushd - + You are currently not mining Trenutno ne rudarite - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + Loading... Učitavanje... - + + Market + + + + + <html><head/><body><p align="center"><span style=" font-weight:600;">Hush Market Information</span></p></body></html> + + + + + Market Cap + + + + + 24H Volume + + + + Block height Visina bloka - + Notarized Hash Potvrđen hash - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + | | - + Notarized txid Potvrđen txid - + Notarized Lag Potvrđeno zaostajanje - + KMD Version KMD verzija - + Protocol Version Verzija protokola - + Version Verzija - + P2P Port P2P port - + RPC Port RPC port - + Client Name Ime klijenta - + Next Halving Sledeći halving - + Local Services Lokalni servisi - + Longest Chain Najduži niz - + Wallet Transactions Transakcije u novčaniku - + + Chain Transactions + + + + Network solution rate Snaga mreže - + Connections Povezanost - + &File &Datoteka - + &Help &Pomoć - + &Apps &Apps - + &Edit &Uredi - + E&xit &Izlaz - + &About &O - + + &Report a bug on Github + + + + &Settings &Podešavanja - + Ctrl+P Ctrl+P - + &Send Duke Feedback &Pošalji Duke Feedback - + &Hush Discord &Hush Discord - + &Hush Website &Hush Web stranica - + Check github.com for &updates Proveri na github.com &dopune - + Sapling &turnstile Sapling &čvorište - + Ctrl+A, Ctrl+T Ctrl+A, Ctrl+T - + &Import private key &Uvoz privatnog ključa - + &Export all private keys &Izvoz svih privatnih ključeva - + &z-board.net &z-board.net - + Ctrl+A, Ctrl+Z Ctrl+A, Ctrl+Z - + Address &book Adresna &knjiga - + Ctrl+B Ctrl+B - + &Backup wallet.dat &Rezervna kopija wallet.dat - - + + Export transactions Izvoz transakcija - + Pay HUSH &URI... Hush plaćanje &URI... - + Connect mobile &app Spoji mobilnu &app - + Ctrl+M Ctrl+M - + Request HUSH... Zatraži HUSH... - + Validate Address Potvrdi adresu - Restart - Ponovo pokreni + Ponovo pokreni - Please restart SilentDragon to have the theme apply - Molim ponovo pokrenite SilentDragon kako bi primenili temu + Molim ponovo pokrenite SilentDragon kako bi primenili temu + + + + Theme Change + - + + + This change can take a few seconds. + + + + + Currency Change + + + + Tor configuration is available only when running an embedded hushd. Tor postavke su dostupne samo ako je pokrenut integrirani hushd. - + You're using an external hushd. Please restart hushd with -rescan Koristite vanjski hushd. Molim ponovo pokrenite hushd sa -rescan - + You're using an external hushd. Please restart hushd with -reindex Koristite vanjski hushd. Molim ponovo pokrenite hushd sa -reindex - + Enable Tor Omogući Tor - + Connection over Tor has been enabled. To use this feature, you need to restart SilentDragon. Veza putem Tora je omogućena. Ako želite koristiti ovo svojstvo, morate ponovo pokrenuti SilentDragon. - + Disable Tor Onemogući Tor - + Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart SilentDragon. Veza putem Tora je onemogućena. Ako se želite potpuno maknuti sa Tora, morate ponovo pokrenuti SilentDragon. - + SilentDragon needs to restart to rescan/reindex. SilentDragon will now close, please restart SilentDragon to continue SilentDragon se mora ponovo pokrenuti za rescan/reindex. SilentDragon će se sada zatvoriti, molim ponovn pokrenite SilentDragon za nastavak - + Restart SilentDragon Ponovo pokrenite SilentDragon - + Some feedback about SilentDragon or Hush... Neke povratne informacije o SilentDragonu ili Hushu... - + Send Duke some private and shielded feedback about Pošaljite Duke privatnu i zaštićenu povratnu informaciju o - + or SilentDragon ili SilentDragon - + Enter Address to validate Unesite adresu za potvrdu - + Transparent or Shielded Address: Transparentna ili Zaštićena adresa: - + Private key import rescan finished Dovršen rescan uvoza privatnog ključa - + Paste HUSH URI Zalepi HUSH URI - + Error paying Hush URI Greška prilikom plaćanja Hush URI - + URI should be of the form 'hush:<addr>?amt=x&memo=y URI treba biti formata 'hush:<addr>?amt=x&memo=y - + Please paste your private keys here, one per line Molim vas zalepite vaše privatne ključeve ovdje, jedan ključ po redu - + The keys will be imported into your connected Hush node Ključevi će biti unešeni u vaš povezani Hush čvor - + The keys were imported! It may take several minutes to rescan the blockchain. Until then, functionality may be limited Ključevi su unešeni. Rescan blockchaina može potrajati i do nekoliko minuta. Do tada su limitirane funkcionalnosti - + Error Greška - + Error exporting transactions, file was not saved Greška prilikom izvoza transakcija, datoteka nije spremljena - + No wallet.dat Nema wallet.dat - + Couldn't find the wallet.dat on this computer Ne mogu pronaći wallet.dat na ovom računaru - + You need to back it up from the machine hushd is running on Morate napraviti rezervnu kopiju na računaru na kojem je aktivan hushd - + Backup wallet.dat Rezervna kopija wallet.dat - + Couldn't backup Nije moguće napraviti rezervnu kopiju - + Couldn't backup the wallet.dat file. Nije moguće napraviti rezervnu kopiju wallet.dat datoteke. - + You need to back it up manually. Morate ručno napraviti rezervnu kopiju. - + These are all the private keys for all the addresses in your wallet Ovo su svi privatni ključevi svih adresa u vašem novčaniku - + Private key for Privatni ključ za - + Save File Spremi datoteku - + Unable to open file Nije moguće otvoriti datoteku - - + + Copy address Kopirajte adresu - - - + + + Copied to clipboard Kopirano u međuspremnik - + Get private key Dobavi privatni ključ - + Shield balance to Sapling Zaštiti saldo u Sapling - - + + View on block explorer Pogledaj na blok exploreru - + Address Asset Viewer Preglednik adresa - + Convert Address Pretvorite adresu - + Copy txid Kopitajte txid - + + Copy block explorer link + + + + View Payment Request Pogledajte zahtjev o plaćanju - + View Memo Pogledajte poruku (memo) - + Reply to Odgovorite - + Created new t-Addr Napravljena je nova transparentna adresa - + Copy Address Kopirajte adresu - + Address has been previously used Adresa je već korištena - + Address is unused Adresa nije korištena @@ -828,38 +884,42 @@ doesn't look like a z-address ne izgleda kao z-adresa - + Change from Promeniti iz - + Current balance : Trenutni saldo : - + Balance after this Tx: Saldo nakon ove Tx: - + Transaction Error Greška u transakciji - + Computing transaction: + + + From Address is Invalid! + + Computing Tx: Računska Tx: - From Address is Invalid - Neispravna adresa pošaljitelja + Neispravna adresa pošaljitelja @@ -1157,7 +1217,7 @@ Ne pokrećem integrirani hushd jer --no-embedded nije prilagođen hushd greška - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1166,7 +1226,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1175,85 +1235,85 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Autorizacija neuspešna. Hushd nije prihvatio korisničko ime / lozinku koju ste uneli. Pokušajte to promeniti u Uredi->Podešavanja meniju - + Your hushd is starting up. Please wait. Hushd se pokreće. Molimo pričekajte. - + This may take several hours, grab some popcorn Ovo može potrajati nekoliko sati, donesite si kokice - - + + Connection Error Greška sa vezom - - + + Transaction Error Greška u transakciji - + There was an error! : Dogodila se greška! : - - + + No Connection Nema veze - + Downloading blocks Preuzimam blokove - + Block height Visina bloka - + Syncing Sinhronizacija - + Connected Spojeno - + testnet: testnet: - + Connected to hushd Spojeno na hushd - + hushd has no peer connections! Network issues? hushd nema vezu sa točkama na istoj razini! Možda imate problem sa mrežom? - + There was an error connecting to hushd. The error was Pojavila se greška prilikom spajanja na hushd. Greška je - + transaction computing. @@ -1262,12 +1322,12 @@ Molimo postavite host/port i korisnčko ime/lozinku u Uredi->Podešavanja men tx proračun. Ovo može potrajati nekoliko minuta. - + Update Available Dostupno ažuriranje - + A new release v%1 is available! You have v%2. Would you like to visit the releases page? @@ -1276,22 +1336,22 @@ Would you like to visit the releases page? Želite li posetiti stranicu sa izadnjima? - + No updates available Nema dostupnih ažuriranja - + You already have the latest release v%1 Već imate najnovije izdanje v%1 - + Please enhance your calm and wait for SilentDragon to exit Molimo pokušajte se strpiti i pričekajte da se SilentDragon zatvori - + Waiting for hushd to exit, y'all Pričekajte da hushd završi @@ -1300,29 +1360,28 @@ Would you like to visit the releases page? Tx - + failed neuspelo - + Transaction - + The transaction with id Transakcija sa ID - + failed. The error was nesupela. Greška je - Tx submitted (right click to copy) txid: - Tx poslan (desni klik za kopiranje) txid: + Tx poslan (desni klik za kopiranje) txid: @@ -1355,15 +1414,20 @@ Would you like to visit the releases page? Spojeno preko Interneta putem SilentDragon usluge crvotočine - + Node is still syncing. Čvor se još uvek sinhronizuje. - + No addresses with enough balance to spend! Try sweeping funds into one address Ne možete trošiti jer nema adrese sa dovoljnim saldom. Pokušajte prebaciti sva sredstva na jednu adresu + + + Transaction submitted (right click to copy) txid: + + RecurringDialog @@ -1525,136 +1589,356 @@ Would you like to visit the releases page? + Local Currency + + + + + AED + + + + + ARS + + + + + AUD + + + + + BDT + + + + + BHD + + + + + BMD + + + + + BRL + + + + + BTC + + + + + CAD + + + + + CHF + + + + + CLP + + + + + CNY + + + + + CZK + + + + + DKK + + + + + EUR + + + + + GBP + + + + + HKD + + + + + HUF + + + + + IDR + + + + + ILS + + + + + INR + + + + + JPY + + + + + KRW + + + + + KWD + + + + + LKR + + + + + PKR + + + + + MXN + + + + + NOK + + + + + NZD + + + + + RUB + + + + + SAR + + + + + SEK + + + + + SGD + + + + + THB + + + + + TRY + + + + + TWD + + + + + UAH + + + + + USD + + + + + VEF + + + + + VND + + + + + XAG + + + + + XAU + + + + + ZAR + + + + default početno - + blue plavo - + light svetlo - + dark tamno - + Connect via Tor Spojite se putem Tora - + Check github for updates at startup Prilikom pokretanja provetite ažuriranja na githubu - + Remember shielded transactions Zapamtite zaštićene transakcije - + Normally, change from t-Addresses goes to another t-Address. Checking this option will send the change to your shielded sapling address instead. Check this option to increase your privacy. Uobičajeno, promene se sa jedne t-adrese šalju na drugu t-adresu. Ako odaberete ovu opciju promena će se poslati na vašu zaštićenu sapling adresu. Odaberite ovu opciju ako želite povećati privatnost. - + Allow overriding the default fees when sending transactions. Enabling this option may compromise your privacy since fees are transparent. Dopusti da se zaobiđu početno podešene naknade prilikom slanja transakcije. Ako odaberete ovu opciju vaša privatnost će biti narušena jer su naknade transparentne. - + Clear History Obriši istoriju - + Shielded transactions are saved locally and shown in the transactions tab. If you uncheck this, shielded transactions will not appear in the transactions tab. Zaštićene transakcije se spremaju lokalno i prikazane su u kartici transakcija. Ako ne odaberete ovo, zaštičene transakcije se neće pojaviti u kartici transakcija. - + Allow custom fees Dopusti prilagodbu naknada - + Shield change from t-Addresses to your sapling address Zaštiti razliku sa t-adrese na sapling adresu - + Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally. Spojite se na Tor mrežu putem SOCKS proxy na 127.0.0.1:9050. Molim vas uzmite u obzir da ćete morati izvana instalirati Tor uslugu. - + Connect to github on startup to check for updates Prilikom pokretanja provetite ažuriranja na githubu - + Connect to the internet to fetch HUSH prices Spojite se na Internet kako bi dohvatili HUSH cene - - Fetch HUSH / USD prices - Dohvati HUSH / USD cene + + Fetch HUSH prices + Dohvati HUSH cene - + Explorer Pregledač - + Tx Explorer URL Tx pregledač URL - + Address Explorer URL Pregledač adresa URL - + Testnet Tx Explorer URL Testnet Tx Pregledač URL - + Testnet Address Explorer URL Testnet pregledač adresa URL - + Troubleshooting Otklanjanje problema - + Reindex Reindex - + Rescan the blockchain for any missing wallet transactions and to correct your wallet balance. This may take several hours. You need to restart SilentDragon for this to take effect Rescan blockchaina ako vam nedostaju transakcije ili ako je krivi saldo u novčaniku. To može potrajati nekoliko sati. Kako bi imalo učinka morate ponovo pokrenuti SilentDragon - + Rescan Rescan - + Rebuild the entire blockchain from the genesis block, by rescanning all the block files. This may take several hours to days, depending on your hardware. You need to restart SilentDragon for this to take effect Izgradite celi blockchain iz prvog (genesis) bloka sa rescanom svih datoteka. Ovo bi moglo potrajati nekoliko sati do nekoliko dana ovisno o jačini vašeg računara. Kako bi imalo učinka morate ponovo pokrenuti SilentDragon diff --git a/res/silentdragon_template.ts b/res/silentdragon_template.ts index 84ff764..5025092 100644 --- a/res/silentdragon_template.ts +++ b/res/silentdragon_template.ts @@ -1574,7 +1574,7 @@ Would you like to visit the releases page? - Fetch HUSH / USD prices + Fetch HUSH prices diff --git a/res/silentdragon_tr.qm b/res/silentdragon_tr.qm index ca4e37b..ceddf64 100644 Binary files a/res/silentdragon_tr.qm and b/res/silentdragon_tr.qm differ diff --git a/res/silentdragon_tr.ts b/res/silentdragon_tr.ts index db5e045..db8caf3 100644 --- a/res/silentdragon_tr.ts +++ b/res/silentdragon_tr.ts @@ -147,8 +147,8 @@ - - + + Memo Memo @@ -175,7 +175,7 @@ - + Miner Fee Madenci Ücreti @@ -200,53 +200,83 @@ Adres Tipi - + + Market + + + + + <html><head/><body><p align="center"><span style=" font-weight:600;">Hush Market Information</span></p></body></html> + + + + + Market Cap + + + + + 24H Volume + + + + Wallet Transactions - + + Chain Transactions + + + + + &Report a bug on Github + + + + &Send Duke Feedback Duke'ye Geri Bildirim Gönder - + &Hush Discord &Hush Discord - + &Hush Website &Hush Website - - + + Export transactions İşlemleri dışa aktar - + Pay HUSH &URI... HUSH URI'yi öde... - + Connect mobile &app Mobil uygulamayı bağla - + Ctrl+M Ctrl+M - + Request HUSH... HUSH iste... - + Validate Address Adres Doğrula @@ -294,7 +324,7 @@ - + Export Private Key Özel Anahtarı Dışarı Aktar @@ -304,128 +334,135 @@ İşlemler - + hushd hushd - + You are currently not mining Şu anda madencilik yapmıyorsunuz - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + Loading... Yükleniyor... - + Block height Blok yüksekliği - + Notarized Hash Noter Onaylı Hash - + Notarized txid Noter Onaylı İşlem id - + Notarized Lag Noter Onaylı Lag - + KMD Version KMD Sürümü - + Protocol Version Protokol Sürümü - + Version Sürüm - + P2P Port P2P Bağlantı Noktası - + RPC Port RPC Bağlantı Noktası - + Client Name İstemci Adı - + Next Halving Sonraki Yarılanma - + Local Services Yerel Hizmetler - + Longest Chain En Uzun Zincir - + Network solution rate Ağ çözüm oranı - + Connections Bağlantılar - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + | | @@ -440,42 +477,42 @@ Transparan Adres (Halka Açık, Meta Veri Sızdıran) - + &File Dosya - + &Help Yardım - + &Apps Uygulamalar - + &Edit Düzenle - + E&xit Çıkış - + &About Hakkında - + &Settings Ayarlar - + Ctrl+P Ctrl+P @@ -484,52 +521,52 @@ Bağış Yap - + Check github.com for &updates Güncellemeler için github.com adresini kontrol edin - + Sapling &turnstile Sapling Fidan turnike - + Ctrl+A, Ctrl+T Ctrl+A, Ctrl+T - + &Import private key Özel anahtarı içeri aktar - + &Export all private keys Tüm özel anahtarları dışarı aktar - + &z-board.net z-board.net - + Ctrl+A, Ctrl+Z Ctrl+A, Ctrl+Z - + Address &book Adres defteri - + Ctrl+B Ctrl+B - + &Backup wallet.dat wallet.dat dosyasını yedekle @@ -563,7 +600,7 @@ Anahtarlar içeri aktarıldı. Blockchain'i yeniden taramak birkaç dakika sürebilir. O zamana kadar, işlevsellik sınırlı olabilir - + Private key import rescan finished Özel anahtar içe aktarma yeniden taraması tamamlandı @@ -577,216 +614,222 @@ YOUR_TRANSLATION_HERE - - Restart + + Theme Change + + + + + + This change can take a few seconds. - - Please restart SilentDragon to have the theme apply + + Currency Change - + Tor configuration is available only when running an embedded hushd. Tor konfigürasyonu yalnızca gömülü bir hushd çalışırken kullanılabilir. - + You're using an external hushd. Please restart hushd with -rescan Harici bir hushd kullanıyorsun. Lütfen hushd'yi -rescan ile yeniden başlat - + You're using an external hushd. Please restart hushd with -reindex Harici bir hushd kullanıyorsun. Lütfen hushd'yi -reindex ile yeniden başlat - + Enable Tor Tor'u etkinleştir - + Connection over Tor has been enabled. To use this feature, you need to restart SilentDragon. Tor üzerinden bağlantı etkin. Bu özelliği kullanmak için, SilentDragon'u yeniden başlatmanız gerekir. - + Disable Tor Tor'u devre dışı bırak - + Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart SilentDragon. Tor üzerinden bağlantı devre dışı bırakıldı. Tor ile bağlantıyı tamamen kesmek için SilentDragon'u yeniden başlatmanız gerekir. - + SilentDragon needs to restart to rescan/reindex. SilentDragon will now close, please restart SilentDragon to continue SilentDragon yeniden tarama/yeniden indeksleme için yeniden başlatılması gerekiyor. SilentDragon şimdi kapanacak, lütfen devam etmek için SilentDragon'u yeniden başlatın - + Restart SilentDragon SilentDragon'u yeniden başlat - + Some feedback about SilentDragon or Hush... SilentDragon veya Hush hakkında bazı görüşler... - + Send Duke some private and shielded feedback about Duke'ye özel ve korumalı geri bildirim gönder - + or SilentDragon veya SilentDragon - + Enter Address to validate Doğrulamak için adres girin - + Transparent or Shielded Address: Transparan veya Korumalı Adres: - + Paste HUSH URI HUSH URI'sini yapıştır - + Error paying Hush URI Hush URI ödeme hatası - + URI should be of the form 'hush:<addr>?amt=x&memo=y URI bu şekilde olmalıdır: 'hush:<addr>?amt=x&memo=y - + Please paste your private keys here, one per line Lütfen özel anahtarlarınızı buraya, her satıra bir tane olacak şekilde yapıştırın - + The keys will be imported into your connected Hush node Anahtarlar bağlı Hush düğümünüze aktarılacak - + The keys were imported! It may take several minutes to rescan the blockchain. Until then, functionality may be limited Anahtarlar içeri aktarıldı. Blockchain'i yeniden taramak birkaç dakika sürebilir. O zamana kadar, işlevsellik sınırlı olabilir - + Error Hata - + Error exporting transactions, file was not saved İşlemler dışa aktarılırken hata oluştu, dosya kaydedilmedi - + No wallet.dat wallet.dat yok - + Couldn't find the wallet.dat on this computer wallet.dat dosyası bu bilgisayarda bulunamadı - + You need to back it up from the machine hushd is running on hushd'ın çalıştığı makineden yedeklemeniz gerekiyor - + Backup wallet.dat wallet.dat dosyasını yedekle - + Couldn't backup Yedeklenemedi - + Couldn't backup the wallet.dat file. wallet.dat dosyası yedeklenemedi. - + You need to back it up manually. Manuel olarak yedeklemeniz gerekir. - + These are all the private keys for all the addresses in your wallet Bunlar, cüzdanınızdaki tüm adreslerin özel anahtarlarıdır - + Private key for için özel anahtar - + Save File Dosyayı Kaydet - + Unable to open file Dosya açılamıyor - - + + Copy address Adresi kopyala - - - + + + Copied to clipboard Panoya kopyalandı - + Get private key Özel anahtarı al - + Shield balance to Sapling sapling'e kalkan dengesi - - + + View on block explorer Blok gezgini üzerinde göster - + Address Asset Viewer Adres Varlığı Görüntüleyicisi - + Convert Address Adresi Dönüştür @@ -795,42 +838,47 @@ Sapling'e geç - + Copy txid txid'i kopyala - + + Copy block explorer link + + + + View Payment Request Ödeme Talebini Görüntüle - + View Memo Memo'yu Görüntüle - + Reply to - + Created new t-Addr Yeni t-Addr oluşturuldu - + Copy Address Adresi Kopyala - + Address has been previously used Adres daha önce kullanılmış - + Address is unused Adres kullanılmamış @@ -890,34 +938,38 @@ doesn't look like a z-address z-adres'i gibi görünmüyor - + Change from Den değiştir - + Current balance : Mevcut bakiye : - + Balance after this Tx: Bu işlemden sonra bakiye: - + Transaction Error İşlem Hatası - + Computing transaction: - + + From Address is Invalid! + + + From Address is Invalid - Gönderen Adresi Geçersiz + Gönderen Adresi Geçersiz @@ -1155,57 +1207,57 @@ Hepsi başarısız olursa, lütfen hushd'i manuel olarak çalıştırın.MB saniyede - + There was an error! : Bir hata oluştu! : - + Downloading blocks Bloklar indiriliyor - + Block height Blok yüksekliği - + Syncing Senkronize ediliyor - + Connected Bağlanıldı - + testnet: testnet: - + Connected to hushd hushd'ye bağlanıldı - + hushd has no peer connections! Network issues? hushd'nin eş bağlantısı yok Ağ sorunları? - + transaction computing. - + Please enhance your calm and wait for SilentDragon to exit - + Waiting for hushd to exit, y'all @@ -1214,27 +1266,27 @@ Hepsi başarısız olursa, lütfen hushd'i manuel olarak çalıştırın.hushd'ye bağlanıldı - + There was an error connecting to hushd. The error was hushd ile bağlantı kurulurken bir hata oluştu. Hata - + Transaction - + The transaction with id id ile işlem - + failed. The error was başarısız oldu. Hata - + failed başarısız oldu @@ -1247,12 +1299,12 @@ Hepsi başarısız olursa, lütfen hushd'i manuel olarak çalıştırın. tx hesaplanıyor. Bu birkaç dakika sürebilir. - + Update Available Güncelleme Mevcut - + A new release v%1 is available! You have v%2. Would you like to visit the releases page? @@ -1261,12 +1313,12 @@ Would you like to visit the releases page? Yayınlanan sürümler sayfasını ziyaret etmek ister misiniz? - + No updates available Güncelleme yok - + You already have the latest release v%1 Zaten en son sürüme (v%1) sahipsiniz @@ -1289,7 +1341,7 @@ Yayınlanan sürümler sayfasını ziyaret etmek ister misiniz? hushd hatası - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1298,7 +1350,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1307,29 +1359,29 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Kimlik doğrulama başarısız oldu. Belirttiğiniz kullanıcı adı/şifre hushd tarafından kabul edilmedi. Düzenle-> Ayarlar menüsünde değiştirmeyi deneyin - + Your hushd is starting up. Please wait. hushd'niz başlıyor. Lütfen bekle. - + This may take several hours, grab some popcorn Bu birkaç saat sürebilir, biraz patlamış mısır kapın - - + + Connection Error Bağlantı Hatası - - + + Transaction Error İşlem Hatası @@ -1338,8 +1390,8 @@ Lütfen Düzenle->Ayarlar menüsünde sunucu/bağlantı noktası ve kullanıc İşlem gönderilirken bir hata oluştu. Hata: - - + + No Connection Bağlantı Yok @@ -1418,9 +1470,8 @@ Lütfen Düzenle->Ayarlar menüsünde sunucu/bağlantı noktası ve kullanıc Etiketi sil - Tx submitted (right click to copy) txid: - İşlem gönderildi (kopyalamak için sağ tıklayın) id: + İşlem gönderildi (kopyalamak için sağ tıklayın) id: Locked funds @@ -1467,15 +1518,20 @@ Onaylanmamış fonunuz var veya otomatik geçiş için bakiye çok düşük.SilentDragon'un solucan deliği servisi aracılığıyla internet üzerinden bağlandı - + Node is still syncing. Düğüm hala senkronize oluyor. - + No addresses with enough balance to spend! Try sweeping funds into one address Harcamaya yeterli bakiyeye sahip adres yok! Fonlarınızı tek bir adrese süpürmeyi deneyin + + + Transaction submitted (right click to copy) txid: + + RecurringDialog @@ -1637,136 +1693,356 @@ Onaylanmamış fonunuz var veya otomatik geçiş için bakiye çok düşük. + Local Currency + + + + + AED + + + + + ARS + + + + + AUD + + + + + BDT + + + + + BHD + + + + + BMD + + + + + BRL + + + + + BTC + + + + + CAD + + + + + CHF + + + + + CLP + + + + + CNY + + + + + CZK + + + + + DKK + + + + + EUR + + + + + GBP + + + + + HKD + + + + + HUF + + + + + IDR + + + + + ILS + + + + + INR + + + + + JPY + + + + + KRW + + + + + KWD + + + + + LKR + + + + + PKR + + + + + MXN + + + + + NOK + + + + + NZD + + + + + RUB + + + + + SAR + + + + + SEK + + + + + SGD + + + + + THB + + + + + TRY + + + + + TWD + + + + + UAH + + + + + USD + + + + + VEF + + + + + VND + + + + + XAG + + + + + XAU + + + + + ZAR + + + + default - + blue - + light - + dark - + Connect via Tor Tor ile bağlan - + Check github for updates at startup Başlangıçta güncellemeler için github'u kontrol et - + Shielded transactions are saved locally and shown in the transactions tab. If you uncheck this, shielded transactions will not appear in the transactions tab. Korumalı işlemler yerel olarak kaydedilir ve işlemler sekmesinde gösterilir. Bu seçeneğin işaretini kaldırırsanız, korumalı işlemler işlemler sekmesinde görünmez. - + Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally. Tor ağına 127.0.0.1:9050'de çalışan SOCKS proxy üzerinden bağlanın. Lütfen Tor servisini harici olarak kurmanız ve çalıştırmanız gerektiğini lütfen unutmayın. - + Connect to github on startup to check for updates Güncellemeleri denetlemek için başlangıçta github'a bağlanır - + Connect to the internet to fetch HUSH prices HUSH fiyatlarını çekmek için internete bağlanır - - Fetch HUSH / USD prices - HUSH / USD fiyatlarını çek + + Fetch HUSH prices + HUSH fiyatlarını çek - + Explorer Gezgin - + Tx Explorer URL İşlem Gezgini URL'İ - + Address Explorer URL Adres Gezgini URL'İ - + Testnet Tx Explorer URL Testnet İşlem Gezgini URL'İ - + Testnet Address Explorer URL Testnet Adres Gezgini URL'İ - + Troubleshooting Sorun giderme - + Reindex Yeniden indeksle - + Rescan the blockchain for any missing wallet transactions and to correct your wallet balance. This may take several hours. You need to restart SilentDragon for this to take effect Eksik cüzdan işlemleri ve cüzdan bakiyenizi düzeltmek için blok zincirini yeniden tarayın. Bu birkaç saat sürebilir. Bunun gerçekleşmesi için SilentDragon'u yeniden başlatmanız gerekir - + Rescan Yeniden tara - + Rebuild the entire blockchain from the genesis block, by rescanning all the block files. This may take several hours to days, depending on your hardware. You need to restart SilentDragon for this to take effect Tüm blok dosyalarını yeniden tarayarak blok zincirini genesis bloğundan yeniden oluşturun. Bu, donanımınıza bağlı olarak birkaç saat ila günler sürebilir. Bunun gerçekleşmesi için SilentDragon’u yeniden başlatmanız gerekir - + Clear History Geçmişi Temizle - + Remember shielded transactions Korumalı işlemleri hatırla - + Allow custom fees Özel ücretlere izin ver - + Allow overriding the default fees when sending transactions. Enabling this option may compromise your privacy since fees are transparent. İşlemleri gönderirken varsayılan ücretlerin geçersiz kılınmasına izin verin. Bu seçeneğin etkinleştirilmesi, ücretler şeffaf olduğu için gizliliğinizi tehlikeye atabilir. - + Normally, change from t-Addresses goes to another t-Address. Checking this option will send the change to your shielded sapling address instead. Check this option to increase your privacy. Normalde, t-Adres'lerinden para üstü başka bir t-Adres'e gider. Bu seçeneğin işaretlenmesi, para üstünü korumalı sapling adresinize gönderecektir. Gizliliğinizi artırmak için bu seçeneği işaretleyin. - + Shield change from t-Addresses to your sapling address T adreslerinden sapling adresinize kalkan değişikliği diff --git a/res/silentdragon_uk.qm b/res/silentdragon_uk.qm index 3b9df5e..e844760 100644 Binary files a/res/silentdragon_uk.qm and b/res/silentdragon_uk.qm differ diff --git a/res/silentdragon_uk.ts b/res/silentdragon_uk.ts index 3b55a9f..483a051 100644 --- a/res/silentdragon_uk.ts +++ b/res/silentdragon_uk.ts @@ -163,8 +163,8 @@ - - + + Memo Мітка @@ -191,7 +191,7 @@ - + Miner Fee Комісія майнерам @@ -216,7 +216,7 @@ Тип адреси - + hushd hushd @@ -233,7 +233,7 @@ Запит safecoin... - + Validate Address Перевірити адресу @@ -274,7 +274,7 @@ - + Export Private Key Експорт приватного ключа @@ -293,259 +293,296 @@ Транзакції - + You are currently not mining Майнінг відключений - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + Loading... Завантаження ... - + Block height Висота блоку - + Network solution rate Швидкість мережі - + Connections Підключень - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + | | - + + Market + + + + + <html><head/><body><p align="center"><span style=" font-weight:600;">Hush Market Information</span></p></body></html> + + + + + Market Cap + + + + + 24H Volume + + + + Notarized Hash - + Notarized txid - + Notarized Lag - + KMD Version - + Protocol Version - + Version - + P2P Port - + RPC Port - + Client Name - + Next Halving - + Local Services - + Longest Chain - + Wallet Transactions - + + Chain Transactions + + + + &File &Файл - + &Help &Допомога - + &Apps &Додатки - + &Edit &Редагувати - + E&xit &Вихід - + &About &Про гаманець - + + &Report a bug on Github + + + + &Settings &Налаштування - + Ctrl+P Ctrl+P - + &Send Duke Feedback &Пожертвування для Duke - + &Hush Discord &Hush Discord - + &Hush Website &Сайт Hush - + Check github.com for &updates &Перевірити github.com на оновлення - + Sapling &turnstile - + Ctrl+A, Ctrl+T - + &Import private key &Імпорт приватного ключа - + &Export all private keys &Експорт всіх приватних ключів - + &z-board.net - + Ctrl+A, Ctrl+Z - + Address &book &Адресна книга - + Ctrl+B Ctrl+B - + &Backup wallet.dat &Зберегти wallet.dat - - + + Export transactions Експорт транзакцій - + Pay HUSH &URI... - + Connect mobile &app - + Ctrl+M - + Request HUSH... @@ -558,32 +595,32 @@ Повідомити про помилку... - + Enable Tor Включити Tor - + Connection over Tor has been enabled. To use this feature, you need to restart SilentDragon. З'єднання через Tor було включено. Щоб скористатися цією функцією, вам потрібно перезапустити SilentDragon. - + Disable Tor Відключити Tor - + Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart SilentDragon. З'єднання через Tor було відключено. Щоб повністю відключитися від Tor, вам потрібно перезапустити SilentDragon. - + Some feedback about SilentDragon or Hush... - + Send Duke some private and shielded feedback about @@ -596,27 +633,17 @@ Ключі були імпортовані. Повторне сканування блокчейна може зайняти кілька хвилин. До тих пір функціональність може бути обмежена - + Private key import rescan finished Повторне сканування приватного ключа завершено - + SilentDragon needs to restart to rescan/reindex. SilentDragon will now close, please restart SilentDragon to continue SilentDragon необхідно перезапустити для повторного сканування / переіндексації. Перезапустіть SilentDragon, щоб продовжити - - Restart - - - - - Please restart SilentDragon to have the theme apply - - - - + Restart SilentDragon Перезапуск SilentDragon @@ -633,145 +660,166 @@ Ключі будуть імпортовані в ваш підключений вузол hushd - + + Theme Change + + + + + + This change can take a few seconds. + + + + + Currency Change + + + + Paste HUSH URI - + Error paying Hush URI - + URI should be of the form 'hush:<addr>?amt=x&memo=y - + Please paste your private keys here, one per line - + The keys will be imported into your connected Hush node - + The keys were imported! It may take several minutes to rescan the blockchain. Until then, functionality may be limited - + Error Помилка - + Error exporting transactions, file was not saved Помилка експорту транзакцій, файл не був збережений - + No wallet.dat Немає wallet.dat - + Couldn't find the wallet.dat on this computer Не вдалося знайти wallet.dat на цьому комп'ютері - + You need to back it up from the machine hushd is running on Ви повинні зробити резервну копію з машини, на якій працює hushd - + Backup wallet.dat Зберегти wallet.dat - + Couldn't backup Неможливо зберегти - + Couldn't backup the wallet.dat file. Неможливо зберегти файл wallet.dat. - + You need to back it up manually. Вам потрібно зробити резервну копію вручну. - + These are all the private keys for all the addresses in your wallet Це все приватні ключі для всіх адрес у вашому гаманці - + Private key for Приватний ключ для - + Save File Зберегти файл - + Unable to open file Неможливо відкрити файл - - + + Copy address Копіювати адресу - - - + + + Copied to clipboard Скопійовано в буфер обміну - + Get private key Отримати приватний ключ - + Shield balance to Sapling Shield balance to Sapling - - + + View on block explorer Подивитися в провіднику блоків - + Address Asset Viewer - + Convert Address + + + Copy block explorer link + + Migrate to Sapling Migrate to Sapling - + Copy txid Скопіювати txid @@ -788,17 +836,17 @@ Оновити - + Tor configuration is available only when running an embedded hushd. Конфігурація Tor доступна тільки при роботі з вбудованим hushd. - + You're using an external hushd. Please restart hushd with -rescan Ви використовуєте зовнішній hushd. Будь ласка, перезапустіть hushd з -rescan - + You're using an external hushd. Please restart hushd with -reindex Ви використовуєте зовнішній hushd. Будь ласка, перезапустіть hushd з -reindex @@ -875,17 +923,17 @@ Надіслати для OleksandrBlack подяку за - + or SilentDragon або SilentDragon - + Enter Address to validate Введіть адресу для перевірки - + Transparent or Shielded Address: Прозора або екранована адреса: @@ -906,37 +954,37 @@ Це може зайняти кілька хвилин. Завантаження ... - + View Payment Request Подивитися запит на оплату - + View Memo Подивитися мітку - + Reply to Відповісти на - + Created new t-Addr Створити новий t-Addr (R) - + Copy Address Копіювати адресу - + Address has been previously used Адреса була раніше використана - + Address is unused Адреса не використовується @@ -1004,34 +1052,38 @@ doesn't look like a z-address не схоже на z-адресу - + Change from Змінити з - + Current balance : Поточний баланс : - + Balance after this Tx: Баланс після цієї Tx: - + Transaction Error Помилка транзакції - + Computing transaction: - + + From Address is Invalid! + + + From Address is Invalid - Від адреси невірно + Від адреси невірно @@ -1262,7 +1314,7 @@ Not starting embedded hushd because --no-embedded was passed помилка hushd - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1271,27 +1323,27 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu Аутентифікація не вдалася. username / password, які ви вказали, не були прийняті hushd. Спробуйте змінити його в меню Редагувати-> Налаштування - + Your hushd is starting up. Please wait. Ваш hushd запускається. Будь ласка зачекайте. - + This may take several hours, grab some popcorn - + There was an error! : - + Downloading blocks Завантаження блоків @@ -1300,52 +1352,52 @@ Please set the host/port and user/password in the Edit->Settings menu.Готово! Дякуємо Вам за допомогу в захисті мережі Hush, запустивши повний вузол. - + Block height Висота блоків - + Syncing Синхронізація - + Connected Підключено - + testnet: testnet: - + Connected to hushd Під'єднано до hushd - + hushd has no peer connections! Network issues? - + There was an error connecting to hushd. The error was При підключенні до hushd сталася помилка. Помилка - + transaction computing. - + Please enhance your calm and wait for SilentDragon to exit - + Waiting for hushd to exit, y'all @@ -1362,22 +1414,22 @@ Please set the host/port and user/password in the Edit->Settings menu.не підтверджено - + Transaction - + The transaction with id Транзакція з id - + failed. The error was не вдалося. Помилка - + failed помилка @@ -1394,12 +1446,12 @@ Please set the host/port and user/password in the Edit->Settings menu. tx обчислюється. Це може зайняти кілька хвилин. - + Update Available Доступно оновлення - + A new release v%1 is available! You have v%2. Would you like to visit the releases page? @@ -1408,12 +1460,12 @@ Would you like to visit the releases page? Хотіли б ви відвідати сторінку релізів? - + No updates available Немає доступних оновлень - + You already have the latest release v%1 У вас вже є остання версія v%1 @@ -1431,7 +1483,7 @@ Would you like to visit the releases page? не вдалося. Будь ласка, перевірте сайт довідки для отримання додаткової інформації - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1444,14 +1496,14 @@ Please set the host/port and user/password in the Edit->Settings menu.Це може зайняти кілька годин - - + + Connection Error Помилка з'єднання - - + + Transaction Error Помилка транзакції @@ -1460,8 +1512,8 @@ Please set the host/port and user/password in the Edit->Settings menu.Сталася помилка під час надсилання транзакції. Помилка була: - - + + No Connection Немає з'єднання @@ -1536,9 +1588,8 @@ Please set the host/port and user/password in the Edit->Settings menu.Видалити мітку - Tx submitted (right click to copy) txid: - Tx представлений (клікніть правою кнопкою миші, щоб скопіювати) txid: + Tx представлений (клікніть правою кнопкою миші, щоб скопіювати) txid: Locked funds @@ -1589,12 +1640,12 @@ You either have unconfirmed funds or the balance is too low for an automatic mig Підключення через Інтернет за допомогою сервісу wormhol SilentDragon - + Node is still syncing. Вузол все ще синхронізується. - + No addresses with enough balance to spend! Try sweeping funds into one address @@ -1634,6 +1685,11 @@ You either have unconfirmed funds or the balance is too low for an automatic mig All future payments will be cancelled. Всі майбутні платежі будуть скасовані. + + + Transaction submitted (right click to copy) txid: + + RecurringDialog @@ -1929,24 +1985,24 @@ You either have unconfirmed funds or the balance is too low for an automatic mig Опції - + Check github for updates at startup Перевірити github на наявність оновлень при запуску - + Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally. Підключатися до мережі Tor через SOCKS-проксі, який працює на 127.0.0.1:9050. Зверніть увагу, що вам необхідно встановлювати і запускати сервіс Tor ззовні. - + Connect to the internet to fetch HUSH prices Підключатися до Інтернету, щоб отримати поточну ціну HUSH - - Fetch HUSH / USD prices - Отріматі ціни HUSH / USD + + Fetch HUSH prices + Отріматі ціни HUSH SafeNodes @@ -2013,12 +2069,12 @@ You either have unconfirmed funds or the balance is too low for an automatic mig Стандартно, це: 0333b9796526ef8de88712a649d618689a1de1ed1adf9fb5ec415f31e560b1f9a3 - + Shielded transactions are saved locally and shown in the transactions tab. If you uncheck this, shielded transactions will not appear in the transactions tab. Екрановані транзакції зберігаються локально і відображаються на вкладці транзакцій. Якщо зняти цей прапорець, екрановані транзакції не будуть відображатися на вкладці транзакцій. - + Connect via Tor Підключатися через Tor @@ -2029,106 +2085,326 @@ You either have unconfirmed funds or the balance is too low for an automatic mig + Local Currency + + + + + AED + + + + + ARS + + + + + AUD + + + + + BDT + + + + + BHD + + + + + BMD + + + + + BRL + + + + + BTC + + + + + CAD + + + + + CHF + + + + + CLP + + + + + CNY + + + + + CZK + + + + + DKK + + + + + EUR + + + + + GBP + + + + + HKD + + + + + HUF + + + + + IDR + + + + + ILS + + + + + INR + + + + + JPY + + + + + KRW + + + + + KWD + + + + + LKR + + + + + PKR + + + + + MXN + + + + + NOK + + + + + NZD + + + + + RUB + + + + + SAR + + + + + SEK + + + + + SGD + + + + + THB + + + + + TRY + + + + + TWD + + + + + UAH + + + + + USD + + + + + VEF + + + + + VND + + + + + XAG + + + + + XAU + + + + + ZAR + + + + default - + blue - + light - + dark - + Connect to github on startup to check for updates Підключатися до github при запуску, щоб перевірити наявність оновлень - + Explorer - + Tx Explorer URL - + Address Explorer URL - + Testnet Tx Explorer URL - + Testnet Address Explorer URL - + Troubleshooting Виправлення проблем - + Reindex Reindex - + Rescan the blockchain for any missing wallet transactions and to correct your wallet balance. This may take several hours. You need to restart SilentDragon for this to take effect Повторно сканує блокчейн для будь-яких пропущених транзакцій гаманця і виправляє баланс вашого гаманця. Це може зайняти кілька годин. Вам потрібно перезапустити SilentDragon, щоб це набуло чинності - + Rescan Rescan - + Rebuild the entire blockchain from the genesis block, by rescanning all the block files. This may take several hours to days, depending on your hardware. You need to restart SilentDragon for this to take effect Перебудовує весь блокчейн з блоку генезису шляхом повторного сканування всіх файлів блоків. Це може зайняти кілька годин або днів, в залежності від вашого обладнання. Вам потрібно перезапустити SilentDragon, щоб це набуло чинності - + Clear History Очистити історію - + Remember shielded transactions Запам'ятовувати екрановані транзакції - + Allow custom fees Дозволити настроювану комісію - + Allow overriding the default fees when sending transactions. Enabling this option may compromise your privacy since fees are transparent. Дозволити зміну розміру комісії за замовчуванням при відправці транзакцій. Включення цієї опції може поставити під загрозу вашу конфіденційність, так як комісія прозора. - + Normally, change from t-Addresses goes to another t-Address. Checking this option will send the change to your shielded sapling address instead. Check this option to increase your privacy. Зазвичай здача з прозорих адрес переходить на інший прозорий адрес. Якщо ви виберете цю опцію, ви відправите здачу на Вашу екранований адресу. Відмітьте цю опцію, щоб збільшити вашу конфіденційність. - + Shield change from t-Addresses to your sapling address Екранування здачі з прозорих адрес на ваш екранований адрес diff --git a/res/silentdragon_zh.qm b/res/silentdragon_zh.qm index 1e68205..eae12d5 100644 Binary files a/res/silentdragon_zh.qm and b/res/silentdragon_zh.qm differ diff --git a/res/silentdragon_zh.ts b/res/silentdragon_zh.ts index 286a1f0..11ea0c2 100644 --- a/res/silentdragon_zh.ts +++ b/res/silentdragon_zh.ts @@ -151,8 +151,8 @@ - - + + Memo 备注 @@ -179,7 +179,7 @@ - + Miner Fee 矿工费用 @@ -243,7 +243,7 @@ - + Export Private Key 导出私钥 @@ -253,163 +253,200 @@ 交易 - + hushd 节点 - + You are currently not mining 您目前没有在挖矿 - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + Loading... 加载中... - + + Market + 市场 + + + + <html><head/><body><p align="center"><span style=" font-weight:600;">Hush Market Information</span></p></body></html> + <html><head/><body><p align="center"><span style=" font-weight:600;">Hush 市场信息</span></p></body></html> + + + + Market Cap + 市值 + + + + 24H Volume + 24小时交易量 + + + Block height 区块高度 - + Notarized Hash - + Notarized txid - + Notarized Lag - + KMD Version - + Protocol Version - + Version - + P2P Port - + RPC Port - + Client Name - + Next Halving - + Local Services - + Longest Chain - + Wallet Transactions - + + Chain Transactions + + + + Network solution rate 全网算力 - + Connections 连接数 - + + &Report a bug on Github + + + + &Send Duke Feedback - + &Hush Discord - + &Hush Website - + Pay HUSH &URI... - + Request HUSH... - + Validate Address - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + | | @@ -424,42 +461,42 @@ - + &File &文件 - + &Help &帮助 - + &Apps &应用 - + &Edit &编辑 - + E&xit &退出 - + &About &关于 - + &Settings &设置 - + Ctrl+P Ctrl+P @@ -468,58 +505,58 @@ &捐赠 - + Check github.com for &updates 检查github.com获取和&更新 - + Sapling &turnstile 树苗&十字旋转门 - + Ctrl+A, Ctrl+T Ctrl+A, Ctrl+T - + &Import private key &导入私钥 - + &Export all private keys &导出所有私钥 - + &z-board.net &z-board.net - + Ctrl+A, Ctrl+Z Ctrl+A, Ctrl+Z - + Address &book &地址簿 - + Ctrl+B Ctrl+B - + &Backup wallet.dat &备份 wallet.dat - - + + Export transactions 导出交易 @@ -528,12 +565,12 @@ 支付hush &URI ... - + Connect mobile &app 连接移动&App - + Ctrl+M Ctrl+M @@ -558,42 +595,42 @@ hushd尚未准备好。 请等待UI加载 - + Tor configuration is available only when running an embedded hushd. Tor配置仅在运行嵌入的hushd时可用。 - + You're using an external hushd. Please restart hushd with -rescan 你正在使用外部hushd。 请使用-rescan参数重新启动hushd - + You're using an external hushd. Please restart hushd with -reindex 你正在使用外部hushd。 请使用-reindex重新启动hushd - + Enable Tor 启用Tor - + Connection over Tor has been enabled. To use this feature, you need to restart SilentDragon. 已启用Tor上的连接。 要使用此功能，您需要重新启动SilentDragon。 - + Disable Tor 禁用Tor - + Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart SilentDragon. Tor上的连接已被禁用。 要完全断开与Tor的连接，您需要重新启动SilentDragon。 - + SilentDragon needs to restart to rescan/reindex. SilentDragon will now close, please restart SilentDragon to continue SlientDragon需要重新启动才能重新扫描/重新索引。 SlientDragon现在关闭，请重启SlientDragon以继续 @@ -626,7 +663,7 @@ 计算交易： - + Private key import rescan finished 私钥导入重新扫描完成 @@ -639,7 +676,7 @@ 支付hush URI时出错 - + URI should be of the form 'hush:<addr>?amt=x&memo=y URI的格式应为 'hush:<addr>?amt=x&memo=y' @@ -656,171 +693,177 @@ 钥匙是导入的。 重新扫描区块链可能需要几分钟时间。 在此之前，功能可能会受到限制 - - Restart + + Theme Change - - Please restart SilentDragon to have the theme apply + + + This change can take a few seconds. - + + Currency Change + + + + Restart SilentDragon - + Some feedback about SilentDragon or Hush... - + Send Duke some private and shielded feedback about - + or SilentDragon - + Enter Address to validate - + Transparent or Shielded Address: - + Paste HUSH URI - + Error paying Hush URI - + Please paste your private keys here, one per line - + The keys will be imported into your connected Hush node - + The keys were imported! It may take several minutes to rescan the blockchain. Until then, functionality may be limited - + Error 错误 - + Error exporting transactions, file was not saved 导出交易时出错，文件未保存 - + No wallet.dat 没有 wallet.dat - + Couldn't find the wallet.dat on this computer 在这台电脑上找不到wallet.dat - + You need to back it up from the machine hushd is running on 你需要从运行hushd的机器备份它 - + Backup wallet.dat 备份 wallet.dat - + Couldn't backup 无法备份 - + Couldn't backup the wallet.dat file. 无法备份wallet.dat文件。 - + You need to back it up manually. 您需要手动备份它。 - + These are all the private keys for all the addresses in your wallet 这些都是钱包中所有地址的私钥 - + Private key for 私钥 - + Save File 保存文件 - + Unable to open file 无法打开文件 - - + + Copy address 复制成功 - - - + + + Copied to clipboard 复制到剪贴板 - + Get private key 获取私钥 - + Shield balance to Sapling 屏蔽余额到Sapling地址 - - + + View on block explorer 从区块浏览器中查看 - + Address Asset Viewer - + Convert Address @@ -829,42 +872,47 @@ 迁移到Sapling地址 - + Copy txid 复制交易ID - + + Copy block explorer link + + + + View Payment Request 查看付款申请 - + View Memo 查看备注 - + Reply to 回复给 - + Created new t-Addr 创建了新的t-Addr - + Copy Address - + Address has been previously used 该地址以前使用过 - + Address is unused 地址未使用 @@ -932,34 +980,38 @@ doesn't look like a z-address 看起来不像是z-address - + Change from 更改发送地址 - + Current balance : 当前余额 : - + Balance after this Tx: 这次交易后余额： - + Transaction Error 交易错误 - + Computing transaction: - + + From Address is Invalid! + + + From Address is Invalid - 发送地址无效 + 发送地址无效 @@ -1324,7 +1376,7 @@ Not starting embedded hushd because --no-embedded was passed hushd 出错 - + A manual connection was requested, but the settings are not configured. Please set the host/port and user/password in the Edit->Settings menu. @@ -1333,7 +1385,7 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Could not connect to hushd configured in settings. Please set the host/port and user/password in the Edit->Settings menu. @@ -1342,22 +1394,22 @@ Please set the host/port and user/password in the Edit->Settings menu. - + Authentication failed. The username / password you specified was not accepted by hushd. Try changing it in the Edit->Settings menu 验证失败。 hushd不接受您指定的用户名/密码。 请在编辑 - >设置菜单中更改它 - + Your hushd is starting up. Please wait. 你的hushd正在启动。 请耐心等待。 - + This may take several hours, grab some popcorn - + There was an error! : @@ -1366,14 +1418,14 @@ Please set the host/port and user/password in the Edit->Settings menu.这可能需要几个小时 - - + + Connection Error 连接错误 - - + + Transaction Error 交易错误 @@ -1386,22 +1438,22 @@ Please set the host/port and user/password in the Edit->Settings menu. 交易 - + failed 失败 - + Transaction - + The transaction with id 交易 - + failed. The error was 失败。 错误是 @@ -1434,58 +1486,58 @@ Please set the host/port and user/password in the Edit->Settings menu.所有未来的付款都将被取消。 - - + + No Connection 没有连接 - + Downloading blocks 下载区块 - + Block height 区块高度 - + Syncing 同步中 - + Connected 已连接 - + testnet: testnet: - + Connected to hushd 连接到hushd - + hushd has no peer connections! Network issues? - + transaction computing. - + Please enhance your calm and wait for SilentDragon to exit - + Waiting for hushd to exit, y'all @@ -1494,7 +1546,7 @@ Please set the host/port and user/password in the Edit->Settings menu.hushd没有节点可连接 - + There was an error connecting to hushd. The error was 连接到hushd时出错。 错误是 @@ -1503,12 +1555,12 @@ Please set the host/port and user/password in the Edit->Settings menu. 交易计算中。 这可能需要几分钟。 - + Update Available 可用更新 - + A new release v%1 is available! You have v%2. Would you like to visit the releases page? @@ -1517,12 +1569,12 @@ Would you like to visit the releases page? 您想访问发布页面吗？ - + No updates available 没有可用的更新 - + You already have the latest release v%1 您已拥有最新版本 v%1 @@ -1535,9 +1587,8 @@ Would you like to visit the releases page? 等待hushd退出 - Tx submitted (right click to copy) txid: - 交易提交（右键单击复制）交易ID: + 交易提交（右键单击复制）交易ID: Locked funds @@ -1588,12 +1639,12 @@ You either have unconfirmed funds or the balance is too low for an automatic mig - + Node is still syncing. 节点仍在同步。 - + No addresses with enough balance to spend! Try sweeping funds into one address @@ -1601,6 +1652,11 @@ You either have unconfirmed funds or the balance is too low for an automatic mig No sapling or transparent addresses with enough balance to spend. 没有sapling或透明地址有足够的余额可以花费。 + + + Transaction submitted (right click to copy) txid: + + RecurringDialog @@ -1871,121 +1927,341 @@ You either have unconfirmed funds or the balance is too low for an automatic mig + Local Currency + + + + + AED + + + + + ARS + + + + + AUD + + + + + BDT + + + + + BHD + + + + + BMD + + + + + BRL + + + + + BTC + + + + + CAD + + + + + CHF + + + + + CLP + + + + + CNY + + + + + CZK + + + + + DKK + + + + + EUR + + + + + GBP + + + + + HKD + + + + + HUF + + + + + IDR + + + + + ILS + + + + + INR + + + + + JPY + + + + + KRW + + + + + KWD + + + + + LKR + + + + + PKR + + + + + MXN + + + + + NOK + + + + + NZD + + + + + RUB + + + + + SAR + + + + + SEK + + + + + SGD + + + + + THB + + + + + TRY + + + + + TWD + + + + + UAH + + + + + USD + + + + + VEF + + + + + VND + + + + + XAG + + + + + XAU + + + + + ZAR + + + + default - + blue - + light - + dark - + Connect via Tor 通过Tor连接 - + Check github for updates at startup 启动时检查github更新 - + Remember shielded transactions 记住隐蔽交易 - + Normally, change from t-Addresses goes to another t-Address. Checking this option will send the change to your shielded sapling address instead. Check this option to increase your privacy. 通常，从t-Addresses发送到另一个t-Address。 选中此选项会将更改发送到屏蔽的树苗地址。 选中此选项可增加隐私。 - + Allow overriding the default fees when sending transactions. Enabling this option may compromise your privacy since fees are transparent. 允许在发送交易时覆盖默认费用。由于费用是透明的，因此启用此选项可能会损害您的隐私。 - + Clear History 清空历史屏蔽交易 - + Shielded transactions are saved locally and shown in the transactions tab. If you uncheck this, shielded transactions will not appear in the transactions tab. 屏蔽交易在本地保存并显示在交易“选项”卡中。 如果取消选中此项，屏蔽的交易将不会显示在“交易”选项卡中。 - + Allow custom fees 允许自定义费用 - + Shield change from t-Addresses to your sapling address 屏蔽改变从t-Addresses到您的树苗地址 - + Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally. 通过运行在127.0.0.1:9050上的SOCKS代理连接到Tor网络。 请注意，您必须在外部安装和运行Tor服务。 - + Connect to github on startup to check for updates 在启动时连接到github以检查更新 - + Connect to the internet to fetch HUSH prices - - Fetch HUSH / USD prices + + Fetch HUSH prices - + Explorer - + Tx Explorer URL - + Address Explorer URL - + Testnet Tx Explorer URL - + Testnet Address Explorer URL - + Rescan the blockchain for any missing wallet transactions and to correct your wallet balance. This may take several hours. You need to restart SilentDragon for this to take effect - + Rebuild the entire blockchain from the genesis block, by rescanning all the block files. This may take several hours to days, depending on your hardware. You need to restart SilentDragon for this to take effect @@ -1998,12 +2274,12 @@ You either have unconfirmed funds or the balance is too low for an automatic mig 获取 ZEC/USD 价格 - + Troubleshooting 故障排除 - + Reindex 重建索引 @@ -2012,7 +2288,7 @@ You either have unconfirmed funds or the balance is too low for an automatic mig 重新扫描区块链以查找任何丢失的钱包交易并更正您的钱包余额。 这可能需要几个小时。 您需要重新启动SlientDragon才能使其生效 - + Rescan 重新扫描 diff --git a/run-after-build.sh b/run-after-build.sh new file mode 100755 index 0000000..afa6d8c --- /dev/null +++ b/run-after-build.sh @@ -0,0 +1,4 @@ +#!/bin/bash +# Copyright 2019-2020 The Hush Developers + +./build.sh && ./silentdragon diff --git a/silentdragon.pro b/silentdragon.pro index 7dc46ed..9832e5d 100644 --- a/silentdragon.pro +++ b/silentdragon.pro @@ -26,6 +26,10 @@ DEFINES += \ INCLUDEPATH += src/3rdparty/ +mac: LIBS+= -Wl,-dead_strip +mac: LIBS+= -Wl,-dead_strip_dylibs +mac: LIBS+= -Wl,-bind_at_load + RESOURCES = application.qrc MOC_DIR = bin @@ -92,6 +96,7 @@ FORMS += \ src/about.ui \ src/confirm.ui \ src/privkey.ui \ + src/viewkey.ui \ src/memodialog.ui \ src/viewalladdresses.ui \ src/validateaddress.ui \ diff --git a/src/about.ui b/src/about.ui index 6f3d970..a4b79ac 100644 --- a/src/about.ui +++ b/src/about.ui @@ -6,8 +6,8 @@ 0 0 - 497 - 448 + 1234 + 856 @@ -40,8 +40,8 @@ 0 0 - 463 - 517 + 1196 + 626 @@ -51,17 +51,20 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.1pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">Copyright (c) 2019 Duke Leto, David Mercer and Aditya Kulkarni. (MIT License)</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:11pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">Special thanks to:</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">JSON for Modern C++ : </span><a href="https://nlohmann.github.io/json/"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">https://nlohmann.github.io/json/</span></a></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">QR Code generator library Nayuki : </span><a href="https://www.nayuki.io/page/qr-code-generator-library"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">https://www.nayuki.io/page/qr-code-ge…</span></a></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">Made with QT : </span><a href="https://www.qt.io/"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">https://www.qt.io/</span></a></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">LICENSE:</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt;">Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</span></p> -<ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Ubuntu'; font-size:11pt;" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</li> -<li style=" font-family:'Ubuntu'; font-size:11pt;" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The Software is provided &quot;as is&quot;, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the Software or the use or other dealings in the Software.</li></ul></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:12pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8.1pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">Copyright(c) 2019-2020 The Hush developers (GPLv3)</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">Copyright (c) 2019 Duke Leto, David Mercer and Aditya Kulkarni. (MIT License)</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">Special thanks to:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">JSON for Modern C++ : </span><a href="https://nlohmann.github.io/json/"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;">https://nlohmann.github.io/json/</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">QR Code generator library Nayuki : </span><a href="https://www.nayuki.io/page/qr-code-generator-library"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;">https://www.nayuki.io/page/qr-code-ge…</span></a></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">Made with QT : </span><a href="https://www.qt.io/"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;">https://www.qt.io/</span></a></p> +<p style="-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;"><br /></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">LICENSE:</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://www.gnu.org/licenses/gpl-3.0.en.html +"><span style=" text-decoration: underline; color:#0000ff;">GPL Version 3</span></a></p> +<p style="-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:1; text-indent:0px; text-decoration: underline; color:#0000ff;"><br /></p></body></html> true diff --git a/src/addresscombo.cpp b/src/addresscombo.cpp index f7cbeee..9c50310 100644 --- a/src/addresscombo.cpp +++ b/src/addresscombo.cpp @@ -27,13 +27,13 @@ void AddressCombo::setCurrentText(const QString& text) { void AddressCombo::addItem(const QString& text, double bal) { QString txt = AddressBook::addLabelToAddress(text); if (bal > 0) - txt = txt % "(" % Settings::getZECDisplayFormat(bal) % ")"; + txt = txt % "(" % Settings::getDisplayFormat(bal) % ")"; QComboBox::addItem(txt); } void AddressCombo::insertItem(int index, const QString& text, double bal) { QString txt = AddressBook::addLabelToAddress(text) % - "(" % Settings::getZECDisplayFormat(bal) % ")"; + "(" % Settings::getDisplayFormat(bal) % ")"; QComboBox::insertItem(index, txt); } \ No newline at end of file diff --git a/src/balancestablemodel.cpp b/src/balancestablemodel.cpp index 4cd484e..2be4190 100644 --- a/src/balancestablemodel.cpp +++ b/src/balancestablemodel.cpp @@ -87,7 +87,7 @@ QVariant BalancesTableModel::data(const QModelIndex &index, int role) const if (role == Qt::DisplayRole) { switch (index.column()) { case 0: return AddressBook::addLabelToAddress(std::get<0>(modeldata->at(index.row()))); - case 1: return Settings::getZECDisplayFormat(std::get<1>(modeldata->at(index.row()))); + case 1: return Settings::getDisplayFormat(std::get<1>(modeldata->at(index.row()))); } } diff --git a/src/connection.cpp b/src/connection.cpp index 0eda0fc..9a1cd01 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -1,4 +1,4 @@ -// Copyright 2019 The Hush developers +// Copyright 2019-2020 The Hush developers // GPLv3 #include "connection.h" #include "mainwindow.h" @@ -21,7 +21,7 @@ ConnectionLoader::ConnectionLoader(MainWindow* main, RPC* rpc) { connD->setupUi(d); QPixmap logo(":/img/res/logobig.gif"); connD->topIcon->setBasePixmap(logo.scaled(512, 512, Qt::KeepAspectRatio, Qt::SmoothTransformation)); - main->logger->write("set topIcon"); + //main->logger->write("set topIcon"); } ConnectionLoader::~ConnectionLoader() { @@ -129,7 +129,7 @@ QString randomPassword() { } /** - * This will create a new HUSH3.conf, download Zcash parameters. + * This will create a new HUSH3.conf and download params if they cannot be found */ void ConnectionLoader::createZcashConf() { main->logger->write("createZcashConf"); @@ -347,7 +347,8 @@ bool ConnectionLoader::startEmbeddedZcashd() { auto hushdProgram = appPath.absoluteFilePath("komodod"); #endif - if (!QFile(hushdProgram).exists()) { + //if (!QFile(hushdProgram).exists()) { + if (!QFile::exists(hushdProgram)) { qDebug() << "Can't find hushd at " << hushdProgram; main->logger->write("Can't find hushd at " + hushdProgram); return false; @@ -387,7 +388,7 @@ bool ConnectionLoader::startEmbeddedZcashd() { qDebug() << "Starting on Linux: " + hushdProgram + " " + params; ezcashd->start(hushdProgram, arguments); #elif defined(Q_OS_DARWIN) - qDebug() << "Starting on Darwin" + hushdProgram + " " + params; + qDebug() << "Starting on Darwin: " + hushdProgram + " " + params; ezcashd->start(hushdProgram, arguments); #elif defined(Q_OS_WIN64) qDebug() << "Starting on Win64: " + hushdProgram + " " + params; @@ -460,7 +461,7 @@ Connection* ConnectionLoader::makeConnection(std::shared_ptr c } void ConnectionLoader::refreshZcashdState(Connection* connection, std::function refused) { - main->logger->write("refreshZcashdState"); + main->logger->write("refreshing state"); json payload = { {"jsonrpc", "1.0"}, diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 20534f0..7f99e0e 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1,4 +1,5 @@ -// Copyright 2019 The Hush Developers +// Copyright 2019-2020 The Hush Developers +// Released under the GPLv3 #include "mainwindow.h" #include "addressbook.h" #include "viewalladdresses.h" @@ -7,6 +8,7 @@ #include "ui_mobileappconnector.h" #include "ui_addressbook.h" #include "ui_privkey.h" +#include "ui_viewkey.h" #include "ui_about.h" #include "ui_settings.h" #include "ui_viewalladdresses.h" @@ -55,6 +57,8 @@ MainWindow::MainWindow(QWidget *parent) : QObject::connect(ui->actionDiscord, &QAction::triggered, this, &MainWindow::discord); + QObject::connect(ui->actionReportBug, &QAction::triggered, this, &MainWindow::reportbug); + QObject::connect(ui->actionWebsite, &QAction::triggered, this, &MainWindow::website); // Set up check for updates action @@ -119,7 +123,9 @@ MainWindow::MainWindow(QWidget *parent) : setupTransactionsTab(); setupReceiveTab(); setupBalancesTab(); - setupZcashdTab(); + setupMarketTab(); + setupChatTab(); + setupHushTab(); rpc = new RPC(this); qDebug() << "Created RPC"; @@ -133,7 +139,7 @@ MainWindow::MainWindow(QWidget *parent) : if (ads->getAllowInternetConnection()) wormholecode = ads->getWormholeCode(ads->getSecretHex()); - qDebug() << "MainWindow: createWebsocket with wormholcode=" << wormholecode; + qDebug() << "MainWindow: createWebsocket with wormholecode=" << wormholecode; createWebsocket(wormholecode); } } @@ -225,13 +231,22 @@ void MainWindow::setupStatusBar() { menu.addAction("Copy txid", [=]() { QGuiApplication::clipboard()->setText(txid); }); - menu.addAction("View tx on block explorer", [=]() { + menu.addAction("Copy block explorer link", [=]() { QString url; auto explorer = Settings::getInstance()->getExplorer(); if (Settings::getInstance()->isTestnet()) { url = explorer.testnetTxExplorerUrl + txid; + } else { + url = explorer.txExplorerUrl + txid; } - else { + QGuiApplication::clipboard()->setText(url); + }); + menu.addAction("View tx on block explorer", [=]() { + QString url; + auto explorer = Settings::getInstance()->getExplorer(); + if (Settings::getInstance()->isTestnet()) { + url = explorer.testnetTxExplorerUrl + txid; + } else { url = explorer.txExplorerUrl + txid; } QDesktopServices::openUrl(QUrl(url)); @@ -265,6 +280,16 @@ void MainWindow::setupSettingsModal() { Settings::getInstance()->setSaveZtxs(checked); }); + std::string currency_name; + try { + currency_name = Settings::getInstance()->get_currency_name(); + } catch (const std::exception& e) { + qDebug() << QString("Currency name exception! : ") << e.what(); + currency_name = "USD"; + } + + this->slot_change_currency(currency_name); + // Setup clear button QObject::connect(settings.btnClearSaved, &QCheckBox::clicked, [=]() { if (QMessageBox::warning(this, "Clear saved history?", @@ -282,8 +307,18 @@ void MainWindow::setupSettingsModal() { QObject::connect(settings.comboBoxTheme, SIGNAL(currentIndexChanged(QString)), this, SLOT(slot_change_theme(QString))); QObject::connect(settings.comboBoxTheme, &QComboBox::currentTextChanged, [=] (QString theme_name) { this->slot_change_theme(theme_name); - // Tell the user to restart - QMessageBox::information(this, tr("Restart"), tr("Please restart SilentDragon to have the theme apply"), QMessageBox::Ok); + QMessageBox::information(this, tr("Theme Change"), tr("This change can take a few seconds."), QMessageBox::Ok); + }); + + // Set local currency + QString ticker = QString::fromStdString( Settings::getInstance()->get_currency_name() ); + int currency_index = settings.comboBoxCurrency->findText(ticker, Qt::MatchExactly); + settings.comboBoxCurrency->setCurrentIndex(currency_index); + QObject::connect(settings.comboBoxCurrency, SIGNAL(currentIndexChanged(QString)), this, SLOT(slot_change_currency(QString))); + QObject::connect(settings.comboBoxCurrency, &QComboBox::currentTextChanged, [=] (QString ticker) { + this->slot_change_currency(ticker.toStdString()); + rpc->refresh(true); + QMessageBox::information(this, tr("Currency Change"), tr("This change can take a few seconds."), QMessageBox::Ok); }); // Save sent transactions @@ -363,6 +398,7 @@ void MainWindow::setupSettingsModal() { } if (settingsDialog.exec() == QDialog::Accepted) { + qDebug() << "Setting dialog box accepted"; // Custom fees bool customFees = settings.chkCustomFees->isChecked(); Settings::getInstance()->setAllowCustomFees(customFees); @@ -459,6 +495,11 @@ void MainWindow::discord() { QDesktopServices::openUrl(QUrl(url)); } +void MainWindow::reportbug() { + QString url = "https://github.com/MyHush/SilentDragon/issues/new"; + QDesktopServices::openUrl(QUrl(url)); +} + void MainWindow::website() { QString url = "https://myhush.org"; QDesktopServices::openUrl(QUrl(url)); @@ -581,7 +622,7 @@ bool MainWindow::eventFilter(QObject *object, QEvent *event) { } -// Pay the Zcash URI by showing a confirmation window. If the URI parameter is empty, the UI +// Pay the Hush URI by showing a confirmation window. If the URI parameter is empty, the UI // will prompt for one. If the myAddr is empty, then the default from address is used to send // the transaction. void MainWindow::payZcashURI(QString uri, QString myAddr) { @@ -735,6 +776,68 @@ void MainWindow::exportAllKeys() { exportKeys(""); } +void MainWindow::getViewKey(QString addr) { + QDialog d(this); + Ui_ViewKey vui; + vui.setupUi(&d); + + // Make the window big by default + auto ps = this->geometry(); + QMargins margin = QMargins() + 50; + d.setGeometry(ps.marginsRemoved(margin)); + + Settings::saveRestore(&d); + + vui.viewKeyTxt->setPlainText(tr("Loading...")); + vui.viewKeyTxt->setReadOnly(true); + vui.viewKeyTxt->setLineWrapMode(QPlainTextEdit::LineWrapMode::NoWrap); + + // Disable the save button until it finishes loading + vui.buttonBox->button(QDialogButtonBox::Save)->setEnabled(false); + vui.buttonBox->button(QDialogButtonBox::Ok)->setVisible(false); + + bool allKeys = false; //addr.isEmpty() ? true : false; + // Wire up save button + QObject::connect(vui.buttonBox->button(QDialogButtonBox::Save), &QPushButton::clicked, [=] () { + QString fileName = QFileDialog::getSaveFileName(this, tr("Save File"), + allKeys ? "hush-all-viewkeys.txt" : "hush-viewkey.txt"); + QFile file(fileName); + if (!file.open(QIODevice::WriteOnly)) { + QMessageBox::information(this, tr("Unable to open file"), file.errorString()); + return; + } + QTextStream out(&file); + // TODO: Output in address, viewkey CSV format? + out << vui.viewKeyTxt->toPlainText(); + }); + + auto isDialogAlive = std::make_shared(true); + + auto fnUpdateUIWithKeys = [=](QList> viewKeys) { + // Check to see if we are still showing. + if (! *(isDialogAlive.get()) ) return; + + QString allKeysTxt; + for (auto keypair : viewKeys) { + allKeysTxt = allKeysTxt % keypair.second % " # addr=" % keypair.first % "\n"; + } + + vui.viewKeyTxt->setPlainText(allKeysTxt); + vui.buttonBox->button(QDialogButtonBox::Save)->setEnabled(true); + }; + + auto fnAddKey = [=](json key) { + QList> singleAddrKey; + singleAddrKey.push_back(QPair(addr, QString::fromStdString(key.get()))); + fnUpdateUIWithKeys(singleAddrKey); + }; + + rpc->getZViewKey(addr, fnAddKey); + + d.exec(); + *isDialogAlive = false; +} + void MainWindow::exportKeys(QString addr) { bool allKeys = addr.isEmpty() ? true : false; @@ -803,8 +906,7 @@ void MainWindow::exportKeys(QString addr) { if (Settings::getInstance()->isZAddress(addr)) { rpc->getZPrivKey(addr, fnAddKey); - } - else { + } else { rpc->getTPrivKey(addr, fnAddKey); } } @@ -873,10 +975,20 @@ void MainWindow::setupBalancesTab() { this->exportKeys(addr); }); + if (addr.startsWith("zs1")) { + menu.addAction(tr("Get viewing key"), [=] () { + this->getViewKey(addr); + }); + } + menu.addAction("Send from " % addr.left(40) % (addr.size() > 40 ? "..." : ""), [=]() { fnDoSendFrom(addr); }); + menu.addAction("Send to " % addr.left(40) % (addr.size() > 40 ? "..." : ""), [=]() { + fnDoSendFrom("",addr); + }); + if (addr.startsWith("R")) { auto defaultSapling = rpc->getDefaultSaplingAddress(); if (!defaultSapling.isEmpty()) { @@ -889,7 +1001,6 @@ void MainWindow::setupBalancesTab() { QString url; auto explorer = Settings::getInstance()->getExplorer(); if (Settings::getInstance()->isTestnet()) { - //TODO url = explorer.testnetAddressExplorerUrl + addr; } else { url = explorer.addressExplorerUrl + addr; @@ -897,6 +1008,17 @@ void MainWindow::setupBalancesTab() { QDesktopServices::openUrl(QUrl(url)); }); + menu.addAction("Copy explorer link", [=]() { + QString url; + auto explorer = Settings::getInstance()->getExplorer(); + if (Settings::getInstance()->isTestnet()) { + url = explorer.testnetAddressExplorerUrl + addr; + } else { + url = explorer.addressExplorerUrl + addr; + } + QGuiApplication::clipboard()->setText(url); + }); + menu.addAction(tr("Address Asset Viewer"), [=] () { QString url; url = "https://dexstats.info/assetviewer.php?address=" + addr; @@ -914,10 +1036,51 @@ void MainWindow::setupBalancesTab() { }); } -void MainWindow::setupZcashdTab() { +void MainWindow::setupHushTab() { ui->hushlogo->setBasePixmap(QPixmap(":/img/res/zcashdlogo.gif")); } +void MainWindow::setupChatTab() { + qDebug() << __FUNCTION__; + QList> addressLabels = AddressBook::getInstance()->getAllAddressLabels(); + QStringListModel *chatModel = new QStringListModel(); + QStringList contacts; + //contacts << "Alice" << "Bob" << "Charlie" << "Eve"; + for (int i = 0; i < addressLabels.size(); ++i) { + QPair pair = addressLabels.at(i); + qDebug() << "Found contact " << pair.first << " " << pair.second; + contacts << pair.first; + } + + chatModel->setStringList(contacts); + + QStringListModel *conversationModel = new QStringListModel(); + QStringList conversations; + conversations << "Bring home some milk" << "Markets look rough" << "How's the weather?" << "Is this on?"; + conversationModel->setStringList(conversations); + + + //Ui_addressBook ab; + //AddressBookModel model(ab.addresses); + //ab.addresses->setModel(&model); + + //TODO: ui->contactsView->setModel( model of address book ); + //ui->contactsView->setModel(&model ); + + ui->contactsView->setModel(chatModel); + ui->chatView->setModel( conversationModel ); +} + +void MainWindow::setupMarketTab() { + qDebug() << "Setting up market tab"; + auto s = Settings::getInstance(); + auto ticker = s->get_currency_name(); + + ui->volume->setText(QString::number((double) s->get_volume("HUSH") ,'f',8) + " HUSH"); + ui->volumeLocal->setText(QString::number((double) s->get_volume(ticker) ,'f',8) + " " + QString::fromStdString(ticker)); + ui->volumeBTC->setText(QString::number((double) s->get_volume("BTC") ,'f',8) + " BTC"); +} + void MainWindow::setupTransactionsTab() { // Double click opens up memo if one exists QObject::connect(ui->transactionsTable, &QTableView::doubleClicked, [=] (auto index) { @@ -971,6 +1134,17 @@ void MainWindow::setupTransactionsTab() { QDesktopServices::openUrl(QUrl(url)); }); + menu.addAction(tr("Copy block explorer link"), [=] () { + QString url; + auto explorer = Settings::getInstance()->getExplorer(); + if (Settings::getInstance()->isTestnet()) { + url = explorer.testnetTxExplorerUrl + txid; + } else { + url = explorer.txExplorerUrl + txid; + } + QGuiApplication::clipboard()->setText(url); + }); + // Payment Request if (!memo.isEmpty() && memo.startsWith("hush:")) { menu.addAction(tr("View Payment Request"), [=] () { @@ -993,8 +1167,7 @@ void MainWindow::setupTransactionsTab() { int lastPost = memo.trimmed().lastIndexOf(QRegExp("[\r\n]+")); QString lastWord = memo.right(memo.length() - lastPost - 1); - if (Settings::getInstance()->isSaplingAddress(lastWord) || - Settings::getInstance()->isSproutAddress(lastWord)) { + if (Settings::getInstance()->isSaplingAddress(lastWord)) { menu.addAction(tr("Reply to ") + lastWord.left(25) + "...", [=]() { // First, cancel any pending stuff in the send tab by pretending to click // the cancel button @@ -1020,26 +1193,24 @@ void MainWindow::setupTransactionsTab() { }); } -void MainWindow::addNewZaddr(bool sapling) { - rpc->newZaddr(sapling, [=] (json reply) { +void MainWindow::addNewZaddr() { + rpc->newZaddr( [=] (json reply) { QString addr = QString::fromStdString(reply.get()); // Make sure the RPC class reloads the z-addrs for future use rpc->refreshAddresses(); // Just double make sure the z-address is still checked - if ( sapling && ui->rdioZSAddr->isChecked() ) { + if ( ui->rdioZSAddr->isChecked() ) { ui->listReceiveAddresses->insertItem(0, addr); ui->listReceiveAddresses->setCurrentIndex(0); - ui->statusBar->showMessage(QString::fromStdString("Created new zAddr") % - (sapling ? "(Sapling)" : "(Sprout)"), - 10 * 1000); + ui->statusBar->showMessage(QString::fromStdString("Created new Sapling zaddr"), 10 * 1000); } }); } -// Adds sapling or sprout z-addresses to the combo box. Technically, returns a +// Adds z-addresses to the combo box. Technically, returns a // lambda, which can be connected to the appropriate signal std::function MainWindow::addZAddrsToComboList(bool sapling) { return [=] (bool checked) { @@ -1059,7 +1230,7 @@ std::function MainWindow::addZAddrsToComboList(bool sapling) { // If z-addrs are empty, then create a new one. if (addrs->isEmpty()) { - addNewZaddr(sapling); + addNewZaddr(); } } }; @@ -1144,7 +1315,7 @@ void MainWindow::setupReceiveTab() { return; if (ui->rdioZSAddr->isChecked()) { - addNewZaddr(true); + addNewZaddr(); } else if (ui->rdioTAddr->isChecked()) { addNewTAddr(); } @@ -1279,18 +1450,33 @@ void MainWindow::updateLabels() { updateLabelsAutoComplete(); } +void MainWindow::slot_change_currency(const std::string& currency_name) +{ + qDebug() << "slot_change_currency"; //<< ": " << currency_name; + Settings::getInstance()->set_currency_name(currency_name); + qDebug() << "Refreshing price stats after currency change"; + rpc->refreshPrice(); + + // Include currency + std::string saved_currency_name; + try { + saved_currency_name = Settings::getInstance()->get_currency_name(); + } catch (const std::exception& e) { + qDebug() << QString("Ignoring currency change Exception! : ") << e.what(); + saved_currency_name = "USD"; + } +} + void MainWindow::slot_change_theme(const QString& theme_name) { Settings::getInstance()->set_theme_name(theme_name); // Include css QString saved_theme_name; - try - { + try { saved_theme_name = Settings::getInstance()->get_theme_name(); - } - catch (...) - { + } catch (const std::exception& e) { + qDebug() << QString("Ignoring theme change Exception! : ") << e.what(); saved_theme_name = "default"; } diff --git a/src/mainwindow.h b/src/mainwindow.h index ea37011..f485b2a 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -80,9 +80,12 @@ private: void setupTransactionsTab(); void setupReceiveTab(); void setupBalancesTab(); - void setupZcashdTab(); + void setupHushTab(); + void setupChatTab(); + void setupMarketTab(); void slot_change_theme(const QString& themeName); + void slot_change_currency(const std::string& currencyName); void setupTurnstileDialog(); void setupSettingsModal(); void setupStatusBar(); @@ -106,7 +109,7 @@ private: void addressChanged(int number, const QString& text); void amountChanged (int number, const QString& text); - void addNewZaddr(bool sapling); + void addNewZaddr(); std::function addZAddrsToComboList(bool sapling); void memoButtonClicked(int number, bool includeReplyTo = false); @@ -116,11 +119,13 @@ private: void donate(); void website(); void discord(); + void reportbug(); void addressBook(); void postToZBoard(); void importPrivKey(); void exportAllKeys(); void exportKeys(QString addr = ""); + void getViewKey(QString addr = ""); void backupWalletDat(); void exportTransactions(); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 4d1245e..7ac4b19 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -6,8 +6,8 @@ 0 0 - 968 - 616 + 1487 + 1214 @@ -22,7 +22,7 @@ - 2 + 5 @@ -148,7 +148,6 @@ - @@ -166,7 +165,7 @@ - + @@ -188,7 +187,6 @@ - @@ -387,8 +385,8 @@ 0 0 - 920 - 301 + 1403 + 619 @@ -740,7 +738,7 @@ - + 0 0 @@ -934,8 +932,122 @@ - - + + + Market + + + + + + + 15 + + + + <html><head/><body><p align="center"><span style=" font-weight:600;">Hush Market Information</span></p></body></html> + + + + + + + Qt::Horizontal + + + + + + + Market Cap + + + + + + + Loading... + + + + + + + + + + + + + + Loading... + + + + + + + 24H Volume + + + + + + + Loading... + + + + + + + Loading... + + + + + + + Loading... + + + + + + + + Chat + + + + + + + + + + + + + + + + + Send + + + + + + + New HushChat + + + + + + + hushd @@ -999,7 +1111,6 @@ - @@ -1021,7 +1132,6 @@ - @@ -1043,7 +1153,6 @@ - @@ -1065,7 +1174,6 @@ - @@ -1087,8 +1195,6 @@ - - @@ -1110,8 +1216,6 @@ - - @@ -1133,7 +1237,6 @@ - @@ -1155,8 +1258,6 @@ - - @@ -1178,7 +1279,6 @@ - @@ -1200,7 +1300,6 @@ - @@ -1222,7 +1321,6 @@ - @@ -1244,7 +1342,6 @@ - @@ -1266,7 +1363,6 @@ - @@ -1288,8 +1384,27 @@ - - + + + + Chain Transactions + + + + + + + Loading... + + + + + + + | + + + @@ -1375,8 +1490,8 @@ 0 0 - 968 - 22 + 1487 + 42 @@ -1402,6 +1517,7 @@ + @@ -1435,6 +1551,11 @@ &About + + + &Report a bug on Github + + &Settings @@ -1550,7 +1671,6 @@ - tabWidget inputsCombo Address1 Amount1 diff --git a/src/privkey.ui b/src/privkey.ui index 57bdb16..57c3d8f 100644 --- a/src/privkey.ui +++ b/src/privkey.ui @@ -34,7 +34,7 @@ - TextLabel + Private Key(s). Keep Secure! diff --git a/src/rpc.cpp b/src/rpc.cpp index 616aca8..014ce0e 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -1,4 +1,5 @@ -// Copyright 2019 The Hush Developers +// Copyright 2019-2020 The Hush Developers +// Released under the GPLv3 #include "rpc.h" #include "addressbook.h" @@ -30,7 +31,7 @@ RPC::RPC(MainWindow* main) { // Set up timer to refresh Price priceTimer = new QTimer(main); QObject::connect(priceTimer, &QTimer::timeout, [=]() { - refreshZECPrice(); + refreshPrice(); }); priceTimer->start(Settings::priceRefreshSpeed); // Every hour @@ -93,7 +94,7 @@ void RPC::setConnection(Connection* c) { Settings::removeFromZcashConf(zcashConfLocation, "reindex"); // Refresh the UI - refreshZECPrice(); + refreshPrice(); checkForUpdate(); // Force update, because this might be coming from a settings update @@ -153,12 +154,12 @@ void RPC::getZUnspent(const std::function& cb) { conn->doRPCWithDefaultErrorHandling(payload, cb); } -void RPC::newZaddr(bool sapling, const std::function& cb) { +void RPC::newZaddr(const std::function& cb) { json payload = { {"jsonrpc", "1.0"}, {"id", "someid"}, {"method", "z_getnewaddress"}, - {"params", { sapling ? "sapling" : "sprout" }}, + {"params", { "sapling" }}, }; conn->doRPCWithDefaultErrorHandling(payload, cb); @@ -170,6 +171,11 @@ void RPC::newTaddr(const std::function& cb) { conn->doRPCWithDefaultErrorHandling(makePayload(method), cb); } +void RPC::getZViewKey(QString addr, const std::function& cb) { + std::string method = "z_exportviewingkey"; + conn->doRPCWithDefaultErrorHandling(makePayload(method, addr.toStdString()), cb); +} + void RPC::getZPrivKey(QString addr, const std::function& cb) { std::string method = "z_exportkey"; conn->doRPCWithDefaultErrorHandling(makePayload(method, addr.toStdString()), cb); @@ -526,7 +532,7 @@ void RPC::refreshReceivedZTrans(QList zaddrs) { ); } -/// This will refresh all the balance data from zcashd +/// This will refresh all the balance data from hushd void RPC::refresh(bool force) { if (conn == nullptr) return noConnection(); @@ -536,9 +542,7 @@ void RPC::refresh(bool force) { void RPC::getInfoThenRefresh(bool force) { - //qDebug() << "getinfo"; - if (conn == nullptr) return noConnection(); @@ -551,6 +555,7 @@ void RPC::getInfoThenRefresh(bool force) { Settings::getInstance()->setTestnet(reply["testnet"].get()); }; + // TODO: checkmark only when getinfo.synced == true! // Connected, so display checkmark. QIcon i(":/icons/res/connected.gif"); main->statusIcon->setPixmap(i.pixmap(16, 16)); @@ -633,22 +638,21 @@ void RPC::getInfoThenRefresh(bool force) { }); - std::string method2 = "getwalletinfo"; - conn->doRPCIgnoreError(makePayload(method2), [=](const json& reply) { + conn->doRPCIgnoreError(makePayload("getwalletinfo"), [=](const json& reply) { int txcount = reply["txcount"].get(); ui->txcount->setText(QString::number(txcount)); }); - // Call to see if the blockchain is syncing. - payload = { - {"jsonrpc", "1.0"}, - {"id", "someid"}, - {"method", "getblockchaininfo"} - }; + //TODO: If -zindex is enabled, show stats + conn->doRPCIgnoreError(makePayload("getchaintxstats"), [=](const json& reply) { + int txcount = reply["txcount"].get(); + ui->chaintxcount->setText(QString::number(txcount)); + }); - conn->doRPCIgnoreError(payload, [=](const json& reply) { + // Call to see if the blockchain is syncing. + conn->doRPCIgnoreError(makePayload("getblockchaininfo"), [=](const json& reply) { auto progress = reply["verificationprogress"].get(); - // TODO: use getinfo.synced + // TODO: use getinfo.synced bool isSyncing = progress < 0.9999; // 99.99% int blockNumber = reply["blocks"].get(); @@ -657,10 +661,12 @@ void RPC::getInfoThenRefresh(bool force) { estimatedheight = reply["estimatedheight"].get(); } - Settings::getInstance()->setSyncing(isSyncing); - Settings::getInstance()->setBlockNumber(blockNumber); + auto s = Settings::getInstance(); + s->setSyncing(isSyncing); + s->setBlockNumber(blockNumber); + std::string ticker = s->get_currency_name(); - // Update zcashd tab if it exists + // Update hushd tab if (isSyncing) { QString txt = QString::number(blockNumber); if (estimatedheight > 0) { @@ -677,20 +683,28 @@ void RPC::getInfoThenRefresh(bool force) { ui->heightLabel->setText(QObject::tr("Block height")); } + auto ticker_price = s->get_price(ticker); + QString extra = ""; + if(ticker_price > 0 && ticker != "BTC") { + extra = QString::number( s->getBTCPrice() ) % "sat"; + } + QString price = ""; + if (ticker_price > 0) { + price = QString(", ") % "HUSH" % "=" % QString::number( (double)ticker_price,'f',8) % " " % QString::fromStdString(ticker) % " " % extra; + } + // Update the status bar QString statusText = QString() % (isSyncing ? QObject::tr("Syncing") : QObject::tr("Connected")) % " (" % - (Settings::getInstance()->isTestnet() ? QObject::tr("testnet:") : "") % + (s->isTestnet() ? QObject::tr("testnet:") : "") % QString::number(blockNumber) % (isSyncing ? ("/" % QString::number(progress*100, 'f', 2) % "%") : QString()) % ") " % - " Lag: " % QString::number(blockNumber - notarized) % - " HUSH/USD=$" % QString::number( (double) Settings::getInstance()->getZECPrice() ) % - " " % QString::number( Settings::getInstance()->getBTCPrice() ) % "sat"; + " Lag: " % QString::number(blockNumber - notarized) % price; main->statusLabel->setText(statusText); - auto zecPrice = Settings::getUSDFormat(1); + auto hushPrice = Settings::getUSDFormat(1); QString tooltip; if (connections > 0) { tooltip = QObject::tr("Connected to hushd"); @@ -698,10 +712,10 @@ void RPC::getInfoThenRefresh(bool force) { else { tooltip = QObject::tr("hushd has no peer connections! Network issues?"); } - tooltip = tooltip % "(v " % QString::number(Settings::getInstance()->getZcashdVersion()) % ")"; + tooltip = tooltip % "(v" % QString::number(Settings::getInstance()->getZcashdVersion()) % ")"; - if (!zecPrice.isEmpty()) { - tooltip = "1 HUSH = " % zecPrice % "\n" % tooltip; + if (!hushPrice.isEmpty()) { + tooltip = "1 HUSH = " % hushPrice % "\n" % tooltip; } main->statusLabel->setToolTip(tooltip); main->statusIcon->setToolTip(tooltip); @@ -801,9 +815,9 @@ void RPC::refreshBalances() { AppDataModel::getInstance()->setBalances(balT, balZ); - ui->balSheilded ->setText(Settings::getZECDisplayFormat(balZ)); - ui->balTransparent->setText(Settings::getZECDisplayFormat(balT)); - ui->balTotal ->setText(Settings::getZECDisplayFormat(balTotal)); + ui->balSheilded ->setText(Settings::getDisplayFormat(balZ)); + ui->balTransparent->setText(Settings::getDisplayFormat(balT)); + ui->balTotal ->setText(Settings::getDisplayFormat(balTotal)); ui->balSheilded ->setToolTip(Settings::getUSDFormat(balZ)); ui->balTransparent->setToolTip(Settings::getUSDFormat(balT)); @@ -1085,15 +1099,16 @@ void RPC::checkForUpdate(bool silent) { } // Get the HUSH prices -void RPC::refreshZECPrice() { +void RPC::refreshPrice() { if (conn == nullptr) return noConnection(); - // TODO: use/render all this data - QUrl cmcURL("https://api.coingecko.com/api/v3/simple/price?ids=hush&vs_currencies=btc%2Cusd%2Ceur&include_market_cap=true&include_24hr_vol=true&include_24hr_change=true"); + QString price_feed = "https://api.coingecko.com/api/v3/simple/price?ids=hush&vs_currencies=btc%2Cusd%2Ceur%2Ceth%2Cgbp%2Ccny%2Cjpy%2Cidr%2Crub%2Ccad%2Csgd%2Cchf%2Cinr%2Caud%2Cinr%2Ckrw%2Cthb%2Cnzd%2Czar%2Cvef%2Cxau%2Cxag%2Cvnd%2Csar%2Ctwd%2Caed%2Cars%2Cbdt%2Cbhd%2Cbmd%2Cbrl%2Cclp%2Cczk%2Cdkk%2Chuf%2Cils%2Ckwd%2Clkr%2Cpkr%2Cnok%2Ctry%2Csek%2Cmxn%2Cuah%2Chkd&include_market_cap=true&include_24hr_vol=true&include_24hr_change=true"; + QUrl cmcURL(price_feed); QNetworkRequest req; req.setUrl(cmcURL); QNetworkReply *reply = conn->restclient->get(req); + auto s = Settings::getInstance(); QObject::connect(reply, &QNetworkReply::finished, [=] { reply->deleteLater(); @@ -1106,8 +1121,8 @@ void RPC::refreshZECPrice() { } else { qDebug() << reply->errorString(); } - Settings::getInstance()->setZECPrice(0); - Settings::getInstance()->setBTCPrice(0); + s->setZECPrice(0); + s->setBTCPrice(0); return; } @@ -1115,8 +1130,8 @@ void RPC::refreshZECPrice() { auto all = reply->readAll(); auto parsed = json::parse(all, nullptr, false); if (parsed.is_discarded()) { - Settings::getInstance()->setZECPrice(0); - Settings::getInstance()->setBTCPrice(0); + s->setZECPrice(0); + s->setBTCPrice(0); return; } @@ -1124,16 +1139,51 @@ void RPC::refreshZECPrice() { const json& item = parsed.get(); const json& hush = item["hush"].get(); + std::string ticker = s->get_currency_name(); + std::for_each(ticker.begin(), ticker.end(), [](char & c){ c = ::tolower(c); }); + fprintf(stderr,"ticker=%s\n", ticker.c_str()); + //qDebug() << "Ticker = " + ticker; - if (hush["usd"] >= 0) { + if (hush[ticker] >= 0) { qDebug() << "Found hush key in price json"; - // TODO: support BTC/EUR prices as well //QString price = QString::fromStdString(hush["usd"].get()); - qDebug() << "HUSH = $" << QString::number((double)hush["usd"]); - qDebug() << "HUSH = " << QString::number((double)hush["btc"]) << " sat "; - Settings::getInstance()->setZECPrice( hush["usd"] ); - Settings::getInstance()->setBTCPrice( (unsigned int) 100000000 * (double)hush["btc"] ); - + qDebug() << "HUSH = $" << QString::number((double)hush["usd"]) << " USD"; + qDebug() << "HUSH = " << QString::number((double)hush["eur"]) << " EUR"; + qDebug() << "HUSH = " << QString::number((int) 100000000 * (double) hush["btc"]) << " sat "; + + s->setZECPrice( hush[ticker] ); + s->setBTCPrice( (unsigned int) 100000000 * (double)hush["btc"] ); + + std::for_each(ticker.begin(), ticker.end(), [](char & c){ c = ::tolower(c); }); + qDebug() << "ticker=" << QString::fromStdString(ticker); + // TODO: work harder to prevent coredumps! + auto price = hush[ticker]; + auto vol = hush[ticker + "_24h_vol"]; + auto mcap = hush[ticker + "_market_cap"]; + + auto btcprice = hush["btc"]; + auto btcvol = hush["btc_24h_vol"]; + auto btcmcap = hush["btc_market_cap"]; + s->set_price(ticker, price); + s->set_volume(ticker, vol); + s->set_volume("BTC", btcvol); + s->set_marketcap(ticker, mcap); + + qDebug() << "Volume = " << (double) vol; + std::for_each(ticker.begin(), ticker.end(), [](char & c){ c = ::toupper(c); }); + ui->volume->setText( QString::number((double) vol, 'f', 2) + " " + QString::fromStdString(ticker) ); + ui->volumeBTC->setText( QString::number((double) btcvol, 'f', 2) + " BTC" ); + std::for_each(ticker.begin(), ticker.end(), [](char & c){ c = ::toupper(c); }); + // We don't get an actual HUSH volume stat, so we calculate it + if (price > 0) + ui->volumeLocal->setText( QString::number((double) vol / (double) price) + " HUSH"); + + qDebug() << "Mcap = " << (double) mcap; + ui->marketcap->setText( QString::number( (double) mcap, 'f', 2) + " " + QString::fromStdString(ticker) ); + ui->marketcapBTC->setText( QString::number((double) btcmcap, 'f', 2) + " BTC" ); + //ui->marketcapLocal->setText( QString::number((double) mcap * (double) price) + " " + QString::fromStdString(ticker) ); + + refresh(true); return; } else { qDebug() << "No hush key found in JSON! API might be down or we are rate-limited\n"; @@ -1150,7 +1200,7 @@ void RPC::refreshZECPrice() { } void RPC::shutdownZcashd() { - // Shutdown embedded zcashd if it was started + // Shutdown embedded hushd if it was started if (ezcashd == nullptr || ezcashd->processId() == 0 || conn == nullptr) { // No hushd running internally, just return return; @@ -1179,7 +1229,7 @@ void RPC::shutdownZcashd() { if ((ezcashd->atEnd() && ezcashd->processId() == 0) || ezcashd->state() == QProcess::NotRunning || waitCount > 30 || - conn->config->zcashDaemon) { // If zcashd is daemon, then we don't have to do anything else + conn->config->zcashDaemon) { // If hushd is daemon, then we don't have to do anything else qDebug() << "Ended"; waiter.stop(); QTimer::singleShot(1000, [&]() { d.accept(); }); @@ -1189,7 +1239,7 @@ void RPC::shutdownZcashd() { }); waiter.start(1000); - // Wait for the zcash process to exit. + // Wait for the hush process to exit. if (!Settings::getInstance()->isHeadless()) { d.exec(); } else { diff --git a/src/rpc.h b/src/rpc.h index 7521345..b599da5 100644 --- a/src/rpc.h +++ b/src/rpc.h @@ -46,7 +46,7 @@ public: void refreshAddresses(); void checkForUpdate(bool silent = true); - void refreshZECPrice(); + void refreshPrice(); void getZboardTopics(std::function)> cb); void executeTransaction(Tx tx, @@ -68,10 +68,11 @@ public: const QMap* getAllBalances() { return allBalances; } const QMap* getUsedAddresses() { return usedAddresses; } - void newZaddr(bool sapling, const std::function& cb); + void newZaddr(const std::function& cb); void newTaddr(const std::function& cb); void getZPrivKey(QString addr, const std::function& cb); + void getZViewKey(QString addr, const std::function& cb); void getTPrivKey(QString addr, const std::function& cb); void importZPrivKey(QString addr, bool rescan, const std::function& cb); void importTPrivKey(QString addr, bool rescan, const std::function& cb); diff --git a/src/scripts/docker/Dockerfile b/src/scripts/docker/Dockerfile index bfbd138..361d2fe 100644 --- a/src/scripts/docker/Dockerfile +++ b/src/scripts/docker/Dockerfile @@ -42,4 +42,21 @@ RUN cd /opt && \ cd /opt/mxe && \ make -j$(nproc) MXE_TARGETS=x86_64-w64-mingw32.static qtbase qtwebsockets +# Add rust +RUN apt install -y gcc-aarch64-linux-gnu + +RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.38.0 -y +RUN echo 'source $HOME/.cargo/env' >> $HOME/.bashrc +RUN ~/.cargo/bin/rustup target add x86_64-pc-windows-gnu +RUN ~/.cargo/bin/rustup target add aarch64-unknown-linux-gnu + +# Append the linker to the cargo config for Windows cross compile +RUN echo "[target.x86_64-pc-windows-gnu]" >> ~/.cargo/config && \ + echo "linker = 'x86_64-w64-mingw32.static-gcc'" >> ~/.cargo/config + +RUN echo "[target.aarch64-unknown-linux-gnu]" >> ~/.cargo/config && \ + echo "linker = '/usr/bin/aarch64-linux-gnu-gcc'" >> ~/.cargo/config + +ENV CC_x86_64_pc_windows_gnu="x86_64-w64-mingw32.static-gcc" +ENV CC_aarch64_unknown_linux_gnu="aarch64-linux-gnu-gcc" ENV PATH="/opt/mxe/usr/bin:${PATH}" diff --git a/src/scripts/dotranslations.sh b/src/scripts/dotranslations.sh old mode 100755 new mode 100644 index 9505622..a140cf5 --- a/src/scripts/dotranslations.sh +++ b/src/scripts/dotranslations.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Copyright (c) 2019-2020 The Hush developers +# Released under the GPLv3 if [ -z $QT_STATIC ]; then echo "QT_STATIC is not set. Please set it to the base directory of a statically compiled Qt"; @@ -11,7 +13,6 @@ $QT_STATIC/bin/lrelease silentdragon.pro # Then update the qt base translations. First, get all languages ls res/*.qm | awk -F '[_.]' '{print $4}' | while read -r language ; do if [ -f $QT_STATIC/translations/qtbase_$language.qm ]; then - $QT_STATIC/bin/lconvert -o res/zec_$language.qm $QT_STATIC/translations/qtbase_$language.qm res/silentdragon_$language.qm - mv res/zec_$language.qm res/silentdragon_$language.qm + $QT_STATIC/bin/lconvert -o res/silentdragon_$language.qm $QT_STATIC/translations/qtbase_$language.qm res/silentdragon_$language.qm fi done diff --git a/src/scripts/make-binary-tarball.sh b/src/scripts/make-binary-tarball.sh new file mode 100755 index 0000000..2abc584 --- /dev/null +++ b/src/scripts/make-binary-tarball.sh @@ -0,0 +1,49 @@ +#!/bin/bash +# Copyright (c) 2020 The Hush developers +# Released under the GPLv3 + +APP_VERSION=$(cat src/version.h | cut -d\" -f2) +if [ -z $APP_VERSION ]; then echo "APP_VERSION is not set"; exit 1; fi + +# This assumes we already have a staticly compiled SD + +set -e +OS=$(uname) +ARCH=$(uname -i) +APP=SilentDragon-v$APP_VERSION-$OS-$ARCH +DIR=$APP +echo "Making tarball for $APP..." +if [ -e $DIR ]; then + mv $DIR $DIR.$(perl -e 'print time') +fi +mkdir -p $DIR +strip silentdragon +strip komodod +strip komodo-tx +strip komodo-cli + +cp silentdragon $DIR +cp komodod $DIR +cp komodo-cli $DIR +cp komodo-tx $DIR +cp hushd $DIR +cp hush-cli $DIR +cp hush-tx $DIR +cp README.md $DIR +cp LICENSE $DIR + +# We make tarballs without params for people who already have them installed +echo "Creating $APP-noparams.tar.gz..." +tar czf $APP-noparams.tar.gz $DIR/ + +cp sapling-output.params $DIR +cp sapling-spend.params $DIR + +# By default we tell users to use the normal tarball with params, which will +# be about 50MB larger but should cause less user support issues +echo "Creating $APP.tar.gz..." +tar czf $APP.tar.gz $DIR/ + +echo "CHECKSUMS for $APP_VERSION" +sha256sum $APP-noparams.tar.gz +sha256sum $APP.tar.gz diff --git a/src/scripts/make-deb.sh b/src/scripts/make-deb.sh new file mode 100755 index 0000000..8050313 --- /dev/null +++ b/src/scripts/make-deb.sh @@ -0,0 +1,123 @@ +#!/bin/bash +# Copyright (c) 2019-2020 The Hush developers +# Released under the GPLv3 + +DEBLOG=deb.log.$$ + +if [ -z $QT_STATIC ]; then + echo "QT_STATIC is not set. Please set it to the base directory of a statically compiled Qt"; + exit 1; +fi + +APP_VERSION=$(cat src/version.h | cut -d\" -f2) +if [ -z $APP_VERSION ]; then echo "APP_VERSION is not set"; exit 1; fi +#if [ -z $PREV_VERSION ]; then echo "PREV_VERSION is not set"; exit 1; fi + +if [ -z $HUSH_DIR ]; then + echo "HUSH_DIR is not set. Please set it to the base directory of hush3.git" + exit 1; +fi + +if [ ! -f $HUSH_DIR/artifacts/komodod ]; then + echo "Couldn't find komodod in $HUSH_DIR/artifacts/. Please build komodod." + exit 1; +fi + +if [ ! -f $HUSH_DIR/artifacts/komodo-cli ]; then + echo "Couldn't find komodo-cli in $HUSH_DIR/artifacts/. Please build komodod." + exit 1; +fi + +echo -n "Cleaning..............." +rm -rf bin/* +rm -rf artifacts/* +make distclean >/dev/null 2>&1 +echo "[OK]" + +echo "" +echo "[Building $APP_VERSION on" `lsb_release -r`" logging to $DEBLOG ]" + +echo -n "Translations............" +QT_STATIC=$QT_STATIC bash src/scripts/dotranslations.sh >/dev/null +echo -n "Configuring............" +$QT_STATIC/bin/qmake silentdragon.pro -spec linux-clang CONFIG+=release > /dev/null +echo "[OK]" + + +echo -n "Building..............." +rm -rf bin/silentdragon* > /dev/null +make clean > /dev/null +./build.sh release > /dev/null +echo "[OK]" + + +# Test for Qt +echo -n "Static link............" +if [[ $(ldd silentdragon | grep -i "Qt") ]]; then + echo "FOUND QT; ABORT"; + exit 1 +fi +echo "[OK]" + + +echo -n "Packaging.............." +APP=SilentDragon-v$APP_VERSION +DIR=bin/$APP +mkdir $DIR > /dev/null +strip silentdragon + +cp silentdragon $DIR > /dev/null +cp $HUSH_DIR/artifacts/komodod $DIR > /dev/null +cp $HUSH_DIR/artifacts/komodo-cli $DIR > /dev/null +cp $HUSH_DIR/artifacts/komodo-tx $DIR > /dev/null +cp $HUSH_DIR/artifacts/hushd $DIR > /dev/null +cp $HUSH_DIR/artifacts/hush-cli $DIR > /dev/null +cp $HUSH_DIR/artifacts/hush-tx $DIR > /dev/null +cp README.md $DIR > /dev/null +cp LICENSE $DIR > /dev/null + +cd bin && tar czf $APP.tar.gz $DIR/ > /dev/null +cd .. + +mkdir artifacts >/dev/null 2>&1 +cp $DIR.tar.gz ./artifacts/$APP-linux.tar.gz +echo "[OK]" + + +if [ -f artifacts/$APP-linux.tar.gz ] ; then + echo -n "Package contents......." + # Test if the package is built OK + if tar tf "artifacts/$APP-linux.tar.gz" | wc -l | grep -q "9"; then + echo "[OK]" + else + echo "[ERROR] Wrong number of files does not match 9" + exit 1 + fi +else + echo "[ERROR]" + exit 1 +fi + +echo -n "Building deb..........." +debdir=bin/deb/silentdragon-v$APP_VERSION +mkdir -p $debdir > /dev/null +mkdir $debdir/DEBIAN +mkdir -p $debdir/usr/local/bin + +cat src/scripts/control | sed "s/RELEASE_VERSION/$APP_VERSION/g" > $debdir/DEBIAN/control + +cp silentdragon $debdir/usr/local/bin/ +# TODO: how does this interact with hushd deb ? +cp $HUSH_DIR/artifacts/komodod $debdir/usr/local/bin/hush-komodod + +mkdir -p $debdir/usr/share/pixmaps/ +cp res/silentdragon.xpm $debdir/usr/share/pixmaps/ + +mkdir -p $debdir/usr/share/applications +cp src/scripts/desktopentry $debdir/usr/share/applications/silentdragon.desktop + +dpkg-deb --build $debdir >/dev/null +cp $debdir.deb artifacts/$DIR.deb +echo "[OK]" + +exit 0 diff --git a/src/scripts/make-only-deb.sh b/src/scripts/make-only-deb.sh new file mode 100755 index 0000000..2ff93fc --- /dev/null +++ b/src/scripts/make-only-deb.sh @@ -0,0 +1,40 @@ +#!/bin/bash +# Copyright (c) 2020 The Hush developers +# Released under the GPLv3 + +echo "Let There Be Debian Packages" +set -e +#set -x + +ARCH=$(uname -i) +APP_VERSION=$(cat src/version.h | cut -d\" -f2) +if [ -z $APP_VERSION ]; then echo "APP_VERSION is not set"; exit 1; fi + +# This assumes we already have a staticly compiled SD + +echo "Building Debian package for $APP_VERSION-$ARCH..." +debdir=deb-SilentDragon-v$APP_VERSION-$ARCH +if [ -e $debdir ]; then + mv $debdir $debdir-backup.$(perl -e 'print time') +fi +mkdir -p $debdir > /dev/null +mkdir $debdir/DEBIAN +mkdir -p $debdir/usr/local/bin + +cat src/scripts/control | sed "s/RELEASE_VERSION/$APP_VERSION/g" > $debdir/DEBIAN/control + +# might have been done already, but just in case +strip silentdragon +cp silentdragon $debdir/usr/local/bin/ + +# TODO: We need an updated pixmap! +#mkdir -p $debdir/usr/share/pixmaps/ +#cp res/silentdragon.xpm $debdir/usr/share/pixmaps/ + +mkdir -p $debdir/usr/share/applications +cp src/scripts/desktopentry $debdir/usr/share/applications/silentdragon.desktop + +dpkg-deb --build $debdir >/dev/null +sha256sum $debdir.deb + +exit 0 diff --git a/src/scripts/mkmacdmg.sh b/src/scripts/mkmacdmg.sh old mode 100755 new mode 100644 index 2e6eb86..31d8dbc --- a/src/scripts/mkmacdmg.sh +++ b/src/scripts/mkmacdmg.sh @@ -17,7 +17,17 @@ case $key in shift # past argument shift # past value ;; - -c|--certificate) + -u|--username) + APPLE_USERNAME="$2" + shift # past argument + shift # past value + ;; + -p|--password) + APPLE_PASSWORD="$2" + shift # past argument + shift # past value + ;; + -c|--certificate) CERTIFICATE="$2" shift # past argument shift # past value @@ -45,6 +55,16 @@ if [ -z $HUSH_DIR ]; then exit 1; fi +if [ -z "$APPLE_USERNAME" ]; then + echo "APPLE_USERNAME is not set. Please set it the name of the MacOS developer login email to submit the binary for Apple for notarization"; + exit 1; +fi + +if [ -z "$APPLE_PASSWORD" ]; then + echo "APPLE_PASSWORD is not set. Please set it the name of the MacOS developer Application password to submit the binary for Apple for notarization"; + exit 1; +fi + if [ -z "$CERTIFICATE" ]; then echo "CERTIFICATE is not set. Please set it the name of the MacOS developer certificate to sign the binary with"; exit 1; @@ -94,31 +114,25 @@ cp $HUSH_DIR/src/hushd silentdragon.app/Contents/MacOS/ cp $HUSH_DIR/src/hush-cli silentdragon.app/Contents/MacOS/ cp $HUSH_DIR/src/komodod silentdragon.app/Contents/MacOS/ cp $HUSH_DIR/src/komodo-cli silentdragon.app/Contents/MacOS/ +cp $HUSH_DIR/sapling-output.params silentdragon.app/Contents/MacOS/ +cp $HUSH_DIR/sapling-spend.params silentdragon.app/Contents/MacOS/ $QT_PATH/bin/macdeployqt silentdragon.app codesign --deep --force --verify --verbose -s "$CERTIFICATE" --options runtime --timestamp silentdragon.app echo "[OK]" # Code Signing Note: -# On MacOS, you still need to run these 3 commands: -# xcrun altool --notarize-app -t osx -f macOS-zecwallet-v0.8.0.dmg --primary-bundle-id="com.yourcompany.zecwallet" -u "apple developer id@email.com" -p "one time password" -# xcrun altool --notarization-info -u "apple developer id@email.com" -p "one time password" -#...wait for the notarization to finish... -# xcrun stapler staple macOS-zecwallet-v0.8.0.dmg +# On MacOS, you still need to run signbinaries.sh to staple. +# echo -n "Building dmg..........." -mv silentdragon.app silentdragon.app create-dmg --volname "silentdragon-v$APP_VERSION" --volicon "res/logo.icns" --window-pos 200 120 --icon "silentdragon.app" 200 190 --app-drop-link 600 185 --hide-extension "silentdragon.app" --window-size 800 400 --hdiutil-quiet --background res/dmgbg.png artifacts/macOS-silentdragon-v$APP_VERSION.dmg silentdragon.app >/dev/null 2>&1 - -#mkdir bin/dmgbuild >/dev/null 2>&1 -#sed "s/RELEASE_VERSION/${APP_VERSION}/g" res/appdmg.json > bin/dmgbuild/appdmg.json -#cp res/logo.icns bin/dmgbuild/ -#cp res/dmgbg.png bin/dmgbuild/ - -#cp -r silentdragon.app bin/dmgbuild/ - -#appdmg --quiet bin/dmgbuild/appdmg.json artifacts/macOS-silentdragon-v$APP_VERSION.dmg >/dev/null if [ ! -f artifacts/macOS-silentdragon-v$APP_VERSION.dmg ]; then echo "[ERROR]" exit 1 fi echo "[OK]" + +# Submit to Apple for notarization +echo -n "Apple notarization....." +xcrun altool --notarize-app -t osx -f artifacts/macOS-silentdragon-v$APP_VERSION.dmg --primary-bundle-id="com.myHush.silentdragon" -u "$APPLE_USERNAME" -p "$APPLE_PASSWORD" +echo "[OK]" diff --git a/src/scripts/mkrelease.sh b/src/scripts/mkrelease.sh index 9127a5e..587a414 100755 --- a/src/scripts/mkrelease.sh +++ b/src/scripts/mkrelease.sh @@ -7,39 +7,39 @@ fi if [ -z $APP_VERSION ]; then echo "APP_VERSION is not set"; exit 1; fi if [ -z $PREV_VERSION ]; then echo "PREV_VERSION is not set"; exit 1; fi -if [ -z $ZCASH_DIR ]; then - echo "ZCASH_DIR is not set. Please set it to the base directory of a Zcash project with built Zcash binaries." +if [ -z $HUSH_DIR ]; then + echo "HUSH_DIR is not set. Please set it to the base directory of a Zcash project with built Zcash binaries." exit 1; fi -if [ ! -f $ZCASH_DIR/artifacts/zcashd ]; then - echo "Couldn't find zcashd in $ZCASH_DIR/artifacts/. Please build zcashd." +if [ ! -f $HUSH_DIR/artifacts/komodod ]; then + echo "Couldn't find komodod in $HUSH_DIR/artifacts/. Please build komodod." exit 1; fi -if [ ! -f $ZCASH_DIR/artifacts/zcash-cli ]; then - echo "Couldn't find zcash-cli in $ZCASH_DIR/artifacts/. Please build zcashd." +if [ ! -f $HUSH_DIR/artifacts/hush-cli ]; then + echo "Couldn't find hush-cli in $HUSH_DIR/artifacts/. Please build komodod." exit 1; fi -# Ensure that zcashd is the right build -echo -n "zcashd version........." -if grep -q "zqwMagicBean" $ZCASH_DIR/artifacts/zcashd && ! readelf -s $ZCASH_DIR/artifacts/zcashd | grep -q "GLIBC_2\.25"; then - echo "[OK]" -else - echo "[ERROR]" - echo "zcashd doesn't seem to be a zqwMagicBean build or zcashd is built with libc 2.25" - exit 1 -fi - -echo -n "zcashd.exe version....." -if grep -q "zqwMagicBean" $ZCASH_DIR/artifacts/zcashd.exe; then - echo "[OK]" -else - echo "[ERROR]" - echo "zcashd doesn't seem to be a zqwMagicBean build" - exit 1 -fi +# Ensure that komodod is the right build +#echo -n "komodod version........." +#if grep -q "zqwMagicBean" $HUSH_DIR/artifacts/komodod && ! readelf -s $HUSH_DIR/artifacts/komodod | grep -q "GLIBC_2\.25"; then +# echo "[OK]" +#else +# echo "[ERROR]" +## echo "komodod doesn't seem to be a zqwMagicBean build or komodod is built with libc 2.25" +# exit 1 +#fi + +#echo -n "komodod.exe version....." +#if grep -q "zqwMagicBean" $HUSH_DIR/artifacts/komodod.exe; then +# echo "[OK]" +#else +# echo "[ERROR]" +# echo "komodod doesn't seem to be a zqwMagicBean build" +# exit 1 +#fi echo -n "Version files.........." # Replace the version number in the .pro file so it gets picked up everywhere @@ -65,16 +65,15 @@ echo "[OK]" echo -n "Building..............." -rm -rf bin/zec-qt-wallet* > /dev/null -rm -rf bin/zecwallet* > /dev/null +rm -rf bin/silentdragon* > /dev/null make clean > /dev/null -make -j$(nproc) > /dev/null +./build.sh release > /dev/null echo "[OK]" # Test for Qt echo -n "Static link............" -if [[ $(ldd zecwallet | grep -i "Qt") ]]; then +if [[ $(ldd silentdragon | grep -i "Qt") ]]; then echo "FOUND QT; ABORT"; exit 1 fi @@ -82,27 +81,31 @@ echo "[OK]" echo -n "Packaging.............." -mkdir bin/zecwallet-v$APP_VERSION > /dev/null -strip zecwallet - -cp zecwallet bin/zecwallet-v$APP_VERSION > /dev/null -cp $ZCASH_DIR/artifacts/zcashd bin/zecwallet-v$APP_VERSION > /dev/null -cp $ZCASH_DIR/artifacts/zcash-cli bin/zecwallet-v$APP_VERSION > /dev/null -cp README.md bin/zecwallet-v$APP_VERSION > /dev/null -cp LICENSE bin/zecwallet-v$APP_VERSION > /dev/null - -cd bin && tar czf linux-zecwallet-v$APP_VERSION.tar.gz zecwallet-v$APP_VERSION/ > /dev/null +mkdir bin/silentdragon-v$APP_VERSION > /dev/null +strip silentdragon + +cp silentdragon bin/silentdragon-v$APP_VERSION > /dev/null +cp $HUSH_DIR/artifacts/komodod bin/silentdragon-v$APP_VERSION > /dev/null +cp $HUSH_DIR/artifacts/komodo-cli bin/silentdragon-v$APP_VERSION > /dev/null +cp $HUSH_DIR/artifacts/komodo-tx bin/silentdragon-v$APP_VERSION > /dev/null +cp $HUSH_DIR/artifacts/hushd bin/silentdragon-v$APP_VERSION > /dev/null +cp $HUSH_DIR/artifacts/hush-cli bin/silentdragon-v$APP_VERSION > /dev/null +cp $HUSH_DIR/artifacts/hush-tx bin/silentdragon-v$APP_VERSION > /dev/null +cp README.md bin/silentdragon-v$APP_VERSION > /dev/null +cp LICENSE bin/silentdragon-v$APP_VERSION > /dev/null + +cd bin && tar czf linux-silentdragon-v$APP_VERSION.tar.gz silentdragon-v$APP_VERSION/ > /dev/null cd .. mkdir artifacts >/dev/null 2>&1 -cp bin/linux-zecwallet-v$APP_VERSION.tar.gz ./artifacts/linux-binaries-zecwallet-v$APP_VERSION.tar.gz +cp bin/linux-silentdragon-v$APP_VERSION.tar.gz ./artifacts/linux-binaries-silentdragon-v$APP_VERSION.tar.gz echo "[OK]" -if [ -f artifacts/linux-binaries-zecwallet-v$APP_VERSION.tar.gz ] ; then +if [ -f artifacts/linux-binaries-silentdragon-v$APP_VERSION.tar.gz ] ; then echo -n "Package contents......." # Test if the package is built OK - if tar tf "artifacts/linux-binaries-zecwallet-v$APP_VERSION.tar.gz" | wc -l | grep -q "6"; then + if tar tf "artifacts/linux-binaries-silentdragon-v$APP_VERSION.tar.gz" | wc -l | grep -q "6"; then echo "[OK]" else echo "[ERROR]" @@ -114,24 +117,25 @@ else fi echo -n "Building deb..........." -debdir=bin/deb/zecwallet-v$APP_VERSION +debdir=bin/deb/silentdragon-v$APP_VERSION mkdir -p $debdir > /dev/null mkdir $debdir/DEBIAN mkdir -p $debdir/usr/local/bin cat src/scripts/control | sed "s/RELEASE_VERSION/$APP_VERSION/g" > $debdir/DEBIAN/control -cp zecwallet $debdir/usr/local/bin/ -cp $ZCASH_DIR/artifacts/zcashd $debdir/usr/local/bin/zqw-zcashd +cp silentdragon $debdir/usr/local/bin/ +# TODO: how does this interact with hushd deb ? +cp $HUSH_DIR/artifacts/komodod $debdir/usr/local/bin/hush-komodod mkdir -p $debdir/usr/share/pixmaps/ -cp res/zecwallet.xpm $debdir/usr/share/pixmaps/ +cp res/silentdragon.xpm $debdir/usr/share/pixmaps/ mkdir -p $debdir/usr/share/applications -cp src/scripts/desktopentry $debdir/usr/share/applications/zec-qt-wallet.desktop +cp src/scripts/desktopentry $debdir/usr/share/applications/silentdragon.desktop dpkg-deb --build $debdir >/dev/null -cp $debdir.deb artifacts/linux-deb-zecwallet-v$APP_VERSION.deb +cp $debdir.deb artifacts/linux-deb-silentdragon-v$APP_VERSION.deb echo "[OK]" @@ -145,14 +149,14 @@ if [ -z $MXE_PATH ]; then exit 0; fi -if [ ! -f $ZCASH_DIR/artifacts/zcashd.exe ]; then - echo "Couldn't find zcashd.exe in $ZCASH_DIR/artifacts/. Please build zcashd.exe" +if [ ! -f $HUSH_DIR/artifacts/komodod.exe ]; then + echo "Couldn't find komodod.exe in $HUSH_DIR/artifacts/. Please build komodod.exe" exit 1; fi -if [ ! -f $ZCASH_DIR/artifacts/zcash-cli.exe ]; then - echo "Couldn't find zcash-cli.exe in $ZCASH_DIR/artifacts/. Please build zcashd.exe" +if [ ! -f $HUSH_DIR/artifacts/komodo-cli.exe ]; then + echo "Couldn't find komodo-cli.exe in $HUSH_DIR/artifacts/. Please build komodod-cli.exe" exit 1; fi @@ -168,28 +172,31 @@ echo "[OK]" echo -n "Building..............." +# TODO: where is this .pro file? x86_64-w64-mingw32.static-qmake-qt5 zec-qt-wallet-mingw.pro CONFIG+=release > /dev/null make -j32 > /dev/null echo "[OK]" echo -n "Packaging.............." -mkdir release/zecwallet-v$APP_VERSION -cp release/zecwallet.exe release/zecwallet-v$APP_VERSION -cp $ZCASH_DIR/artifacts/zcashd.exe release/zecwallet-v$APP_VERSION > /dev/null -cp $ZCASH_DIR/artifacts/zcash-cli.exe release/zecwallet-v$APP_VERSION > /dev/null -cp README.md release/zecwallet-v$APP_VERSION -cp LICENSE release/zecwallet-v$APP_VERSION -cd release && zip -r Windows-binaries-zecwallet-v$APP_VERSION.zip zecwallet-v$APP_VERSION/ > /dev/null +mkdir release/silentdragon-v$APP_VERSION +cp release/silentdragon.exe release/silentdragon-v$APP_VERSION +cp $HUSH_DIR/artifacts/komodod.exe release/silentdragon-v$APP_VERSION > /dev/null +cp $HUSH_DIR/artifacts/komodo-cli.exe release/silentdragon-v$APP_VERSION > /dev/null +cp $HUSH_DIR/artifacts/hushd.bat release/silentdragon-v$APP_VERSION > /dev/null +cp $HUSH_DIR/artifacts/hush-cli.bat release/silentdragon-v$APP_VERSION > /dev/null +cp README.md release/silentdragon-v$APP_VERSION +cp LICENSE release/silentdragon-v$APP_VERSION +cd release && zip -r Windows-binaries-silentdragon-v$APP_VERSION.zip silentdragon-v$APP_VERSION/ > /dev/null cd .. mkdir artifacts >/dev/null 2>&1 -cp release/Windows-binaries-zecwallet-v$APP_VERSION.zip ./artifacts/ +cp release/Windows-binaries-silentdragon-v$APP_VERSION.zip ./artifacts/ echo "[OK]" -if [ -f artifacts/Windows-binaries-zecwallet-v$APP_VERSION.zip ] ; then +if [ -f artifacts/Windows-binaries-silentdragon-v$APP_VERSION.zip ] ; then echo -n "Package contents......." - if unzip -l "artifacts/Windows-binaries-zecwallet-v$APP_VERSION.zip" | wc -l | grep -q "11"; then + if unzip -l "artifacts/Windows-binaries-silentdragon-v$APP_VERSION.zip" | wc -l | grep -q "11"; then echo "[OK]" else echo "[ERROR]" diff --git a/src/scripts/signbinaries.sh b/src/scripts/signbinaries.sh index 341b735..284a900 100755 --- a/src/scripts/signbinaries.sh +++ b/src/scripts/signbinaries.sh @@ -24,7 +24,12 @@ if [ -z $APP_VERSION ]; then echo "APP_VERSION is not set"; exit 1; fi # Store the hash and signatures here rm -rf release/signatures -mkdir -p release/signatures +mkdir -p release/signatures + +# Staple the notarization +xcrun stapler staple artifacts/macOS-silentdragon-v$APP_VERSION.dmg + +cd artifacts cd artifacts diff --git a/src/sendtab.cpp b/src/sendtab.cpp index 70ac8ca..0567149 100644 --- a/src/sendtab.cpp +++ b/src/sendtab.cpp @@ -1,4 +1,4 @@ -// Copyright 2019 The Hush developers +// Copyright 2019-2020 Hush developers #include "mainwindow.h" #include "ui_mainwindow.h" #include "addressbook.h" @@ -196,7 +196,7 @@ void MainWindow::updateFromCombo() { void MainWindow::inputComboTextChanged(int index) { auto addr = ui->inputsCombo->itemText(index); auto bal = rpc->getAllBalances()->value(addr); - auto balFmt = Settings::getZECDisplayFormat(bal); + auto balFmt = Settings::getDisplayFormat(bal); ui->sendAddressBalance->setText(balFmt); ui->sendAddressBalanceUSD->setText(Settings::getUSDFormat(bal)); @@ -497,9 +497,6 @@ Tx MainWindow::createTxFromSendPage() { // Remove label if it exists addr = AddressBook::addressFromAddressLabel(addr); - // If address is sprout, then we can't send change to sapling, because of turnstile. - //sendChangeToSapling = sendChangeToSapling && !Settings::getInstance()->isSproutAddress(addr); - double amt = ui->sendToWidgets->findChild(QString("Amount") % QString::number(i+1))->text().trimmed().toDouble(); totalAmt += amt; QString memo = ui->sendToWidgets->findChild(QString("MemoTxt") % QString::number(i+1))->text().trimmed(); @@ -598,7 +595,7 @@ bool MainWindow::confirmTx(Tx tx) { // Amount (HUSH) auto Amt = new QLabel(confirm.sendToAddrs); Amt->setObjectName(QString("Amt") % QString::number(i + 1)); - Amt->setText(Settings::getZECDisplayFormat(toAddr.amount)); + Amt->setText(Settings::getDisplayFormat(toAddr.amount)); Amt->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter); confirm.gridLayout->addWidget(Amt, row, 1, 1, 1); totalSpending += toAddr.amount; @@ -648,7 +645,7 @@ bool MainWindow::confirmTx(Tx tx) { minerFee->setObjectName(QStringLiteral("minerFee")); minerFee->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); confirm.gridLayout->addWidget(minerFee, row, 1, 1, 1); - minerFee->setText(Settings::getZECDisplayFormat(tx.fee)); + minerFee->setText(Settings::getDisplayFormat(tx.fee)); totalSpending += tx.fee; auto minerFeeUSD = new QLabel(confirm.sendToAddrs); @@ -732,7 +729,10 @@ void MainWindow::sendButton() { QString MainWindow::doSendTxValidations(Tx tx) { //TODO: Feedback fromAddr is empty for some reason - if (!Settings::isValidAddress(tx.fromAddr)) return QString(tr("From Address is Invalid")); + if (!Settings::isValidAddress(tx.fromAddr)){ + qDebug() << "address is invalid! " << tx.fromAddr; + return QString(tr("From Address is Invalid!")); + } for (auto toAddr : tx.toAddrs) { if (!Settings::isValidAddress(toAddr.addr)) { diff --git a/src/senttxstore.cpp b/src/senttxstore.cpp index 22a6828..a25f761 100644 --- a/src/senttxstore.cpp +++ b/src/senttxstore.cpp @@ -90,7 +90,7 @@ void SentTxStore::addToSentTx(Tx tx, QString txid) { } else { // Concatenate all the toAddresses for (auto a : tx.toAddrs) { - toAddresses += a.addr % "(" % Settings::getZECDisplayFormat(a.amount) % ") "; + toAddresses += a.addr % "(" % Settings::getDisplayFormat(a.amount) % ") "; } } diff --git a/src/settings.cpp b/src/settings.cpp index c0624a1..2341417 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1,4 +1,5 @@ -// Copyright 2019 The Hush developers +// Copyright 2019-2020 Hush developers +// Released under the GPLv3 #include "mainwindow.h" #include "settings.h" @@ -162,6 +163,63 @@ double Settings::getZECPrice() { return zecPrice; } +double Settings::get_price(std::string currency) { + std::for_each(currency.begin(), currency.end(), [](char & c){ c = ::tolower(c); }); + QString ticker = QString::fromStdString(currency); + auto search = prices.find(currency); + if (search != prices.end()) { + qDebug() << "Found price of " << ticker << " = " << search->second; + return search->second; + } else { + qDebug() << "Could not find price of" << ticker << "!!!"; + return 0.0; + } +} + +void Settings::set_price(std::string curr, double price) { + QString ticker = QString::fromStdString(curr); + qDebug() << "Setting price of " << ticker << "=" << QString::number(price); + prices.insert( std::make_pair(curr, price) ); +} + +void Settings::set_volume(std::string curr, double volume) { + QString ticker = QString::fromStdString(curr); + qDebug() << "Setting volume of " << ticker << "=" << QString::number(volume); + volumes.insert( std::make_pair(curr, volume) ); +} + +double Settings::get_volume(std::string currency) { + std::for_each(currency.begin(), currency.end(), [](char & c){ c = ::tolower(c); }); + QString ticker = QString::fromStdString(currency); + auto search = volumes.find(currency); + if (search != volumes.end()) { + qDebug() << "Found volume of " << ticker << " = " << search->second; + return search->second; + } else { + qDebug() << "Could not find volume of" << ticker << "!!!"; + return 0.0; + } +} + +void Settings::set_marketcap(std::string curr, double marketcap) { + QString ticker = QString::fromStdString(curr); + qDebug() << "Setting marketcap of " << ticker << "=" << QString::number(marketcap); + marketcaps.insert( std::make_pair(curr, marketcap) ); +} + +double Settings::get_marketcap(std::string currency) { + std::for_each(currency.begin(), currency.end(), [](char & c){ c = ::tolower(c); }); + QString ticker = QString::fromStdString(currency); + auto search = marketcaps.find(currency); + if (search != marketcaps.end()) { + qDebug() << "Found marketcap of " << ticker << " = " << search->second; + return search->second; + } else { + qDebug() << "Could not find marketcap of" << ticker << "!!!"; + return -1.0; + } +} + unsigned int Settings::getBTCPrice() { // in satoshis return btcPrice; @@ -222,7 +280,8 @@ void Settings::saveRestore(QDialog* d) { } QString Settings::getUSDFormat(double bal) { - return "$" + QLocale(QLocale::English).toString(bal * Settings::getInstance()->getZECPrice(), 'f', 2); + //TODO: respect current locale! + return QLocale(QLocale::English).toString(bal * Settings::getInstance()->getZECPrice(), 'f', 8) + " " + QString::fromStdString(Settings::getInstance()->get_currency_name()); } QString Settings::getDecimalString(double amt) { @@ -237,7 +296,7 @@ QString Settings::getDecimalString(double amt) { return f; } -QString Settings::getZECDisplayFormat(double bal) { +QString Settings::getDisplayFormat(double bal) { // This is idiotic. Why doesn't QString have a way to do this? return getDecimalString(bal) % " " % Settings::getTokenName(); } @@ -245,25 +304,27 @@ QString Settings::getZECDisplayFormat(double bal) { QString Settings::getZECUSDDisplayFormat(double bal) { auto usdFormat = getUSDFormat(bal); if (!usdFormat.isEmpty()) - return getZECDisplayFormat(bal) % " (" % getUSDFormat(bal) % ")"; + return getDisplayFormat(bal) % " (" % getUSDFormat(bal) % ")"; else - return getZECDisplayFormat(bal); + return getDisplayFormat(bal); } -const QString Settings::txidStatusMessage = QString(QObject::tr("Tx submitted (right click to copy) txid:")); +const QString Settings::txidStatusMessage = QString(QObject::tr("Transaction submitted (right click to copy) txid:")); QString Settings::getTokenName() { if (Settings::getInstance()->isTestnet()) { - return "HUSHT"; + return "TUSH"; } else { return "HUSH"; } } +//TODO: this isn't used for donations QString Settings::getDonationAddr() { if (Settings::getInstance()->isTestnet()) { return "ztestsaplingXXX"; } + // This is used for user feedback return "zs1aq4xnrkjlnxx0zesqye7jz3dfrf3rjh7q5z6u8l6mwyqqaam3gx3j2fkqakp33v93yavq46j83q"; } @@ -280,6 +341,16 @@ bool Settings::addToZcashConf(QString confLocation, QString line) { return true; } +std::string Settings::get_currency_name() { + // Load from the QT Settings. + return QSettings().value("options/currency_name", "BTC").toString().toStdString(); +} + +void Settings::set_currency_name(std::string currency_name) { + QSettings().setValue("options/currency_name", QString::fromStdString(currency_name)); +} + + bool Settings::removeFromZcashConf(QString confLocation, QString option) { if (confLocation.isEmpty()) return false; @@ -339,7 +410,7 @@ bool Settings::isValidAddress(QString addr) { // Get a pretty string representation of this Payment URI QString Settings::paymentURIPretty(PaymentURI uri) { - return QString() + "Payment Request\n" + "Pay: " + uri.addr + "\nAmount: " + getZECDisplayFormat(uri.amt.toDouble()) + return QString() + "Payment Request\n" + "Pay: " + uri.addr + "\nAmount: " + getDisplayFormat(uri.amt.toDouble()) + "\nMemo:" + QUrl::fromPercentEncoding(uri.memo.toUtf8()); } diff --git a/src/settings.h b/src/settings.h index 9756896..ac060bc 100644 --- a/src/settings.h +++ b/src/settings.h @@ -85,13 +85,24 @@ public: QString get_theme_name(); void set_theme_name(QString theme_name); + std::string get_currency_name(); + void set_currency_name(std::string currency_name); + void setUsingZcashConf(QString confLocation); const QString& getZcashdConfLocation() { return _confLocation; } - void setZECPrice(double p) { zecPrice = p; } - void setBTCPrice(unsigned int p) { btcPrice = p; } + void setZECPrice(double p) { zecPrice = p; } + void set_fiat_price(double p) { fiat_price = p; } + void setBTCPrice(unsigned int p) { btcPrice = p; } double getZECPrice(); + double get_fiat_price(); unsigned int getBTCPrice(); + double get_price(std::string currency); + void set_price(std::string currency, double price); + double get_volume(std::string ticker); + void set_volume(std::string curr, double volume); + double get_marketcap(std::string curr); + void set_marketcap(std::string curr, double marketcap); void setPeers(int peers); int getPeers(); @@ -110,7 +121,7 @@ public: static QString getDecimalString(double amt); static QString getUSDFormat(double bal); - static QString getZECDisplayFormat(double bal); + static QString getDisplayFormat(double bal); static QString getZECUSDDisplayFormat(double bal); static QString getTokenName(); @@ -152,7 +163,11 @@ private: int _peerConnections = 0; double zecPrice = 0.0; - unsigned int btcPrice = 0.0; + double fiat_price = 0.0; + unsigned int btcPrice = 0; + std::map prices; + std::map volumes; + std::map marketcaps; }; #endif // SETTINGS_H diff --git a/src/settings.ui b/src/settings.ui index 896209e..7370a2c 100644 --- a/src/settings.ui +++ b/src/settings.ui @@ -161,6 +161,258 @@ + + + + + + 0 + 0 + + + + Local Currency + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + 80 + 150 + 80 + 25 + + + + + 0 + 0 + + + + + AED + + + + + ARS + + + + + AUD + + + + + BDT + + + + + BHD + + + + + BMD + + + + + BRL + + + + + BTC + + + + + CAD + + + + + CHF + + + + + CLP + + + + + CNY + + + + + CZK + + + + + DKK + + + + + EUR + + + + + GBP + + + + + HKD + + + + + HUF + + + + + IDR + + + + + ILS + + + + + INR + + + + + JPY + + + + + KRW + + + + + KWD + + + + + LKR + + + + + PKR + + + + + MXN + + + + + NOK + + + + + NZD + + + + + RUB + + + + + SAR + + + + + SEK + + + + + SGD + + + + + THB + + + + + TRY + + + + + TWD + + + + + UAH + + + + + USD + + + + + VEF + + + + + VND + + + + + XAG + + + + + XAU + + + + + ZAR + + + + + @@ -323,7 +575,7 @@ - Fetch HUSH / USD prices + Fetch HUSH prices diff --git a/src/txtablemodel.cpp b/src/txtablemodel.cpp index a13b31e..e7e4f96 100644 --- a/src/txtablemodel.cpp +++ b/src/txtablemodel.cpp @@ -132,7 +132,7 @@ void TxTableModel::updateAllData() { return addr; } case 2: return QDateTime::fromMSecsSinceEpoch(modeldata->at(index.row()).datetime * (qint64)1000).toLocalTime().toString(); - case 3: return Settings::getZECDisplayFormat(modeldata->at(index.row()).amount); + case 3: return Settings::getDisplayFormat(modeldata->at(index.row()).amount); } } diff --git a/src/version.h b/src/version.h index 37b696a..73156bc 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define APP_VERSION "0.8.3" +#define APP_VERSION "0.9.0" diff --git a/src/websockets.cpp b/src/websockets.cpp index 9bba90f..6a694ec 100644 --- a/src/websockets.cpp +++ b/src/websockets.cpp @@ -1,4 +1,4 @@ -// Copyright 2019 The Hush developers +// Copyright 2019-2020 Hush developers #include "websockets.h" #include "rpc.h" @@ -480,10 +480,16 @@ void AppDataServer::saveNonceHex(NonceType nt, QString noncehex) { // Encrypt an outgoing message with the stored secret key. QString AppDataServer::encryptOutgoing(QString msg) { - qDebug() << "Encrypting msg"; - if (msg.length() % 256 > 0) { - msg = msg + QString(" ").repeated(256 - (msg.length() % 256)); + // This padding size is ~50% larger than current largest + // message size and makes all current message types + // indistinguishable. If some new message type can + // be larger than this, the padding should probably be increased + int padding = 16*1024; + qDebug() << "Encrypt msg(pad="<