diff options
| author | Sverrir Sigmundarson <[email protected]> | 2015-11-18 23:57:03 +0100 |
|---|---|---|
| committer | Sverrir Sigmundarson <[email protected]> | 2015-11-21 01:16:57 +0100 |
| commit | 9e107ee850e396044c4c80c3257a4623995b88b3 (patch) | |
| tree | 9abf59556c18f9c24c3841a9573fc78f0de62992 /win/CS/HandBrakeWPF/Properties | |
| parent | 6c731e1353608b909ce1e721e9b31b2fea6f932c (diff) | |
Fixing importing and exporting of chapters via CSV files. Adding proper handling of escape characters, handling of most common alternative value separators. Fixing resource leakage via undisposed FileDialogs.
Diffstat (limited to 'win/CS/HandBrakeWPF/Properties')
| -rw-r--r-- | win/CS/HandBrakeWPF/Properties/Resources.Designer.cs | 38 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Properties/Resources.resx | 14 |
2 files changed, 50 insertions, 2 deletions
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs index 643843132..b53620537 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs +++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs @@ -448,7 +448,7 @@ namespace HandBrakeWPF.Properties { }
/// <summary>
- /// Looks up a localized string similar to Unable to save Chapter Makrers file! .
+ /// Looks up a localized string similar to Unable to save Chapter Markers file! .
/// </summary>
public static string ChaptersViewModel_UnableToExportChaptersWarning {
get {
@@ -457,6 +457,42 @@ namespace HandBrakeWPF.Properties { }
/// <summary>
+ /// Looks up a localized string similar to First column in chapters file must only contain a integer number value higher than zero (0).
+ /// </summary>
+ public static string ChaptersViewModel_UnableToImportChaptersFirstColumnMustContainOnlyIntegerNumber {
+ get {
+ return ResourceManager.GetString("ChaptersViewModel_UnableToImportChaptersFirstColumnMustContainOnlyIntegerNumber", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to All lines in chapters file must have at least 2 columns of data.
+ /// </summary>
+ public static string ChaptersViewModel_UnableToImportChaptersLineDoesNotHaveAtLeastTwoColumns {
+ get {
+ return ResourceManager.GetString("ChaptersViewModel_UnableToImportChaptersLineDoesNotHaveAtLeastTwoColumns", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Line {0} is invalid. Nothing will be imported..
+ /// </summary>
+ public static string ChaptersViewModel_UnableToImportChaptersMalformedLineMsg {
+ get {
+ return ResourceManager.GetString("ChaptersViewModel_UnableToImportChaptersMalformedLineMsg", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Unable to import chapter file.
+ /// </summary>
+ public static string ChaptersViewModel_UnableToImportChaptersWarning {
+ get {
+ return ResourceManager.GetString("ChaptersViewModel_UnableToImportChaptersWarning", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Confirm.
/// </summary>
public static string Confirm {
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx index 0ce417b62..a8b2cb469 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.resx +++ b/win/CS/HandBrakeWPF/Properties/Resources.resx @@ -584,7 +584,7 @@ The Activity log may have further information.</value> <value>Switch Back To Tracks</value>
</data>
<data name="ChaptersViewModel_UnableToExportChaptersWarning" xml:space="preserve">
- <value>Unable to save Chapter Makrers file! </value>
+ <value>Unable to save Chapter Markers file! </value>
</data>
<data name="ChaptersViewModel_UnableToExportChaptersMsg" xml:space="preserve">
<value>Chapter marker names will NOT be saved in your encode.</value>
@@ -739,4 +739,16 @@ Your old presets file was archived to:</value> <data name="MainViewModel_LowDiskSpaceWarning" xml:space="preserve">
<value>Warning, you are running low on disk space. HandBrake will not be able to complete this encode if you run out of space. </value>
</data>
+ <data name="ChaptersViewModel_UnableToImportChaptersMalformedLineMsg" xml:space="preserve">
+ <value>Line {0} is invalid. Nothing will be imported.</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersWarning" xml:space="preserve">
+ <value>Unable to import chapter file</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersLineDoesNotHaveAtLeastTwoColumns" xml:space="preserve">
+ <value>All lines in chapters file must have at least 2 columns of data</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersFirstColumnMustContainOnlyIntegerNumber" xml:space="preserve">
+ <value>First column in chapters file must only contain a integer number value higher than zero (0)</value>
+ </data>
</root>
\ No newline at end of file |