diff --git a/flutter/lib/desktop/widgets/remote_toolbar.dart b/flutter/lib/desktop/widgets/remote_toolbar.dart
index fe917278f..ab937787c 100644
--- a/flutter/lib/desktop/widgets/remote_toolbar.dart
+++ b/flutter/lib/desktop/widgets/remote_toolbar.dart
@@ -1071,7 +1071,7 @@ class _DisplayMenuState extends State<_DisplayMenu> {
           Divider(),
           _SubmenuButton(
               ffi: widget.ffi,
-              child: Text(translate('Privacy Mode')),
+              child: Text(translate('Privacy mode')),
               menuChildren: privacyModeList
                   .map((e) => CkbMenuButton(
                       value: e.value,
diff --git a/src/lang/ar.rs b/src/lang/ar.rs
index 381750e81..caa49c143 100644
--- a/src/lang/ar.rs
+++ b/src/lang/ar.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/ca.rs b/src/lang/ca.rs
index b292de892..2a37c36c6 100644
--- a/src/lang/ca.rs
+++ b/src/lang/ca.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/cn.rs b/src/lang/cn.rs
index 86e80d9c2..f796ff873 100644
--- a/src/lang/cn.rs
+++ b/src/lang/cn.rs
@@ -578,7 +578,13 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("capture_display_elevated_connections_tip", "用户提权后，不能显示多个显示器。若要控制多显示器，请安装后再试。"),
         ("Swap control-command key", "交换Control键和Command键"),
         ("swap-left-right-mouse", "交换鼠标左右键"),
+<<<<<<< Updated upstream
         ("2FA code", "双重认证代码"),
         ("2fa_tip", "请输入授权 app 中的双重认证代码"),
+=======
+        ("2FA code", "2FA code"),
+        ("2fa_tip", "请输入授权 app 中的 2FA code"),
+        ("More", ""),
+>>>>>>> Stashed changes
     ].iter().cloned().collect();
 }
diff --git a/src/lang/cs.rs b/src/lang/cs.rs
index eccee6f74..41dc81961 100644
--- a/src/lang/cs.rs
+++ b/src/lang/cs.rs
@@ -578,7 +578,13 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("capture_display_elevated_connections_tip", "Snímání více displejů není podporováno v uživatelském režimu se zvýšenými oprávněními. Pokud chcete ovládat více displejů, zkuste to znovu po instalaci."),
         ("Swap control-command key", "Prohození klávesy control-command"),
         ("swap-left-right-mouse", "Prohodit levé a pravé tlačítko myši"),
+<<<<<<< Updated upstream
         ("2FA code", "2FA kód"),
         ("2fa_tip", "Zadejte svůj kód 2FA do ověřovací aplikace."),
+=======
+        ("2FA code", ""),
+        ("2fa_tip", ""),
+        ("More", ""),
+>>>>>>> Stashed changes
     ].iter().cloned().collect();
 }
diff --git a/src/lang/da.rs b/src/lang/da.rs
index 7414f6ef1..0175bba44 100644
--- a/src/lang/da.rs
+++ b/src/lang/da.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/de.rs b/src/lang/de.rs
index 9e886c054..f18732aea 100644
--- a/src/lang/de.rs
+++ b/src/lang/de.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", "Linke und rechte Maustaste tauschen"),
         ("2FA code", "2FA-Code"),
         ("2fa_tip", "Bitte geben Sie Ihren 2FA-Code in der Authentifizierungs-App ein."),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/el.rs b/src/lang/el.rs
index e32b93c31..689928db0 100644
--- a/src/lang/el.rs
+++ b/src/lang/el.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/eo.rs b/src/lang/eo.rs
index edd8b914f..7c4b75397 100644
--- a/src/lang/eo.rs
+++ b/src/lang/eo.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/es.rs b/src/lang/es.rs
index 9c112e0dd..84b39095f 100644
--- a/src/lang/es.rs
+++ b/src/lang/es.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", "Intercambiar botones derecho-izquierdo del ratón"),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/et.rs b/src/lang/et.rs
index cb300a356..243992ebe 100644
--- a/src/lang/et.rs
+++ b/src/lang/et.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", "Vaheta vasak ja parem hiirenupp"),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/fa.rs b/src/lang/fa.rs
index 9bea7d08d..1b758fc3a 100644
--- a/src/lang/fa.rs
+++ b/src/lang/fa.rs
@@ -576,9 +576,17 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("input_source_1_tip", "منبع ورودی 1"),
         ("input_source_2_tip", "منبع ورودی 2"),
         ("capture_display_elevated_connections_tip", ""),
