diff --git a/common/loginpage/deploy/index.onlyru.html b/common/loginpage/deploy/index.onlyru.html new file mode 100644 index 000000000..ae365bf66 --- /dev/null +++ b/common/loginpage/deploy/index.onlyru.html @@ -0,0 +1,162 @@ +Hello Documents
Loading...

Create new

  • DOCUMENT
  • SPREADSHEET
  • PRESENTATION
    • \ No newline at end of file diff --git a/macos/ONLYOFFICE.xcodeproj/project.pbxproj b/macos/ONLYOFFICE.xcodeproj/project.pbxproj index 31aa89d43..968cd702d 100644 --- a/macos/ONLYOFFICE.xcodeproj/project.pbxproj +++ b/macos/ONLYOFFICE.xcodeproj/project.pbxproj @@ -61,6 +61,8 @@ FC659BFA1C75EE8B00C99776 /* ASCAboutController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC659BF81C75EE8B00C99776 /* ASCAboutController.m */; }; FC659BFB1C75EE8B00C99776 /* ASCAboutController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC659BF81C75EE8B00C99776 /* ASCAboutController.m */; }; FC659BFC1C75EE8B00C99776 /* ASCAboutController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC659BF81C75EE8B00C99776 /* ASCAboutController.m */; }; + FC65A6411F33355F00BD0F7E /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = FC6515FF1D1542C2009DBDCD /* Info.plist */; }; + FC65A6421F33356300BD0F7E /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = FC081E9D1C3257FF00F9881C /* Info.plist */; }; FC6718011BD913C00028600F /* ASCApplicationManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FC3BFE0B1BBEBB7B0040C904 /* ASCApplicationManager.cpp */; }; FC6718021BD913C00028600F /* ASCDownloadCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = FCAA9A3D1BBA802100F3C47F /* ASCDownloadCellView.m */; }; FC6718031BD913C00028600F /* ViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = FCA9A18F1BA6DC6000ABF3AB /* ViewController.mm */; }; @@ -696,14 +698,14 @@ path = ../../core/DesktopEditor/Word_Api; sourceTree = SOURCE_ROOT; }; - FC6515F41D1542C2009DBDCD /* ONLYOFFICE-RU */ = { + FC6515F41D1542C2009DBDCD /* ONLYOFFICE-RU-FREE */ = { isa = PBXGroup; children = ( FC6515F51D1542C2009DBDCD /* EULA.html */, FC6515F71D1542C2009DBDCD /* InfoPlist.strings */, FC6515FF1D1542C2009DBDCD /* Info.plist */, ); - path = "ONLYOFFICE-RU"; + path = "ONLYOFFICE-RU-FREE"; sourceTree = ""; }; FC659BF51C75EE5C00C99776 /* About */ = { @@ -766,7 +768,7 @@ children = ( FC9424791CB7C92000C78A27 /* dsa_pub.pem */, FC081E981C32575800F9881C /* ONLYOFFICE */, - FC6515F41D1542C2009DBDCD /* ONLYOFFICE-RU */, + FC6515F41D1542C2009DBDCD /* ONLYOFFICE-RU-FREE */, FC081E9A1C3257A800F9881C /* ONLYOFFICE-MAS */, FC081EBC1C325E8400F9881C /* file-formats */, FC081EF91C325EE900F9881C /* dictionaries */, @@ -1013,9 +1015,9 @@ productReference = FC67182D1BD913C00028600F /* ONLYOFFICE.app */; productType = "com.apple.product-type.application"; }; - FC7FD3941C315DD6008F6641 /* ONLYOFFICE-RU */ = { + FC7FD3941C315DD6008F6641 /* ONLYOFFICE-RU-FREE */ = { isa = PBXNativeTarget; - buildConfigurationList = FC7FD3E21C315DD6008F6641 /* Build configuration list for PBXNativeTarget "ONLYOFFICE-RU" */; + buildConfigurationList = FC7FD3E21C315DD6008F6641 /* Build configuration list for PBXNativeTarget "ONLYOFFICE-RU-FREE" */; buildPhases = ( FC7FD3951C315DD6008F6641 /* Copy Library */, FC7FD3961C315DD6008F6641 /* Sources */, @@ -1028,7 +1030,7 @@ ); dependencies = ( ); - name = "ONLYOFFICE-RU"; + name = "ONLYOFFICE-RU-FREE"; productName = ONLYOFFICE; productReference = FC7FD3E51C315DD6008F6641 /* ONLYOFFICE.app */; productType = "com.apple.product-type.application"; @@ -1113,7 +1115,7 @@ targets = ( FCBC42671B9D650400405301 /* ONLYOFFICE */, FC6717FE1BD913C00028600F /* ONLYOFFICE-MAS */, - FC7FD3941C315DD6008F6641 /* ONLYOFFICE-RU */, + FC7FD3941C315DD6008F6641 /* ONLYOFFICE-RU-FREE */, FCD2B9111BC64D5F00F54560 /* Localization */, FC5C4EEA1CF8618F008F5C11 /* Prepare */, ); @@ -1189,6 +1191,7 @@ FC98AF3A1E94E16A00718A12 /* file-txt.icns in Resources */, FC7FD3D21C315DD6008F6641 /* MoveApplication.strings in Resources */, FC7FD3DB1C315DD6008F6641 /* Main.storyboard in Resources */, + FC65A6411F33355F00BD0F7E /* Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1226,6 +1229,7 @@ FC98AF381E94E16A00718A12 /* file-txt.icns in Resources */, FC94247A1CB7C92100C78A27 /* dsa_pub.pem in Resources */, FCBC42791B9D650500405301 /* Main.storyboard in Resources */, + FC65A6421F33356300BD0F7E /* Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1315,7 +1319,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "#!/bin/sh\n\n#exit 0\n\nCreateDir() {\n if [ ! -d $1 ]; then\n mkdir -p $1\n fi\n}\n\nBASEDIR=$(pwd)\nDST_DIR=\"$BASEDIR\"/Vendor/ONLYOFFICE\nCORE_BASE_DIR=\"$BASEDIR\"/../../core\n\necho \"---------------------------------------------------------------------------------------\"\necho \"Import Login page\"\necho \"---------------------------------------------------------------------------------------\"\n\nSRCLOGINPAGE_DIR=\"$BASEDIR\"/../common/loginpage/deploy\nDSTLOGINPAGE_DIR=\"$DST_DIR\"/login\nSRCWEBFONTS_DIR=\"$BASEDIR\"/../common/package/fonts\nDSTWEBFONTS_DIR=\"$DST_DIR\"/login/fonts\nSRCCOMMONLICENCE_DIR=\"$BASEDIR\"/ONLYOFFICE/Resources\nDSTCOMMONLICENCE_DIR=\"$DSTLOGINPAGE_DIR\"\n\nCreateDir \"$DSTLOGINPAGE_DIR\"\nCreateDir \"$DSTWEBFONTS_DIR\"\n\ncp -R \"$SRCLOGINPAGE_DIR\"/index.html \"$DSTLOGINPAGE_DIR\"/index.html\ncp -R \"$SRCWEBFONTS_DIR\"/LICENSE.txt \"$DSTWEBFONTS_DIR\"/LICENSE.txt\ncp -R \"$SRCWEBFONTS_DIR\"/OpenSans-Bold.ttf \"$DSTWEBFONTS_DIR\"/OpenSans-Bold.ttf\ncp -R \"$SRCWEBFONTS_DIR\"/OpenSans-BoldItalic.ttf \"$DSTWEBFONTS_DIR\"/OpenSans-BoldItalic.ttf\ncp -R \"$SRCWEBFONTS_DIR\"/OpenSans-ExtraBold.ttf \"$DSTWEBFONTS_DIR\"/OpenSans-ExtraBold.ttf\ncp -R \"$SRCWEBFONTS_DIR\"/OpenSans-ExtraBoldItalic.ttf \"$DSTWEBFONTS_DIR\"/OpenSans-ExtraBoldItalic.ttf\ncp -R \"$SRCWEBFONTS_DIR\"/OpenSans-Italic.ttf \"$DSTWEBFONTS_DIR\"/OpenSans-Italic.ttf\ncp -R \"$SRCWEBFONTS_DIR\"/OpenSans-Light.ttf \"$DSTWEBFONTS_DIR\"/OpenSans-Light.ttf\ncp -R \"$SRCWEBFONTS_DIR\"/OpenSans-LightItalic.ttf \"$DSTWEBFONTS_DIR\"/OpenSans-LightItalic.ttf\ncp -R \"$SRCWEBFONTS_DIR\"/OpenSans-Regular.ttf \"$DSTWEBFONTS_DIR\"/OpenSans-Regular.ttf\ncp -R \"$SRCWEBFONTS_DIR\"/OpenSans-Semibold.ttf \"$DSTWEBFONTS_DIR\"/OpenSans-Semibold.ttf\ncp -R \"$SRCWEBFONTS_DIR\"/OpenSans-SemiboldItalic.ttf \"$DSTWEBFONTS_DIR\"/OpenSans-SemiboldItalic.ttf\ncp -R \"$SRCCOMMONLICENCE_DIR\"/acknowledgments.html \"$DSTCOMMONLICENCE_DIR\"/acknowledgments.html\n\ncd \"$BASEDIR\"\n\necho \"---------------------------------------------------------------------------------------\"\necho \"Import Editors\"\necho \"---------------------------------------------------------------------------------------\"\n\nJS_SDK_SVN=\"$CORE_BASE_DIR/build/jsdesktop\"\nSRCEDITORPAGE_DIR=\"$JS_SDK_SVN\"/web-apps\nDSTEDITORPAGE_DIR=\"$DST_DIR\"/editors\nSRCEDITORFONTS_DIR=\"$BASEDIR\"/../common/package/fonts\nDSTEDITORFONTS_DIR=\"$DSTEDITORPAGE_DIR\"/fonts\nWEBAPPS_DIR=\"$DSTEDITORPAGE_DIR\"\n\nCreateDir \"$DSTLOGINPAGE_DIR\"\nCreateDir \"$DSTEDITORFONTS_DIR\"\nCreateDir \"$DSTEDITORPAGE_DIR\"/sdkjs\nCreateDir \"$WEBAPPS_DIR\"\n\ncp -R \"$SRCEDITORFONTS_DIR\"/ariblk.ttf \"$DSTEDITORFONTS_DIR\"/ariblk.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/Asana-Math.ttf \"$DSTEDITORFONTS_DIR\"/Asana-Math.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/caladea-bold.ttf \"$DSTEDITORFONTS_DIR\"/caladea-bold.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/caladea-bolditalic.ttf \"$DSTEDITORFONTS_DIR\"/caladea-bolditalic.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/caladea-italic.ttf \"$DSTEDITORFONTS_DIR\"/caladea-italic.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/caladea-regular.ttf \"$DSTEDITORFONTS_DIR\"/caladea-regular.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/Carlito-Bold.ttf \"$DSTEDITORFONTS_DIR\"/Carlito-Bold.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/Carlito-BoldItalic.ttf \"$DSTEDITORFONTS_DIR\"/Carlito-BoldItalic.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/Carlito-Italic.ttf \"$DSTEDITORFONTS_DIR\"/Carlito-Italic.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/Carlito-Regular.ttf \"$DSTEDITORFONTS_DIR\"/Carlito-Regular.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/Comic_Sans_MS_Bold.ttf \"$DSTEDITORFONTS_DIR\"/Comic_Sans_MS_Bold.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/Comic_Sans_MS.ttf \"$DSTEDITORFONTS_DIR\"/Comic_Sans_MS.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/LICENSE.txt \"$DSTEDITORFONTS_DIR\"/LICENSE.txt\n\nrsync -av --progress \"$JS_SDK_SVN\"/ \"$DSTEDITORPAGE_DIR\"/sdkjs --exclude='web-apps' --exclude='startpage'\ncp -vR \"$SRCEDITORPAGE_DIR\" \"$WEBAPPS_DIR\"\n\ncd \"$BASEDIR\"\n\necho \"---------------------------------------------------------------------------------------\"\necho \"Import Converter\"\necho \"---------------------------------------------------------------------------------------\"\n\nSRCCONVERTER_DIR=\"$BASEDIR\"/../common/converter\nDSTCONVERTER_DIR=\"$DST_DIR\"/converter\n\nCreateDir \"$DSTCONVERTER_DIR\"\n\ncp -vR \"$SRCCONVERTER_DIR\" \"$DST_DIR\"\ncp -vR \"$CORE_BASE_DIR\"/build/empty \"$DSTCONVERTER_DIR\"\n\ncp -vR \"$CORE_BASE_DIR/build/lib/mac_64/libDjVuFile.dylib\" \"$DSTCONVERTER_DIR\"\ncp -vR \"$CORE_BASE_DIR/build/lib/mac_64/libdoctrenderer.dylib\" \"$DSTCONVERTER_DIR\"\ncp -vR \"$CORE_BASE_DIR/build/lib/mac_64/libHtmlFile.dylib\" \"$DSTCONVERTER_DIR\"\ncp -vR \"$CORE_BASE_DIR/build/lib/mac_64/libHtmlRenderer.dylib\" \"$DSTCONVERTER_DIR\"\ncp -vR \"$CORE_BASE_DIR/build/lib/mac_64/libPdfReader.dylib\" \"$DSTCONVERTER_DIR\"\ncp -vR \"$CORE_BASE_DIR/build/lib/mac_64/libPdfWriter.dylib\" \"$DSTCONVERTER_DIR\"\ncp -vR \"$CORE_BASE_DIR/build/lib/mac_64/libUnicodeConverter.dylib\" \"$DSTCONVERTER_DIR\"\ncp -vR \"$CORE_BASE_DIR/build/lib/mac_64/libXpsFile.dylib\" \"$DSTCONVERTER_DIR\"\n\ncp -vR \"$CORE_BASE_DIR/build/bin/icu/mac_64/libicuuc.55.1.dylib\" \"$DSTCONVERTER_DIR\"\ncp -vR \"$CORE_BASE_DIR/build/bin/icu/mac_64/libicudata.55.1.dylib\" \"$DSTCONVERTER_DIR\"\n\ncp -vR \"$CORE_BASE_DIR/build/bin/mac_64/x2t\" \"$DSTCONVERTER_DIR\"\ncp -vR \"$CORE_BASE_DIR/build/bin/mac_64/icudtl_dat.S\" \"$DSTCONVERTER_DIR\"\n\nchmod -v +x \"$DSTCONVERTER_DIR\"/x2t"; + shellScript = "#!/bin/sh\n\nexit 0\n\nCreateDir() {\n if [ ! -d $1 ]; then\n mkdir -p $1\n fi\n}\n\nBASEDIR=$(pwd)\nDST_DIR=\"$BASEDIR\"/Vendor/ONLYOFFICE\nCORE_BASE_DIR=\"$BASEDIR\"/../../core\n\necho \"---------------------------------------------------------------------------------------\"\necho \"Import Login page\"\necho \"---------------------------------------------------------------------------------------\"\n\nSRCLOGINPAGE_DIR=\"$BASEDIR\"/../common/loginpage/deploy\nDSTLOGINPAGE_DIR=\"$DST_DIR\"/login\nSRCWEBFONTS_DIR=\"$BASEDIR\"/../common/package/fonts\nDSTWEBFONTS_DIR=\"$DST_DIR\"/login/fonts\nSRCCOMMONLICENCE_DIR=\"$BASEDIR\"/ONLYOFFICE/Resources\nDSTCOMMONLICENCE_DIR=\"$DSTLOGINPAGE_DIR\"\n\nCreateDir \"$DSTLOGINPAGE_DIR\"\nCreateDir \"$DSTWEBFONTS_DIR\"\n\ncp -R \"$SRCLOGINPAGE_DIR\"/index.onlyru.html \"$DSTLOGINPAGE_DIR\"/index.html\ncp -R \"$SRCWEBFONTS_DIR\"/LICENSE.txt \"$DSTWEBFONTS_DIR\"/LICENSE.txt\ncp -R \"$SRCWEBFONTS_DIR\"/OpenSans-Bold.ttf \"$DSTWEBFONTS_DIR\"/OpenSans-Bold.ttf\ncp -R \"$SRCWEBFONTS_DIR\"/OpenSans-BoldItalic.ttf \"$DSTWEBFONTS_DIR\"/OpenSans-BoldItalic.ttf\ncp -R \"$SRCWEBFONTS_DIR\"/OpenSans-ExtraBold.ttf \"$DSTWEBFONTS_DIR\"/OpenSans-ExtraBold.ttf\ncp -R \"$SRCWEBFONTS_DIR\"/OpenSans-ExtraBoldItalic.ttf \"$DSTWEBFONTS_DIR\"/OpenSans-ExtraBoldItalic.ttf\ncp -R \"$SRCWEBFONTS_DIR\"/OpenSans-Italic.ttf \"$DSTWEBFONTS_DIR\"/OpenSans-Italic.ttf\ncp -R \"$SRCWEBFONTS_DIR\"/OpenSans-Light.ttf \"$DSTWEBFONTS_DIR\"/OpenSans-Light.ttf\ncp -R \"$SRCWEBFONTS_DIR\"/OpenSans-LightItalic.ttf \"$DSTWEBFONTS_DIR\"/OpenSans-LightItalic.ttf\ncp -R \"$SRCWEBFONTS_DIR\"/OpenSans-Regular.ttf \"$DSTWEBFONTS_DIR\"/OpenSans-Regular.ttf\ncp -R \"$SRCWEBFONTS_DIR\"/OpenSans-Semibold.ttf \"$DSTWEBFONTS_DIR\"/OpenSans-Semibold.ttf\ncp -R \"$SRCWEBFONTS_DIR\"/OpenSans-SemiboldItalic.ttf \"$DSTWEBFONTS_DIR\"/OpenSans-SemiboldItalic.ttf\ncp -R \"$SRCCOMMONLICENCE_DIR\"/acknowledgments.html \"$DSTCOMMONLICENCE_DIR\"/acknowledgments.html\n\ncd \"$BASEDIR\"\n\necho \"---------------------------------------------------------------------------------------\"\necho \"Import Editors\"\necho \"---------------------------------------------------------------------------------------\"\n\nJS_SDK_SVN=\"$CORE_BASE_DIR/build/jsdesktop\"\nSRCEDITORPAGE_DIR=\"$JS_SDK_SVN\"/web-apps\nDSTEDITORPAGE_DIR=\"$DST_DIR\"/editors\nSRCEDITORFONTS_DIR=\"$BASEDIR\"/../common/package/fonts\nDSTEDITORFONTS_DIR=\"$DSTEDITORPAGE_DIR\"/fonts\nWEBAPPS_DIR=\"$DSTEDITORPAGE_DIR\"\n\nCreateDir \"$DSTLOGINPAGE_DIR\"\nCreateDir \"$DSTEDITORFONTS_DIR\"\nCreateDir \"$DSTEDITORPAGE_DIR\"/sdkjs\nCreateDir \"$WEBAPPS_DIR\"\n\ncp -R \"$SRCEDITORFONTS_DIR\"/ariblk.ttf \"$DSTEDITORFONTS_DIR\"/ariblk.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/Asana-Math.ttf \"$DSTEDITORFONTS_DIR\"/Asana-Math.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/caladea-bold.ttf \"$DSTEDITORFONTS_DIR\"/caladea-bold.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/caladea-bolditalic.ttf \"$DSTEDITORFONTS_DIR\"/caladea-bolditalic.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/caladea-italic.ttf \"$DSTEDITORFONTS_DIR\"/caladea-italic.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/caladea-regular.ttf \"$DSTEDITORFONTS_DIR\"/caladea-regular.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/Carlito-Bold.ttf \"$DSTEDITORFONTS_DIR\"/Carlito-Bold.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/Carlito-BoldItalic.ttf \"$DSTEDITORFONTS_DIR\"/Carlito-BoldItalic.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/Carlito-Italic.ttf \"$DSTEDITORFONTS_DIR\"/Carlito-Italic.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/Carlito-Regular.ttf \"$DSTEDITORFONTS_DIR\"/Carlito-Regular.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/Comic_Sans_MS_Bold.ttf \"$DSTEDITORFONTS_DIR\"/Comic_Sans_MS_Bold.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/Comic_Sans_MS.ttf \"$DSTEDITORFONTS_DIR\"/Comic_Sans_MS.ttf\ncp -R \"$SRCEDITORFONTS_DIR\"/LICENSE.txt \"$DSTEDITORFONTS_DIR\"/LICENSE.txt\n\nrsync -av --progress \"$JS_SDK_SVN\"/ \"$DSTEDITORPAGE_DIR\" --exclude='web-apps' --exclude='startpage'\ncp -vR \"$SRCEDITORPAGE_DIR\" \"$WEBAPPS_DIR\"\n\ncd \"$BASEDIR\"\n\necho \"---------------------------------------------------------------------------------------\"\necho \"Import Converter\"\necho \"---------------------------------------------------------------------------------------\"\n\nSRCCONVERTER_DIR=\"$BASEDIR\"/../common/converter\nDSTCONVERTER_DIR=\"$DST_DIR\"/converter\n\nCreateDir \"$DSTCONVERTER_DIR\"\n\ncp -vR \"$SRCCONVERTER_DIR\" \"$DST_DIR\"\ncp -vR \"$CORE_BASE_DIR\"/build/empty \"$DSTCONVERTER_DIR\"\n\ncp -vR \"$CORE_BASE_DIR/build/lib/mac_64/libDjVuFile.dylib\" \"$DSTCONVERTER_DIR\"\ncp -vR \"$CORE_BASE_DIR/build/lib/mac_64/libdoctrenderer.dylib\" \"$DSTCONVERTER_DIR\"\ncp -vR \"$CORE_BASE_DIR/build/lib/mac_64/libHtmlFile.dylib\" \"$DSTCONVERTER_DIR\"\ncp -vR \"$CORE_BASE_DIR/build/lib/mac_64/libHtmlRenderer.dylib\" \"$DSTCONVERTER_DIR\"\ncp -vR \"$CORE_BASE_DIR/build/lib/mac_64/libPdfReader.dylib\" \"$DSTCONVERTER_DIR\"\ncp -vR \"$CORE_BASE_DIR/build/lib/mac_64/libPdfWriter.dylib\" \"$DSTCONVERTER_DIR\"\ncp -vR \"$CORE_BASE_DIR/build/lib/mac_64/libUnicodeConverter.dylib\" \"$DSTCONVERTER_DIR\"\ncp -vR \"$CORE_BASE_DIR/build/lib/mac_64/libXpsFile.dylib\" \"$DSTCONVERTER_DIR\"\n\ncp -vR \"$CORE_BASE_DIR/build/bin/icu/mac_64/libicuuc.55.1.dylib\" \"$DSTCONVERTER_DIR\"\ncp -vR \"$CORE_BASE_DIR/build/bin/icu/mac_64/libicudata.55.1.dylib\" \"$DSTCONVERTER_DIR\"\n\ncp -vR \"$CORE_BASE_DIR/build/bin/mac_64/x2t\" \"$DSTCONVERTER_DIR\"\ncp -vR \"$CORE_BASE_DIR/build/bin/mac_64/icudtl.dat\" \"$DSTCONVERTER_DIR\"\n\nchmod -v +x \"$DSTCONVERTER_DIR\"/x2t"; }; FC7FD3DF1C315DD6008F6641 /* Rename symbols */ = { isa = PBXShellScriptBuildPhase; @@ -1329,7 +1333,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "#exit 0\n\ncontents=${CONFIGURATION_BUILD_DIR}/${CONTENTS_FOLDER_PATH}\ndst=\"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\n\ncore_path=${SRCROOT}/../../core\n\nrm -rf \"${dst}\"/Chromium\\ Embedded\\ Framework.framework\nrm -rf \"${dst}\"/${PRODUCT_NAME}\\ Helper.app\nrm -rf \"${dst}\"/libascdocumentscore.dylib\n\nif [ ! -d \"${dst}\" ]; then\n mkdir -p \"${dst}\"\nfi\n\necho \"Copy libraries and frameworks\"\ncp -Rv \"${core_path}\"/build/cef/mac/${PRODUCT_NAME}\\ Helper.app \"${dst}\"/${PRODUCT_NAME}\\ Helper.app\ncp -Rv \"${core_path}\"/build/cef/mac/Chromium\\ Embedded\\ Framework.framework \"${dst}\"\ncp -Rv \"${core_path}\"/build/lib/mac_64/libascdocumentscore.dylib \"${dst}\"\n\necho \"Change dynamic shared library install names\"\ninstall_name_tool \\\n-change \\\n@executable_path/Chromium\\ Embedded\\ Framework \\\n@executable_path/../Frameworks/Chromium\\ Embedded\\ Framework.framework/Chromium\\ Embedded\\ Framework \\\n\"${contents}\"/MacOS/\"${PRODUCT_NAME}\"\n\ninstall_name_tool \\\n-change \\\n/usr/local/lib/libascdocumentscore.dylib \\\n@executable_path/../Frameworks/libascdocumentscore.dylib \\\n\"${contents}\"/MacOS/\"${PRODUCT_NAME}\"\n\ninstall_name_tool \\\n-change \\\n@executable_path/Chromium\\ Embedded\\ Framework \\\n@executable_path/../Frameworks/Chromium\\ Embedded\\ Framework.framework/Chromium\\ Embedded\\ Framework \\\n\"${dst}\"/libascdocumentscore.dylib\n\ninstall_name_tool \\\n-change \\\nlibDjVuFile.dylib \\\n@rpath/libDjVuFile.dylib \\\n\"${dst}\"/libascdocumentscore.dylib\n\ninstall_name_tool \\\n-change \\\nlibPdfReader.dylib \\\n@rpath/libPdfReader.dylib \\\n\"${dst}\"/libascdocumentscore.dylib\n\ninstall_name_tool \\\n-change \\\nlibPdfWriter.dylib \\\n@rpath/libPdfWriter.dylib \\\n\"${dst}\"/libascdocumentscore.dylib\n\ninstall_name_tool \\\n-change \\\nlibXpsFile.dylib \\\n@rpath/libXpsFile.dylib \\\n\"${dst}\"/libascdocumentscore.dylib\n\ninstall_name_tool \\\n-change \\\nlibHtmlRenderer.dylib \\\n@rpath/libHtmlRenderer.dylib \\\n\"${dst}\"/libascdocumentscore.dylib\n\ninstall_name_tool \\\n-change \\\nlibPdfWriter.dylib \\\n@rpath/libPdfWriter.dylib \\\n\"${contents}\"/Resources/converter/libDjVuFile.dylib\n\ninstall_name_tool \\\n-change \\\nlibPdfWriter.dylib \\\n@rpath/libPdfWriter.dylib \\\n\"${contents}\"/Resources/converter/libPdfReader.dylib\n\ninstall_name_tool \\\n-change \\\nlibPdfWriter.dylib \\\n@rpath/libPdfWriter.dylib \\\n\"${contents}\"/Resources/converter/libXpsFile.dylib\n\ninstall_name_tool \\\n-change \\\nlibHtmlRenderer.dylib \\\n@rpath/libHtmlRenderer.dylib \\\n\"${contents}\"/Resources/converter/libPdfReader.dylib\n\ninstall_name_tool \\\n-change \\\nlibHtmlRenderer.dylib \\\n@rpath/libHtmlRenderer.dylib \\\n\"${contents}\"/Resources/converter/libHtmlRenderer.dylib\n\n# rename symbols in helper ==========\ninstall_name_tool -change libDjVuFile.dylib \\\n@rpath/libDjVuFile.dylib \\\n\"${dst}\"/${PRODUCT_NAME}\\ Helper.app/Contents/MacOS/${PRODUCT_NAME}\\ Helper\n\ninstall_name_tool -change libPdfReader.dylib \\\n@rpath/libPdfReader.dylib \\\n\"${dst}\"/${PRODUCT_NAME}\\ Helper.app/Contents/MacOS/${PRODUCT_NAME}\\ Helper\n\ninstall_name_tool -change libXpsFile.dylib \\\n@rpath/libXpsFile.dylib \\\n\"${dst}\"/${PRODUCT_NAME}\\ Helper.app/Contents/MacOS/${PRODUCT_NAME}\\ Helper\n\ninstall_name_tool -change libHtmlRenderer.dylib \\\n@rpath/libHtmlRenderer.dylib \\\n\"${dst}\"/${PRODUCT_NAME}\\ Helper.app/Contents/MacOS/${PRODUCT_NAME}\\ Helper\n\ninstall_name_tool -add_rpath \\\n@executable_path/../../../../Resources/converter \\\n\"${dst}\"/${PRODUCT_NAME}\\ Helper.app/Contents/MacOS/${PRODUCT_NAME}\\ Helper\n# ===================================\n\necho \"Create symbol links\"\n(cd \"${contents}\"/Resources/converter && ln -siv libicuuc.55.1.dylib libicuuc.55.dylib)\n(cd \"${contents}\"/Resources/converter && ln -siv libicudata.55.1.dylib libicudata.55.dylib)\n\necho \"Change rights\"\nchmod -v +x \"${dst}\"/${PRODUCT_NAME}\\ Helper.app/Contents/MacOS/${PRODUCT_NAME}\\ Helper\n\necho \"Sign libraries and frameworks\"\ncodesign --verbose=4 --force -s \"${CODE_SIGN_IDENTITY}\" \"${dst}/libascdocumentscore.dylib\"\ncodesign --verbose=4 --force -s \"${CODE_SIGN_IDENTITY}\" \"${dst}/Chromium Embedded Framework.framework/\"\ncodesign --verbose=4 --force -s \"${CODE_SIGN_IDENTITY}\" \"${dst}/${PRODUCT_NAME} Helper.app/\""; + shellScript = "#!/bin/sh\n\n#exit 0\n\ncontents=${CONFIGURATION_BUILD_DIR}/${CONTENTS_FOLDER_PATH}\ndst=\"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\n\ncore_path=${SRCROOT}/../../core\n\nrm -rf \"${dst}\"/Chromium\\ Embedded\\ Framework.framework\nrm -rf \"${dst}\"/ONLYOFFICE\\ Helper.app\nrm -rf \"${dst}\"/libascdocumentscore.dylib\nrm -rf \"${dst}\"/libooxmlsignature.dylib\nrm -rf \"${dst}\"/libssl.1.1.dylib\nrm -rf \"${dst}\"/libcrypto.1.1.dylib\n\nif [ ! -d \"${dst}\" ]; then\nmkdir -p \"${dst}\"\nfi\n\necho \"Copy libraries and frameworks\"\ncp -Rv \"${core_path}\"/build/cef/mac/ONLYOFFICE\\ Helper.app \"${dst}\"/ONLYOFFICE\\ Helper.app\ncp -Rv \"${core_path}\"/build/cef/mac/Chromium\\ Embedded\\ Framework.framework \"${dst}\"\ncp -Rv \"${core_path}\"/build/lib/mac_64/libascdocumentscore.dylib \"${dst}\"\ncp -Rv \"${core_path}\"/build/lib/mac_64/libooxmlsignature.dylib \"${dst}\"\ncp -Rv \"${core_path}\"/build/lib/mac_64/libssl.1.1.dylib \"${dst}\"\ncp -Rv \"${core_path}\"/build/lib/mac_64/libcrypto.1.1.dylib \"${dst}\"\n\necho \"Change dynamic shared library install names\"\ninstall_name_tool \\\n-change \\\n@executable_path/Chromium\\ Embedded\\ Framework \\\n@executable_path/../Frameworks/Chromium\\ Embedded\\ Framework.framework/Chromium\\ Embedded\\ Framework \\\n\"${contents}\"/MacOS/ONLYOFFICE\n\ninstall_name_tool \\\n-change \\\n/usr/local/lib/libascdocumentscore.dylib \\\n@executable_path/../Frameworks/libascdocumentscore.dylib \\\n\"${contents}\"/MacOS/ONLYOFFICE\n\ninstall_name_tool \\\n-change \\\n@executable_path/Chromium\\ Embedded\\ Framework \\\n@executable_path/../Frameworks/Chromium\\ Embedded\\ Framework.framework/Chromium\\ Embedded\\ Framework \\\n\"${dst}\"/libascdocumentscore.dylib\n\ninstall_name_tool \\\n-change \\\nlibDjVuFile.dylib \\\n@rpath/libDjVuFile.dylib \\\n\"${dst}\"/libascdocumentscore.dylib\n\ninstall_name_tool \\\n-change \\\nlibPdfReader.dylib \\\n@rpath/libPdfReader.dylib \\\n\"${dst}\"/libascdocumentscore.dylib\n\ninstall_name_tool \\\n-change \\\nlibPdfWriter.dylib \\\n@rpath/libPdfWriter.dylib \\\n\"${dst}\"/libascdocumentscore.dylib\n\ninstall_name_tool \\\n-change \\\nlibXpsFile.dylib \\\n@rpath/libXpsFile.dylib \\\n\"${dst}\"/libascdocumentscore.dylib\n\ninstall_name_tool \\\n-change \\\nlibHtmlRenderer.dylib \\\n@rpath/libHtmlRenderer.dylib \\\n\"${dst}\"/libascdocumentscore.dylib\n\ninstall_name_tool \\\n-change \\\nlibUnicodeConverter.dylib \\\n@rpath/libUnicodeConverter.dylib \\\n\"${dst}\"/libascdocumentscore.dylib\n\ninstall_name_tool \\\n-change \\\nlibooxmlsignature.dylib \\\n@rpath/libooxmlsignature.dylib \\\n\"${dst}\"/libascdocumentscore.dylib\n\ninstall_name_tool \\\n-change \\\n/usr/local/lib/libssl.1.1.dylib \\\n@rpath/libssl.1.1.dylib \\\n\"${dst}\"/libooxmlsignature.dylib\n\ninstall_name_tool \\\n-change \\\n/usr/local/lib/libcrypto.1.1.dylib \\\n@rpath/libcrypto.1.1.dylib \\\n\"${dst}\"/libooxmlsignature.dylib\n\ninstall_name_tool \\\n-change \\\n/usr/local/lib/libcrypto.1.1.dylib \\\n@rpath/libcrypto.1.1.dylib \\\n\"${dst}\"/libssl.1.1.dylib\n\ninstall_name_tool \\\n-change \\\nlibicuuc.55.dylib \\\n@rpath/libicuuc.55.dylib \\\n\"${contents}\"/Resources/converter/libUnicodeConverter.dylib\n\ninstall_name_tool \\\n-change \\\n../lib/libicudata.55.1.dylib \\\n@rpath/libicudata.55.dylib \\\n\"${contents}\"/Resources/converter/libUnicodeConverter.dylib\n\ninstall_name_tool \\\n-change \\\nlibicudata.55.dylib \\\n@rpath/libicudata.55.dylib \\\n\"${contents}\"/Resources/converter/libicuuc.55.1.dylib\n\ninstall_name_tool \\\n-change \\\nlibPdfWriter.dylib \\\n@rpath/libPdfWriter.dylib \\\n\"${contents}\"/Resources/converter/libDjVuFile.dylib\n\ninstall_name_tool \\\n-change \\\nlibPdfWriter.dylib \\\n@rpath/libPdfWriter.dylib \\\n\"${contents}\"/Resources/converter/libPdfReader.dylib\n\ninstall_name_tool \\\n-change \\\nlibPdfWriter.dylib \\\n@rpath/libPdfWriter.dylib \\\n\"${contents}\"/Resources/converter/libXpsFile.dylib\n\ninstall_name_tool \\\n-change \\\nlibHtmlRenderer.dylib \\\n@rpath/libHtmlRenderer.dylib \\\n\"${contents}\"/Resources/converter/libPdfReader.dylib\n\ninstall_name_tool \\\n-change \\\nlibHtmlRenderer.dylib \\\n@rpath/libHtmlRenderer.dylib \\\n\"${contents}\"/Resources/converter/libHtmlRenderer.dylib\n\ninstall_name_tool \\\n-change \\\nlibUnicodeConverter.dylib \\\n@rpath/libUnicodeConverter.dylib \\\n\"${contents}\"/Resources/converter/libHtmlRenderer.dylib\n\ninstall_name_tool \\\n-change \\\nlibUnicodeConverter.dylib \\\n@rpath/libUnicodeConverter.dylib \\\n\"${contents}\"/Resources/converter/libDjVuFile.dylib\n\ninstall_name_tool \\\n-change \\\nlibUnicodeConverter.dylib \\\n@rpath/libUnicodeConverter.dylib \\\n\"${contents}\"/Resources/converter/libPdfWriter.dylib\n\ninstall_name_tool \\\n-change \\\nlibUnicodeConverter.dylib \\\n@rpath/libUnicodeConverter.dylib \\\n\"${contents}\"/Resources/converter/libPdfReader.dylib\n\ninstall_name_tool \\\n-change \\\nlibUnicodeConverter.dylib \\\n@rpath/libUnicodeConverter.dylib \\\n\"${contents}\"/Resources/converter/libXpsFile.dylib\n\n# rename symbols in helper ==========\ninstall_name_tool -change libDjVuFile.dylib \\\n@rpath/libDjVuFile.dylib \\\n\"${dst}\"/ONLYOFFICE\\ Helper.app/Contents/MacOS/ONLYOFFICE\\ Helper\n\ninstall_name_tool -change libPdfReader.dylib \\\n@rpath/libPdfReader.dylib \\\n\"${dst}\"/ONLYOFFICE\\ Helper.app/Contents/MacOS/ONLYOFFICE\\ Helper\n\ninstall_name_tool -change libXpsFile.dylib \\\n@rpath/libXpsFile.dylib \\\n\"${dst}\"/ONLYOFFICE\\ Helper.app/Contents/MacOS/ONLYOFFICE\\ Helper\n\ninstall_name_tool -change libHtmlRenderer.dylib \\\n@rpath/libHtmlRenderer.dylib \\\n\"${dst}\"/ONLYOFFICE\\ Helper.app/Contents/MacOS/ONLYOFFICE\\ Helper\n\ninstall_name_tool -change libUnicodeConverter.dylib \\\n@rpath/libUnicodeConverter.dylib \\\n\"${dst}\"/ONLYOFFICE\\ Helper.app/Contents/MacOS/ONLYOFFICE\\ Helper\n\ninstall_name_tool -add_rpath \\\n@executable_path/../../../../Resources/converter \\\n\"${dst}\"/ONLYOFFICE\\ Helper.app/Contents/MacOS/ONLYOFFICE\\ Helper\n\n# ===================================\n\necho \"Create symbol links\"\n(cd \"${contents}\"/Resources/converter && ln -siv libicuuc.55.1.dylib libicuuc.55.dylib)\n(cd \"${contents}\"/Resources/converter && ln -siv libicudata.55.1.dylib libicudata.55.dylib)\n\necho \"Change rights\"\nchmod -v +x \"${dst}\"/ONLYOFFICE\\ Helper.app/Contents/MacOS/ONLYOFFICE\\ Helper\n\necho \"Sign libraries and frameworks\"\necho \"${CODE_SIGN_IDENTITY}\"\ncodesign --verbose=4 --force -s \"${CODE_SIGN_IDENTITY}\" \"${dst}/libooxmlsignature.dylib\"\ncodesign --verbose=4 --force -s \"${CODE_SIGN_IDENTITY}\" \"${dst}/libascdocumentscore.dylib\"\ncodesign --verbose=4 --force -s \"${CODE_SIGN_IDENTITY}\" \"${dst}/libssl.1.1.dylib\"\ncodesign --verbose=4 --force -s \"${CODE_SIGN_IDENTITY}\" \"${dst}/libcrypto.1.1.dylib\"\ncodesign --verbose=4 --force -s \"${CODE_SIGN_IDENTITY}\" \"${dst}/Chromium Embedded Framework.framework/\"\ncodesign --verbose=4 --force -s \"${CODE_SIGN_IDENTITY}\" \"${dst}/ONLYOFFICE Helper.app/\""; showEnvVarsInLog = 0; }; FCD2B9151BC64D6D00F54560 /* Generate Localizable.strings */ = { @@ -1708,9 +1712,9 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", _MAC, - _PRODUCT_ONLYOFFICE_RU, + _PRODUCT_ONLYOFFICE_RU_FREE, ); - INFOPLIST_FILE = "$(SRCROOT)/ONLYOFFICE/Resources/ONLYOFFICE-RU/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/ONLYOFFICE/Resources/$(TARGET_NAME)/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -1744,9 +1748,9 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", _MAC, - _PRODUCT_ONLYOFFICE_RU, + _PRODUCT_ONLYOFFICE_RU_FREE, ); - INFOPLIST_FILE = "$(SRCROOT)/ONLYOFFICE/Resources/ONLYOFFICE-RU/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/ONLYOFFICE/Resources/$(TARGET_NAME)/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -1951,7 +1955,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - FC7FD3E21C315DD6008F6641 /* Build configuration list for PBXNativeTarget "ONLYOFFICE-RU" */ = { + FC7FD3E21C315DD6008F6641 /* Build configuration list for PBXNativeTarget "ONLYOFFICE-RU-FREE" */ = { isa = XCConfigurationList; buildConfigurations = ( FC7FD3E31C315DD6008F6641 /* Debug */, diff --git a/macos/ONLYOFFICE/Code/Controllers/ASCAboutController.m b/macos/ONLYOFFICE/Code/Controllers/ASCAboutController.m index 79349cae6..ad527bb03 100644 --- a/macos/ONLYOFFICE/Code/Controllers/ASCAboutController.m +++ b/macos/ONLYOFFICE/Code/Controllers/ASCAboutController.m @@ -62,6 +62,11 @@ NSString * locCopyright = localizedInfoDictionary[@"NSHumanReadableCopyright"]; locProductName = locProductName ? locProductName : infoDictionary[@"CFBundleName"]; + +#ifdef _PRODUCT_ONLYOFFICE_RU_FREE + locProductName = NSLocalizedString("ONLYOFFICE FREE", nil) +#endif + locCopyright = locCopyright ? locCopyright : infoDictionary[@"NSHumanReadableCopyright"]; // EULA View diff --git a/macos/ONLYOFFICE/Code/Controllers/ASCEventsController.mm b/macos/ONLYOFFICE/Code/Controllers/ASCEventsController.mm index 7b269891b..339adb261 100644 --- a/macos/ONLYOFFICE/Code/Controllers/ASCEventsController.mm +++ b/macos/ONLYOFFICE/Code/Controllers/ASCEventsController.mm @@ -299,21 +299,21 @@ public: } } -// // Begin hotfix ODP presentation -// -// NSArray* pptxExtension = [supportFormats filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"SELF['extension'] == %@", @"pptx"]]; -// NSArray* odpExtension = [supportFormats filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"SELF['extension'] == %@", @"odp"]]; -// -// if ([pptxExtension count] > 0 && [odpExtension count] < 1) { -// NSDictionary * info = [ASCConstants ascFormatsInfo][@(AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP)]; -// [supportFormats addObject:@{ -// @"type" : @(AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP), -// @"description" : info[@"description"], -// @"extension" : info[@"extension"] -// }]; -// } -// -// // End hotfix ODP presentation + // Begin hotfix ODP presentation + + NSArray* pptxExtension = [supportFormats filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"SELF['extension'] == %@", @"pptx"]]; + NSArray* odpExtension = [supportFormats filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"SELF['extension'] == %@", @"odp"]]; + + if ([pptxExtension count] > 0 && [odpExtension count] < 1) { + NSDictionary * info = [ASCConstants ascFormatsInfo][@(AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP)]; + [supportFormats addObject:@{ + @"type" : @(AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP), + @"description" : info[@"description"], + @"extension" : info[@"extension"] + }]; + } + + // End hotfix ODP presentation [[NSNotificationCenter defaultCenter] postNotificationName:CEFEventNameSaveLocal object:nil diff --git a/macos/ONLYOFFICE/Code/Utils/ASCConstants.h b/macos/ONLYOFFICE/Code/Utils/ASCConstants.h index 40a168313..4f2b70639 100644 --- a/macos/ONLYOFFICE/Code/Utils/ASCConstants.h +++ b/macos/ONLYOFFICE/Code/Utils/ASCConstants.h @@ -54,7 +54,11 @@ typedef NS_ENUM(int, ASCTabActionType) { ASCTabActionSaveLocalFile, }; -#ifdef _PRODUCT_ONLYOFFICE_RU +#ifdef _PRODUCT_ONLYOFFICE_RU_FREE +static NSString * kRegHelpUrl = @"http://onlyoffice.ru/help"; +static NSString * kHelpUrl = @"http://onlyoffice.ru/help"; +#else +#ifdef _PRODUCT_ONLYOFFICE_RU_PRO static NSString * kRegHelpUrl = @"http://onlyoffice.ru/help"; static NSString * kHelpUrl = @"http://onlyoffice.ru/help"; #else diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/Base.lproj/EULA.html b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/Base.lproj/EULA.html similarity index 100% rename from macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/Base.lproj/EULA.html rename to macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/Base.lproj/EULA.html diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/Base.lproj/InfoPlist.strings b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/Base.lproj/InfoPlist.strings new file mode 100644 index 000000000..fb473c4dc --- /dev/null +++ b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/Base.lproj/InfoPlist.strings @@ -0,0 +1,5 @@ +/* (No Commment) */ +"CFBundleName" = "ONLYOFFICE"; + +/* (No Commment) */ +"NSHumanReadableCopyright" = "© АО \"Novyye Kommunikatsionnyye Tekhnologii\" 2017 All rights reserved."; diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/Info.plist b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/Info.plist similarity index 97% rename from macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/Info.plist rename to macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/Info.plist index aeab68fe5..ef0e37fe0 100644 --- a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/Info.plist +++ b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/Info.plist @@ -220,11 +220,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.1.1 + 4.4 CFBundleSignature ???? CFBundleVersion - 105 + 169 LSApplicationCategoryType public.app-category.productivity LSMinimumSystemVersion @@ -235,13 +235,13 @@ NSHumanReadableCopyright - Copyright © 2017 Ascensio System SIA. All rights reserved. + Copyright © АО Novyye Kommunikatsionnyye Tekhnologii. 2017 All rights reserved. NSMainStoryboardFile Main NSPrincipalClass NSApplication SUFeedURL - http://download.onlyoffice.com/install/desktop/editors/mac/onlyoffice.xml + http://download.onlyoffice.com/install/desktop/editors/mac/onlyoffice-ru-free.xml SUPublicDSAKeyFile dsa_pub.pem SUScheduledCheckInterval diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/de.lproj/EULA.html b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/de.lproj/EULA.html similarity index 100% rename from macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/de.lproj/EULA.html rename to macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/de.lproj/EULA.html diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/de.lproj/InfoPlist.strings b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/de.lproj/InfoPlist.strings new file mode 100644 index 000000000..fb473c4dc --- /dev/null +++ b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/de.lproj/InfoPlist.strings @@ -0,0 +1,5 @@ +/* (No Commment) */ +"CFBundleName" = "ONLYOFFICE"; + +/* (No Commment) */ +"NSHumanReadableCopyright" = "© АО \"Novyye Kommunikatsionnyye Tekhnologii\" 2017 All rights reserved."; diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/es.lproj/EULA.html b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/es.lproj/EULA.html similarity index 100% rename from macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/es.lproj/EULA.html rename to macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/es.lproj/EULA.html diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/es.lproj/InfoPlist.strings b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/es.lproj/InfoPlist.strings new file mode 100644 index 000000000..fb473c4dc --- /dev/null +++ b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/es.lproj/InfoPlist.strings @@ -0,0 +1,5 @@ +/* (No Commment) */ +"CFBundleName" = "ONLYOFFICE"; + +/* (No Commment) */ +"NSHumanReadableCopyright" = "© АО \"Novyye Kommunikatsionnyye Tekhnologii\" 2017 All rights reserved."; diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/fr.lproj/EULA.html b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/fr.lproj/EULA.html similarity index 100% rename from macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/fr.lproj/EULA.html rename to macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/fr.lproj/EULA.html diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/fr.lproj/InfoPlist.strings b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/fr.lproj/InfoPlist.strings new file mode 100644 index 000000000..fb473c4dc --- /dev/null +++ b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/fr.lproj/InfoPlist.strings @@ -0,0 +1,5 @@ +/* (No Commment) */ +"CFBundleName" = "ONLYOFFICE"; + +/* (No Commment) */ +"NSHumanReadableCopyright" = "© АО \"Novyye Kommunikatsionnyye Tekhnologii\" 2017 All rights reserved."; diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/ru.lproj/EULA.html b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/ru.lproj/EULA.html similarity index 100% rename from macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/ru.lproj/EULA.html rename to macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/ru.lproj/EULA.html diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/ru.lproj/InfoPlist.strings b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/ru.lproj/InfoPlist.strings new file mode 100644 index 000000000..cffb884de --- /dev/null +++ b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU-FREE/ru.lproj/InfoPlist.strings @@ -0,0 +1,5 @@ +/* (No Commment) */ +"CFBundleName" = "ONLYOFFICE"; + +/* (No Commment) */ +"NSHumanReadableCopyright" = "© АО \"Новые Коммуникационные Технологии\" 2017 Все права защищены."; diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/Base.lproj/InfoPlist.strings b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/Base.lproj/InfoPlist.strings deleted file mode 100644 index f8cf0dce7..000000000 --- a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/Base.lproj/InfoPlist.strings +++ /dev/null @@ -1,7 +0,0 @@ -/* - InfoPlist.strings - ONLYOFFICE - - Created by Alexander Yuzhin on 12/29/15. - Copyright © 2015 Ascensio System SIA. All rights reserved. -*/ diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/de.lproj/InfoPlist.strings b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/de.lproj/InfoPlist.strings deleted file mode 100644 index f8cf0dce7..000000000 --- a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/de.lproj/InfoPlist.strings +++ /dev/null @@ -1,7 +0,0 @@ -/* - InfoPlist.strings - ONLYOFFICE - - Created by Alexander Yuzhin on 12/29/15. - Copyright © 2015 Ascensio System SIA. All rights reserved. -*/ diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/es.lproj/InfoPlist.strings b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/es.lproj/InfoPlist.strings deleted file mode 100644 index f8cf0dce7..000000000 --- a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/es.lproj/InfoPlist.strings +++ /dev/null @@ -1,7 +0,0 @@ -/* - InfoPlist.strings - ONLYOFFICE - - Created by Alexander Yuzhin on 12/29/15. - Copyright © 2015 Ascensio System SIA. All rights reserved. -*/ diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/fr.lproj/InfoPlist.strings b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/fr.lproj/InfoPlist.strings deleted file mode 100644 index f8cf0dce7..000000000 --- a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/fr.lproj/InfoPlist.strings +++ /dev/null @@ -1,7 +0,0 @@ -/* - InfoPlist.strings - ONLYOFFICE - - Created by Alexander Yuzhin on 12/29/15. - Copyright © 2015 Ascensio System SIA. All rights reserved. -*/ diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/ru.lproj/InfoPlist.strings b/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/ru.lproj/InfoPlist.strings deleted file mode 100644 index 1dd2f8b67..000000000 --- a/macos/ONLYOFFICE/Resources/ONLYOFFICE-RU/ru.lproj/InfoPlist.strings +++ /dev/null @@ -1,5 +0,0 @@ -/* (No Commment) */ -"CFBundleName" = "ONLYOFFICE"; - -/* (No Commment) */ -"NSHumanReadableCopyright" = "© ЗАО \"Новые Коммуникационные Технологии\" 2017 Все права защищены."; \ No newline at end of file