diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index 494399b3c..caebee28c 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -7382,7 +7382,7 @@ namespace Nikse.SubtitleEdit.Forms } catch (Exception exception) { - MessageBox.Show("Unable to connect to server: " + exception.Message); + MessageBox.Show(string.Format(_language.NetworkUnableToConnectToServer, exception.Message)); _networkSession.TimerStop(); if (_networkChat != null && !_networkChat.IsDisposed) { @@ -7419,7 +7419,7 @@ namespace Nikse.SubtitleEdit.Forms { _networkChat.AddUser(update.User); } - _networkSession.AppendToLog("New user: " + update.User.UserName + " (" + update.User.Ip + ")"); + _networkSession.AppendToLog(string.Format(_language.NetworkNewUser, update.User.UserName, update.User.Ip )); } else if (update.Action == "MSG") { @@ -7434,7 +7434,7 @@ namespace Nikse.SubtitleEdit.Forms { _networkChat.AddChatMessage(update.User, update.Text); } - _networkSession.AppendToLog("Message: " + update.User.UserName + " (" + update.User.Ip + "): " + update.Text); + _networkSession.AppendToLog(string.Format(_language.NetworkMessage, update.User.UserName, update.User.Ip, update.Text)); } else if (update.Action == "DEL") { @@ -7442,7 +7442,7 @@ namespace Nikse.SubtitleEdit.Forms _subtitle.Paragraphs.RemoveAt(update.Index); if (_networkSession.LastSubtitle != null) _networkSession.LastSubtitle.Paragraphs.RemoveAt(update.Index); - _networkSession.AppendToLog("Delete: " + update.User.UserName + " (" + update.User.Ip + "): Index=" + update.Index.ToString()); + _networkSession.AppendToLog(string.Format(_language.NetworkDelete, update.User.UserName , update.User.Ip, update.Index.ToString())); _networkSession.AdjustUpdateLogToDelete(update.Index); _change = true; @@ -7470,7 +7470,7 @@ namespace Nikse.SubtitleEdit.Forms _subtitle.Paragraphs.Insert(update.Index, p); if (_networkSession.LastSubtitle != null) _networkSession.LastSubtitle.Paragraphs.Insert(update.Index, new Paragraph(p)); - _networkSession.AppendToLog("Insert: " + update.User.UserName + " (" + update.User.Ip + "): Index=" + update.Index.ToString() + ", Text=" + update.Text.Replace(Environment.NewLine, Configuration.Settings.General.ListViewLineSeparatorString)); + _networkSession.AppendToLog(string.Format(_language.NetworkInsert, update.User.UserName, update.User.Ip, update.Index.ToString(), update.Text.Replace(Environment.NewLine, Configuration.Settings.General.ListViewLineSeparatorString))); _networkSession.AddToWsUserLog(update.User, update.Index, update.Action, false); updateListViewStatus = true; _networkSession.AdjustUpdateLogToInsert(update.Index); @@ -7500,6 +7500,7 @@ namespace Nikse.SubtitleEdit.Forms p.EndTime.TotalMilliseconds = update.EndMilliseconds; p.Text = update.Text; SubtitleListview1.SetTimeAndText(update.Index, p); + _networkSession.AppendToLog(string.Format(_language.NetworkUpdate, update.User.UserName, update.User.Ip, update.Index.ToString(), update.Text.Replace(Environment.NewLine, Configuration.Settings.General.ListViewLineSeparatorString))); _networkSession.AddToWsUserLog(update.User, update.Index, update.Action, true); updateListViewStatus = true; } @@ -7532,7 +7533,7 @@ namespace Nikse.SubtitleEdit.Forms if (removeUser != null) _networkSession.Users.Remove(removeUser); - _networkSession.AppendToLog("Bye: " + update.User.UserName + " (" + update.User.Ip + ")"); + _networkSession.AppendToLog(string.Format(_language.NetworkByeUser, update.User.UserName, update.User.Ip)); } else { diff --git a/src/Logic/Language.cs b/src/Logic/Language.cs index 9f8cb1a50..5294ff55c 100644 --- a/src/Logic/Language.cs +++ b/src/Logic/Language.cs @@ -68,7 +68,7 @@ namespace Nikse.SubtitleEdit.Logic General = new LanguageStructure.General { Title = "Subtitle Edit", - Version = "3.0", + Version = "3.1", TranslatedBy = "", CultureName = "en-US", OK = "&OK", @@ -645,6 +645,13 @@ namespace Nikse.SubtitleEdit.Logic BeforeSetStartTimeAndOffsetTheRest = "Before set start time and offset the rest", ContinueWithCurrentSpellCheck = "Continue with current spell check?", CharactersPerSecond = "Chars/sec: {0:0.00}", + NetworkMessage = "New message: {0} ({1}): {2}", + NetworkUpdate = "Line updated: {0} ({1}): Index={2}, Text={3}", + NetworkInsert = "Line inserted: {0} ({1}): Index={2}, Text={3}", + NetworkDelete = "Line deleted: {0} ({1}): Index={2}", + NetworkNewUser = "New user: {0} ({1})", + NetworkByeUser = "Bye {0} ({1})", + NetworkUnableToConnectToServer = "Unable to connect to server: {0}", Menu = new LanguageStructure.Main.MainMenu { diff --git a/src/Logic/LanguageStructure.cs b/src/Logic/LanguageStructure.cs index 4d188aa28..7d0867e24 100644 --- a/src/Logic/LanguageStructure.cs +++ b/src/Logic/LanguageStructure.cs @@ -574,6 +574,13 @@ public string BeforeSetStartTimeAndOffsetTheRest { get; set; } public string ContinueWithCurrentSpellCheck { get; set; } public string CharactersPerSecond { get; set; } + public string NetworkMessage { get; set; } + public string NetworkUpdate { get; set; } + public string NetworkInsert { get; set; } + public string NetworkDelete { get; set; } + public string NetworkNewUser { get; set; } + public string NetworkByeUser { get; set; } + public string NetworkUnableToConnectToServer { get; set; } public class MainMenu { diff --git a/src/Resources/da-DK.xml b/src/Resources/da-DK.xml index 2118f3377..df2b385ab 100644 --- a/src/Resources/da-DK.xml +++ b/src/Resources/da-DK.xml @@ -725,6 +725,13 @@ Fortsæt? Før sæt start tid og juster resten Fortsæt med aktuelle stavekontrol? Bogstav/sek: {0:0.00} + Ny meddelelse: {0} ({1}): {2} + Linje opdateret: {0} ({1}): Indeks = {2}, Tekst = {3} + Linje indsat: {0} ({1}): Indeks = {2}, Tekst = {3} + Linje slettet: {0} ({1}): Indeks = {2} + Ny bruger: {0} ({1}) + Bye {0} ({1}) + Stand til at forbinde til serveren: {0} Vælg undertekst fra Matroska fil diff --git a/src/Resources/da-DK.xml.zip b/src/Resources/da-DK.xml.zip index 54a52a5c4..a8717d866 100644 Binary files a/src/Resources/da-DK.xml.zip and b/src/Resources/da-DK.xml.zip differ