From eefef9d1e2773c1193b895cfc9628769dd84ffbb Mon Sep 17 00:00:00 2001 From: ProJend <782041066@qq.com> Date: Sat, 20 Jun 2020 23:20:23 +0800 Subject: [PATCH] Traditional Chinese --- PixivFSUWP/MainPage.xaml.cs | 52 +- .../MultilingualResources/PixivFSUWP.ja.xlf | 79 +- .../PixivFSUWP.zh-Hans.xlf | 735 ------------------ .../PixivFSUWP.zh-Hant.xlf | 735 ------------------ PixivFSUWP/PixivFSUWP.csproj | 6 +- PixivFSUWP/ReportIssuePage.xaml | 27 +- PixivFSUWP/ReportIssuePage.xaml.cs | 20 +- PixivFSUWP/SettingsPage.xaml | 1 + PixivFSUWP/SettingsPage.xaml.cs | 16 +- PixivFSUWP/Strings/en/Resources.resw | 62 +- PixivFSUWP/Strings/zh-Hans/Resources.resw | 179 ++++- PixivFSUWP/Strings/zh-Hant/Resources.resw | 415 +++++++--- 12 files changed, 670 insertions(+), 1657 deletions(-) delete mode 100644 PixivFSUWP/MultilingualResources/PixivFSUWP.zh-Hans.xlf delete mode 100644 PixivFSUWP/MultilingualResources/PixivFSUWP.zh-Hant.xlf diff --git a/PixivFSUWP/MainPage.xaml.cs b/PixivFSUWP/MainPage.xaml.cs index d5cf79f..f04caac 100644 --- a/PixivFSUWP/MainPage.xaml.cs +++ b/PixivFSUWP/MainPage.xaml.cs @@ -1,24 +1,13 @@ using PixivFSUWP.Data; using System; using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; using System.Threading.Tasks; -using Windows.ApplicationModel.Core; -using Windows.Foundation; -using Windows.Foundation.Collections; +using Windows.System; using Windows.UI; using Windows.UI.Popups; using Windows.UI.ViewManagement; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; using static PixivFSUWP.Data.OverAll; // https://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x804 上介绍了“空白页”项模板 @@ -260,8 +249,37 @@ private void NavControl_BackRequested(NavigationView sender, NavigationViewBackR private async void btnReport_Click(object sender, RoutedEventArgs e) { - //在新窗口中打开发送反馈的窗口 - await ShowNewWindow(typeof(ReportIssuePage), null); + ////在新窗口中打开发送反馈的窗口 + //await ShowNewWindow(typeof(ReportIssuePage), null); + var reportIssue = new ContentDialog() + { + Content = new ReportIssuePage(), + FullSizeDesired = false, + + Title = GetResourceString("ReportIssueTitlePlain"), + PrimaryButtonText = GetResourceString("PrimayButtonPlain"), + SecondaryButtonText = GetResourceString("SecondButtonPlain"), + CloseButtonText = GetResourceString("CancelButtonPlain"), + + PrimaryButtonStyle = (Style)this.Resources["AccentButtonStyle"], + SecondaryButtonStyle = (Style)this.Resources["ButtonRevealStyle"], + CloseButtonStyle = (Style)this.Resources["ButtonRevealStyle"], + }; + var a = await reportIssue.ShowAsync(); + if (a == ContentDialogResult.Primary) + { + await Launcher.LaunchUriAsync(new + Uri(@"https://github.com/tobiichiamane/pixivfs-uwp/issues/new/choose")); + } + else if (a == ContentDialogResult.Secondary) + { + await Launcher.LaunchUriAsync(new + Uri(@"mailto:tobiichiamane@outlook.jp")); + } + else + { + + } } /// @@ -270,16 +288,16 @@ private async void btnReport_Click(object sender, RoutedEventArgs e) private async void btnExperimentalWarning_Click(object sender, RoutedEventArgs e) { MessageDialog warningDialog = new MessageDialog(GetResourceString("ExperimentalWarningPlain")); - warningDialog.Commands.Add(new UICommand("Yes", async (_) => + warningDialog.Commands.Add(new UICommand(GetResourceString("YesButtonPlain"), async (_) => { //关闭直连 Windows.Storage.ApplicationDataContainer localSettings = Windows.Storage.ApplicationData.Current.LocalSettings; localSettings.Values["directConnection"] = false; //通知重启应用生效 - MessageDialog restartDialog = new MessageDialog("请重启本程序来应用更改。\nPlease restart this app to apply the changes."); + MessageDialog restartDialog = new MessageDialog(GetResourceString("RestartApplyColorTheme")); await restartDialog.ShowAsync(); })); - warningDialog.Commands.Add(new UICommand("No")); + warningDialog.Commands.Add(new UICommand(GetResourceString("NoButtonPlain"))); await warningDialog.ShowAsync(); } } diff --git a/PixivFSUWP/MultilingualResources/PixivFSUWP.ja.xlf b/PixivFSUWP/MultilingualResources/PixivFSUWP.ja.xlf index f20ddb7..a5a5b7f 100644 --- a/PixivFSUWP/MultilingualResources/PixivFSUWP.ja.xlf +++ b/PixivFSUWP/MultilingualResources/PixivFSUWP.ja.xlf @@ -724,9 +724,84 @@ Do you want to disable them? Light ComboBoxItem + + Error : Failed to load contributors. + Error : Failed to load contributors. + PlainText + - Restart the application to take effect - Restart the application to take effect + Please restart the application to take effect. + Please restart the application to take effect. + PlainText + + + ID : + ID : + PlainText + + + TIme : + TIme : + PlainText + + + Version : + Version : + PlainText + + + Don't worry. The information you just copied does not contain any private data. + Don't worry. The information you just copied does not contain any private data. + TextBlock + + + You are going to report an issue. We've collected some details. + You are going to report an issue. We've collected some details. + TextBlock + + + Report An Issue + Report An Issue + PlainText + + + Copy All + Copy All + HyperlinkButton + + + Not Yet + Not Yet + PlainText + + + Sure + Sure + PlainText + + + Cancle + Cancle + PlainText + + + GitHub + GitHub + PlainText + + + Email + Email + PlainText + + + Valuable information has been copied to clipboard. + Valuable information has been copied to clipboard. + PlainText + + + Copied + Copied PlainText diff --git a/PixivFSUWP/MultilingualResources/PixivFSUWP.zh-Hans.xlf b/PixivFSUWP/MultilingualResources/PixivFSUWP.zh-Hans.xlf deleted file mode 100644 index b99a9c2..0000000 --- a/PixivFSUWP/MultilingualResources/PixivFSUWP.zh-Hans.xlf +++ /dev/null @@ -1,735 +0,0 @@ - - - -
- -
- - - - All Time - 所有时间 - ComboBoxItem - - - Artist - 画师 - PlainText - - - Birthday - 生日 - TextBlock - - - Failed to unbookmark「{0}」 - 作品「{0}」删除收藏失败 - PlainText - - - Mark - 收藏 - Please verify the translation’s accuracy as the source string was updated after it was translated. - NavigationViewItem - - - Mark - 已收藏 - Please verify the translation’s accuracy as the source string was updated after it was translated. - PlainText - - - Copy app URL - 复制应用链接 - ToolTip - - - Copy web URL - 复制网页链接 - ToolTip - - - Windows Share - Windows分享 - ToolTip - - - Cancel - 放弃 - PlainText - - - Chair - 椅子 - TextBlock - - - Comments - 评论 - PlainText - - - Generating Windows® Timeline™ - 正在创建时间线 - PlainText - - - Current User - 当前登录的用户 - TextBlock - - - Date ascending - 按日期升序 - ComboBoxItem - - - Date descending - 按日期降序 - ComboBoxItem - - - Unbookmark - 删除收藏 - PlainText - - - 「{0}」unbookmarked - 作品「{0}」已删除收藏 - PlainText - - - Desk - 桌子 - TextBlock - - - Desktop - 桌面 - TextBlock - - - Detail - 详情 - PlainText - - - Downloading ugoira - 正在下载动态剪影 - PlainText - - - Draw - 临摹 - AppBarButton - - - Email： - 邮箱： - TextBlock - - - Female - 女 - PlainText - - - Follow - 关注 - Please verify the translation’s accuracy as the source string was updated after it was translated. - NavigationViewItem - - - Follow - 已关注 - Please verify the translation’s accuracy as the source string was updated after it was translated. - PlainText - - - Fully match tag - 完全匹配标签 - ComboBoxItem - - - Generating Gif - 正在生成 Gif - PlainText - - - Gif file - Gif文件 - PlainText - - - Image - 图片文件 - PlainText - - - Job - 当前工作 - TextBlock - - - Keyword - 关键字/标签 - TextBlock - - - Last day - 过去一天内 - ComboBoxItem - - - Last month - 过去一月内 - ComboBoxItem - - - Last week - 过去一周内 - ComboBoxItem - - - Link - 网页链接 - PlainText - - - Living place - 居住地 - TextBlock - - - Loading - 加载中 - PlainText - - - Loading preview - 正在加载预览 - PlainText - - - Loading {0}/{1} - 正在加载第 {0} 张，共 {1} 张 - PlainText - - - Logging in - 正在登录 - TextBlock - - - Login - 登录 - Button - - - Spice up your creating process - 让创作变得更有乐趣 - TextBlock - - - Login failed. Troubleshoot and try again. - 登录失败，点此查看错误排查步骤并重试 - Button - - - Logout - 注销 - Button - - - *This will log you out on all your Windows devices - *这将在您的所有Windows设备上退出登录 - TextBlock - - - Male - 男 - PlainText - - - Monitor - 显示器 - TextBlock - - - Mouse - 鼠标 - TextBlock - - - Music - 音乐 - TextBlock - - - Draft - 我的临摹 - PlainText - - - No caption - 暂无简介 - PlainText - - - No ink strokes to save - 没有墨迹可以保存 - PlainText - - - Mark - 未收藏 - Please verify the translation’s accuracy as the source string was updated after it was translated. - TextBlock - - - Mark - 未收藏 - Please verify the translation’s accuracy as the source string was updated after it was translated. - PlainText - - - Follow - 未关注 - Please verify the translation’s accuracy as the source string was updated after it was translated. - TextBlock - - - Follow - 未关注 - Please verify the translation’s accuracy as the source string was updated after it was translated. - PlainText - - - OK - 好的 - PlainText - - - Num of pages: {0}. Click or tap to view in big image mode. - 共 {0} 张作品，点击或触摸查看大图 - PlainText - - - Partially match tag - 部分匹配标签 - ComboBoxItem - - - Partially match title and caption - 部分匹配标题和简介 - ComboBoxItem - - - Password - 密码 - TextBlock - - - PC - 计算机 - TextBlock - - - Website - 个人主页 - TextBlock - - - Pin - 已固定 - Please verify the translation’s accuracy as the source string was updated after it was translated. - PlainText - - - Pixiv user - Pixiv用户 - PlainText - - - Playing ugoira - 正在播放动态剪影 - PlainText - - - Play - 播放 - PlainText - - - Printer - 打印机 - TextBlock - - - None/Private - 无/保密 - PlainText - - - Private - 保密 - PlainText - - - Bookmark - 快速收藏 - MenuFlyoutItem - - - Bookmark - 快速收藏 - PlainText - - - Save - 快速保存 - MenuFlyoutItem - - - Rankings - 排行 - NavigationViewItem - - - Raw ink - 墨迹原始信息 - PlainText - - - Recommended - 推荐 - NavigationViewItem - - - Register - 注册 - Button - - - Requesting - 请求中 - PlainText - - - Retry - 重试 - PlainText - - - Save - 快速保存 - TextBlock - - - Save Image - 保存图片 - AppBarButton - - - Failed to save image - 图片保存失败 - PlainText - - - Save Image - 保存图片 - PlainText - - - Image saved - 图片已保存 - PlainText - - - Failed to save ink strokes - 墨迹保存失败 - PlainText - - - Save ink strokes - 保存墨迹 - PlainText - - - Ink strokes saved - 墨迹已保存 - PlainText - - - Failed to save ugoira - 剪影保存失败 - PlainText - - - Ugoira saved - 剪影已保存 - PlainText - - - Scanner - 扫描仪 - TextBlock - - - Search… - 搜索作品… - AutoSuggestBox - - - Search options - 搜索选项 - TextBlock - - - Search - 搜索 - PlainText - - - Settings - 设置 - PlainText - - - Sex - 性别 - TextBlock - - - Share - 分享 - TextBlock - - - Share - 分享 - PlainText - - - Sharing illust - 该图片页面的链接将被分享 - PlainText - - - Stop - 停止 - TextBlock - - - Stop - 停止 - PlainText - - - Tablet - 数位板 - TextBlock - - - *Choose a tag will change your search options - *点击趋势标签将改变您的搜索选项 - TextBlock - - - Tools - 绘图工具 - TextBlock - - - Trending tags - 趋势标签 - TextBlock - - - Unknown - 未知 - PlainText - - - Pin - 未固定 - Please verify the translation’s accuracy as the source string was updated after it was translated. - TextBlock - - - User - 用户 - PlainText - - - User ID： - 用户标识： - TextBlock - - - Username - 用户名 - TextBlock - - - Sharing artist - 该用户页面的链接将被分享 - PlainText - - - Version information - 软件包版本信息 - TextBlock - - - Works - 作品 - Please verify the translation’s accuracy as the source string was updated after it was translated. - TextBlock - - - 「{0}」bookmarked - 作品「{0}」已收藏 - PlainText - - - Failed to bookmark「{0}」 - 作品「{0}」收藏失败 - PlainText - - - Pixiv art - Pixiv作品 - PlainText - - - 「{0}」 saved - 作品「{0}」已保存 - PlainText - - - Failed to save「{0}」 - 作品「{0}」保存失败 - PlainText - - - Direct Connection (!Experimental!) - 直连（实验性，可以绕过中国大陆的封锁） - CheckBox - - - New comment - 撰写评论 - ToggleButton - - - SauceNAO - 以图搜图 - Button + - - - Pixiv ID - 作品ID - AutoSuggestBox + - - - Imgur API key - Imgur API密钥 - TextBlock + - - - SauceNAO API key - SauceNAO API密钥 - TextBlock + - - - More functions - 更多功能 - TextBlock + - - - Pixiv ID - 作品直达 - TextBlock + - - - Cache - 缓存 - TextBlock - - - Cache size: - 缓存大小： - TextBlock - - - Calculating... - 计算中... - TextBlock - - - Clear cache - 清除缓存 - Button - - - Delete invalid files - 删除无效文件 - Button - - - Recalculating... - 重新计算中... - PlainText - - - Contributors from GitHub - 来自GitHub的参与者 - TextBlock - - - Developers - 开发人员 - TextBlock - - - Main developer - 主要开发者 - TextBlock - - - You have experimental features enabled. They may cause stability issues. -Do you want to disable them? - 您开启了实验性功能，它们可能带来稳定性问题。 -您想关闭它们吗？ - PlainText - - - Color Theme - 颜色主题 - TextBlock - - - Dark - 深色 - ComboBoxItem - - - Use System Default - 跟随系统 - ComboBoxItem - - - Light - 浅色 - ComboBoxItem - - - Restart the application to take effect - 重新启动以应用设置 - PlainText - - - - - \ No newline at end of file diff --git a/PixivFSUWP/MultilingualResources/PixivFSUWP.zh-Hant.xlf b/PixivFSUWP/MultilingualResources/PixivFSUWP.zh-Hant.xlf deleted file mode 100644 index fcf98e4..0000000 --- a/PixivFSUWP/MultilingualResources/PixivFSUWP.zh-Hant.xlf +++ /dev/null @@ -1,735 +0,0 @@ - - - -
- -
- - - - All Time - 所有时间 - ComboBoxItem - - - Artist - 画师 - PlainText - - - Birthday - 生日 - TextBlock - - - Failed to unbookmark「{0}」 - 作品「{0}」删除收藏失败 - PlainText - - - Mark - 收藏 - Please verify the translation’s accuracy as the source string was updated after it was translated. - NavigationViewItem - - - Mark - 已收藏 - Please verify the translation’s accuracy as the source string was updated after it was translated. - PlainText - - - Copy app URL - 复制应用链接 - ToolTip - - - Copy web URL - 复制网页链接 - ToolTip - - - Windows Share - Windows分享 - ToolTip - - - Cancel - 放弃 - PlainText - - - Chair - 椅子 - TextBlock - - - Comments - 评论 - PlainText - - - Generating Windows® Timeline™ - 正在创建时间线 - PlainText - - - Current User - 当前登录的用户 - TextBlock - - - Date ascending - 按日期升序 - ComboBoxItem - - - Date descending - 按日期降序 - ComboBoxItem - - - Unbookmark - 删除收藏 - PlainText - - - 「{0}」unbookmarked - 作品「{0}」已删除收藏 - PlainText - - - Desk - 桌子 - TextBlock - - - Desktop - 桌面 - TextBlock - - - Detail - 详情 - PlainText - - - Downloading ugoira - 正在下载动态剪影 - PlainText - - - Draw - 临摹 - AppBarButton - - - Email： - 邮箱： - TextBlock - - - Female - 女 - PlainText - - - Follow - 关注 - Please verify the translation’s accuracy as the source string was updated after it was translated. - NavigationViewItem - - - Follow - 已关注 - Please verify the translation’s accuracy as the source string was updated after it was translated. - PlainText - - - Fully match tag - 完全匹配标签 - ComboBoxItem - - - Generating Gif - 正在生成 Gif - PlainText - - - Gif file - Gif文件 - PlainText - - - Image - 图片文件 - PlainText - - - Job - 当前工作 - TextBlock - - - Keyword - 关键字/标签 - TextBlock - - - Last day - 过去一天内 - ComboBoxItem - - - Last month - 过去一月内 - ComboBoxItem - - - Last week - 过去一周内 - ComboBoxItem - - - Link - 网页链接 - PlainText - - - Living place - 居住地 - TextBlock - - - Loading - 加载中 - PlainText - - - Loading preview - 正在加载预览 - PlainText - - - Loading {0}/{1} - 正在加载第 {0} 张，共 {1} 张 - PlainText - - - Logging in - 正在登录 - TextBlock - - - Login - 登录 - Button - - - Spice up your creating process - 让创作变得更有乐趣 - TextBlock - - - Login failed. Troubleshoot and try again. - 登录失败，点此查看错误排查步骤并重试 - Button - - - Logout - 注销 - Button - - - *This will log you out on all your Windows devices - *这将在您的所有Windows设备上退出登录 - TextBlock - - - Male - 男 - PlainText - - - Monitor - 显示器 - TextBlock - - - Mouse - 鼠标 - TextBlock - - - Music - 音乐 - TextBlock - - - Draft - 我的临摹 - PlainText - - - No caption - 暂无简介 - PlainText - - - No ink strokes to save - 没有墨迹可以保存 - PlainText - - - Mark - 未收藏 - Please verify the translation’s accuracy as the source string was updated after it was translated. - TextBlock - - - Mark - 未收藏 - Please verify the translation’s accuracy as the source string was updated after it was translated. - PlainText - - - Follow - 未关注 - Please verify the translation’s accuracy as the source string was updated after it was translated. - TextBlock - - - Follow - 未关注 - Please verify the translation’s accuracy as the source string was updated after it was translated. - PlainText - - - OK - 好的 - PlainText - - - Num of pages: {0}. Click or tap to view in big image mode. - 共 {0} 张作品，点击或触摸查看大图 - PlainText - - - Partially match tag - 部分匹配标签 - ComboBoxItem - - - Partially match title and caption - 部分匹配标题和简介 - ComboBoxItem - - - Password - 密码 - TextBlock - - - PC - 计算机 - TextBlock - - - Website - 个人主页 - TextBlock - - - Pin - 已固定 - Please verify the translation’s accuracy as the source string was updated after it was translated. - PlainText - - - Pixiv user - Pixiv用户 - PlainText - - - Playing ugoira - 正在播放动态剪影 - PlainText - - - Play - 播放 - PlainText - - - Printer - 打印机 - TextBlock - - - None/Private - 无/保密 - PlainText - - - Private - 保密 - PlainText - - - Bookmark - 快速收藏 - MenuFlyoutItem - - - Bookmark - 快速收藏 - PlainText - - - Save - 快速保存 - MenuFlyoutItem - - - Rankings - 排行 - NavigationViewItem - - - Raw ink - 墨迹原始信息 - PlainText - - - Recommended - 推荐 - NavigationViewItem - - - Register - 注册 - Button - - - Requesting - 请求中 - PlainText - - - Retry - 重试 - PlainText - - - Save - 快速保存 - TextBlock - - - Save Image - 保存图片 - AppBarButton - - - Failed to save image - 图片保存失败 - PlainText - - - Save Image - 保存图片 - PlainText - - - Image saved - 图片已保存 - PlainText - - - Failed to save ink strokes - 墨迹保存失败 - PlainText - - - Save ink strokes - 保存墨迹 - PlainText - - - Ink strokes saved - 墨迹已保存 - PlainText - - - Failed to save ugoira - 剪影保存失败 - PlainText - - - Ugoira saved - 剪影已保存 - PlainText - - - Scanner - 扫描仪 - TextBlock - - - Search… - 搜索作品… - AutoSuggestBox - - - Search options - 搜索选项 - TextBlock - - - Search - 搜索 - PlainText - - - Settings - 设置 - PlainText - - - Sex - 性别 - TextBlock - - - Share - 分享 - TextBlock - - - Share - 分享 - PlainText - - - Sharing illust - 该图片页面的链接将被分享 - PlainText - - - Stop - 停止 - TextBlock - - - Stop - 停止 - PlainText - - - Tablet - 数位板 - TextBlock - - - *Choose a tag will change your search options - *点击趋势标签将改变您的搜索选项 - TextBlock - - - Tools - 绘图工具 - TextBlock - - - Trending tags - 趋势标签 - TextBlock - - - Unknown - 未知 - PlainText - - - Pin - 未固定 - Please verify the translation’s accuracy as the source string was updated after it was translated. - TextBlock - - - User - 用户 - PlainText - - - User ID： - 用户标识： - TextBlock - - - Username - 用户名 - TextBlock - - - Sharing artist - 该用户页面的链接将被分享 - PlainText - - - Version information - 软件包版本信息 - TextBlock - - - Works - 作品 - Please verify the translation’s accuracy as the source string was updated after it was translated. - TextBlock - - - 「{0}」bookmarked - 作品「{0}」已收藏 - PlainText - - - Failed to bookmark「{0}」 - 作品「{0}」收藏失败 - PlainText - - - Pixiv art - Pixiv作品 - PlainText - - - 「{0}」 saved - 作品「{0}」已保存 - PlainText - - - Failed to save「{0}」 - 作品「{0}」保存失败 - PlainText - - - Direct Connection (!Experimental!) - 直连（实验性，可以绕过中国大陆的封锁） - CheckBox - - - New comment - 撰写评论 - ToggleButton - - - SauceNAO - 以圖搜圖 - Button + - - - Pixiv ID - Pixiv ID - AutoSuggestBox + - - - Imgur API key - Imgur API密钥 - TextBlock + - - - SauceNAO API key - SauceNAO API密钥 - TextBlock + - - - More functions - 更多功能 - TextBlock + - - - Pixiv ID - 作品直达 - TextBlock + - - - Cache - 缓存 - TextBlock - - - Cache size: - 缓存大小： - TextBlock - - - Calculating... - 计算中... - TextBlock - - - Clear cache - 清除缓存 - Button - - - Delete invalid files - 删除无效文件 - Button - - - Recalculating... - 重新计算中... - PlainText - - - Contributors from GitHub - 来自GitHub的参与者 - TextBlock - - - Developers - 开发人员 - TextBlock - - - Main developer - 主要开发者 - TextBlock - - - You have experimental features enabled. They may cause stability issues. -Do you want to disable them? - You have experimental features enabled. They may cause stability issues. -Do you want to disable them? - PlainText - - - Color Theme - Color Theme - TextBlock - - - Dark - Dark - ComboBoxItem - - - Use System Default - Use System Default - ComboBoxItem - - - Light - Light - ComboBoxItem - - - Restart the application to take effect - Restart the application to take effect - PlainText - - - - - \ No newline at end of file diff --git a/PixivFSUWP/PixivFSUWP.csproj b/PixivFSUWP/PixivFSUWP.csproj index aa7067b..5cfa0e5 100644 --- a/PixivFSUWP/PixivFSUWP.csproj +++ b/PixivFSUWP/PixivFSUWP.csproj @@ -209,10 +209,10 @@ - - + + @@ -309,8 +309,6 @@ - - 14.0 diff --git a/PixivFSUWP/ReportIssuePage.xaml b/PixivFSUWP/ReportIssuePage.xaml index 6fed6bb..3e8ff2f 100644 --- a/PixivFSUWP/ReportIssuePage.xaml +++ b/PixivFSUWP/ReportIssuePage.xaml @@ -13,23 +13,22 @@ - - - Report an issue/报告问题 - You are going to report an issue. We've collected some details. - 您正准备汇报一个问题，我们收集了一些细节。 + + + + - - + - Copy all/全部复制 - - Don't worry. The information you just copied does not contain any private data. - 不要担心，您刚刚所复制的信息不会携带您的任何隐私数据。 - - - + + + + + + diff --git a/PixivFSUWP/ReportIssuePage.xaml.cs b/PixivFSUWP/ReportIssuePage.xaml.cs index 616309c..6349019 100644 --- a/PixivFSUWP/ReportIssuePage.xaml.cs +++ b/PixivFSUWP/ReportIssuePage.xaml.cs @@ -1,24 +1,12 @@ using Microsoft.Toolkit.Uwp.Helpers; using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; using Windows.ApplicationModel; -using Windows.ApplicationModel.Core; using Windows.ApplicationModel.DataTransfer; -using Windows.Foundation; -using Windows.Foundation.Collections; using Windows.System; using Windows.UI.Popups; -using Windows.UI.ViewManagement; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; +using static PixivFSUWP.Data.OverAll; // https://go.microsoft.com/fwlink/?LinkId=234238 上介绍了“空白页”项模板 @@ -32,9 +20,7 @@ public sealed partial class ReportIssuePage : Page public ReportIssuePage() { this.InitializeComponent(); - CoreApplication.GetCurrentView().TitleBar.ExtendViewIntoTitleBar = true; - var view = ApplicationView.GetForCurrentView(); - view.Title = "Report an issue/问题反馈"; + txtDetails.Text += "General:\n"; txtDetails.Text += string.Format("OS version: build {0}\n", SystemInformation.OperatingSystemVersion.Build); txtDetails.Text += string.Format("App version: {0}.{1}.{2} {3}\n", @@ -61,7 +47,7 @@ private async void BtnCopy_Click(object sender, RoutedEventArgs e) dataPackage.RequestedOperation = DataPackageOperation.Copy; dataPackage.SetText(txtDetails.Text); Clipboard.SetContent(dataPackage); - MessageDialog dialog = new MessageDialog("Valuable information has been copied to clipboard./有价值的信息已经被复制到剪贴板。", "Copied/已复制"); + MessageDialog dialog = new MessageDialog(GetResourceString("CopiedInfoPlain"), GetResourceString("CopiedPlain")); await dialog.ShowAsync(); } diff --git a/PixivFSUWP/SettingsPage.xaml b/PixivFSUWP/SettingsPage.xaml index bee8b41..c01b6c7 100644 --- a/PixivFSUWP/SettingsPage.xaml +++ b/PixivFSUWP/SettingsPage.xaml @@ -101,6 +101,7 @@ BorderThickness="1.5" Margin="15,5,15,0" x:Uid="DeleteInvalid" Width="170" x:Name="btnDelInvalid" Click="btnDelInvalid_Click"/> + diff --git a/PixivFSUWP/SettingsPage.xaml.cs b/PixivFSUWP/SettingsPage.xaml.cs index bc618fa..67fb611 100644 --- a/PixivFSUWP/SettingsPage.xaml.cs +++ b/PixivFSUWP/SettingsPage.xaml.cs @@ -1,21 +1,13 @@ using PixivFSUWP.Interfaces; using System; using System.Collections.Generic; -using System.IO; using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; using System.Threading.Tasks; using Windows.ApplicationModel; -using Windows.Foundation; -using Windows.Foundation.Collections; using Windows.Security.Credentials; using Windows.System; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Navigation; using static PixivFSUWP.Data.OverAll; using Windows.Storage; @@ -61,14 +53,14 @@ protected override void OnNavigatedFrom(NavigationEventArgs e) async Task loadContentsAsync() { var imgTask = LoadImageAsync(currentUser.Avatar170); - txtVersion.Text = string.Format("版本：{0} version-{1}.{2}.{3} {4}", + txtVersion.Text = GetResourceString("ReleasedVersion") + string.Format("{0} version-{1}.{2}.{3} {4}", Package.Current.DisplayName, Package.Current.Id.Version.Major, Package.Current.Id.Version.Minor, Package.Current.Id.Version.Build, Package.Current.Id.Architecture); - txtPkgName.Text = string.Format("包名：{0}", Package.Current.Id.Name); - txtInsDate.Text = string.Format("时间：{0}", Package.Current.InstalledDate.ToLocalTime().DateTime); + txtPkgName.Text = GetResourceString("ReleasedID") + string.Format("{0}", Package.Current.Id.Name); + txtInsDate.Text = GetResourceString("ReleasedTime") + string.Format("{0}", Package.Current.InstalledDate.ToLocalTime().DateTime); txtID.Text = currentUser.ID.ToString(); txtName.Text = currentUser.Username; txtAccount.Text = "@" + currentUser.UserAccount; @@ -125,7 +117,7 @@ async Task loadContributors() { progressLoadingContributors.Visibility = Visibility.Collapsed; progressLoadingContributors.IsActive = false; - txtContributors.Text = "Failed to load contributors."; + txtContributors.Text = GetResourceString("ContributorsReadingErrorPlain"); return; } var enumerable = from item in res select ViewModels.ContributorViewModel.FromItem(item); diff --git a/PixivFSUWP/Strings/en/Resources.resw b/PixivFSUWP/Strings/en/Resources.resw index f68ca0c..c031da7 100644 --- a/PixivFSUWP/Strings/en/Resources.resw +++ b/PixivFSUWP/Strings/en/Resources.resw @@ -169,6 +169,10 @@ Calculating... TextBlock + + Cancel + PlainText + Cancel PlainText @@ -193,6 +197,22 @@ Contributors from GitHub TextBlock + + Error : Failed to load contributors. + PlainText + + + Valuable information has been copied to clipboard. + PlainText + + + Copied + PlainText + + + Copy All + HyperlinkButton + Generating Windows® Timeline™ PlainText @@ -306,6 +326,10 @@ Do you want to disable them? Imgur API key TextBlock + + + Don't worry. The information you just copied does not contain any private data. + TextBlock + Job TextBlock @@ -402,6 +426,10 @@ Do you want to disable them? New comment ToggleButton + + Not Yet + PlainText + No caption PlainText @@ -470,6 +498,10 @@ Do you want to disable them? Play PlainText + + GitHub + PlainText + Printer TextBlock @@ -514,12 +546,32 @@ Do you want to disable them? Register Button + + ID : + PlainText + + + TIme : + PlainText + + + Version : + PlainText + + + You are going to report an issue. We've collected some details. + TextBlock + + + Report An Issue + PlainText + Requesting PlainText - Restart the application to take effect + Please restart the application to take effect. PlainText @@ -590,6 +642,10 @@ Do you want to disable them? Search PlainText + + Email + PlainText + Settings PlainText @@ -686,4 +742,8 @@ Do you want to disable them? Failed to save「{0}」 PlainText + + Sure + PlainText + \ No newline at end of file diff --git a/PixivFSUWP/Strings/zh-Hans/Resources.resw b/PixivFSUWP/Strings/zh-Hans/Resources.resw index 4b8807d..6f4ea94 100644 --- a/PixivFSUWP/Strings/zh-Hans/Resources.resw +++ b/PixivFSUWP/Strings/zh-Hans/Resources.resw @@ -1,5 +1,110 @@  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx @@ -45,7 +150,7 @@ ToolTip - Windows分享 + Windows 分享 ToolTip @@ -129,7 +234,7 @@ PlainText - Gif文件 + Gif 文件 PlainText @@ -197,7 +302,7 @@ Button - *这将在您的所有Windows设备上退出登录 + *这将在您的所有 Windows 设备上退出登录 TextBlock @@ -277,7 +382,7 @@ PlainText - Pixiv用户 + Pixiv 用户 PlainText @@ -505,11 +610,11 @@ AutoSuggestBox + - Imgur API密钥 + Imgur API 密钥 TextBlock + - SauceNAO API密钥 + SauceNAO API 密钥 TextBlock + @@ -545,7 +650,7 @@ PlainText - 来自GitHub的参与者 + 来自 GitHub 的参与者 TextBlock @@ -581,4 +686,64 @@ 重新启动以应用设置 PlainText + + 出错啦：无法正常读取开发人员列表。 + PlainText + + + 包名： + PlainText + + + 时间： + PlainText + + + 版本： + PlainText + + + 取消 + PlainText + + + 有价值的信息已经被复制到剪贴板。 + PlainText + + + 全部复制 + HyperlinkButton + + + 不要担心，您刚刚所复制的信息不会携带您的任何隐私数据。 + TextBlock + + + 没有 + PlainText + + + GitHub + PlainText + + + 您正准备汇报一个问题，我们收集了一些细节。 + TextBlock + + + 报告问题 + PlainText + + + 邮件 + PlainText + + + 当然 + PlainText + + + 已复制 + PlainText + \ No newline at end of file diff --git a/PixivFSUWP/Strings/zh-Hant/Resources.resw b/PixivFSUWP/Strings/zh-Hant/Resources.resw index 1770c8a..14f701e 100644 --- a/PixivFSUWP/Strings/zh-Hant/Resources.resw +++ b/PixivFSUWP/Strings/zh-Hant/Resources.resw @@ -1,5 +1,110 @@  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx @@ -13,11 +118,11 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 所有时间 + 所有日期 ComboBoxItem - 画师 + 畫家 PlainText @@ -25,11 +130,11 @@ TextBlock - 作品「{0}」删除收藏失败 + 作品「{0}」收藏剔除不成功 PlainText - 收藏 + 收藏庫 NavigationViewItem @@ -37,51 +142,51 @@ PlainText - 复制应用链接 + 拷貝應用程式 URL ToolTip - 复制网页链接 + 拷貝網站 URL ToolTip - Windows分享 + Windows 自帶分享 ToolTip - 放弃 + 放棄 PlainText - 椅子 + 凳子 TextBlock - 评论 + 評論 PlainText - 正在创建时间线 + 正在在時間軸上創建新的活動歷程 PlainText - 当前登录的用户 + 當前登錄的賬戶 TextBlock - 按日期升序 + 按日期升序排序 ComboBoxItem - 按日期降序 + 按日期降序排序 ComboBoxItem - 删除收藏 + 從個人收藏庫中剔除該作品 PlainText - 作品「{0}」已删除收藏 + 作品「{0}」收藏剔除完成 PlainText @@ -93,35 +198,35 @@ TextBlock - 详情 + 詳情 PlainText - 正在下载动态剪影 + 正在下載動態剪影 PlainText - 临摹 + 臨摹 AppBarButton - 邮箱： + 電子郵箱： TextBlock - 女 + 女性 PlainText - 关注 + 追蹤 NavigationViewItem - 已关注 + 已追蹤 PlainText - 完全匹配标签 + 完全配對標簽 ComboBoxItem @@ -129,23 +234,23 @@ PlainText - Gif文件 + Gif 檔案 PlainText - 图片文件 + 相片檔案 PlainText - 当前工作 + 現時工作 TextBlock - 关键字/标签 + 關鍵字 / 標簽 TextBlock - 过去一天内 + 过去一日内 ComboBoxItem @@ -157,7 +262,7 @@ ComboBoxItem - 网页链接 + 網頁連結 PlainText @@ -165,67 +270,67 @@ TextBlock - 加载中 + 加載中 PlainText - 正在加载预览 + 正在加載瀏覽... PlainText - 正在加载第 {0} 张，共 {1} 张 + 正在加載第 {0} 张，共 {1} 张 PlainText - 正在登录 + 正在登入 TextBlock - 登录 + 登入 Button - 让创作变得更有乐趣 + 讓樂趣時刻伴隨創作 TextBlock - 登录失败，点此查看错误排查步骤并重试 + 登錄不成功，點擊查閲相關錯誤排解並重登賬戶 Button - 注销 + 登出 Button - *这将在您的所有Windows设备上退出登录 + *本次操作將會在所有裝有 Windows 設備上同步退登賬戶 TextBlock - 男 + 男性 PlainText - 显示器 + 液晶屏 TextBlock - 鼠标 + 滑鼠 TextBlock - 音乐 + 音樂 TextBlock - 我的临摹 + 我的臨摹 PlainText - 暂无简介 + 暫無介紹 PlainText - 没有墨迹可以保存 + 沒有墨跡可以存儲 PlainText @@ -237,11 +342,11 @@ PlainText - 未关注 + 未追蹤 TextBlock - 未关注 + 未追蹤 PlainText @@ -249,39 +354,39 @@ PlainText - 共 {0} 张作品，点击或触摸查看大图 + 共 {0} 张作品，點擊或觸摸檢查詳情 PlainText - 部分匹配标签 + 部分配對標簽 ComboBoxItem - 部分匹配标题和简介 + 部分配對標題及其簡介 ComboBoxItem - 密码 + 密碼 TextBlock - 计算机 + 計算機 TextBlock - 个人主页 + 個人主頁 TextBlock - 已固定 + 已釘選 PlainText - Pixiv用户 + Pixiv 賬戶 PlainText - 正在播放动态剪影 + 正在播放動態剪影 PlainText @@ -289,11 +394,11 @@ PlainText - 打印机 + 打印機 TextBlock - 无/保密 + 無 / 保密 PlainText @@ -301,99 +406,99 @@ PlainText - 快速收藏 + 便捷收藏 MenuFlyoutItem - 快速收藏 + 便捷收藏 PlainText - 快速保存 + 便捷存儲 MenuFlyoutItem - 排行 + 排行榜 NavigationViewItem - 墨迹原始信息 + 墨跡原件訊息 PlainText - 推荐 + 推薦 NavigationViewItem - 注册 + 注冊 Button - 请求中 + 請求中 PlainText - 重试 + 重試 PlainText - 快速保存 + 便捷存儲 TextBlock - 保存图片 + 存儲相片 AppBarButton - 图片保存失败 + 相片存儲不成功 PlainText - 保存图片 + 存儲相片 PlainText - 图片已保存 + 相片存儲成功 PlainText - 墨迹保存失败 + 墨跡存儲不成功 PlainText - 保存墨迹 + 存儲墨跡 PlainText - 墨迹已保存 + 墨跡存儲成功 PlainText - 剪影保存失败 + 剪影存儲不成功 PlainText - 剪影已保存 + 剪影存儲成功 PlainText - 扫描仪 + 掃描儀 TextBlock - 搜索作品… + 搜尋更多作品… AutoSuggestBox - 搜索选项 + 搜尋選項 TextBlock - 搜索 + 搜尋 PlainText - 设置 + 設定 PlainText @@ -409,7 +514,7 @@ PlainText - 该图片页面的链接将被分享 + 操作將會以相片頁面的連結為形式分享 PlainText @@ -421,19 +526,19 @@ PlainText - 数位板 + 數位板 TextBlock - *点击趋势标签将改变您的搜索选项 + *搜尋設定將會應用于你所做出更改趨勢標簽的選項 TextBlock - 绘图工具 + 繪圖工具 TextBlock - 趋势标签 + 趨勢標簽 TextBlock @@ -441,27 +546,27 @@ PlainText - 未固定 + 未釘選 TextBlock - 用户 + 用戶 PlainText - 用户标识： + 用戶唯一標識： TextBlock - 用户名 + 用戶名 TextBlock - 该用户页面的链接将被分享 + 操作將會以賬戶頁面的連結為形式分享 PlainText - 软件包版本信息 + 應用程式版本資訊 TextBlock @@ -469,31 +574,31 @@ TextBlock - 作品「{0}」已收藏 + 作品「{0}」收藏成功 PlainText - 作品「{0}」收藏失败 + 作品「{0}」收藏不成功 PlainText - Pixiv作品 + Pixiv 作品 PlainText - 作品「{0}」已保存 + 作品「{0}」存儲成功 PlainText - 作品「{0}」保存失败 + 作品「{0}」存儲不成功 PlainText - 直连（实验性，可以绕过中国大陆的封锁） + 直連（實驗性，可避開 GWF 網路封鎖） CheckBox - 撰写评论 + 撰寫評論 ToggleButton @@ -505,11 +610,11 @@ AutoSuggestBox + - Imgur API密钥 + Imgur API 金匙 TextBlock + - SauceNAO API密钥 + SauceNAO API 金匙 TextBlock + @@ -517,43 +622,127 @@ TextBlock + - 作品直达 + 直連作品 TextBlock + - 缓存 + 暫存檔案 TextBlock - 缓存大小： + 暫存檔案共計： TextBlock - 计算中... + 計算中... TextBlock - 清除缓存 + 釋放暫存檔案 Button - 删除无效文件 + 剔除無效檔案 Button - 重新计算中... + 重新計算中... PlainText - 来自GitHub的参与者 + 來自 GitHub 的參與人 TextBlock - 开发人员 + 開發人員 TextBlock - 主要开发者 + 承建開發人 TextBlock + + 色彩 + TextBlock + + + 出錯啦：無法獲取開發人名單資訊。 + PlainText + + + 深色 + ComboBoxItem + + + 使用系統設定 + ComboBoxItem + + + 淺色 + ComboBoxItem + + + 程序包： + PlainText + + + 安裝日期： + PlainText + + + 具體型號： + PlainText + + + 已做出變更，請重啓應用程序來使用設定 + PlainText + + + 撤消 + PlainText + + + 有價值的訊息已張貼到剪切板。 + PlainText + + + 全部拷貝 + HyperlinkButton + + + 您已啓用實驗性功能，或者會帶來維持應用程式穩定性的困難，請確認您是否要停用？ + PlainText + + + 不用擔心，以上的訊息不會包含您個人隱私數據。 + TextBlock + + + 沒有 + PlainText + + + GitHub + PlainText + + + 我們收集了少少您的裝置清單，來協助您更好地反應意見。 + TextBlock + + + 傳送意見反應 + PlainText + + + Email + PlainText + + + 當然 + PlainText + + + 完成操作 + PlainText + \ No newline at end of file