Merge branch 'Brand_expansion'

HorizenOfficial · Aug 22, 2018 · cca0349 · cca0349
2 parents b0b8622 + 70d3928
commit cca0349
Show file tree

Hide file tree

Showing 41 changed files with 96 additions and 227 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2018 ZenCash Team
+Copyright (c) 2017-2018 Horizen Team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 [![Code Climate][codeclimate-img]][codeclimate-url]
 
 # User Manuals
+- v1.2.0: [Arizen v1.2.0 Wallet User Manual.pdf](https://github.com/ZencashOfficial/arizen/releases/download/v1.2.0/Arizen.v1.2.0.Wallet.User.Manual.pdf)
 - v1.1.9: [Arizen v1.1.9 Wallet User Manual.pdf](https://github.com/ZencashOfficial/arizen/releases/download/v1.1.9/Arizen.v1.1.9.Wallet.User.Manual.pdf)
 - v1.1.8: [Arizen v1.1.8 Wallet User Manual.pdf](https://github.com/ZencashOfficial/arizen/releases/download/v1.1.8/Arizen.v1.1.8.Wallet.User.Manual.pdf)
 - v1.1.7: [Arizen v1.1.7 Wallet User Manual.pdf](https://github.com/ZencashOfficial/arizen/releases/download/v1.1.7/Arizen.v1.1.7.Wallet.User.Manual.pdf)
@@ -16,6 +17,11 @@
 
 # Version History
 
+## v1.2.0
+- [x] Brand expansion
+- [x] FIX: max button
+
+
 ## v1.1.91
 - [x] FIX: generate new T address
 - [x] FIX: max button

diff --git a/app/lang/lang_ar.json b/app/lang/lang_ar.json
@@ -192,7 +192,7 @@
       "generateNewWallet": "إنشاء محفظة جديدة",
       "name": "الاسم اختياري",
       "addWalletToArizen": "إضافة هذه المحفظة إلى أريزين",
-      "zenCashWalletLabel": "محفظة زنكاش",
+      "horizenWalletLabel": "محفظة زنكاش",
       "tAddrLabel": "مفتاح عام - عنوان شفاف",
       "privateKeyLabel": "مفتاح سري",
       "namePrint": "اسم",
@@ -262,7 +262,7 @@
     "helpSubmenu": {
       "arizenManual": "User Manual",
       "support": "Support",
-      "zencash": "ZenCash"
+      "horizen": "Horizen"
     },
     "changeWalletPassword": "Change wallet password"
   },

diff --git a/app/lang/lang_bg.json b/app/lang/lang_bg.json
@@ -199,7 +199,7 @@
       "generateNewWallet": "Генериране на нов портфейл",
       "name": "Име (по избор)",
       "addWalletToArizen": "Добавяне на портфейла към Arizen",
-      "zenCashWalletLabel": "ZenCash портфейл",
+      "horizenWalletLabel": "ZenCash портфейл",
       "tAddrLabel": "Public Key - T Address",
       "privateKeyLabel": "Private Key",
       "namePrint": "Име",
@@ -269,7 +269,7 @@
     "helpSubmenu": {
       "arizenManual": "Упътване",
       "support": "Поддръжка",
-      "zencash": "ZenCash"
+      "horizen": "Horizen"
     }
   },
   "warmingMessages": {

diff --git a/app/lang/lang_cs.json b/app/lang/lang_cs.json
@@ -193,7 +193,7 @@
       "generateNewWallet": "Vytvořit novou peněženku",
       "name": "Jméno (nepovinné)",
       "addWalletToArizen": "Přidat vytvořenou peněženku do Arizen",
-      "zenCashWalletLabel": "ZenCash peněženka",
+      "horizenWalletLabel": "Horizen peněženka",
       "tAddrLabel": "Veřejný klíč - T adresa",
       "privateKeyLabel": "Privátní klíč",
       "namePrint": "Jméno",
@@ -260,7 +260,7 @@
       "selectAll": "Vybrat vše"
     },
     "helpSubmenu": {
-      "zencash": "ZenCash",
+      "horizen": "Horizen",
       "support": "Podpora",
       "arizenManual": "Uživatelská Příručka"
     },

diff --git a/app/lang/lang_de.json b/app/lang/lang_de.json
@@ -192,7 +192,7 @@
       "generateNewWallet": "Neue Wallet erstellen",
       "name": "Name (optional)",
       "addWalletToArizen": "Diese Wallet zu Arizen hinzufügen",
-      "zenCashWalletLabel": "ZenCash Wallet",
+      "horizenWalletLabel": "Horizen Wallet",
       "tAddrLabel": "Öffentlicher Schlüssel - T-Adresse",
       "privateKeyLabel": "Privater Schlüssel",
       "namePrint": "Name",
@@ -262,7 +262,7 @@
     "helpSubmenu": {
       "arizenManual": "Benutzerhandbuch",
       "support": "Support",
-      "zencash": "ZenCash"
+      "horizen": "Horizen"
     },
     "changeWalletPassword": "Wallet-Passwort ändern"
   },

diff --git a/app/lang/lang_el.json b/app/lang/lang_el.json
@@ -192,7 +192,7 @@
       "generateNewWallet": "Δημιουργία νέου πορτοφολιού",
       "name": "Όνομα (προαιρετικό)",
       "addWalletToArizen": "Προσθέστε αυτό το πορτοφόλι στο Arizen",
-      "zenCashWalletLabel": "Πορτοφόλι ZenCash",
+      "horizenWalletLabel": "Πορτοφόλι Horizen",
       "tAddrLabel": "Δημόσιο κλειδί - T Διεύθυνση",
       "privateKeyLabel": "Ιδιωτικό κλειδί",
       "namePrint": "Όνομα",
@@ -262,7 +262,7 @@
     "helpSubmenu": {
       "arizenManual": "Εγχειρίδιο χρήσης",
       "support": "Υποστήριξη",
-      "zencash": "ZenCash"
+      "horizen": "Horizen"
     },
     "changeWalletPassword": "Αλλαγή κωδικού πορτοφολιού"
   },

