Merge branch 'Ryubing:master' into master

Ryubing · Jan 13, 2025 · ebeac1f · ebeac1f
2 parents 92b6756 + f1dee50
commit ebeac1f
Show file tree

Hide file tree

Showing 9 changed files with 3,454 additions and 3,453 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -129,11 +129,11 @@ jobs:
         with:
           global-json-file: global.json
 
-      - name: Setup LLVM 14
+      - name: Setup LLVM 17
         run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 14
+          sudo ./llvm.sh 17
 
       - name: Install rcodesign
         run: |

diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
@@ -210,11 +210,11 @@ jobs:
         with:
           global-json-file: global.json
 
-      - name: Setup LLVM 15
+      - name: Setup LLVM 17
         run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 15
+          sudo ./llvm.sh 17
 
       - name: Install rcodesign
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -191,11 +191,11 @@ jobs:
         with:
           global-json-file: global.json
 
-      - name: Setup LLVM 15
+      - name: Setup LLVM 17
         run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 15
+          sudo ./llvm.sh 17
 
       - name: Install rcodesign
         run: |

diff --git a/distribution/macos/bundle_fix_up.py b/distribution/macos/bundle_fix_up.py
@@ -19,7 +19,7 @@
 else:
     OTOOL = shutil.which("llvm-otool")
     if OTOOL is None:
-        for llvm_ver in [15, 14, 13]:
+        for llvm_ver in [17, 16, 15, 14, 13]:
             otool_path = shutil.which(f"llvm-otool-{llvm_ver}")
             if otool_path is not None:
                 OTOOL = otool_path

diff --git a/distribution/macos/construct_universal_dylib.py b/distribution/macos/construct_universal_dylib.py
@@ -26,7 +26,7 @@
     LIPO = shutil.which("llvm-lipo")
 
     if LIPO is None:
-        for llvm_ver in [15, 14, 13]:
+        for llvm_ver in [17, 16, 15, 14, 13]:
             lipo_path = shutil.which(f"llvm-lipo-{llvm_ver}")
             if lipo_path is not None:
                 LIPO = lipo_path

diff --git a/distribution/macos/create_macos_build_ava.sh b/distribution/macos/create_macos_build_ava.sh
@@ -67,11 +67,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_APP_
 
 if ! [ -x "$(command -v lipo)" ];
 then
-    if ! [ -x "$(command -v llvm-lipo-14)" ];
+    if ! [ -x "$(command -v llvm-lipo-17)" ];
     then
         LIPO=llvm-lipo
     else
-        LIPO=llvm-lipo-14
+        LIPO=llvm-lipo-17
     fi
 else
     LIPO=lipo

diff --git a/distribution/macos/create_macos_build_headless.sh b/distribution/macos/create_macos_build_headless.sh
@@ -62,11 +62,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_OUTP
 
 if ! [ -x "$(command -v lipo)" ];
 then
-    if ! [ -x "$(command -v llvm-lipo-14)" ];
+    if ! [ -x "$(command -v llvm-lipo-17)" ];
     then
         LIPO=llvm-lipo
     else
-        LIPO=llvm-lipo-14
+        LIPO=llvm-lipo-17
     fi
 else
     LIPO=lipo

diff --git a/docs/compatibility.csv b/docs/compatibility.csv
diff --git a/src/Ryujinx/Assets/locales.json b/src/Ryujinx/Assets/locales.json
@@ -1243,7 +1243,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "问答与指南",
         "zh_TW": ""
       }
     },
@@ -4066,7 +4066,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "与 PC 日期和时间重新同步",
         "zh_TW": ""
       }
     },
@@ -14241,7 +14241,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Ryujinx — це емулятор для Nintendo Switch™.\nОтримуйте всі останні новини в нашому Discord.\nРозробники, які хочуть зробити внесок, можуть дізнатися більше на нашому GitHub або в Discord.",
-        "zh_CN": "",
+        "zh_CN": "Ryujinx 是一个 Nintendo Switch™ 模拟器。\n有兴趣做出贡献的开发者可以在我们的 GitHub 或 Discord 上了解更多信息。\n",
         "zh_TW": ""
       }
     },
@@ -17866,7 +17866,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "档案对话框",
         "zh_TW": ""
       }
     },
@@ -19591,7 +19591,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Необрізаних {0} тайтл(ів)...",
-        "zh_CN": "",
+        "zh_CN": "正在精简 {0} 个游戏",
         "zh_TW": ""
       }
     },
@@ -19766,7 +19766,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Заголовок",
-        "zh_CN": "",
+        "zh_CN": "标题",
         "zh_TW": ""
       }
     },
@@ -19791,7 +19791,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Економія місця",
-        "zh_CN": "",
+        "zh_CN": "节省空间",
         "zh_TW": ""
       }
     },
@@ -19841,7 +19841,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "Зшивання",
-        "zh_CN": "",
+        "zh_CN": "取消精简",
         "zh_TW": ""
       }
     },
@@ -22666,7 +22666,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "最后更新于: {0}",
         "zh_TW": ""
       }
     },
@@ -22691,7 +22691,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "此兼容性列表可能包含过时的条目。\n不要只测试 \"进入游戏\" 状态的游戏。",
         "zh_TW": ""
       }
     },
@@ -22716,7 +22716,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "正在搜索兼容性条目...",
         "zh_TW": ""
       }
     },
@@ -22741,7 +22741,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "打开兼容性列表",
         "zh_TW": ""
       }
     },
@@ -22766,7 +22766,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "仅显示拥有的游戏",
         "zh_TW": ""
       }
     },
@@ -22791,7 +22791,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "可游玩",
         "zh_TW": ""
       }
     },
@@ -22816,7 +22816,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "进入游戏",
         "zh_TW": ""
       }
     },
@@ -22841,7 +22841,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "菜单",
         "zh_TW": ""
       }
     },
@@ -22866,7 +22866,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "启动",
         "zh_TW": ""
       }
     },
@@ -22891,7 +22891,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "什么都没有",
         "zh_TW": ""
       }
     }