5.0.1

5.0.1

Author: Sneezry

_locales/en/messages.json

@@ -59,6 +59,14 @@
         "message": "Account",
         "description": "Account."
     },
+    "accountName": {
+        "message": "Account name",
+        "description": "Account Name."
+    },
+    "username": {
+      "message": "Username",
+      "description": "Username."
+    },
     "secret": {
         "message": "Secret",
         "description": "Secret."
@@ -196,9 +204,17 @@
         "description": "Download backup file."
     },
     "import_backup": {
+        "message": "Import Backup",
+        "description": "Import backup."
+    },
+    "import_backup_file": {
         "message": "Import Backup File",
         "description": "Import backup file."
     },
+    "import_backup_code": {
+        "message": "Import Backup Code",
+        "description": "Import backup code."
+    },
     "dropbox_backup": {
         "message": "Auto Backup to Dropbox",
         "description": "Auto backup to Dropbox."
@@ -220,7 +236,7 @@
         "description": "Show all entries."
     },
     "dropbox_risk": {
-        "message": "Backups saved in Dropbox are unencrypted (even if you have set a passphrase), use it at your own risk.",
+        "message": "Warning: backups saved in Dropbox are unencrypted. Use at your own risk.",
         "description": "Dropbox backup risk warning."
     }
 }

_locales/zh_CN/messages.json

