From 313cea5580452d5831d1ff73c9814ea3dbe4b931 Mon Sep 17 00:00:00 2001
From: Mayesters <maxi@boether.de>
Date: Wed, 31 May 2017 12:55:32 +0200
Subject: [PATCH] fix master merge translations

---
 app/locales/en.json                  |  9 +++++++--
 ui/js/component/fileActions/view.jsx |  2 +-
 ui/js/component/splash.js            | 12 ++++++------
 ui/js/component/video/view.jsx       |  4 ++--
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/locales/en.json b/app/locales/en.json
index 6baadaac6..de73a67b1 100644
--- a/app/locales/en.json
+++ b/app/locales/en.json
@@ -309,5 +309,10 @@
   "Wallet": "Wallet",
   "Looking up version info": "Looking up version info",
   "It looks like you deleted or moved this file. We're rebuilding it now. It will only take a few seconds.": "It looks like you deleted or moved this file. We're rebuilding it now. It will only take a few seconds.",
-  "Fetching cost info": "Fetching cost info"
-}
+  "Fetching cost info": "Fetching cost info",
+  "Testing network": "Testing network",
+  "Connection Failure": "Connection Failure",
+  "Try closing all LBRY processes and starting again. If this still happpens, your anti-virus software or firewall may be preventing LBRY from connecting. Contact hello@lbry.io if you think this is a software bug.": "Try closing all LBRY processes and starting again. If this still happpens, your anti-virus software or firewall may be preventing LBRY from connecting. Contact hello@lbry.io if you think this is a software bug.",
+  "Timed Out": "Timed Out",
+  "Testing Network": "Testing Network"
+}
\ No newline at end of file
diff --git a/ui/js/component/fileActions/view.jsx b/ui/js/component/fileActions/view.jsx
index 445b3b6e7..0a2106b26 100644
--- a/ui/js/component/fileActions/view.jsx
+++ b/ui/js/component/fileActions/view.jsx
@@ -122,7 +122,7 @@ class FileActions extends React.Component {
             <DropDownMenuItem key={1} onClick={() => openModal('confirmRemove')} label={__("Remove...")} />
           </DropDownMenu> : '' }
         <Modal type="confirm" isOpen={modal == 'affirmPurchase'}
-               contentLabel="Confirm Purchase" onConfirmed={this.onAffirmPurchase.bind(this)} onAborted={closeModal}>
+               contentLabel={__("Confirm Purchase")} onConfirmed={this.onAffirmPurchase.bind(this)} onAborted={closeModal}>
           {__("This will purchase")} <strong>{title}</strong> {__("for")} <strong><FilePrice uri={uri} look="plain" /></strong> {__("credits")}.
         </Modal>
         <Modal isOpen={modal == 'notEnoughCredits'} contentLabel={__("Not enough credits")}
diff --git a/ui/js/component/splash.js b/ui/js/component/splash.js
index 98b09db93..8da6d5c0e 100644
--- a/ui/js/component/splash.js
+++ b/ui/js/component/splash.js
@@ -12,8 +12,8 @@ export class SplashScreen extends React.Component {
     super(props);
 
     this.state = {
-      details: 'Starting daemon',
-      message: "Connecting",
+      details: __('Starting daemon'),
+      message: __("Connecting"),
       isLagging: false,
     };
   }
@@ -30,8 +30,8 @@ export class SplashScreen extends React.Component {
       // TODO: This is a hack, and the logic should live in the daemon
       // to give us a better sense of when we are actually started
       this.setState({
-        message: "Testing Network",
-        details: "Waiting for name resolution",
+        message: __("Testing Network"),
+        details: __("Waiting for name resolution"),
         isLagging: false
       });
 
@@ -55,8 +55,8 @@ export class SplashScreen extends React.Component {
       .catch(() => {
         this.setState({
           isLagging: true,
-          message: "Connection Failure",
-          details: "Try closing all LBRY processes and starting again. If this still happpens, your anti-virus software or firewall may be preventing LBRY from connecting. Contact hello@lbry.io if you think this is a software bug."
+          message: __("Connection Failure"),
+          details: __("Try closing all LBRY processes and starting again. If this still happpens, your anti-virus software or firewall may be preventing LBRY from connecting. Contact hello@lbry.io if you think this is a software bug.")
         })
       })
   }
diff --git a/ui/js/component/video/view.jsx b/ui/js/component/video/view.jsx
index 49de15cbf..b3601a287 100644
--- a/ui/js/component/video/view.jsx
+++ b/ui/js/component/video/view.jsx
@@ -52,7 +52,7 @@ class VideoPlayButton extends React.Component {
             className="video__play-button"
             icon="icon-play"
             onClick={this.onWatchClick.bind(this)} />
-      <Modal contentLabel="Not enough credits" isOpen={modal == 'notEnoughCredits'} onConfirmed={closeModal}>
+      <Modal contentLabel={__("Not enough credits")} isOpen={modal == 'notEnoughCredits'} onConfirmed={closeModal}>
         {__("You don't have enough LBRY credits to pay for this stream.")}
       </Modal>
       <Modal
@@ -64,7 +64,7 @@ class VideoPlayButton extends React.Component {
         {__("This will purchase")} <strong>{title}</strong> {__("for")} <strong><FilePrice uri={uri} look="plain" /></strong> {__("credits")}.
       </Modal>
       <Modal
-        isOpen={modal == 'timedOut'} onConfirmed={closeModal} contentLabel="Timed Out">
+        isOpen={modal == 'timedOut'} onConfirmed={closeModal} contentLabel={__("Timed Out")}>
         {__("Sorry, your download timed out :(")}
       </Modal>
     </div>);