summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2021-01-02 21:26:51 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2021-01-02 21:31:20 +0100
commit95cfa9a8c47caa054a587498368a07d5ac898206 (patch)
tree740dbabf43a8a319b65e9cdc0d735bd6845bdfe0
parente74cde1c6e89c51ef902219434b1fd41b5385583 (diff)
downloadrockbox-95cfa9a8c47caa054a587498368a07d5ac898206.tar.gz
rockbox-95cfa9a8c47caa054a587498368a07d5ac898206.tar.bz2
rockbox-95cfa9a8c47caa054a587498368a07d5ac898206.zip
rbutil: Rework action texts for ipod6g bootloader installation.
The logging entries do word wrapping, so no need to add hard line breaks. Those will become problematic for translations and in some cases on UI scaling. Instead add an empty line after the header to make things clearer. Change-Id: Ib774b1ad77abcfa2f5955988f7756e3a510cd1be
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstalls5l.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp b/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp
index 6568ffb74d..63a30ff2b0 100644
--- a/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstalls5l.cpp
@@ -138,10 +138,10 @@ void BootloaderInstallS5l::installStageWaitForEject(void)
}
if (!scanSuccess) {
if (!actionShown) {
- emit logItem(tr("Action required:\n"
- " Please make sure no programs are accessing\n"
- " files on the device. If ejecting still fails\n"
- " please use your computers eject funtionality."),
+ emit logItem(tr("Action required:\n\n"
+ "Please make sure no programs are accessing "
+ "files on the device. If ejecting still fails "
+ "please use your computers eject functionality."),
LOGWARNING);
actionShown = true;
}
@@ -168,8 +168,8 @@ void BootloaderInstallS5l::installStageWaitForProcs(void)
}
if (!scanSuccess) {
if (!actionShown) {
- emit logItem(tr("Action required:\n"
- " Quit iTunes application."), LOGWARNING);
+ emit logItem(tr("Action required:\n\n"
+ "Quit iTunes application."), LOGWARNING);
actionShown = true;
}
QTimer::singleShot(250, this, &BootloaderInstallS5l::installStageWaitForProcs);
@@ -189,7 +189,7 @@ void BootloaderInstallS5l::installStageWaitForProcs(void)
#endif
suspendedPids = Utils::suspendProcess(helperPids, true);
if (suspendedPids.size() != helperPids.size()) {
- emit logItem(tr("Could not suspend iTunesHelper. Stop it\n"
+ emit logItem(tr("Could not suspend iTunesHelper. Stop it "
"using the Task Manager, and try again."), LOGERROR);
emit done(true);
return;
@@ -215,11 +215,11 @@ void BootloaderInstallS5l::installStageWaitForSpindown(void)
LOG_INFO() << "preparing installStageWaitForDfu";
emit logItem(tr("Waiting for DFU mode..."), LOGINFO);
- emit logItem(tr("Action required:\n"
- " Press and hold SELECT+MENU buttons, after\n"
- " about 12 seconds a new action will require\n"
- " you to release the buttons, DO IT QUICKLY,\n"
- " otherwise the process could fail."), LOGWARNING);
+ emit logItem(tr("Action required:\n\n"
+ "Press and hold SELECT+MENU buttons, after "
+ "about 12 seconds a new action will require "
+ "you to release the buttons, DO IT QUICKLY, "
+ "otherwise the process could fail."), LOGWARNING);
scanTimer.invalidate();
installStageWaitForDfu();
}
@@ -240,8 +240,8 @@ void BootloaderInstallS5l::installStageWaitForDfu(void)
}
emit logItem(tr("DFU mode detected."), LOGINFO);
- emit logItem(tr("Action required:\n"
- " Release SELECT+MENU buttons and wait..."), LOGWARNING);
+ emit logItem(tr("Action required:\n\n"
+ "Release SELECT+MENU buttons and wait..."), LOGWARNING);
// Once the iPod enters DFU mode, the device will reset again if
// SELECT+MENU remains pressed for another 8 seconds. To avoid a
@@ -265,8 +265,8 @@ void BootloaderInstallS5l::installStageSendDfu(void)
if (!System::listUsbIds().contains(0x05ac1223)) {
LOG_ERROR() << "device not in DFU mode";
- emit logItem(tr("Device is not in DFU mode. It seems that\n"
- "the previous required action failed, please\n"
+ emit logItem(tr("Device is not in DFU mode. It seems that "
+ "the previous required action failed, please "
"try again."), LOGERROR);
emit done(true);
return;
@@ -282,8 +282,8 @@ void BootloaderInstallS5l::installStageSendDfu(void)
#if defined(Q_OS_WIN32)
if (strstr(errstr, "DFU device not found"))
{
- emit logItem(tr("No valid DFU USB driver found.\n"
- "Install iTunes (or the Apple Device Driver)\n"
+ emit logItem(tr("No valid DFU USB driver found.\n\n"
+ "Install iTunes (or the Apple Device Driver) "
"and try again."),
LOGERROR);
}
@@ -318,12 +318,12 @@ void BootloaderInstallS5l::installStageWaitForRemount(void)
}
if (!scanSuccess) {
if (!actionShown && (progressTimer.elapsed() > progressTimeout)) {
- emit logItem(tr("Action required:\n"
- " Could not remount the device, try to do it\n"
- " manually. If the iPod didn't restart, force\n"
- " a reset by pressing SELECT+MENU buttons\n"
- " for about 5 seconds. If the problem could\n"
- " not be solved then click 'Abort' to cancel."),
+ emit logItem(tr("Action required:\n\n"
+ "Could not remount the device, try to do it "
+ "manually. If the iPod didn't restart, force "
+ "a reset by pressing SELECT+MENU buttons "
+ "for about 5 seconds. If the problem could "
+ "not be solved then click 'Abort' to cancel."),
LOGWARNING);
actionShown = true;
}