Japanese translation

LiveSplit/LiveSplit.Core/Model/AutoSplitter.cs

@@ -50,7 +50,7 @@ public void Activate(LiveSplitState state)
                 catch (Exception ex)
                 {
                     Log.Error(ex);
-                    MessageBox.Show(state.Form, "The Auto Splitter could not be activated. (" + ex.Message + ")", "Activation Failed", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    MessageBox.Show(state.Form, "自動スプリットを有効にできませんでした。 (" + ex.Message + ")", "実行失敗", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 }
             }
         }
@@ -81,7 +81,7 @@ private void DownloadFiles()
                 }
                 catch (WebException)
                 {
-                    Log.Error("Error downloading file from " + url);
+                    Log.Error(url + "からのダウンロードに失敗しました。");
                 }
                 catch (Exception ex)
                 {

LiveSplit/LiveSplit.Core/UI/Components/SeparatorFactory.cs

@@ -8,7 +8,13 @@ public string ComponentName
             => "Separator";
 
         public string Description
+<<<<<<< HEAD
+        {
+            get { return "部品ごとの区切り線を表示"; }
+        }
+=======
             => "Shows a line to separate components.";
+>>>>>>> refs/remotes/LiveSplit/master
 
         public ComponentCategory Category
             => ComponentCategory.Other;

LiveSplit/LiveSplit.Core/Web/Share/Excel.cs

@@ -17,9 +17,20 @@ public class Excel : IRunUploadPlatform
 
         public string PlatformName => "Excel";
 
+<<<<<<< HEAD
+        public string Description
+        {
+            get
+            {
+                return "あなたのスプリットをエクセルファイルとして保存します。"
+                    + "今まで試行してきた全履歴が保存されています。";
+            }
+        }
+=======
         public string Description =>
 @"Export your splits as an Excel Sheet to analyze your splits. 
 This includes your whole history of all the runs you ever did.";
+>>>>>>> refs/remotes/LiveSplit/master
 
         public ISettings Settings { get; set; }
 

LiveSplit/LiveSplit.Core/Web/Share/Gett.cs

@@ -31,11 +31,23 @@ protected Uri GetUri(string subUri)
 
         public string PlatformName => "Ge.tt";
 
+<<<<<<< HEAD
+        public string Description
+        {
+            get
+            {
+                return "Ge.ttはスプリット共有サイトです。"
+                + "アカウント無しでアップロードできますが、その場合は30日後に自動的に削除されます・"
+                + "\"URLから開く\"からGe.ttのリンクからインポートができます。";
+            }
+        }
+=======
         public string Description =>
 @"Ge.tt is a useful platform for sharing files 
 with the world. You don't need an account. If you're not logged in, the splits 
 will be deleted after 30 days, though. 
 " + "You can also directly import Ge.tt links with \"Open from URL...\"";
+>>>>>>> refs/remotes/LiveSplit/master
 
         public ISettings Settings { get; set; }
 

LiveSplit/LiveSplit.Core/Web/Share/Imgur.cs

@@ -40,8 +40,7 @@ public string Description
         {
             get
             {
-                return "Sharing to Imgur allows you to share a screenshot of "
-                    + "LiveSplit with a popular web database of image content.";
+                return "ImgurにLiveSplitのスクリーンショットを自動的にアップロードできます。";
             }
         }
 

LiveSplit/LiveSplit.Core/Web/Share/Screenshot.cs

@@ -17,7 +17,17 @@ protected Screenshot() { }
 
         public string PlatformName => "Screenshot";
 
+<<<<<<< HEAD
+        public string Description
+        {
+            get 
+            {
+                return "LiveSplitのスクリーンショットを保存します。";
+            }
+        }
+=======
         public string Description => "Sharing will save a screenshot of LiveSplit.";
+>>>>>>> refs/remotes/LiveSplit/master
 
         public IEnumerable<ASUP.IdPair> GetGameList()
         {

LiveSplit/LiveSplit.Core/Web/Share/SplitsIO.cs

@@ -33,13 +33,28 @@ protected SplitsIO() { }
 
         public string PlatformName => "Splits.io";
 
+<<<<<<< HEAD
+        public string Description
+        {
+            get 
+            {
+                return "Splits.ioはスプリット共有サイトで、自分のスプリットをアップロードまたは"
+                + "他人のものをダウンロードすることができます。"
+                + "\"Splits.ioからスプリットを開く\"を使うことでSplits.ioの閲覧、 "
+                + "または\"Splits.ioから比較をインポート\"で他人のスプリットを比較することができます。 "
+                + "Splits.ioからダウンロードしたスプリットはデータ損失なし、そして他タイマー用に形式を選択して"
+                + "ダウンロードすることができます。";
+            }
+        }
+=======
         public string Description =>
             "Splits.io is the best platform for sharing individual "
             + "splits with the world and downloading them from there. "
             + "You can also browse Splits.io with \"Open Splits From Splits.io...\" "
             + "or import splits as a comparison with \"Import Comparison From Splits.io...\". "
             + "Splits downloaded from Splits.io have not data loss, and the splits can be "
             + "downloaded in the format for any timer.";
+>>>>>>> refs/remotes/LiveSplit/master
 
         public ISettings Settings { get; set; }
 

LiveSplit/LiveSplit.Core/Web/Share/Twitch.cs

@@ -128,11 +128,28 @@ protected Uri GetUri(string subUri)
 
         public string PlatformName => "Twitch";
 
+<<<<<<< HEAD
+        public string PlatformName
+        {
+            get { return "Twitch"; }
+        }
+
+        public string Description
+        {
+            get
+            {
+                return "Twitchと共有すると配信タイトルとやっているゲームを更新します。"
+                     + "やっているゲームは自分のスプリットで設定したものになります。"
+                     + "初回使用時はTwitchと連携させる必要があります。";
+            }
+        }
+=======
         public string Description =>
 @"Sharing to Twitch will automatically update your 
 stream title and game playing based on the information 
 in your splits. Twitch must authenticate with LiveSplit 
 the first time that sharing to Twitch is used.";
+>>>>>>> refs/remotes/LiveSplit/master
 
         public ISettings Settings { get; set; }
 

LiveSplit/LiveSplit.Core/Web/Share/Twitter.cs

@@ -30,12 +30,25 @@ protected Twitter() { }
 
         public string PlatformName => "Twitter";
 
+<<<<<<< HEAD
+        public string Description
+        {
+            get 
+            {
+                return "Twitterを使ってあなたの記録を共有することができます。"
+                + "共有時は、スプリットのスクリーンショットもツイート内に含まれます。"
+                + "共有ボタンを押した時、TwitterはLiveSplitを認証するかどうか聞いてきます。"
+                + "共有後は、Livesplitが自動的にツイートします。"; 
+            }
+        }
+=======
         public string Description =>
 @"Twitter allows you to share your run with the world. 
 When sharing, a screenshot of your splits will automatically 
 be included. When you click share, Twitter will ask to 
 authenticate with LiveSplit. After the authentication, LiveSplit 
 will automatically send the tweet."; 
+>>>>>>> refs/remotes/LiveSplit/master
 
         public IEnumerable<ASUP.IdPair> GetGameList()
         {

LiveSplit/LiveSplit.View/LiveSplit.View.csproj

@@ -253,19 +253,36 @@
     <EmbeddedResource Include="View\AboutBox.resx">
       <DependentUpon>AboutBox.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="View\BrowseSpeedrunComDialog.ja-JP.resx">
+      <DependentUpon>BrowseSpeedrunComDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="View\BrowseSpeedrunComDialog.resx">
       <DependentUpon>BrowseSpeedrunComDialog.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="View\ChooseComparisonsDialog.ja-JP.resx">
+      <DependentUpon>ChooseComparisonsDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="View\ComponentSettingsDialog.ja-JP.resx">
+      <DependentUpon>ComponentSettingsDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="View\EditHistoryDialog.ja-JP.resx">
+      <DependentUpon>EditHistoryDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="View\EditHistoryDialog.resx">
       <DependentUpon>EditHistoryDialog.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="View\ChooseComparisonsDialog.resx">
       <DependentUpon>ChooseComparisonsDialog.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="View\LayoutEditorDialog.ja-JP.resx">
+      <DependentUpon>LayoutEditorDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="View\LayoutEditorDialog.resx">
       <DependentUpon>LayoutEditorDialog.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="View\LayoutSettingsControl.ja-JP.resx">
+      <DependentUpon>LayoutSettingsControl.cs</DependentUpon>
     <EmbeddedResource Include="View\MetadataControl.resx">
       <DependentUpon>MetadataControl.cs</DependentUpon>
     </EmbeddedResource>
@@ -275,22 +292,39 @@
     <EmbeddedResource Include="View\ComponentSettingsDialog.resx">
       <DependentUpon>ComponentSettingsDialog.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="View\LayoutSettingsDialog.ja-JP.resx">
+      <DependentUpon>LayoutSettingsDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="View\LayoutSettingsDialog.resx">
       <DependentUpon>LayoutSettingsDialog.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="View\RunEditorDialog.ja-JP.resx">
+      <DependentUpon>RunEditorDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="View\RunEditorDialog.resx">
       <DependentUpon>RunEditorDialog.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="View\SetSizeForm.ja-JP.resx">
+      <DependentUpon>SetSizeForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="View\SetSizeForm.resx">
       <DependentUpon>SetSizeForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="View\SettingsDialog.ja-JP.resx">
+      <DependentUpon>SettingsDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="View\SettingsDialog.resx">
       <DependentUpon>SettingsDialog.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="View\ShareRunDialog.ja-JP.resx">
+      <DependentUpon>ShareRunDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="View\ShareRunDialog.resx">
       <DependentUpon>ShareRunDialog.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="View\SpeedRunsLiveForm.ja-JP.resx">
+      <DependentUpon>SpeedRunsLiveForm.cs</DependentUpon>
     <EmbeddedResource Include="View\SpeedrunComSubmitDialog.resx">
       <DependentUpon>SpeedrunComSubmitDialog.cs</DependentUpon>
     </EmbeddedResource>
@@ -300,6 +334,9 @@
     <EmbeddedResource Include="View\AuthenticationDialog.resx">
       <DependentUpon>AuthenticationDialog.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="View\TimerForm.ja-JP.resx">
+      <DependentUpon>TimerForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="View\TimerForm.resx">
       <DependentUpon>TimerForm.cs</DependentUpon>
       <SubType>Designer</SubType>