diff --git a/AddCamera.cs b/AddCamera.cs
index add1269b..529cb41c 100644
--- a/AddCamera.cs
+++ b/AddCamera.cs
@@ -589,11 +589,13 @@ private void RenderResources()
             rdoMotion.Text = LocRm.GetString("WhenMotionDetected");
             rdoContinuous.Text = LocRm.GetString("Continuous");
             chkMovement.Text = LocRm.GetString("AlertsEnabled");
+            chkMessaging.Text = LocRm.GetString("Messaging");
             chkPublic.Text = LocRm.GetString("PubliccheckThisToMakeYour");
             rdoRecordDetect.Text = LocRm.GetString("RecordOnMovementDetection");
             rdoRecordAlert.Text = LocRm.GetString("RecordOnAlert");
             rdoNoRecord.Text = LocRm.GetString("NoRecord");
             chkSchedule.Text = LocRm.GetString("ScheduleCamera");
+            tabPage6.Text = LocRm.GetString("Storage");
             chkSuppressNoise.Text = LocRm.GetString("SupressNoise");
             chkTimelapse.Text = LocRm.GetString("TimelapseEnabled");
             gbZones.Text = LocRm.GetString("DetectionZones");
diff --git a/AddMicrophone.cs b/AddMicrophone.cs
index b7e8a7af..634fa526 100644
--- a/AddMicrophone.cs
+++ b/AddMicrophone.cs
@@ -249,6 +249,7 @@ private void RenderResources()
             rdoNoRecord.Text = LocRm.GetString("NoRecord");
             chkSchedule.Text = LocRm.GetString("ScheduleMicrophone");
             chkSound.Text = LocRm.GetString("AlertsEnabled");
+            chkMessaging.Text = LocRm.GetString("Messaging");
             label1.Text = LocRm.GetString("Name");
             label12.Text = LocRm.GetString("MaxRecordTime");
             label6.Text = LocRm.GetString("MinRecordTime");
@@ -266,7 +267,8 @@ private void RenderResources()
             label48.Text = LocRm.GetString("Seconds");
             label5.Text = LocRm.GetString("Seconds");
             label15.Text = LocRm.GetString("Intervals");
-            
+            tabPage5.Text = LocRm.GetString("Storage");
+
             lblAudioSource.Text = LocRm.GetString("Audiosource");
             rdoMovement.Text = LocRm.GetString("IsDetectedFor");
             rdoNoMovement.Text = LocRm.GetString("IsNotDetectedFor");
diff --git a/LocRM.cs b/LocRM.cs
index 4fc44a40..34244dcc 100644
--- a/LocRM.cs
+++ b/LocRM.cs
@@ -63,7 +63,7 @@ public static string GetString(string identifier, string languageCode)
             identifier = identifier.ToLower();
             try
             {
-                return Res[languageCode+"."+identifier.ToLower()].ToString();
+                return Res[languageCode+"."+identifier].ToString();
             }
             catch (NullReferenceException)
             {
diff --git a/MainForm.cs b/MainForm.cs
index 39d47c90..d01590d8 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -1622,6 +1622,8 @@ internal void RenderResources()
             _switchAllOffToolStripMenuItem.Text = LocRm.GetString("SwitchAllOff");
             _switchAllOnToolStripMenuItem.Text = LocRm.GetString("SwitchAllOn");
             _takePhotoToolStripMenuItem.Text = LocRm.GetString("TakePhoto");
+            pTZToolStripMenuItem.Text = LocRm.GetString("PTZ");
+            pTZControllerToolStripMenuItem1.Text = LocRm.GetString("PTZController");
             _thruWebsiteToolStripMenuItem.Text = LocRm.GetString("Online");
             _toolStripButton1.Text = LocRm.GetString("WebSettings");
             _toolStripButton4.Text = LocRm.GetString("settings");
diff --git a/RemoteCommands.cs b/RemoteCommands.cs
index 055b65d3..8c1ade04 100644
--- a/RemoteCommands.cs
+++ b/RemoteCommands.cs
@@ -25,7 +25,8 @@ private void RenderResources()
         {
             Text = LocRm.GetString("RemoteCommands");
             btnAddCommand.Text = LocRm.GetString("Add");
-            btnDelete.Text = LocRm.GetString("Delete");            
+            btnEditCommand.Text = LocRm.GetString("Edit");
+            btnDelete.Text = LocRm.GetString("Delete");
             label45.Text = LocRm.GetString("forExamples");
             label82.Text = LocRm.GetString("YouCanTriggerRemoteComman");
             linkLabel3.Text = LocRm.GetString("Reset");
diff --git a/Settings.cs b/Settings.cs
index 1f6e8336..f4bac38f 100644
--- a/Settings.cs
+++ b/Settings.cs
@@ -672,8 +672,8 @@ private void RenderResources()
             label63.Text = LocRm.GetString("Servers");
             chkOpenGrabs.Text = LocRm.GetString("OpenImagesAfterSaving");
             chkEnableLogging.Text = LocRm.GetString("Enable");
-            numKeepLogs.Text = LocRm.GetString("KeepLogsForDays");
-            numMaxLogSize.Text = LocRm.GetString("MaxFileSizeKB");
+            label65.Text = LocRm.GetString("KeepLogsForDays");
+            label66.Text = LocRm.GetString("MaxFileSizeKB");
             llblHelp.Visible = linkLabel1.Visible = linkLabel2.Visible = Helper.HasFeature(Enums.Features.View_Ispy_Links);
         }
 
diff --git a/XML/Translations.xml b/XML/Translations.xml
index d9416764..d0a99d6d 100644
Binary files a/XML/Translations.xml and b/XML/Translations.xml differ