Skip to content

Commit

Permalink
Merge branch 'main' into 1.81-features
Browse files Browse the repository at this point in the history
  • Loading branch information
bagusnl committed Jul 28, 2024
2 parents ee27eba + a95320f commit 20bf0f1
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
8 changes: 4 additions & 4 deletions CollapseLauncher/App.xaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Application x:Class="CollapseLauncher.App"
<Application x:Class="CollapseLauncher.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
Expand Down Expand Up @@ -456,8 +456,8 @@
<AcrylicBrush x:Key="SocMedPanelAcrylicBrush"
FallbackColor="#CCEEEEEE"
TintColor="#EEEEEE"
TintLuminosityOpacity="0.7"
TintOpacity="0.0"/>
TintLuminosityOpacity="0.6"
TintOpacity="0"/>
<AcrylicBrush x:Key="WebView2GridBackground"
FallbackColor="#EEEAEAEA"
TintColor="#FFFFFF"
Expand Down Expand Up @@ -527,7 +527,7 @@
StartPoint="0,0"
EndPoint="0.15,0">
<GradientStop Offset="0"
Color="#66FFFFFF"/>
Color="#44FFFFFF"/>
<GradientStop Offset="1"
Color="#00FFFFFF"/>
</LinearGradientBrush>
Expand Down
2 changes: 1 addition & 1 deletion CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- ReSharper disable IdentifierTypo -->
<!-- ReSharper disable IdentifierTypo -->
<!-- ReSharper disable UnusedMember.Local -->
<!-- ReSharper disable Xaml.ConstructorWarning -->
<Page x:Class="CollapseLauncher.Pages.HomePage"
Expand Down
8 changes: 7 additions & 1 deletion Hi3Helper.Core/Lang/ja_JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@
"GameSettings_Panel4": "その他",
"GameSettings_Panel4ShowEventsPanel": "イベントパネルを表示",
"GameSettings_Panel4ShowSocialMediaPanel": "ソーシャルメディアパネルを表示",
"GameSettings_Panel4ShowPlaytimeButton": "累計プレイ時間を表示する",
"GameSettings_Panel4CreateShortcutBtn": "ショートカットアイコン作成",
"GameSettings_Panel4AddToSteamBtn": "Steamライブラリに追加",

Expand Down Expand Up @@ -534,6 +535,7 @@
"TimeRemainHMSFormat": "あと{0:%h}時間 {0:%m}分 {0:%s}秒",
"TimeRemainHMSFormatPlaceholder": "あと--時間 --分 --秒",
"Speed": "速度: {0}/秒",
"SpeedTextOnly": "速度",
"SpeedPerSec": "{0}/秒",
"SpeedPlaceholder": "速度: - /秒",
"PerFromTo": "{0} / {1}",
Expand Down Expand Up @@ -584,6 +586,9 @@
"LangNameKR": "韓国語",

"Downloading": "ダウンロード中",
"Updating": "アップデート中",
"UpdatingAndApplying": "アップデート + パッチ中",
"Applying": "パッチ中",
"Merging": "マージ中",
"Idle": "待機",
"Change": "変更",
Expand Down Expand Up @@ -1262,7 +1267,8 @@
"TW/HK/MO": "台湾/香港/マカオ",
"Korea": "韓国",
"Japan": "日本",
"Bilibili": "Bilibili"
"Bilibili": "Bilibili",
"Google Play": "Google Play"
},

"_OOBEAgreementMenu": {
Expand Down

0 comments on commit 20bf0f1

Please sign in to comment.