+<<<<<<< Updated upstream
         ("Swap control-command key", "گرفتن چندین نمایشگر در حالت کاربر زیاد پشتیبانی نمی شود. اگر می‌خواهید چند نمایشگر را کنترل کنید، لطفاً پس از نصب دوباره امتحان کنید."),
         ("swap-left-right-mouse", "دکمه چپ و راست ماوس را عوض کنید"),
         ("2FA code", "کد ورود 2 مرحله ای"),
         ("2fa_tip", "لطفا کد ورود 2 مرحله ای خود را در برنامه احراز هویت وارد کنید"),
+=======
+        ("Swap control-command key", ""),
+        ("swap-left-right-mouse", ""),
+        ("2FA code", ""),
+        ("2fa_tip", ""),
+        ("More", ""),
+>>>>>>> Stashed changes
     ].iter().cloned().collect();
 }
diff --git a/src/lang/fr.rs b/src/lang/fr.rs
index b24cccf85..1cae9241b 100644
--- a/src/lang/fr.rs
+++ b/src/lang/fr.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", "Intervertir le bouton gauche et droit de la souris"),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/hu.rs b/src/lang/hu.rs
index 51e55128e..b18f740db 100644
--- a/src/lang/hu.rs
+++ b/src/lang/hu.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/id.rs b/src/lang/id.rs
index 8881adc70..0becea9cf 100644
--- a/src/lang/id.rs
+++ b/src/lang/id.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/it.rs b/src/lang/it.rs
index 210a4392f..b00b0c29d 100644
--- a/src/lang/it.rs
+++ b/src/lang/it.rs
@@ -578,7 +578,13 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("capture_display_elevated_connections_tip", "La cattura di più display non è supportata nella modalità utente con privilegi elevati. Se vuoi controllare più display riprova dopo l'installazione."),
         ("Swap control-command key", "Scambia tasto controllo-comando"),
         ("swap-left-right-mouse", "Scambia pulsante sinistro-destro mouse"),
+<<<<<<< Updated upstream
         ("2FA code", "Codice 2FA"),
         ("2fa_tip", "Inserisci il codice 2FA nell'app di autenticazione."),
+=======
+        ("2FA code", ""),
+        ("2fa_tip", ""),
+        ("More", ""),
+>>>>>>> Stashed changes
     ].iter().cloned().collect();
 }
diff --git a/src/lang/ja.rs b/src/lang/ja.rs
index de14c5e2f..1f23e7167 100644
--- a/src/lang/ja.rs
+++ b/src/lang/ja.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/ko.rs b/src/lang/ko.rs
index 07b5dbade..43f139b29 100644
--- a/src/lang/ko.rs
+++ b/src/lang/ko.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/kz.rs b/src/lang/kz.rs
index afa2e3459..ecbe399eb 100644
--- a/src/lang/kz.rs
+++ b/src/lang/kz.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/lt.rs b/src/lang/lt.rs
index f8474ac9e..240d85b72 100644
--- a/src/lang/lt.rs
+++ b/src/lang/lt.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/lv.rs b/src/lang/lv.rs
index 068fe9a05..4a6886e01 100644
--- a/src/lang/lv.rs
+++ b/src/lang/lv.rs
@@ -578,7 +578,13 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("capture_display_elevated_connections_tip", "Vairāku displeju uzņemšana netiek atbalstīta paaugstinātā lietotāja režīmā. Lūdzu, mēģiniet vēlreiz pēc instalēšanas, ja vēlaties kontrolēt vairākus displejus."),
         ("Swap control-command key", "Apmainīt vadības un komandas taustiņu"),
         ("swap-left-right-mouse", "Apmainīt kreiso un labo peles pogu"),
+<<<<<<< Updated upstream
         ("2FA code", "2FA kods"),
         ("2fa_tip", "Lūdzu, ievadiet savu 2FA kodu autentifikācijas lietotnē."),
+=======
+        ("2FA code", ""),
+        ("2fa_tip", ""),
+        ("More", ""),
+>>>>>>> Stashed changes
     ].iter().cloned().collect();
 }
diff --git a/src/lang/nb.rs b/src/lang/nb.rs
index 1bcae0702..580930b05 100644
--- a/src/lang/nb.rs
+++ b/src/lang/nb.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/nl.rs b/src/lang/nl.rs
index e4367f194..90e939009 100644
--- a/src/lang/nl.rs
+++ b/src/lang/nl.rs
@@ -578,7 +578,13 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("capture_display_elevated_connections_tip", "Scannen van meerdere schermen wordt niet ondersteund in de bevoorrechte gebruikersmodus. Als je meerdere schermen wilt bedienen, probeer het dan opnieuw na de installatie."),
         ("Swap control-command key", "Wissel controle-commando toets"),
         ("swap-left-right-mouse", "wissel-links-rechts-muis"),
+<<<<<<< Updated upstream
         ("2FA code", "2FA-code"),
         ("2fa_tip", "Geef je 2FA-code op in de verificatie-app."),
