From 33da62744577b8f04d851a6a09d80928a54dff16 Mon Sep 17 00:00:00 2001
From: Michael Gordeev <mikhailagord@gmail.com>
Date: Tue, 21 Aug 2018 22:36:41 +0300
Subject: [PATCH] Localization development 3

---
 FoxTube/FoxTube.csproj                      |  4 +-
 FoxTube/Pages/MainPage.xaml                 | 43 +++++++---------
 FoxTube/Pages/Settings.xaml                 |  8 +--
 FoxTube/Pages/SettingsPages/About.xaml      | 28 +++++------
 FoxTube/Pages/SettingsPages/General.xaml    | 45 +++++++++--------
 FoxTube/Pages/SettingsPages/Inbox.xaml      | 10 ++--
 FoxTube/Strings/en-US/Main.resw             | 40 ++++++++-------
 FoxTube/Strings/en-US/Settings.resw         |  9 ++--
 FoxTube/Strings/en-US/Settings/About.resw   | 28 +++++------
 FoxTube/Strings/en-US/Settings/General.resw | 56 +++++++++++++--------
 FoxTube/Strings/en-US/Settings/Inbox.resw   | 10 ++--
 FoxTube/Strings/ru-RU/Main.resw             | 40 ++++++++-------
 FoxTube/Strings/ru-RU/Settings.resw         |  8 +--
 FoxTube/Strings/ru-RU/Settings/About.resw   | 28 +++++------
 FoxTube/Strings/ru-RU/Settings/General.resw | 56 +++++++++++++--------
 FoxTube/Strings/ru-RU/Settings/Inbox.resw   | 10 ++--
 16 files changed, 228 insertions(+), 195 deletions(-)

diff --git a/FoxTube/FoxTube.csproj b/FoxTube/FoxTube.csproj
index 55ed4dc..02b02cb 100644
--- a/FoxTube/FoxTube.csproj
+++ b/FoxTube/FoxTube.csproj
@@ -442,7 +442,9 @@
     <PRIResource Include="Strings\en-US\Settings\About.resw" />
     <PRIResource Include="Strings\en-US\Settings\General.resw" />
     <PRIResource Include="Strings\en-US\Settings.resw" />
-    <PRIResource Include="Strings\ru-RU\Main.resw" />
+    <PRIResource Include="Strings\ru-RU\Main.resw">
+      <SubType>Designer</SubType>
+    </PRIResource>
     <PRIResource Include="Strings\en-US\Main.resw" />
   </ItemGroup>
   <ItemGroup>
diff --git a/FoxTube/Pages/MainPage.xaml b/FoxTube/Pages/MainPage.xaml
index 946e5a7..d113eb1 100644
--- a/FoxTube/Pages/MainPage.xaml
+++ b/FoxTube/Pages/MainPage.xaml
@@ -15,19 +15,19 @@
         <NavigationView SelectedItem="toHome" BackRequested="nav_BackRequested" PaneTitle="FoxTube" OpenPaneLength="300" Name="nav" IsPaneOpen="False" SelectionChanged="nav_SelectionChanged">
 
             <NavigationView.MenuItems>
-                <NavigationViewItem x:Uid="home" Icon="Home" Content="Home" Name="toHome"/>
-                <NavigationViewItem x:Uid="myChannel" Icon="Contact" Content="My channel" Name="toChannel" Visibility="Collapsed"/>
-                <NavigationViewItem x:Uid="subscriptions" Icon="People" Content="Subscriptions" Name="toSubscriptions" Visibility="Collapsed"/>
-                <NavigationViewItemHeader x:Uid="myLibrary" Content="My library" Name="libHeader" Visibility="Collapsed"/>
-                <NavigationViewItem x:Uid="history" Content="History" Name="toHistory" Visibility="Collapsed">
+                <NavigationViewItem x:Uid="/Main/home" Icon="Home" Content="Home" Name="toHome"/>
+                <NavigationViewItem x:Uid="/Main/myChannel" Icon="Contact" Content="My channel" Name="toChannel" Visibility="Collapsed"/>
+                <NavigationViewItem x:Uid="/Main/subscriptions" Icon="People" Content="Subscriptions" Name="toSubscriptions" Visibility="Collapsed"/>
+                <NavigationViewItemHeader x:Uid="/Main/myLibrary" Content="My library" Name="libHeader" Visibility="Collapsed"/>
+                <NavigationViewItem x:Uid="/Main/history" Content="History" Name="toHistory" Visibility="Collapsed">
                     <NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xE81C;"/>
                     </NavigationViewItem.Icon>
                 </NavigationViewItem>
-                <NavigationViewItem x:Uid="liked" Icon="Like" Content="Liked videos" Name="toLiked" Visibility="Collapsed"/>
-                <NavigationViewItem x:Uid="later" Icon="Clock" Content="Watch later" Name="toLater" Visibility="Collapsed"/>
-                <NavigationViewItem x:Uid="downloads" Icon="Download" Content="Downloads" Name="toDownloads" Visibility="Collapsed"/>
-                <NavigationViewItemHeader x:Uid="subscriptions" Content="Subscriptions" Name="subsHeader" Visibility="Collapsed"/>
+                <NavigationViewItem x:Uid="/Main/liked" Icon="Like" Content="Liked videos" Name="toLiked" Visibility="Collapsed"/>
+                <NavigationViewItem x:Uid="/Main/later" Icon="Clock" Content="Watch later" Name="toLater" Visibility="Collapsed"/>
+                <NavigationViewItem x:Uid="/Main/downloads" Icon="Download" Content="Downloads" Name="toDownloads" Visibility="Collapsed"/>
+                <NavigationViewItemHeader x:Uid="/Main/subscriptions" Content="Subscriptions" Name="subsHeader" Visibility="Collapsed"/>
             </NavigationView.MenuItems>
 
             <NavigationView.PaneFooter>
@@ -35,22 +35,20 @@
                     <Button Visibility="Visible" Name="feedback" Click="feedback_Click" Height="40" HorizontalAlignment="Stretch" Background="Transparent" HorizontalContentAlignment="Left">
                         <StackPanel Orientation="Horizontal">
                             <FontIcon Glyph="&#xED15;" FontSize="16" Margin="6,0,16,0"/>
