Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml
===================================================================
diff -u -r25650e95ca7f75f3e9b1a367bb8782b602d90bc2 -re63a6c37c6df68f5af5f7bb02b2affc6876e4bee
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision 25650e95ca7f75f3e9b1a367bb8782b602d90bc2)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml	(.../MainWindow.xaml)	(revision e63a6c37c6df68f5af5f7bb02b2affc6876e4bee)
@@ -78,25 +78,25 @@
     <metro:MetroWindow.LeftWindowCommands>
         <metro:WindowCommands>
             <Button Style="{StaticResource WindowCommandsButtonStyle}"
-                    ToolTip="{x:Static properties:Resources.Ribbon_Command_New}"
+                    ToolTip="{x:Static properties:Resources.WindowCommands_New_ToolTip}"
                     AutomationProperties.AutomationId="WindowCommandsNewProject"
                     Click="OnFileNewClicked">
                 <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE93C;"/>
             </Button>
             <Button Style="{StaticResource WindowCommandsButtonStyle}"
-                    ToolTip="{x:Static properties:Resources.Ribbon_Command_Save}"
+                    ToolTip="{x:Static properties:Resources.WindowCommands_Save_ToolTip}"
                     AutomationProperties.AutomationId="WindowCommandsSaveProject"
                     Click="OnFileSaveClicked">
                 <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE93E;"/>
             </Button>
             <Button Style="{StaticResource WindowCommandsButtonStyle}"
-                    ToolTip="{x:Static properties:Resources.Ribbon_Command_Save_As}"
+                    ToolTip="{x:Static properties:Resources.WindowCommands_SaveAs_ToolTip}"
                     AutomationProperties.AutomationId="WindowCommandsSaveProjectAs"
                     Click="OnFileSaveAsClicked">
                 <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE940;"/>
             </Button>
             <Button Style="{StaticResource WindowCommandsButtonStyle}"
-                    ToolTip="{x:Static properties:Resources.Ribbon_Command_Open}"
+                    ToolTip="{x:Static properties:Resources.WindowCommands_Open_ToolTip}"
                     AutomationProperties.AutomationId= "WindowCommandsOpenProject"
                     Click="OnFileOpenClicked">
                 <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE93D;"/>
@@ -108,7 +108,7 @@
         <DockPanel>
             <StackPanel DockPanel.Dock="Top" Height="100" Background="{StaticResource MainButtonBarBackgroundBrush}" Orientation="Horizontal">
                 <Button Style="{StaticResource MainButtonBarButtonStyle}"
-                        Tag="Project"
+                        Tag="{x:Static properties:Resources.MainButtonBar_Project_DisplayName}"
                         AutomationProperties.AutomationId="MainButtonBarProject">
                     <TextBlock Style="{StaticResource ButtonLargeIconStyle}"
                                Text="&#xE949;"/>
@@ -148,56 +148,59 @@
             <DockPanel Height="30" DockPanel.Dock="Bottom" Style="{StaticResource PanelBackgroundWindowTitleStyle}">
                 <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
                     <ToggleButton Style="{StaticResource ViewStateBarToggleButtonStyle}"
+                                  ToolTip="{x:Static properties:Resources.ViewStateBar_ProjectExplorer_ToolTip}"
                                   AutomationProperties.AutomationId="ViewStateButtonBarShowProjectExplorer">
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE95B;"/>
                     </ToggleButton>
                     <ToggleButton Name="ButtonShowProperties"
                                   Style="{StaticResource ViewStateBarToggleButtonStyle}"
-                                  ToolTip="{x:Static properties:Resources.Ribbon_Properties}"
+                                  ToolTip="{x:Static properties:Resources.ViewStateBar_Properties_ToolTip}"
                                   Click="ButtonShowProperties_Click"
                                   AutomationProperties.AutomationId="ViewStateButtonBarShowProperties">
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE945;"/>
                     </ToggleButton>
                     <ToggleButton Name="ButtonShowMessages"
                                   Style="{StaticResource ViewStateBarToggleButtonStyle}"
