Skip to content

Commit 98ea2df

Browse files
committed
Merge branch 'develop' into prod
2 parents eed3c41 + 2f61381 commit 98ea2df

29 files changed

+1359
-216
lines changed

Setup/AdvancedInstaller/ImageGlass_9_x64.aip

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<DOCUMENT Type="Advanced Installer" CreateVersion="16.6.1" version="21.7.1" Modules="architect" RootPath="." Language="en" Id="{F94250A5-86CD-4D74-BDB8-560C4CA1354D}">
3-
<COMPONENT cid="caphyon.advinst.msicomp.ProjectOptionsComponent">
4-
<ROW Name="HiddenItems" Value="AppXProductDetailsComponent;AppXDependenciesComponent;AppXAppDetailsComponent;AppXVisualAssetsComponent;AppXCapabilitiesComponent;AppXAppDeclarationsComponent;AppXUriRulesComponent;FixupComponent;MsiXDiffComponent;MsixManifestEditorComponent"/>
5-
</COMPONENT>
2+
<DOCUMENT Type="Advanced Installer" CreateVersion="16.6.1" version="21.8.2" Modules="architect" RootPath="." Language="en" Id="{F94250A5-86CD-4D74-BDB8-560C4CA1354D}">
63
<COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
74
<ROW Property="AI_APP_FILE" Value="[#ImageGlass.exe]"/>
85
<ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
@@ -25,10 +22,10 @@
2522
<ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:3"/>
2623
<ROW Property="Manufacturer" Value="Duong Dieu Phap"/>
2724
<ROW Property="MsiLogging" MultiBuildValue="DefaultBuild:vp"/>
28-
<ROW Property="ProductCode" Value="1033:{A0A1D7F6-69DD-422C-913A-5C9A9A4B9953} " Type="16"/>
25+
<ROW Property="ProductCode" Value="1033:{8E74F7F4-A6E9-45C1-8E41-BDDF2A40A53B} " Type="16"/>
2926
<ROW Property="ProductLanguage" Value="1033"/>
3027
<ROW Property="ProductName" Value="ImageGlass"/>
31-
<ROW Property="ProductVersion" Value="9.1.6.14" Options="32"/>
28+
<ROW Property="ProductVersion" Value="9.1.7.627" Options="32"/>
3229
<ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
3330
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
3431
<ROW Property="UpgradeCode" Value="{877DB994-AB03-4025-B99D-41CE565E810B}"/>
@@ -488,6 +485,7 @@
488485
<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"/>
489486
<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"/>
490487
<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"/>
488+
<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"/>
491489
</COMPONENT>
492490
<COMPONENT cid="caphyon.advinst.msicomp.AiPersistentPropComponent">
493491
<ROW Property="AI_INSTALLPERUSER" Registry="AI_INSTALLPERUSER" HklmSearch="AI_INSTALLPERUSER" HkcuSearch="AI_INSTALLPERUSER_1" Hklm64Search="AI_INSTALLPERUSER_2" Hkcu64Search="AI_INSTALLPERUSER_3"/>

Setup/AdvancedInstaller/ImageGlass_9_x64.back(21.7.1).aip

Lines changed: 984 additions & 0 deletions
Large diffs are not rendered by default.