-                            <TextBlock x:Uid="feedback" Text="Give a feedback"/>
+                            <TextBlock x:Uid="/Main/feedback" Text="Give a feedback"/>
                         </StackPanel>
                     </Button>
                     <Button Visibility="Collapsed" Name="removeAds" Height="40" HorizontalAlignment="Stretch" Background="Transparent" HorizontalContentAlignment="Left">
                         <StackPanel Orientation="Horizontal">
                             <FontIcon Glyph="&#xE14D;" FontSize="16" Margin="6,0,16,0"/>
-                            <TextBlock x:Uid="adsFree" Text="Remove ads"/>
+                            <TextBlock x:Uid="/Main/adsFree" Text="Remove ads"/>
                         </StackPanel>
                     </Button>
                 </StackPanel>
             </NavigationView.PaneFooter>
 
             <NavigationView.AutoSuggestBox>
-                <AutoSuggestBox x:Name="search" QueryIcon="Find" QuerySubmitted="search_QuerySubmitted" TextChanged="search_TextChanged">
-                    <AutoSuggestBox.PlaceholderText x:Uid="searchPlaceholder">Search</AutoSuggestBox.PlaceholderText>
-                </AutoSuggestBox>
+                <AutoSuggestBox x:Name="search" QueryIcon="Find" QuerySubmitted="search_QuerySubmitted" TextChanged="search_TextChanged" x:Uid="/Main/searchPlaceholder" PlaceholderText="Search"/>
             </NavigationView.AutoSuggestBox>
 
             <NavigationView.Header>
@@ -63,8 +61,7 @@
                     <StackPanel Orientation="Horizontal" Grid.Column="1" Margin="10,25,0,-11">
                         <Button Name="notificationMenu" Click="notificationMenu_Click"
                             FontFamily="Segoe MDL2 Assets" Content="&#xED0D;"
-                            Width="50" Height="50" Background="Transparent">
-                            <ToolTipService.ToolTip x:Uid="notifications">Notifications</ToolTipService.ToolTip>
+                            Width="50" Height="50" Background="Transparent" x:Uid="notifications" ToolTipService.ToolTip="Notifications">
                             <Button.Flyout>
                                 <Flyout Content="{x:Bind notificationsCenter}"/>
                             </Button.Flyout>
@@ -72,24 +69,22 @@
 
                         <Button Name="account"
                         FontFamily="Segoe MDL2 Assets" Content="&#xE8FA;"
-                        Width="50" Height="50" Background="Transparent">
-                            <ToolTipService.ToolTip x:Uid="signIn">Sign in</ToolTipService.ToolTip>
+                        Width="50" Height="50" Background="Transparent" x:Uid="signIn" ToolTipService.ToolTip="Sign in">
                             <Button.Flyout>
                                 <MenuFlyout>
-                                    <MenuFlyoutItem x:Uid="signEx" Text="Sign in with existing account" Name="signIn" Click="signIn_Click"/>
-                                    <MenuFlyoutItem x:Uid="signNew" Text="Create new Google account" Name="createAccount" Click="createAccount_Click"/>
+                                    <MenuFlyoutItem x:Uid="/Main/signEx" Text="Sign in with existing account" Name="signIn" Click="signIn_Click"/>
+                                    <MenuFlyoutItem x:Uid="/Main/signNew" Text="Create new Google account" Name="createAccount" Click="createAccount_Click"/>
                                 </MenuFlyout>
                             </Button.Flyout>
                         </Button>
 
                         <Button Width="50" Background="Transparent" Height="50" Visibility="Collapsed" Name="avatar">
-                            <PersonPicture Width="30"/>
-                            <ToolTipService.ToolTip x:Uid="myAccount">My account</ToolTipService.ToolTip>
+                            <PersonPicture Width="30" ToolTipService.ToolTip="My account" x:Uid="myAccount"/>
                             <Button.Flyout>
                                 <MenuFlyout>
-                                    <MenuFlyoutItem x:Uid="myChannel" Text="My channel" Name="myChannel" Click="myChannel_Click"/>
+                                    <MenuFlyoutItem x:Uid="/Main/myChannelContext" Text="My channel" Name="myChannel" Click="myChannel_Click"/>
                                     <MenuFlyoutSeparator/>
-                                    <MenuFlyoutItem x:Uid="signOut" Text="Log out" Name="logout" Click="logout_Click"/>
+                                    <MenuFlyoutItem x:Uid="/Main/signOut" Text="Log out" Name="logout" Click="logout_Click"/>
                                 </MenuFlyout>
                             </Button.Flyout>
                         </Button>
diff --git a/FoxTube/Pages/Settings.xaml b/FoxTube/Pages/Settings.xaml
index c674962..d8dfadb 100644
--- a/FoxTube/Pages/Settings.xaml
+++ b/FoxTube/Pages/Settings.xaml
@@ -11,22 +11,22 @@
 
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <Pivot SelectedIndex="0" Name="pivot" IsHeaderItemsCarouselEnabled="False" SelectionChanged="pivot_SelectionChanged">
-            <PivotItem Header="General">
+            <PivotItem Header="General" x:Uid="general">
                 <ScrollViewer>
                     <settingspages:General/>
                 </ScrollViewer>
             </PivotItem>
-            <PivotItem Header="About us">
+            <PivotItem Header="About us" x:Uid="about">
                 <ScrollViewer>
                     <settingspages:About/>
                 </ScrollViewer>
             </PivotItem>
-            <PivotItem Header="Help us translate this app">
+            <PivotItem Header="Help us translate this app" x:Uid="helpTranslate">
                 <ScrollViewer>
                     <settingspages:Translate/>
                 </ScrollViewer>
             </PivotItem>
-            <PivotItem Header="Inbox">
+            <PivotItem Header="Inbox" x:Uid="inbox">
                 <ScrollViewer>
                     <settingspages:Inbox/>
                 </ScrollViewer>