-                                  ToolTip="{x:Static properties:Resources.Ribbon_Messages}"
+                                  ToolTip="{x:Static properties:Resources.ViewStateBar_Messages_ToolTip}"
                                   Click="ButtonShowMessages_Click"
                                   AutomationProperties.AutomationId="ViewStateButtonBarShowMessages">
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE942;"/>
                     </ToggleButton>
                     <ToggleButton Style="{StaticResource ViewStateBarToggleButtonStyle}"
+                                  ToolTip="{x:Static properties:Resources.ViewStateBar_Map_ToolTip}"
                                   AutomationProperties.AutomationId="ViewStateButtonBarShowMap">
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE94C;"/>
                     </ToggleButton>
                     <ToggleButton Style="{StaticResource ViewStateBarToggleButtonStyle}"
+                                  ToolTip="{x:Static properties:Resources.ViewStateBar_Chart_ToolTip}"
                                   AutomationProperties.AutomationId="ViewStateButtonBarShowChart">
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE943;"/>
                     </ToggleButton>
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal" DockPanel.Dock="Left" Margin="40 0 0 0">
                     <Button Style="{StaticResource ViewStateBarButtonStyle}"
-                            ToolTip="{x:Static properties:Resources.Ribbon_Show_Log}"
+                            ToolTip="{x:Static properties:Resources.ViewStateBar_ShowLog_ToolTip}"
                             Click="OnFileHelpShowLog_Clicked"
                             AutomationProperties.AutomationId="ViewStateButtonBarShowLog">
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE946;"/>
                     </Button>
                     <Button Name="FileManualButton"
                             Style="{StaticResource ViewStateBarButtonStyle}"
-                            ToolTip="{x:Static properties:Resources.Ribbon_Open_Manual}"
+                            ToolTip="{x:Static properties:Resources.ViewStateBar_OpenManual_ToolTip}"
                             Click="OnFileManual_Clicked"
                             x:FieldModifier="private"
                             AutomationProperties.AutomationId="ViewStateButtonBarOpenManual">
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE92D;"/>
                     </Button>
                     <Button Style="{StaticResource ViewStateBarButtonStyle}"
-                            ToolTip="{x:Static properties:Resources.Ribbon_About}"
+                            ToolTip="{x:Static properties:Resources.ViewStateBar_About_ToolTip}"
                             Click="OnAboutDialog_Clicked"
                             AutomationProperties.AutomationId="ViewStateButtonBarShowAbout">
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE921;"/>
                     </Button>
                     <Button Style="{StaticResource ViewStateBarButtonStyle}"
-                            ToolTip="{x:Static properties:Resources.Ribbon_Exit}"
+                            ToolTip="{x:Static properties:Resources.ViewStateBar_Exit_ToolTip}"
                             Click="OnFileExitClicked"
                             AutomationProperties.AutomationId="ViewStateButtonBarExit">
                         <TextBlock Style="{StaticResource ButtonIconStyle}" Text="&#xE901;"/>
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r54c889ff0f67cd16eb8371a7e9c468444a4732ba -re63a6c37c6df68f5af5f7bb02b2affc6876e4bee
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 54c889ff0f67cd16eb8371a7e9c468444a4732ba)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision e63a6c37c6df68f5af5f7bb02b2affc6876e4bee)
@@ -415,7 +415,7 @@
                 SupportPhoneNumber = settings.FixedSettings.SupportPhoneNumber,
                 AllowsTransparency = false,
                 WindowStyle = WindowStyle.SingleBorderWindow,