diff --git a/app/lang/lang_en.json b/app/lang/lang_en.json
@@ -201,7 +201,7 @@
       "generateNewWallet": "Generate New Wallet",
       "name": "Name (optional)",
       "addWalletToArizen": "Add this wallet to Arizen",
-      "zenCashWalletLabel": "ZenCash Wallet",
+      "horizenWalletLabel": "Horizen Wallet",
       "tAddrLabel": "Public Key - T Address",
       "privateKeyLabel": "Private Key",
       "namePrint": "Name",
@@ -269,7 +269,7 @@
     "helpSubmenu": {
       "arizenManual": "User Manual",
       "support": "Support",
-      "zencash": "ZenCash"
+      "horizen": "Horizen"
     }
   },
   "warmingMessages": {

diff --git a/app/lang/lang_es.json b/app/lang/lang_es.json
@@ -192,7 +192,7 @@
       "generateNewWallet": "Generar nueva cartera de papel",
       "name": "Nombre: (Opcional)",
       "addWalletToArizen": "Agrega esta cartera a Arizen",
-      "zenCashWalletLabel": "Cartera ZenCash",
+      "horizenWalletLabel": "Cartera Horizen",
       "tAddrLabel": "Clave pública - Dirección transparente",
       "privateKeyLabel": "Clave privada",
       "namePrint": "Nombre",
@@ -262,7 +262,7 @@
     "helpSubmenu": {
       "arizenManual": "User Manual",
       "support": "Support",
-      "zencash": "ZenCash"
+      "horizen": "Horizen"
     },
     "changeWalletPassword": "Change wallet password"
   },

diff --git a/app/lang/lang_fr.json b/app/lang/lang_fr.json
@@ -192,7 +192,7 @@
       "generateNewWallet": "Générer un nouveau portefeuille",
       "name": "Nom (optionnel)",
       "addWalletToArizen": "Ajouter ce portefeuille à Arizen",
-      "zenCashWalletLabel": "Portefeuille ZenCash",
+      "horizenWalletLabel": "Portefeuille Horizen",
       "tAddrLabel": "Clé publique - Adresse T (Transparente)",
       "privateKeyLabel": "Clé privée",
       "namePrint": "Nom",
@@ -262,7 +262,7 @@
     "helpSubmenu": {
       "arizenManual": "User Manual",
       "support": "Support",
-      "zencash": "ZenCash"
+      "horizen": "Horizen"
     },
     "changeWalletPassword": "Change wallet password"
   },

diff --git a/app/lang/lang_it.json b/app/lang/lang_it.json
@@ -199,7 +199,7 @@
       "generateNewWallet": "Crea un nuovo wallet",
       "name": "Nome (opzionale)",
       "addWalletToArizen": "Aggiungi questo wallet ad Arizen",
-      "zenCashWalletLabel": "ZenCash Wallet",
+      "horizenWalletLabel": "Horizen Wallet",
       "tAddrLabel": "Chiave pubblica - T Address",
       "privateKeyLabel": "Chiave Privata",
       "namePrint": "Nome",
