Skip to content

Commit

Permalink
Merge branch 'develop' into prod
Browse files Browse the repository at this point in the history
  • Loading branch information
d2phap committed Jun 26, 2024
2 parents eed3c41 + 2f61381 commit 98ea2df
Show file tree
Hide file tree
Showing 29 changed files with 1,359 additions and 216 deletions.
10 changes: 4 additions & 6 deletions Setup/AdvancedInstaller/ImageGlass_9_x64.aip
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<DOCUMENT Type="Advanced Installer" CreateVersion="16.6.1" version="21.7.1" Modules="architect" RootPath="." Language="en" Id="{F94250A5-86CD-4D74-BDB8-560C4CA1354D}">
<COMPONENT cid="caphyon.advinst.msicomp.ProjectOptionsComponent">
<ROW Name="HiddenItems" Value="AppXProductDetailsComponent;AppXDependenciesComponent;AppXAppDetailsComponent;AppXVisualAssetsComponent;AppXCapabilitiesComponent;AppXAppDeclarationsComponent;AppXUriRulesComponent;FixupComponent;MsiXDiffComponent;MsixManifestEditorComponent"/>
</COMPONENT>
<DOCUMENT Type="Advanced Installer" CreateVersion="16.6.1" version="21.8.2" Modules="architect" RootPath="." Language="en" Id="{F94250A5-86CD-4D74-BDB8-560C4CA1354D}">
<COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
<ROW Property="AI_APP_FILE" Value="[#ImageGlass.exe]"/>
<ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
Expand All @@ -25,10 +22,10 @@
<ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:3"/>
<ROW Property="Manufacturer" Value="Duong Dieu Phap"/>
<ROW Property="MsiLogging" MultiBuildValue="DefaultBuild:vp"/>
<ROW Property="ProductCode" Value="1033:{A0A1D7F6-69DD-422C-913A-5C9A9A4B9953} " Type="16"/>
<ROW Property="ProductCode" Value="1033:{8E74F7F4-A6E9-45C1-8E41-BDDF2A40A53B} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="ImageGlass"/>
<ROW Property="ProductVersion" Value="9.1.6.14" Options="32"/>
<ROW Property="ProductVersion" Value="9.1.7.627" Options="32"/>
<ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
<ROW Property="UpgradeCode" Value="{877DB994-AB03-4025-B99D-41CE565E810B}"/>
Expand Down Expand Up @@ -488,6 +485,7 @@
<ROW File="Indonesian.iglang.json" Component_="Vietnamese.iglang.json" FileName="INDONE~1.JSO|Indonesian.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Indonesian.iglang.json" SelfReg="false"/>
<ROW File="Irish.iglang.json" Component_="Vietnamese.iglang.json" FileName="IRISHI~1.JSO|Irish.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Irish.iglang.json" SelfReg="false"/>
<ROW File="Kyrgyz.iglang.json" Component_="Vietnamese.iglang.json" FileName="KYRGYZ~1.JSO|Kyrgyz.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Kyrgyz.iglang.json" SelfReg="false"/>
<ROW File="ArrowMove.svg" Component_="ArrowDown.svg" FileName="ARROWM~1.SVG|ArrowMove.svg" Attributes="0" SourcePath="..\..\Source\ImageGlass\bin\Publish\net8.0-windows-x64\Icons\ArrowMove.svg" SelfReg="false"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.AiPersistentPropComponent">
<ROW Property="AI_INSTALLPERUSER" Registry="AI_INSTALLPERUSER" HklmSearch="AI_INSTALLPERUSER" HkcuSearch="AI_INSTALLPERUSER_1" Hklm64Search="AI_INSTALLPERUSER_2" Hkcu64Search="AI_INSTALLPERUSER_3"/>
Expand Down
984 changes: 984 additions & 0 deletions Setup/AdvancedInstaller/ImageGlass_9_x64.back(21.7.1).aip

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions Setup/Assets/Language/Chinese Simplified.iglang.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@
"FrmMain.MnuRename._Description": "输入新文件名:",
"_._No": "",
"FrmSlideshow.MnuToggleCountdown": "显示每页幻灯片播放倒计时",
"FrmSettings._OpenStartupAppsSetting": "Open Startup apps setting",
"FrmSettings._OpenStartupAppsSetting": "打开启动应用设置",
"FrmMain.MnuViewPreviousFrame": "查看上一帧",
"_.ImageOrderBy._DateModified": "修改日期",
"FrmMain.MnuViewNextFrame": "查看下一帧",
"FrmMain.MnuUnload": "卸载图像",
"FrmSettings.Toolbar._HideToolbarInFullscreen": "全屏模式隐藏工具栏",
"_.ImageOrderType._Desc": "降序",
"_._Update": "Update",
"FrmSettings._EnableImageAsyncLoading": "Enable image asynchronous loading",
"FrmSettings._DefaultPhotoViewer._Description": "Register the supported formats of ImageGlass with Windows. You might need to open the Default apps settings and manually select ImageGlass from the list for it to take effect.",
"_._Update": "更新",
"FrmSettings._EnableImageAsyncLoading": "启用图像异步加载",
"FrmSettings._DefaultPhotoViewer._Description": "在 Windows 中注册 ImageGlass 支持的格式。 您可能需要打开默认应用设置并手动从列表中选择 ImageGlass 才能生效。",
"_.MouseWheelAction._BrowseImages": "查看下一张/上一张图片",
"FrmSettings._EditApps": "图像编辑应用",
"FrmColorPickerSettings.ChkShowCIELabA": "使用含 Alpha 值的 CIELAB 格式",
Expand Down Expand Up @@ -79,15 +79,15 @@
"FrmQuickSetup._StepInfo": "步骤 {0}",
"FrmMain.MnuColorPicker": "取色工具",
"FrmCrop.SelectionAspectRatio._FreeRatio": "自由比例",
"FrmSettings._ResetSettings": "Reset settings",
"FrmSettings._ResetSettings": "重置设置",
"FrmSettings._Startup": "启动",
"_.BackdropStyle._None": "",
"FrmSettings._LoadDefaultZoomLevels": "载入默认缩放级别",
"FrmColorPicker.BtnSettings._Tooltip": "打开拾色器设置…",
"FrmSettings._UseThemeForDarkMode": "将此主题用于深色模式",
"FrmSettings._ShowDeleteConfirmation": "删除文件时显示确认对话框",
"FrmSettings._ShowAppIcon": "在标题栏上显示应用图标",
"_._InvalidAction": "Invalid action",
"_._InvalidAction": "无效操作",
"FrmQuickSetup._SelectProfile": "选择一个配置文件",
"_.Metadata._FileCreationTime": "创建日期",
"FrmSettings._SlideshowImagesToNotifySound": "触发通知声音的图像数量",
Expand All @@ -109,7 +109,7 @@
"FrmSettings._ShouldAutoOpenNewAddedImage": "自动打开新添加的图像",
"FrmCrop.SelectionAspectRatio._Custom": "自定义...",
"FrmMain.MnuCopyPath._Success": "已复制当前图像路径。",
"FrmSettings._StartupBoost._Error": "Could not change Startup Boost setting",
"FrmSettings._StartupBoost._Error": "无法更改自启动设置",
"FrmToolNotFound.LblDescription": "ImageGlass 无法定位可执行文件 '{0}' 的路径。 要解决这个问题,请按需更新 '{0}' 的路径。",
"FrmMain.MnuClearClipboard": "清空剪贴板",
"FrmSettings._ColorManagement": "色彩管理",
Expand Down Expand Up @@ -152,14 +152,14 @@
"FrmMain.MnuScaleToFill": "填满窗口",
"FrmCrop.BtnCrop": "裁剪",
"_.AfterEditAppAction._Minimize": "最小化",
"FrmSettings._StartupBoost": "Startup Boost",
"FrmSettings._StartupBoost": "自启动",
"FrmMain.MnuViewFirstFrame": "查看第一帧",
"_.MouseWheelEvent._CtrlAndScroll": "按住 Ctrl 滚动",
"FrmSettings._HideMainWindowInSlideshow": "自动隐藏主窗口",
"_.Metadata._FrameCount": "帧数",
"FrmSettings._EnableCopyMultipleFiles": "允许一次复制多个文件",
"FrmMain.MnuFrameless._EnableDescription": "按住 Shift 键移动窗口。",
"_.ImageOrderBy._ExifDateTaken": "EXIF: Date taken",
"_.ImageOrderBy._ExifDateTaken": "EXIF:日期已使用",
"FrmAbout._Credits": "致谢",
"FrmSettings._AddNewFileExtension": "添加新文件扩展名",
"FrmMain.MnuQuickSetup": "打开 ImageGlass 快速设置",
Expand All @@ -181,7 +181,7 @@
"_.Position._Right": "右侧",
"_._Icon": "图标",
"FrmSettings._ShouldLoadHiddenImages": "加载隐藏图像",
"_._InvalidAction._Transformation": "ImageGlass does not support rotation, flipping for this image.",
"_._InvalidAction._Transformation": "ImageGlass 不支持旋转、翻转该图像。",
"FrmSettings._MakeDefault": "设为默认",
"FrmMain.MnuCopyImageData._Copying": "正在复制图像数据。 这需要一些时间…",
"FrmSettings._UseEmbeddedThumbnailRawFormats": "仅为RAW格式加载缩略图",
Expand Down Expand Up @@ -219,8 +219,8 @@
"FrmMain.MnuExit": "退出",
"_._Yes": "",
"FrmMain.MnuRotateLeft": "向左旋转",
"FrmSettings._EnableStartupBoost": "Enable Startup Boost",
"_.ImageOrderBy._ExifRating": "EXIF: Rating",
"FrmSettings._EnableStartupBoost": "启用自启动",
"_.ImageOrderBy._ExifRating": "EXIF:评分",
"FrmMain.MnuZoomIn": "放大",
"_.Metadata._ColorSpace": "色彩空间",
"FrmAbout._Version": "版本:",
Expand All @@ -235,15 +235,15 @@
"FrmMain.MnuCropTool": "裁剪图像",
"_._IgCommandExe._DefaultError._Heading": "无效命令",
"_._Refresh": "刷新",
"FrmMain.MnuLosslessCompression._Description": "This tool uses Magick.NET library for lossless compression, optimizing file size. Overwrites only if the compressed file is smaller than the original.",
"FrmMain.MnuLosslessCompression._Description": "此工具使用 Magick.NET 库进行无损压缩,优化文件大小。 仅在压缩文件小于原始文件时覆盖。",
"_._MoveDown": "下移",
"FrmSettings._GetExtensionIconPacks": "获取扩展图标包...",
"FrmSettings._InAppMessageDuration": "应用内消息持续时间 (毫秒)",
"FrmMain.MnuFrameless": "无边框模式",
"_._Reset": "重置",
"FrmSettings._ConfigDir": "配置文件位置",
"FrmQuickSetup._SettingsWillBeApplied": "以下设置将被应用:",
"FrmSettings._UnmanagedSettingReminder": "This setting is not managed by ImageGlass. Don't forget to disable it before you remove or relocate the app because ImageGlass does not handle this automatically.",
"FrmSettings._UnmanagedSettingReminder": "此设置不由 ImageGlass 管理。 请在您删除或移动应用之前禁用它,因为ImageGlass 不会自动处理。",
"FrmMain.MnuClipboard": "剪贴板",
"FrmMain.MnuCustomZoom": "自定义缩放...",
"FrmSettings._DisplayLanguage": "显示语言",
Expand All @@ -256,9 +256,9 @@
"FrmSettings._ShowCheckerboardOnlyImageRegion": "仅在图像区域内显示棋盘格",
"FrmMain.MnuClearClipboard._Success": "清除剪贴板。",
"FrmQuickSetup._Text": "ImageGlass 快速设置",
"FrmMain.MnuLosslessCompression._Done": "Done lossless compression.\r\nThe new file size is {0}, saved {1}.",
"FrmMain.MnuLosslessCompression": "Magick.NET Lossless Compression",
"FrmSettings._StartupBoost._Disabled": "Startup Boost is disabled",
"FrmMain.MnuLosslessCompression._Done": "无损压缩完成\r\n新文件大小为 {0},已保存 {1}",
"FrmMain.MnuLosslessCompression": "Magick.NET 无损压缩",
"FrmSettings._StartupBoost._Disabled": "自启动已禁用",
"FrmMain.MnuToggleCheckerboard": "启用网格背景",
"FrmSettings._MinEmbeddedThumbnailSize._Height": "高度",
"FrmSettings.Nav._General": "一般",
Expand Down Expand Up @@ -293,7 +293,7 @@
"FrmExportFrames._OpenOutputFolder": "打开输出文件夹",
"FrmMain.MnuOpenLocation": "打开图片所在位置",
"FrmMain.MnuLockZoom": "锁定缩放比例",
"FrmSettings._StartupBoost._Description": "Preload and run ImageGlass in the background for a few seconds during Windows startup to accelerate the first launch.",
"FrmSettings._StartupBoost._Description": "在 Windows 启动时预加载并短暂后台运行以加速 ImageGlass 的首次启动。",
"FrmSettings._WindowBackdrop": "窗口背景",
"FrmSettings._EnableRealTimeFileUpdate": "监控文件夹中的文件更改并实时更新",
"_._NotSupported": "不支持的格式",
Expand Down Expand Up @@ -346,7 +346,7 @@
"_._Name": "名称",
"FrmColorPickerSettings.ChkShowHslA": "使用含 Alpha 值的 HSL 格式",
"FrmMain.MnuToggleImageAnimation": "开始/停止图像动画",
"FrmSettings._DisableStartupBoost": "Disable Startup Boost",
"FrmSettings._DisableStartupBoost": "禁用自启动",
"FrmMain.MnuCopyFile._Success": "已复制 {0} 个文件。",
"FrmMain.MnuSave._ConfirmDescription": "ImageGlass 并非专业照片编辑器,请注意在保存图像时,质量、元数据、图层等信息可能丢失。",
"FrmToolNotFound.BtnSelectExecutable": "选择…",
Expand Down Expand Up @@ -394,9 +394,9 @@
"FrmMain.MnuCopyFile": "复制文件",
"_._CreatingFile": "创建临时图像文件…",
"FrmMain.MnuToggleTopMost": "保持窗口最前",
"FrmMain.MnuLosslessCompression._Confirm": "Are you sure you want to proceed?",
"FrmMain.MnuLosslessCompression._Confirm": "您确定要操作吗?",
"FrmMain.MnuImage": "图像",
"FrmSettings._StartupBoost._Enabled": "Startup Boost is enabled",
"FrmSettings._StartupBoost._Enabled": "自启动已启用",
"FrmQuickSetup._SetDefaultViewer": "您要设置 ImageGlass 为默认的照片查看器吗?",
"FrmMain.MnuScaleToWidth": "适配宽度",
"_._FileExtension": "文件扩展名",
Expand Down Expand Up @@ -439,7 +439,7 @@
"_._ID": "ID",
"FrmSettings._UserConfigFile": "用户设置文件(igconfig.json)",
"FrmMain.MnuLoadingOrders": "加载顺序",
"FrmSettings._OpenSaveAsDialogInTheCurrentImageDir": "Open the Save As dialog in the current image directory",
"FrmSettings._OpenSaveAsDialogInTheCurrentImageDir": "在当前图像目录中打开另存为对话框",
"_.MouseWheelEvent._ShiftAndScroll": "按住 Shift 滚动",
"FrmSettings._UseSmoothZooming": "使用平滑缩放",
"FrmSettings._Theme": "主题",
Expand All @@ -464,7 +464,7 @@
"FrmSettings.Tools._AddNewTool": "添加外部工具",
"FrmMain.MnuRename": "重命名图像...",
"FrmMain.MnuViewLastFrame": "查看最后一帧",
"_._Webview2._NotFound": "Please install the latest version of WebView2 Runtime.",
"_._Webview2._NotFound": "请安装 WebView2 运行时的最新版本。",
"FrmMain.MnuGetMoreTools": "获取更多工具…",
"FrmSettings.Nav._Appearance": "外观",
"FrmSettings._SlideshowInterval": "幻灯片放映间隔:",
Expand All @@ -480,7 +480,7 @@
"FrmSettings.Nav._Edit": "编辑",
"FrmMain.MnuToggleGallery": "相册面板",
"_._IgCommandExe._DefaultError._Description": "请确保您输入了正确的命令!\r\n该可执行文件包含 ImageGlass 软件的命令行功能。\r\n\r\n要探索所有命令行, 请访问:\n{0}",
"FrmMain.MnuLosslessCompression._Compressing": "Performing lossless compression",
"FrmMain.MnuLosslessCompression._Compressing": "无损压缩中",
"FrmSettings._ShouldGroupImagesByDirectory": "按目录分组图像",
"FrmMain.MnuPanToRightSide": "平移图像至右侧",
"_.Metadata._ExifRatingPercent": "评级",
Expand Down
Loading

0 comments on commit 98ea2df

Please sign in to comment.