-                Title = Properties.Resources.Ribbon_About,
+                Title = Properties.Resources.ViewStateBar_About_ToolTip,
                 Icon = Imaging.CreateBitmapSourceFromHBitmap(Properties.Resources.information.GetHbitmap(),
                                                              IntPtr.Zero,
                                                              Int32Rect.Empty,
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -ra5e4ebcce8619e8154972b937bfde6495ade4836 -re63a6c37c6df68f5af5f7bb02b2affc6876e4bee
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision a5e4ebcce8619e8154972b937bfde6495ade4836)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision e63a6c37c6df68f5af5f7bb02b2affc6876e4bee)
@@ -1018,6 +1018,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Project.
+        /// </summary>
+        public static string MainButtonBar_Project_DisplayName {
+            get {
+                return ResourceManager.GetString("MainButtonBar_Project_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Berichten.
         /// </summary>
         public static string Messages {
@@ -1241,293 +1250,311 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Over.
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
-        public static string Ribbon_About {
+        public static System.Drawing.Icon Riskeer {
             get {
-                return ResourceManager.GetString("Ribbon_About", resourceCulture);
+                object obj = ResourceManager.GetObject("Riskeer", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Nieuw.
+        ///   Looks up a localized string similar to Opslaan als.
         /// </summary>
-        public static string Ribbon_Command_New {
+        public static string SaveFileDialog_Title {
             get {
-                return ResourceManager.GetString("Ribbon_Command_New", resourceCulture);
+                return ResourceManager.GetString("SaveFileDialog_Title", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Openen.
+        ///   Looks up a localized string similar to Initialiseren van opgeslagen project.
         /// </summary>
-        public static string Ribbon_Command_Open {
+        public static string SaveProjectActivity_ProgressTextStepName_InitializeSavedProject {
             get {
-                return ResourceManager.GetString("Ribbon_Command_Open", resourceCulture);
+                return ResourceManager.GetString("SaveProjectActivity_ProgressTextStepName_InitializeSavedProject", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Opslaan.
+        ///   Looks up a localized string similar to Project opslaan.
         /// </summary>
-        public static string Ribbon_Command_Save {
+        public static string SaveProjectActivity_ProgressTextStepName_SavingProject {
             get {
-                return ResourceManager.GetString("Ribbon_Command_Save", resourceCulture);
+                return ResourceManager.GetString("SaveProjectActivity_ProgressTextStepName_SavingProject", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Opslaan Als.
+        ///   Looks up a localized string similar to Voorbereidingen opslaan.
         /// </summary>
-        public static string Ribbon_Command_Save_As {
+        public static string SaveProjectActivity_ProgressTextStepName_StagingProject {
             get {
-                return ResourceManager.GetString("Ribbon_Command_Save_As", resourceCulture);
+                return ResourceManager.GetString("SaveProjectActivity_ProgressTextStepName_StagingProject", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Afsluiten.
+        ///   Looks up a localized string similar to Opslaan van bestaand project.
         /// </summary>
-        public static string Ribbon_Exit {
+        public static string SaveProjectActivity_Save_existing_project {
             get {
-                return ResourceManager.GetString("Ribbon_Exit", resourceCulture);
+                return ResourceManager.GetString("SaveProjectActivity_Save_existing_project", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Berichten.
+        ///   Looks up a localized string similar to Opslaan van project.
         /// </summary>
-        public static string Ribbon_Messages {
+        public static string SaveProjectActivity_Save_project {
             get {
-                return ResourceManager.GetString("Ribbon_Messages", resourceCulture);
+                return ResourceManager.GetString("SaveProjectActivity_Save_project", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Gebruikershandleiding Openen.
+        ///   Looks up a localized string similar to Fout.
         /// </summary>
-        public static string Ribbon_Open_Manual {
+        public static string SelectItemDialog_buttonOk_Click_Error {
             get {
-                return ResourceManager.GetString("Ribbon_Open_Manual", resourceCulture);
+                return ResourceManager.GetString("SelectItemDialog_buttonOk_Click_Error", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Eigenschappen.
+        ///   Looks up a localized string similar to Kies een type.
         /// </summary>
-        public static string Ribbon_Properties {
+        public static string SelectItemDialog_buttonOk_Click_Please_select_an_item {
             get {
-                return ResourceManager.GetString("Ribbon_Properties", resourceCulture);
+                return ResourceManager.GetString("SelectItemDialog_buttonOk_Click_Please_select_an_item", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Log Tonen.
+        ///   Looks up a localized string similar to - (Standaard).
         /// </summary>
-        public static string Ribbon_Show_Log {
+        public static string SelectViewDialog_listBox_DrawItem_Default {
             get {
-                return ResourceManager.GetString("Ribbon_Show_Log", resourceCulture);
+                return ResourceManager.GetString("SelectViewDialog_listBox_DrawItem_Default", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Help.
+        ///   Looks up a localized string similar to Website.
         /// </summary>
-        public static string Ribbon_TabItem_Help {
+        public static string SplashScreen_SupportEmail {
             get {
-                return ResourceManager.GetString("Ribbon_TabItem_Help", resourceCulture);
+                return ResourceManager.GetString("SplashScreen_SupportEmail", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        ///   Looks up a localized string similar to Telefoon.
         /// </summary>
-        public static System.Drawing.Icon Riskeer {
+        public static string SplashScreen_SupportPhoneNumber {
             get {
-                object obj = ResourceManager.GetObject("Riskeer", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
+                return ResourceManager.GetString("SplashScreen_SupportPhoneNumber", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Opslaan als.
+        ///   Looks up a localized string similar to Voor vragen: Helpdesk Water..
         /// </summary>
-        public static string SaveFileDialog_Title {
+        public static string SplashScreen_SupportTitle {
             get {
-                return ResourceManager.GetString("SaveFileDialog_Title", resourceCulture);
+                return ResourceManager.GetString("SplashScreen_SupportTitle", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Initialiseren van opgeslagen project.
+        ///   Looks up a localized string similar to Versie.
         /// </summary>
-        public static string SaveProjectActivity_ProgressTextStepName_InitializeSavedProject {
+        public static string SplashScreen_Version {
             get {
-                return ResourceManager.GetString("SaveProjectActivity_ProgressTextStepName_InitializeSavedProject", resourceCulture);
+                return ResourceManager.GetString("SplashScreen_Version", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Project opslaan.
+        ///   Looks up a localized string similar to Project afsluiten.
         /// </summary>
-        public static string SaveProjectActivity_ProgressTextStepName_SavingProject {
+        public static string StorageCommandHandler_ClosingProject_Title {
             get {
-                return ResourceManager.GetString("SaveProjectActivity_ProgressTextStepName_SavingProject", resourceCulture);
+                return ResourceManager.GetString("StorageCommandHandler_ClosingProject_Title", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Voorbereidingen opslaan.
+        ///   Looks up a localized string similar to Nieuw project aanmaken is geannuleerd..
         /// </summary>
-        public static string SaveProjectActivity_ProgressTextStepName_StagingProject {
+        public static string StorageCommandHandler_NewProject_Creating_new_project_canceled {
             get {
-                return ResourceManager.GetString("SaveProjectActivity_ProgressTextStepName_StagingProject", resourceCulture);
+                return ResourceManager.GetString("StorageCommandHandler_NewProject_Creating_new_project_canceled", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Opslaan van bestaand project.
+        ///   Looks up a localized string similar to Sla wijzigingen in het project op: {0}?.
         /// </summary>
-        public static string SaveProjectActivity_Save_existing_project {
+        public static string StorageCommandHandler_OpenSaveOrDiscardProjectDialog_SaveChangesToProject_0 {
             get {
-                return ResourceManager.GetString("SaveProjectActivity_Save_existing_project", resourceCulture);
+                return ResourceManager.GetString("StorageCommandHandler_OpenSaveOrDiscardProjectDialog_SaveChangesToProject_0", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Opslaan van project.
+        ///   Looks up a localized string similar to &amp;Bijwerken....
         /// </summary>
-        public static string SaveProjectActivity_Save_project {
+        public static string Update {
             get {
-                return ResourceManager.GetString("SaveProjectActivity_Save_project", resourceCulture);
+                return ResourceManager.GetString("Update", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Fout.
+        ///   Looks up a localized string similar to Werk de geïmporteerde gegevens bij met nieuwe gegevens vanuit een bestand..
         /// </summary>
-        public static string SelectItemDialog_buttonOk_Click_Error {
+        public static string Update_ToolTip {
             get {
-                return ResourceManager.GetString("SelectItemDialog_buttonOk_Click_Error", resourceCulture);
+                return ResourceManager.GetString("Update_ToolTip", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Kies een type.
+        ///   Looks up a localized string similar to Bijwerken gegevens.
         /// </summary>
-        public static string SelectItemDialog_buttonOk_Click_Please_select_an_item {
+        public static string UpdateInfo_Default_category {
             get {
-                return ResourceManager.GetString("SelectItemDialog_buttonOk_Click_Please_select_an_item", resourceCulture);
+                return ResourceManager.GetString("UpdateInfo_Default_category", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to - (Standaard).
+        ///   Looks up a localized string similar to Over.
         /// </summary>
-        public static string SelectViewDialog_listBox_DrawItem_Default {
+        public static string ViewStateBar_About_ToolTip {
             get {
-                return ResourceManager.GetString("SelectViewDialog_listBox_DrawItem_Default", resourceCulture);
+                return ResourceManager.GetString("ViewStateBar_About_ToolTip", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Website.
+        ///   Looks up a localized string similar to Grafiek.
         /// </summary>
-        public static string SplashScreen_SupportEmail {
+        public static string ViewStateBar_Chart_ToolTip {
             get {
-                return ResourceManager.GetString("SplashScreen_SupportEmail", resourceCulture);
+                return ResourceManager.GetString("ViewStateBar_Chart_ToolTip", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Telefoon.
+        ///   Looks up a localized string similar to Afsluiten.
         /// </summary>
-        public static string SplashScreen_SupportPhoneNumber {
+        public static string ViewStateBar_Exit_ToolTip {
             get {
-                return ResourceManager.GetString("SplashScreen_SupportPhoneNumber", resourceCulture);
+                return ResourceManager.GetString("ViewStateBar_Exit_ToolTip", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Voor vragen: Helpdesk Water..
+        ///   Looks up a localized string similar to Kaart.
         /// </summary>
-        public static string SplashScreen_SupportTitle {
+        public static string ViewStateBar_Map_ToolTip {
             get {
-                return ResourceManager.GetString("SplashScreen_SupportTitle", resourceCulture);
+                return ResourceManager.GetString("ViewStateBar_Map_ToolTip", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Versie.
+        ///   Looks up a localized string similar to Berichten.
         /// </summary>
-        public static string SplashScreen_Version {
+        public static string ViewStateBar_Messages_ToolTip {
             get {
-                return ResourceManager.GetString("SplashScreen_Version", resourceCulture);
+                return ResourceManager.GetString("ViewStateBar_Messages_ToolTip", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Project afsluiten.
+        ///   Looks up a localized string similar to Gebruikershandleiding Openen.
         /// </summary>
-        public static string StorageCommandHandler_ClosingProject_Title {
+        public static string ViewStateBar_OpenManual_ToolTip {
             get {
-                return ResourceManager.GetString("StorageCommandHandler_ClosingProject_Title", resourceCulture);
+                return ResourceManager.GetString("ViewStateBar_OpenManual_ToolTip", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Nieuw project aanmaken is geannuleerd..
+        ///   Looks up a localized string similar to Projectverkenner.
         /// </summary>
-        public static string StorageCommandHandler_NewProject_Creating_new_project_canceled {
+        public static string ViewStateBar_ProjectExplorer_ToolTip {
             get {
-                return ResourceManager.GetString("StorageCommandHandler_NewProject_Creating_new_project_canceled", resourceCulture);
+                return ResourceManager.GetString("ViewStateBar_ProjectExplorer_ToolTip", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Sla wijzigingen in het project op: {0}?.
+        ///   Looks up a localized string similar to Eigenschappen.
         /// </summary>
-        public static string StorageCommandHandler_OpenSaveOrDiscardProjectDialog_SaveChangesToProject_0 {
+        public static string ViewStateBar_Properties_ToolTip {
             get {
-                return ResourceManager.GetString("StorageCommandHandler_OpenSaveOrDiscardProjectDialog_SaveChangesToProject_0", resourceCulture);
+                return ResourceManager.GetString("ViewStateBar_Properties_ToolTip", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &amp;Bijwerken....
+        ///   Looks up a localized string similar to Log Tonen.
         /// </summary>
-        public static string Update {
+        public static string ViewStateBar_ShowLog_ToolTip {
             get {
-                return ResourceManager.GetString("Update", resourceCulture);
+                return ResourceManager.GetString("ViewStateBar_ShowLog_ToolTip", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Werk de geïmporteerde gegevens bij met nieuwe gegevens vanuit een bestand..
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
-        public static string Update_ToolTip {
+        public static System.Drawing.Icon warning {
             get {
-                return ResourceManager.GetString("Update_ToolTip", resourceCulture);
+                object obj = ResourceManager.GetObject("warning", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Bijwerken gegevens.
+        ///   Looks up a localized string similar to Nieuw.
         /// </summary>
-        public static string UpdateInfo_Default_category {
+        public static string WindowCommands_New_ToolTip {
             get {
-                return ResourceManager.GetString("UpdateInfo_Default_category", resourceCulture);
+                return ResourceManager.GetString("WindowCommands_New_ToolTip", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        ///   Looks up a localized string similar to Openen.
         /// </summary>
-        public static System.Drawing.Icon warning {
+        public static string WindowCommands_Open_ToolTip {
             get {
-                object obj = ResourceManager.GetObject("warning", resourceCulture);
-                return ((System.Drawing.Icon)(obj));
+                return ResourceManager.GetString("WindowCommands_Open_ToolTip", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Opslaan.
+        /// </summary>
+        public static string WindowCommands_Save_ToolTip {
+            get {
+                return ResourceManager.GetString("WindowCommands_Save_ToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Opslaan Als.
+        /// </summary>
+        public static string WindowCommands_SaveAs_ToolTip {
+            get {
+                return ResourceManager.GetString("WindowCommands_SaveAs_ToolTip", resourceCulture);
+            }
+        }
     }
 }
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx
===================================================================
diff -u -ra5e4ebcce8619e8154972b937bfde6495ade4836 -re63a6c37c6df68f5af5f7bb02b2affc6876e4bee
--- Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision a5e4ebcce8619e8154972b937bfde6495ade4836)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision e63a6c37c6df68f5af5f7bb02b2affc6876e4bee)
@@ -121,7 +121,7 @@
     <value>Eigenschappen</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="Ribbon_Command_New" xml:space="preserve">
+  <data name="WindowCommands_New_ToolTip" xml:space="preserve">
     <value>Nieuw</value>
   </data>
   <data name="App_ShutdownIfNotFirstInstance_Cannot_start_multiple_instances_of_Riskeer_Please_close_the_other_instance_first" xml:space="preserve">
@@ -133,7 +133,7 @@
   <data name="App_Unhandled_exception" xml:space="preserve">
     <value>Onbekende kritieke fout opgetreden.</value>
   </data>
-  <data name="Ribbon_Command_Save" xml:space="preserve">
+  <data name="WindowCommands_Save_ToolTip" xml:space="preserve">
     <value>Opslaan</value>
   </data>
   <data name="GuiCore_ActivatePlugins_Exception_during_plugin_gui_deactivation" xml:space="preserve">
@@ -166,25 +166,22 @@
   <data name="PropertiesHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\PropertiesHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Ribbon_Command_Save_As" xml:space="preserve">
+  <data name="WindowCommands_SaveAs_ToolTip" xml:space="preserve">
     <value>Opslaan Als</value>
   </data>
   <data name="SelectViewDialog_listBox_DrawItem_Default" xml:space="preserve">
     <value>- (Standaard)</value>
   </data>
-  <data name="Ribbon_TabItem_Help" xml:space="preserve">
-    <value>Help</value>
-  </data>
   <data name="App_Starting_Riskeer_version_0_by_user_0" xml:space="preserve">
     <value>Riskeer versie {0} wordt gestart door {1}...</value>
   </data>
-  <data name="Ribbon_Messages" xml:space="preserve">
+  <data name="ViewStateBar_Messages_ToolTip" xml:space="preserve">
     <value>Berichten</value>
   </data>
   <data name="Creating_new_project_successful" xml:space="preserve">
     <value>Nieuw project aanmaken is gelukt.</value>
   </data>
-  <data name="Ribbon_Open_Manual" xml:space="preserve">
+  <data name="ViewStateBar_OpenManual_ToolTip" xml:space="preserve">
     <value>Gebruikershandleiding Openen</value>
   </data>
   <data name="folder" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -199,13 +196,13 @@
   <data name="application_import_blue1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\application_import_blue.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Ribbon_Command_Open" xml:space="preserve">
+  <data name="WindowCommands_Open_ToolTip" xml:space="preserve">
     <value>Openen</value>
   </data>
   <data name="GuiCore_ShowSplashScreen_User_has_canceled_start_Exiting" xml:space="preserve">
     <value>Gebruiker heeft het opstarten onderbroken. Het programma wordt afgesloten...</value>
   </data>
-  <data name="Ribbon_About" xml:space="preserve">
+  <data name="ViewStateBar_About_ToolTip" xml:space="preserve">
     <value>Over</value>
   </data>
   <data name="error" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -226,7 +223,7 @@
   <data name="MessageWindowLogAppender_AppendToMessageWindow_Check_log_file_for_more_information_Home_Show_Log" xml:space="preserve">
     <value>Controleer logbestand voor meer informatie ("Bestand"-&gt;"Help"-&gt;"Log tonen").</value>
   </data>
-  <data name="Ribbon_Properties" xml:space="preserve">
+  <data name="ViewStateBar_Properties_ToolTip" xml:space="preserve">
     <value>Eigenschappen</value>
   </data>
   <data name="brick" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -238,7 +235,7 @@
   <data name="GuiUpdateHandler_GetSupportedUpdaterForTargetType_No_updater_available_for_this_item" xml:space="preserve">
     <value>Geen enkele 'Updater' is beschikbaar voor dit element.</value>
   </data>
-  <data name="Ribbon_Exit" xml:space="preserve">
+  <data name="ViewStateBar_Exit_ToolTip" xml:space="preserve">
     <value>Afsluiten</value>
   </data>
   <data name="information" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -247,7 +244,7 @@
   <data name="GuiCore_Only_a_single_instance_of_Riskeer_is_allowed_at_the_same_time_per_process_Make_sure_that_the_previous_instance_was_disposed_correctly_stack_trace_0" xml:space="preserve">
     <value>Slechts één instantie van de Riskeer grafische interface is toegestaan per proces. Zorg ervoor dat de vorige instantie correct opgeruimd is. 'Stack trace': {0}</value>
   </data>
-  <data name="Ribbon_Show_Log" xml:space="preserve">
+  <data name="ViewStateBar_ShowLog_ToolTip" xml:space="preserve">
     <value>Log Tonen</value>
   </data>
   <data name="MessageWindow_MessageWindow_Messages" xml:space="preserve">
@@ -586,4 +583,16 @@
   <data name="warning" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\warning.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="MainButtonBar_Project_DisplayName" xml:space="preserve">
+    <value>Project</value>
+  </data>
+  <data name="ViewStateBar_ProjectExplorer_ToolTip" xml:space="preserve">
+    <value>Projectverkenner</value>
+  </data>
+  <data name="ViewStateBar_Map_ToolTip" xml:space="preserve">
+    <value>Kaart</value>
+  </data>
+  <data name="ViewStateBar_Chart_ToolTip" xml:space="preserve">
+    <value>Grafiek</value>
+  </data>
 </root>
\ No newline at end of file