diff --git a/Telegram/DeployLinux.sh b/Telegram/DeployLinux.sh index 9757b9c1a..629f68693 100755 --- a/Telegram/DeployLinux.sh +++ b/Telegram/DeployLinux.sh @@ -1,15 +1,20 @@ AppVersion=`./Version.sh | awk -F " " '{print $1}'` AppVersionStr=`./Version.sh | awk -F " " '{print $2}'` +DevChannel=`./Version.sh | awk -F " " '{print $3}'` +DevPostfix='' +if [ "$DevChannel" != "0" ]; then + DevPostfix='.dev' +fi -if [ ! -f "./../Linux/Release/deploy/$AppVersionStr/tlinuxupd$AppVersion" ]; then +if [ ! -f "./../Linux/Release/deploy/$AppVersionStr$DevPostfix/tlinuxupd$AppVersion" ]; then echo "tlinuxupd$AppVersion not found!"; exit 1 fi -if [ ! -f "./../Linux/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.tar.xz" ]; then - echo "tsetup.$AppVersionStr.tar.xz not found!" +if [ ! -f "./../Linux/Release/deploy/$AppVersionStr$DevPostfix/tsetup.$AppVersionStr$DevPostfix.tar.xz" ]; then + echo "tsetup.$AppVersionStr$DevPostfix.tar.xz not found!" exit 1 fi -scp ./../Linux/Release/deploy/$AppVersionStr/tlinuxupd$AppVersion tmaster:tdesktop/www/tlinux/ -scp ./../Linux/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.tar.xz tmaster:tdesktop/www/tlinux/ +scp ./../Linux/Release/deploy/$AppVersionStr$DevPostfix/tlinuxupd$AppVersion tmaster:tdesktop/www/tlinux/ +scp ./../Linux/Release/deploy/$AppVersionStr$DevPostfix/tsetup.$AppVersionStr$DevPostfix.tar.xz tmaster:tdesktop/www/tlinux/ diff --git a/Telegram/DeployLinux32.sh b/Telegram/DeployLinux32.sh index 252a79fed..3540d3cbd 100755 --- a/Telegram/DeployLinux32.sh +++ b/Telegram/DeployLinux32.sh @@ -1,16 +1,21 @@ AppVersion=`./Version.sh | awk -F " " '{print $1}'` AppVersionStr=`./Version.sh | awk -F " " '{print $2}'` +DevChannel=`./Version.sh | awk -F " " '{print $3}'` +DevPostfix='' +if [ "$DevChannel" != "0" ]; then + DevPostfix='.dev' +fi -if [ ! -f "./../Linux/Release/deploy/$AppVersionStr/tlinux32upd$AppVersion" ]; then +if [ ! -f "./../Linux/Release/deploy/$AppVersionStr$DevPostfix/tlinux32upd$AppVersion" ]; then echo "tlinux32upd$AppVersion not found!" exit 1 fi -if [ ! -f "./../Linux/Release/deploy/$AppVersionStr/tsetup32.$AppVersionStr.tar.xz" ]; then - echo "tsetup32.$AppVersionStr.zip not found!" +if [ ! -f "./../Linux/Release/deploy/$AppVersionStr$DevPostfix/tsetup32.$AppVersionStr$DevPostfix.tar.xz" ]; then + echo "tsetup32.$AppVersionStr$DevPostfix.zip not found!" exit 1 fi -scp ./../Linux/Release/deploy/$AppVersionStr/tlinux32upd$AppVersion tmaster:tdesktop/www/tlinux32/ -scp ./../Linux/Release/deploy/$AppVersionStr/tsetup32.$AppVersionStr.tar.xz tmaster:tdesktop/www/tlinux32/ +scp ./../Linux/Release/deploy/$AppVersionStr$DevPostfix/tlinux32upd$AppVersion tmaster:tdesktop/www/tlinux32/ +scp ./../Linux/Release/deploy/$AppVersionStr$DevPostfix/tsetup32.$AppVersionStr$DevPostfix.tar.xz tmaster:tdesktop/www/tlinux32/ diff --git a/Telegram/DeployMacWin.sh b/Telegram/DeployMacWin.sh index a6ac0dd70..1e8a06b12 100755 --- a/Telegram/DeployMacWin.sh +++ b/Telegram/DeployMacWin.sh @@ -1,13 +1,18 @@ AppVersion=`./Version.sh | awk -F " " '{print $1}'` AppVersionStr=`./Version.sh | awk -F " " '{print $2}'` +DevChannel=`./Version.sh | awk -F " " '{print $3}'` +DevPostfix='' +if [ "$DevChannel" != "0" ]; then + DevPostfix='.dev' +fi -if [ ! -f "./../Mac/Release/deploy/$AppVersionStr/tmacupd$AppVersion" ]; then +if [ ! -f "./../Mac/Release/deploy/$AppVersionStr$DevPostfix/tmacupd$AppVersion" ]; then echo "tmacupd$AppVersion not found!" exit 1 fi -if [ ! -f "./../Mac/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.dmg" ]; then - echo "tsetup.$AppVersionStr.dmg not found!" +if [ ! -f "./../Mac/Release/deploy/$AppVersionStr$DevPostfix/tsetup.$AppVersionStr$DevPostfix.dmg" ]; then + echo "tsetup.$AppVersionStr$DevPostfix.dmg not found!" exit 1 fi @@ -16,18 +21,18 @@ if [ ! -f "./../../tother/tsetup/tupdate$AppVersion" ]; then exit 1 fi -if [ ! -f "./../../tother/tsetup/tportable.$AppVersionStr.zip" ]; then - echo "tportable.$AppVersionStr.zip not found!" +if [ ! -f "./../../tother/tsetup/tportable.$AppVersionStr$DevPostfix.zip" ]; then + echo "tportable.$AppVersionStr$DevPostfix.zip not found!" exit 1 fi -if [ ! -f "./../../tother/tsetup/tsetup.$AppVersionStr.exe" ]; then - echo "tsetup.$AppVersionStr.exe not found!" +if [ ! -f "./../../tother/tsetup/tsetup.$AppVersionStr$DevPostfix.exe" ]; then + echo "tsetup.$AppVersionStr$DevPostfix.exe not found!" exit 1 fi -scp ./../Mac/Release/deploy/$AppVersionStr/tmacupd$AppVersion tmaster:tdesktop/www/tmac/ -scp ./../Mac/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.dmg tmaster:tdesktop/www/tmac/ +scp ./../Mac/Release/deploy/$AppVersionStr$DevPostfix/tmacupd$AppVersion tmaster:tdesktop/www/tmac/ +scp ./../Mac/Release/deploy/$AppVersionStr$DevPostfix/tsetup.$AppVersionStr$DevPostfix.dmg tmaster:tdesktop/www/tmac/ scp ./../../tother/tsetup/tupdate$AppVersion tmaster:tdesktop/www/tsetup/ -scp ./../../tother/tsetup/tportable.$AppVersionStr.zip tmaster:tdesktop/www/tsetup/ -scp ./../../tother/tsetup/tsetup.$AppVersionStr.exe tmaster:tdesktop/www/tsetup/ +scp ./../../tother/tsetup/tportable.$AppVersionStr$DevPostfix.zip tmaster:tdesktop/www/tsetup/ +scp ./../../tother/tsetup/tsetup.$AppVersionStr$DevPostfix.exe tmaster:tdesktop/www/tsetup/ diff --git a/Telegram/PrepareLinux.sh b/Telegram/PrepareLinux.sh index 54752ec74..530fe2885 100755 --- a/Telegram/PrepareLinux.sh +++ b/Telegram/PrepareLinux.sh @@ -1,5 +1,17 @@ AppVersion=`./Version.sh | awk -F " " '{print $1}'` AppVersionStr=`./Version.sh | awk -F " " '{print $2}'` +DevChannel=`./Version.sh | awk -F " " '{print $3}'` +DevPostfix='' +DevParam='' +if [ "$DevChannel" != "0" ]; then + DevPostfix='.dev' + DevParam='-dev' +fi + +if [ -d "./../Linux/Release/deploy/$AppVersionStr.dev" ]; then + echo "Deploy folder for version $AppVersionStr.dev already exists!" + exit 1 +fi if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then echo "Deploy folder for version $AppVersionStr already exists!" @@ -21,19 +33,19 @@ if [ ! -f "./../Linux/Release/Updater" ]; then exit 1 fi -echo "Preparing version $AppVersionStr, executing Packer.." -cd ./../Linux/Release && ./Packer -path Telegram -path Updater -version $AppVersion && cd ./../../Telegram +echo "Preparing version $AppVersionStr$DevPostfix, executing Packer.." +cd ./../Linux/Release && ./Packer -path Telegram -path Updater -version $AppVersion $DevParam && cd ./../../Telegram echo "Packer done!" if [ ! -d "./../Linux/Release/deploy" ]; then mkdir "./../Linux/Release/deploy" fi -echo "Copying Telegram, Updater and tlinuxupd$AppVersion to deploy/$AppVersionStr.."; -mkdir "./../Linux/Release/deploy/$AppVersionStr" -mkdir "./../Linux/Release/deploy/$AppVersionStr/Telegram" -mv ./../Linux/Release/Telegram ./../Linux/Release/deploy/$AppVersionStr/Telegram/ -mv ./../Linux/Release/Updater ./../Linux/Release/deploy/$AppVersionStr/Telegram/ -mv ./../Linux/Release/tlinuxupd$AppVersion ./../Linux/Release/deploy/$AppVersionStr/ -cd ./../Linux/Release/deploy/$AppVersionStr && tar -cJvf tsetup.$AppVersionStr.tar.xz Telegram/ && cd ./../../../../Telegram -echo "Version $AppVersionStr prepared!"; +echo "Copying Telegram, Updater and tlinuxupd$AppVersion to deploy/$AppVersionStr$DevPostfix.."; +mkdir "./../Linux/Release/deploy/$AppVersionStr$DevPostfix" +mkdir "./../Linux/Release/deploy/$AppVersionStr$DevPostfix/Telegram" +mv ./../Linux/Release/Telegram ./../Linux/Release/deploy/$AppVersionStr$DevPostfix/Telegram/ +mv ./../Linux/Release/Updater ./../Linux/Release/deploy/$AppVersionStr$DevPostfix/Telegram/ +mv ./../Linux/Release/tlinuxupd$AppVersion ./../Linux/Release/deploy/$AppVersionStr$DevPostfix/ +cd ./../Linux/Release/deploy/$AppVersionStr$DevPostfix && tar -cJvf tsetup.$AppVersionStr$DevPostfix.tar.xz Telegram/ && cd ./../../../../Telegram +echo "Version $AppVersionStr$DevPostfix prepared!"; diff --git a/Telegram/PrepareLinux32.sh b/Telegram/PrepareLinux32.sh index ce532bc18..ead20e14f 100755 --- a/Telegram/PrepareLinux32.sh +++ b/Telegram/PrepareLinux32.sh @@ -1,5 +1,17 @@ AppVersion=`./Version.sh | awk -F " " '{print $1}'` AppVersionStr=`./Version.sh | awk -F " " '{print $2}'` +DevChannel=`./Version.sh | awk -F " " '{print $3}'` +DevPostfix='' +DevParam='' +if [ "$DevChannel" != "0" ]; then + DevPostfix='.dev' + DevParam='-dev' +fi + +if [ -d "./../Linux/Release/deploy/$AppVersionStr.dev" ]; then + echo "Deploy folder for version $AppVersionStr.dev already exists!" + exit 1 +fi if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then echo "Deploy folder for version $AppVersionStr already exists!" @@ -21,19 +33,19 @@ if [ ! -f "./../Linux/Release/Updater" ]; then exit 1 fi -echo "Preparing version $AppVersionStr, executing Packer.." -cd ./../Linux/Release && ./Packer -path Telegram -path Updater -version $AppVersion && cd ./../../Telegram +echo "Preparing version $AppVersionStr$DevPostfix, executing Packer.." +cd ./../Linux/Release && ./Packer -path Telegram -path Updater -version $AppVersion $DevParam && cd ./../../Telegram echo "Packer done!" if [ ! -d "./../Linux/Release/deploy" ]; then mkdir "./../Linux/Release/deploy" fi -echo "Copying Telegram, Updater and tlinux32upd$AppVersion to deploy/$AppVersionStr.."; -mkdir "./../Linux/Release/deploy/$AppVersionStr" -mkdir "./../Linux/Release/deploy/$AppVersionStr/Telegram" -mv ./../Linux/Release/Telegram ./../Linux/Release/deploy/$AppVersionStr/Telegram/ -mv ./../Linux/Release/Updater ./../Linux/Release/deploy/$AppVersionStr/Telegram/ -mv ./../Linux/Release/tlinux32upd$AppVersion ./../Linux/Release/deploy/$AppVersionStr/ -cd ./../Linux/Release/deploy/$AppVersionStr && tar -cJvf tsetup32.$AppVersionStr.tar.xz Telegram/ && cd ./../../../../Telegram -echo "Version $AppVersionStr prepared!"; +echo "Copying Telegram, Updater and tlinux32upd$AppVersion to deploy/$AppVersionStr$DevPostfix.."; +mkdir "./../Linux/Release/deploy/$AppVersionStr$DevPostfix" +mkdir "./../Linux/Release/deploy/$AppVersionStr$DevPostfix/Telegram" +mv ./../Linux/Release/Telegram ./../Linux/Release/deploy/$AppVersionStr$DevPostfix/Telegram/ +mv ./../Linux/Release/Updater ./../Linux/Release/deploy/$AppVersionStr$DevPostfix/Telegram/ +mv ./../Linux/Release/tlinux32upd$AppVersion ./../Linux/Release/deploy/$AppVersionStr$DevPostfix/ +cd ./../Linux/Release/deploy/$AppVersionStr$DevPostfix && tar -cJvf tsetup32.$AppVersionStr$DevPostfix.tar.xz Telegram/ && cd ./../../../../Telegram +echo "Version $AppVersionStr$DevPostfix prepared!"; diff --git a/Telegram/PrepareMac.sh b/Telegram/PrepareMac.sh index 373645ffc..a2f83ff9d 100755 --- a/Telegram/PrepareMac.sh +++ b/Telegram/PrepareMac.sh @@ -1,10 +1,22 @@ AppVersion=`./Version.sh | awk -F " " '{print $1}'` AppVersionStr=`./Version.sh | awk -F " " '{print $2}'` +DevChannel=`./Version.sh | awk -F " " '{print $3}'` +DevPostfix='' +DevParam='' +if [ "$DevChannel" != "0" ]; then + DevPostfix='.dev' + DevParam='-dev' +fi echo "" -echo "Preparing version $AppVersionStr.." +echo "Preparing version $AppVersionStr$DevPostfix.." echo "" +if [ -d "./../Mac/Release/deploy/$AppVersionStr.dev" ]; then + echo "Deploy folder for version $AppVersionStr.dev already exists!" + exit 1 +fi + if [ -d "./../Mac/Release/deploy/$AppVersionStr" ]; then echo "Deploy folder for version $AppVersionStr already exists!" exit 1 @@ -57,23 +69,23 @@ temppath=`hdiutil attach -readwrite tsetup.dmg | awk -F "\t" 'END {print $3}'` cp -R ./Telegram.app "$temppath/" bless --folder "$temppath/" --openfolder "$temppath/" hdiutil detach "$temppath" -hdiutil convert tsetup.dmg -format UDZO -imagekey zlib-level=9 -ov -o tsetup.$AppVersionStr.dmg +hdiutil convert tsetup.dmg -format UDZO -imagekey zlib-level=9 -ov -o tsetup.$AppVersionStr$DevPostfix.dmg cd ./../../Telegram -cd ./../Mac/Release && ./Packer.app/Contents/MacOS/Packer -path Telegram.app -version $AppVersion && cd ./../../Telegram +cd ./../Mac/Release && ./Packer.app/Contents/MacOS/Packer -path Telegram.app -version $AppVersion $DevParam && cd ./../../Telegram if [ ! -d "./../Mac/Release/deploy/" ]; then mkdir "./../Mac/Release/deploy" fi echo "Copying Telegram.app and tmacupd$AppVersion to deploy/$AppVersionStr.."; -mkdir "./../Mac/Release/deploy/$AppVersionStr" -mkdir "./../Mac/Release/deploy/$AppVersionStr/Telegram" -cp -r ./../Mac/Release/Telegram.app ./../Mac/Release/deploy/$AppVersionStr/Telegram/ -mv ./../Mac/Release/Telegram.app.dSYM ./../Mac/Release/deploy/$AppVersionStr/ +mkdir "./../Mac/Release/deploy/$AppVersionStr$DevPostfix" +mkdir "./../Mac/Release/deploy/$AppVersionStr$DevPostfix/Telegram" +cp -r ./../Mac/Release/Telegram.app ./../Mac/Release/deploy/$AppVersionStr$DevPostfix/Telegram/ +mv ./../Mac/Release/Telegram.app.dSYM ./../Mac/Release/deploy/$AppVersionStr$DevPostfix/ rm ./../Mac/Release/Telegram.app/Contents/MacOS/Telegram rm ./../Mac/Release/Telegram.app/Contents/Frameworks/Updater rm -rf ./../Mac/Release/Telegram.app/Contents/_CodeSignature -mv ./../Mac/Release/tmacupd$AppVersion ./../Mac/Release/deploy/$AppVersionStr/ -mv ./../Mac/Release/tsetup.$AppVersionStr.dmg ./../Mac/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.dmg -echo "Version $AppVersionStr prepared!"; +mv ./../Mac/Release/tmacupd$AppVersion ./../Mac/Release/deploy/$AppVersionStr$DevPostfix/ +mv ./../Mac/Release/tsetup.$AppVersionStr$DevPostfix.dmg ./../Mac/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr$DevPostfix.dmg +echo "Version $AppVersionStr$DevPostfix prepared!"; diff --git a/Telegram/SourceFiles/langs/lang_it.strings b/Telegram/SourceFiles/langs/lang_it.strings index fe850182b..0512aee30 100644 --- a/Telegram/SourceFiles/langs/lang_it.strings +++ b/Telegram/SourceFiles/langs/lang_it.strings @@ -440,7 +440,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org "lng_mediaview_forward" = "Inoltra"; "lng_mediaview_delete" = "Elimina"; "lng_mediaview_single_photo" = "Foto singola"; -"lng_mediaview_group_photo" = "Gruppo di foto"; +"lng_mediaview_group_photo" = "Foto gruppo"; "lng_mediaview_profile_photo" = "Foto profilo"; "lng_mediaview_n_of_count" = "Foto {n} di {count}"; "lng_mediaview_doc_image" = "File"; diff --git a/Telegram/SourceFiles/langs/lang_ko.strings b/Telegram/SourceFiles/langs/lang_ko.strings index c6f2cac63..26fb51876 100644 --- a/Telegram/SourceFiles/langs/lang_ko.strings +++ b/Telegram/SourceFiles/langs/lang_ko.strings @@ -452,7 +452,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org "lng_new_authorization" = "{name}님,\n{day}, {date} {time}에 새 기기에서 회원님의 계정에 로그인하였습니다.\n\n기기: {device}\n위치: {location}\n\n본인의 접속이 아니라면 '설정'으로 가서 '다른 모든 세션 종료'를 실행하세요.\n\n감사합니다.\n텔레그램 팀 드림"; -"lng_new_version_minor" = "텔레그램 데스크탑은 {version} 버전으로 업데이트 되었습니다. \n\n— 버그 수정 및 일부 기능 향상\n\n 전체 버전 히스토리는 아래에서 확인 가능합니다: {link}"; +"lng_new_version_minor" = "텔레그램 데스크탑은 {version} 버전으로 업데이트 되었습니다. \n\n— 버그 수정 및 일부 기능 향상\n\n 전체 버전 히스토리는 아래에서 확인 가능합니다:\n{link}"; "lng_new_version7009" = "텔레그램 데스크탑은 {version} 버전으로 업데이트 되었습니다. \n\n— 한국어 추가\n— 윈도우와 윈도우와 맥에 «다음으로 실행» 퀵메뉴 추가\n\n 전체 버전 히스토리는 아래에서 확인 가능합니다: {link}"; "lng_new_version7006_appstore" = "텔레그램 데스크탑은 {version} 버전으로 업데이트 되었습니다.\n\n— 스티커 지원\n— 음성 메시지 로컬 캐싱\n— 언어 추가\n\n전체 버전 히스토리는 아래에서 확인 가능합니다:\n{link}"; diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist index f5eb348d4..27ba6bc3e 100644 --- a/Telegram/Telegram.plist +++ b/Telegram/Telegram.plist @@ -11,7 +11,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.7.10 + 0.7.11 CFBundleSignature ???? CFBundleURLTypes diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index fc92524c2..2d5de1ca9 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -1637,7 +1637,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.7.10; + CURRENT_PROJECT_VERSION = 0.7.11; DEBUG_INFORMATION_FORMAT = dwarf; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -1655,7 +1655,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 0.7.10; + CURRENT_PROJECT_VERSION = 0.7.11; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = fast; GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h; @@ -1681,10 +1681,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.7.10; + CURRENT_PROJECT_VERSION = 0.7.11; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_COMPATIBILITY_VERSION = 0.7; - DYLIB_CURRENT_VERSION = 0.7.10; + DYLIB_CURRENT_VERSION = 0.7.11; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -1824,10 +1824,10 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 0.7.10; + CURRENT_PROJECT_VERSION = 0.7.11; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_COMPATIBILITY_VERSION = 0.7; - DYLIB_CURRENT_VERSION = 0.7.10; + DYLIB_CURRENT_VERSION = 0.7.11; ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; diff --git a/Telegram/Version.sh b/Telegram/Version.sh index f7d04542b..664d7294a 100755 --- a/Telegram/Version.sh +++ b/Telegram/Version.sh @@ -1,2 +1,2 @@ -echo 7010 0.7.10 - +echo 7011 0.7.11 1 +# AppVersion AppVersionStr DevChannel