[macos] update Sparkle assets after merge

This commit is contained in:
maxkadushkin
2023-02-04 08:36:04 +03:00
parent b67889dbf2
commit a60b428b1f
14 changed files with 20 additions and 384 deletions

View File

@ -3,11 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<<<<<<< HEAD:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/B/Resources/Info.plist
<string>20G314</string>
=======
<string>20G224</string>
>>>>>>> hotfix/v7.3.1:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
@ -21,11 +17,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<<<<<<< HEAD:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/B/Resources/Info.plist
<string>2.0.0</string>
=======
<string>1.27.1</string>
>>>>>>> hotfix/v7.3.1:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
@ -33,11 +25,7 @@
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<<<<<<< HEAD:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/B/Resources/Info.plist
<string>2008</string>
=======
<string>1.106</string>
>>>>>>> hotfix/v7.3.1:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
@ -55,10 +43,6 @@
<key>DTXcodeBuild</key>
<string>13A1030d</string>
<key>LSMinimumSystemVersion</key>
<<<<<<< HEAD:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/B/Resources/Info.plist
<string>10.11</string>
=======
<string>10.9</string>
>>>>>>> hotfix/v7.3.1:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist
</dict>
</plist>

View File

@ -3,11 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<<<<<<< HEAD:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app/Contents/Info.plist
<string>20G314</string>
=======
<string>20G224</string>
>>>>>>> hotfix/v7.3.1:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
@ -21,11 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<<<<<<< HEAD:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app/Contents/Info.plist
<string>2.0.0</string>
=======
<string>1.27.1</string>
>>>>>>> hotfix/v7.3.1:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
@ -33,11 +25,7 @@
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<<<<<<< HEAD:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app/Contents/Info.plist
<string>2008</string>
=======
<string>1.106</string>
>>>>>>> hotfix/v7.3.1:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
@ -56,15 +44,8 @@
<string>13A1030d</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<<<<<<< HEAD:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app/Contents/Info.plist
<key>LSMinimumSystemVersion</key>
<string>10.11</string>
=======
<key>LSBackgroundOnly</key>
<string>1</string>
<key>LSMinimumSystemVersion</key>
<string>10.9</string>
>>>>>>> hotfix/v7.3.1:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist
<key>LSUIElement</key>
<string>1</string>
<key>NSPrincipalClass</key>

View File

