Merge remote-tracking branch 'upstream/dev' into login-common

UWNetworksLab · Dec 18, 2015 · 7093739 · 7093739
2 parents 1dabbe1 + 3c87bbe
commit 7093739
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/generic_ui/locales/en/messages.json b/src/generic_ui/locales/en/messages.json
@@ -1127,6 +1127,6 @@
   },
   "GITHUB_LOGIN_CONFIRMATION": {
     "description": "Confirmation message the user sees prior to logging into GitHub",
-    "message": "uProxy can use Github, a developer tool, to help you connect with your friends.<br><br>Because it may be possible for others to tell which Github accounts are using uProxy, <strong>we recommend you create a new anonymous Github account</strong>, even if you already use Github.  <strong>You will need to verify your email with GitHub before you connect.</strong>"
+    "message": "uProxy can use GitHub, a developer tool, to help you connect with your friends.<br><br>Because it may be possible for others to tell which GitHub accounts are using uProxy, <strong>we recommend you create a new anonymous GitHub account</strong>, even if you already use GitHub.  <strong>You will need to verify your email with GitHub before you connect.</strong>"
   }
 }