merge

cbucher · Apr 29, 2016 · 129bdb4 · 129bdb4
1 parent 884e414
commit 129bdb4
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/l10n/JPN/console.ini b/l10n/JPN/console.ini
@@ -198,7 +198,7 @@
 "&Toolbar"="ツールバー"
 "Attach Consoles"="コンソールのアタッチ"
 "Cl&ear Selection"="現在の選択をクリア"
-"Clone in new &Tab"="新しいタブにクローンを作成"
+"Clone in New &Tab"="新しいタブにクローンを作成"
 "Close All Tabs BUT This"="アクティブタブ以外のタブをクローズ"
 "Close All Tabs to the Left"="左方向にタブをクローズ"
 "Close All Tabs to the Right"="右方向にタブをクローズ"
@@ -252,7 +252,7 @@
 "Clear screen\nClear"="スクリーンクリア\nクリア"
 "Clear selection"="選択のクリア"
 "Click link"="リンクのクリック"
-"Clone the current view in a new tab\nClone in new tab"="現在のビューを新しいタブにクローン\n新しいタブにクローン"
+"Clone the current view in a new tab\nClone in New Tab"="現在のビューを新しいタブにクローン\n新しいタブにクローン"
 "Clone view in new tab"="新しいタブにビューを複製"
 "Close all tabs but the current"="利用中以外のタブをすべてクローズ"
 "Close all tabs to the left of the current"="利用中のタブより左のタブをクローズ"
@@ -296,7 +296,7 @@
 "Display font information of the hidden console"="隠れたコンソールのフォント情報を表示"
 "Display program information, version number and copyright\nAbout"="プログラム情報、バージョン、コピーライトを表示\nAbout"
 "DLL hook %1% is missing!"="DLL フック %1% エラー!"
-"DLL injection has failed (reason:%1%)!"="DLL インジェクションの失敗 (理由:%1%)!"
+"DLL injection has failed (reason: %1%)!"="DLL インジェクションの失敗 (理由:%1%)!"
 "Drag window"="ウィンドーのドラッグ"
 "Dump screen buffer"="スクリーンバッファーのダンプ"
 "Edit"="編集"
@@ -459,11 +459,12 @@
 "Transparency"="透過"
 "Turn on or off transparency"="透過のON OFF"
 "Turn on/off transparency"="透過のON OF"
-"Unable to create shared objects (reason:%1%)!"="共有オブジェクトを作れません (reason:%1%)!"
-"Unable to get the elevation level (reason:%1%)!"="Unable to get the elevation level (reason:%1%)!"
-"Unable to start %1% %2% as administrator (reason:%3%)!"="Unable to start %1% %2% as administrator (reason:%3%)!"
-"Unable to start %1% (reason:%2%)!"="Unable to start %1% (reason:%2%)!"
-"Unable to start %1% as user %2% (reason:%3%)!"="Unable to start %1% as user %2% (reason:%3%)!"
+"Unable to create shared objects (reason: %1%)!"="共有オブジェクトを作れません (reason:%1%)!"
+"Unable to get current user identity (reason: %1%)!"="Unable to get current user identity (reason: %1%)!"
+"Unable to get the elevation level (reason: %1%)!"="Unable to get the elevation level (reason: %1%)!"
+"Unable to start %1% %2% as administrator (reason: %3%)!"="Unable to start %1% %2% as administrator (reason: %3%)!"
+"Unable to start %1% (reason: %2%)!"="Unable to start %1% (reason: %2%)!"
+"Unable to start %1% as user %2% (reason: %3%)!"="Unable to start %1% as user %2% (reason: %3%)!"
 "Ungroup all"="Ungroup all"
 "Ungroup tab"="Ungroup tab"
 "Value"="値"

diff --git a/l10n/JPN/console.rc b/l10n/JPN/console.rc
@@ -880,15 +880,16 @@ END
 STRINGTABLE
 BEGIN
     IDS_CAPTION_ERROR "エラー"
-    IDS_ERR_CANT_START_SHELL "Unable to start %1% (reason:%2%)!"
-    IDS_ERR_CANT_START_SHELL_AS_USER "Unable to start %1% as user %2% (reason:%3%)!"
+    IDS_ERR_CANT_START_SHELL "Unable to start %1% (reason: %2%)!"
+    IDS_ERR_CANT_START_SHELL_AS_USER "Unable to start %1% as user %2% (reason: %3%)!"
     IDS_ERR_DLL_INJECTION_FAILED "DLL インジェクションの失敗 (理由:%1%)!"
     IDS_ERR_DLL_HOOK_MISSING "DLL フック %1% エラー!"
     IDS_ERR_CREATE_SHARED_OBJECTS_FAILED "共有オブジェクトを作れません (reason:%1%)!"
-    IDS_ERR_CANT_START_SHELL_AS_ADMIN "Unable to start %1% %2% as administrator (reason:%3%)!"
-    IDS_ERR_CANT_GET_ELEVATION_TYPE "Unable to get the elevation level (reason:%1%)!"
+    IDS_ERR_CANT_START_SHELL_AS_ADMIN "Unable to start %1% %2% as administrator (reason: %3%)!"
+    IDS_ERR_CANT_GET_ELEVATION_TYPE "Unable to get the elevation level (reason: %1%)!"
     IDS_ERR_TAB_CREATE_FAILED "タブ %1%をオープンできません !\nプロセス　%2% がまだ動作してます　(タスクマネージャーで該当プロセスを終了してください)"
     IDS_ERR_IS_NOT_A_WIN32_CONSOLE "%1% is not a Win32 console application!"
+    IDS_ERR_CANT_GET_USER "Unable to get current user identity (reason: %1%)!"
 END
 
 STRINGTABLE

diff --git a/l10n/l10n.vcxproj b/l10n/l10n.vcxproj
@@ -13,6 +13,7 @@
   <ItemGroup>
     <None Include="DEU\console.ini" />
     <None Include="FRA\console.ini" />
+    <None Include="JPN\console.ini" />
     <None Include="makefile" />
     <None Include="RUS\console.ini" />
   </ItemGroup>

diff --git a/l10n/l10n.vcxproj.filters b/l10n/l10n.vcxproj.filters
@@ -10,6 +10,9 @@
     <Filter Include="DEU">
       <UniqueIdentifier>{5426a010-5084-4bdd-9de5-37adbd28f3ef}</UniqueIdentifier>
     </Filter>
+    <Filter Include="JPN">
+      <UniqueIdentifier>{5c7d1c0e-5b2e-484f-82ad-68007b3a2bb1}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="makefile" />
@@ -22,5 +25,8 @@
     <None Include="DEU\console.ini">
       <Filter>DEU</Filter>
     </None>
+    <None Include="JPN\console.ini">
+      <Filter>JPN</Filter>
+    </None>
   </ItemGroup>
 </Project>