Merge pull request #28 from EQAditu/localization-273

r273 -exportcontroltext

Localization/en-US/Advanced Combat Tracker.exe.FormActMain.xml

@@ -123,6 +123,7 @@
     <Control ControlPath="root\tc1\tpOptions\flpOptionControls\Options_TableAttackType\gbTableDepth5" UniqueName="label49" Text="Sort #2:" />
     <Control ControlPath="root\tc1\tpOptions\flpOptionControls\Options_TableAttackType\gbTableDepth5" UniqueName="btnATSort2" Text="Time" />
     <Control ControlPath="root\tc1\tpOptions\flpOptionControls\Options_TableAttackType" UniqueName="btnTableDefaults" Text="Reset Columns to Default" />
+    <Control ControlPath="root\tc1\tpOptions\flpOptionControls\Options_MainTableGen" UniqueName="cbEncSilenceCut" Text="Number of seconds to wait after the last combat action to pause the encounter duration." />
     <Control ControlPath="root\tc1\tpOptions\flpOptionControls\Options_MainTableGen\groupBox6" UniqueName="cbTableCommas" Text="Show thousand separators in the Main tab tables" />
     <Control ControlPath="root\tc1\tpOptions\flpOptionControls\Options_MainTableGen\groupBox6" UniqueName="cbReverseSort" Text="Reverse the sorting order of the main table.  (Decending order)" />
     <Control ControlPath="root\tc1\tpOptions\flpOptionControls\Options_MainTableGen\groupBox6" UniqueName="label2" Text="Main table update frequency in seconds:" />

Localization/en-US/Advanced Combat Tracker.exe.InternalStrings.cs

@@ -6,7 +6,7 @@
 
 [assembly: AssemblyTitle("ActLocalization-InternalStrings")]
 [assembly: AssemblyDescription("A sample of an ACT plugin that changes localization strings.")]