@@ -269,7 +269,7 @@
     "helpSubmenu": {
       "arizenManual": "Manuale Utente",
       "support": "Support",
-      "zencash": "ZenCash"
+      "horizen": "Horizen"
     }
   },
   "warmingMessages": {

diff --git a/app/lang/lang_ja.json b/app/lang/lang_ja.json
@@ -192,7 +192,7 @@
       "generateNewWallet": "新規ウォレット作成",
       "name": "名前 (任意)",
       "addWalletToArizen": "このウォレットを Arizen に追加",
-      "zenCashWalletLabel": "ZenCash ウォレット",
+      "horizenWalletLabel": "Horizen ウォレット",
       "tAddrLabel": "公開鍵: T アドレス",
       "privateKeyLabel": "秘密鍵",
       "namePrint": "名前",
@@ -262,7 +262,7 @@
     "helpSubmenu": {
       "arizenManual": "ユーザーマニュアル",
       "support": "サポート",
-      "zencash": "ZenCash"
+      "horizen": "Horizen"
     },
     "changeWalletPassword": "ウォレットのパスワードを変更"
   },

diff --git a/app/lang/lang_ko.json b/app/lang/lang_ko.json
@@ -192,7 +192,7 @@
       "generateNewWallet": "새 지갑 생성",
       "name": "이름 (선택사항)",
       "addWalletToArizen": "이 지갑을 Arizen 에 보내기",
-      "zenCashWalletLabel": "ZenCash 지갑",
+      "horizenWalletLabel": "Horizen 지갑",
       "tAddrLabel": "공용키 - T 주소",
       "privateKeyLabel": "개인 키",
       "namePrint": "이름",
@@ -262,7 +262,7 @@
     "helpSubmenu": {
       "arizenManual": "사용자 매뉴얼",
       "support": "지원",
-      "zencash": "ZenCash"
+      "horizen": "Horizen"
     },
     "changeWalletPassword": "지갑 비밀번호 변경"
   },

diff --git a/app/lang/lang_nl.json b/app/lang/lang_nl.json
@@ -192,7 +192,7 @@
       "generateNewWallet": "Genereer Nieuwe Portefeuille",
       "name": "Naam (optioneel)",
       "addWalletToArizen": "Voeg deze portefeuille toe aan Arizen",
-      "zenCashWalletLabel": "ZenCash Portefeuille",
+      "horizenWalletLabel": "Horizen Portefeuille",
       "tAddrLabel": "Publieke Sleutel - T Adres",
       "privateKeyLabel": "Prive Sleutel",
       "namePrint": "Naam",
@@ -262,7 +262,7 @@
     "helpSubmenu": {
       "arizenManual": "Handleiding",
       "support": "Ondersteuning",
-      "zencash": "ZenCash"
+      "horizen": "Horizen"
     },
     "changeWalletPassword": "Portefuille wachtwoord aanpassen"
   },

diff --git a/app/lang/lang_pl.json b/app/lang/lang_pl.json
@@ -192,7 +192,7 @@
       "generateNewWallet": "Wygeneruj Nowy Portfel",
       "name": "Nazwa (niewymagane)",
       "addWalletToArizen": "Dodaj ten portfel do Arizen",
-      "zenCashWalletLabel": "ZenCash Portfel",
+      "horizenWalletLabel": "Horizen Portfel",
       "tAddrLabel": "Klucz publiczny - T Adres",
       "privateKeyLabel": "Prywatny klucz",
       "namePrint": "Nazwa",
@@ -262,7 +262,7 @@
     "helpSubmenu": {
       "arizenManual": "User Manual",
       "support": "Support",
-      "zencash": "ZenCash"
+      "horizen": "Horizen"
     },
     "changeWalletPassword": "Change wallet password"
   },

diff --git a/app/lang/lang_pt.json b/app/lang/lang_pt.json
@@ -192,7 +192,7 @@
       "generateNewWallet": "Gerar nova carteira",
       "name": "Nome (Opcional)",
       "addWalletToArizen": "Adicione esta carteira a Arizen",
-      "zenCashWalletLabel": "Carteira ZenCash",
+      "horizenWalletLabel": "Carteira Horizen",
       "tAddrLabel": "Chave pública - endereço transparente",
       "privateKeyLabel": "Chave privada",
       "namePrint": "Nome",
@@ -262,7 +262,7 @@
     "helpSubmenu": {
       "arizenManual": "User Manual",
       "support": "Support",
-      "zencash": "ZenCash"
+      "horizen": "Horizen"
     },
     "changeWalletPassword": "Change wallet password"
   },

diff --git a/app/lang/lang_ru.json b/app/lang/lang_ru.json
@@ -192,7 +192,7 @@
       "generateNewWallet": "Создать новый кошелёк",
       "name": "Имя (опционально)",
       "addWalletToArizen": "Добавить этот кошелёк в Arizen",