diff --git a/FoxTube/Pages/SettingsPages/About.xaml b/FoxTube/Pages/SettingsPages/About.xaml
index a471a07..5f80be8 100644
--- a/FoxTube/Pages/SettingsPages/About.xaml
+++ b/FoxTube/Pages/SettingsPages/About.xaml
@@ -28,29 +28,29 @@
         </Grid.ColumnDefinitions>
 
         <StackPanel>
-            <TextBlock Text="About us and this app" FontSize="28"/>
+            <TextBlock x:Uid="aboutHeader" Text="About us and this app" FontSize="28"/>
 
             <TextBlock Text="FoxTube" FontSize="24"/>
             <TextBlock Name="version" Text="[currentVersion]" FontSize="14" Foreground="Gray" Margin="0,-5,0,10"/>
 
-            <TextBlock TextWrapping="WrapWholeWords" Text="Developed by Michael Gordeev (also known as XFox)" Margin="0,0,0,10"/>
+            <TextBlock x:Uid="developed" TextWrapping="WrapWholeWords" Text="Developed by Michael Gordeev (also known as XFox)" Margin="0,0,0,10"/>
             <TextBlock TextWrapping="WrapWholeWords" Visibility="Collapsed" Text="Special thanks to contributors for motivating me, testers and translators for making this app better everyday and you for using this app;)" Margin="0,0,0,10"/>
 
-            <TextBlock Text="Contacts" FontSize="22" FontWeight="SemiBold"/>
-            <TextBlock>Twitter: <Hyperlink NavigateUri="https://twitter.com/XFox_Mike">@XFox_Mike</Hyperlink></TextBlock>
-            <TextBlock>Vkontakte: <Hyperlink NavigateUri="https://vk.com/XFox.Mike">@XFox.Mike</Hyperlink></TextBlock>
+            <TextBlock x:Uid="contacts" Text="Contacts" FontSize="22" FontWeight="SemiBold"/>
+            <TextBlock><Run x:Uid="twitter">Twitter:</Run> <Hyperlink NavigateUri="https://twitter.com/XFox_Mike">@XFox_Mike</Hyperlink></TextBlock>
+            <TextBlock><Run x:Uid="vk">Vkontakte:</Run> <Hyperlink NavigateUri="https://vk.com/XFox.Mike">@XFox.Mike</Hyperlink></TextBlock>
             <TextBlock>YouTube: <Hyperlink NavigateUri="https://youtube.com/c/FoxGameStudioChannel">@FoxGameStudioChannel</Hyperlink></TextBlock>
             <TextBlock>E-mail: <Hyperlink NavigateUri="mailto:michael.xfox@outlook.com">michael.xfox@outlook.com</Hyperlink></TextBlock>
-            <TextBlock Margin="0,0,0,10">My blog (Russian language only): <Hyperlink NavigateUri="https://michael-xfox.com">https://michael-xfox.com</Hyperlink></TextBlock>
+            <TextBlock Margin="0,0,0,10"> <Run x:Uid="myBlog">My blog (Russian language only):</Run><Hyperlink NavigateUri="https://michael-xfox.com">https://michael-xfox.com</Hyperlink></TextBlock>
 
-            <TextBlock Text="Legal stuff" FontSize="22" FontWeight="SemiBold"/>
-            <HyperlinkButton Content="Our Privacy Policy" NavigateUri="https://michael-xfox.com/foxtubepp.txt" Padding="0,5,0,0"/>
-            <HyperlinkButton Content="YouTube Privacy Policy" NavigateUri="https://youtube.com/t/privacy" Padding="0"/>
-            <HyperlinkButton Content="YouTube Terms of use" NavigateUri="https://youtube.com/t/terms" Padding="0"/>
-            <HyperlinkButton Content="YouTube Community Guidelines" NavigateUri="https://youtube.com/t/community_guidelines" Padding="0,0,0,10"/>
-            <TextBlock Text="© 2018 Michael Gordeev"/>
-            <TextBlock Text="© 2018 YouTube, LLC"/>
-            <Button Content="Leave feedback" Margin="0,5" Click="Button_Click"/>
+            <TextBlock x:Uid="legal" Text="Legal stuff" FontSize="22" FontWeight="SemiBold"/>
+            <HyperlinkButton x:Uid="ourPrivacy" Content="Our Privacy Policy" NavigateUri="https://michael-xfox.com/foxtubepp.txt" Padding="0,5,0,0"/>
+            <HyperlinkButton x:Uid="ytPrivacy" Content="YouTube Privacy Policy" NavigateUri="https://youtube.com/t/privacy" Padding="0"/>
+            <HyperlinkButton x:Uid="terms" Content="YouTube Terms of use" NavigateUri="https://youtube.com/t/terms" Padding="0"/>
+            <HyperlinkButton x:Uid="guides" Content="YouTube Community Guidelines" NavigateUri="https://youtube.com/t/community_guidelines" Padding="0,0,0,10"/>
+            <TextBlock x:Uid="crMe" Text="© 2018 Michael Gordeev"/>
+            <TextBlock x:Uid="crYt" Text="© 2018 YouTube, LLC"/>
+            <Button x:Uid="feedback" Content="Leave feedback" Margin="0,5" Click="Button_Click"/>
         </StackPanel>
         <Image Grid.Column="1" Source="/Assets/LogoAvatar.png" VerticalAlignment="Top" Width="128"/>
     </Grid>
diff --git a/FoxTube/Pages/SettingsPages/General.xaml b/FoxTube/Pages/SettingsPages/General.xaml
index e1bf4ac..684306f 100644
--- a/FoxTube/Pages/SettingsPages/General.xaml
+++ b/FoxTube/Pages/SettingsPages/General.xaml
@@ -9,23 +9,23 @@
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
     <StackPanel Orientation="Vertical">
-        <TextBlock Text="Preferences" FontSize="28"/>
-        <TextBlock Text="Region &#x26; search" FontSize="22"/>
-        <ComboBox Header="App interface language" MinWidth="250" Name="language" SelectionChanged="language_SelectionChanged">
-            <ComboBoxItem Content="English (United States)"/>
-            <ComboBoxItem Content="Russian (Russia)"/>
+        <TextBlock x:Uid="preferences" Text="Preferences" FontSize="28"/>
+        <TextBlock x:Uid="regNsearch" Text="Region &#x26; search" FontSize="22"/>
+        <ComboBox x:Uid="interfaceLang" Header="App interface language" MinWidth="250" Name="language" SelectionChanged="language_SelectionChanged">
+            <ComboBoxItem x:Uid="en" Content="English (United States)"/>
+            <ComboBoxItem x:Uid="ru" Content="Russian (Russia)"/>
         </ComboBox>
