diff --git a/_translations/en.yml b/_translations/en.yml
index 6cb3e713..8cafbe1f 100644
--- a/_translations/en.yml
+++ b/_translations/en.yml
@@ -100,38 +100,83 @@ en:
choose-your-wallet:
title: "Choose your wallet - Bitcoin"
pagetitle: "Choose your Bitcoin wallet"
- summary: "Your Bitcoin wallet is what allows you to transact with other users. It gives you ownership of a Bitcoin balance so that you can send and receive bitcoins. Just like email, all wallets can interoperate with each other. Before you start with Bitcoin, be sure to read what you need to know first."
- getstarted: "Get started fast and easy"
- getstarteddesk: "MultiBit is an app you can download for Windows, Mac and Linux."
- getstartedmobi: "Bitcoin Wallet for Android runs on your phone or tablet."
- bethenetwork: "Why be part of the Bitcoin network"
- bethenetworktxt: "You can choose between different kinds of lightweight wallets or a full Bitcoin client. The later uses more storage and bandwidth and can take a day or longer to synchronize. But there are benefits like increased privacy and security by not trusting other network nodes. Running full nodes is essential to protecting the network by checking and relaying transactions."
- walletdesk: "Desktop wallets"
- walletdesktxt: "Desktop wallets are installed on your computer. They give you complete control over your wallet. You are responsible for protecting your money and doing backups."
- walletmobi: "Mobile wallets"
- walletmobitxt: "Mobile wallets allow you to bring Bitcoin with you in your pocket. You can exchange bitcoins easily and pay in physical stores by scanning a QR code or using NFC \"tap to pay\"."
- walletweb: "Web wallets"
- walletwebtxt: "Web wallets allow you to use Bitcoin on any browser or mobile and often offer additional services. However, you must choose your web wallet with care as they host your bitcoins."
+ pagedesc: "Find your wallet and start making payments with merchants and users."
+ walletcatmobile: "Mobile"
+ walletcatdesktop: "Desktop"
+ walletcathardware: "Hardware"
+ walletcatweb: "Web"
walletbitcoinqt: "Bitcoin Core is a full Bitcoin client and builds the backbone of the network. It offers the highest levels of security, privacy, and stability. However, it has fewer features and it takes a lot of space and memory."
walletmultibit: "MultiBit is a lightweight client that focuses on being fast and easy to use. It synchronizes with the network and is ready to use in minutes. MultiBit also supports many languages. It is a good choice for non-technical users."
wallethive: "Hive is a fast, integrated, user-friendly Bitcoin wallet for Mac OS X. With a focus on usability, Hive is translated into many languages and has apps, making it easy to interact with your favorite Bitcoin services and merchants."
wallethive-android: "Hive is a standalone wallet for Android, which requires no external server or account. It focuses on usability, yet provides a range of advanced features, such as touch-to-pay via NFC or reliable payments via Bluetooth. Hive Android is extensible through plugins."
walletarmory: "Armory is an advanced Bitcoin client that expands its features for Bitcoin power users. It offers many backup and encryption features, and it allows secure cold-storage on offline computers."
walletelectrum: "Electrum's focus is speed and simplicity, with low resource usage. It uses remote servers that handle the most complicated parts of the Bitcoin system, and it allows you to recover your wallet from a secret phrase."
- walletbitcoinwallet: "Bitcoin Wallet for Android is easy to use and reliable, while also being secure and fast. Its vision is de-centralization and zero trust: No central service is needed for Bitcoin-related operations. The app is a good choice for non-technical people. It is also available for BlackBerry OS."
+ walletbitcoinwallet: "Bitcoin Wallet for Android is easy to use and reliable, while also being secure and fast. Its vision is de-centralization and zero trust; no central service is needed for Bitcoin-related operations. The app is a good choice for non-technical people. It is also available for BlackBerry OS."
walletmyceliumwallet: "Mycelium Bitcoin Wallet is an open source wallet for Android designed for security, speed, and ease of use. It has unique features to manage your keys and for cold storage that help you secure your bitcoins."
- walletblockchaininfo: "Blockchain.info is a user-friendly hybrid wallet. It stores an encrypted version of your wallet online but decryption happens in your browser. For security reasons, you should always use the browser extension and email backups."
+ walletblockchaininfo: "Blockchain.info is a user-friendly hybrid wallet. It stores an encrypted version of your wallet online but decryption happens in your browser. For security reasons, you should always use the browser extension and email backups (and keep that email secure) ."
walletcoinbase: "Coinbase is a web wallet service that aims to be easy to use. It also provides an Android web wallet app, merchant tools and integration with US bank accounts to buy and sell bitcoins."
walletcoinkite: "Coinkite is a web wallet & debit card service that aims to be easy to use. It also works on mobile browsers, has merchant tools, point-of-sale payment terminals. It is a hybrid wallet and full reserve vault."
walletbitgo: "BitGo is a multi-signature wallet offering the highest levels of security. Every transaction requires two signatures, protecting your bitcoins from malware and server attacks. Private keys are held by the user such that BitGo cannot access the bitcoins. It is a good choice for non technical users."
walletgreenaddress: "GreenAddress is a user-friendly multi-signature wallet with improved security and privacy. At no time your keys are server side, not even encrypted. For security reasons, you should always use 2FA and the browser extension or Android App."
walletdownload: "Download"
walletvisit: "Visit website"
- walletwebwarning: "Be careful"
- walletwebwarningtxt: "Web wallets host your bitcoins. That means it is possible for them to lose your bitcoins following any incident on their side. As of today, no web wallet services provide enough insurance to be used to store value like a bank."
- walletwebwarningok: "OK, I understand"
- wallettrustinfo: "Third party"
- wallettrustinfotxt: "This wallet relies on a centralized service by default and requires a certain level of trust on a third party. This third party however does not control your wallet. Using backups and a strong password is always recommended when applicable."
+ checkgoodcontrolfull: "Control over your money"
+ checkgoodcontrolfulltxt: "This wallet gives you full control over your bitcoins. This means no third party can freeze or lose your funds. You are however still responsible for securing and backing up your wallet."
+ checkpasscontrolhybrid: "Hosted control over your money"
+ checkpasscontrolhybridtxt: "This wallet gives you control over your bitcoins. However, this service is retaining an encrypted copy of your wallet. This means your bitcoins can be stolen if you don't use a strong password and the service is compromised."
+ checkpasscontrolmulti: "Shared control over your money"
+ checkpasscontrolmultitxt: "This wallet requires every transaction to be authorized both by you and this third party. Under normal circumstances, you can regain full control over your bitcoins using your initial backup or pre-signed transactions sent by email."
+ checkfailcontrolthirdpartyinsured: "Money controlled by a third party"
+ checkfailcontrolthirdpartyinsuredtxt: "This service has full control over your bitcoins. This means you need to trust this service will not freeze or mismanage your funds. Although this service claims to be providing insurrance against failures on their side, you are still responsible for securing your wallet."
+ checkfailcontrolthirdparty: "Money controlled by a third party"
+ checkfailcontrolthirdpartytxt: "This service has full control over your bitcoins. This means you need to trust this service will not lose your funds in an incident on their side. As of today, most web wallets don't insure their deposits like a bank, and many such services have suffered from security breaches in the past."
+ checkgooddecentralizefullnode: "Full node"
+ checkgooddecentralizefullnodetxt: "This wallet is a full node that validates and relays transactions on the Bitcoin network. This means no trust in a third party is required when verifying payments. Full nodes provide the highest level of security and are essential to protecting the network. However, they require more space (over 20GB), bandwidth, and a longer initial synchronization time."
+ checkneutraldecentralizevariable: "Variable decentralization"
+ checkneutraldecentralizevariabletxt: "Decentralization features are provided by the software wallet you use with this device. Please see the Decentralization score for the software wallet you plan to use."
+ checkpassdecentralizespv: "Decentralized"
+ checkpassdecentralizespvtxt: "This wallet connects to the Bitcoin network. This means very little trust in third parties is required when verifying payments. However, it is not as secure as a full node like Bitcoin Core."
+ checkfaildecentralizecentralized: "Centralized"
+ checkfaildecentralizecentralizedtxt: "This wallet relies on a centralized service by default. This means a third party must be trusted to not hide or simulate payments."
+ checkgoodtransparencydeterministic: "Complete transparency"
+ checkgoodtransparencydeterministictxt: "This wallet is open-source and built deterministically. This means any developer in the world can audit the code and make sure the final software isn't hiding any secrets."
+ checkpasstransparencyopensource: "Good transparency"
+ checkpasstransparencyopensourcetxt: "The developers of this wallet publish the source code for the client. This means any developer in the world can audit the code. However, you still need to trust developers of this wallet when installing or updating the final software because it was not built deterministically like Bitcoin Core."
+ checkpasstransparencyclosedsource: "No transparency"
+ checkpasstransparencyclosedsourcetxt: "This wallet is not open-source. This means it is not possible to audit the code and make sure the final software isn't hiding dangerous code or doing anything you wouldn't agree to."
+ checkfailtransparencyremote: "Remote app"
+ checkfailtransparencyremotetxt: "This wallet is loaded from a remote location. This means that whenever you use your wallet, you need to trust the developers to not steal or lose your bitcoins in an incident on their site. Using a browser extension or mobile app, if available, can reduce that risk."
+ checkgoodenvironmenthardware: "Very secure environment"
+ checkgoodenvironmenthardwaretxt: "This wallet is loaded from a secure specialized environment provided by the device. This provides very strong protection against computer vulnerabilities and malware since no software can be installed on this environment."
+ checkpassenvironmentmobile: "Secure environment"
+ checkpassenvironmentmobiletxt: "This wallet is loaded on mobiles where apps are usually isolated. This provides a good protection against malware, although mobiles are usually easier to steal or lose. Encrypting your mobile and backing up your wallet can reduce that risk."
+ checkpassenvironmenttwofactor: "Two-factor authentication"
+ checkpassenvironmenttwofactortxt: "This wallet can be used from insecure environments. However, this service requires two-factor authentication. This means access to multiple devices or accounts is required to steal your bitcoins."
+ checkfailenvironmentdesktop: "Vulnerable environment"
+ checkfailenvironmentdesktoptxt: "This wallet can be loaded on computers which are vulnerable to malware. Securing your computer, using a strong passphrase, moving most of your funds to cold storage or enabling two-factor authentication can make it harder to steal on your bitcoins."
+ checkgoodprivacyimproved: "Improved privacy"
+ checkneutralprivacyvariable: "Variable privacy"
+ checkneutralprivacyvariabletxt: "Privacy features are provided by the software wallet you use with this device. Please see the Privacy score for the software wallet you plan to use."
+ checkpassprivacybasic: "Basic privacy"
+ checkfailprivacyweak: "Weak privacy"
+ checkpassprivacyaddressrotation: "Prevents spying on your payments"
+ checkpassprivacyaddressrotationtxt: "This wallet makes it harder to spy on your balance and payments by rotating addresses. You should still take care to use a new Bitcoin address each time you request payment."
+ checkfailprivacyaddressrotation: "Allows spying on your payments"
+ checkfailprivacyaddressrotationtxt: "This wallet makes it easy for anyone to spy on your balance and payments because it reuses the same addresses."
+ checkpassprivacydisclosurefullnode: "Avoids disclosing information"
+ checkpassprivacydisclosurefullnodetxt: "This wallet does not disclose information to peers on the network when receiving or sending a payment."
+ checkfailprivacydisclosurespv: "Discloses limited information to peers"
+ checkfailprivacydisclosurespvtxt: "Peers on the network can log your IP address and associate your payments together when receiving or sending payment."
+ checkfailprivacydisclosurecentralized: "Discloses information to a third party"
+ checkfailprivacydisclosurecentralizedtxt: "This wallet uses central servers which are able to associate your payments together and log your IP address."
+ checkfailprivacydisclosureaccount: "Discloses information to a third party"
+ checkfailprivacydisclosureaccounttxt: "This service can associate your payments together, log your IP address and know your real identity if you provide personal information like your email, name or banking account."
+ checkpassprivacynetworksupporttorproxy: "Tor can be used"
+ checkpassprivacynetworksupporttorproxytxt: "This wallet lets you setup and use Tor as a proxy to prevent attackers or Internet service providers from associating your payments with your IP address."
+ checkfailprivacynetworknosupporttor: "Tor not supported"
+ checkfailprivacynetworknosupporttortxt: "This wallet does not let you use Tor to prevent attackers or Internet service providers from associating your payments with your IP address."
+ educate: "Take time to educate yourself"
+ educatetxt: "Bitcoin is different from what you know and use every day. Before you start using Bitcoin for any serious transaction, be sure to read what you need to know and take appropriate steps to secure your wallet. Always remember that it is your responsibility to choose your wallet carefully and adopt good practices in order to protect your money."
development:
title: "Development - Bitcoin"
pagetitle: "Bitcoin development"
@@ -158,7 +203,7 @@ en:
sourcecode: "Get the source code"
versionhistory: "Show version history"
notelicense: "Bitcoin Core is a community-driven free software project, released under the MIT license."
- notesync: "Bitcoin Core initial sync can take a very long time to complete. You should make sure that you have enough bandwidth and storage for the full block chain size. If you know how to download a torrent file, you can speed up this process by putting bootstrap.dat (a previous copy of the block chain) in the Bitcoin Core data directory before starting the software."
+ notesync: "Bitcoin Core initial sync can take a long time. You should make sure that you have enough bandwidth and storage for the full block chain size (over 20GB). If you know how to download a torrent file, you can speed up this process by putting bootstrap.dat (a previous copy of the block chain) in the Bitcoin Core data directory before starting the software."
patient: "You will need to be patient"
events:
title: "Conferences and events - Bitcoin"
diff --git a/img/bubble.png b/img/bubble.png
deleted file mode 100644
index 481bec3c..00000000
Binary files a/img/bubble.png and /dev/null differ
diff --git a/img/bubblebottom.png b/img/bubblebottom.png
deleted file mode 100644
index 3cd7fbd8..00000000
Binary files a/img/bubblebottom.png and /dev/null differ
diff --git a/img/bubbleinfo.png b/img/bubbleinfo.png
deleted file mode 100644
index d83fb147..00000000
Binary files a/img/bubbleinfo.png and /dev/null differ
diff --git a/img/bubbleinfo.svg b/img/bubbleinfo.svg
deleted file mode 100644
index 4bdb18de..00000000
--- a/img/bubbleinfo.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
diff --git a/img/bubbleinfobottom.png b/img/bubbleinfobottom.png
deleted file mode 100644
index 266b97ed..00000000
Binary files a/img/bubbleinfobottom.png and /dev/null differ
diff --git a/img/bubbleinfomiddle.png b/img/bubbleinfomiddle.png
deleted file mode 100644
index 887ebb8d..00000000
Binary files a/img/bubbleinfomiddle.png and /dev/null differ
diff --git a/img/bubbleinfotop.png b/img/bubbleinfotop.png
deleted file mode 100644
index f0fd0f40..00000000
Binary files a/img/bubbleinfotop.png and /dev/null differ
diff --git a/img/bubblemiddle.png b/img/bubblemiddle.png
deleted file mode 100644
index bc79dd4b..00000000
Binary files a/img/bubblemiddle.png and /dev/null differ
diff --git a/img/bubblemiddle.svg b/img/bubblemiddle.svg
deleted file mode 100644
index f9c31891..00000000
--- a/img/bubblemiddle.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
diff --git a/img/bubbletop.png b/img/bubbletop.png
deleted file mode 100644
index 0d79e0f0..00000000
Binary files a/img/bubbletop.png and /dev/null differ
diff --git a/img/bubblewarn.png b/img/bubblewarn.png
deleted file mode 100644
index 5ac71d53..00000000
Binary files a/img/bubblewarn.png and /dev/null differ
diff --git a/img/bubblewarn.svg b/img/bubblewarn.svg
deleted file mode 100644
index 8b621c71..00000000
--- a/img/bubblewarn.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
diff --git a/img/bubblewarnbottom.png b/img/bubblewarnbottom.png
deleted file mode 100644
index b5076469..00000000
Binary files a/img/bubblewarnbottom.png and /dev/null differ
diff --git a/img/bubblewarnbottom.svg b/img/bubblewarnbottom.svg
deleted file mode 100644
index 4e123a87..00000000
--- a/img/bubblewarnbottom.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
diff --git a/img/bubblewarnmiddle.png b/img/bubblewarnmiddle.png
deleted file mode 100644
index 0034ea63..00000000
Binary files a/img/bubblewarnmiddle.png and /dev/null differ
diff --git a/img/bubblewarnmiddle.svg b/img/bubblewarnmiddle.svg
deleted file mode 100644
index 066528bc..00000000
--- a/img/bubblewarnmiddle.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
diff --git a/img/bubblewarntop.png b/img/bubblewarntop.png
deleted file mode 100644
index ea093f03..00000000
Binary files a/img/bubblewarntop.png and /dev/null differ
diff --git a/img/bubblewarntop.svg b/img/bubblewarntop.svg
deleted file mode 100644
index 7c541441..00000000
--- a/img/bubblewarntop.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
diff --git a/img/check_control_fail.png b/img/check_control_fail.png
new file mode 100644
index 00000000..ed4b1bc0
Binary files /dev/null and b/img/check_control_fail.png differ
diff --git a/img/check_control_fail.svg b/img/check_control_fail.svg
new file mode 100644
index 00000000..35d11bfe
--- /dev/null
+++ b/img/check_control_fail.svg
@@ -0,0 +1,85 @@
+
+
+
+
diff --git a/img/check_control_pass.png b/img/check_control_pass.png
new file mode 100644
index 00000000..15fd373a
Binary files /dev/null and b/img/check_control_pass.png differ
diff --git a/img/check_control_pass.svg b/img/check_control_pass.svg
new file mode 100644
index 00000000..9b2a7f29
--- /dev/null
+++ b/img/check_control_pass.svg
@@ -0,0 +1,85 @@
+
+
+
+
diff --git a/img/check_decentralization_fail.png b/img/check_decentralization_fail.png
new file mode 100644
index 00000000..f3233a6f
Binary files /dev/null and b/img/check_decentralization_fail.png differ
diff --git a/img/check_decentralization_fail.svg b/img/check_decentralization_fail.svg
new file mode 100644
index 00000000..ff8eb1eb
--- /dev/null
+++ b/img/check_decentralization_fail.svg
@@ -0,0 +1,112 @@
+
+
+
+
diff --git a/img/check_decentralization_neutral.png b/img/check_decentralization_neutral.png
new file mode 100644
index 00000000..e53e5a76
Binary files /dev/null and b/img/check_decentralization_neutral.png differ
diff --git a/img/check_decentralization_neutral.svg b/img/check_decentralization_neutral.svg
new file mode 100644
index 00000000..68402d70
--- /dev/null
+++ b/img/check_decentralization_neutral.svg
@@ -0,0 +1,112 @@
+
+
+
+
diff --git a/img/check_decentralization_pass.png b/img/check_decentralization_pass.png
new file mode 100644
index 00000000..18aa02e7
Binary files /dev/null and b/img/check_decentralization_pass.png differ
diff --git a/img/check_decentralization_pass.svg b/img/check_decentralization_pass.svg
new file mode 100644
index 00000000..af6939f5
--- /dev/null
+++ b/img/check_decentralization_pass.svg
@@ -0,0 +1,112 @@
+
+
+
+
diff --git a/img/check_environment_fail.png b/img/check_environment_fail.png
new file mode 100644
index 00000000..1f15dae0
Binary files /dev/null and b/img/check_environment_fail.png differ
diff --git a/img/check_environment_fail.svg b/img/check_environment_fail.svg
new file mode 100644
index 00000000..4fa6baa6
--- /dev/null
+++ b/img/check_environment_fail.svg
@@ -0,0 +1,124 @@
+
+
+
+
diff --git a/img/check_environment_pass.png b/img/check_environment_pass.png
new file mode 100644
index 00000000..fe13cd7a
Binary files /dev/null and b/img/check_environment_pass.png differ
diff --git a/img/check_environment_pass.svg b/img/check_environment_pass.svg
new file mode 100644
index 00000000..74a88a3f
--- /dev/null
+++ b/img/check_environment_pass.svg
@@ -0,0 +1,124 @@
+
+
+
+
diff --git a/img/check_privacy_fail.png b/img/check_privacy_fail.png
new file mode 100644
index 00000000..dbcafe9e
Binary files /dev/null and b/img/check_privacy_fail.png differ
diff --git a/img/check_privacy_fail.svg b/img/check_privacy_fail.svg
new file mode 100644
index 00000000..90d4ed5a
--- /dev/null
+++ b/img/check_privacy_fail.svg
@@ -0,0 +1,76 @@
+
+
+
+
diff --git a/img/check_privacy_neutral.png b/img/check_privacy_neutral.png
new file mode 100644
index 00000000..b0109316
Binary files /dev/null and b/img/check_privacy_neutral.png differ
diff --git a/img/check_privacy_neutral.svg b/img/check_privacy_neutral.svg
new file mode 100644
index 00000000..43244aea
--- /dev/null
+++ b/img/check_privacy_neutral.svg
@@ -0,0 +1,76 @@
+
+
+
+
diff --git a/img/check_privacy_pass.png b/img/check_privacy_pass.png
new file mode 100644
index 00000000..b9ca9a6e
Binary files /dev/null and b/img/check_privacy_pass.png differ
diff --git a/img/check_privacy_pass.svg b/img/check_privacy_pass.svg
new file mode 100644
index 00000000..c68366ad
--- /dev/null
+++ b/img/check_privacy_pass.svg
@@ -0,0 +1,76 @@
+
+
+
+
diff --git a/img/check_transparency_fail.png b/img/check_transparency_fail.png
new file mode 100644
index 00000000..f51383d4
Binary files /dev/null and b/img/check_transparency_fail.png differ
diff --git a/img/check_transparency_fail.svg b/img/check_transparency_fail.svg
new file mode 100644
index 00000000..5a847c14
--- /dev/null
+++ b/img/check_transparency_fail.svg
@@ -0,0 +1,76 @@
+
+
+
+
diff --git a/img/check_transparency_pass.png b/img/check_transparency_pass.png
new file mode 100644
index 00000000..08b894eb
Binary files /dev/null and b/img/check_transparency_pass.png differ
diff --git a/img/check_transparency_pass.svg b/img/check_transparency_pass.svg
new file mode 100644
index 00000000..15c179c8
--- /dev/null
+++ b/img/check_transparency_pass.svg
@@ -0,0 +1,76 @@
+
+
+
+
diff --git a/img/checkbubble_fail.png b/img/checkbubble_fail.png
new file mode 100644
index 00000000..413b56e6
Binary files /dev/null and b/img/checkbubble_fail.png differ
diff --git a/img/bubbleinfomiddle.svg b/img/checkbubble_fail.svg
similarity index 53%
rename from img/bubbleinfomiddle.svg
rename to img/checkbubble_fail.svg
index a8ea6167..1765bf89 100644
--- a/img/bubbleinfomiddle.svg
+++ b/img/checkbubble_fail.svg
@@ -9,17 +9,17 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="280"
- height="10"
- id="svg4147"
+ width="16"
+ height="16"
+ id="svg2"
version="1.1"
inkscape:version="0.48.4 r9939"
- inkscape:export-filename="/media/X/bitcoin.org/bitcoin.org_choose/img/bubble.png"
+ sodipodi:docname="checkbubble_fail.svg"
+ inkscape:export-filename="/media/X/bitcoin.org/current/img/checkbubble_fail.png"
inkscape:export-xdpi="90"
- inkscape:export-ydpi="90"
- sodipodi:docname="bubbleinfomiddle.svg">
+ inkscape:export-ydpi="90">
+ id="defs4" />
+ inkscape:window-width="1232"
+ inkscape:window-height="786"
+ inkscape:window-x="219"
+ inkscape:window-y="105"
+ inkscape:window-maximized="0" />
+ id="metadata7">
@@ -54,12 +54,22 @@
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(0,-1042.3622)">
+ transform="translate(0,-1036.3622)">
+ transform="translate(0,1036.3622)"
+ sodipodi:nodetypes="cccc" />
+
+
+
diff --git a/img/checkbubble_fail_rtl.png b/img/checkbubble_fail_rtl.png
new file mode 100644
index 00000000..3e8647b9
Binary files /dev/null and b/img/checkbubble_fail_rtl.png differ
diff --git a/img/bubblebottom.svg b/img/checkbubble_fail_rtl.svg
similarity index 51%
rename from img/bubblebottom.svg
rename to img/checkbubble_fail_rtl.svg
index 26d6eab6..89836913 100644
--- a/img/bubblebottom.svg
+++ b/img/checkbubble_fail_rtl.svg
@@ -9,17 +9,17 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="280"
- height="64"
- id="svg4147"
+ width="16"
+ height="16"
+ id="svg2"
version="1.1"
inkscape:version="0.48.4 r9939"
- inkscape:export-filename="/media/X/bitcoin.org/bitcoin.org_choose/img/bubble.png"
+ sodipodi:docname="checkbubble_fail.svg"
+ inkscape:export-filename="/media/X/bitcoin.org/current/img/checkbubble_fail_rtl.png"
inkscape:export-xdpi="90"
- inkscape:export-ydpi="90"
- sodipodi:docname="bubblebottom.svg">
+ inkscape:export-ydpi="90">
+ id="defs4" />
+ inkscape:window-width="1232"
+ inkscape:window-height="786"
+ inkscape:window-x="219"
+ inkscape:window-y="105"
+ inkscape:window-maximized="0" />
+ id="metadata7">
image/svg+xml
-
+
@@ -54,12 +54,22 @@
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(0,-988.3622)">
+ transform="translate(0,-1036.3622)">
+ sodipodi:nodetypes="cccc" />
+
+
+
diff --git a/img/checkbubble_neutral.png b/img/checkbubble_neutral.png
new file mode 100644
index 00000000..1c563997
Binary files /dev/null and b/img/checkbubble_neutral.png differ
diff --git a/img/bubbleinfobottom.svg b/img/checkbubble_neutral.svg
similarity index 53%
rename from img/bubbleinfobottom.svg
rename to img/checkbubble_neutral.svg
index 08162714..1574e9b1 100644
--- a/img/bubbleinfobottom.svg
+++ b/img/checkbubble_neutral.svg
@@ -9,17 +9,17 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="280"
- height="64"
- id="svg4147"
+ width="16"
+ height="16"
+ id="svg2"
version="1.1"
inkscape:version="0.48.4 r9939"
- inkscape:export-filename="/media/X/bitcoin.org/bitcoin.org_choose/img/bubble.png"
+ sodipodi:docname="checkbubble_neutral.svg"
+ inkscape:export-filename="/media/X/bitcoin.org/current/img/checkbubble_neutral.png"
inkscape:export-xdpi="90"
- inkscape:export-ydpi="90"
- sodipodi:docname="bubbleinfobottom.svg">
+ inkscape:export-ydpi="90">
+ id="defs4" />
+ inkscape:window-width="1232"
+ inkscape:window-height="786"
+ inkscape:window-x="219"
+ inkscape:window-y="105"
+ inkscape:window-maximized="0" />
+ id="metadata7">
@@ -54,12 +54,22 @@
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(0,-988.3622)">
+ transform="translate(0,-1036.3622)">
+ transform="translate(0,1036.3622)"
+ sodipodi:nodetypes="cccc" />
+
+
+
diff --git a/img/checkbubble_neutral_rtl.png b/img/checkbubble_neutral_rtl.png
new file mode 100644
index 00000000..14ef2abb
Binary files /dev/null and b/img/checkbubble_neutral_rtl.png differ
diff --git a/img/checkbubble_neutral_rtl.svg b/img/checkbubble_neutral_rtl.svg
new file mode 100644
index 00000000..d036ab3c
--- /dev/null
+++ b/img/checkbubble_neutral_rtl.svg
@@ -0,0 +1,75 @@
+
+
+
+
diff --git a/img/checkbubble_pass.png b/img/checkbubble_pass.png
new file mode 100644
index 00000000..c6dd9ebf
Binary files /dev/null and b/img/checkbubble_pass.png differ
diff --git a/img/bubbletop.svg b/img/checkbubble_pass.svg
similarity index 53%
rename from img/bubbletop.svg
rename to img/checkbubble_pass.svg
index b8a175ba..2943290f 100644
--- a/img/bubbletop.svg
+++ b/img/checkbubble_pass.svg
@@ -9,17 +9,17 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="280"
- height="10"
- id="svg4147"
+ width="16"
+ height="16"
+ id="svg2"
version="1.1"
inkscape:version="0.48.4 r9939"
- inkscape:export-filename="/media/X/bitcoin.org/bitcoin.org_choose/img/bubble.png"
+ sodipodi:docname="checkbubble_pass.svg"
+ inkscape:export-filename="/media/X/bitcoin.org/current/img/checkbubble_pass.png"
inkscape:export-xdpi="90"
- inkscape:export-ydpi="90"
- sodipodi:docname="bubbletop.svg">
+ inkscape:export-ydpi="90">
+ id="defs4" />
+ inkscape:window-width="1232"
+ inkscape:window-height="786"
+ inkscape:window-x="219"
+ inkscape:window-y="105"
+ inkscape:window-maximized="0" />
+ id="metadata7">
image/svg+xml
-
+
@@ -54,12 +54,22 @@
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(0,-1042.3622)">
+ transform="translate(0,-1036.3622)">
+ transform="translate(0,1036.3622)"
+ sodipodi:nodetypes="cccc" />
+
+
+
diff --git a/img/checkbubble_pass_rtl.png b/img/checkbubble_pass_rtl.png
new file mode 100644
index 00000000..8c924f16
Binary files /dev/null and b/img/checkbubble_pass_rtl.png differ
diff --git a/img/checkbubble_pass_rtl.svg b/img/checkbubble_pass_rtl.svg
new file mode 100644
index 00000000..396d77f5
--- /dev/null
+++ b/img/checkbubble_pass_rtl.svg
@@ -0,0 +1,75 @@
+
+
+
+
diff --git a/img/clients/lo-bitcoin.png b/img/clients/lo-bitcoincore.png
similarity index 100%
rename from img/clients/lo-bitcoin.png
rename to img/clients/lo-bitcoincore.png
diff --git a/img/icon-be-the-network.png b/img/icon-be-the-network.png
deleted file mode 100644
index 92ba7125..00000000
Binary files a/img/icon-be-the-network.png and /dev/null differ
diff --git a/img/icon-be-the-network.svg b/img/icon-be-the-network.svg
deleted file mode 100644
index eab1a856..00000000
--- a/img/icon-be-the-network.svg
+++ /dev/null
@@ -1,318 +0,0 @@
-
-
-
-
diff --git a/img/note.png b/img/note.png
new file mode 100644
index 00000000..80501ba8
Binary files /dev/null and b/img/note.png differ
diff --git a/img/note.svg b/img/note.svg
new file mode 100644
index 00000000..084716fa
--- /dev/null
+++ b/img/note.svg
@@ -0,0 +1,266 @@
+
+
+
+
diff --git a/img/os/ios.png b/img/os/ios.png
deleted file mode 100644
index 03b6405e..00000000
Binary files a/img/os/ios.png and /dev/null differ
diff --git a/img/os/iphone.png b/img/os/iphone.png
new file mode 100644
index 00000000..fbd353bf
Binary files /dev/null and b/img/os/iphone.png differ
diff --git a/img/os/iphone.svg b/img/os/iphone.svg
new file mode 100644
index 00000000..1464a6c4
--- /dev/null
+++ b/img/os/iphone.svg
@@ -0,0 +1,114 @@
+
+
+
+
diff --git a/img/os/mac.png b/img/os/mac.png
new file mode 100644
index 00000000..fbd353bf
Binary files /dev/null and b/img/os/mac.png differ
diff --git a/img/os/mac.svg b/img/os/mac.svg
new file mode 100644
index 00000000..acc202ed
--- /dev/null
+++ b/img/os/mac.svg
@@ -0,0 +1,114 @@
+
+
+
+
diff --git a/img/os/osx-uni.png b/img/os/osx-uni.png
deleted file mode 100644
index 8aa0e4ba..00000000
Binary files a/img/os/osx-uni.png and /dev/null differ
diff --git a/img/os/win.png b/img/os/windows.png
similarity index 100%
rename from img/os/win.png
rename to img/os/windows.png
diff --git a/img/screenshots/armory.png b/img/screenshots/armory.png
new file mode 100644
index 00000000..d6cad948
Binary files /dev/null and b/img/screenshots/armory.png differ
diff --git a/img/screenshots/bitcoincore.png b/img/screenshots/bitcoincore.png
new file mode 100644
index 00000000..046b9a7a
Binary files /dev/null and b/img/screenshots/bitcoincore.png differ
diff --git a/img/screenshots/bitcoinwalletandroid.png b/img/screenshots/bitcoinwalletandroid.png
new file mode 100644
index 00000000..cbddc15b
Binary files /dev/null and b/img/screenshots/bitcoinwalletandroid.png differ
diff --git a/img/screenshots/bitgo.png b/img/screenshots/bitgo.png
new file mode 100644
index 00000000..0d599380
Binary files /dev/null and b/img/screenshots/bitgo.png differ
diff --git a/img/screenshots/blockchainandroid.png b/img/screenshots/blockchainandroid.png
new file mode 100644
index 00000000..eb7aac30
Binary files /dev/null and b/img/screenshots/blockchainandroid.png differ
diff --git a/img/screenshots/blockchaindesktop.png b/img/screenshots/blockchaindesktop.png
new file mode 100644
index 00000000..c7030a48
Binary files /dev/null and b/img/screenshots/blockchaindesktop.png differ
diff --git a/img/screenshots/coinbase.png b/img/screenshots/coinbase.png
new file mode 100644
index 00000000..40599dcc
Binary files /dev/null and b/img/screenshots/coinbase.png differ
diff --git a/img/screenshots/coinkite.png b/img/screenshots/coinkite.png
new file mode 100644
index 00000000..3eebfb6d
Binary files /dev/null and b/img/screenshots/coinkite.png differ
diff --git a/img/screenshots/electrum.png b/img/screenshots/electrum.png
new file mode 100644
index 00000000..051b435f
Binary files /dev/null and b/img/screenshots/electrum.png differ
diff --git a/img/screenshots/greenaddressandroid.png b/img/screenshots/greenaddressandroid.png
new file mode 100644
index 00000000..253bd0dc
Binary files /dev/null and b/img/screenshots/greenaddressandroid.png differ
diff --git a/img/screenshots/greenaddressdesktop.png b/img/screenshots/greenaddressdesktop.png
new file mode 100644
index 00000000..f06d7eb0
Binary files /dev/null and b/img/screenshots/greenaddressdesktop.png differ
diff --git a/img/screenshots/hiveandroid.png b/img/screenshots/hiveandroid.png
new file mode 100644
index 00000000..d0ccad60
Binary files /dev/null and b/img/screenshots/hiveandroid.png differ
diff --git a/img/screenshots/hivemac.png b/img/screenshots/hivemac.png
new file mode 100644
index 00000000..6fda84f7
Binary files /dev/null and b/img/screenshots/hivemac.png differ
diff --git a/img/screenshots/multibit.png b/img/screenshots/multibit.png
new file mode 100644
index 00000000..9b863bcd
Binary files /dev/null and b/img/screenshots/multibit.png differ
diff --git a/img/screenshots/mycelium.png b/img/screenshots/mycelium.png
new file mode 100644
index 00000000..9ea602a8
Binary files /dev/null and b/img/screenshots/mycelium.png differ
diff --git a/img/wallet_bubble.png b/img/wallet_bubble.png
new file mode 100644
index 00000000..7f1a972b
Binary files /dev/null and b/img/wallet_bubble.png differ
diff --git a/img/bubble.svg b/img/wallet_bubble.svg
similarity index 50%
rename from img/bubble.svg
rename to img/wallet_bubble.svg
index 7893e2e8..979d72af 100644
--- a/img/bubble.svg
+++ b/img/wallet_bubble.svg
@@ -9,17 +9,17 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="280"
- height="280"
- id="svg4147"
+ width="32"
+ height="32"
+ id="svg3919"
version="1.1"
inkscape:version="0.48.4 r9939"
- inkscape:export-filename="/media/X/bitcoin.org/bitcoin.org_choose/img/bubble.png"
+ sodipodi:docname="wallet_bubble.svg"
+ inkscape:export-filename="/media/X/bitcoin.org/current/img/wallet_bubble.png"
inkscape:export-xdpi="90"
- inkscape:export-ydpi="90"
- sodipodi:docname="bubble.svg">
+ inkscape:export-ydpi="90">
+ id="defs3921" />
+ id="metadata3924">
image/svg+xml
-
+
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(0,-16)">
+ sodipodi:nodetypes="cccc" />
+
+
+
+
+
diff --git a/img/wallet_help.png b/img/wallet_help.png
new file mode 100644
index 00000000..ba6e15c7
Binary files /dev/null and b/img/wallet_help.png differ
diff --git a/img/wallet_help.svg b/img/wallet_help.svg
new file mode 100644
index 00000000..2f782b5d
--- /dev/null
+++ b/img/wallet_help.svg
@@ -0,0 +1,83 @@
+
+
+
+
diff --git a/img/wallet_menu_desktop.png b/img/wallet_menu_desktop.png
new file mode 100644
index 00000000..c2c336f9
Binary files /dev/null and b/img/wallet_menu_desktop.png differ
diff --git a/img/wallet_menu_desktop.svg b/img/wallet_menu_desktop.svg
new file mode 100644
index 00000000..3b116480
--- /dev/null
+++ b/img/wallet_menu_desktop.svg
@@ -0,0 +1,150 @@
+
+
+
+
diff --git a/img/wallet_menu_hardware.png b/img/wallet_menu_hardware.png
new file mode 100644
index 00000000..c5963055
Binary files /dev/null and b/img/wallet_menu_hardware.png differ
diff --git a/img/wallet_menu_hardware.svg b/img/wallet_menu_hardware.svg
new file mode 100644
index 00000000..f9dcd808
--- /dev/null
+++ b/img/wallet_menu_hardware.svg
@@ -0,0 +1,86 @@
+
+
+
+
diff --git a/img/wallet_menu_mobile.png b/img/wallet_menu_mobile.png
new file mode 100644
index 00000000..b16e4f21
Binary files /dev/null and b/img/wallet_menu_mobile.png differ
diff --git a/img/wallet_menu_mobile.svg b/img/wallet_menu_mobile.svg
new file mode 100644
index 00000000..1d2aa58c
--- /dev/null
+++ b/img/wallet_menu_mobile.svg
@@ -0,0 +1,70 @@
+
+
+
+
diff --git a/img/wallet_menu_web.png b/img/wallet_menu_web.png
new file mode 100644
index 00000000..fcad00bc
Binary files /dev/null and b/img/wallet_menu_web.png differ
diff --git a/img/wallet_menu_web.svg b/img/wallet_menu_web.svg
new file mode 100644
index 00000000..6484828d
--- /dev/null
+++ b/img/wallet_menu_web.svg
@@ -0,0 +1,159 @@
+
+
+
+
diff --git a/img/wallet_select.png b/img/wallet_select.png
new file mode 100644
index 00000000..15822f4c
Binary files /dev/null and b/img/wallet_select.png differ
diff --git a/img/bubbleinfotop.svg b/img/wallet_select.svg
similarity index 58%
rename from img/bubbleinfotop.svg
rename to img/wallet_select.svg
index b684f657..bfa45163 100644
--- a/img/bubbleinfotop.svg
+++ b/img/wallet_select.svg
@@ -9,17 +9,17 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="280"
- height="10"
- id="svg4147"
+ width="18"
+ height="18"
+ id="svg3794"
version="1.1"
inkscape:version="0.48.4 r9939"
- inkscape:export-filename="/media/X/bitcoin.org/bitcoin.org_choose/img/bubble.png"
+ sodipodi:docname="wallet_select.svg"
+ inkscape:export-filename="/media/X/bitcoin.org/current/img/wallet_select.png"
inkscape:export-xdpi="90"
- inkscape:export-ydpi="90"
- sodipodi:docname="bubbleinfotop.svg">
+ inkscape:export-ydpi="90">
+ id="defs3796" />
+ id="metadata3799">
@@ -51,15 +52,15 @@
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(0,-14)">
+ sodipodi:nodetypes="ccccccc" />
diff --git a/js/hyphenator.js b/js/hyphenator.js
deleted file mode 100644
index acf66efa..00000000
--- a/js/hyphenator.js
+++ /dev/null
@@ -1,2772 +0,0 @@
-/** @license Hyphenator 4.2.0 - client side hyphenation for webbrowsers
- * Copyright (C) 2013 Mathias Nater, Zürich (mathias at mnn dot ch)
- * Project and Source hosted on http://code.google.com/p/hyphenator/
- *
- * This JavaScript code is free software: you can redistribute
- * it and/or modify it under the terms of the GNU Lesser
- * General Public License (GNU LGPL) as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option)
- * any later version. The code is distributed WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU GPL for more details.
- *
- * As additional permission under GNU GPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- *
- * Hyphenator.js contains code from Bram Steins hypher.js-Project:
- * https://github.com/bramstein/Hypher
- *
- * Code from this project is marked in the source and belongs
- * to the following license:
- *
- * Copyright (c) 2011, Bram Stein
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-/*
- * Comments are jsdoctoolkit formatted. See http://code.google.com/p/jsdoc-toolkit/
- */
-
-/* The following comment is for JSLint: */
-/*global window */
-/*jslint browser: true */
-
-/**
- * @constructor
- * @description Provides all functionality to do hyphenation, except the patterns that are loaded
- * externally.
- * @author Mathias Nater, mathias@mnn.ch
- * @version 4.2.0
- * @namespace Holds all methods and properties
- * @example
- * <script src = "Hyphenator.js" type = "text/javascript"></script>
- * <script type = "text/javascript">
- * Hyphenator.run();
- * </script>
- */
-var Hyphenator = (function (window) {
- 'use strict';
-
- /**
- * @name Hyphenator-contextWindow
- * @private
- * @description
- * contextWindow stores the window for the document to be hyphenated.
- * If there are frames this will change.
- * So use contextWindow instead of window!
- */
- var contextWindow = window,
-
- /**
- * @name Hyphenator-supportedLangs
- * @description
- * A key-value object that stores supported languages and meta data.
- * The key is the bcp47 code of the language and the value
- * is an object containing following informations about the language:
- * file: filename of the pattern file,
- * script: script type of the language (e.g. 'latin' for english), this type is abbreviated by an id,
- * prompt: the sentence prompted to the user, if Hyphenator.js doesn't find a language hint.
- * @type {Object., Object>}
- * @private
- * @example
- * Check if language lang is supported:
- * if (supportedLangs.hasOwnProperty(lang))
- */
- supportedLangs = (function () {
- var r = {},
- o = function (code, file, script, prompt) {
- r[code] = {'file': file, 'script': script, 'prompt': prompt};
- };
-
- //latin:0, cyrillic: 1, arabic: 2, armenian:3, bengali: 4, devangari: 5, greek: 6
- //gujarati: 7, kannada: 8, lao: 9, malayalam: 10, oriya: 11, persian: 12, punjabi: 13, tamil: 14, telugu: 15
- //
- //(language code, file name, script, prompt)
- o('be', 'be.js', 1, 'Мова гэтага сайта не можа быць вызначаны аўтаматычна. Калі ласка пакажыце мову:');
- o('ca', 'ca.js', 0, '');
- o('cs', 'cs.js', 0, 'Jazyk této internetové stránky nebyl automaticky rozpoznán. Určete prosím její jazyk:');
- o('da', 'da.js', 0, 'Denne websides sprog kunne ikke bestemmes. Angiv venligst sprog:');
- o('bn', 'bn.js', 4, '');
- o('de', 'de.js', 0, 'Die Sprache dieser Webseite konnte nicht automatisch bestimmt werden. Bitte Sprache angeben:');
- o('el', 'el-monoton.js', 6, '');
- o('el-monoton', 'el-monoton.js', 6, '');
- o('el-polyton', 'el-polyton.js', 6, '');
- o('en', 'en-us.js', 0, 'The language of this website could not be determined automatically. Please indicate the main language:');
- o('en-gb', 'en-gb.js', 0, 'The language of this website could not be determined automatically. Please indicate the main language:');
- o('en-us', 'en-us.js', 0, 'The language of this website could not be determined automatically. Please indicate the main language:');
- o('eo', 'eo.js', 0, 'La lingvo de ĉi tiu retpaĝo ne rekoneblas aŭtomate. Bonvolu indiki ĝian ĉeflingvon:');
- o('es', 'es.js', 0, 'El idioma del sitio no pudo determinarse autom%E1ticamente. Por favor, indique el idioma principal:');
- o('et', 'et.js', 0, 'Veebilehe keele tuvastamine ebaõnnestus, palun valige kasutatud keel:');
- o('fi', 'fi.js', 0, 'Sivun kielt%E4 ei tunnistettu automaattisesti. M%E4%E4rit%E4 sivun p%E4%E4kieli:');
- o('fr', 'fr.js', 0, 'La langue de ce site n%u2019a pas pu %EAtre d%E9termin%E9e automatiquement. Veuillez indiquer une langue, s.v.p.%A0:');
- o('grc', 'grc.js', 6, '');
- o('gu', 'gu.js', 7, '');
- o('hi', 'hi.js', 5, '');
- o('hu', 'hu.js', 0, 'A weboldal nyelvét nem sikerült automatikusan megállapítani. Kérem adja meg a nyelvet:');
- o('hy', 'hy.js', 3, 'Չհաջողվեց հայտնաբերել այս կայքի լեզուն։ Խնդրում ենք նշեք հիմնական լեզուն՝');
- o('it', 'it.js', 0, 'Lingua del sito sconosciuta. Indicare una lingua, per favore:');
- o('kn', 'kn.js', 8, 'ಜಾಲ ತಾಣದ ಭಾಷೆಯನ್ನು ನಿರ್ಧರಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ. ದಯವಿಟ್ಟು ಮುಖ್ಯ ಭಾಷೆಯನ್ನು ಸೂಚಿಸಿ:');
- o('la', 'la.js', 0, '');
- o('lt', 'lt.js', 0, 'Nepavyko automatiškai nustatyti šios svetainės kalbos. Prašome įvesti kalbą:');
- o('lv', 'lv.js', 0, 'Šīs lapas valodu nevarēja noteikt automātiski. Lūdzu norādiet pamata valodu:');
- o('ml', 'ml.js', 10, 'ഈ വെ%u0D2C%u0D4D%u200Cസൈറ്റിന്റെ ഭാഷ കണ്ടുപിടിയ്ക്കാ%u0D28%u0D4D%u200D കഴിഞ്ഞില്ല. ഭാഷ ഏതാണെന്നു തിരഞ്ഞെടുക്കുക:');
- o('nb', 'nb-no.js', 0, 'Nettstedets språk kunne ikke finnes automatisk. Vennligst oppgi språk:');
- o('no', 'nb-no.js', 0, 'Nettstedets språk kunne ikke finnes automatisk. Vennligst oppgi språk:');
- o('nb-no', 'nb-no.js', 0, 'Nettstedets språk kunne ikke finnes automatisk. Vennligst oppgi språk:');
- o('nl', 'nl.js', 0, 'De taal van deze website kan niet automatisch worden bepaald. Geef de hoofdtaal op:');
- o('or', 'or.js', 11, '');
- o('pa', 'pa.js', 13, '');
- o('pl', 'pl.js', 0, 'Języka tej strony nie można ustalić automatycznie. Proszę wskazać język:');
- o('pt', 'pt.js', 0, 'A língua deste site não pôde ser determinada automaticamente. Por favor indique a língua principal:');
- o('ru', 'ru.js', 1, 'Язык этого сайта не может быть определен автоматически. Пожалуйста укажите язык:');
- o('sk', 'sk.js', 0, '');
- o('sl', 'sl.js', 0, 'Jezika te spletne strani ni bilo mogoče samodejno določiti. Prosim navedite jezik:');
- o('sr-latn', 'sr-latn.js', 0, 'Jezika te spletne strani ni bilo mogoče samodejno določiti. Prosim navedite jezik:');
- o('sv', 'sv.js', 0, 'Spr%E5ket p%E5 den h%E4r webbplatsen kunde inte avg%F6ras automatiskt. V%E4nligen ange:');
- o('ta', 'ta.js', 14, '');
- o('te', 'te.js', 15, '');
- o('tr', 'tr.js', 0, 'Bu web sitesinin dili otomatik olarak tespit edilememiştir. Lütfen dökümanın dilini seçiniz%A0:');
- o('uk', 'uk.js', 1, 'Мова цього веб-сайту не може бути визначена автоматично. Будь ласка, вкажіть головну мову:');
- o('ro', 'ro.js', 0, 'Limba acestui sit nu a putut fi determinată automat. Alege limba principală:');
-
- return r;
- }()),
-
-
- /**
- * @name Hyphenator-basePath
- * @description
- * A string storing the basepath from where Hyphenator.js was loaded.
- * This is used to load the patternfiles.
- * The basepath is determined dynamically by searching all script-tags for Hyphenator.js
- * If the path cannot be determined http://hyphenator.googlecode.com/svn/trunk/ is used as fallback.
- * @type {string}
- * @private
- * @see Hyphenator-loadPatterns
- */
- basePath = (function () {
- var s = contextWindow.document.getElementsByTagName('script'), i = 0, p, src, t = s[i], r = '';
- while (!!t) {
- if (!!t.src) {
- src = t.src;
- p = src.indexOf('hyphenator.js');
- if (p !== -1) {
- r = src.substring(0, p);
- }
- }
- i += 1;
- t = s[i];
- }
- return !!r ? r : 'https://hyphenator.googlecode.com/svn/trunk/';
- }()),
-
- /**
- * @name Hyphenator-isLocal
- * @private
- * @description
- * isLocal is true, if Hyphenator is loaded from the same domain, as the webpage, but false, if
- * it's loaded from an external source (i.e. directly from google.code)
- */
- isLocal = (function () {
- var re = false;
- if (window.location.href.indexOf(basePath) !== -1) {
- re = true;
- }
- return re;
- }()),
-
- /**
- * @name Hyphenator-documentLoaded
- * @private
- * @description
- * documentLoaded is true, when the DOM has been loaded. This is set by runOnContentLoaded
- */
- documentLoaded = false,
-
- /**
- * @name Hyphenator-persistentConfig
- * @private
- * @description
- * if persistentConfig is set to true (defaults to false), config options and the state of the
- * toggleBox are stored in DOM-storage (according to the storage-setting). So they haven't to be
- * set for each page.
- */
- persistentConfig = false,
-
- /**
- * @name Hyphenator-doFrames
- * @private
- * @description
- * switch to control if frames/iframes should be hyphenated, too
- * defaults to false (frames are a bag of hurt!)
- */
- doFrames = false,
-
- /**
- * @name Hyphenator-dontHyphenate
- * @description
- * A key-value object containing all html-tags whose content should not be hyphenated
- * @type {Object.}
- * @private
- * @see Hyphenator-hyphenateElement
- */
- dontHyphenate = {'script': true, 'code': true, 'pre': true, 'img': true, 'br': true, 'samp': true, 'kbd': true, 'var': true, 'abbr': true, 'acronym': true, 'sub': true, 'sup': true, 'button': true, 'option': true, 'label': true, 'textarea': true, 'input': true, 'math': true, 'svg': true},
-
- /**
- * @name Hyphenator-enableCache
- * @description
- * A variable to set if caching is enabled or not
- * @type boolean
- * @default true
- * @private
- * @see Hyphenator.config
- * @see hyphenateWord
- */
- enableCache = true,
-
- /**
- * @name Hyphenator-storageType
- * @description
- * A variable to define what html5-DOM-Storage-Method is used ('none', 'local' or 'session')
- * @type {string}
- * @default 'local'
- * @private
- * @see Hyphenator.config
- */
- storageType = 'local',
-
- /**
- * @name Hyphenator-storage
- * @description
- * An alias to the storage-Method defined in storageType.
- * Set by Hyphenator.run()
- * @type {Object|undefined}
- * @default null
- * @private
- * @see Hyphenator.run
- */
- storage,
-
- /**
- * @name Hyphenator-enableReducedPatternSet
- * @description
- * A variable to set if storing the used patterns is set
- * @type boolean
- * @default false
- * @private
- * @see Hyphenator.config
- * @see hyphenateWord
- * @see Hyphenator.getRedPatternSet
- */
- enableReducedPatternSet = false,
-
- /**
- * @name Hyphenator-enableRemoteLoading
- * @description
- * A variable to set if pattern files should be loaded remotely or not
- * @type boolean
- * @default true
- * @private
- * @see Hyphenator.config
- * @see Hyphenator-loadPatterns
- */
- enableRemoteLoading = true,
-
- /**
- * @name Hyphenator-displayToggleBox
- * @description
- * A variable to set if the togglebox should be displayed or not
- * @type boolean
- * @default false
- * @private
- * @see Hyphenator.config
- * @see Hyphenator-toggleBox
- */
- displayToggleBox = false,
-
- /**
- * @name Hyphenator-onError
- * @description
- * A function that can be called upon an error.
- * @see Hyphenator.config
- * @type {function(Object)}
- * @private
- */
- onError = function (e) {
- window.alert("Hyphenator.js says:\n\nAn Error occurred:\n" + e.message);
- },
-
- /**
- * @name Hyphenator-createElem
- * @description
- * A function alias to document.createElementNS or document.createElement
- * @type {function(string, Object)}
- * @private
- */
- createElem = function (tagname, context) {
- context = context || contextWindow;
- var el;
- if (window.document.createElementNS) {
- el = context.document.createElementNS('http://www.w3.org/1999/xhtml', tagname);
- } else if (window.document.createElement) {
- el = context.document.createElement(tagname);
- }
- return el;
- },
-
- /**
- * @name Hyphenator-css3
- * @description
- * A variable to set if css3 hyphenation should be used
- * @type boolean
- * @default false
- * @private
- * @see Hyphenator.config
- */
- css3 = false,
-
- /**
- * @name Hyphenator-css3_hsupport
- * @description
- * A generated object containing information for CSS3-hyphenation support
- * {
- * support: boolean,
- * property: ,
- * languages:
- * }
- * @type object
- * @default undefined
- * @private
- * @see Hyphenator-css3_gethsupport
- */
- css3_h9n,
-
- /**
- * @name Hyphenator-css3_gethsupport
- * @description
- * This function sets Hyphenator-css3_h9n for the current UA
- * @type function
- * @private
- * @see Hyphenator-css3_h9n
- */
- css3_gethsupport = function () {
- var s,
- createLangSupportChecker = function (prefix) {
- var testStrings = [
- //latin: 0
- 'aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz',
- //cyrillic: 1
- 'абвгдеёжзийклмнопрстуфхцчшщъыьэюя',
- //arabic: 2
- 'أبتثجحخدذرزسشصضطظعغفقكلمنهوي',
- //armenian: 3
- 'աբգդեզէըթժիլխծկհձղճմյնշոչպջռսվտրցւփքօֆ',
- //bengali: 4
- 'ঁংঃঅআইঈউঊঋঌএঐওঔকখগঘঙচছজঝঞটঠডঢণতথদধনপফবভমযরলশষসহ়ঽািীুূৃৄেৈোৌ্ৎৗড়ঢ়য়ৠৡৢৣ',
- //devangari: 5
- 'ँंःअआइईउऊऋऌएऐओऔकखगघङचछजझञटठडढणतथदधनपफबभमयरलळवशषसहऽािीुूृॄेैोौ्॒॑ॠॡॢॣ',
- //greek: 6
- 'αβγδεζηθικλμνξοπρσςτυφχψω',
- //gujarati: 7
- 'બહઅઆઇઈઉઊઋૠએઐઓઔાિીુૂૃૄૢૣેૈોૌકખગઘઙચછજઝઞટઠડઢણતથદધનપફસભમયરલળવશષ',
- //kannada: 8
- 'ಂಃಅಆಇಈಉಊಋಌಎಏಐಒಓಔಕಖಗಘಙಚಛಜಝಞಟಠಡಢಣತಥದಧನಪಫಬಭಮಯರಱಲಳವಶಷಸಹಽಾಿೀುೂೃೄೆೇೈೊೋೌ್ೕೖೞೠೡ',
- //lao: 9
- 'ກຂຄງຈຊຍດຕຖທນບປຜຝພຟມຢຣລວສຫອຮະັາິີຶືຸູົຼເແໂໃໄ່້໊໋ໜໝ',
- //malayalam: 10
- 'ംഃഅആഇഈഉഊഋഌഎഏഐഒഓഔകഖഗഘങചഛജഝഞടഠഡഢണതഥദധനപഫബഭമയരറലളഴവശഷസഹാിീുൂൃെേൈൊോൌ്ൗൠൡൺൻർൽൾൿ',
- //oriya: 11
- 'ଁଂଃଅଆଇଈଉଊଋଌଏଐଓଔକଖଗଘଙଚଛଜଝଞଟଠଡଢଣତଥଦଧନପଫବଭମଯରଲଳଵଶଷସହାିୀୁୂୃେୈୋୌ୍ୗୠୡ',
- //persian: 12
- 'أبتثجحخدذرزسشصضطظعغفقكلمنهوي',
- //punjabi: 13
- 'ਁਂਃਅਆਇਈਉਊਏਐਓਔਕਖਗਘਙਚਛਜਝਞਟਠਡਢਣਤਥਦਧਨਪਫਬਭਮਯਰਲਲ਼ਵਸ਼ਸਹਾਿੀੁੂੇੈੋੌ੍ੰੱ',
- //tamil: 14
- 'ஃஅஆஇஈஉஊஎஏஐஒஓஔகஙசஜஞடணதநனபமயரறலளழவஷஸஹாிீுூெேைொோௌ்ௗ',
- //telugu: 15
- 'ఁంఃఅఆఇఈఉఊఋఌఎఏఐఒఓఔకఖగఘఙచఛజఝఞటఠడఢణతథదధనపఫబభమయరఱలళవశషసహాిీుూృౄెేైొోౌ్ౕౖౠౡ'
- ],
- f = function (lang) {
- var shadow,
- computedHeight,
- bdy = window.document.getElementsByTagName('body')[0],
- r = false;
-
- if (supportedLangs.hasOwnProperty(lang)) {
- //create and append shadow-test-element
- shadow = createElem('div', window);
- shadow.id = 'Hyphenator_LanguageChecker';
- shadow.style.width = '5em';
- shadow.style[prefix] = 'auto';
- shadow.style.hyphens = 'auto';
- shadow.style.fontSize = '12px';
- shadow.style.lineHeight = '12px';
- shadow.style.visibility = 'hidden';
- shadow.lang = lang;
- shadow.style['-webkit-locale'] = "'" + lang + "'";
- shadow.innerHTML = testStrings[supportedLangs[lang].script];
- bdy.appendChild(shadow);
- //measure its height
- computedHeight = shadow.offsetHeight;
- //remove shadow element
- bdy.removeChild(shadow);
- r = (computedHeight > 12) ? true : false;
- } else {
- r = false;
- }
- return r;
- };
- return f;
- },
- r = {
- support: false,
- property: '',
- checkLangSupport: function () {}
- };
-
- if (window.getComputedStyle) {
- s = contextWindow.getComputedStyle(contextWindow.document.getElementsByTagName('body')[0], null);
- } else {
- //ancient Browsers don't support CSS3 anyway
- css3_h9n = r;
- return;
- }
-
- if (s['-webkit-hyphens'] !== undefined) {
- r.support = true;
- r.property = '-webkit-hyphens';
- r.checkLangSupport = createLangSupportChecker('-webkit-hyphens');
- } else if (s.MozHyphens !== undefined) {
- r.support = true;
- r.property = '-moz-hyphens';
- r.checkLangSupport = createLangSupportChecker('MozHyphens');
- } else if (s['-ms-hyphens'] !== undefined) {
- r.support = true;
- r.property = '-ms-hyphens';
- r.checkLangSupport = createLangSupportChecker('-ms-hyphens');
- }
- css3_h9n = r;
- },
-
- /**
- * @name Hyphenator-hyphenateClass
- * @description
- * A string containing the css-class-name for the hyphenate class
- * @type {string}
- * @default 'hyphenate'
- * @private
- * @example
- * <p class = "hyphenate">Text</p>
- * @see Hyphenator.config
- */
- hyphenateClass = 'hyphenate',
-
- /**
- * @name Hyphenator-classPrefix
- * @description
- * A string containing a unique className prefix to be used
- * whenever Hyphenator sets a CSS-class
- * @type {string}
- * @private
- */
- classPrefix = 'Hyphenator' + Math.round(Math.random() * 1000),
-
- /**
- * @name Hyphenator-hideClass
- * @description
- * The name of the class that hides elements
- * @type {string}
- * @private
- */
- hideClass = classPrefix + 'hide',
-
- /**
- * @name Hyphenator-hideClassRegExp
- * @description
- * RegExp to remove hideClass from a list of classes
- * @type {RegExp}
- * @private
- */
- hideClassRegExp = new RegExp("\\s?\\b" + hideClass + "\\b", "g"),
-
- /**
- * @name Hyphenator-hideClass
- * @description
- * The name of the class that unhides elements
- * @type {string}
- * @private
- */
- unhideClass = classPrefix + 'unhide',
-
- /**
- * @name Hyphenator-hideClassRegExp
- * @description
- * RegExp to remove unhideClass from a list of classes
- * @type {RegExp}
- * @private
- */
- unhideClassRegExp = new RegExp("\\s?\\b" + unhideClass + "\\b", "g"),
-
- /**
- * @name Hyphenator-css3hyphenateClass
- * @description
- * The name of the class that hyphenates elements with css3
- * @type {string}
- * @private
- */
- css3hyphenateClass = classPrefix + 'css3hyphenate',
-
- /**
- * @name Hyphenator-css3hyphenateClass
- * @description
- * The var where CSSEdit class is stored
- * @type {Object}
- * @private
- */
- css3hyphenateClassHandle,
-
- /**
- * @name Hyphenator-dontHyphenateClass
- * @description
- * A string containing the css-class-name for elements that should not be hyphenated
- * @type {string}
- * @default 'donthyphenate'
- * @private
- * @example
- * <p class = "donthyphenate">Text</p>
- * @see Hyphenator.config
- */
- dontHyphenateClass = 'donthyphenate',
-
- /**
- * @name Hyphenator-min
- * @description
- * A number wich indicates the minimal length of words to hyphenate.
- * @type {number}
- * @default 6
- * @private
- * @see Hyphenator.config
- */
- min = 6,
-
- /**
- * @name Hyphenator-orphanControl
- * @description
- * Control how the last words of a line are handled:
- * level 1 (default): last word is hyphenated
- * level 2: last word is not hyphenated
- * level 3: last word is not hyphenated and last space is non breaking
- * @type {number}
- * @default 1
- * @private
- */
- orphanControl = 1,
-
- /**
- * @name Hyphenator-isBookmarklet
- * @description
- * Indicates if Hyphanetor runs as bookmarklet or not.
- * @type boolean
- * @default false
- * @private
- */
- isBookmarklet = (function () {
- var loc = null,
- re = false,
- scripts = contextWindow.document.getElementsByTagName('script'),
- i = 0,
- l = scripts.length;
- while (!re && i < l) {
- loc = scripts[i].getAttribute('src');
- if (!!loc && loc.indexOf('Hyphenator.js?bm=true') !== -1) {
- re = true;
- }
- i += 1;
- }
- return re;
- }()),
-
- /**
- * @name Hyphenator-mainLanguage
- * @description
- * The general language of the document. In contrast to {@link Hyphenator-defaultLanguage},
- * mainLanguage is defined by the client (i.e. by the html or by a prompt).
- * @type {string|null}
- * @private
- * @see Hyphenator-autoSetMainLanguage
- */
- mainLanguage = null,
-
- /**
- * @name Hyphenator-defaultLanguage
- * @description
- * The language defined by the developper. This language setting is defined by a config option.
- * It is overwritten by any html-lang-attribute and only taken in count, when no such attribute can
- * be found (i.e. just before the prompt).
- * @type {string|null}
- * @private
- * @see Hyphenator-autoSetMainLanguage
- */
- defaultLanguage = '',
-
-
- /**
- * @name Hyphenator-elements
- * @description
- * An object holding all elements that have to be hyphenated. This var is filled by
- * {@link Hyphenator-gatherDocumentInfos}
- * @type {Array}
- * @private
- */
- elements = (function () {
- var Element = function (element) {
- this.element = element;
- this.hyphenated = false;
- this.treated = false; //collected but not hyphenated (dohyphenation is off)
- },
- ElementCollection = function () {
- this.count = 0;
- this.hyCount = 0;
- this.list = {};
- };
- ElementCollection.prototype = {
- add: function (el, lang) {
- if (!this.list.hasOwnProperty(lang)) {
- this.list[lang] = [];
- }
- this.list[lang].push(new Element(el));
- this.count += 1;
- },
- each: function (fn) {
- var k;
- for (k in this.list) {
- if (this.list.hasOwnProperty(k)) {
- if (fn.length === 2) {
- fn(k, this.list[k]);
- } else {
- fn(this.list[k]);
- }
- }
- }
- }
- };
- return new ElementCollection();
- }()),
-
-
- /**
- * @name Hyphenator-exceptions
- * @description
- * An object containing exceptions as comma separated strings for each language.
- * When the language-objects are loaded, their exceptions are processed, copied here and then deleted.
- * @see Hyphenator-prepareLanguagesObj
- * @type {Object}
- * @private
- */
- exceptions = {},
-
- /**
- * @name Hyphenator-docLanguages
- * @description
- * An object holding all languages used in the document. This is filled by
- * {@link Hyphenator-gatherDocumentInfos}
- * @type {Object}
- * @private
- */
- docLanguages = {},
-
- /**
- * @name Hyphenator-state
- * @description
- * A number that inidcates the current state of the script
- * 0: not initialized
- * 1: loading patterns
- * 2: ready
- * 3: hyphenation done
- * 4: hyphenation removed
- * @type {number}
- * @private
- */
- state = 0,
-
- /**
- * @name Hyphenator-url
- * @description
- * A string containing a RegularExpression to match URL's
- * @type {string}
- * @private
- */
- url = '(\\w*:\/\/)?((\\w*:)?(\\w*)@)?((([\\d]{1,3}\\.){3}([\\d]{1,3}))|((www\\.|[a-zA-Z]\\.)?[a-zA-Z0-9\\-\\.]+\\.([a-z]{2,4})))(:\\d*)?(\/[\\w#!:\\.?\\+=&%@!\\-]*)*',
- // protocoll usr pwd ip or host tld port path
-
- /**
- * @name Hyphenator-mail
- * @description
- * A string containing a RegularExpression to match mail-adresses
- * @type {string}
- * @private
- */
- mail = '[\\w-\\.]+@[\\w\\.]+',
-
- /**
- * @name Hyphenator-urlRE
- * @description
- * A RegularExpressions-Object for url- and mail adress matching
- * @type {RegExp}
- * @private
- */
- urlOrMailRE = new RegExp('(' + url + ')|(' + mail + ')', 'i'),
-
- /**
- * @name Hyphenator-zeroWidthSpace
- * @description
- * A string that holds a char.
- * Depending on the browser, this is the zero with space or an empty string.
- * zeroWidthSpace is used to break URLs
- * @type {string}
- * @private
- */
- zeroWidthSpace = (function () {
- var zws, ua = window.navigator.userAgent.toLowerCase();
- zws = String.fromCharCode(8203); //Unicode zero width space
- if (ua.indexOf('msie 6') !== -1) {
- zws = ''; //IE6 doesn't support zws
- }
- if (ua.indexOf('opera') !== -1 && ua.indexOf('version/10.00') !== -1) {
- zws = ''; //opera 10 on XP doesn't support zws
- }
- return zws;
- }()),
-
- /**
- * @name Hyphenator-onBeforeWordHyphenation
- * @description
- * A method to be called for each word to be hyphenated before it is hyphenated.
- * Takes the word as a first parameter and its language as a second parameter.
- * Returns a string that will replace the word to be hyphenated.
- * @see Hyphenator.config
- * @type {function()}
- * @private
- */
- onBeforeWordHyphenation = function (word) {
- return word;
- },
-
- /**
- * @name Hyphenator-onAfterWordHyphenation
- * @description
- * A method to be called for each word to be hyphenated after it is hyphenated.
- * Takes the word as a first parameter and its language as a second parameter.
- * Returns a string that will replace the word that has been hyphenated.
- * @see Hyphenator.config
- * @type {function()}
- * @private
- */
- onAfterWordHyphenation = function (word) {
- return word;
- },
-
- /**
- * @name Hyphenator-onHyphenationDone
- * @description
- * A method to be called, when the last element has been hyphenated
- * @see Hyphenator.config
- * @type {function()}
- * @private
- */
- onHyphenationDone = function () {},
-
- /**
- * @name Hyphenator-selectorFunction
- * @description
- * A function set by the user that has to return a HTMLNodeList or array of Elements to be hyphenated.
- * By default this is set to false so we can check if a selectorFunction is set…
- * @see Hyphenator.config
- * @type {function()}
- * @private
- */
- selectorFunction = false,
-
- /**
- * @name Hyphenator-mySelectorFunction
- * @description
- * A function that has to return a HTMLNodeList or array of Elements to be hyphenated.
- * By default it uses the classname ('hyphenate') to select the elements.
- * @type {function()}
- * @private
- */
- mySelectorFunction = function (hyphenateClass) {
- var tmp, el = [], i, l;
- if (window.document.getElementsByClassName) {
- el = contextWindow.document.getElementsByClassName(hyphenateClass);
- } else if (window.document.querySelectorAll) {
- el = contextWindow.document.querySelectorAll('.' + hyphenateClass);
- } else {
- tmp = contextWindow.document.getElementsByTagName('*');
- l = tmp.length;
- for (i = 0; i < l; i += 1) {
- if (tmp[i].className.indexOf(hyphenateClass) !== -1 && tmp[i].className.indexOf(dontHyphenateClass) === -1) {
- el.push(tmp[i]);
- }
- }
- }
- return el;
- },
-
- /**
- * @name Hyphenator-selectElements
- * @description
- * A function that has to return a HTMLNodeList or array of Elements to be hyphenated.
- * It uses either selectorFunction set by the user (and adds a unique class to each element)
- * or the default mySelectorFunction.
- * @type {function()}
- * @private
- */
- selectElements = function () {
- var elements;
- if (selectorFunction) {
- elements = selectorFunction();
- } else {
- elements = mySelectorFunction(hyphenateClass);
- }
-
- return elements;
- },
-
- /**
- * @name Hyphenator-intermediateState
- * @description
- * The value of style.visibility of the text while it is hyphenated.
- * @see Hyphenator.config
- * @type {string}
- * @private
- */
- intermediateState = 'hidden',
-
- /**
- * @name Hyphenator-unhide
- * @description
- * How hidden elements unhide: either simultaneous (default: 'wait') or progressively.
- * 'wait' makes Hyphenator.js to wait until all elements are hyphenated (one redraw)
- * With 'progressive' Hyphenator.js unhides elements as soon as they are hyphenated.
- * @see Hyphenator.config
- * @type {string}
- * @private
- */
- unhide = 'wait',
-
- /**
- * @name Hyphenator-CSSEditors
- * @description A container array that holds CSSEdit classes
- * For each window object one CSSEdit class is inserted
- * @see Hyphenator-CSSEdit
- * @type {array}
- * @private
- */
- CSSEditors = [],
-
- /**
- * @name Hyphenator-CSSEditors
- * @description A custom class with two public methods: setRule() and clearChanges()
- * Rather sets style for CSS-classes then for single elements
- * This is used to hide/unhide elements when they are hyphenated.
- * @see Hyphenator-gatherDocumentInfos
- * @type {function ()}
- * @private
- */
- CSSEdit = function (w) {
- w = w || window;
- var doc = w.document,
- //find/create an accessible StyleSheet
- sheet = (function () {
- var i,
- l = doc.styleSheets.length,
- sheet,
- element,
- r = false;
- for (i = 0; i < l; i += 1) {
- sheet = doc.styleSheets[i];
- try {
- if (!!sheet.cssRules) {
- r = sheet;
- break;
- }
- } catch (e) {}
- }
- if (r === false) {
- element = doc.createElement('style');
- element.type = 'text/css';
- doc.getElementsByTagName('head')[0].appendChild(element);
- r = doc.styleSheets[doc.styleSheets.length - 1];
- }
- return r;
- }()),
- changes = [],
- findRule = function (sel) {
- var sheet, rule, sheets = window.document.styleSheets, rules, i, j, r = false;
- for (i = 0; i < sheets.length; i += 1) {
- sheet = sheets[i];
- try { //FF has issues here with external CSS (s.o.p)
- if (!!sheet.cssRules) {
- rules = sheet.cssRules;
- } else if (!!sheet.rules) {
- // IE < 9
- rules = sheet.rules;
- }
- } catch (e) {
- //do nothing
- //console.log(e);
- }
- if (!!rules && !!rules.length) {
- for (j = 0; j < rules.length; j += 1) {
- rule = rules[j];
- if (rule.selectorText === sel) {
- r = {
- index: j,
- rule: rule
- };
- }
- }
- }
- }
- return r;
- },
- addRule = function (sel, rulesStr) {
- var i, r;
- if (!!sheet.insertRule) {
- if (!!sheet.cssRules) {
- i = sheet.cssRules.length;
- } else {
- i = 0;
- }
- r = sheet.insertRule(sel + '{' + rulesStr + '}', i);
- } else if (!!sheet.addRule) {
- // IE < 9
- if (!!sheet.rules) {
- i = sheet.rules.length;
- } else {
- i = 0;
- }
- sheet.addRule(sel, rulesStr, i);
- r = i;
- }
- return r;
- },
- removeRule = function (sheet, index) {
- if (sheet.deleteRule) {
- sheet.deleteRule(index);
- } else {
- // IE < 9
- sheet.removeRule(index);
- }
- };
-
- return {
- setRule: function (sel, rulesString) {
- var i, existingRule, cssText;
- existingRule = findRule(sel);
- if (!!existingRule) {
- if (!!existingRule.rule.cssText) {
- cssText = existingRule.rule.cssText;
- } else {
- // IE < 9
- cssText = existingRule.rule.style.cssText.toLowerCase();
- }
- if (cssText === '.' + hyphenateClass + ' { visibility: hidden; }') {
- //browsers w/o IE < 9 and no additional style defs:
- //add to [changes] for later removal
- changes.push({sheet: existingRule.rule.parentStyleSheet, index: existingRule.index});
- } else if (cssText.indexOf('visibility: hidden') !== -1) {
- // IE < 9 or additional style defs:
- // add new rule
- i = addRule(sel, rulesString);
- //add to [changes] for later removal
- changes.push({sheet: sheet, index: i});
- // clear existing def
- existingRule.rule.style.visibility = '';
- } else {
- addRule(sel, rulesString);
- }
- } else {
- i = addRule(sel, rulesString);
- changes.push({sheet: sheet, index: i});
- }
- },
- clearChanges: function () {
- var change = changes.pop();
- while (!!change) {
- removeRule(change.sheet, change.index);
- change = changes.pop();
- }
- }
- };
- },
-
- /**
- * @name Hyphenator-hyphen
- * @description
- * A string containing the character for in-word-hyphenation
- * @type {string}
- * @default the soft hyphen
- * @private
- * @see Hyphenator.config
- */
- hyphen = String.fromCharCode(173),
-
- /**
- * @name Hyphenator-urlhyphen
- * @description
- * A string containing the character for url/mail-hyphenation
- * @type {string}
- * @default the zero width space
- * @private
- * @see Hyphenator.config
- * @see Hyphenator-zeroWidthSpace
- */
- urlhyphen = zeroWidthSpace,
-
- /**
- * @name Hyphenator-safeCopy
- * @description
- * Defines wether work-around for copy issues is active or not
- * Not supported by Opera (no onCopy handler)
- * @type boolean
- * @default true
- * @private
- * @see Hyphenator.config
- * @see Hyphenator-registerOnCopy
- */
- safeCopy = true,
-
- /*
- * runOnContentLoaded is based od jQuery.bindReady()
- * see
- * jQuery JavaScript Library v1.3.2
- * http://jquery.com/
- *
- * Copyright (c) 2009 John Resig
- * Dual licensed under the MIT and GPL licenses.
- * http://docs.jquery.com/License
- *
- * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
- * Revision: 6246
- */
- /**
- * @name Hyphenator-runOnContentLoaded
- * @description
- * A crossbrowser solution for the DOMContentLoaded-Event based on jQuery
- * 0) {
- for (i = 0; i < fl; i += 1) {
- haveAccess = undefined;
- //try catch isn't enough for webkit
- try {
- //opera throws only on document.toString-access
- haveAccess = window.frames[i].document.toString();
- } catch (e) {
- haveAccess = undefined;
- }
- if (!!haveAccess) {
- if (window.frames[i].location.href !== 'about:blank') {
- init(window.frames[i]);
- }
- }
- }
- contextWindow = window;
- f();
- hyphRunForThis[window.location.href] = true;
- } else {
- init(window);
- }
- },
-
- // Cleanup functions for the document ready method
- DOMContentLoaded = function (e) {
- if (e.type === 'readystatechange' && contextWindow.document.readyState !== 'complete') {
- return;
- }
- contextWindow.document[rem](pre + e.type, DOMContentLoaded, false);
- if (!doFrames && window.frames.length === 0) {
- init(window);
- } /* else {
- //we are in a frameset, so do nothing but wait for onload to fire
-
- }*/
- };
-
- if (documentLoaded && !hyphRunForThis[w.location.href]) {
- f();
- hyphRunForThis[w.location.href] = true;
- return;
- }
-
- if (contextWindow.document.readyState === "complete" || contextWindow.document.readyState === "interactive") {
- //Running Hyphenator.js if it has been loaded later
- //Thanks to davenewtron http://code.google.com/p/hyphenator/issues/detail?id=158#c10
- window.setTimeout(doOnLoad, 1);
- } else {
- //registering events
- contextWindow.document[add](pre + "DOMContentLoaded", DOMContentLoaded, false);
- contextWindow.document[add](pre + 'readystatechange', DOMContentLoaded, false);
- window[add](pre + 'load', doOnLoad, false);
- toplevel = false;
- try {
- toplevel = !window.frameElement;
- } catch (e) {}
- if (contextWindow.document.documentElement.doScroll && toplevel) {
- doScrollCheck();
- }
- }
- },
-
- /**
- * @name Hyphenator-getLang
- * @description
- * Gets the language of an element. If no language is set, it may use the {@link Hyphenator-mainLanguage}.
- * @param {Object} el The first parameter is an DOM-Element-Object
- * @param {boolean} fallback The second parameter is a boolean to tell if the function should return the {@link Hyphenator-mainLanguage}
- * if there's no language found for the element.
- * @private
- */
- getLang = function (el, fallback) {
- try {
- return !!el.getAttribute('lang') ? el.getAttribute('lang').toLowerCase() :
- !!el.getAttribute('xml:lang') ? el.getAttribute('xml:lang').toLowerCase() :
- el.tagName.toLowerCase() !== 'html' ? getLang(el.parentNode, fallback) :
- fallback ? mainLanguage :
- null;
- } catch (e) {}
- },
-
- /**
- * @name Hyphenator-autoSetMainLanguage
- * @description
- * Retrieves the language of the document from the DOM.
- * The function looks in the following places:
- *