@ -8,7 +8,6 @@
<data>
S4owayudAPuQWGl1UDlYESEJG4A=
</data>
<<<<<<< HEAD:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app/Contents/_CodeSignature/CodeResources
<key>Resources/SUStatus.nib/keyedobjects-101300.nib</key>
<data>
OtbFuoQj/TzopWhVXk1hUIS2YFE=
@ -16,19 +15,6 @@
<key>Resources/SUStatus.nib/keyedobjects.nib</key>
<data>
rfBJq2R1UWIjy/2RGqIE2U4xpi4=
=======
<key>Resources/Base.lproj/Sparkle.strings</key>
<data>
cHZov5FaqzfNhnBo0XdRuTMT4SY=
</data>
<key>Resources/SUStatus.nib/keyedobjects-101300.nib</key>
<data>
CIAIcdXrd5aOBmKYYDM7NGmuxGA=
</data>
<key>Resources/SUStatus.nib/keyedobjects.nib</key>
<data>
AWzvc/Oom69t77SqVhJIUEVnNYw=
>>>>>>> hotfix/v7.3.1:macos/Vendor/Sparkle/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/_CodeSignature/CodeResources
</data>
<key>Resources/ca.lproj/Sparkle.strings</key>
<dict>
@ -43,11 +29,7 @@
<dict>
<key>hash</key>
<data>
<<<<<<< HEAD:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app/Contents/_CodeSignature/CodeResources
s/BqxfkW6ntejzvVKDGFQGNbyiE=
=======
Gyp0nPqNvS5KdfMw+6ieF0yUTnI=
>>>>>>> hotfix/v7.3.1:macos/Vendor/Sparkle/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/_CodeSignature/CodeResources
</data>
<key>optional</key>
<true/>
@ -65,11 +47,7 @@
<dict>
<key>hash</key>
<data>
<<<<<<< HEAD:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app/Contents/_CodeSignature/CodeResources
k3tjECB5S48rX7WfCvnTXIkcB0E=
=======
fXH7MjrA6hDT/k/8B6Vwgntt2lw=
>>>>>>> hotfix/v7.3.1:macos/Vendor/Sparkle/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/_CodeSignature/CodeResources
</data>
<key>optional</key>
<true/>
@ -114,11 +92,7 @@
<dict>
<key>hash</key>
<data>
<<<<<<< HEAD:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app/Contents/_CodeSignature/CodeResources
2eoIyFzzAjSdyXDhmvKhtem2aVQ=
=======
xFBTJYPjf7rlbYdkRKNTsPYz5JA=
>>>>>>> hotfix/v7.3.1:macos/Vendor/Sparkle/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/_CodeSignature/CodeResources
</data>
<key>optional</key>
<true/>
@ -315,20 +289,7 @@
</dict>
<key>files2</key>
<dict>
<<<<<<< HEAD:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app/Contents/_CodeSignature/CodeResources
<key>Resources/Base.lproj/Sparkle.strings</key>
=======
<key>MacOS/fileop</key>
<dict>
<key>cdhash</key>
<data>
lxj3mKIQ39AVZEK38pWMaPSGxUs=
</data>
<key>requirement</key>
<string>cdhash H"e3eb91f77d0b03312e38c12fa726c22d3d36648e" or cdhash H"9718f798a210dfd0156442b7f2958c68f486c54b" or cdhash H"3041d686c9337dbc22180e5a50a1619b4300b495" or cdhash H"73d14270b04c7bd6598431fd41162ed85684fb94"</string>
</dict>
<key>Resources/AppIcon.icns</key>
>>>>>>> hotfix/v7.3.1:macos/Vendor/Sparkle/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/_CodeSignature/CodeResources
<dict>
<key>hash</key>
<data>
@ -339,7 +300,6 @@
DtMzHIaZXc+b8QeWxE6ny827TaDz6qtYADJ5E0RXPh0=
</data>
</dict>
<<<<<<< HEAD:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app/Contents/_CodeSignature/CodeResources
<key>Resources/SUStatus.nib/keyedobjects-101300.nib</key>
<dict>
<key>hash</key>
@ -349,39 +309,6 @@
<key>hash2</key>
<data>
ZPknwIs+Htkj2J2TUj5QrwOP88tPD6h2y4RzHawexN0=
=======
<key>Resources/Base.lproj/Sparkle.strings</key>
<dict>
<key>hash</key>
<data>
cHZov5FaqzfNhnBo0XdRuTMT4SY=
</data>
<key>hash2</key>
<data>
39CdfZZ1CQQz1Gd1+Ukxo2JHl0XESoc/cqWKF091WUk=
</data>
</dict>
<key>Resources/SUStatus.nib/keyedobjects-101300.nib</key>
<dict>
<key>hash</key>
<data>
CIAIcdXrd5aOBmKYYDM7NGmuxGA=
</data>
<key>hash2</key>
<data>
zQHRg9w5HHkCzf82YkWsfd9mPEYj66NGhFY/cgUMYfQ=
</data>
</dict>
<key>Resources/SUStatus.nib/keyedobjects.nib</key>
<dict>
<key>hash</key>
<data>
AWzvc/Oom69t77SqVhJIUEVnNYw=
</data>
<key>hash2</key>
<data>
zGUKYo5Dal8e+pKH1KVfXrogifmh9AWqDdAL/neSQgE=
>>>>>>> hotfix/v7.3.1:macos/Vendor/Sparkle/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/_CodeSignature/CodeResources
</data>
</dict>
<key>Resources/SUStatus.nib/keyedobjects.nib</key>
@ -412,19 +339,11 @@
<dict>
<key>hash</key>
<data>
<<<<<<< HEAD:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app/Contents/_CodeSignature/CodeResources
s/BqxfkW6ntejzvVKDGFQGNbyiE=
</data>
<key>hash2</key>
<data>
0TqHpdP45A2ZEX4dbmhxiwdAGWST22JPeSpoD8uKI6g=
=======
Gyp0nPqNvS5KdfMw+6ieF0yUTnI=
</data>
<key>hash2</key>
<data>
8q22yKUhfKJVOOXteUQZAVVkhfzPQKzoSJdnVNkDPo8=
>>>>>>> hotfix/v7.3.1:macos/Vendor/Sparkle/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/_CodeSignature/CodeResources
</data>
<key>optional</key>
<true/>
@ -446,19 +365,11 @@
<dict>
<key>hash</key>
<data>
<<<<<<< HEAD:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app/Contents/_CodeSignature/CodeResources
k3tjECB5S48rX7WfCvnTXIkcB0E=
</data>
<key>hash2</key>
<data>
9zno2tv+fUnUtxKLppI3VwTLjTKxymPq/VKODtJpFSQ=
=======
fXH7MjrA6hDT/k/8B6Vwgntt2lw=
</data>
<key>hash2</key>
<data>
bA5bxESyZuC/dG2VKfN+eQ7CVb2qAWrwfu94IpJ4Xi0=
>>>>>>> hotfix/v7.3.1:macos/Vendor/Sparkle/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/_CodeSignature/CodeResources
</data>
<key>optional</key>
<true/>
@ -519,19 +430,11 @@
<dict>
<key>hash</key>
<data>
<<<<<<< HEAD:macos/Vendor/Sparkle/Sparkle Test App.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app/Contents/_CodeSignature/CodeResources
2eoIyFzzAjSdyXDhmvKhtem2aVQ=
</data>
<key>hash2</key>
<data>
sg8RCTcbS8KN4P8IJCsQ4cTpc3dCUp6AVFkQHgqPvjk=
=======
xFBTJYPjf7rlbYdkRKNTsPYz5JA=
</data>
<key>hash2</key>
<data>
8PKuKp2lymWYfR+BqJ15UWlxOQKUl3fEveeseHBfaTw=
>>>>>>> hotfix/v7.3.1:macos/Vendor/Sparkle/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/_CodeSignature/CodeResources
</data>
<key>optional</key>
<true/>

