diff options
| author | Katja Marttila <katja.marttila@theqtcompany.com> | 2016-06-21 11:51:10 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@theqtcompany.com> | 2016-06-21 12:32:42 +0300 |
| commit | e87c58548ae1e412491210e1951a2527ac0ff381 (patch) | |
| tree | ca5efe41f021f431873318b66daa859d1021b7aa /src/sdk | |
| parent | 76fd6e8f2953347ea0bf7a57b643968784bc9acc (diff) | |
| parent | 6a06b8adc5d6fabac4401219044b928043e7e8a9 (diff) | |
Merge remote-tracking branch 'origin/2.0'
Conflicts:
Changelog
dist/config/config.xml
dist/packages/org.qtproject.ifw.binaries/meta/package.xml
dist/packages/org.qtproject.ifw/meta/package.xml
installerfw.pri
src/libs/7zip/7zip.pro
src/libs/7zip/win/CPP/7zip/UI/Common/Update.cpp
src/libs/installer/component.cpp
src/libs/installer/lib7z_facade.cpp
src/libs/installer/packagemanagercore.cpp
src/libs/installer/proxycredentialsdialog.h
src/sdk/translations/ja.ts
tests/auto/installer/messageboxhandler/tst_messageboxhandler.cpp
tests/auto/installer/scriptengine/tst_scriptengine.cpp
tests/auto/installer/settings/tst_settings.cpp
Change-Id: I3bb98b8490b3c3eb7f664c1abb7417155b5430b2
Diffstat (limited to 'src/sdk')
| -rw-r--r-- | src/sdk/installerbase.cpp | 4 | ||||
| -rw-r--r-- | src/sdk/sdk.pro | 3 | ||||
| -rw-r--r-- | src/sdk/translations/ja.ts | 8 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp index 80fc7b8b3..8a009769d 100644 --- a/src/sdk/installerbase.cpp +++ b/src/sdk/installerbase.cpp @@ -88,8 +88,8 @@ int InstallerBase::run() // and check the running processes. if (runCheck.isRunning(RunOnceChecker::ConditionFlag::ProcessList)) { QInstaller::MessageBoxHandler::information(0, QLatin1String("AlreadyRunning"), - QString::fromLatin1("Waiting for %1").arg(qAppName()), - QString::fromLatin1("Another %1 instance is already running. Wait " + tr("Waiting for %1").arg(qAppName()), + tr("Another %1 instance is already running. Wait " "until it finishes, close it, or restart your system.").arg(qAppName())); return EXIT_FAILURE; } diff --git a/src/sdk/sdk.pro b/src/sdk/sdk.pro index 76bd4c5e2..fd69b4529 100644 --- a/src/sdk/sdk.pro +++ b/src/sdk/sdk.pro @@ -142,3 +142,6 @@ win32 { } macx:include(../../no_app_bundle.pri) + +target.path = $$[QT_INSTALL_BINS] +INSTALLS += target diff --git a/src/sdk/translations/ja.ts b/src/sdk/translations/ja.ts index facd4c0a7..d994bcd72 100644 --- a/src/sdk/translations/ja.ts +++ b/src/sdk/translations/ja.ts @@ -2099,6 +2099,10 @@ Do you want to continue?</source> <source>Password</source> <translation>パスワード</translation> </message> + <message> + <source>Proxy Credentials</source> + <translation>プロキシ認証</translation> + </message> </context> <context> <name>QInstaller::ServerAuthenticationDialog</name> @@ -2402,6 +2406,10 @@ Do you want to continue?</source> <source>Cannot create output file for writing: %1</source> <translation>書き込み用に出力ファイルを作成できませんでした: %1</translation> </message> + <message> + <source>Could not convert path: %1.</source> + <translation>パスを変換できませんでした: %1</translation> + </message> </context> <context> <name>ExtractCallbackImpl</name> |