From 6309a5b3b83d120cd6256c36410f80fa95fc3847 Mon Sep 17 00:00:00 2001 From: Richard Waltman Date: Tue, 18 Jul 2023 17:15:25 -0500 Subject: [PATCH] Add MacOS Signing Cert to Github Action --- .github/workflows/macos-test-build.yml | 37 +++ appveyor.yml | 10 +- release_script/mac_only/Certificates.p12.enc | Bin 3152 -> 0 bytes .../mac_only/Certificates_2023.p12.enc | 66 +++++ release_script/mac_only/dmgbuild_settings.py | 228 ++++++++------- .../mac_only/dmgbuild_settings_old.py | 266 ++++++++++++++++++ 6 files changed, 498 insertions(+), 109 deletions(-) delete mode 100644 release_script/mac_only/Certificates.p12.enc create mode 100644 release_script/mac_only/Certificates_2023.p12.enc create mode 100644 release_script/mac_only/dmgbuild_settings_old.py diff --git a/.github/workflows/macos-test-build.yml b/.github/workflows/macos-test-build.yml index a6a2aa66f..7c1ee0dbb 100644 --- a/.github/workflows/macos-test-build.yml +++ b/.github/workflows/macos-test-build.yml @@ -4,6 +4,13 @@ on: branches: [master, development] push: branches: [master, development] + +permissions: + id-token: write + contents: read + +env: + AWS_REGION : us-east-1 jobs: check: @@ -57,6 +64,20 @@ jobs: run: | ls python $GITHUB_WORKSPACE/OpenBCI_GUI_UnitTests/run-unittests.py + + - name: Decrypt Certificate + run: | + openssl version + openssl enc -aes-256-cbc -a -d -pbkdf2 -in $GITHUB_WORKSPACE/release_script/mac_only/Certificates_2023.p12.enc -out $GITHUB_WORKSPACE/release_script/mac_only/Certificates.p12 -k "$OPENSSL_CERT_K" + openssl base64 -in $GITHUB_WORKSPACE/release_script/mac_only/Certificates.p12 -out $GITHUB_WORKSPACE/release_script/mac_only/Certificates.txt + env: + OPENSSL_CERT_K: ${{ secrets.OPENSSL_CERT_K }} + + - name: Add OSX Signing Certificate + uses: apple-actions/import-codesign-certs@v2 + with: + p12-filepath: ${{ github.workspace }}/release_script/mac_only/Certificates.p12 + p12-password: ${{ secrets.CERTIFICATE_P12_PASSWORD }} - name: Build GUI run: | @@ -66,3 +87,19 @@ jobs: python $GITHUB_WORKSPACE/release_script/make-release.py --no-prompts GUI_COMMIT_TIME=`cat temp/timestamp.txt` GUI_VERSION_STRING=`cat temp/versionstring.txt` + + - name: Store DMG on AWS + env: + AWS_DEFAULT_REGION: ${{ env.AWS_REGION }} + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_2023 }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_2023 }} + run: | + export CURRENT_BRANCH=`git branch --show-current` + export GUI_COMMIT_TIME=`cat temp/timestamp.txt` + export GUI_VERSION_STRING=`cat temp/versionstring.txt` + cd $GITHUB_WORKSPACE + ls + aws s3 rm s3://openbci-public-gui-v6/latest --recursive --exclude "*" --include "openbcigui_*_macosx.dmg" + aws s3 cp $GITHUB_WORKSPACE/. s3://openbci-public-gui-v6/${GUI_VERSION_STRING} --recursive --exclude "*" --include "openbcigui_*_macosx.dmg" + aws s3 cp $GITHUB_WORKSPACE/. s3://openbci-public-gui-v6/latest --recursive --exclude "*" --include "openbcigui_*_macosx.dmg" + diff --git a/appveyor.yml b/appveyor.yml index 5e9b5dc3d..42588b820 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -49,12 +49,12 @@ build_script: - set /p GUI_VERSION_STRING= < temp\versionstring.txt deploy_script: - - aws s3 rm s3://openbci-gui/%APPVEYOR_REPO_BRANCH%/latest --recursive --exclude "*" --include "openbcigui_*_windows64.zip" - - aws s3 cp %APPVEYOR_BUILD_FOLDER%\. s3://openbci-gui/%APPVEYOR_REPO_BRANCH%/%GUI_VERSION_STRING%_%GUI_COMMIT_TIME% --recursive --exclude "*" --include "openbcigui_*_windows64.zip" - - aws s3 cp %APPVEYOR_BUILD_FOLDER%\. s3://openbci-gui/%APPVEYOR_REPO_BRANCH%/latest --recursive --exclude "*" --include "openbcigui_*_windows64.zip" + #- aws s3 rm s3://openbci-gui/%APPVEYOR_REPO_BRANCH%/latest --recursive --exclude "*" --include "openbcigui_*_windows64.zip" + #- aws s3 cp %APPVEYOR_BUILD_FOLDER%\. s3://openbci-gui/%APPVEYOR_REPO_BRANCH%/%GUI_VERSION_STRING%_%GUI_COMMIT_TIME% --recursive --exclude "*" --include "openbcigui_*_windows64.zip" + #- aws s3 cp %APPVEYOR_BUILD_FOLDER%\. s3://openbci-gui/%APPVEYOR_REPO_BRANCH%/latest --recursive --exclude "*" --include "openbcigui_*_windows64.zip" # copy index.html and list.js back to s3 to refresh it and avoid it being deleted by the eviction policy - - aws s3 cp %APPVEYOR_BUILD_FOLDER%\release_script\index.html s3://openbci-gui/index.html - - aws s3 cp %APPVEYOR_BUILD_FOLDER%\release_script\list.js s3://openbci-gui/list.js + #- aws s3 cp %APPVEYOR_BUILD_FOLDER%\release_script\index.html s3://openbci-gui/index.html + #- aws s3 cp %APPVEYOR_BUILD_FOLDER%\release_script\list.js s3://openbci-gui/list.js notifications: - provider: Email diff --git a/release_script/mac_only/Certificates.p12.enc b/release_script/mac_only/Certificates.p12.enc deleted file mode 100644 index ed5ac625004f3f3728eec838f0445278a8957566..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3152 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 diff --git a/release_script/mac_only/Certificates_2023.p12.enc b/release_script/mac_only/Certificates_2023.p12.enc new file mode 100644 index 000000000..861081323 --- /dev/null +++ b/release_script/mac_only/Certificates_2023.p12.enc @@ -0,0 +1,66 @@ +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 diff --git a/release_script/mac_only/dmgbuild_settings.py b/release_script/mac_only/dmgbuild_settings.py index 6e963b929..80854b57f 100644 --- a/release_script/mac_only/dmgbuild_settings.py +++ b/release_script/mac_only/dmgbuild_settings.py @@ -1,34 +1,34 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -import biplist import os.path +import plistlib # -# Settings file for dmgbuild +# Example settings file for dmgbuild # # Use like this: dmgbuild -s settings.py "Test Volume" test.dmg -# You can actually use this file for any application (not just TextEdit) +# You can actually use this file for your own application (not just TextEdit) # by doing e.g. # # dmgbuild -s settings.py -D app=/path/to/My.app "My Application" MyApp.dmg # .. Useful stuff .............................................................. -application = defines.get('app', '/Applications/TextEdit.app') # default +application = defines.get("app", "/System/Applications/TextEdit.app") # noqa: F821 appname = os.path.basename(application) + def icon_from_app(app_path): - plist_path = os.path.join(app_path, 'Contents', 'Info.plist') - plist = biplist.readPlist(plist_path) - icon_name = plist['CFBundleIconFile'] - icon_root,icon_ext = os.path.splitext(icon_name) + plist_path = os.path.join(app_path, "Contents", "Info.plist") + with open(plist_path, "rb") as f: + plist = plistlib.load(f) + icon_name = plist["CFBundleIconFile"] + icon_root, icon_ext = os.path.splitext(icon_name) if not icon_ext: - icon_ext = '.icns' + icon_ext = ".icns" icon_name = icon_root + icon_ext - return os.path.join(app_path, 'Contents', 'Resources', icon_name) + return os.path.join(app_path, "Contents", "Resources", icon_name) + # .. Basics .................................................................... @@ -39,31 +39,38 @@ def icon_from_app(app_path): # volume_name = 'Test' # Volume format (see hdiutil create -help) -format = defines.get('format', 'UDBZ') +format = defines.get("format", "UDBZ") # noqa: F821 + +# Compression level (if relevant) +# compression_level = 9 # Volume size -size = defines.get('size', None) +size = defines.get("size", None) # noqa: F821 # Files to include -files = [ application ] +files = [application] # Symlinks to create -symlinks = { 'Applications': '/Applications' } +symlinks = {"Applications": "/Applications"} + +# Files to hide +# hide = [ 'Secret.data' ] + +# Files to hide the extension of +# hide_extension = [ 'README.rst' ] # Volume icon # # You can either define icon, in which case that icon file will be copied to the # image, *or* you can define badge_icon, in which case the icon file you specify -# will be used to badge the system's Removable Disk icon +# will be used to badge the system's Removable Disk icon. Badge icons require +# pyobjc-framework-Quartz. # -#icon = '/path/to/icon.icns' +# icon = '/path/to/icon.icns' badge_icon = icon_from_app(application) # Where to put the icons -icon_locations = { - appname: (140, 120), - 'Applications': (500, 120) - } +icon_locations = {appname: (140, 120), "Applications": (500, 120)} # .. Window configuration ...................................................... @@ -87,7 +94,7 @@ def icon_from_app(app_path): # # Other color components may be expressed either in the range 0 to 1, or # as percentages (e.g. 60% is equivalent to 0.6). -background = 'builtin-arrow' +background = "builtin-arrow" show_status_bar = False show_tab_view = False @@ -106,15 +113,15 @@ def icon_from_app(app_path): # 'column-view' # 'coverflow' # -default_view = 'icon-view' +default_view = "icon-view" # General view configuration show_icon_preview = False # Set these to True to force inclusion of icon/list view settings (otherwise # we only include settings for the default view) -include_icon_view_settings = 'auto' -include_list_view_settings = 'auto' +include_icon_view_settings = "auto" +include_list_view_settings = "auto" # .. Icon view configuration ................................................... @@ -122,7 +129,7 @@ def icon_from_app(app_path): grid_offset = (0, 0) grid_spacing = 100 scroll_position = (0, 0) -label_pos = 'bottom' # or 'right' +label_pos = "bottom" # or 'right' text_size = 16 icon_size = 128 @@ -144,34 +151,34 @@ def icon_from_app(app_path): list_icon_size = 16 list_text_size = 12 list_scroll_position = (0, 0) -list_sort_by = 'name' +list_sort_by = "name" list_use_relative_dates = True -list_calculate_all_sizes = False, -list_columns = ('name', 'date-modified', 'size', 'kind', 'date-added') +list_calculate_all_sizes = (False,) +list_columns = ("name", "date-modified", "size", "kind", "date-added") list_column_widths = { - 'name': 300, - 'date-modified': 181, - 'date-created': 181, - 'date-added': 181, - 'date-last-opened': 181, - 'size': 97, - 'kind': 115, - 'label': 100, - 'version': 75, - 'comments': 300, - } + "name": 300, + "date-modified": 181, + "date-created": 181, + "date-added": 181, + "date-last-opened": 181, + "size": 97, + "kind": 115, + "label": 100, + "version": 75, + "comments": 300, +} list_column_sort_directions = { - 'name': 'ascending', - 'date-modified': 'descending', - 'date-created': 'descending', - 'date-added': 'descending', - 'date-last-opened': 'descending', - 'size': 'descending', - 'kind': 'ascending', - 'label': 'ascending', - 'version': 'ascending', - 'comments': 'ascending', - } + "name": "ascending", + "date-modified": "descending", + "date-created": "descending", + "date-added": "descending", + "date-last-opened": "descending", + "size": "descending", + "kind": "ascending", + "label": "ascending", + "version": "ascending", + "comments": "ascending", +} # .. License configuration ..................................................... @@ -193,54 +200,67 @@ def icon_from_app(app_path): # pt_PT, ro_RO, ru_RU, se, sk_SK, sl_SI, sr_RS, sv_SE, th_TH, to_TO, tr_TR, # uk_UA, ur_IN, ur_PK, uz_UZ, vi_VN, zh_CN, zh_TW -# license = { -# 'default-language': 'en_US', -# 'licenses': { -# # For each language, the text of the license. This can be plain text, -# # RTF (in which case it must start "{\rtf1"), or a path to a file -# # containing the license text. If you're using RTF, -# # watch out for Python escaping (or read it from a file). -# 'English': b'''{\\rtf1\\ansi\\ansicpg1252\\cocoartf1504\\cocoasubrtf820 -# {\\fonttbl\\f0\\fnil\\fcharset0 Helvetica-Bold;\\f1\\fnil\\fcharset0 Helvetica;} -# {\\colortbl;\\red255\\green255\\blue255;\\red0\\green0\\blue0;} -# {\\*\\expandedcolortbl;;\\cssrgb\\c0\\c0\\c0;} -# \\paperw11905\\paperh16837\\margl1133\\margr1133\\margb1133\\margt1133 -# \\deftab720 -# \\pard\\pardeftab720\\sa160\\partightenfactor0 - -# \\f0\\b\\fs60 \\cf2 \\expnd0\\expndtw0\\kerning0 -# \\up0 \\nosupersub \\ulnone \\outl0\\strokewidth0 \\strokec2 Test License\\ -# \\pard\\pardeftab720\\sa160\\partightenfactor0 - -# \\fs36 \\cf2 \\strokec2 What is this?\\ -# \\pard\\pardeftab720\\sa160\\partightenfactor0 - -# \\f1\\b0\\fs22 \\cf2 \\strokec2 This is the English license. It says what you are allowed to do with this software.\\ -# \\ -# }''', -# }, -# 'buttons': { -# # For each language, text for the buttons on the licensing window. -# # -# # Default buttons and text are built-in for the following languages: -# # -# # English (en_US), German (de_DE), Spanish (es_ES), French (fr_FR), -# # Italian (it_IT), Japanese (ja_JP), Dutch (nl_NL), Swedish (sv_SE), -# # Brazilian Portuguese (pt_BR), Simplified Chinese (zh_CN), -# # Traditional Chinese (zh_TW), Danish (da_DK), Finnish (fi_FI), -# # Korean (ko_KR), Norwegian (nb_NO) -# # -# # You don't need to specify them for those languages; if you fail to -# # specify them for some other language, English will be used instead. - -# 'en_US': ( -# b'English', -# b'Agree', -# b'Disagree', -# b'Print', -# b'Save', -# b'If you agree with the terms of this license, press "Agree" to ' -# b'install the software. If you do not agree, press "Disagree".' -# ), -# }, -# } \ No newline at end of file +license = { + "default-language": "en_US", + "licenses": { + # For each language, the text of the license. This can be plain text, + # RTF (in which case it must start "{\rtf1"), or a path to a file + # containing the license text. If you're using RTF, + # watch out for Python escaping (or read it from a file). + "en_GB": b"""{\\rtf1\\ansi\\ansicpg1252\\cocoartf1504\\cocoasubrtf820 + {\\fonttbl\\f0\\fnil\\fcharset0 Helvetica-Bold;\\f1\\fnil\\fcharset0 Helvetica;} + {\\colortbl;\\red255\\green255\\blue255;\\red0\\green0\\blue0;} + {\\*\\expandedcolortbl;;\\cssrgb\\c0\\c0\\c0;} + \\paperw11905\\paperh16837\\margl1133\\margr1133\\margb1133\\margt1133 + \\deftab720 + \\pard\\pardeftab720\\sa160\\partightenfactor0 + + \\f0\\b\\fs60 \\cf2 \\expnd0\\expndtw0\\kerning0 + \\up0 \\nosupersub \\ulnone \\outl0\\strokewidth0 \\strokec2 Test License\\ + \\pard\\pardeftab720\\sa160\\partightenfactor0 + + \\fs36 \\cf2 \\strokec2 What is this?\\ + \\pard\\pardeftab720\\sa160\\partightenfactor0 + + \\f1\\b0\\fs22 \\cf2 \\strokec2 This is the English license. It says what you are allowed to do with this software.\\ + \\ + }""", + "de_DE": "Ich bin ein Berliner. Bielefeld gibt's doch gar nicht.", + }, + "buttons": { + # For each language, text for the buttons on the licensing window. + # + # Default buttons and text are built-in for the following languages: + # + # da_DK: Danish + # de_DE: German + # en_AU: English (Australian) + # en_GB: English (UK) + # en_NZ: English (New Zealand) + # en_US: English (US) + # es_ES: Spanish + # fr_CA: French (Canadian) + # fr_FR: French + # it_IT: Italian + # ja_JP: Japanese + # nb_NO: Norsk + # nl_BE: Flemish + # nl_NL: Dutch + # pt_BR: Brazilian Portuguese + # pt_PT: Portugese + # sv_SE: Swedish + # zh_CN: Simplified Chinese + # zh_TW: Traditional Chinese + # + # You don't need to specify them for those languages; if you fail to + # specify them for some other language, English will be used instead. + "en_US": ( + b"English", + b"Agree!", + b"Disagree!", + b"Print!", + b"Save!", + b'Do you agree or not? Press "Agree" or "Disagree".', + ), + }, +} \ No newline at end of file diff --git a/release_script/mac_only/dmgbuild_settings_old.py b/release_script/mac_only/dmgbuild_settings_old.py new file mode 100644 index 000000000..0702bbeaa --- /dev/null +++ b/release_script/mac_only/dmgbuild_settings_old.py @@ -0,0 +1,266 @@ +import os.path +import plistlib + +# +# Example settings file for dmgbuild +# + +# Use like this: dmgbuild -s settings.py "Test Volume" test.dmg + +# You can actually use this file for your own application (not just TextEdit) +# by doing e.g. +# +# dmgbuild -s settings.py -D app=/path/to/My.app "My Application" MyApp.dmg + +# .. Useful stuff .............................................................. + +application = defines.get("app", "/System/Applications/TextEdit.app") # noqa: F821 +appname = os.path.basename(application) + + +def icon_from_app(app_path): + plist_path = os.path.join(app_path, "Contents", "Info.plist") + with open(plist_path, "rb") as f: + plist = plistlib.load(f) + icon_name = plist["CFBundleIconFile"] + icon_root, icon_ext = os.path.splitext(icon_name) + if not icon_ext: + icon_ext = ".icns" + icon_name = icon_root + icon_ext + return os.path.join(app_path, "Contents", "Resources", icon_name) + + +# .. Basics .................................................................... + +# Uncomment to override the output filename +# filename = 'test.dmg' + +# Uncomment to override the output volume name +# volume_name = 'Test' + +# Volume format (see hdiutil create -help) +format = defines.get("format", "UDBZ") # noqa: F821 + +# Compression level (if relevant) +# compression_level = 9 + +# Volume size +size = defines.get("size", None) # noqa: F821 + +# Files to include +files = [application] + +# Symlinks to create +symlinks = {"Applications": "/Applications"} + +# Files to hide +# hide = [ 'Secret.data' ] + +# Files to hide the extension of +# hide_extension = [ 'README.rst' ] + +# Volume icon +# +# You can either define icon, in which case that icon file will be copied to the +# image, *or* you can define badge_icon, in which case the icon file you specify +# will be used to badge the system's Removable Disk icon. Badge icons require +# pyobjc-framework-Quartz. +# +# icon = '/path/to/icon.icns' +badge_icon = icon_from_app(application) + +# Where to put the icons +icon_locations = {appname: (140, 120), "Applications": (500, 120)} + +# .. Window configuration ...................................................... + +# Background +# +# This is a STRING containing any of the following: +# +# #3344ff - web-style RGB color +# #34f - web-style RGB color, short form (#34f == #3344ff) +# rgb(1,0,0) - RGB color, each value is between 0 and 1 +# hsl(120,1,.5) - HSL (hue saturation lightness) color +# hwb(300,0,0) - HWB (hue whiteness blackness) color +# cmyk(0,1,0,0) - CMYK color +# goldenrod - X11/SVG named color +# builtin-arrow - A simple built-in background with a blue arrow +# /foo/bar/baz.png - The path to an image file +# +# The hue component in hsl() and hwb() may include a unit; it defaults to +# degrees ('deg'), but also supports radians ('rad') and gradians ('grad' +# or 'gon'). +# +# Other color components may be expressed either in the range 0 to 1, or +# as percentages (e.g. 60% is equivalent to 0.6). +background = "builtin-arrow" + +show_status_bar = False +show_tab_view = False +show_toolbar = False +show_pathbar = False +show_sidebar = False +sidebar_width = 180 + +# Window position in ((x, y), (w, h)) format +window_rect = ((100, 100), (640, 280)) + +# Select the default view; must be one of +# +# 'icon-view' +# 'list-view' +# 'column-view' +# 'coverflow' +# +default_view = "icon-view" + +# General view configuration +show_icon_preview = False + +# Set these to True to force inclusion of icon/list view settings (otherwise +# we only include settings for the default view) +include_icon_view_settings = "auto" +include_list_view_settings = "auto" + +# .. Icon view configuration ................................................... + +arrange_by = None +grid_offset = (0, 0) +grid_spacing = 100 +scroll_position = (0, 0) +label_pos = "bottom" # or 'right' +text_size = 16 +icon_size = 128 + +# .. List view configuration ................................................... + +# Column names are as follows: +# +# name +# date-modified +# date-created +# date-added +# date-last-opened +# size +# kind +# label +# version +# comments +# +list_icon_size = 16 +list_text_size = 12 +list_scroll_position = (0, 0) +list_sort_by = "name" +list_use_relative_dates = True +list_calculate_all_sizes = (False,) +list_columns = ("name", "date-modified", "size", "kind", "date-added") +list_column_widths = { + "name": 300, + "date-modified": 181, + "date-created": 181, + "date-added": 181, + "date-last-opened": 181, + "size": 97, + "kind": 115, + "label": 100, + "version": 75, + "comments": 300, +} +list_column_sort_directions = { + "name": "ascending", + "date-modified": "descending", + "date-created": "descending", + "date-added": "descending", + "date-last-opened": "descending", + "size": "descending", + "kind": "ascending", + "label": "ascending", + "version": "ascending", + "comments": "ascending", +} + +# .. License configuration ..................................................... + +# Text in the license configuration is stored in the resources, which means +# it gets stored in a legacy Mac encoding according to the language. dmgbuild +# will *try* to convert Unicode strings to the appropriate encoding, *but* +# you should be aware that Python doesn't support all of the necessary encodings; +# in many cases you will need to encode the text yourself and use byte strings +# instead here. + +# Recognized language names are: +# +# af_ZA, ar, be_BY, bg_BG, bn, bo, br, ca_ES, cs_CZ, cy, da_DK, de_AT, de_CH, +# de_DE, dz_BT, el_CY, el_GR, en_AU, en_CA, en_GB, en_IE, en_SG, en_US, eo, +# es_419, es_ES, et_EE, fa_IR, fi_FI, fo_FO, fr_001, fr_BE, fr_CA, fr_CH, +# fr_FR, ga-Latg_IE, ga_IE, gd, grc, gu_IN, gv, he_IL, hi_IN, hr_HR, hu_HU, +# hy_AM, is_IS, it_CH, it_IT, iu_CA, ja_JP, ka_GE, kl, ko_KR, lt_LT, lv_LV, +# mk_MK, mr_IN, mt_MT, nb_NO, ne_NP, nl_BE, nl_NL, nn_NO, pa, pl_PL, pt_BR, +# pt_PT, ro_RO, ru_RU, se, sk_SK, sl_SI, sr_RS, sv_SE, th_TH, to_TO, tr_TR, +# uk_UA, ur_IN, ur_PK, uz_UZ, vi_VN, zh_CN, zh_TW + +license = { + "default-language": "en_US", + "licenses": { + # For each language, the text of the license. This can be plain text, + # RTF (in which case it must start "{\rtf1"), or a path to a file + # containing the license text. If you're using RTF, + # watch out for Python escaping (or read it from a file). + "en_GB": b"""{\\rtf1\\ansi\\ansicpg1252\\cocoartf1504\\cocoasubrtf820 + {\\fonttbl\\f0\\fnil\\fcharset0 Helvetica-Bold;\\f1\\fnil\\fcharset0 Helvetica;} + {\\colortbl;\\red255\\green255\\blue255;\\red0\\green0\\blue0;} + {\\*\\expandedcolortbl;;\\cssrgb\\c0\\c0\\c0;} + \\paperw11905\\paperh16837\\margl1133\\margr1133\\margb1133\\margt1133 + \\deftab720 + \\pard\\pardeftab720\\sa160\\partightenfactor0 + + \\f0\\b\\fs60 \\cf2 \\expnd0\\expndtw0\\kerning0 + \\up0 \\nosupersub \\ulnone \\outl0\\strokewidth0 \\strokec2 Test License\\ + \\pard\\pardeftab720\\sa160\\partightenfactor0 + + \\fs36 \\cf2 \\strokec2 What is this?\\ + \\pard\\pardeftab720\\sa160\\partightenfactor0 + + \\f1\\b0\\fs22 \\cf2 \\strokec2 This is the English license. It says what you are allowed to do with this software.\\ + \\ + }""", + "de_DE": "Ich bin ein Berliner. Bielefeld gibt's doch gar nicht.", + }, + "buttons": { + # For each language, text for the buttons on the licensing window. + # + # Default buttons and text are built-in for the following languages: + # + # da_DK: Danish + # de_DE: German + # en_AU: English (Australian) + # en_GB: English (UK) + # en_NZ: English (New Zealand) + # en_US: English (US) + # es_ES: Spanish + # fr_CA: French (Canadian) + # fr_FR: French + # it_IT: Italian + # ja_JP: Japanese + # nb_NO: Norsk + # nl_BE: Flemish + # nl_NL: Dutch + # pt_BR: Brazilian Portuguese + # pt_PT: Portugese + # sv_SE: Swedish + # zh_CN: Simplified Chinese + # zh_TW: Traditional Chinese + # + # You don't need to specify them for those languages; if you fail to + # specify them for some other language, English will be used instead. + "en_US": ( + b"English", + b"Agree!", + b"Disagree!", + b"Print!", + b"Save!", + b'Do you agree or not? Press "Agree" or "Disagree".', + ), + }, +} \ No newline at end of file