@@ -1,4 +1,4 @@
-{
+{
     "extName": {
         "message": "身份验证器",
         "description": "Extension Name."
@@ -24,7 +24,7 @@
         "description": "Secret Error."
     },
     "info": {
-        "message": "<p><strong>Authenticator</strong> for Google&trade; Authenticator,<br/>&copy; 2018 <a target='_blank' href='https://github.com/Authenticator-Extension'>Authenticator Extension</a>. Released under the MIT License.</p><p>Google&trade;是Google的商标，Google Authenticator是Google的商品名，以上所有权归Google公司所有。</p><p><a target='_blank' href='https://github.com/LazarSoft/jsqrcode'>jsqrcode</a>的所有权归jsqrcode的作者所有。以Apache协议授权。</p><p><a target='_blank' href='https://github.com/zxing/zxing'>ZXing</a>的所有权归ZXing的作者所有。以Apache协议授权。</p><p><a target='_blank' href='http://blog.tinisles.com/2011/10/google-authenticator-one-time-password-algorithm-in-javascript/'>totp.js</a>的所有权归其作者所有。以MIT协议授权。</p><p><a target='_blank' href='http://caligatio.github.com/jsSHA/'>jsSHA</a>的所有权归jsSHA的作者所有。以BSD协议授权。</p><p><a target='_blank' href='http://davidshimjs.github.io/qrcodejs/'>qrcode.js</a>的所有权归qrcode.js作者所有。以MIT协议授权。</p><p><a target='_blank' href='https://code.google.com/p/crypto-js/'>crypto-js</a>的所有权归crypto-js作者所有。以BSD协议授权。</p><p><a target='_blank' href='https://www.google.com/fonts/specimen/Droid+Sans+Mono'>Droid Sans Mono</a>的所有权归Steve Matteson所有。以Apache协议授权。</p><p><a target='_blank' href='http://fontawesome.io'>Font Awesome</a>的所有权归Dave Gandy所有。以SIL OFL协议1.1授权。</p><p>感谢 <a target='_blank' href='https://github.com/multiwebinc'>Mike Robinson</a> &lt;3</p>",
+        "message": "<p><strong>Authenticator<\/strong> for Google&trade; Authenticator,<br\/>&copy; 2018 <a target='_blank' href='https:\/\/github.com\/Authenticator-Extension'>Authenticator Extension<\/a>. Released under the MIT License.<\/p><p>Google&trade;是Google的商标，Google Authenticator是Google的商品名，以上所有权归Google公司所有。<\/p><p><a target='_blank' href='https:\/\/github.com\/LazarSoft\/jsqrcode'>jsqrcode<\/a>的所有权归jsqrcode的作者所有。以Apache协议授权。<\/p><p><a target='_blank' href='https:\/\/github.com\/zxing\/zxing'>ZXing<\/a>的所有权归ZXing的作者所有。以Apache协议授权。<\/p><p><a target='_blank' href='http:\/\/blog.tinisles.com\/2011\/10\/google-authenticator-one-time-password-algorithm-in-javascript\/'>totp.js<\/a>的所有权归其作者所有。以MIT协议授权。<\/p><p><a target='_blank' href='http:\/\/caligatio.github.com\/jsSHA\/'>jsSHA<\/a>的所有权归jsSHA的作者所有。以BSD协议授权。<\/p><p><a target='_blank' href='http:\/\/davidshimjs.github.io\/qrcodejs\/'>qrcode.js<\/a>的所有权归qrcode.js作者所有。以MIT协议授权。<\/p><p><a target='_blank' href='https:\/\/code.google.com\/p\/crypto-js\/'>crypto-js<\/a>的所有权归crypto-js作者所有。以BSD协议授权。<\/p><p><a target='_blank' href='https:\/\/www.google.com\/fonts\/specimen\/Droid+Sans+Mono'>Droid Sans Mono<\/a>的所有权归Steve Matteson所有。以Apache协议授权。<\/p><p><a target='_blank' href='http:\/\/fontawesome.io'>Font Awesome<\/a>的所有权归Dave Gandy所有。以SIL OFL协议1.1授权。<\/p><p>感谢 <a target='_blank' href='https:\/\/github.com\/multiwebinc'>Mike Robinson<\/a> &lt;3<\/p>",
         "description": "Information."
     },
     "add_qr": {
@@ -44,8 +44,8 @@
         "description": "OK."
     },
     "yes": {
-            "message": "是",
-            "description": "Yes."
+        "message": "是",
+        "description": "Yes."
     },
     "no": {
         "message": "否",
@@ -59,6 +59,14 @@
         "message": "账户",
         "description": "Account."
     },
+    "accountName": {
+        "message": "账户名称",
+        "description": "Account Name."
+    },
+    "username": {
+        "message": "用户名",
+        "description": "Username."
+    },
     "secret": {
         "message": "密钥",
         "description": "Secret."
@@ -76,7 +84,7 @@
         "description": "About."
     },
     "export_import": {
-        "message": "导出 / 导入",
+        "message": "导出 \/ 导入",
         "description": "Export and Import."
     },
     "settings": {
@@ -89,39 +97,39 @@
     },
     "current_phrase": {
         "message": "当前密码",
-        "description": "Current Phrase."
+        "description": "Current Passphrase."
     },
     "new_phrase": {
         "message": "新密码",
-        "description": "New Phrase."
+        "description": "New Passphrase."
     },
     "phrase": {
         "message": "密码",
-        "description": "Phrase."
+        "description": "Passphrase."
     },
     "confirm_phrase": {
         "message": "确认密码",
-        "description": "Confirmm Phrase."
+        "description": "Confirmm Passphrase."
     },
-    "confirm_delete" : {
-        "message": "您确定要删除此密钥吗？您无法找回已删除的密钥。此操作无法撤销。",
+    "confirm_delete": {
+        "message": "您确定要删除此密钥吗？此操作无法撤销。",
         "description": "Remove entry confirmation"
     },
     "security_warning": {
         "message": "您的密钥将使用此密码进行加密。如果您忘记了密码没有人能够提供帮助。",
-        "description": "Phrase Warning."
+        "description": "Passphrase Warning."
     },
     "update": {
         "message": "更新",
         "description": "Update."
     },
     "phrase_incorrect": {
         "message": "部分账户与密码不匹配，您无法添加新账户、导出账户数据或者更改密码。请提供正确的密码后重试。",
-        "description": "Phrase Incorrect."
+        "description": "Passphrase Incorrect."
     },
     "phrase_not_match": {
         "message": "两次密码不一致。",
-        "description": "Phrase Not Match."
+        "description": "Passphrase Not Match."
     },
     "encrypted": {
         "message": "已加密",
@@ -160,7 +168,7 @@
         "description": "Local Time is Too Far Off"
     },
     "remind_backup": {
-        "message": "您是否为密钥创建了备份？请注意，没有人可以帮助您找回被锁定的账户，不要等到为时已晚。我们将在30天后再次提醒您进行备份。",
+        "message": "您是否为密钥创建了备份？不要等到为时已晚。",
         "description": "Remind Backup"
     },
     "capture_failed": {
@@ -196,9 +204,17 @@
         "description": "Download backup file."
     },
     "import_backup": {
+        "message": "导入备份",
+        "description": "Import backup."
+    },
+    "import_backup_file": {
         "message": "导入备份文件",
         "description": "Import backup file."
     },
+    "import_backup_code": {
+        "message": "导入备份代码",
+        "description": "Import backup code."
+    },
     "dropbox_backup": {
         "message": "自动备份至Dropbox",
         "description": "Auto backup to Dropbox."
@@ -220,7 +236,7 @@
         "description": "Show all entries."
     },
     "dropbox_risk": {
-        "message": "保存至Dropbox的备份没有加密（即使您已设置了密码），使用此功能需要您自担风险。",
+        "message": "警告：保存至Dropbox的备份均未备份，您需自担风险。",
         "description": "Dropbox backup risk warning."
     }
-}
+}

css/import.css

@@ -0,0 +1,95 @@
+[v-cloak] { display: none }
+
+#authenticator {
+    width: 600px;
+    position: relative;
+    margin: 0 auto;
+}
+
+.import_tab {
+    text-align: center;
+    font-size: 0;
+}
+
+.import_tab input {
+    display: none;
+}
+
+.import_tab label {
+    width: 250px;
+    height: 50px;
+    line-height: 50px;
+    font-size: 18px;
+    text-align: center;
+    display: inline-block;
+    margin: 20px;
+    cursor: pointer;
+    border-radius: 2px;
+}
+
+.import_tab input:checked + label,
+.import_tab label:hover {
+    background: #eee;
+}
+
+.import_file {
+    text-align: center;
+}
+
+.import_file input {
+    display: none;
+}
+
+button,
+.import_file label {
+    display: inline-block;
+    width: 260px;
+    height: 60px;
+    line-height: 60px;
+    border: #CCC 1px solid;
+    background: white;
+    border-radius: 2px;
+    position: relative;
+    text-align: center;
+    font-size: 16px;
+    color: gray;
+    cursor: pointer;
+    outline: none;
+}
+
+button:hover,
+.import_file label:hover {
+    color: black;
+}
+
+.import_encrypted {
+    margin-bottom: 20px;
+}
+
+.import_encrypted input {
+    margin-left: 0;
+}
+
+.import_code {
+    float: left;
+    margin-left: 30px;
+    margin-right: 40px;
+}
+
+.import_code textarea {
+    width: 250px;
+    height: 400px;
+    padding: 10px;
+    outline: none;
+    resize: none;
+    box-sizing: border-box;
+}
+
+.import_passphrase input {
+    padding: 10px;
+    margin-bottom: 20px;
+    width: 250px;
+    border: #CCC 1px solid;
+    background: white;
+    outline: none;
+}