-        <TextBlock Foreground="Red" Name="restartNote" Text="Reopen the app to apply settings" Visibility="Collapsed"/>
-        <ComboBox Header="Region" MinWidth="250" Name="region" SelectionChanged="region_SelectionChanged"/>
-        <ComboBox Header="SafeSearch" MinWidth="250" Name="safeSearch" SelectionChanged="safeSearch_SelectionChanged">
-            <ComboBoxItem Content="Moderate"/>
-            <ComboBoxItem Content="None"/>
-            <ComboBoxItem Content="Strict"/>
+        <TextBlock x:Uid="restart" Foreground="Red" Name="restartNote" Text="Reopen the app to apply settings" Visibility="Collapsed"/>
+        <ComboBox x:Uid="region" Header="Region" MinWidth="250" Name="region" SelectionChanged="region_SelectionChanged"/>
+        <ComboBox x:Uid="safeSearch" Header="SafeSearch" MinWidth="250" Name="safeSearch" SelectionChanged="safeSearch_SelectionChanged">
+            <ComboBoxItem x:Uid="moderate" Content="Moderate"/>
+            <ComboBoxItem x:Uid="none" Content="None"/>
+            <ComboBoxItem x:Uid="strict" Content="Strict"/>
         </ComboBox>
 
-        <TextBlock Text="Playback" FontSize="22"/>
-        <ComboBox Width="250" Header="Default video playback quality" Name="quality" SelectionChanged="quality_SelectionChanged">
-            <ComboBoxItem Content="Remember my choice"/>
+        <TextBlock x:Uid="playback" Text="Playback" FontSize="22"/>
+        <ComboBox x:Uid="quality" Width="250" Header="Default video playback quality" Name="quality" SelectionChanged="quality_SelectionChanged">
+            <ComboBoxItem x:Uid="remember" Content="Remember my choice"/>
             <ComboBoxItem Content="2160p"/>
             <ComboBoxItem Content="1080p"/>
             <ComboBoxItem Content="720p"/>
@@ -34,15 +34,16 @@
             <ComboBoxItem Content="240p"/>
             <ComboBoxItem Content="144p"/>
         </ComboBox>
-        <ToggleSwitch OnContent="Notify when playing on metered connection" OffContent="Notify when playing on metered connection" Name="mobileWarning" Toggled="notification_IsEnabledChanged"/>
-        <ToggleSwitch OnContent="Play videos automatically" OffContent="Play videos automatically" Name="autoplay" Toggled="notification_IsEnabledChanged"/>
+        <ToggleSwitch x:Uid="metered" OnContent="Notify when playing on metered connection" OffContent="Notify when playing on metered connection" Name="mobileWarning" Toggled="notification_IsEnabledChanged"/>
+        <ToggleSwitch x:Uid="autoplay" OnContent="Play videos automatically" OffContent="Play videos automatically" Name="autoplay" Toggled="notification_IsEnabledChanged"/>
 
-        <TextBlock Text="Notifications" FontSize="22"/>
+        <TextBlock x:Uid="notifications" Text="Notifications" FontSize="22"/>
+        <ToggleSwitch x:Uid="newVideo" Name="newVideo" OnContent="Notify when someone of your subscriptions uploaded new video" OffContent="Notify when someone of your subscriptions uploaded new video" Toggled="notification_IsEnabledChanged"/>
 
-        <TextBlock Text="Color mode" FontSize="22"/>
-        <RadioButton Content="Light" Name="light" GroupName="color" Checked="RadioButton_Checked"/>
-        <RadioButton Content="Dark" Name="dark" GroupName="color" Checked="RadioButton_Checked"/>
-        <RadioButton Content="Windows default" Name="system" GroupName="color" Checked="RadioButton_Checked"/>
-        <HyperlinkButton Content="Windows color settings" NavigateUri="ms-settings:colors"/>
+        <TextBlock x:Uid="color" Text="Color mode" FontSize="22"/>
+        <RadioButton x:Uid="colorLight" Content="Light" Name="light" GroupName="color" Checked="RadioButton_Checked"/>
+        <RadioButton x:Uid="colorDark" Content="Dark" Name="dark" GroupName="color" Checked="RadioButton_Checked"/>
+        <RadioButton x:Uid="colorDefault" Content="Windows default" Name="system" GroupName="color" Checked="RadioButton_Checked"/>
+        <HyperlinkButton x:Uid="colorSystem" Content="Windows color settings" NavigateUri="ms-settings:colors"/>
     </StackPanel>
 </Page>
diff --git a/FoxTube/Pages/SettingsPages/Inbox.xaml b/FoxTube/Pages/SettingsPages/Inbox.xaml
index 2ad0a74..32695ed 100644
--- a/FoxTube/Pages/SettingsPages/Inbox.xaml
+++ b/FoxTube/Pages/SettingsPages/Inbox.xaml
@@ -55,10 +55,10 @@
         </Grid.ColumnDefinitions>
         <ScrollViewer Background="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}">
             <StackPanel VerticalAlignment="Stretch">
-                <ComboBox Header="Filter" Margin="10" HorizontalAlignment="Stretch" SelectedIndex="0" Name="filter" SelectionChanged="filter_SelectionChanged">
-                    <ComboBoxItem Content="All"/>
-                    <ComboBoxItem Content="Messages"/>
-                    <ComboBoxItem Content="Patch notes"/>
+                <ComboBox x:Uid="filter" Header="Filter" Margin="10" HorizontalAlignment="Stretch" SelectedIndex="0" Name="filter" SelectionChanged="filter_SelectionChanged">
+                    <ComboBoxItem x:Uid="all" Content="All"/>
+                    <ComboBoxItem x:Uid="messages" Content="Messages"/>
+                    <ComboBoxItem x:Uid="changelogs" Content="Patch notes"/>
                 </ComboBox>
                 <ListBox Name="list" SelectionChanged="list_SelectionChanged" Background="Transparent">
                     <ListBox.ItemContainerStyle>