View File

@ -3,11 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<<<<<<< HEAD
<string>20G314</string>
=======
<string>20G224</string>
>>>>>>> hotfix/v7.3.1
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
@ -51,11 +47,7 @@
<key>DTXcodeBuild</key>
<string>13A1030d</string>
<key>LSMinimumSystemVersion</key>
<<<<<<< HEAD
<string>10.11</string>
=======
<string>10.9</string>
>>>>>>> hotfix/v7.3.1
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>

View File

@ -10,11 +10,7 @@
</data>
<key>Resources/Assets.car</key>
<data>
<<<<<<< HEAD
8TWGyzimQUVXLotg5y+3/Dbo78s=
=======
QP25pawSxpR4M5r7q7CQE5JyXE8=
>>>>>>> hotfix/v7.3.1
</data>
<key>Resources/Base.lproj/InfoPlist.strings</key>
<data>
@ -22,17 +18,12 @@
</data>
<key>Resources/Base.lproj/MainMenu.nib/keyedobjects-101300.nib</key>
<data>
<<<<<<< HEAD
ogy5Zprukq9+QDgP6mekIM2VuUo=
=======
omuOCx21ap2xiAiRyAAlxAMlTbM=
>>>>>>> hotfix/v7.3.1
</data>
<key>Resources/Base.lproj/MainMenu.nib/keyedobjects.nib</key>
<data>
Oaz19feEasz/QLmv9PCj/GvU+5o=
</data>
<<<<<<< HEAD
<key>Resources/SUInstallUpdateViewController.nib/keyedobjects-101300.nib</key>
<data>
dg30r7D47b7G/J8OVn8/t57t3AQ=
@ -48,15 +39,6 @@
<key>Resources/SUUpdateSettingsWindowController.nib/keyedobjects.nib</key>
<data>
layvIHVkrsdo3lY5W40kfs8MAH0=
=======
<key>Resources/SUUpdateSettingsWindowController.nib/keyedobjects-101300.nib</key>
<data>
HVKdzpogmjjJ9pMMHRIYjGf7Blg=
</data>
<key>Resources/SUUpdateSettingsWindowController.nib/keyedobjects.nib</key>
<data>
934bF1u8a23xvzxkFqQqdOgSqkM=
>>>>>>> hotfix/v7.3.1
</data>
<key>Resources/ar.lproj/MainMenu.strings</key>
<dict>
@ -130,11 +112,16 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/fa.lproj/MainMenu.strings</key>
=======
<dict>
<key>hash</key>
<data>
dYu/+UbWh6smabl4RmEo2CFM3MQ=
</data>
<key>optional</key>
<true/>
</dict>
<key>Resources/fi.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -143,11 +130,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/fi.lproj/MainMenu.strings</key>
=======
<key>Resources/fr.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -156,11 +139,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/fr.lproj/MainMenu.strings</key>
=======
<key>Resources/he.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -169,11 +148,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/he.lproj/MainMenu.strings</key>
=======
<key>Resources/hr.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -182,11 +157,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/hr.lproj/MainMenu.strings</key>
=======
<key>Resources/hu.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -195,11 +166,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/hu.lproj/MainMenu.strings</key>
=======
<key>Resources/is.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -208,11 +175,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/is.lproj/MainMenu.strings</key>
=======
<key>Resources/it.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -221,11 +184,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/it.lproj/MainMenu.strings</key>
=======
<key>Resources/ja.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -234,11 +193,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/ja.lproj/MainMenu.strings</key>
=======
<key>Resources/ko.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -247,11 +202,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/ko.lproj/MainMenu.strings</key>
=======
<key>Resources/nb.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -260,11 +211,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/nb.lproj/MainMenu.strings</key>
=======
<key>Resources/nl.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -273,11 +220,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/nl.lproj/MainMenu.strings</key>
=======
<key>Resources/pl.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -286,11 +229,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/pl.lproj/MainMenu.strings</key>
=======
<key>Resources/pt_BR.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -299,11 +238,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/pt_BR.lproj/MainMenu.strings</key>
=======
<key>Resources/pt_PT.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -312,11 +247,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/pt_PT.lproj/MainMenu.strings</key>
=======
<key>Resources/ro.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -325,11 +256,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/ro.lproj/MainMenu.strings</key>
=======
<key>Resources/ru.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -338,11 +265,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/ru.lproj/MainMenu.strings</key>
=======
<key>Resources/sk.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -351,27 +274,11 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/sk.lproj/MainMenu.strings</key>
=======
<key>Resources/sl.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
dYu/+UbWh6smabl4RmEo2CFM3MQ=
<<<<<<< HEAD
</data>
<key>optional</key>
<true/>
</dict>
<key>Resources/sl.lproj/MainMenu.strings</key>
<dict>
<key>hash</key>
<data>
dYu/+UbWh6smabl4RmEo2CFM3MQ=
=======
>>>>>>> hotfix/v7.3.1
</data>
<key>optional</key>
<true/>
@ -441,17 +348,10 @@
<dict>
<key>cdhash</key>
<data>
<<<<<<< HEAD
kKbC5gfOxqU1suvmQDOSQGwLZ2c=
</data>
<key>requirement</key>
<string>cdhash H"6d4254bf4efc215e91781ecb743662ef4b9ddde8" or cdhash H"90a6c2e607cec6a535b2ebe6403392406c0b6767" or cdhash H"c35d2fae4977454e8ddf428a43cf3bd2f462e9f9" or cdhash H"eecd8e80bc5944f5acf1486f896f4c2312a36c07"</string>
=======
WhQaJjseBIxpGMD8w4MC8QpcCpA=
</data>
<key>requirement</key>
<string>cdhash H"9ded5b37b33ac7bfc8e3a0b87e5a2b18355d368e" or cdhash H"5a141a263b1e048c6918c0fcc38302f10a5c0a90" or cdhash H"1cd250941a9e1d1e8d6c53278279a5e2b7d9bd69" or cdhash H"23dba92d043ed6684ec2b50271630393b40ee7e8"</string>
>>>>>>> hotfix/v7.3.1
</dict>
<key>Resources/AppIcon.icns</key>
<dict>
@ -468,19 +368,11 @@
<dict>
<key>hash</key>
<data>
<<<<<<< HEAD
8TWGyzimQUVXLotg5y+3/Dbo78s=
</data>
<key>hash2</key>
<data>
yVSz9fjf3EjNQQ7Ri2oiBfSGdlGwj/E5L8Rr/kJxYV8=
=======
QP25pawSxpR4M5r7q7CQE5JyXE8=
</data>
<key>hash2</key>
<data>
N5Bb299OUHvtsim+eijYsf9/cJZsU51F4rEBFtPP3FY=
>>>>>>> hotfix/v7.3.1
</data>
</dict>
<key>Resources/Base.lproj/InfoPlist.strings</key>
@ -498,19 +390,11 @@
<dict>
<key>hash</key>
<data>
<<<<<<< HEAD
ogy5Zprukq9+QDgP6mekIM2VuUo=
</data>
<key>hash2</key>
<data>
QpyMpGGd+niskTmvPqX3Ok1KrgpgV9DewZ+v6zQcF5E=
=======
omuOCx21ap2xiAiRyAAlxAMlTbM=
</data>
<key>hash2</key>
<data>
bxvpkceeC791G6R5WSqctI2ctX7K7t7J9XGLq9Q0pXo=
>>>>>>> hotfix/v7.3.1
</data>
</dict>
<key>Resources/Base.lproj/MainMenu.nib/keyedobjects.nib</key>
@ -524,7 +408,6 @@
AW5OE1Uuj4oiuC57HrYKwrX5trrqDp6xOYZQEOOlnh8=
</data>
</dict>
<<<<<<< HEAD
<key>Resources/SUInstallUpdateViewController.nib/keyedobjects-101300.nib</key>
<dict>
<key>hash</key>
@ -547,44 +430,26 @@
+plIS2rF2W1MhWlelb/VIMdP4B3az8//DuwjgL4Yqsw=
</data>
</dict>
=======
>>>>>>> hotfix/v7.3.1
<key>Resources/SUUpdateSettingsWindowController.nib/keyedobjects-101300.nib</key>
<dict>
<key>hash</key>
<data>
<<<<<<< HEAD
wSppjdd5G/4lDEaezWvvrLqb0AE=
</data>
<key>hash2</key>
<data>
THjYRpDtilBzSSH+xs8AIQeJEspOE/fvU/9D69e44cw=
=======
HVKdzpogmjjJ9pMMHRIYjGf7Blg=
</data>
<key>hash2</key>
<data>
2ktJqFojZMG1753LtrAtfpd+8pYLv7vVQ1zuvLLwqOQ=
>>>>>>> hotfix/v7.3.1
</data>
</dict>
<key>Resources/SUUpdateSettingsWindowController.nib/keyedobjects.nib</key>
<dict>
<key>hash</key>
<data>
<<<<<<< HEAD
layvIHVkrsdo3lY5W40kfs8MAH0=
</data>
<key>hash2</key>
<data>
FY/okURm83Am3YoZFC0rWeM1jLgjX8lFo4mkZEXl0Co=
=======
934bF1u8a23xvzxkFqQqdOgSqkM=
</data>
<key>hash2</key>
<data>
hwqlbaKgjv8Ffjl7P4kfPodOYhB15SyafWid23Yq2pg=
>>>>>>> hotfix/v7.3.1
</data>
</dict>
<key>Resources/ar.lproj/MainMenu.strings</key>
@ -691,11 +556,20 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/fa.lproj/MainMenu.strings</key>
=======
<dict>
<key>hash</key>
<data>
dYu/+UbWh6smabl4RmEo2CFM3MQ=
</data>
<key>hash2</key>
<data>
cJUVRswEvrCHRy6IeoFTVbbHAtuImMzREcu7QfyCXo8=
</data>
<key>optional</key>
<true/>
</dict>
<key>Resources/fi.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -708,11 +582,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/fi.lproj/MainMenu.strings</key>
=======
<key>Resources/fr.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -725,11 +595,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/fr.lproj/MainMenu.strings</key>
=======
<key>Resources/he.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -742,11 +608,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/he.lproj/MainMenu.strings</key>
=======
<key>Resources/hr.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -759,11 +621,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/hr.lproj/MainMenu.strings</key>
=======
<key>Resources/hu.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -776,11 +634,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/hu.lproj/MainMenu.strings</key>
=======
<key>Resources/is.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -793,11 +647,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/is.lproj/MainMenu.strings</key>
=======
<key>Resources/it.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -810,11 +660,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/it.lproj/MainMenu.strings</key>
=======
<key>Resources/ja.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -827,11 +673,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/ja.lproj/MainMenu.strings</key>
=======
<key>Resources/ko.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -844,11 +686,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/ko.lproj/MainMenu.strings</key>
=======
<key>Resources/nb.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -861,11 +699,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/nb.lproj/MainMenu.strings</key>
=======
<key>Resources/nl.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -878,11 +712,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/nl.lproj/MainMenu.strings</key>
=======
<key>Resources/pl.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -895,11 +725,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/pl.lproj/MainMenu.strings</key>
=======
<key>Resources/pt_BR.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -912,11 +738,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/pt_BR.lproj/MainMenu.strings</key>
=======
<key>Resources/pt_PT.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -929,11 +751,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/pt_PT.lproj/MainMenu.strings</key>
=======
<key>Resources/ro.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -946,11 +764,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/ro.lproj/MainMenu.strings</key>
=======
<key>Resources/ru.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -963,11 +777,7 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/ru.lproj/MainMenu.strings</key>
=======
<key>Resources/sk.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
@ -980,24 +790,6 @@
<key>optional</key>
<true/>
</dict>
<<<<<<< HEAD
<key>Resources/sk.lproj/MainMenu.strings</key>
=======
<key>Resources/sl.lproj/MainMenu.strings</key>
>>>>>>> hotfix/v7.3.1
<dict>
<key>hash</key>
<data>
dYu/+UbWh6smabl4RmEo2CFM3MQ=
</data>
<key>hash2</key>
<data>
cJUVRswEvrCHRy6IeoFTVbbHAtuImMzREcu7QfyCXo8=
<<<<<<< HEAD
</data>
<key>optional</key>
<true/>
</dict>
<key>Resources/sl.lproj/MainMenu.strings</key>
<dict>
<key>hash</key>
@ -1007,8 +799,6 @@
<key>hash2</key>
<data>
cJUVRswEvrCHRy6IeoFTVbbHAtuImMzREcu7QfyCXo8=
=======
>>>>>>> hotfix/v7.3.1
</data>
<key>optional</key>
<true/>

