summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/android/app/src/main/res/values-de/strings.xml20
-rw-r--r--src/android/app/src/main/res/values-es/strings.xml18
-rw-r--r--src/android/app/src/main/res/values-fr/strings.xml18
-rw-r--r--src/android/app/src/main/res/values-it/strings.xml18
-rw-r--r--src/android/app/src/main/res/values-ja/strings.xml18
-rw-r--r--src/android/app/src/main/res/values-ko/strings.xml18
-rw-r--r--src/android/app/src/main/res/values-nb/strings.xml18
-rw-r--r--src/android/app/src/main/res/values-pl/strings.xml18
-rw-r--r--src/android/app/src/main/res/values-pt-rBR/strings.xml18
-rw-r--r--src/android/app/src/main/res/values-pt-rPT/strings.xml18
-rw-r--r--src/android/app/src/main/res/values-ru/strings.xml18
-rw-r--r--src/android/app/src/main/res/values-uk/strings.xml18
-rw-r--r--src/android/app/src/main/res/values-zh-rCN/strings.xml18
-rw-r--r--src/android/app/src/main/res/values-zh-rTW/strings.xml18
-rw-r--r--src/android/app/src/main/res/values/strings.xml36
-rw-r--r--src/core/hle/service/time/time_zone_content_manager.cpp17
-rw-r--r--src/core/hle/service/time/time_zone_content_manager.h2
-rw-r--r--src/core/memory.cpp21
-rw-r--r--src/video_core/vulkan_common/vulkan_device.cpp6
19 files changed, 50 insertions, 286 deletions
diff --git a/src/android/app/src/main/res/values-de/strings.xml b/src/android/app/src/main/res/values-de/strings.xml
index 969223ef8..0c1d91264 100644
--- a/src/android/app/src/main/res/values-de/strings.xml
+++ b/src/android/app/src/main/res/values-de/strings.xml
@@ -235,26 +235,6 @@
235 <string name="region_korea">Korea</string> 235 <string name="region_korea">Korea</string>
236 <string name="region_taiwan">Taiwan</string> 236 <string name="region_taiwan">Taiwan</string>
237 237
238 <!-- Language Names -->
239 <string name="language_japanese">Japanisch (日本語)</string>
240 <string name="language_english">Englisch</string>
241 <string name="language_french">Französisch (Français)</string>
242 <string name="langauge_german">Deutsch (German)</string>
243 <string name="language_italian">Italienisch (Italiano)</string>
244 <string name="language_spanish">Spanisch (Español)</string>
245 <string name="language_chinese">Chinesisch (简体中文)</string>
246 <string name="language_korean">Koreanisch (한국어)</string>
247 <string name="language_dutch">Niederländisch (Nederlands)</string>
248 <string name="language_portuguese">Portugiesisch (Português)</string>
249 <string name="language_russian">Russisch (Русский)</string>
250 <string name="language_taiwanese">Taiwanesisch (台湾)</string>
251 <string name="language_british_english">Britisches Englisch</string>
252 <string name="language_canadian_french">Kanadisches Französisch (Français canadien)</string>
253 <string name="language_latin_american_spanish">Lateinamerikanisches Spanisch (Español latinoamericano)</string>
254 <string name="language_simplified_chinese">Vereinfachtes Chinesisch (简体中文)</string>
255 <string name="language_traditional_chinese">Traditionelles Chinesisch (正體中文)</string>
256 <string name="language_brazilian_portuguese">Brasilianisches Portugiesisch (Português do Brasil)</string>
257
258 <!-- Renderer APIs --> 238 <!-- Renderer APIs -->
259 <string name="renderer_vulkan">Vulkan</string> 239 <string name="renderer_vulkan">Vulkan</string>
260 <string name="renderer_none">Keiner</string> 240 <string name="renderer_none">Keiner</string>
diff --git a/src/android/app/src/main/res/values-es/strings.xml b/src/android/app/src/main/res/values-es/strings.xml
index 986e80e50..357f956d1 100644
--- a/src/android/app/src/main/res/values-es/strings.xml
+++ b/src/android/app/src/main/res/values-es/strings.xml
@@ -241,24 +241,6 @@
241 <string name="region_taiwan">Taiwán</string> 241 <string name="region_taiwan">Taiwán</string>
242 242
243 <!-- Language Names --> 243 <!-- Language Names -->
244 <string name="language_japanese">Japonés (日本語)</string>
245 <string name="language_english">Inglés (English)</string>
246 <string name="language_french">Francés (Français)</string>
247 <string name="langauge_german">Alemán (deutsch)</string>
248 <string name="language_italian">Italiano (Italiano)</string>
249 <string name="language_spanish">Español (Español)</string>
250 <string name="language_chinese">Chino (简体中文)</string>
251 <string name="language_korean">Coreano (한국어)</string>
252 <string name="language_dutch">Holandés (nederlands)</string>
253 <string name="language_portuguese">Portugués (Português)</string>
254 <string name="language_russian">Ruso (Русский)</string>
255 <string name="language_taiwanese">Taiwanés (台湾)</string>
256 <string name="language_british_english">Inglés británico</string>
257 <string name="language_canadian_french">Francés Canadiense (Français canadien)</string>
258 <string name="language_latin_american_spanish">Español Latinoamericano (Español latinoamericano)</string>
259 <string name="language_simplified_chinese">Chino Simplificado (简体中文)</string>
260 <string name="language_traditional_chinese">Chino tradicional (正體中文)</string>
261 <string name="language_brazilian_portuguese">Portugués Brasileño (Português do Brasil)</string>
262 244
263 <!-- Renderer APIs --> 245 <!-- Renderer APIs -->
264 <string name="renderer_vulkan">Vulkan</string> 246 <string name="renderer_vulkan">Vulkan</string>
diff --git a/src/android/app/src/main/res/values-fr/strings.xml b/src/android/app/src/main/res/values-fr/strings.xml
index 14a9b2d5c..dfca1c830 100644
--- a/src/android/app/src/main/res/values-fr/strings.xml
+++ b/src/android/app/src/main/res/values-fr/strings.xml
@@ -241,24 +241,6 @@
241 <string name="region_taiwan">Taïwan</string> 241 <string name="region_taiwan">Taïwan</string>
242 242
243 <!-- Language Names --> 243 <!-- Language Names -->
244 <string name="language_japanese">Japonais (日本語)</string>
245 <string name="language_english">Anglais</string>
246 <string name="language_french">Français (Français)</string>
247 <string name="langauge_german">Allemand (Deutsch)</string>
248 <string name="language_italian">Italien (Italiano)</string>
249 <string name="language_spanish">Espagnol (Español)</string>
250 <string name="language_chinese">Chinois (简体中文)</string>
251 <string name="language_korean">Coréen (한국어)</string>
252 <string name="language_dutch">Néerlandais (Nederlands)</string>
253 <string name="language_portuguese">Portugais (Português)</string>
254 <string name="language_russian">Russe (Русский)</string>
255 <string name="language_taiwanese">Taïwanais (台湾)</string>
256 <string name="language_british_english">Anglais Britannique</string>
257 <string name="language_canadian_french">Français canadien (Français canadien)</string>
258 <string name="language_latin_american_spanish">Espagnol latino-américain (Español latinoamericano)</string>
259 <string name="language_simplified_chinese">Chinois simplifié (简体中文)</string>
260 <string name="language_traditional_chinese">Chinois Traditionnel (正體中文)</string>
261 <string name="language_brazilian_portuguese">Portugais brésilien (Português do Brasil)</string>
262 244
263 <!-- Renderer APIs --> 245 <!-- Renderer APIs -->
264 <string name="renderer_vulkan">Vulkan</string> 246 <string name="renderer_vulkan">Vulkan</string>
diff --git a/src/android/app/src/main/res/values-it/strings.xml b/src/android/app/src/main/res/values-it/strings.xml
index 47a4cfa31..089d93ed6 100644
--- a/src/android/app/src/main/res/values-it/strings.xml
+++ b/src/android/app/src/main/res/values-it/strings.xml
@@ -241,24 +241,6 @@
241 <string name="region_taiwan">Taiwan</string> 241 <string name="region_taiwan">Taiwan</string>
242 242
243 <!-- Language Names --> 243 <!-- Language Names -->
244 <string name="language_japanese">Giapponese (日本語)</string>
245 <string name="language_english">Inglese (English)</string>
246 <string name="language_french">Francese (Français)</string>
247 <string name="langauge_german">Tedesco (Deutsch)</string>
248 <string name="language_italian">Italiano (Italiano)</string>
249 <string name="language_spanish">Spagnolo (Español)</string>
250 <string name="language_chinese">Cinese (简体中文)</string>
251 <string name="language_korean">Coreano (한국어)</string>
252 <string name="language_dutch">Olandese (Nederlands)</string>
253 <string name="language_portuguese">Portoghese (Português)</string>
254 <string name="language_russian">Russo (Русский)</string>
255 <string name="language_taiwanese">Taiwanese (台湾)</string>
256 <string name="language_british_english">Inglese britannico</string>
257 <string name="language_canadian_french">Francese Canadese (Français canadien)</string>
258 <string name="language_latin_american_spanish">Spagnolo Latino Americano (Español latinoamericano)</string>
259 <string name="language_simplified_chinese">Cinese Semplificato (简体中文)</string>
260 <string name="language_traditional_chinese">Cinese tradizionale (正體中文)</string>
261 <string name="language_brazilian_portuguese">Portoghese (Português)</string>
262 244
263 <!-- Renderer APIs --> 245 <!-- Renderer APIs -->
264 <string name="renderer_vulkan">Vulkan</string> 246 <string name="renderer_vulkan">Vulkan</string>
diff --git a/src/android/app/src/main/res/values-ja/strings.xml b/src/android/app/src/main/res/values-ja/strings.xml
index 46eda9ef7..39b590bee 100644
--- a/src/android/app/src/main/res/values-ja/strings.xml
+++ b/src/android/app/src/main/res/values-ja/strings.xml
@@ -239,24 +239,6 @@
239 <string name="region_taiwan">台湾</string> 239 <string name="region_taiwan">台湾</string>
240 240
241 <!-- Language Names --> 241 <!-- Language Names -->
242 <string name="language_japanese">日本語</string>
243 <string name="language_english">英語</string>
244 <string name="language_french">フランス語 (Français)</string>
245 <string name="langauge_german">ドイツ語 (Deutsch)</string>
246 <string name="language_italian">イタリア語 (Italiano)</string>
247 <string name="language_spanish">スペイン語 (Español)</string>
248 <string name="language_chinese">中国語 (简体中文)</string>
249 <string name="language_korean">韓国語 (한국어)</string>
250 <string name="language_dutch">オランダ語 (Nederlands)</string>
251 <string name="language_portuguese">ポルトガル語 (Português)</string>
252 <string name="language_russian">ロシア語 (Русский)</string>
253 <string name="language_taiwanese">台湾語 (台湾)</string>
254 <string name="language_british_english">イギリス英語</string>
255 <string name="language_canadian_french">フランス語(カナダ) (Français canadien)</string>
256 <string name="language_latin_american_spanish">スペイン語(ラテンアメリカ) (Español latinoamericano)</string>
257 <string name="language_simplified_chinese">中国語 (简体中文)</string>
258 <string name="language_traditional_chinese">繁体字中国語 (正體中文)</string>
259 <string name="language_brazilian_portuguese">ポルトガル語(ブラジル) (Português do Brasil)</string>
260 242
261 <!-- Renderer APIs --> 243 <!-- Renderer APIs -->
262 <string name="renderer_vulkan">Vulkan</string> 244 <string name="renderer_vulkan">Vulkan</string>
diff --git a/src/android/app/src/main/res/values-ko/strings.xml b/src/android/app/src/main/res/values-ko/strings.xml
index 5da80ab4b..cbcb2873f 100644
--- a/src/android/app/src/main/res/values-ko/strings.xml
+++ b/src/android/app/src/main/res/values-ko/strings.xml
@@ -241,24 +241,6 @@
241 <string name="region_taiwan">타이완</string> 241 <string name="region_taiwan">타이완</string>
242 242
243 <!-- Language Names --> 243 <!-- Language Names -->
244 <string name="language_japanese">일본어 (日本語)</string>
245 <string name="language_english">영어 (English)</string>
246 <string name="language_french">프랑스어 (Français)</string>
247 <string name="langauge_german">독일어(Deutsch)</string>
248 <string name="language_italian">이탈리아어 (Italiano)</string>
249 <string name="language_spanish">스페인어 (Español)</string>
250 <string name="language_chinese">중국어 (简体中文)</string>
251 <string name="language_korean">한국어 (Korean)</string>
252 <string name="language_dutch">네덜란드어 (Nederlands)</string>
253 <string name="language_portuguese">포르투갈어 (Português)</string>
254 <string name="language_russian">러시아어 (Русский)</string>
255 <string name="language_taiwanese">대만어 (台湾)</string>
256 <string name="language_british_english">영어 (British English)</string>
257 <string name="language_canadian_french">캐나다 프랑스어 (Français canadien)</string>
258 <string name="language_latin_american_spanish">라틴 아메리카 스페인어 (Español latinoamericano)</string>
259 <string name="language_simplified_chinese">중국어 간체 (简体中文)</string>
260 <string name="language_traditional_chinese">중국어 번체 (正體中文)</string>
261 <string name="language_brazilian_portuguese">브라질 포르투갈어 (Português do Brasil)</string>
262 244
263 <!-- Renderer APIs --> 245 <!-- Renderer APIs -->
264 <string name="renderer_vulkan">불칸</string> 246 <string name="renderer_vulkan">불칸</string>
diff --git a/src/android/app/src/main/res/values-nb/strings.xml b/src/android/app/src/main/res/values-nb/strings.xml
index 3e1f9bce5..e48a4be38 100644
--- a/src/android/app/src/main/res/values-nb/strings.xml
+++ b/src/android/app/src/main/res/values-nb/strings.xml
@@ -241,24 +241,6 @@
241 <string name="region_taiwan">Taiwan</string> 241 <string name="region_taiwan">Taiwan</string>
242 242
243 <!-- Language Names --> 243 <!-- Language Names -->
244 <string name="language_japanese">Japansk (日本語)</string>
245 <string name="language_english">Engelsk</string>
246 <string name="language_french">Fransk (Français)</string>
247 <string name="langauge_german">Tysk (Deutsch)</string>
248 <string name="language_italian">Italiensk (Italiano)</string>
249 <string name="language_spanish">Spansk (Español)</string>
250 <string name="language_chinese">Kinesisk (简体中文)</string>
251 <string name="language_korean">Koreansk (한국어)</string>
252 <string name="language_dutch">Nederlandsk (Nederlands)</string>
253 <string name="language_portuguese">Portugisisk (Português)</string>
254 <string name="language_russian">Russisk (Русский)</string>
255 <string name="language_taiwanese">Taiwansk (台湾)</string>
256 <string name="language_british_english">Britisk Engelsk</string>
257 <string name="language_canadian_french">Kanadisk fransk (Français canadien)</string>
258 <string name="language_latin_american_spanish">Latinamerikansk spansk (Español latinoamericano)</string>
259 <string name="language_simplified_chinese">Forenklet kinesisk (简体中文)</string>
260 <string name="language_traditional_chinese">Tradisjonell Kinesisk (正體中文)</string>
261 <string name="language_brazilian_portuguese">Brasiliansk portugisisk (Português do Brasil)</string>
262 244
263 <!-- Renderer APIs --> 245 <!-- Renderer APIs -->
264 <string name="renderer_vulkan">Vulkan</string> 246 <string name="renderer_vulkan">Vulkan</string>
diff --git a/src/android/app/src/main/res/values-pl/strings.xml b/src/android/app/src/main/res/values-pl/strings.xml
index 1cd1a8f87..bc9c0f7f4 100644
--- a/src/android/app/src/main/res/values-pl/strings.xml
+++ b/src/android/app/src/main/res/values-pl/strings.xml
@@ -241,24 +241,6 @@
241 <string name="region_taiwan">Tajwan</string> 241 <string name="region_taiwan">Tajwan</string>
242 242
243 <!-- Language Names --> 243 <!-- Language Names -->
244 <string name="language_japanese">Japoński (日本語)</string>
245 <string name="language_english">Angielski</string>
246 <string name="language_french">Francuski (Francja)</string>
247 <string name="langauge_german">Niemiecki (Niemcy)</string>
248 <string name="language_italian">Włoski (Włochy)</string>
249 <string name="language_spanish">Hiszpański (Hiszpania)</string>
250 <string name="language_chinese">Chiński (简体中文)</string>
251 <string name="language_korean">Koreański (한국어)</string>
252 <string name="language_dutch">Duński (Holandia)</string>
253 <string name="language_portuguese">Portugalski (Portugalia)</string>
254 <string name="language_russian">Rosyjski (Русский)</string>
255 <string name="language_taiwanese">Tajwański (台湾)</string>
256 <string name="language_british_english">Angielski Brytyjski</string>
257 <string name="language_canadian_french">Francuski (Kanada)</string>
258 <string name="language_latin_american_spanish">Hiszpański (Ameryka Latynoska)</string>
259 <string name="language_simplified_chinese">Chiński uproszczony (简体中文)</string>
260 <string name="language_traditional_chinese">Chiński tradycyjny (正體中文)</string>
261 <string name="language_brazilian_portuguese">Portugalski (Brazylia)</string>
262 244
263 <!-- Renderer APIs --> 245 <!-- Renderer APIs -->
264 <string name="renderer_vulkan">Vulkan</string> 246 <string name="renderer_vulkan">Vulkan</string>
diff --git a/src/android/app/src/main/res/values-pt-rBR/strings.xml b/src/android/app/src/main/res/values-pt-rBR/strings.xml
index 35197c280..75fe0edbf 100644
--- a/src/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/src/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -241,24 +241,6 @@
241 <string name="region_taiwan">Taiwan</string> 241 <string name="region_taiwan">Taiwan</string>
242 242
243 <!-- Language Names --> 243 <!-- Language Names -->
244 <string name="language_japanese">Japônes (日本語)</string>
245 <string name="language_english">Português do Brasil</string>
246 <string name="language_french">Francês (Français)</string>
247 <string name="langauge_german">Alemão (Deutsch)</string>
248 <string name="language_italian">Italiano (Italiano)</string>
249 <string name="language_spanish">Espanhol (Español)</string>
250 <string name="language_chinese">Mandarim (简体中文)</string>
251 <string name="language_korean">Coreano (한국어)</string>
252 <string name="language_dutch">Holandês (Nederlands)</string>
253 <string name="language_portuguese">Português (Português)</string>
254 <string name="language_russian">Russo (Русский)</string>
255 <string name="language_taiwanese">Taiwanês (台湾)</string>
256 <string name="language_british_english">Inglês britânico (British English)</string>
257 <string name="language_canadian_french">Fracês Canadiano (Français canadien)</string>
258 <string name="language_latin_american_spanish">Espanhol da América Latina (Español latino-americano)</string>
259 <string name="language_simplified_chinese">Chinês Simplificado (简体中文)</string>
260 <string name="language_traditional_chinese">Chinês tradicional (正體中文)</string>
261 <string name="language_brazilian_portuguese">Português do Brasil (Português do Brasil)</string>
262 244
263 <!-- Renderer APIs --> 245 <!-- Renderer APIs -->
264 <string name="renderer_vulkan">Vulcano</string> 246 <string name="renderer_vulkan">Vulcano</string>
diff --git a/src/android/app/src/main/res/values-pt-rPT/strings.xml b/src/android/app/src/main/res/values-pt-rPT/strings.xml
index 8761e2374..96b040c66 100644
--- a/src/android/app/src/main/res/values-pt-rPT/strings.xml
+++ b/src/android/app/src/main/res/values-pt-rPT/strings.xml
@@ -241,24 +241,6 @@
241 <string name="region_taiwan">Taiwan</string> 241 <string name="region_taiwan">Taiwan</string>
242 242
243 <!-- Language Names --> 243 <!-- Language Names -->
244 <string name="language_japanese">Japonês (日本語)</string>
245 <string name="language_english">Inglês</string>
246 <string name="language_french">Francês (Français)</string>
247 <string name="langauge_german">Alemão (Deutsch)</string>
248 <string name="language_italian">Italiano (Italiano)</string>
249 <string name="language_spanish">Espanhol (Español)</string>
250 <string name="language_chinese">Chinês simplificado (简体中文)</string>
251 <string name="language_korean">Coreano (한국어)</string>
252 <string name="language_dutch">Holandês (Nederlands)</string>
253 <string name="language_portuguese">Português (Português)</string>
254 <string name="language_russian">Russo (Русский)</string>
255 <string name="language_taiwanese">Taiwanês (台湾)</string>
256 <string name="language_british_english">Inglês Britânico</string>
257 <string name="language_canadian_french">Fracês Canadiano (Français canadien)</string>
258 <string name="language_latin_american_spanish">Espanhol da América Latina (Español latino-americano)</string>
259 <string name="language_simplified_chinese">Chinês Simplificado (简体中文)</string>
260 <string name="language_traditional_chinese">Chinês Tradicional (正 體 中文)</string>
261 <string name="language_brazilian_portuguese">Português do Brasil (Português do Brasil)</string>
262 244
263 <!-- Renderer APIs --> 245 <!-- Renderer APIs -->
264 <string name="renderer_vulkan">Vulcano</string> 246 <string name="renderer_vulkan">Vulcano</string>
diff --git a/src/android/app/src/main/res/values-ru/strings.xml b/src/android/app/src/main/res/values-ru/strings.xml
index 0fb4908f7..8d954f59e 100644
--- a/src/android/app/src/main/res/values-ru/strings.xml
+++ b/src/android/app/src/main/res/values-ru/strings.xml
@@ -241,24 +241,6 @@
241 <string name="region_taiwan">Тайвань</string> 241 <string name="region_taiwan">Тайвань</string>
242 242
243 <!-- Language Names --> 243 <!-- Language Names -->
244 <string name="language_japanese">Японский (日本語)</string>
245 <string name="language_english">Английский (English)</string>
246 <string name="language_french">Французский (Français)</string>
247 <string name="langauge_german">Немецкий (Deutsch)</string>
248 <string name="language_italian">Итальянский (Italiano)</string>
249 <string name="language_spanish">Испанский (Español)</string>
250 <string name="language_chinese">Китайский (简体中文)</string>
251 <string name="language_korean">Корейский (한국어)</string>
252 <string name="language_dutch">Голландский (Nederlands)</string>
253 <string name="language_portuguese">Португальский (Português)</string>
254 <string name="language_russian">Русский</string>
255 <string name="language_taiwanese">Тайваньский (台湾)</string>
256 <string name="language_british_english">Британский английский</string>
257 <string name="language_canadian_french">Канадский французский (Français canadien)</string>
258 <string name="language_latin_american_spanish">Латиноамериканский испанский (Español latinoamericano)</string>
259 <string name="language_simplified_chinese">Упрощенный китайский (简体中文)</string>
260 <string name="language_traditional_chinese">Традиционный китайский (正體中文)</string>
261 <string name="language_brazilian_portuguese">Бразильский португальский (Português do Brasil)</string>
262 244
263 <!-- Renderer APIs --> 245 <!-- Renderer APIs -->
264 <string name="renderer_vulkan">Vulkan</string> 246 <string name="renderer_vulkan">Vulkan</string>
diff --git a/src/android/app/src/main/res/values-uk/strings.xml b/src/android/app/src/main/res/values-uk/strings.xml
index 0d11eb2d2..6c028535b 100644
--- a/src/android/app/src/main/res/values-uk/strings.xml
+++ b/src/android/app/src/main/res/values-uk/strings.xml
@@ -241,24 +241,6 @@
241 <string name="region_taiwan">Тайвань</string> 241 <string name="region_taiwan">Тайвань</string>
242 242
243 <!-- Language Names --> 243 <!-- Language Names -->
244 <string name="language_japanese">Японська (日本語)</string>
245 <string name="language_english">Англійська (English)</string>
246 <string name="language_french">Французька (Français)</string>
247 <string name="langauge_german">Німецька (Deutsch)</string>
248 <string name="language_italian">Італійська (Italiano)</string>
249 <string name="language_spanish">Іспанська (Español)</string>
250 <string name="language_chinese">Китайскька (简体中文)</string>
251 <string name="language_korean">Корейська (한국어)</string>
252 <string name="language_dutch">Голландська (Nederlands)</string>
253 <string name="language_portuguese">Португальська (Português)</string>
254 <string name="language_russian">Російська (Русский)</string>
255 <string name="language_taiwanese">Тайванська (台湾)</string>
256 <string name="language_british_english">Британська англійська</string>
257 <string name="language_canadian_french">Канадська французька (Français canadien)</string>
258 <string name="language_latin_american_spanish">Латиноамериканська іспанська (Español latinoamericano)</string>
259 <string name="language_simplified_chinese">Спрощена китайська (简体中文)</string>
260 <string name="language_traditional_chinese">Традиційна китайська (正體中文)</string>
261 <string name="language_brazilian_portuguese">Бразильська португальська (Português do Brasil)</string>
262 244
263 <!-- Renderer APIs --> 245 <!-- Renderer APIs -->
264 <string name="renderer_vulkan">Vulkan</string> 246 <string name="renderer_vulkan">Vulkan</string>
diff --git a/src/android/app/src/main/res/values-zh-rCN/strings.xml b/src/android/app/src/main/res/values-zh-rCN/strings.xml
index e00bbaa2e..e4ad2ed07 100644
--- a/src/android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/src/android/app/src/main/res/values-zh-rCN/strings.xml
@@ -241,24 +241,6 @@
241 <string name="region_taiwan">中国台湾</string> 241 <string name="region_taiwan">中国台湾</string>
242 242
243 <!-- Language Names --> 243 <!-- Language Names -->
244 <string name="language_japanese">日语 (日本語)</string>
245 <string name="language_english">英语 (English)</string>
246 <string name="language_french">法语 (Français)</string>
247 <string name="langauge_german">德语 (Deutsch)</string>
248 <string name="language_italian">意大利语 (Italiano)</string>
249 <string name="language_spanish">西班牙语 (Español)</string>
250 <string name="language_chinese">中文 (简体中文)</string>
251 <string name="language_korean">韩语 (한국어)</string>
252 <string name="language_dutch">荷兰语 (Nederlands)</string>
253 <string name="language_portuguese">葡萄牙语 (Português)</string>
254 <string name="language_russian">俄语 (Русский)</string>
255 <string name="language_taiwanese">台湾中文 (台灣)</string>
256 <string name="language_british_english">英式英语</string>
257 <string name="language_canadian_french">加拿大法语 (Français canadien)</string>
258 <string name="language_latin_american_spanish">拉丁美洲西班牙语 (Español latinoamericano)</string>
259 <string name="language_simplified_chinese">简体中文 (简体中文)</string>
260 <string name="language_traditional_chinese">繁体中文 (正體中文)</string>
261 <string name="language_brazilian_portuguese">巴西葡萄牙语 (Português do Brasil)</string>
262 244
263 <!-- Renderer APIs --> 245 <!-- Renderer APIs -->
264 <string name="renderer_vulkan">Vulkan</string> 246 <string name="renderer_vulkan">Vulkan</string>
diff --git a/src/android/app/src/main/res/values-zh-rTW/strings.xml b/src/android/app/src/main/res/values-zh-rTW/strings.xml
index a54d04248..0d32f23df 100644
--- a/src/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/src/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -241,24 +241,6 @@
241 <string name="region_taiwan">台灣</string> 241 <string name="region_taiwan">台灣</string>
242 242
243 <!-- Language Names --> 243 <!-- Language Names -->
244 <string name="language_japanese">日文 (日本語)</string>
245 <string name="language_english">英文</string>
246 <string name="language_french">法文 (Français)</string>
247 <string name="langauge_german">德文 (Deutsch)</string>
248 <string name="language_italian">義大利文 (Italiano)</string>
249 <string name="language_spanish">西班牙文 (Español)</string>
250 <string name="language_chinese">中文 (简体中文)</string>
251 <string name="language_korean">韓文 (한국어)</string>
252 <string name="language_dutch">荷蘭文 (Nederlands)</string>
253 <string name="language_portuguese">葡萄牙文 (Português)</string>
254 <string name="language_russian">俄文 (Русский)</string>
255 <string name="language_taiwanese">台文 (台灣)</string>
256 <string name="language_british_english">英式英文</string>
257 <string name="language_canadian_french">加拿大法文 (Français canadien)</string>
258 <string name="language_latin_american_spanish">拉丁美洲西班牙文 (Español latinoamericano)</string>
259 <string name="language_simplified_chinese">簡體中文 (简体中文)</string>
260 <string name="language_traditional_chinese">正體中文 (正體中文)</string>
261 <string name="language_brazilian_portuguese">巴西葡萄牙文 (Português do Brasil)</string>
262 244
263 <!-- Renderer APIs --> 245 <!-- Renderer APIs -->
264 <string name="renderer_vulkan">Vulkan</string> 246 <string name="renderer_vulkan">Vulkan</string>
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index bfdebd35b..02e25504d 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -287,24 +287,24 @@
287 <string name="region_taiwan">Taiwan</string> 287 <string name="region_taiwan">Taiwan</string>
288 288
289 <!-- Language Names --> 289 <!-- Language Names -->
290 <string name="language_japanese">Japanese (日本語)</string> 290 <string name="language_japanese" translatable="false">日本語</string>
291 <string name="language_english">English</string> 291 <string name="language_english" translatable="false">English</string>
292 <string name="language_french">French (Français)</string> 292 <string name="language_french" translatable="false">Français</string>
293 <string name="langauge_german">German (Deutsch)</string> 293 <string name="langauge_german" translatable="false">Deutsch</string>
294 <string name="language_italian">Italian (Italiano)</string> 294 <string name="language_italian" translatable="false">Italiano</string>
295 <string name="language_spanish">Spanish (Español)</string> 295 <string name="language_spanish" translatable="false">Español</string>
296 <string name="language_chinese">Chinese (简体中文)</string> 296 <string name="language_chinese" translatable="false">简体中文</string>
297 <string name="language_korean">Korean (한국어)</string> 297 <string name="language_korean" translatable="false">한국어</string>
298 <string name="language_dutch">Dutch (Nederlands)</string> 298 <string name="language_dutch" translatable="false">Nederlands</string>
299 <string name="language_portuguese">Portuguese (Português)</string> 299 <string name="language_portuguese" translatable="false">Português</string>
300 <string name="language_russian">Russian (Русский)</string> 300 <string name="language_russian" translatable="false">Русский</string>
301 <string name="language_taiwanese">Taiwanese (台湾)</string> 301 <string name="language_taiwanese" translatable="false">台湾</string>
302 <string name="language_british_english">British English</string> 302 <string name="language_british_english" translatable="false">British English</string>
303 <string name="language_canadian_french">Canadian French (Français canadien)</string> 303 <string name="language_canadian_french" translatable="false">Français canadien</string>
304 <string name="language_latin_american_spanish">Latin American Spanish (Español latinoamericano)</string> 304 <string name="language_latin_american_spanish" translatable="false">Español latinoamericano</string>
305 <string name="language_simplified_chinese">Simplified Chinese (简体中文)</string> 305 <string name="language_simplified_chinese" translatable="false">简体中文</string>
306 <string name="language_traditional_chinese">Traditional Chinese (正體中文)</string> 306 <string name="language_traditional_chinese" translatable="false">正體中文</string>
307 <string name="language_brazilian_portuguese">Brazilian Portuguese (Português do Brasil)</string> 307 <string name="language_brazilian_portuguese" translatable="false">Português do Brasil</string>
308 308
309 <!-- Memory Sizes --> 309 <!-- Memory Sizes -->
310 <string name="memory_byte">Byte</string> 310 <string name="memory_byte">Byte</string>
diff --git a/src/core/hle/service/time/time_zone_content_manager.cpp b/src/core/hle/service/time/time_zone_content_manager.cpp
index 5d60be67a..3b6047ad0 100644
--- a/src/core/hle/service/time/time_zone_content_manager.cpp
+++ b/src/core/hle/service/time/time_zone_content_manager.cpp
@@ -3,6 +3,7 @@
3 3
4#include <chrono> 4#include <chrono>
5#include <sstream> 5#include <sstream>
6#include <utility>
6 7
7#include "common/logging/log.h" 8#include "common/logging/log.h"
8#include "common/settings.h" 9#include "common/settings.h"
@@ -46,14 +47,14 @@ static FileSys::VirtualDir GetTimeZoneBinary(Core::System& system) {
46 return FileSys::ExtractRomFS(romfs); 47 return FileSys::ExtractRomFS(romfs);
47} 48}
48 49
49static std::vector<std::string> BuildLocationNameCache(Core::System& system) { 50static std::vector<std::string> BuildLocationNameCache(
50 const FileSys::VirtualDir extracted_romfs{GetTimeZoneBinary(system)}; 51 const FileSys::VirtualDir& time_zone_binary) {
51 if (!extracted_romfs) { 52 if (!time_zone_binary) {
52 LOG_ERROR(Service_Time, "Failed to extract RomFS for {:016X}!", time_zone_binary_titleid); 53 LOG_ERROR(Service_Time, "Failed to extract RomFS for {:016X}!", time_zone_binary_titleid);
53 return {}; 54 return {};
54 } 55 }
55 56
56 const FileSys::VirtualFile binary_list{extracted_romfs->GetFile("binaryList.txt")}; 57 const FileSys::VirtualFile binary_list{time_zone_binary->GetFile("binaryList.txt")};
57 if (!binary_list) { 58 if (!binary_list) {
58 LOG_ERROR(Service_Time, "{:016X} has no file binaryList.txt!", time_zone_binary_titleid); 59 LOG_ERROR(Service_Time, "{:016X} has no file binaryList.txt!", time_zone_binary_titleid);
59 return {}; 60 return {};
@@ -73,7 +74,8 @@ static std::vector<std::string> BuildLocationNameCache(Core::System& system) {
73} 74}
74 75
75TimeZoneContentManager::TimeZoneContentManager(Core::System& system_) 76TimeZoneContentManager::TimeZoneContentManager(Core::System& system_)
76 : system{system_}, location_name_cache{BuildLocationNameCache(system)} {} 77 : system{system_}, time_zone_binary{GetTimeZoneBinary(system)},
78 location_name_cache{BuildLocationNameCache(time_zone_binary)} {}
77 79
78void TimeZoneContentManager::Initialize(TimeManager& time_manager) { 80void TimeZoneContentManager::Initialize(TimeManager& time_manager) {
79 const auto timezone_setting = Settings::GetTimeZoneString(); 81 const auto timezone_setting = Settings::GetTimeZoneString();
@@ -111,13 +113,12 @@ Result TimeZoneContentManager::GetTimeZoneInfoFile(const std::string& location_n
111 return ERROR_TIME_NOT_FOUND; 113 return ERROR_TIME_NOT_FOUND;
112 } 114 }
113 115
114 const FileSys::VirtualDir extracted_romfs{GetTimeZoneBinary(system)}; 116 if (!time_zone_binary) {
115 if (!extracted_romfs) {
116 LOG_ERROR(Service_Time, "Failed to extract RomFS for {:016X}!", time_zone_binary_titleid); 117 LOG_ERROR(Service_Time, "Failed to extract RomFS for {:016X}!", time_zone_binary_titleid);
117 return ERROR_TIME_NOT_FOUND; 118 return ERROR_TIME_NOT_FOUND;
118 } 119 }
119 120
120 const FileSys::VirtualDir zoneinfo_dir{extracted_romfs->GetSubdirectory("zoneinfo")}; 121 const FileSys::VirtualDir zoneinfo_dir{time_zone_binary->GetSubdirectory("zoneinfo")};
121 if (!zoneinfo_dir) { 122 if (!zoneinfo_dir) {
122 LOG_ERROR(Service_Time, "{:016X} has no directory zoneinfo!", time_zone_binary_titleid); 123 LOG_ERROR(Service_Time, "{:016X} has no directory zoneinfo!", time_zone_binary_titleid);
123 return ERROR_TIME_NOT_FOUND; 124 return ERROR_TIME_NOT_FOUND;
diff --git a/src/core/hle/service/time/time_zone_content_manager.h b/src/core/hle/service/time/time_zone_content_manager.h
index 3d94b6428..a6f9698bc 100644
--- a/src/core/hle/service/time/time_zone_content_manager.h
+++ b/src/core/hle/service/time/time_zone_content_manager.h
@@ -6,6 +6,7 @@
6#include <string> 6#include <string>
7#include <vector> 7#include <vector>
8 8
9#include "core/file_sys/vfs_types.h"
9#include "core/hle/service/time/time_zone_manager.h" 10#include "core/hle/service/time/time_zone_manager.h"
10 11
11namespace Core { 12namespace Core {
@@ -41,6 +42,7 @@ private:
41 42
42 Core::System& system; 43 Core::System& system;
43 TimeZoneManager time_zone_manager; 44 TimeZoneManager time_zone_manager;
45 const FileSys::VirtualDir time_zone_binary;
44 const std::vector<std::string> location_name_cache; 46 const std::vector<std::string> location_name_cache;
45}; 47};
46 48
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 513bc4edb..fa5273402 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -24,6 +24,16 @@
24 24
25namespace Core::Memory { 25namespace Core::Memory {
26 26
27namespace {
28
29bool AddressSpaceContains(const Common::PageTable& table, const Common::ProcessAddress addr,
30 const std::size_t size) {
31 const Common::ProcessAddress max_addr = 1ULL << table.GetAddressSpaceBits();
32 return addr + size >= addr && addr + size <= max_addr;
33}
34
35} // namespace
36
27// Implementation class used to keep the specifics of the memory subsystem hidden 37// Implementation class used to keep the specifics of the memory subsystem hidden
28// from outside classes. This also allows modification to the internals of the memory 38// from outside classes. This also allows modification to the internals of the memory
29// subsystem without needing to rebuild all files that make use of the memory interface. 39// subsystem without needing to rebuild all files that make use of the memory interface.
@@ -191,6 +201,11 @@ struct Memory::Impl {
191 std::size_t page_offset = addr & YUZU_PAGEMASK; 201 std::size_t page_offset = addr & YUZU_PAGEMASK;
192 bool user_accessible = true; 202 bool user_accessible = true;
193 203
204 if (!AddressSpaceContains(page_table, addr, size)) [[unlikely]] {
205 on_unmapped(size, addr);
206 return false;
207 }
208
194 while (remaining_size) { 209 while (remaining_size) {
195 const std::size_t copy_amount = 210 const std::size_t copy_amount =
196 std::min(static_cast<std::size_t>(YUZU_PAGESIZE) - page_offset, remaining_size); 211 std::min(static_cast<std::size_t>(YUZU_PAGESIZE) - page_offset, remaining_size);
@@ -421,7 +436,7 @@ struct Memory::Impl {
421 } 436 }
422 437
423 void MarkRegionDebug(u64 vaddr, u64 size, bool debug) { 438 void MarkRegionDebug(u64 vaddr, u64 size, bool debug) {
424 if (vaddr == 0) { 439 if (vaddr == 0 || !AddressSpaceContains(*current_page_table, vaddr, size)) {
425 return; 440 return;
426 } 441 }
427 442
@@ -478,7 +493,7 @@ struct Memory::Impl {
478 } 493 }
479 494
480 void RasterizerMarkRegionCached(u64 vaddr, u64 size, bool cached) { 495 void RasterizerMarkRegionCached(u64 vaddr, u64 size, bool cached) {
481 if (vaddr == 0) { 496 if (vaddr == 0 || !AddressSpaceContains(*current_page_table, vaddr, size)) {
482 return; 497 return;
483 } 498 }
484 499
@@ -615,7 +630,7 @@ struct Memory::Impl {
615 // AARCH64 masks the upper 16 bit of all memory accesses 630 // AARCH64 masks the upper 16 bit of all memory accesses
616 vaddr = vaddr & 0xffffffffffffULL; 631 vaddr = vaddr & 0xffffffffffffULL;
617 632
618 if (vaddr >= 1uLL << current_page_table->GetAddressSpaceBits()) { 633 if (!AddressSpaceContains(*current_page_table, vaddr, 1)) [[unlikely]] {
619 on_unmapped(); 634 on_unmapped();
620 return nullptr; 635 return nullptr;
621 } 636 }
diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp
index e04852e01..78918f996 100644
--- a/src/video_core/vulkan_common/vulkan_device.cpp
+++ b/src/video_core/vulkan_common/vulkan_device.cpp
@@ -555,9 +555,9 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
555 555
556 sets_per_pool = 64; 556 sets_per_pool = 64;
557 if (extensions.extended_dynamic_state3 && is_amd_driver && 557 if (extensions.extended_dynamic_state3 && is_amd_driver &&
558 properties.properties.driverVersion >= VK_MAKE_API_VERSION(0, 2, 0, 270)) { 558 !features.shader_float16_int8.shaderFloat16 &&
559 LOG_WARNING(Render_Vulkan, 559 properties.properties.driverVersion >= VK_MAKE_API_VERSION(0, 2, 0, 258)) {
560 "AMD drivers after 23.5.2 have broken extendedDynamicState3ColorBlendEquation"); 560 LOG_WARNING(Render_Vulkan, "AMD GCN4 has broken extendedDynamicState3ColorBlendEquation");
561 features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable = false; 561 features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable = false;
562 features.extended_dynamic_state3.extendedDynamicState3ColorBlendEquation = false; 562 features.extended_dynamic_state3.extendedDynamicState3ColorBlendEquation = false;
563 dynamic_state3_blending = false; 563 dynamic_state3_blending = false;
HIC SVNT DRACONES