From d143c41711f9c4ec277a249ece871c2bf7857961 Mon Sep 17 00:00:00 2001
From: Dasmius007 <176837655+Dasmius007@users.noreply.github.com>
Date: Wed, 1 Oct 2025 20:53:09 -0700
Subject: [PATCH] Changed resource string keys to unique names so not to
 conflict with the regular Humble library, per Playnite recommendation

---
 HumbleKeysLibrarySettingsView.xaml | 24 ++++++++++++------------
 Localization/en-US.xaml            | 20 ++++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/HumbleKeysLibrarySettingsView.xaml b/HumbleKeysLibrarySettingsView.xaml
index ee9b66d..f0bf2c3 100644
--- a/HumbleKeysLibrarySettingsView.xaml
+++ b/HumbleKeysLibrarySettingsView.xaml
@@ -27,7 +27,7 @@
     <StackPanel Margin="20">
 		<CheckBox x:Name="CheckHumbleConnectAccount"
 				  IsChecked="{Binding ConnectAccount}"
-			  Content="{DynamicResource LOCHumbleSettingsConnectAccount}"/>
+			  Content="{DynamicResource LOCHumbleKeysSettingsConnectAccount}"/>
 
         <StackPanel DockPanel.Dock="Top" Margin="40,5,5,0"
 					IsEnabled="{Binding IsChecked, ElementName=CheckHumbleConnectAccount}">
@@ -44,10 +44,10 @@
                 <TextBlock
 					Name="RedemptionStoreLabel" VerticalAlignment="Center"
                     Text="Add Redemption Store to field:"
-					ToolTip="{DynamicResource LOCHumbleRedemptionStoreTip}"
+					ToolTip="{DynamicResource LOCHumbleKeysRedemptionStoreTip}"
 					Grid.Column="0"/>
                 <ComboBox Margin="10 0 0 0" Name="RedemptionStoreValues" SelectedValuePath="Tag" SelectedValue="{Binding RedemptionStore, Mode=TwoWay}"
-                          Grid.Column="1" ToolTip="{DynamicResource LOCHumbleRedemptionStoreTip}">
+                          Grid.Column="1" ToolTip="{DynamicResource LOCHumbleKeysRedemptionStoreTip}">
                     <ComboBoxItem Tag="0" ToolTip="Don't add to any field">None</ComboBoxItem>
                     <ComboBoxItem Tag="1" ToolTip="Recommended">Source</ComboBoxItem>
                     <ComboBoxItem Tag="2">Tag</ComboBoxItem>
@@ -55,7 +55,7 @@
                     <ComboBoxItem Tag="4" ToolTip="Not recommended (may not work properly with some metadata add-ons; for backward compatibility)">Platform</ComboBoxItem>
                 </ComboBox>
             </Grid>
-            <CheckBox Margin="0,10,0,0" x:Name="CheckAddLinks" IsChecked="{Binding AddLinks}" Content="{DynamicResource LOCHumbleAddLinks}"/>
+            <CheckBox Margin="0,10,0,0" x:Name="CheckAddLinks" IsChecked="{Binding AddLinks}" Content="{DynamicResource LOCHumbleKeysAddLinks}"/>
             <CheckBox Margin="0,10,0,0"
 						IsChecked="{Binding ImportChoiceKeys}"
 						Content="Import Choice Games"
@@ -69,10 +69,10 @@
 				<TextBlock
 						Name="TagWithBundleNameLabel" VerticalAlignment="Center"
 						Text="Create Tags for Bundle Names:"
-						ToolTip="{DynamicResource LOCHumbleTagWithBundleTip}"
+						ToolTip="{DynamicResource LOCHumbleKeysTagWithBundleTip}"
 						Grid.Column="0"/>
                 <ComboBox Margin="10 0 0 0" Name="TagMethodCombo" SelectedValuePath="Tag" SelectedValue="{Binding TagWithBundleName, Mode=TwoWay}"
-                          Grid.Column="1" ToolTip="{DynamicResource LOCHumbleTagWithBundleTip}">
+                          Grid.Column="1" ToolTip="{DynamicResource LOCHumbleKeysTagWithBundleTip}">
                     <ComboBoxItem Tag="0" ToolTip="Do not create Tags based on Bundle Name">None</ComboBoxItem>
                     <ComboBoxItem Tag="1" ToolTip="Create only Tags for Humble Choice Monthly bundles" IsEnabled="{Binding IsChecked,ElementName=ImportChoiceKeys}">
                         <ComboBoxItem.Style>
@@ -95,10 +95,10 @@
 				<TextBlock
 					Name="UnredeemableKeyHandlingLabel" VerticalAlignment="Center"
                     Text="Unredeemable key handling:"
-					ToolTip="{DynamicResource LOCHumbleUnredeemableKeyHandlingTip}"
+					ToolTip="{DynamicResource LOCHumbleKeysUnredeemableKeyHandlingTip}"
 					Grid.Column="0"/>
                 <ComboBox Margin="10 0 0 0" Name="UnredeemableKeyValues" SelectedValuePath="Tag" SelectedValue="{Binding UnredeemableKeyHandling, Mode=TwoWay}"
