From dedafca97dc02a2558dbc1f8dfddc4d956155922 Mon Sep 17 00:00:00 2001
From: Artem Samoilenko <artem@brave.com>
Date: Wed, 26 Jul 2023 14:21:51 -0400
Subject: [PATCH] [Android] Fix for conflicting string error

---
 .../res/layout/fragment_brave_vpn_always_on_error_dialog.xml    | 2 +-
 browser/ui/android/strings/android_brave_strings.grd            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/java/res/layout/fragment_brave_vpn_always_on_error_dialog.xml b/android/java/res/layout/fragment_brave_vpn_always_on_error_dialog.xml
index 67e389f492a..7da1cd0abe7 100644
--- a/android/java/res/layout/fragment_brave_vpn_always_on_error_dialog.xml
+++ b/android/java/res/layout/fragment_brave_vpn_always_on_error_dialog.xml
@@ -23,7 +23,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:text="@string/connection_error"
+        android:text="@string/vpn_connection_error"
         android:textSize="20sp"
         android:layout_marginBottom="16dp"
         android:textColor="@color/shield_text_color"
diff --git a/browser/ui/android/strings/android_brave_strings.grd b/browser/ui/android/strings/android_brave_strings.grd
index 1435cfa995a..7f8884952da 100644
--- a/browser/ui/android/strings/android_brave_strings.grd
+++ b/browser/ui/android/strings/android_brave_strings.grd
@@ -3042,7 +3042,7 @@ If you don't accept this request, VPN will not reconnect and your internet conne
     <message name="IDS_BRAVE_WALLET_DAPPS_CONNECTION_REQUEST_MSG" desc="A message shown to user when a DApp site request to connect with Brave wallet">
     This page wants to interact with Brave Wallet
     </message>
-    <message name="IDS_CONNECTION_ERROR" desc="Always on vpn text">
+    <message name="IDS_VPN_CONNECTION_ERROR" desc="Vpn connection error message">
       Connection error
     </message>
     <message name="IDS_BRAVE_WALLET_NETWORK_SELECTION_ERROR" desc="Network activity toolbar title">