diff --git a/flutter/lib/desktop/widgets/remote_toolbar.dart b/flutter/lib/desktop/widgets/remote_toolbar.dart
index 17b1ce540..19dd79a2f 100644
--- a/flutter/lib/desktop/widgets/remote_toolbar.dart
+++ b/flutter/lib/desktop/widgets/remote_toolbar.dart
@@ -1023,15 +1023,16 @@ class _ResolutionsMenuState extends State<_ResolutionsMenu> {
     final showFitLocalBtn = !_isRemoteResolutionFitLocal();
 
     return _SubmenuButton(
-        ffi: widget.ffi,
-        menuChildren: <Widget>[
-              _OriginalResolutionMenuButton(showOriginalBtn),
-              _FitLocalResolutionMenuButton(showFitLocalBtn),
-              // _customResolutionMenuButton(isVirtualDisplay),
-              _menuDivider(showOriginalBtn, showFitLocalBtn, isVirtualDisplay),
-            ] +
-            _supportedResolutionMenuButtons(),
-        child: Text(translate("Resolution")));
+      ffi: widget.ffi,
+      menuChildren: <Widget>[
+            _OriginalResolutionMenuButton(showOriginalBtn),
+            _FitLocalResolutionMenuButton(showFitLocalBtn),
+            // _customResolutionMenuButton(isVirtualDisplay),
+            _menuDivider(showOriginalBtn, showFitLocalBtn, isVirtualDisplay),
+          ] +
+          _supportedResolutionMenuButtons(),
+      child: Text(translate("Resolution")),
+    );
   }
 
   _menuDivider(
@@ -1094,7 +1095,7 @@ class _ResolutionsMenuState extends State<_ResolutionsMenu> {
             _changeResolution(display.originalWidth, display.originalHeight),
         ffi: widget.ffi,
         child: Text(
-            '${translate('Original')} ${display.originalWidth}x${display.originalHeight}'),
+            '${translate('resolution_original_tip')} ${display.originalWidth}x${display.originalHeight}'),
       ),
     );
   }
@@ -1111,7 +1112,7 @@ class _ResolutionsMenuState extends State<_ResolutionsMenu> {
         },
         ffi: widget.ffi,
         child: Text(
-            '${translate('Fit Local')} ${_localResolution?.width ?? 0}x${_localResolution?.height ?? 0}'),
+            '${translate('resolution_fit_local_tip')} ${_localResolution?.width ?? 0}x${_localResolution?.height ?? 0}'),
       ),
     );
   }
@@ -1131,8 +1132,8 @@ class _ResolutionsMenuState extends State<_ResolutionsMenu> {
       child: MenuButton(
         onPressed: () => _customResolutionDialog(),
         ffi: widget.ffi,
-        child:
-            Text('${translate('Custom')} ${display.width}x${display.height}'),
+        child: Text(
+            '${translate('resolution_custom_tip')} ${display.width}x${display.height}'),
       ),
     );
   }
diff --git a/res/lang.py b/res/lang.py
index 85fd08654..74492818a 100644
--- a/res/lang.py
+++ b/res/lang.py
@@ -36,7 +36,7 @@ def main():
 
 
 def expand():
-  for fn in glob.glob('./src/lang/*'):
+  for fn in glob.glob('./src/lang/*.rs'):
     lang = os.path.basename(fn)[:-3]
     if lang in ['en','template']: continue
     print(lang)
diff --git a/src/lang/ca.rs b/src/lang/ca.rs
index 0d876d6f2..5ca5cb6f1 100644
--- a/src/lang/ca.rs
+++ b/src/lang/ca.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/cn.rs b/src/lang/cn.rs
index 447460174..b325dee22 100644
--- a/src/lang/cn.rs
+++ b/src/lang/cn.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", "启用"),
         ("Disable", "禁用"),
         ("Options", "选项"),
+        ("resolution_original_tip", "原始分辨率"),
+        ("resolution_fit_local_tip", "适应本地分辨率"),
+        ("resolution_custom_tip", "自定义分辨率"),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/cs.rs b/src/lang/cs.rs
index e38e7620f..0596c3590 100644
--- a/src/lang/cs.rs
+++ b/src/lang/cs.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/da.rs b/src/lang/da.rs
index e863f534f..3db456bfe 100644
--- a/src/lang/da.rs
+++ b/src/lang/da.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/de.rs b/src/lang/de.rs
index 50f8f3e7e..199ff886c 100644
--- a/src/lang/de.rs
+++ b/src/lang/de.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", "Aktivieren"),
         ("Disable", "Deaktivieren"),
         ("Options", "Einstellungen"),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/el.rs b/src/lang/el.rs
index 40c3d30d6..fafcf1698 100644
--- a/src/lang/el.rs
+++ b/src/lang/el.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/en.rs b/src/lang/en.rs
index 93a56544a..8e86125c6 100644
--- a/src/lang/en.rs
+++ b/src/lang/en.rs
@@ -66,5 +66,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("xorg_not_found_text_tip", "Please install Xorg"),
         ("no_desktop_title_tip", "No desktop is available"),
         ("no_desktop_text_tip", "Please install GNOME desktop"),
+        ("resolution_original_tip", "Original resolution"),
+        ("resolution_fit_local_tip", "Fit local resolution"),
+        ("resolution_custom_tip", "Custom resolution"),
         ].iter().cloned().collect();
 }
