From 0a8e6c175862b842829953a415324da6468fada8 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Wed, 21 Sep 2022 16:38:44 +0200
Subject: [PATCH] Weblate: fix conflict

---
 library/ui-strings/src/main/res/values-de/strings.xml     | 2 +-
 library/ui-strings/src/main/res/values-ru/strings.xml     | 2 +-
 library/ui-strings/src/main/res/values-zh-rCN/strings.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/ui-strings/src/main/res/values-de/strings.xml b/library/ui-strings/src/main/res/values-de/strings.xml
index 3753cedff2..8e502a6392 100644
--- a/library/ui-strings/src/main/res/values-de/strings.xml
+++ b/library/ui-strings/src/main/res/values-de/strings.xml
@@ -2622,4 +2622,4 @@
     <string name="device_manager_other_sessions_description_unverified">Nicht verifiziert · Letzte Aktivität %1$s</string>
     <string name="device_manager_verification_status_detail_unverified">Verifiziere deine aktuelle Sitzung für besonders sichere Nachrichtenübertragung.</string>
     <string name="device_manager_verification_status_unverified">Nicht verifizierte Sitzung</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/library/ui-strings/src/main/res/values-ru/strings.xml b/library/ui-strings/src/main/res/values-ru/strings.xml
index 8d223bae5e..4852be1f82 100644
--- a/library/ui-strings/src/main/res/values-ru/strings.xml
+++ b/library/ui-strings/src/main/res/values-ru/strings.xml
@@ -2678,4 +2678,4 @@
     <string name="explore_rooms">Обзор комнат</string>
     <string name="start_chat">Начать беседу</string>
     <string name="create_room">Создать комнату</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
index ee0e95d648..4e1c8e61c8 100644
--- a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
@@ -2583,4 +2583,4 @@
     <string name="device_manager_verification_status_verified">已验证的会话</string>
     <string name="a11y_device_manager_device_type_unknown">未知的设备类型</string>
     <string name="invites_title">邀请</string>
-</resources>
+</resources>
\ No newline at end of file