diff --git a/src/Ryujinx/Assets/locales.json b/src/Ryujinx/Assets/locales.json
index fa7e3bbd8..39eb512de 100644
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -1042,7 +1042,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "720p",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "720p",
@@ -1066,7 +1066,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "1080p",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "1080p",
@@ -2122,7 +2122,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "ExeFS",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "ExeFS",
@@ -2170,7 +2170,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "RomFS",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "RomFS",
@@ -3994,7 +3994,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "OpenAL",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "OpenAL",
@@ -4042,7 +4042,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "SDL2",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "SDL2",
@@ -4165,7 +4165,11 @@
         "no_NO": "6GB",
         "pl_PL": "",
         "pt_BR": "",
+<<<<<<< HEAD
         "ru_RU": "6 ГиБ",
+=======
+        "ru_RU": "6ГиБ",
+>>>>>>> b5a9c73bb (ru_Ru locale update)
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "6Гб",
@@ -4189,7 +4193,11 @@
         "no_NO": "8GB",
         "pl_PL": "",
         "pt_BR": "",
+<<<<<<< HEAD
         "ru_RU": "8 ГиБ",
+=======
+        "ru_RU": "8ГиБ",
+>>>>>>> b5a9c73bb (ru_Ru locale update)
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "8Гб",
@@ -4213,7 +4221,11 @@
         "no_NO": "12GB",
         "pl_PL": "",
         "pt_BR": "",
+<<<<<<< HEAD
         "ru_RU": "12 ГиБ",
+=======
+        "ru_RU": "12ГиБ",
+>>>>>>> b5a9c73bb (ru_Ru locale update)
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "12Гб",
@@ -4666,7 +4678,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "4:3",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "4:3",
@@ -4690,7 +4702,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "16:9",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "16:9",
@@ -4714,7 +4726,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "16:10",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "16:10",
@@ -4738,7 +4750,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "21:9",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "21:9",
@@ -6106,7 +6118,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "A",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Α",
@@ -6130,7 +6142,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "B",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "B",
@@ -6154,7 +6166,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "X",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "X",
@@ -6178,7 +6190,7 @@
         "it_IT": "",
         "ja_JP": "",
         "ko_KR": "",
-        "no_NO": "Y",
+        "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "Y",
@@ -8149,7 +8161,7 @@
         "no_NO": "Tøm",
         "pl_PL": "",
         "pt_BR": "",
-        "ru_RU": "Очистить",
+        "ru_RU": "",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Очистити",