+=======
+        ("2FA code", ""),
+        ("2fa_tip", ""),
+        ("More", ""),
+>>>>>>> Stashed changes
     ].iter().cloned().collect();
 }
diff --git a/src/lang/pl.rs b/src/lang/pl.rs
index 9856b2abb..02acd06b1 100644
--- a/src/lang/pl.rs
+++ b/src/lang/pl.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", "Zamień przyciski myszki (lewy - prawy)"),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/pt_PT.rs b/src/lang/pt_PT.rs
index 4902b0218..e9088214b 100644
--- a/src/lang/pt_PT.rs
+++ b/src/lang/pt_PT.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/ptbr.rs b/src/lang/ptbr.rs
index f021b6094..4e218cce5 100644
--- a/src/lang/ptbr.rs
+++ b/src/lang/ptbr.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/ro.rs b/src/lang/ro.rs
index dca2b854e..93c8f0010 100644
--- a/src/lang/ro.rs
+++ b/src/lang/ro.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/ru.rs b/src/lang/ru.rs
index e00171be2..c9b33db27 100644
--- a/src/lang/ru.rs
+++ b/src/lang/ru.rs
@@ -578,7 +578,13 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("capture_display_elevated_connections_tip", "Захват экрана нескольких дисплеев не поддерживается в режиме повышенных прав. Повторите попытку после установки, если хотите управлять несколькими дисплеями."),
         ("Swap control-command key", "Поменять кнопки управления и команд"),
         ("swap-left-right-mouse", "Поменять левую и правую кнопки мыши"),
+<<<<<<< Updated upstream
         ("2FA code", "Код 2FA"),
         ("2fa_tip", "Введите код двухфакторной аутентификации из приложения для аутентификации."),
+=======
+        ("2FA code", ""),
+        ("2fa_tip", ""),
+        ("More", ""),
+>>>>>>> Stashed changes
     ].iter().cloned().collect();
 }
diff --git a/src/lang/sk.rs b/src/lang/sk.rs
index 0d7205a6d..c16f57ea6 100644
--- a/src/lang/sk.rs
+++ b/src/lang/sk.rs
@@ -578,7 +578,13 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("capture_display_elevated_connections_tip", "Snímanie viacerých displejov nie je podporované v režime privilegovaného používateľa. Ak chcete ovládať viac displejov, skúste to po inštalácii znova."),
         ("Swap control-command key", "Vymeniť kláves ovládania a príkazu"),
         ("swap-left-right-mouse", "Prehodiť ľavé a pravé tlačidlo myši"),
+<<<<<<< Updated upstream
         ("2FA code", "2FA kód"),
         ("2fa_tip", "Zadajte svoj kód 2FA do aplikácie na overovanie."),
+=======
+        ("2FA code", ""),
+        ("2fa_tip", ""),
+        ("More", ""),
+>>>>>>> Stashed changes
     ].iter().cloned().collect();
 }
diff --git a/src/lang/sl.rs b/src/lang/sl.rs
index 757a70380..3faa062af 100755
--- a/src/lang/sl.rs
+++ b/src/lang/sl.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/sq.rs b/src/lang/sq.rs
index 584408076..4cb980874 100644
--- a/src/lang/sq.rs
+++ b/src/lang/sq.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/sr.rs b/src/lang/sr.rs
index 099e59c37..e4ddd2c3b 100644
--- a/src/lang/sr.rs
+++ b/src/lang/sr.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/sv.rs b/src/lang/sv.rs
index cb5e41549..a7f0f0fe8 100644
--- a/src/lang/sv.rs
+++ b/src/lang/sv.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/template.rs b/src/lang/template.rs
index 60ae853b8..04b3a70f8 100644
--- a/src/lang/template.rs
+++ b/src/lang/template.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/th.rs b/src/lang/th.rs
index afb812c11..1dac813f2 100644
--- a/src/lang/th.rs
+++ b/src/lang/th.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/tr.rs b/src/lang/tr.rs
index f9c5d0304..e9e7d8985 100644
--- a/src/lang/tr.rs
+++ b/src/lang/tr.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/tw.rs b/src/lang/tw.rs
index fe6a65e53..3f77f70ce 100644
--- a/src/lang/tw.rs
+++ b/src/lang/tw.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/ua.rs b/src/lang/ua.rs
index 10ee99713..f4281dc51 100644
--- a/src/lang/ua.rs
+++ b/src/lang/ua.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", "Поміняти місцями ліву та праву кнопки миші"),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/vn.rs b/src/lang/vn.rs
index 2c2751a8a..1701105dc 100644
--- a/src/lang/vn.rs
+++ b/src/lang/vn.rs
@@ -580,5 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", ""),
         ("2FA code", ""),
         ("2fa_tip", ""),
+        ("More", ""),
     ].iter().cloned().collect();
 }