diff --git a/GUI/GarUpdate.cs b/GUI/GarUpdate.cs index 570f982b..42930b6a 100644 --- a/GUI/GarUpdate.cs +++ b/GUI/GarUpdate.cs @@ -33,6 +33,7 @@ using System.Windows; using System.Windows.Input; using System.Xml; using GameRes; +using GARbro.GUI.Strings; namespace GARbro.GUI { @@ -70,7 +71,7 @@ namespace GARbro.GUI { if (e.Error != null) { - SetStatusText (string.Format ("{0} {1}", "Update failed.", e.Error.Message)); + SetStatusText (string.Format ("{0} {1}", guiStrings.MsgUpdateFailed, e.Error.Message)); return; } else if (e.Cancelled) @@ -78,7 +79,7 @@ namespace GARbro.GUI var result = e.Result as GarUpdateInfo; if (null == result) { - SetStatusText ("No updates currently available."); + SetStatusText (guiStrings.MsgNoUpdates); return; } var app_version = Assembly.GetExecutingAssembly().GetName().Version; @@ -87,12 +88,12 @@ namespace GARbro.GUI bool has_db_update = db_version < result.FormatsVersion && CheckAssemblies (result.Assemblies); if (!has_app_update && !has_db_update) { - SetStatusText ("GARbro version is up to date."); + SetStatusText (guiStrings.MsgUpToDate); return; } var dialog = new UpdateDialog (result, has_app_update, has_db_update); dialog.Owner = this; - dialog.FormatsDownload.Click = FormatsDownloadExec; + dialog.FormatsDownload.Click += FormatsDownloadExec; dialog.ShowDialog(); } diff --git a/GUI/MainWindow.xaml b/GUI/MainWindow.xaml index 7d0cbe3b..5caa2549 100644 --- a/GUI/MainWindow.xaml +++ b/GUI/MainWindow.xaml @@ -151,7 +151,7 @@ - + diff --git a/GUI/Strings/guiStrings.Designer.cs b/GUI/Strings/guiStrings.Designer.cs index 6610230a..3829cae0 100644 --- a/GUI/Strings/guiStrings.Designer.cs +++ b/GUI/Strings/guiStrings.Designer.cs @@ -96,6 +96,15 @@ namespace GARbro.GUI.Strings { } } + /// + /// Looks up a localized string similar to _Download. + /// + public static string ButtonDownload { + get { + return ResourceManager.GetString("ButtonDownload", resourceCulture); + } + } + /// /// Looks up a localized string similar to Extract. /// @@ -456,6 +465,15 @@ namespace GARbro.GUI.Strings { } } + /// + /// Looks up a localized string similar to Release notes. + /// + public static string LabelReleaseNotes { + get { + return ResourceManager.GetString("LabelReleaseNotes", resourceCulture); + } + } + /// /// Looks up a localized string similar to Skip incovertible files.. /// @@ -474,6 +492,15 @@ namespace GARbro.GUI.Strings { } } + /// + /// Looks up a localized string similar to _Check for updates.... + /// + public static string MenuCheckUpdates { + get { + return ResourceManager.GetString("MenuCheckUpdates", resourceCulture); + } + } + /// /// Looks up a localized string similar to E_xit. /// @@ -771,6 +798,15 @@ namespace GARbro.GUI.Strings { } } + /// + /// Looks up a localized string similar to No updates currently available.. + /// + public static string MsgNoUpdates { + get { + return ResourceManager.GetString("MsgNoUpdates", resourceCulture); + } + } + /// /// Looks up a localized string similar to File {0} ///already exists. @@ -837,6 +873,33 @@ namespace GARbro.GUI.Strings { } } + /// + /// Looks up a localized string similar to Formats database update available.. + /// + public static string MsgUpdateAvailable { + get { + return ResourceManager.GetString("MsgUpdateAvailable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Update check failed.. + /// + public static string MsgUpdateFailed { + get { + return ResourceManager.GetString("MsgUpdateFailed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to GARbro version is up to date.. + /// + public static string MsgUpToDate { + get { + return ResourceManager.GetString("MsgUpToDate", resourceCulture); + } + } + /// /// Looks up a localized string similar to Version {0}. /// @@ -1093,6 +1156,15 @@ namespace GARbro.GUI.Strings { } } + /// + /// Looks up a localized string similar to New version available:. + /// + public static string TextNewVersion { + get { + return ResourceManager.GetString("TextNewVersion", resourceCulture); + } + } + /// /// Looks up a localized string similar to Archive parameters. /// @@ -1138,6 +1210,15 @@ namespace GARbro.GUI.Strings { } } + /// + /// Looks up a localized string similar to Visit download page. + /// + public static string TextVisitPage { + get { + return ResourceManager.GetString("TextVisitPage", resourceCulture); + } + } + /// /// Looks up a localized string similar to Either WAV, MP3 or OGG. /// diff --git a/GUI/Strings/guiStrings.ko-KR.resx b/GUI/Strings/guiStrings.ko-KR.resx index 8deaee9a..2e390101 100644 --- a/GUI/Strings/guiStrings.ko-KR.resx +++ b/GUI/Strings/guiStrings.ko-KR.resx @@ -493,4 +493,40 @@ 대상폴더에 파일 {0} 이(가) 이미 존재합니다. - + + Download + translation pending + + + Release notes + translation pending + + + Check for updates... + translation pending + + + No updates currently available. + translation pending + + + Formats database update available. + translation pending + + + Update check failed. + translation pending + + + GARbro version is up to date. + translation pending + + + New version available: + translation pending + + + Visit download page + translation pending + + \ No newline at end of file diff --git a/GUI/Strings/guiStrings.resx b/GUI/Strings/guiStrings.resx index 8c89f810..d3ecaa5e 100644 --- a/GUI/Strings/guiStrings.resx +++ b/GUI/Strings/guiStrings.resx @@ -497,4 +497,31 @@ Overwrite? File {0} already exists in the destination folder. + + _Download + + + Release notes + + + _Check for updates... + + + No updates currently available. + + + Formats database update available. + + + Update check failed. + + + GARbro version is up to date. + + + New version available: + + + Visit download page + \ No newline at end of file diff --git a/GUI/Strings/guiStrings.ru-RU.resx b/GUI/Strings/guiStrings.ru-RU.resx index cb36b5fe..26b120b3 100644 --- a/GUI/Strings/guiStrings.ru-RU.resx +++ b/GUI/Strings/guiStrings.ru-RU.resx @@ -518,4 +518,31 @@ Файл с именем {0} уже существует. + + Обновить + + + Примечания к выпуску + + + Проверить обновления... + + + Обновления недоступны. + + + Доступна обновлённая база форматов. + + + Сбой проверки обновлений. + + + Установлена актуальная версия GARbro. + + + Доступна новая версия: + + + Перейти на страницу загрузки + \ No newline at end of file diff --git a/GUI/Strings/guiStrings.zh-Hans.resx b/GUI/Strings/guiStrings.zh-Hans.resx index a602e8fc..06845701 100644 --- a/GUI/Strings/guiStrings.zh-Hans.resx +++ b/GUI/Strings/guiStrings.zh-Hans.resx @@ -505,4 +505,40 @@ 文件{0}已经存在。 + + Download + translation pending + + + Release notes + translation pending + + + Check for updates... + translation pending + + + No updates currently available. + translation pending + + + Formats database update available. + translation pending + + + Update check failed. + translation pending + + + GARbro version is up to date. + translation pending + + + New version available: + translation pending + + + Visit download page + translation pending + \ No newline at end of file diff --git a/GUI/UpdateDialog.xaml b/GUI/UpdateDialog.xaml index d9054837..de18c5ac 100644 --- a/GUI/UpdateDialog.xaml +++ b/GUI/UpdateDialog.xaml @@ -39,22 +39,22 @@ IN THE SOFTWARE. - + - + - + - -