Setup/Assets/Language/Chinese Simplified.iglang.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@
2626
"FrmMain.MnuRename._Description": "输入新文件名:",
2727
"_._No": "",
2828
"FrmSlideshow.MnuToggleCountdown": "显示每页幻灯片播放倒计时",
29-
"FrmSettings._OpenStartupAppsSetting": "Open Startup apps setting",
29+
"FrmSettings._OpenStartupAppsSetting": "打开启动应用设置",
3030
"FrmMain.MnuViewPreviousFrame": "查看上一帧",
3131
"_.ImageOrderBy._DateModified": "修改日期",
3232
"FrmMain.MnuViewNextFrame": "查看下一帧",
3333
"FrmMain.MnuUnload": "卸载图像",
3434
"FrmSettings.Toolbar._HideToolbarInFullscreen": "全屏模式隐藏工具栏",
3535
"_.ImageOrderType._Desc": "降序",
36-
"_._Update": "Update",
37-
"FrmSettings._EnableImageAsyncLoading": "Enable image asynchronous loading",
38-
"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.",
36+
"_._Update": "更新",
37+
"FrmSettings._EnableImageAsyncLoading": "启用图像异步加载",
38+
"FrmSettings._DefaultPhotoViewer._Description": "在 Windows 中注册 ImageGlass 支持的格式。 您可能需要打开默认应用设置并手动从列表中选择 ImageGlass 才能生效。",
3939
"_.MouseWheelAction._BrowseImages": "查看下一张/上一张图片",
4040
"FrmSettings._EditApps": "图像编辑应用",
4141
"FrmColorPickerSettings.ChkShowCIELabA": "使用含 Alpha 值的 CIELAB 格式",
@@ -79,15 +79,15 @@
7979
"FrmQuickSetup._StepInfo": "步骤 {0}",
8080
"FrmMain.MnuColorPicker": "取色工具",
8181
"FrmCrop.SelectionAspectRatio._FreeRatio": "自由比例",
82-
"FrmSettings._ResetSettings": "Reset settings",
82+
"FrmSettings._ResetSettings": "重置设置",
8383
"FrmSettings._Startup": "启动",
8484
"_.BackdropStyle._None": "",
8585
"FrmSettings._LoadDefaultZoomLevels": "载入默认缩放级别",
8686
"FrmColorPicker.BtnSettings._Tooltip": "打开拾色器设置…",
8787
"FrmSettings._UseThemeForDarkMode": "将此主题用于深色模式",
8888
"FrmSettings._ShowDeleteConfirmation": "删除文件时显示确认对话框",
8989
"FrmSettings._ShowAppIcon": "在标题栏上显示应用图标",
90-
"_._InvalidAction": "Invalid action",
90+
"_._InvalidAction": "无效操作",
9191
"FrmQuickSetup._SelectProfile": "选择一个配置文件",
9292
"_.Metadata._FileCreationTime": "创建日期",
9393
"FrmSettings._SlideshowImagesToNotifySound": "触发通知声音的图像数量",
@@ -109,7 +109,7 @@
109109
"FrmSettings._ShouldAutoOpenNewAddedImage": "自动打开新添加的图像",
110110
"FrmCrop.SelectionAspectRatio._Custom": "自定义...",
111111
"FrmMain.MnuCopyPath._Success": "已复制当前图像路径。",
112-
"FrmSettings._StartupBoost._Error": "Could not change Startup Boost setting",
112+
"FrmSettings._StartupBoost._Error": "无法更改自启动设置",
113113
"FrmToolNotFound.LblDescription": "ImageGlass 无法定位可执行文件 '{0}' 的路径。 要解决这个问题,请按需更新 '{0}' 的路径。",
114114
"FrmMain.MnuClearClipboard": "清空剪贴板",
115115
"FrmSettings._ColorManagement": "色彩管理",
@@ -152,14 +152,14 @@
152152
"FrmMain.MnuScaleToFill": "填满窗口",
153153
"FrmCrop.BtnCrop": "裁剪",
154154
"_.AfterEditAppAction._Minimize": "最小化",
155-
"FrmSettings._StartupBoost": "Startup Boost",
155+
"FrmSettings._StartupBoost": "自启动",
156156
"FrmMain.MnuViewFirstFrame": "查看第一帧",
157157
"_.MouseWheelEvent._CtrlAndScroll": "按住 Ctrl 滚动",
158158
"FrmSettings._HideMainWindowInSlideshow": "自动隐藏主窗口",
159159
"_.Metadata._FrameCount": "帧数",
160160
"FrmSettings._EnableCopyMultipleFiles": "允许一次复制多个文件",
161161
"FrmMain.MnuFrameless._EnableDescription": "按住 Shift 键移动窗口。",
162-
"_.ImageOrderBy._ExifDateTaken": "EXIF: Date taken",
162+
"_.ImageOrderBy._ExifDateTaken": "EXIF:日期已使用",
163163
"FrmAbout._Credits": "致谢",
164164
"FrmSettings._AddNewFileExtension": "添加新文件扩展名",
165165
"FrmMain.MnuQuickSetup": "打开 ImageGlass 快速设置",
@@ -181,7 +181,7 @@
181181
"_.Position._Right": "右侧",
182182
"_._Icon": "图标",
183183
"FrmSettings._ShouldLoadHiddenImages": "加载隐藏图像",
184-
"_._InvalidAction._Transformation": "ImageGlass does not support rotation, flipping for this image.",
184+
"_._InvalidAction._Transformation": "ImageGlass 不支持旋转、翻转该图像。",
185185
"FrmSettings._MakeDefault": "设为默认",
186186
"FrmMain.MnuCopyImageData._Copying": "正在复制图像数据。 这需要一些时间…",
187187
"FrmSettings._UseEmbeddedThumbnailRawFormats": "仅为RAW格式加载缩略图",
@@ -219,8 +219,8 @@
219219
"FrmMain.MnuExit": "退出",
220220
"_._Yes": "",
221221
"FrmMain.MnuRotateLeft": "向左旋转",
222-
"FrmSettings._EnableStartupBoost": "Enable Startup Boost",
223-
"_.ImageOrderBy._ExifRating": "EXIF: Rating",
222+
"FrmSettings._EnableStartupBoost": "启用自启动",
223+
"_.ImageOrderBy._ExifRating": "EXIF:评分",
224224
"FrmMain.MnuZoomIn": "放大",
225225
"_.Metadata._ColorSpace": "色彩空间",
226226
"FrmAbout._Version": "版本:",
@@ -235,15 +235,15 @@
235235
"FrmMain.MnuCropTool": "裁剪图像",
236236
"_._IgCommandExe._DefaultError._Heading": "无效命令",
237237
"_._Refresh": "刷新",
238-
"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.",
238+
"FrmMain.MnuLosslessCompression._Description": "此工具使用 Magick.NET 库进行无损压缩,优化文件大小。 仅在压缩文件小于原始文件时覆盖。",
239239
"_._MoveDown": "下移",
240240
"FrmSettings._GetExtensionIconPacks": "获取扩展图标包...",
241241
"FrmSettings._InAppMessageDuration": "应用内消息持续时间 (毫秒)",
242242
"FrmMain.MnuFrameless": "无边框模式",
243243
"_._Reset": "重置",
244244
"FrmSettings._ConfigDir": "配置文件位置",
245245
"FrmQuickSetup._SettingsWillBeApplied": "以下设置将被应用:",
246-
"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.",
246+
"FrmSettings._UnmanagedSettingReminder": "此设置不由 ImageGlass 管理。 请在您删除或移动应用之前禁用它,因为ImageGlass 不会自动处理。",
247247
"FrmMain.MnuClipboard": "剪贴板",
248248
"FrmMain.MnuCustomZoom": "自定义缩放...",
249249
"FrmSettings._DisplayLanguage": "显示语言",
@@ -256,9 +256,9 @@
256256
"FrmSettings._ShowCheckerboardOnlyImageRegion": "仅在图像区域内显示棋盘格",
257257
"FrmMain.MnuClearClipboard._Success": "清除剪贴板。",
258258
"FrmQuickSetup._Text": "ImageGlass 快速设置",
259-
"FrmMain.MnuLosslessCompression._Done": "Done lossless compression.\r\nThe new file size is {0}, saved {1}.",
260-
"FrmMain.MnuLosslessCompression": "Magick.NET Lossless Compression",
261-
"FrmSettings._StartupBoost._Disabled": "Startup Boost is disabled",
259+
"FrmMain.MnuLosslessCompression._Done": "无损压缩完成\r\n新文件大小为 {0},已保存 {1}",
260+
"FrmMain.MnuLosslessCompression": "Magick.NET 无损压缩",
261+
"FrmSettings._StartupBoost._Disabled": "自启动已禁用",
262262
"FrmMain.MnuToggleCheckerboard": "启用网格背景",
263263
"FrmSettings._MinEmbeddedThumbnailSize._Height": "高度",
264264
"FrmSettings.Nav._General": "一般",
@@ -293,7 +293,7 @@
293293
"FrmExportFrames._OpenOutputFolder": "打开输出文件夹",
294294
"FrmMain.MnuOpenLocation": "打开图片所在位置",
295295
"FrmMain.MnuLockZoom": "锁定缩放比例",
296-
"FrmSettings._StartupBoost._Description": "Preload and run ImageGlass in the background for a few seconds during Windows startup to accelerate the first launch.",
296+
"FrmSettings._StartupBoost._Description": "在 Windows 启动时预加载并短暂后台运行以加速 ImageGlass 的首次启动。",
297297
"FrmSettings._WindowBackdrop": "窗口背景",
298298
"FrmSettings._EnableRealTimeFileUpdate": "监控文件夹中的文件更改并实时更新",
299299
"_._NotSupported": "不支持的格式",
@@ -346,7 +346,7 @@
346346
"_._Name": "名称",
347347
"FrmColorPickerSettings.ChkShowHslA": "使用含 Alpha 值的 HSL 格式",
348348
"FrmMain.MnuToggleImageAnimation": "开始/停止图像动画",
349-
"FrmSettings._DisableStartupBoost": "Disable Startup Boost",
349+
"FrmSettings._DisableStartupBoost": "禁用自启动",
350350
"FrmMain.MnuCopyFile._Success": "已复制 {0} 个文件。",
351351
"FrmMain.MnuSave._ConfirmDescription": "ImageGlass 并非专业照片编辑器,请注意在保存图像时,质量、元数据、图层等信息可能丢失。",
352352
"FrmToolNotFound.BtnSelectExecutable": "选择…",
@@ -394,9 +394,9 @@
394394
"FrmMain.MnuCopyFile": "复制文件",
395395
"_._CreatingFile": "创建临时图像文件…",
396396
"FrmMain.MnuToggleTopMost": "保持窗口最前",
397-
"FrmMain.MnuLosslessCompression._Confirm": "Are you sure you want to proceed?",
397+
"FrmMain.MnuLosslessCompression._Confirm": "您确定要操作吗?",
398398
"FrmMain.MnuImage": "图像",
399-
"FrmSettings._StartupBoost._Enabled": "Startup Boost is enabled",
399+
"FrmSettings._StartupBoost._Enabled": "自启动已启用",
400400
"FrmQuickSetup._SetDefaultViewer": "您要设置 ImageGlass 为默认的照片查看器吗?",
401401
"FrmMain.MnuScaleToWidth": "适配宽度",
402402
"_._FileExtension": "文件扩展名",
@@ -439,7 +439,7 @@
439439
"_._ID": "ID",
440440
"FrmSettings._UserConfigFile": "用户设置文件(igconfig.json)",
441441
"FrmMain.MnuLoadingOrders": "加载顺序",
442-
"FrmSettings._OpenSaveAsDialogInTheCurrentImageDir": "Open the Save As dialog in the current image directory",
442+
"FrmSettings._OpenSaveAsDialogInTheCurrentImageDir": "在当前图像目录中打开另存为对话框",
443443
"_.MouseWheelEvent._ShiftAndScroll": "按住 Shift 滚动",
444444
"FrmSettings._UseSmoothZooming": "使用平滑缩放",
445445
"FrmSettings._Theme": "主题",
@@ -464,7 +464,7 @@
464464
"FrmSettings.Tools._AddNewTool": "添加外部工具",
465465
"FrmMain.MnuRename": "重命名图像...",
466466
"FrmMain.MnuViewLastFrame": "查看最后一帧",
467-
"_._Webview2._NotFound": "Please install the latest version of WebView2 Runtime.",
467+
"_._Webview2._NotFound": "请安装 WebView2 运行时的最新版本。",
468468
"FrmMain.MnuGetMoreTools": "获取更多工具…",
469469
"FrmSettings.Nav._Appearance": "外观",
470470
"FrmSettings._SlideshowInterval": "幻灯片放映间隔:",
@@ -480,7 +480,7 @@
480480
"FrmSettings.Nav._Edit": "编辑",
481481
"FrmMain.MnuToggleGallery": "相册面板",
482482
"_._IgCommandExe._DefaultError._Description": "请确保您输入了正确的命令!\r\n该可执行文件包含 ImageGlass 软件的命令行功能。\r\n\r\n要探索所有命令行, 请访问:\n{0}",
483-
"FrmMain.MnuLosslessCompression._Compressing": "Performing lossless compression",
483+
"FrmMain.MnuLosslessCompression._Compressing": "无损压缩中",
484484
"FrmSettings._ShouldGroupImagesByDirectory": "按目录分组图像",
485485
"FrmMain.MnuPanToRightSide": "平移图像至右侧",
486486
"_.Metadata._ExifRatingPercent": "评级",

0 commit comments

Comments
 (0)