Permalink
Browse files

fixed fork false positive - 3a10346

fixed false positive you-are-probably-on-a-fork message triggered by to
few downloaded blocks on client startup
updated locales
  • Loading branch information...
1 parent 26a6eeb commit 12a7485e13b93446f9e467a2f114eecf9dfa6203 @dawallet dawallet committed Jan 24, 2017
Showing with 7 additions and 1 deletion.
  1. +4 −1 html/ui/js/nrs.js
  2. +3 −0 html/ui/locales/en.json
View
@@ -917,6 +917,9 @@ var NRS = (function(NRS, $, undefined) {
break;
}
}
+ } else {
+
+ onAFork = false;
}
if (onAFork) {
@@ -997,4 +1000,4 @@ function receiveMessage(event) {
return;
}
//parent.postMessage("from iframe", "file://");
-}
+}
View
@@ -1,6 +1,9 @@
{
"deadline": "Deadline",
"recipient": "Recipient",
+ "export_contact": "Export Contacts",
+ "import_contact": "Import Contacts",
+ "error_no_contacts_available": "There are no contacts available",
"subtype": "Subtype",
"error_description": "Error Description",
"alias_sale_info_outdated": "This alias sale info is outdated.",

0 comments on commit 12a7485

Please sign in to comment.