@@ -101,7 +101,7 @@
         <Grid Grid.Column="1" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Name="block">
             <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                 <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE7EA;" FontSize="70" Foreground="Gray" Margin="10"/>
-                <TextBlock Text="Select item from list" FontSize="30" VerticalAlignment="Center" Foreground="Gray"/>
+                <TextBlock x:Uid="select" Text="Select item from list" FontSize="30" VerticalAlignment="Center" Foreground="Gray"/>
             </StackPanel>
         </Grid>
     </Grid>
diff --git a/FoxTube/Strings/en-US/Main.resw b/FoxTube/Strings/en-US/Main.resw
index 3993a83..d3b5ac1 100644
--- a/FoxTube/Strings/en-US/Main.resw
+++ b/FoxTube/Strings/en-US/Main.resw
@@ -117,55 +117,61 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="adsFree" xml:space="preserve">
+  <data name="adsFree.Text" xml:space="preserve">
     <value>Remove ads</value>
   </data>
-  <data name="downloads" xml:space="preserve">
+  <data name="downloads.Content" xml:space="preserve">
     <value>Downloads</value>
   </data>
-  <data name="feedback" xml:space="preserve">
+  <data name="feedback.Text" xml:space="preserve">
     <value>Give a feedback</value>
   </data>
-  <data name="history" xml:space="preserve">
+  <data name="history.Content" xml:space="preserve">
     <value>History</value>
   </data>
-  <data name="home" xml:space="preserve">
+  <data name="home.Content" xml:space="preserve">
     <value>Home</value>
   </data>
-  <data name="later" xml:space="preserve">
+  <data name="later.Content" xml:space="preserve">
     <value>Watch later</value>
   </data>
-  <data name="liked" xml:space="preserve">
+  <data name="liked.Content" xml:space="preserve">
     <value>Liked videos</value>
   </data>
-  <data name="myAccount" xml:space="preserve">
+  <data name="myAccount.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>My account</value>
   </data>
-  <data name="myChannel" xml:space="preserve">
+  <data name="myChannel.Content" xml:space="preserve">
     <value>My channel</value>
   </data>
-  <data name="myLibrary" xml:space="preserve">
+  <data name="myChannelContext.Text" xml:space="preserve">
+    <value>My channel</value>
+  </data>
+  <data name="myLibrary.Content" xml:space="preserve">
     <value>My library</value>
   </data>
-  <data name="notifications" xml:space="preserve">
+  <data name="notifications.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Notifications</value>
   </data>
-  <data name="searchPlaceholder" xml:space="preserve">
+  <data name="searchPlaceholder.PlaceholderText" xml:space="preserve">
     <value>Search</value>
   </data>
-  <data name="signEx" xml:space="preserve">
+  <data name="settings.Content" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="signEx.Text" xml:space="preserve">
     <value>Sign in with existing account</value>
   </data>
-  <data name="signIn" xml:space="preserve">
+  <data name="signIn.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Sign in</value>
   </data>
-  <data name="signNew" xml:space="preserve">
+  <data name="signNew.Text" xml:space="preserve">
     <value>Create new Google account</value>
   </data>
-  <data name="signOut" xml:space="preserve">
+  <data name="signOut.Text" xml:space="preserve">
     <value>Log out</value>
   </data>
-  <data name="subscriptions" xml:space="preserve">
+  <data name="subscriptions.Content" xml:space="preserve">
     <value>Subscriptions</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/FoxTube/Strings/en-US/Settings.resw b/FoxTube/Strings/en-US/Settings.resw
index 82123d3..ece8d3c 100644
--- a/FoxTube/Strings/en-US/Settings.resw
+++ b/FoxTube/Strings/en-US/Settings.resw
@@ -117,17 +117,16 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <!--START FROM HERE!!!-->
-  <data name="about" xml:space="preserve">
+  <data name="about.Header" xml:space="preserve">
     <value>About us</value>
   </data>
-  <data name="general" xml:space="preserve">
+  <data name="general.Header" xml:space="preserve">
     <value>General</value>
   </data>
-  <data name="helpTranslate" xml:space="preserve">
+  <data name="helpTranslate.Header" xml:space="preserve">
     <value>Help us translate this app</value>
   </data>
-  <data name="inbox" xml:space="preserve">
+  <data name="inbox.Header" xml:space="preserve">
     <value>Inbox</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/FoxTube/Strings/en-US/Settings/About.resw b/FoxTube/Strings/en-US/Settings/About.resw
index fe5b7f8..0a2ee97 100644
--- a/FoxTube/Strings/en-US/Settings/About.resw
+++ b/FoxTube/Strings/en-US/Settings/About.resw
@@ -117,46 +117,46 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="aboutHeader" xml:space="preserve">
+  <data name="aboutHeader.Text" xml:space="preserve">
     <value>About us and this app</value>
   </data>
-  <data name="contacts" xml:space="preserve">
+  <data name="contacts.Text" xml:space="preserve">
     <value>Contacts</value>
   </data>
-  <data name="crMe" xml:space="preserve">
+  <data name="crMe.Text" xml:space="preserve">
     <value>© 2018 Michael Gordeev</value>
   </data>
-  <data name="crYt" xml:space="preserve">
+  <data name="crYt.Text" xml:space="preserve">
     <value>© 2018 YouTube, LLC</value>
   </data>
-  <data name="developed" xml:space="preserve">
+  <data name="developed.Text" xml:space="preserve">
     <value>Developed by Michael Gordeev (also known as XFox)</value>
   </data>
-  <data name="feedback" xml:space="preserve">
+  <data name="feedback.Content" xml:space="preserve">
     <value>Leave feedback</value>
   </data>
-  <data name="guides" xml:space="preserve">
+  <data name="guides.Content" xml:space="preserve">
     <value>YouTube Community Guidelines</value>
   </data>
-  <data name="legal" xml:space="preserve">
+  <data name="legal.Text" xml:space="preserve">
     <value>Legal stuff</value>
   </data>