css/popup.css

@@ -132,6 +132,8 @@ body {
     text-align: center;
     font-size: 16px;
     border-bottom: #CCC 1px solid;
+    user-select: none;
+    -moz-user-select: none;
 }
 
 #notification {
@@ -346,6 +348,7 @@ body {
 #add_secret,
 #add_button,
 #download_backup,
+#import_backup,
 #upload_backup,
 #security_save,
 #passphrase_ok,
@@ -549,9 +552,6 @@ body {
     color: black;
 }
 
-#menu .menuList p:hover:after {
-    color: black;
-}
 
 #menu .menuList p:last-child {
     border-bottom: none;
@@ -625,6 +625,7 @@ body {
 #add_qr:hover,
 #upload_backup:hover,
 #download_backup:hover,
+#import_backup:hover,
 #editAction:hover,
 #infoAction:hover,
 #scan:hover,
@@ -638,7 +639,12 @@ body {
 #dropbox_ok:hover,
 #export:hover,
 #resizeClose:hover,
-#resize_save:hover {
+#resize_save:hover,
+#confirm_cancel:hover,
+#confirm_ok:hover,
+#menu .menuList p:hover:after,
+.entry:hover .movehandle,
+.showqr:hover {
     color: black;
 }
 
@@ -762,7 +768,8 @@ body {
     z-index: 1000;
 }
 
-#download_backup {
+#download_backup,
+#import_backup {
     text-decoration: none;
     color: gray;
     display: block;

import.html

@@ -1,7 +1,9 @@
 <html>
 <head>
     <meta charset="utf-8"/>
-    <title>Import Backup</title>
+    <title> </title>
+    <script src="js/import.js"></script>
+    <link rel="stylesheet" href="css/import.css" type="text/css" charset="utf-8">
     <script src="js/vue.min.js"></script>
     <script src="js/vue-dragula.js"></script>
     <script src="js/md5.js"></script>
@@ -16,8 +18,31 @@
     <script src="build/models/dropbox.js"></script>
 </head>
 <body>
-<div id="authenticator">
-    <input id="import_file" type="file" v-on:change="importFile($event, true)" accept="application/json"></input>
+<div id="authenticator" v-cloak>
+    <div class="import_tab">
+        <input type="radio" id="import_file_radio" value="import_file" v-model="importType">
+        <label for="import_file_radio">{{ i18n.import_backup_file }}</label>
+        <input type="radio" id="import_code_radio" value="import_code" v-model="importType">
+        <label for="import_code_radio">{{ i18n.import_backup_code }}</label>
+    </div>
+    <div class="import_file" v-show="importType === 'import_file'">
+        <label for="import_file">{{ i18n.import_backup_file }}</label>
+        <input id="import_file" type="file" v-on:change="importFile($event, true)" accept="application/json"></input>
+    </div>
+    <div v-show="importType === 'import_code'">
+        <div class="import_code">
+            <textarea spellcheck="false" v-model="importCode"></textarea>
+        </div>
+        <div class="import_encrypted">
+            <input type="checkbox" id="encryptedCode" v-model="importEncrypted">
+            <label for="encryptedCode">{{ i18n.encrypted }}</label>
+        </div>
+        <div class="import_passphrase" v-show="importEncrypted">
+            <label for="import_passphrase">{{ i18n.phrase }}</label>
+            <input id="import_passphrase" type="password" v-model="importPassphrase">
+        </div>
+        <button v-on:click="importBackupCode()">{{ i18n.import_backup_code }}</button>
+    </div>
 </div>
 <script src="build/ui/add-account.js"></script>
 <script src="build/ui/class.js"></script>

js/import.js

@@ -0,0 +1 @@
+document.title = chrome.i18n.getMessage('import_backup');

manifest-chrome.json

@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "__MSG_extName__",
     "short_name": "__MSG_extShortName__",
-    "version": "5.0",
+    "version": "5.0.1",
     "default_locale": "en",
     "description": "__MSG_extDesc__",
     "icons": {