Skip to content

Commit

Permalink
Merge branch 'dev' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
mymindstorm committed Nov 28, 2018
2 parents fb87c0a + c393516 commit d033a31
Show file tree
Hide file tree
Showing 35 changed files with 1,357 additions and 575 deletions.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ about: Report a bug in Authenticator

<Do not use this to ask about lost codes or accounts>
<More info here: https://github.com/Authenticator-Extension/Authenticator/wiki/Lost-Codes>
<You can also open an issue by Tweeting with #AuthenticatorFeedback>

**Describe the bug:** <Describe the issue with Authenticator>

Expand Down
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: node_js
node_js:
- "node"
cache: npm
stages:
- test
- deploy
Expand All @@ -12,9 +13,11 @@ jobs:
- stage: test
name: "lintspaces"
script: "npm i -g lintspaces-cli && lintspaces -nt -d 'spaces' -i 'js-comments' src/* view/* manifest-*.json css/popup.css css/import.css"
env: CACHE_NAME=LINTSPACES
- stage: test
name: "Build Firefox and run addons-linter"
script: "npm install --only=production addons-linter && npm run firefox && addons-linter firefox"
env: CACHE_NAME=FIREFOXLINTER
- stage: test
name: "Build Chrome"
script: "npm run chrome"
Expand Down
6 changes: 5 additions & 1 deletion _locales/cs/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
"description": "Message explaning the diffrences between sync and local storage spaces."
},
"storage_sync_info": {
"message": "Automatically backup your data to 3rd party storgae services.",
"message": "Automatically backup your data to 3rd party storage services.",
"description": "3rd party backup info"
},
"storage_location": {
Expand All @@ -274,5 +274,9 @@
"log_out": {
"message": "Logout",
"description": "Sign out of 3rd party storage services"
},
"token_revoked": {
"message": "There was an issue connecting to your ${service} account, please sign in again.",
"description": "Error authenticating to backup service. ${service} will be replaced with a proper noun (E.g.: 'Google Drive' or 'Dropbox')"
}
}
6 changes: 5 additions & 1 deletion _locales/de/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -274,5 +274,9 @@
"log_out": {
"message": "Logout",
"description": "Sign out of 3rd party storage services"
},
"token_revoked": {
"message": "There was an issue connecting to your ${service} account, please sign in again.",
"description": "Error authenticating to backup service. ${service} will be replaced with a proper noun (E.g.: 'Google Drive' or 'Dropbox')"
}
}
}
6 changes: 5 additions & 1 deletion _locales/el/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -274,5 +274,9 @@
"log_out": {
"message": "Logout",
"description": "Sign out of 3rd party storage services"
},
"token_revoked": {
"message": "There was an issue connecting to your ${service} account, please sign in again.",
"description": "Error authenticating to backup service. ${service} will be replaced with a proper noun (E.g.: 'Google Drive' or 'Dropbox')"
}
}
}
6 changes: 5 additions & 1 deletion _locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
"description": "Message explaning the diffrences between sync and local storage spaces."
},
"storage_sync_info": {
"message": "Automatically backup your data to 3rd party storgae services.",
"message": "Automatically backup your data to 3rd party storage services.",
"description": "3rd party backup info"
},
"storage_location": {
Expand All @@ -274,5 +274,9 @@
"log_out": {
"message": "Logout",
"description": "Sign out of 3rd party storage services"
},
"token_revoked": {
"message": "There was an issue connecting to your ${service} account, please sign in again.",
"description": "Error authenticating to backup service. ${service} will be replaced with a proper noun (E.g.: 'Google Drive' or 'Dropbox')"
}
}
6 changes: 5 additions & 1 deletion _locales/es/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
"description": "Message explaning the diffrences between sync and local storage spaces."
},
"storage_sync_info": {
"message": "Automatically backup your data to 3rd party storgae services.",
"message": "Automatically backup your data to 3rd party storage services.",
"description": "3rd party backup info"
},
"storage_location": {
Expand All @@ -274,5 +274,9 @@
"log_out": {
"message": "Logout",
"description": "Sign out of 3rd party storage services"
},
"token_revoked": {
"message": "There was an issue connecting to your ${service} account, please sign in again.",
"description": "Error authenticating to backup service. ${service} will be replaced with a proper noun (E.g.: 'Google Drive' or 'Dropbox')"
}
}
6 changes: 5 additions & 1 deletion _locales/fr/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
"description": "Message explaning the diffrences between sync and local storage spaces."
},
"storage_sync_info": {
"message": "Automatically backup your data to 3rd party storgae services.",
"message": "Automatically backup your data to 3rd party storage services.",
"description": "3rd party backup info"
},
"storage_location": {
Expand All @@ -274,5 +274,9 @@
"log_out": {
"message": "Logout",
"description": "Sign out of 3rd party storage services"
},
"token_revoked": {
"message": "There was an issue connecting to your ${service} account, please sign in again.",
"description": "Error authenticating to backup service. ${service} will be replaced with a proper noun (E.g.: 'Google Drive' or 'Dropbox')"
}
}
6 changes: 5 additions & 1 deletion _locales/id/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
"description": "Message explaning the diffrences between sync and local storage spaces."
},
"storage_sync_info": {
"message": "Automatically backup your data to 3rd party storgae services.",
"message": "Automatically backup your data to 3rd party storage services.",
"description": "3rd party backup info"
},
"storage_location": {
Expand All @@ -274,5 +274,9 @@
"log_out": {
"message": "Logout",
"description": "Sign out of 3rd party storage services"
},
"token_revoked": {
"message": "There was an issue connecting to your ${service} account, please sign in again.",
"description": "Error authenticating to backup service. ${service} will be replaced with a proper noun (E.g.: 'Google Drive' or 'Dropbox')"
}
}
6 changes: 5 additions & 1 deletion _locales/it/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
"description": "Message explaning the diffrences between sync and local storage spaces."
},
"storage_sync_info": {
"message": "Automatically backup your data to 3rd party storgae services.",
"message": "Automatically backup your data to 3rd party storage services.",
"description": "3rd party backup info"
},
"storage_location": {
Expand All @@ -274,5 +274,9 @@
"log_out": {
"message": "Logout",
"description": "Sign out of 3rd party storage services"
},
"token_revoked": {
"message": "There was an issue connecting to your ${service} account, please sign in again.",
"description": "Error authenticating to backup service. ${service} will be replaced with a proper noun (E.g.: 'Google Drive' or 'Dropbox')"
}
}
6 changes: 5 additions & 1 deletion _locales/ja/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -274,5 +274,9 @@
"log_out": {
"message": "Logout",
"description": "Sign out of 3rd party storage services"
},
"token_revoked": {
"message": "There was an issue connecting to your ${service} account, please sign in again.",
"description": "Error authenticating to backup service. ${service} will be replaced with a proper noun (E.g.: 'Google Drive' or 'Dropbox')"
}
}
}
Loading

0 comments on commit d033a31

Please sign in to comment.