-  <data name="myBlog" xml:space="preserve">
+  <data name="myBlog.Text" xml:space="preserve">
     <value>My blog (Russian language only)</value>
   </data>
-  <data name="ourPrivacy" xml:space="preserve">
+  <data name="ourPrivacy.Content" xml:space="preserve">
     <value>Our Privacy Policy</value>
   </data>
-  <data name="terms" xml:space="preserve">
+  <data name="terms.Content" xml:space="preserve">
     <value>YouTube Terms of use</value>
   </data>
-  <data name="twitter" xml:space="preserve">
+  <data name="twitter.Text" xml:space="preserve">
     <value>Twitter</value>
   </data>
-  <data name="vk" xml:space="preserve">
+  <data name="vk.Text" xml:space="preserve">
     <value>Vkontakte</value>
   </data>
-  <data name="ytPrivacy" xml:space="preserve">
+  <data name="ytPrivacy.Content" xml:space="preserve">
     <value>YouTube Privacy Policy</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/FoxTube/Strings/en-US/Settings/General.resw b/FoxTube/Strings/en-US/Settings/General.resw
index f514f3a..381bcd2 100644
--- a/FoxTube/Strings/en-US/Settings/General.resw
+++ b/FoxTube/Strings/en-US/Settings/General.resw
@@ -117,70 +117,82 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="autoplay" xml:space="preserve">
+  <data name="autoplay.OffContent" xml:space="preserve">
     <value>Play videos automatically</value>
   </data>
-  <data name="color" xml:space="preserve">
+  <data name="autoplay.OnContent" xml:space="preserve">
+    <value>Play videos automatically</value>
+  </data>
+  <data name="color.Text" xml:space="preserve">
     <value>Color mode</value>
   </data>
-  <data name="colorDark" xml:space="preserve">
+  <data name="colorDark.Content" xml:space="preserve">
     <value>Dark</value>
   </data>
-  <data name="colorDefault" xml:space="preserve">
+  <data name="colorDefault.Content" xml:space="preserve">
     <value>Default</value>
   </data>
-  <data name="colorLight" xml:space="preserve">
+  <data name="colorLight.Content" xml:space="preserve">
     <value>Light</value>
   </data>
-  <data name="colorSystem" xml:space="preserve">
+  <data name="colorSystem.Content" xml:space="preserve">
     <value>Windows color settings</value>
   </data>
-  <data name="en" xml:space="preserve">
+  <data name="en.Content" xml:space="preserve">
     <value>English (United States of America)</value>
   </data>
-  <data name="interfaceLang" xml:space="preserve">
+  <data name="interfaceLang.Header" xml:space="preserve">
     <value>App interface language</value>
   </data>
-  <data name="metered" xml:space="preserve">
+  <data name="metered.OffContent" xml:space="preserve">
     <value>Notify when playing on metered connection</value>
   </data>
-  <data name="moderate" xml:space="preserve">
+  <data name="metered.OnContent" xml:space="preserve">
+    <value>Notify when playing on metered connection</value>
+  </data>
+  <data name="moderate.Content" xml:space="preserve">
     <value>Moderate</value>
   </data>
-  <data name="newVideo" xml:space="preserve">
+  <data name="newVideo.OffContent" xml:space="preserve">
     <value>Notify when someone of your subscriptions uploaded new video</value>
   </data>
-  <data name="none" xml:space="preserve">
+  <data name="newVideo.OnContent" xml:space="preserve">
+    <value>Notify when someone of your subscriptions uploaded new video</value>
+  </data>
+  <data name="none.Content" xml:space="preserve">
     <value>None</value>
   </data>
-  <data name="notifications" xml:space="preserve">
+  <data name="notifications.Text" xml:space="preserve">
     <value>Notifications</value>
   </data>
-  <data name="perferences" xml:space="preserve">
+  <data name="perferences.Text" xml:space="preserve">
     <value>Preferences</value>
   </data>
-  <data name="playback" xml:space="preserve">
+  <data name="playback.Text" xml:space="preserve">
     <value>Playback</value>
   </data>
-  <data name="quality" xml:space="preserve">
+  <data name="quality.Header" xml:space="preserve">
     <value>Default video playback quality</value>
   </data>
-  <data name="regNsearch" xml:space="preserve">
+  <data name="region.Header" xml:space="preserve">
+    <value>Region</value>
+  </data>
+  <data name="regNsearch.Text" xml:space="preserve">
     <value>Region &amp; search</value>
   </data>
-  <data name="remember" xml:space="preserve">
+  <data name="remember.Content" xml:space="preserve">
     <value>Remember my choice</value>
   </data>
-  <data name="restart" xml:space="preserve">
+  <data name="restart.Text" xml:space="preserve">
     <value>Reopen the app to apply changes</value>
   </data>
-  <data name="ru" xml:space="preserve">
+  <data name="ru.Content" xml:space="preserve">
     <value>Russian (Russian Federation)</value>
   </data>
-  <data name="safeSearch" xml:space="preserve">
+  <data name="safeSearch.Header" xml:space="preserve">
     <value>SafeSearch</value>
   </data>
-  <data name="strict" xml:space="preserve">
+  <data name="strict.Content" xml:space="preserve">
     <value>Strict</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/FoxTube/Strings/en-US/Settings/Inbox.resw b/FoxTube/Strings/en-US/Settings/Inbox.resw
index 49a664e..f7766ac 100644
--- a/FoxTube/Strings/en-US/Settings/Inbox.resw
+++ b/FoxTube/Strings/en-US/Settings/Inbox.resw
@@ -117,19 +117,19 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="all" xml:space="preserve">
+  <data name="all.Content" xml:space="preserve">
     <value>All</value>
   </data>
-  <data name="changelogs" xml:space="preserve">
+  <data name="changelogs.Content" xml:space="preserve">
     <value>Changelogs</value>
   </data>
-  <data name="filter" xml:space="preserve">
+  <data name="filter.Header" xml:space="preserve">
     <value>Filter</value>
   </data>
-  <data name="messages" xml:space="preserve">
+  <data name="messages.Content" xml:space="preserve">
     <value>Messages</value>
   </data>