-                          Grid.Column="1" ToolTip="{DynamicResource LOCHumbleUnredeemableKeyHandlingTip}">
+                          Grid.Column="1" ToolTip="{DynamicResource LOCHumbleKeysUnredeemableKeyHandlingTip}">
                     <ComboBoxItem Tag="0" ToolTip="Create only Tags for games that cannot be redeemed">Tag</ComboBoxItem>
                     <ComboBoxItem Tag="1" ToolTip="Delete games that cannot be redeemed">Delete</ComboBoxItem>
                 </ComboBox>
@@ -115,7 +115,7 @@
             <CheckBox Margin="0,10,0,0" x:Name="CheckPlatformWindows" IsChecked="{Binding AddPlatformWindows}" Content="Add PC (Windows) to all other keys (Recommended)"/>
 
             <StackPanel Orientation="Horizontal" Margin="0,20,0,0">
-				<Button Content="{DynamicResource LOCHumbleAuthenticateLabel}" HorizontalAlignment="Left"
+				<Button Content="{DynamicResource LOCHumbleKeysAuthenticateLabel}" HorizontalAlignment="Left"
 					Command="{Binding LoginCommand}" Margin="0,5,5,5"/>
 				<TextBlock VerticalAlignment="Center" Margin="10,5,5,5">
 					<TextBlock.Tag>
@@ -128,13 +128,13 @@
 						<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlockStyle}">
 							<Style.Triggers>
 								<Trigger Property="Tag" Value="{StaticResource True}">
-									<Setter Property="Text" Value="{DynamicResource LOCHumbleLoggedIn}" />
+									<Setter Property="Text" Value="{DynamicResource LOCHumbleKeysLoggedIn}" />
 								</Trigger>
 								<Trigger Property="Tag" Value="{StaticResource False}">
-									<Setter Property="Text" Value="{DynamicResource LOCHumbleNotLoggedIn}" />
+									<Setter Property="Text" Value="{DynamicResource LOCHumbleKeysNotLoggedIn}" />
 								</Trigger>
 								<Trigger Property="Tag" Value="{x:Null}">
-									<Setter Property="Text" Value="{DynamicResource LOCHumbleLoginChecking}" />
+									<Setter Property="Text" Value="{DynamicResource LOCHumbleKeysLoginChecking}" />
 								</Trigger>
 							</Style.Triggers>
 						</Style>
diff --git a/Localization/en-US.xaml b/Localization/en-US.xaml
index 3b90eb4..9c5d312 100644
--- a/Localization/en-US.xaml
+++ b/Localization/en-US.xaml
@@ -1,12 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib">
-  <sys:String x:Key="LOCHumbleSettingsConnectAccount">Connect account</sys:String>
-  <sys:String x:Key="LOCHumbleLoginChecking">Checking authentication status…</sys:String>
-  <sys:String x:Key="LOCHumbleLoggedIn">User is authenticated</sys:String>
-  <sys:String x:Key="LOCHumbleNotLoggedIn">Requires authentication</sys:String>
-  <sys:String x:Key="LOCHumbleNotLoggedInError">Failed to authenticate user.</sys:String>
-  <sys:String x:Key="LOCHumbleAuthenticateLabel">Authenticate</sys:String>
-  <sys:String x:Key="LOCHumbleAddLinks">Add Humble &amp; Steam links</sys:String>
-  <sys:String x:Key="LOCHumbleRedemptionStoreTip">Add the store the key is for (e.g. Steam) to this field</sys:String>
-  <sys:String x:Key="LOCHumbleTagWithBundleTip">When None is not selected, Humble Keys Library will add a new Tag per Bundle Name</sys:String>
-  <sys:String x:Key="LOCHumbleUnredeemableKeyHandlingTip">If Tag is selected a new tag will replace the existing 'Key: Unredeemed' tag with 'Key: Unredeemable', if Delete is selected the game will be deleted from the library if it cannot be redeemed</sys:String>
+  <sys:String x:Key="LOCHumbleKeysSettingsConnectAccount">Connect account</sys:String>
+  <sys:String x:Key="LOCHumbleKeysLoginChecking">Checking authentication status…</sys:String>
+  <sys:String x:Key="LOCHumbleKeysLoggedIn">User is authenticated</sys:String>
+  <sys:String x:Key="LOCHumbleKeysNotLoggedIn">Requires authentication</sys:String>
+  <sys:String x:Key="LOCHumbleKeysNotLoggedInError">Failed to authenticate user.</sys:String>
+  <sys:String x:Key="LOCHumbleKeysAuthenticateLabel">Authenticate</sys:String>
+  <sys:String x:Key="LOCHumbleKeysAddLinks">Add Humble &amp; Steam links</sys:String>
+  <sys:String x:Key="LOCHumbleKeysRedemptionStoreTip">Add the store the key is for (e.g. Steam) to this field</sys:String>
+  <sys:String x:Key="LOCHumbleKeysTagWithBundleTip">When None is not selected, Humble Keys Library will add a new Tag per Bundle Name</sys:String>
+  <sys:String x:Key="LOCHumbleKeysUnredeemableKeyHandlingTip">If Tag is selected a new tag will replace the existing 'Key: Unredeemed' tag with 'Key: Unredeemable', if Delete is selected the game will be deleted from the library if it cannot be redeemed</sys:String>
 </ResourceDictionary>
\ No newline at end of file