View File

@ -5,7 +5,6 @@
"45.title" = "Text Cell";
/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "176"; */
<<<<<<< HEAD:macos/Vendor/Sparkle/sparkle.app/Contents/Frameworks/Sparkle.framework/Versions/B/Resources/cs.lproj/SUUpdatePermissionPrompt.strings
"OhZ-1K-DmA.title" = "Automaticky vyhledávat";
/* Class = "NSButtonCell"; title = "Dont Check"; ObjectID = "177"; */
@ -13,25 +12,12 @@
/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "178"; */
"gmh-T4-BO0.title" = "Vyhledávat aktualizace automaticky?";
=======
"176.title" = "Automaticky vyhledávat";
/* Class = "NSButtonCell"; title = "Dont Check"; ObjectID = "177"; */
"177.title" = "Nevyhledávat";
/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "178"; */
"178.title" = "Vyhledávat aktualizace automaticky?";
>>>>>>> hotfix/v7.3.1:macos/Vendor/Sparkle/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.strings
/* Class = "NSTextFieldCell"; title = "DO NOT LOCALIZE"; ObjectID = "179"; */
"179.title" = "DO NOT LOCALIZE";
/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "180"; */
<<<<<<< HEAD:macos/Vendor/Sparkle/sparkle.app/Contents/Frameworks/Sparkle.framework/Versions/B/Resources/cs.lproj/SUUpdatePermissionPrompt.strings
"gz7-LM-gNf.title" = "Odeslat anonymní systémový profil";
=======
"180.title" = "Odeslat anonymní systémový profil";
>>>>>>> hotfix/v7.3.1:macos/Vendor/Sparkle/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.strings
/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work.\nPlease contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
"183.title" = "Informace z anonymního systémového profilu pomáhají vývojářům lépe plánovat budoucí vývoj aplikace.\nBudete-li mít nějaký dotaz, obraťte se na nás.\n\nToto jsou informace, které budou odeslány:";