-  <data name="select" xml:space="preserve">
+  <data name="select.Text" xml:space="preserve">
     <value>Select item from the list</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/FoxTube/Strings/ru-RU/Main.resw b/FoxTube/Strings/ru-RU/Main.resw
index a5d240f..d907b3b 100644
--- a/FoxTube/Strings/ru-RU/Main.resw
+++ b/FoxTube/Strings/ru-RU/Main.resw
@@ -117,55 +117,61 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="adsFree" xml:space="preserve">
+  <data name="adsFree.Text" xml:space="preserve">
     <value>Убрать рекламу</value>
   </data>
-  <data name="downloads" xml:space="preserve">
+  <data name="downloads.Content" xml:space="preserve">
     <value>Загрузки</value>
   </data>
-  <data name="feedback" xml:space="preserve">
+  <data name="feedback.Text" xml:space="preserve">
     <value>Оставить отзыв</value>
   </data>
-  <data name="history" xml:space="preserve">
+  <data name="history.Content" xml:space="preserve">
     <value>История</value>
   </data>
-  <data name="home" xml:space="preserve">
+  <data name="home.Content" xml:space="preserve">
     <value>Главная</value>
   </data>
-  <data name="later" xml:space="preserve">
+  <data name="later.Content" xml:space="preserve">
     <value>Посмотреть позже</value>
   </data>
-  <data name="liked" xml:space="preserve">
+  <data name="liked.Content" xml:space="preserve">
     <value>Понравившиеся</value>
   </data>
-  <data name="myAccount" xml:space="preserve">
+  <data name="myAccount.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Мой аккаунт</value>
   </data>
-  <data name="myChannel" xml:space="preserve">
+  <data name="myChannel.Content" xml:space="preserve">
     <value>Мой канал</value>
   </data>
-  <data name="myLibrary" xml:space="preserve">
+  <data name="myChannelContext.Text" xml:space="preserve">
+    <value>Мой канал</value>
+  </data>
+  <data name="myLibrary.Content" xml:space="preserve">
     <value>Библиотека</value>
   </data>
-  <data name="notifications" xml:space="preserve">
+  <data name="notifications.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Уведомления</value>
   </data>
-  <data name="searchPlaceholder" xml:space="preserve">
+  <data name="searchPlaceholder.PlaceholderText" xml:space="preserve">
     <value>Поиск</value>
   </data>
-  <data name="signEx" xml:space="preserve">
+  <data name="settings.Content" xml:space="preserve">
+    <value>Настройки</value>
+  </data>
+  <data name="signEx.Text" xml:space="preserve">
     <value>Войти с помощью существующего аккаунта Google</value>
   </data>
-  <data name="signIn" xml:space="preserve">
+  <data name="signIn.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Войти</value>
   </data>
-  <data name="signNew" xml:space="preserve">
+  <data name="signNew.Text" xml:space="preserve">
     <value>Создать новый аккаунт Google</value>
   </data>
-  <data name="signOut" xml:space="preserve">
+  <data name="signOut.Text" xml:space="preserve">
     <value>Выйти</value>
   </data>
-  <data name="subscriptions" xml:space="preserve">
+  <data name="subscriptions.Content" xml:space="preserve">
     <value>Подписки</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/FoxTube/Strings/ru-RU/Settings.resw b/FoxTube/Strings/ru-RU/Settings.resw
index 68edc41..b45e559 100644
--- a/FoxTube/Strings/ru-RU/Settings.resw
+++ b/FoxTube/Strings/ru-RU/Settings.resw
@@ -117,16 +117,16 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="about" xml:space="preserve">
+  <data name="about.Header" xml:space="preserve">
     <value>О нас</value>
   </data>
-  <data name="general" xml:space="preserve">
+  <data name="general.Header" xml:space="preserve">
     <value>Общие</value>
   </data>
-  <data name="helpTranslate" xml:space="preserve">
+  <data name="helpTranslate.Header" xml:space="preserve">
     <value>Помогите перевести приложение</value>
   </data>
-  <data name="inbox" xml:space="preserve">
+  <data name="inbox.Header" xml:space="preserve">
     <value>Сообщения</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/FoxTube/Strings/ru-RU/Settings/About.resw b/FoxTube/Strings/ru-RU/Settings/About.resw
index 6346733..17f2e79 100644
--- a/FoxTube/Strings/ru-RU/Settings/About.resw
+++ b/FoxTube/Strings/ru-RU/Settings/About.resw
@@ -117,46 +117,46 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="aboutHeader" xml:space="preserve">
+  <data name="aboutHeader.Text" xml:space="preserve">
     <value>О нас и приложении</value>
   </data>
-  <data name="contacts" xml:space="preserve">
+  <data name="contacts.Text" xml:space="preserve">
     <value>Контакты</value>
   </data>
-  <data name="crMe" xml:space="preserve">
+  <data name="crMe.Text" xml:space="preserve">
     <value>© 2018 Михаил Гордеев</value>
   </data>
-  <data name="crYt" xml:space="preserve">
+  <data name="crYt.Text" xml:space="preserve">
     <value>© 2018 YouTube, LLC</value>
   </data>
-  <data name="developed" xml:space="preserve">
+  <data name="developed.Text" xml:space="preserve">
     <value>Разработано Михаилом Гордеевым (также известным как XFox)</value>
   </data>
-  <data name="feedback" xml:space="preserve">
+  <data name="feedback.Content" xml:space="preserve">
     <value>Оставить отзыв</value>
   </data>
-  <data name="guides" xml:space="preserve">
+  <data name="guides.Content" xml:space="preserve">
     <value>Принципы сообщества YouTube</value>
   </data>
-  <data name="legal" xml:space="preserve">
+  <data name="legal.Text" xml:space="preserve">
     <value>Юридический материал</value>
   </data>
-  <data name="myBlog" xml:space="preserve">
+  <data name="myBlog.Text" xml:space="preserve">
     <value>Мой блог</value>
   </data>
-  <data name="ourPrivacy" xml:space="preserve">
+  <data name="ourPrivacy.Content" xml:space="preserve">
     <value>Наша политика конфиденциальности</value>
   </data>
-  <data name="terms" xml:space="preserve">
+  <data name="terms.Content" xml:space="preserve">
     <value>Правила использования YouTube</value>
   </data>
