Merge branch 'bip44' of https://github.com/darkwallet/darkwallet into…

… bip44
darkwallet · Nov 4, 2014 · 4e286f4 · 4e286f4
2 parents 9d75803 + 5db99a8
commit 4e286f4
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 47 deletions.
diff --git a/html/partials/lobby.html b/html/partials/lobby.html
@@ -22,14 +22,14 @@ <h4>{{'Channels'|_}}</h4>
           <h4 ng-show="peerRequests.length">{{'Requests'|_}}</h4>
           <div ng-show="peerRequests.length">
               <select class="select-list" size="10">
-              <option ng-click="openRequest(request)" ng-selected="selectedRequest == request" ng-repeat="request in peerRequests">{{'{0} from {1}'|_:request.type:request.body.nick}}</option>
+              <option ng-click="openRequest(request)" ng-selected="selectedRequest == request" ng-repeat="request in peerRequests">{{request.type == 'Pair' ? ('Pair from {0}'|_:request.body.nick) : ('Beacon from {0}'|_:request.body.nick)}}</option>
               </select>
           </div>
       </div>
 
       <!-- Request window -->
       <div ng-show="selectedRequest && (selectedRequest.type == 'Pair')" class="medium-7 columns">
-          <h2>{{selectedRequest.type}} {{'Request'|_}}</h2>
+          <h2>{{'Pair request'|_}}</h2>
           <form>
           <div class="wrapper"><face title="{{selectedRequest.peer.name}}" hash="selectedRequest.peer.pubKeyHex" icon-size="32"></face> <input type="text" ng-model="selectedRequest.nick"></input></div>
           </form>

diff --git a/html/partials/settings.html b/html/partials/settings.html
@@ -33,7 +33,7 @@ <h5>{{'Change your password'|_}}</h5>
         </form>
           <h5 ng-show="settings.advanced">{{'Mixing'|_}}</h5>
           <div ng-show="settings.advanced">
-             <input id="checkbox-mixer" title="{{'If mixing is enabled when sending, will only send if successfull mixing, otherwise will just not send'|_}}" ng-model="settings.hardMixing" ng-change="storeSettings()" type="checkbox"><label for="checkbox-mixer">Enforced mixing</label><br>
+             <input id="checkbox-mixer" title="{{'If mixing is enabled when sending, will only send if successfull mixing, otherwise will just not send'|_}}" ng-model="settings.hardMixing" ng-change="storeSettings()" type="checkbox"><label for="checkbox-mixer">{{'Enforced mixing'|_}}</label><br>
           </div>
 
         </div>

diff --git a/html/popup.html b/html/popup.html
@@ -30,7 +30,7 @@
           </a>
         </div>
         <div ng-show="!identities.length" ng-cloak class="small-12 columns">
-			<h6>Welcome to Darkwallet! Let's get started:
+			<h6>{{'Welcome to Darkwallet! Let\'s get started:'|_}}
           <a href="index.html#new_wallet" target="_blank" class="button small radius expand">
             {{'Create wallet'|_}}
           </a>

diff --git a/i18n/en_US.json b/i18n/en_US.json
@@ -42,6 +42,7 @@
     "Bad password: ": "Bad password: ",
     "Balance": "Balance",
     "Base unit": "Base unit",
+    "Beacon from {0}": "Beacon from {0}",
     "Beacon!": "Beacon!",
     "Beacons will be sent and received automatically [friend]": "Beacons will be sent and received automatically [friend]",
     "Below dust threshold": "Below dust threshold",
@@ -120,6 +121,7 @@
     "Edit name": "Edit name",
     "Enable animations": "Enable animations",
     "Enable developer mode": "Enable developer mode",
+    "Enforced mixing": "Enforced mixing",
     "Enter IP address (e.g: 80.34.132.23:2534)": "Enter IP address (e.g: 80.34.132.23:2534)",
     "Enter a bitcoin address here or use the buttons on the right.": "Enter a bitcoin address here or use the buttons on the right.",
     "Enter a bitcoin address here...": "Enter a bitcoin address here...",
@@ -266,6 +268,8 @@
     "Outgoing": "Outgoing",
     "Outputs": "Outputs",
     "Overview": "Overview",
+    "Pair from {0}": "Pair from {0}",
+    "Pair request": "Pair request",
     "Paranoid": "Paranoid",
     "Participants": "Participants",
     "Password": "Password",
@@ -296,7 +300,6 @@
     "Rename": "Rename",
     "Repeat new password": "Repeat new password",
     "Repeat password": "Repeat password",
-    "Request": "Request",
     "Request for identification": "Request for identification",
     "Requesting information from the server... please wait": "Requesting information from the server... please wait",
     "Requesting my own public key": "Requesting my own public key",
@@ -432,6 +435,7 @@
     "Watch-only pockets": "Watch-only pockets",
     "Week": "Week",
     "Weekly": "Weekly",
+    "Welcome to Darkwallet! Let's get started:": "Welcome to Darkwallet! Let's get started:",
     "Write an address to export just one.": "Write an address to export just one.",
     "Write the 12 words here...": "Write the 12 words here...",
     "Write the password for your pocket": "Write the password for your pocket",
@@ -508,7 +512,6 @@
     "unused": "unused",
     "{0} added to contacts": "{0} added to contacts",
     "{0} confirmations": "{0} confirmations",
-    "{0} from {1}": "{0} from {1}",
     "{0} has been deleted.": "{0} has been deleted.",
     "{0} keys": "{0} keys",
     "{0} of {1}": "{0} of {1}",