OSDN Git Service

add win/C# diff files
[handbrake-jp/handbrake-jp.git] / win / C# / frmMain.resx.diff
diff --git a/win/C#/frmMain.resx.diff b/win/C#/frmMain.resx.diff
new file mode 100644 (file)
index 0000000..b979c00
--- /dev/null
@@ -0,0 +1,137 @@
+diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
+index 0f26e40..bb2f6f7 100644
+--- a/win/C#/frmMain.resx
++++ b/win/C#/frmMain.resx
+@@ -117,12 +117,12 @@
+   <resheader name="writer">\r
+     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+   </resheader>\r
+-  <metadata name="notifyIconMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+-    <value>17, 54</value>\r
+-  </metadata>\r
+   <metadata name="notifyIconMenu.GenerateMember" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+     <value>False</value>\r
+   </metadata>\r
++  <metadata name="notifyIconMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
++    <value>1106, 15</value>\r
++  </metadata>\r
+   <metadata name="DVD_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+     <value>556, 15</value>\r
+   </metadata>\r
+@@ -136,7 +136,7 @@
+     <value>True</value>\r
+   </metadata>\r
+   <metadata name="ChaptersMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+-    <value>935, 54</value>\r
++    <value>578, 54</value>\r
+   </metadata>\r
+   <data name="data_chpt.ToolTip" xml:space="preserve">\r
+     <value>Here you can name each chapter that the encoded video will contain.\r
+@@ -144,6 +144,38 @@ Make sure you have selected a "Title" from the "Source" box above otherwise
+ the list will not be populated with the correct amount of chapters.\r
+ Note: Do not change any of the chapter numbers!</value>\r
+   </data>\r
++  <data name="btn_importChapters.ToolTip" xml:space="preserve">\r
++    <value>Import a comma separated file containing the chapter information.\r
++The CSV should be formatted as follows:\r
++\r
++1,Chapter 1 Name\r
++2,Chapter 2 Name\r
++3,Chapter 3 Name\r
++\r
++Note: Currently, if you wish to use a , in your chapter name, you must escape it with a \\r
++Note2: HandBrake can NOT create chapters, only add a name to any chapters your source currently has.</value>\r
++  </data>\r
++  <data name="btn_export.ToolTip" xml:space="preserve">\r
++    <value>Export to a comma separated file containing the chapter information.\r
++The CSV is formatted as follows:\r
++\r
++1,Chapter 1 Name\r
++2,Chapter 2 Name\r
++3,Chapter 3 Name\r
++\r
++Note: Commas in names are escaped by a \</value>\r
++  </data>\r
++  <data name="drop_mode.ToolTip" xml:space="preserve">\r
++    <value>There are several ranges which can be encoded:\r
++- Encode a range of Chapters.\r
++\r
++The Following options are not 100% accurate:\r
++- Encode video between a start and end time, measured in seconds\r
++- Encode video between a start and end frame.</value>\r
++  </data>\r
++  <metadata name="presets_menu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
++    <value>1354, 15</value>\r
++  </metadata>\r
+   <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+     <value>232, 15</value>\r
+   </metadata>\r
+@@ -157,34 +189,21 @@ Note: Do not change any of the chapter numbers!</value>
+     <value>106, 15</value>\r
+   </metadata>\r
+   <metadata name="AudioMenuRowHeightHack.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+-    <value>392, 54</value>\r
+-  </metadata>\r
+-  <metadata name="presets_menu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+-    <value>265, 54</value>\r
++    <value>17, 54</value>\r
+   </metadata>\r
++  <data name="label34.Text" xml:space="preserve">\r
++    <value>Here you can alter the query generated by this program. This feature is for one job overriding of the automatic query generation.\r
++Don't forget to re-generate this query if you change any GUI options.\r
++Note that this will also override the "Add to Queue" query as well.\r
++Clear the text box below to return to the internal query generation.</value>\r
++  </data>\r
+   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+     <value>767, 15</value>\r
+   </metadata>\r
+-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
+-  <data name="btn_dvd_source.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
+-    <value>\r
+-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
+-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJQSURBVDhPlZNdSNNRGMb/F110ZZEVhVBgeeHNICiiuggp\r
+-        olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdPKMgr7kApFItTUkWZqVhSVYmao5Nev/xyoQ4k88Nyc\r
+-        8z6/93nP4QjCfy6lwc4ltZVso4P/tMyXRcmMHqZ0EeY6jZQVInzuf0e1Tb9Ina3P/tkpLD6XkNg8BJe5\r
+-        u93C+HDVrP4M2ZkcMOOw5tLZ9nxJyJE4HSExBoKkBQhVpTrGhso9zNPfiph0JlB+U01ZcRbmwnRMeWlc\r
+-        08opUCV6QissGsZ+WOY6z4hmuuXglC6pRYBbJSp+fzXNxnaZ66o1s3rkyKHWruJuWRYOcwZ2kxKr8TI3\r
+-        DCkU6+QYNUnuNGWmLEY+5uOK3degoKZcx3SfEvozPfVB3OtNhi4ZvI2nrTIc23U9gtmYwa8eNXzScq8i\r
+-        l6bHWnfRwhHeREJzGFONgYw/CeB9qQSZNNR9FyUGBT87lfQ3plJj1zLTq4COGDegLVo0HmeqKZjx+gOM\r
+-        PNzDYPU2lLF+4jhyN6BIl8pgexK3bRpaXopJuhJEwGloiWDmVSgTLw4xWreXoZrtfK/wp/nKak4E+s6/\r
+-        hDFHTkd9GndsOdCTBq1i3NdHmWgIYvRpAMO1OxlwSPhi2YpT641CuoWzsSfnAfnZiVRZ1Tjvx9GsF+bU\r
+-        pF1BvWolD9JXUZmyDnOiD1cvbCZiYXfXCPrMi+gVZ8hOiiL53DHORwdzKnw/hw/uYt9uCTskfvj7+rBp\r
+-        41rWr/Fig7fX8j/Tsn/fcgx/ARfG3ml6M3rzAAAAAElFTkSuQmCC\r
+-</value>\r
+-  </data>\r
+   <metadata name="notifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+     <value>871, 15</value>\r
+   </metadata>\r
++  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
+   <data name="notifyIcon.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
+     <value>\r
+         AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA\r
+@@ -565,10 +584,10 @@ Note: Do not change any of the chapter numbers!</value>
+ </value>\r
+   </data>\r
+   <metadata name="StatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+-    <value>155, 54</value>\r
++    <value>1244, 15</value>\r
+   </metadata>\r
+   <metadata name="hbproc.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+-    <value>595, 54</value>\r
++    <value>220, 54</value>\r
+   </metadata>\r
+   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+     <value>98</value>\r
+@@ -956,9 +975,9 @@ Note: Do not change any of the chapter numbers!</value>
+     <value>664, 15</value>\r
+   </metadata>\r
+   <metadata name="openPreset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+-    <value>680, 54</value>\r
++    <value>310, 54</value>\r
+   </metadata>\r
+   <metadata name="File_ChapterImport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+-    <value>787, 54</value>\r
++    <value>423, 54</value>\r
+   </metadata>\r
+ </root>
+\ No newline at end of file