-  <data name="twitter" xml:space="preserve">
+  <data name="twitter.Text" xml:space="preserve">
     <value>Твиттер</value>
   </data>
-  <data name="vk" xml:space="preserve">
+  <data name="vk.Text" xml:space="preserve">
     <value>ВКонтакте</value>
   </data>
-  <data name="ytPrivacy" xml:space="preserve">
+  <data name="ytPrivacy.Content" xml:space="preserve">
     <value>Политика конфиденциальности YouYube</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/FoxTube/Strings/ru-RU/Settings/General.resw b/FoxTube/Strings/ru-RU/Settings/General.resw
index 18e3506..6f7dd72 100644
--- a/FoxTube/Strings/ru-RU/Settings/General.resw
+++ b/FoxTube/Strings/ru-RU/Settings/General.resw
@@ -117,70 +117,82 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="autoplay" xml:space="preserve">
+  <data name="autoplay.OffContent" xml:space="preserve">
     <value>Воспроизводить видео автоматически</value>
   </data>
-  <data name="color" xml:space="preserve">
+  <data name="autoplay.OnContent" xml:space="preserve">
+    <value>Воспроизводить видео автоматически</value>
+  </data>
+  <data name="color.Text" xml:space="preserve">
     <value>Тема</value>
   </data>
-  <data name="colorDark" xml:space="preserve">
+  <data name="colorDark.Content" xml:space="preserve">
     <value>Темная</value>
   </data>
-  <data name="colorDefault" xml:space="preserve">
+  <data name="colorDefault.Content" xml:space="preserve">
     <value>Системная</value>
   </data>
-  <data name="colorLight" xml:space="preserve">
+  <data name="colorLight.Content" xml:space="preserve">
     <value>Светлая</value>
   </data>
-  <data name="colorSystem" xml:space="preserve">
+  <data name="colorSystem.Content" xml:space="preserve">
     <value>Цветовые настройки Windows</value>
   </data>
-  <data name="en" xml:space="preserve">
+  <data name="en.Content" xml:space="preserve">
     <value>Английский (Соединенные Штаты Америки)</value>
   </data>
-  <data name="interfaceLang" xml:space="preserve">
+  <data name="interfaceLang.Header" xml:space="preserve">
     <value>Язык интерфейса</value>
   </data>
-  <data name="metered" xml:space="preserve">
+  <data name="metered.OffContent" xml:space="preserve">
     <value>Уведомлять об ограниченном соединении перед воспроизведением</value>
   </data>
-  <data name="moderate" xml:space="preserve">
+  <data name="metered.OnContent" xml:space="preserve">
+    <value>Уведомлять об ограниченном соединении перед воспроизведением</value>
+  </data>
+  <data name="moderate.Content" xml:space="preserve">
     <value>Выборочный</value>
   </data>
-  <data name="newVideo" xml:space="preserve">
+  <data name="newVideo.OffContent" xml:space="preserve">
     <value>Уведомлять если кто-то из ваших подписок загрузил новое видео</value>
   </data>
-  <data name="none" xml:space="preserve">
+  <data name="newVideo.OnContent" xml:space="preserve">
+    <value>Уведомлять если кто-то из ваших подписок загрузил новое видео</value>
+  </data>
+  <data name="none.Content" xml:space="preserve">
     <value>Отключен</value>
   </data>
-  <data name="notifications" xml:space="preserve">
+  <data name="notifications.Text" xml:space="preserve">
     <value>Уведомления</value>
   </data>
-  <data name="perferences" xml:space="preserve">
+  <data name="perferences.Text" xml:space="preserve">
     <value>Настройки</value>
   </data>
-  <data name="playback" xml:space="preserve">
+  <data name="playback.Text" xml:space="preserve">
     <value>Воспроизведение</value>
   </data>
-  <data name="quality" xml:space="preserve">
+  <data name="quality.Header" xml:space="preserve">
     <value>Качество видео по умолчанию</value>
   </data>
-  <data name="regNsearch" xml:space="preserve">
+  <data name="region.Header" xml:space="preserve">
+    <value>Регион</value>
+  </data>
+  <data name="regNsearch.Text" xml:space="preserve">
     <value>Регион и поиск</value>
   </data>
-  <data name="remember" xml:space="preserve">
+  <data name="remember.Content" xml:space="preserve">
     <value>Запомнить мой выбор</value>
   </data>
-  <data name="restart" xml:space="preserve">
+  <data name="restart.Text" xml:space="preserve">
     <value>Перезапустите приложение, чтобы применить настройки</value>
   </data>
-  <data name="ru" xml:space="preserve">
+  <data name="ru.Content" xml:space="preserve">
     <value>Русский (Российская Федерация)</value>
   </data>
-  <data name="safeSearch" xml:space="preserve">
+  <data name="safeSearch.Header" xml:space="preserve">
     <value>Безопасный поиск</value>
   </data>
-  <data name="strict" xml:space="preserve">
+  <data name="strict.Content" xml:space="preserve">
     <value>Строгий</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/FoxTube/Strings/ru-RU/Settings/Inbox.resw b/FoxTube/Strings/ru-RU/Settings/Inbox.resw
index 460bf13..da979b1 100644
--- a/FoxTube/Strings/ru-RU/Settings/Inbox.resw
+++ b/FoxTube/Strings/ru-RU/Settings/Inbox.resw
@@ -117,19 +117,19 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="all" xml:space="preserve">
+  <data name="all.Content" xml:space="preserve">
     <value>Все</value>
   </data>
-  <data name="changelogs" xml:space="preserve">
+  <data name="changelogs.Content" xml:space="preserve">
     <value>"Что нового?"</value>
   </data>
-  <data name="filter" xml:space="preserve">
+  <data name="filter.Header" xml:space="preserve">
     <value>Фильтр</value>
   </data>
-  <data name="messages" xml:space="preserve">
+  <data name="messages.Content" xml:space="preserve">
     <value>Сообщения</value>
   </data>
-  <data name="select" xml:space="preserve">
+  <data name="select.Text" xml:space="preserve">
     <value>Выберите сообщение из списка</value>
   </data>
 </root>
\ No newline at end of file