diff --git a/src/lang/eo.rs b/src/lang/eo.rs
index 61e57d5f5..a18cc6ee0 100644
--- a/src/lang/eo.rs
+++ b/src/lang/eo.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/es.rs b/src/lang/es.rs
index 6daf738ba..2b4b20115 100644
--- a/src/lang/es.rs
+++ b/src/lang/es.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", "Habilitar"),
         ("Disable", "Inhabilitar"),
         ("Options", "Opciones"),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/fa.rs b/src/lang/fa.rs
index eb35b0ff1..b44e796fd 100644
--- a/src/lang/fa.rs
+++ b/src/lang/fa.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", "فعال کردن"),
         ("Disable", "غیر فعال کردن"),
         ("Options", "گزینه ها"),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/fr.rs b/src/lang/fr.rs
index 645a088bc..a1482a04b 100644
--- a/src/lang/fr.rs
+++ b/src/lang/fr.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/hu.rs b/src/lang/hu.rs
index 3fca393b1..5828efb08 100644
--- a/src/lang/hu.rs
+++ b/src/lang/hu.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/id.rs b/src/lang/id.rs
index e746d509d..b90c96ec6 100644
--- a/src/lang/id.rs
+++ b/src/lang/id.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/it.rs b/src/lang/it.rs
index a0f2e9bab..e3c59bdae 100644
--- a/src/lang/it.rs
+++ b/src/lang/it.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", "Abilita"),
         ("Disable", "Disabilita"),
         ("Options", "Opzioni"),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/ja.rs b/src/lang/ja.rs
index cf49377ec..4e8267aea 100644
--- a/src/lang/ja.rs
+++ b/src/lang/ja.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/ko.rs b/src/lang/ko.rs
index eab5f189f..32c34d086 100644
--- a/src/lang/ko.rs
+++ b/src/lang/ko.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/kz.rs b/src/lang/kz.rs
index c0d90b433..e345c993c 100644
--- a/src/lang/kz.rs
+++ b/src/lang/kz.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/lt.rs b/src/lang/lt.rs
index 953d0ad43..fe1336848 100644
--- a/src/lang/lt.rs
+++ b/src/lang/lt.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/nl.rs b/src/lang/nl.rs
index 92f2c9557..bdcc4314c 100644
--- a/src/lang/nl.rs
+++ b/src/lang/nl.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", "Activeer"),
         ("Disable", "Deactiveer"),
         ("Options", "Opties"),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/pl.rs b/src/lang/pl.rs
index 11bf58f19..9dffed6e9 100644
--- a/src/lang/pl.rs
+++ b/src/lang/pl.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", "Włącz"),
         ("Disable", "Wyłącz"),
         ("Options", "Opcje"),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/pt_PT.rs b/src/lang/pt_PT.rs
index 07bb8a065..e28f8b1cc 100644
--- a/src/lang/pt_PT.rs
+++ b/src/lang/pt_PT.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/ptbr.rs b/src/lang/ptbr.rs
index 5627a5f2a..e3fa71ad9 100644
--- a/src/lang/ptbr.rs
+++ b/src/lang/ptbr.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", "Habilitar"),
         ("Disable", "Desabilitar"),
         ("Options", "Opções"),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/ro.rs b/src/lang/ro.rs
index 04d9f9d22..81665e73a 100644
--- a/src/lang/ro.rs
+++ b/src/lang/ro.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/ru.rs b/src/lang/ru.rs
index c2517df99..7d277450e 100644
--- a/src/lang/ru.rs
+++ b/src/lang/ru.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", "Включить"),
         ("Disable", "Отключить"),
         ("Options", "Настройки"),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/sk.rs b/src/lang/sk.rs
index 0e2559193..cea678364 100644
--- a/src/lang/sk.rs
+++ b/src/lang/sk.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/sl.rs b/src/lang/sl.rs
index c6188aaf8..35edd0568 100755
--- a/src/lang/sl.rs
+++ b/src/lang/sl.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/sq.rs b/src/lang/sq.rs
index c55a4741e..c4e248ea2 100644
--- a/src/lang/sq.rs
+++ b/src/lang/sq.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/sr.rs b/src/lang/sr.rs
index 3f37e23c7..5fc30af0b 100644
--- a/src/lang/sr.rs
+++ b/src/lang/sr.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/sv.rs b/src/lang/sv.rs
index 5a76a1677..78331d448 100644
--- a/src/lang/sv.rs
+++ b/src/lang/sv.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/template.rs b/src/lang/template.rs
index f61635f9a..a20769abb 100644
--- a/src/lang/template.rs
+++ b/src/lang/template.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/th.rs b/src/lang/th.rs
index ab4ec4993..3ef4142c4 100644
--- a/src/lang/th.rs
+++ b/src/lang/th.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/tr.rs b/src/lang/tr.rs
index 3fd57d1cd..7572cbee1 100644
--- a/src/lang/tr.rs
+++ b/src/lang/tr.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/tw.rs b/src/lang/tw.rs
index b9cdb60dd..f624b2006 100644
--- a/src/lang/tw.rs
+++ b/src/lang/tw.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/ua.rs b/src/lang/ua.rs
index 68580c73b..2f98d9fe2 100644
--- a/src/lang/ua.rs
+++ b/src/lang/ua.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }
diff --git a/src/lang/vn.rs b/src/lang/vn.rs
index 9e64ca784..6781ca2d5 100644
--- a/src/lang/vn.rs
+++ b/src/lang/vn.rs
@@ -506,5 +506,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable", ""),
         ("Disable", ""),
         ("Options", ""),
+        ("resolution_original_tip", ""),
+        ("resolution_fit_local_tip", ""),
+        ("resolution_custom_tip", ""),
     ].iter().cloned().collect();
 }