-      "zenCashWalletLabel": "ZenCash кошелёк",
+      "horizenWalletLabel": "Horizen кошелёк",
       "tAddrLabel": "Публичный Ключ - T Адрес",
       "privateKeyLabel": "Приватный Ключ",
       "namePrint": "Имя",
@@ -262,7 +262,7 @@
     "helpSubmenu": {
       "arizenManual": "User Manual",
       "support": "Support",
-      "zencash": "ZenCash"
+      "horizen": "Horizen"
     },
     "changeWalletPassword": "Change wallet password"
   },

diff --git a/app/lang/lang_sr.json b/app/lang/lang_sr.json
@@ -199,7 +199,7 @@
       "generateNewWallet": "Kreirajte novi novčanik",
       "name": "Ime (opciono)",
       "addWalletToArizen": "Dodajte ovaj novčanik u Arizen",
-      "zenCashWalletLabel": "ZenCash Novčanik",
+      "horizenWalletLabel": "Horizen Novčanik",
       "tAddrLabel": "Javni Ključ - T Adresa",
       "privateKeyLabel": "Privatni ključ",
       "namePrint": "Ime",
@@ -269,7 +269,7 @@
     "helpSubmenu": {
       "arizenManual": "Uputstvo za korisnike",
       "support": "Podrška",
-      "zencash": "ZenCash"
+      "horizen": "Horizen"
     }
   },
   "warmingMessages": {

diff --git a/app/lang/lang_tr.json b/app/lang/lang_tr.json
@@ -192,7 +192,7 @@
       "generateNewWallet": "Yeni Cüzdan Oluştur",
       "name": "İsim (isteğe bağlı)",
       "addWalletToArizen": "Bu cüzdanı Arizen'e ekle",
-      "zenCashWalletLabel": "ZenCash Cüzdan",
+      "horizenWalletLabel": "Horizen Cüzdan",
       "tAddrLabel": "Genel Anahtar - T Adresi",
       "privateKeyLabel": "Özel Anahtar",
       "namePrint": "İsim",
@@ -262,7 +262,7 @@
     "helpSubmenu": {
       "arizenManual": "User Manual",
       "support": "Support",
-      "zencash": "ZenCash"
+      "horizen": "Horizen"
     },
     "changeWalletPassword": "Change wallet password"
   },

diff --git a/app/lang/lang_vi.json b/app/lang/lang_vi.json
@@ -192,7 +192,7 @@
       "generateNewWallet": "Tạo ví mới",
       "name": "Tên (không bắt buộc)",
       "addWalletToArizen": "Thêm ví vào Arizen",
-      "zenCashWalletLabel": "Ví ZenCash",
+      "horizenWalletLabel": "Ví Horizen",
       "tAddrLabel": "Khoá công khai - T Address",
       "privateKeyLabel": "Khoá riêng tư",
       "namePrint": "Tên",
@@ -262,7 +262,7 @@
     "helpSubmenu": {
       "arizenManual": "Hướng dẫn sử dụng",
       "support": "Hỗ trợ",
-      "zencash": "ZenCash"
+      "horizen": "Horizen"
     },
     "changeWalletPassword": "Thay đổi mật khẩu của ví"
   },

diff --git a/app/lang/lang_zh_cn.json b/app/lang/lang_zh_cn.json
@@ -192,7 +192,7 @@
       "generateNewWallet": "创建新的钱包",
       "name": "名字（非必填）",
       "addWalletToArizen": "新增此钱包到 Arizen",
-      "zenCashWalletLabel": "ZenCash 钱包",
+      "horizenWalletLabel": "Horizen 钱包",
       "tAddrLabel": "公钥 - T 地址",
       "privateKeyLabel": "私钥",
       "namePrint": "名称",
@@ -262,7 +262,7 @@
     "helpSubmenu": {
       "arizenManual": "用户手册",
       "support": "支援",
-      "zencash": "ZenCash"
+      "horizen": "Horizen"
     },
     "changeWalletPassword": "更改钱包密码"
   },

diff --git a/app/lang/lang_zh_tw.json b/app/lang/lang_zh_tw.json
@@ -192,7 +192,7 @@
       "generateNewWallet": "創建新的錢包",
       "name": "名字（非必填）",
       "addWalletToArizen": "新增此錢包到 Arizen",
-      "zenCashWalletLabel": "ZenCash 錢包",
+      "horizenWalletLabel": "Horizen 錢包",
       "tAddrLabel": "公鑰 - T 地址",
       "privateKeyLabel": "私鑰",
       "namePrint": "名稱",
@@ -262,7 +262,7 @@
     "helpSubmenu": {
       "arizenManual": "User Manual",
       "support": "Support",
-      "zencash": "ZenCash"
+      "horizen": "Horizen"
     },
     "changeWalletPassword": "Change wallet password"
   },