-[assembly: AssemblyVersion("271.0.0.0")]
+[assembly: AssemblyVersion("273.0.0.0")]
 
 namespace ActLocalization
 {
@@ -208,6 +208,7 @@ internal static void EditLocalizations()
 			TryEditLocalization("helpPanel-cbCullTimer", "When an encounter ends, all encounters (except for \"All\" zone-wide encounters) older than this time limit will be removed."); // 
 			TryEditLocalization("helpPanel-cbCurrentOdbc", "When in combat, ACT can export to a temporary table called current_table on your ODBC datasource every few seconds.  Every export, the table will be deleted and refilled to reflect the current encounter.  This option is only recommended if you have a very quick connection to your datasource."); // 
 			TryEditLocalization("helpPanel-cbDoubleBufferLV", "When checked, ACT will attempt to enable minimal redrawing of the main table.  Windows versions before WindowsXP normally do not have this ability and may cause undesired results."); // 
+			TryEditLocalization("helpPanel-cbEncSilenceCut", "When enabled, an encounter's duration will be reduced when there are no hostile actions recorded for this many seconds.  This setting should be lower than the above end encounter idle timer.  This setting will not increase the duration of an enounter past its last hostile action."); // 
 			TryEditLocalization("helpPanel-cbExFile", "At the end of combat, this option will export to a macro file something similar to what a clipboard export would look like.  This file export is not restricted to 256 characters like the clipboard export, however it can only output 16 lines.  Once the export is created, you can display the results by using the command:\n\n/do_file_commands act-export.txt\n\nYou can create an EQ2 macro to trigger this command.  The macro file export will attempt to tabulate the data to make viewing it easier.\n\nYou must set the below option with what channel you wish to display the export to beforehand.  Leaving the channel prefix blank will cause the macro file not to function unless the Text Only Formatting options prefix a channel to *every* line."); // 
 			TryEditLocalization("helpPanel-cbExFileColumnAlign", "When enabled, the text export will be aligned into a table where each cell is padded to the length of the longest entry in that column.  It is recommended you use a text formatter such as {NAME10} instead of {name} or that column may have excessive padding."); // 
 			TryEditLocalization("helpPanel-cbExGraph", "When checked, HTML exports will include a main encounter graph."); // 
@@ -283,6 +284,7 @@ internal static void EditLocalizations()
 			TryEditLocalization("helpPanel-rbSParseFull", "Full selective parsing should only be used in small groups where there are other groups near by.  When the encounter begins, the settings are locked to that encounter.  Using this feature may cause the ExtDPS calculations to differ from other copies of ACT or other parsers depending on the limiting options they use.  Once an encounter has taken place, you cannot add or remove combatants  to it without reparsing that battle.  Full selective parsing will create data gaps and should not be used while using ACT to analyze battles or statistics as it will not show a complete \"picture\" of the encounter."); // 
 			TryEditLocalization("helpPanel-SampleType", "These settings affect how many DPS plots there are along the X-Axis.  If an encounter is one minute long, and Fixed number of DPS samples(6) is selected, there will be six X-Axis plots in 10 second intervals.  If DPS samples every 15 seconds is selected, there will be four DPS plots at 15 second intervals.  Fixed number is useful for keeping a graph readable no matter how long the encounter, and fixed sample durations is useful for comparisons to other time lines."); // 
 			TryEditLocalization("helpPanel-tbCharName", "If a log file is open this setting is ignored; however if ACT is used as an offline parser only, this setting will be used to fill in your name instead of using 'YOU'."); // 
+			TryEditLocalization("helpPanel-tbConvertXml", "You may paste a portion of ACT's configuration file in this textbox and convert it into a snippet.  Someone copying this snippet and clicking the [Import XML] button in the corner will import the contained config settings."); // 
 			TryEditLocalization("helpPanel-tbExFileName", "This export file name is a relative file path to the game folder or may be an absolute path."); // 
 			TryEditLocalization("helpPanel-TextFormatAddPreset", "Save these format options to the drop down list."); // 
 			TryEditLocalization("helpPanel-TextFormatAllies", "Allies formatting string. (First Line Format)"); // 
@@ -676,6 +678,7 @@ internal static void EditLocalizations()
 			TryEditLocalization("uiOpMisc-logPosition1", "Reading {0}\nAt position: {1:0,0}."); // Shown in the Misc options panel
 			TryEditLocalization("uiOpMisc-logPosition2a", " ({0} lines behind.)"); // 
 			TryEditLocalization("uiOpMisc-logPosition3", " ({0} CustomTrigger lines behind.)"); // 
+			TryEditLocalization("uiOpMisc-logPosition4", "\nSyncing companion files: "); // 
 			TryEditLocalization("uiOpMisc-logResumed", "Parsing Resumed..."); // 
 			TryEditLocalization("uiOptionsImportExport-xmlConverted", "XML Converted.  The above may be copied as an ACT Config Snippet to paste."); // 
 			TryEditLocalization("uiOptionsOdbc-connectSuccess", "ODBC Connection Succeeded"); // 

Localization/en-US/Advanced Combat Tracker.exe.InternalStrings.xml

@@ -291,6 +291,7 @@
 	<string key="helpPanel-cbCullTimer" value="When an encounter ends, all encounters (except for &quot;All&quot; zone-wide encounters) older than this time limit will be removed." />
 	<string key="helpPanel-cbCurrentOdbc" value="When in combat, ACT can export to a temporary table called current_table on your ODBC datasource every few seconds.  Every export, the table will be deleted and refilled to reflect the current encounter.  This option is only recommended if you have a very quick connection to your datasource." />
 	<string key="helpPanel-cbDoubleBufferLV" value="When checked, ACT will attempt to enable minimal redrawing of the main table.  Windows versions before WindowsXP normally do not have this ability and may cause undesired results." />
+	<string key="helpPanel-cbEncSilenceCut" value="When enabled, an encounter's duration will be reduced when there are no hostile actions recorded for this many seconds.  This setting should be lower than the above end encounter idle timer.  This setting will not increase the duration of an enounter past its last hostile action." />
 	<string key="helpPanel-cbExFile" value="At the end of combat, this option will export to a macro file something similar to what a clipboard export would look like.  This file export is not restricted to 256 characters like the clipboard export, however it can only output 16 lines.  Once the export is created, you can display the results by using the command:&#xA;&#xA;/do_file_commands act-export.txt&#xA;&#xA;You can create an EQ2 macro to trigger this command.  The macro file export will attempt to tabulate the data to make viewing it easier.&#xA;&#xA;You must set the below option with what channel you wish to display the export to beforehand.  Leaving the channel prefix blank will cause the macro file not to function unless the Text Only Formatting options prefix a channel to *every* line." />
 	<string key="helpPanel-cbExFileColumnAlign" value="When enabled, the text export will be aligned into a table where each cell is padded to the length of the longest entry in that column.  It is recommended you use a text formatter such as {NAME10} instead of {name} or that column may have excessive padding." />
 	<string key="helpPanel-cbExGraph" value="When checked, HTML exports will include a main encounter graph." />
@@ -366,6 +367,7 @@
 	<string key="helpPanel-rbSParseFull" value="Full selective parsing should only be used in small groups where there are other groups near by.  When the encounter begins, the settings are locked to that encounter.  Using this feature may cause the ExtDPS calculations to differ from other copies of ACT or other parsers depending on the limiting options they use.  Once an encounter has taken place, you cannot add or remove combatants  to it without reparsing that battle.  Full selective parsing will create data gaps and should not be used while using ACT to analyze battles or statistics as it will not show a complete &quot;picture&quot; of the encounter." />
 	<string key="helpPanel-SampleType" value="These settings affect how many DPS plots there are along the X-Axis.  If an encounter is one minute long, and Fixed number of DPS samples(6) is selected, there will be six X-Axis plots in 10 second intervals.  If DPS samples every 15 seconds is selected, there will be four DPS plots at 15 second intervals.  Fixed number is useful for keeping a graph readable no matter how long the encounter, and fixed sample durations is useful for comparisons to other time lines." />
 	<string key="helpPanel-tbCharName" value="If a log file is open this setting is ignored; however if ACT is used as an offline parser only, this setting will be used to fill in your name instead of using 'YOU'." />
+	<string key="helpPanel-tbConvertXml" value="You may paste a portion of ACT's configuration file in this textbox and convert it into a snippet.  Someone copying this snippet and clicking the [Import XML] button in the corner will import the contained config settings." />
 	<string key="helpPanel-tbExFileName" value="This export file name is a relative file path to the game folder or may be an absolute path." />
 	<string key="helpPanel-TextFormatAddPreset" value="Save these format options to the drop down list." />
 	<string key="helpPanel-TextFormatAllies" value="Allies formatting string. (First Line Format)" />
@@ -782,6 +784,7 @@
 	<string key="uiOpMisc-logPosition1" value="Reading {0}&#xA;At position: {1:0,0}." />
 	<string key="uiOpMisc-logPosition2a" value=" ({0} lines behind.)" />
 	<string key="uiOpMisc-logPosition3" value=" ({0} CustomTrigger lines behind.)" />
+	<string key="uiOpMisc-logPosition4" value="&#xA;Syncing companion files: " />
 	<string key="uiOpMisc-logResumed" value="Parsing Resumed..." />
 	<string key="uiOptionsImportExport-xmlConverted" value="XML Converted.  The above may be copied as an ACT Config Snippet to paste." />
 	<string key="uiOptionsOdbc-connectSuccess" value="ODBC Connection Succeeded" />