D19838: [powerdevil] Touch up messages/prompts
broulik added inline comments.
INLINE COMMENTS
> powerdevilcore.cpp:541
> msg = i18nc("Placeholder is device name",
> -"The battery in your mouse (\"%1\") is low, and
> the device may turn itself off at any time. "
> -"Please replace or charge the battery as soon as
> possible.", name);
> +"The battery in (\"%1\") is running low, and the
> device may turn off at any time. "
> +"Please recharge or replace the battery.", name);
Since you removed the separation between the three cases you might as well
unify the codebase into one. Now you have three separate identical strings.
Also, "The battery in (some device) is running low" with the parenthesis is a
bit awkward since now it's the sentence's subject.
> powerdevilcore.cpp:580
> emitRichNotification(QStringLiteral("lowbattery"), i18n("Battery Low
> (%1% Remaining)", currentPercent),
> - i18n("Your battery is low. If you need to
> continue using your computer, either plug in your computer, or shut it down
> and then change the battery."));
> + i18n("Battery running low - to continue using
> your computer, plug it in or shut it down and change the battery."));
> return true;
not a fan of that hyphen. It is in the heading, so just change the main text to
"To continue using your computer..."
> powerdevilcore.cpp:641
> i18n("AC Adapter Plugged In"),
> - i18n("All pending suspend actions have been
> canceled."));
> + i18n("The computer will no longer go to
> sleep."));
> } else {
Sounds like from now on it will never suspend anymore.
REPOSITORY
R122 Powerdevil
REVISION DETAIL
https://phabricator.kde.org/D19838
To: rooty, #vdg, #plasma, broulik, ngraham, filipf
Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai,
ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
rooty added inline comments. INLINE COMMENTS > rooty wrote in powerdevilcore.cpp:330 > Hmm sure Actually you're right, without "the profile" and "it" it sounds fancier haha REPOSITORY R122 Powerdevil BRANCH master REVISION DETAIL https://phabricator.kde.org/D19838 To: rooty, #vdg, #plasma, broulik, ngraham, filipf Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
This revision was automatically updated to reflect the committed changes. Closed by commit R122:22d725ca0361: [powerdevil] Touch up messages/prompts (authored by rooty). REPOSITORY R122 Powerdevil CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D19838?vs=54260=54261 REVISION DETAIL https://phabricator.kde.org/D19838 AFFECTED FILES daemon/powerdevilcore.cpp To: rooty, #vdg, #plasma, broulik, ngraham, filipf Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
rooty updated this revision to Diff 54260. rooty added a comment. "or because" REPOSITORY R122 Powerdevil CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D19838?vs=54168=54260 BRANCH master REVISION DETAIL https://phabricator.kde.org/D19838 AFFECTED FILES daemon/powerdevilcore.cpp To: rooty, #vdg, #plasma, broulik, ngraham, filipf Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
ngraham accepted this revision. ngraham added a comment. This revision is now accepted and ready to land. Awesome. Go ahead and make your proposed change if you'd like, then shipit! INLINE COMMENTS > rooty wrote in powerdevilcore.cpp:367 > "or because the action is not supported", "This is due to the action not > being supported" sounds too elaborate for my taste and I'd rather have a > disconnected clause here That was actually going to be my first suggestion. :) Go ahead and do that if you think it sounds better. > rooty wrote in powerdevilcore.cpp:541 > I thought about that, then realized that the heading says "Mouse" (Mouse > Battery Low) "Keyboard" etc. so it seems redundant too (to repeat it in the > body text) Ah, you're right! REPOSITORY R122 Powerdevil BRANCH master REVISION DETAIL https://phabricator.kde.org/D19838 To: rooty, #vdg, #plasma, broulik, ngraham, filipf Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
rooty updated this revision to Diff 54168. rooty added a comment. Activity... REPOSITORY R122 Powerdevil CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D19838?vs=54167=54168 BRANCH master REVISION DETAIL https://phabricator.kde.org/D19838 AFFECTED FILES daemon/powerdevilcore.cpp To: rooty, #vdg, #plasma, broulik, ngraham, filipf Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
rooty updated this revision to Diff 54167. rooty added a comment. Remove unnecessary comment REPOSITORY R122 Powerdevil CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D19838?vs=54166=54167 BRANCH master REVISION DETAIL https://phabricator.kde.org/D19838 AFFECTED FILES daemon/powerdevilcore.cpp To: rooty, #vdg, #plasma, broulik, ngraham, filipf Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
rooty updated this revision to Diff 54166. rooty added a comment. Missed one REPOSITORY R122 Powerdevil CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D19838?vs=54165=54166 BRANCH master REVISION DETAIL https://phabricator.kde.org/D19838 AFFECTED FILES daemon/powerdevilcore.cpp To: rooty, #vdg, #plasma, broulik, ngraham, filipf Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
rooty updated this revision to Diff 54165. rooty marked 9 inline comments as done. rooty added a comment. Implement inline comment suggestions REPOSITORY R122 Powerdevil CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D19838?vs=54137=54165 BRANCH master REVISION DETAIL https://phabricator.kde.org/D19838 AFFECTED FILES daemon/powerdevilcore.cpp To: rooty, #vdg, #plasma, broulik, ngraham, filipf Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
rooty marked 7 inline comments as done. rooty added inline comments. INLINE COMMENTS > ngraham wrote in powerdevilcore.cpp:330 > Remove "the profile" Hmm sure > ngraham wrote in powerdevilcore.cpp:367 > "or the action is not supported" -> "or the action not being supported" "or because the action is not supported", "This is due to the action not being supported" sounds too elaborate for my taste and I'd rather have a disconnected clause here > ngraham wrote in powerdevilcore.cpp:541 > Are we 100% sure that `name` will always be a good enough string that the > user will recognize it as their mouse? (not a rhetorical question, I really > am wondering :) ) > > Same for other instances below too. I thought about that, then realized that the heading says "Mouse" (Mouse Battery Low) "Keyboard" etc. so it seems redundant too (to repeat it in the body text) > ngraham wrote in powerdevilcore.cpp:607 > "go into" -> "enter" ? Better, yes. We could use just "enter hibernation" without mode too > ngraham wrote in powerdevilcore.cpp:612 > "go to sleep" is just fine here Not very fancy tho 藍 > ngraham wrote in powerdevilcore.cpp:643 > Not sure this comment is really necessary :) :) REPOSITORY R122 Powerdevil REVISION DETAIL https://phabricator.kde.org/D19838 To: rooty, #vdg, #plasma, broulik, ngraham, filipf Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
ngraham requested changes to this revision.
ngraham added a comment.
This revision now requires changes to proceed.
Mostly good, just a new nitpicks and suggestions:
INLINE COMMENTS
> powerdevilcore.cpp:256
> QString activity = m_activityConsumer->currentActivity();
> -qCDebug(POWERDEVIL) << "We are now into activity " << activity;
> +qCDebug(POWERDEVIL) << "We are now in activity " << activity; // into?
> direction?
> KConfigGroup activitiesConfig(m_profilesConfig, "Activities");
I'd say "using activity "
> powerdevilcore.cpp:330
> +emitNotification(QStringLiteral("powerdevilerror"), i18n("Profile
> \"%1\" has been selected, "
> + "but the profile does not exist.\nPlease check your
> PowerDevil configuration.",
> profileId));
Remove "the profile"
> powerdevilcore.cpp:367
> << actionName << "a non-existent action.
> This is usually due to an installation problem,"
> -" or to a configuration problem, or simply
> the action is not supported";
> +" a configuration problem, or the action is
> not supported";
> }
"or the action is not supported" -> "or the action not being supported"
> powerdevilcore.cpp:541
> msg = i18nc("Placeholder is device name",
> -"The battery in your mouse (\"%1\") is low, and
> the device may turn itself off at any time. "
> -"Please replace or charge the battery as soon as
> possible.", name);
> +"The battery in (\"%1\") is running low, and the
> device may turn off at any time. "
> +"Please recharge or replace the battery.", name);
Are we 100% sure that `name` will always be a good enough string that the user
will recognize it as their mouse? (not a rhetorical question, I really am
wondering :) )
Same for other instances below too.
> powerdevilcore.cpp:607
> case PowerDevil::BundledActions::SuspendSession::ToDiskMode:
> -m_criticalBatteryNotification->setText(i18n("Your battery level is
> critical, the computer will be hibernated in 60 seconds."));
> +m_criticalBatteryNotification->setText(i18n("Battery level critical.
> Your computer will go into hibernation mode in 60 seconds."));
> m_criticalBatteryNotification->setActions(actions);
"go into" -> "enter" ?
> powerdevilcore.cpp:612
> case PowerDevil::BundledActions::SuspendSession::ToRamMode:
> -m_criticalBatteryNotification->setText(i18n("Your battery level is
> critical, the computer will be suspended in 60 seconds."));
> +m_criticalBatteryNotification->setText(i18n("Battery level critical.
> Your computer will go to sleep in 60 seconds.")); // go into sleep mode?
> m_criticalBatteryNotification->setActions(actions);
"go to sleep" is just fine here
> powerdevilcore.cpp:643
> } else {
> -emitRichNotification(QStringLiteral("pluggedin"), i18n("Running
> on AC power"), i18n("The power adaptor has been plugged in."));
> +emitRichNotification(QStringLiteral("pluggedin"), i18n("Running
> on AC power"), i18n("The power adapter has been plugged in.")); //uniform
> spelling throughout (either -er or -or, not both)
> }
Not sure this comment is really necessary :)
REPOSITORY
R122 Powerdevil
REVISION DETAIL
https://phabricator.kde.org/D19838
To: rooty, #vdg, #plasma, broulik, ngraham, filipf
Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai,
ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
rooty updated this revision to Diff 54137. rooty added a comment. Bring back the posessive pronouns REPOSITORY R122 Powerdevil CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D19838?vs=54135=54137 BRANCH master REVISION DETAIL https://phabricator.kde.org/D19838 AFFECTED FILES daemon/powerdevilcore.cpp To: rooty, #vdg, #plasma, broulik, ngraham, filipf Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
rooty updated this revision to Diff 54135. rooty added a comment. Drop unnecessary pronouns REPOSITORY R122 Powerdevil CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D19838?vs=54132=54135 BRANCH master REVISION DETAIL https://phabricator.kde.org/D19838 AFFECTED FILES daemon/powerdevilcore.cpp To: rooty, #vdg, #plasma, broulik, ngraham, filipf Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
rooty updated this revision to Diff 54132. rooty added a comment. Touch up some more REPOSITORY R122 Powerdevil CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D19838?vs=54129=54132 BRANCH master REVISION DETAIL https://phabricator.kde.org/D19838 AFFECTED FILES daemon/powerdevilcore.cpp To: rooty, #vdg, #plasma, broulik, ngraham, filipf Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
rooty updated this revision to Diff 54129. rooty added a comment. Add the verb run (because... why not) REPOSITORY R122 Powerdevil CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D19838?vs=54123=54129 BRANCH master REVISION DETAIL https://phabricator.kde.org/D19838 AFFECTED FILES daemon/powerdevilcore.cpp To: rooty, #vdg, #plasma, broulik, ngraham, filipf Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
rooty added a comment. > Looks good. I'd avoid using pronouns, I think it would sound better and whose else's is the battery if not yours? Haha yeah. Granted, even these pronouns are wy better than the prompt saying "I am going to sleep." Outright creepy :D REPOSITORY R122 Powerdevil REVISION DETAIL https://phabricator.kde.org/D19838 To: rooty, #vdg, #plasma, broulik, ngraham, filipf Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
filipf added a comment. Looks good. I'd avoid using pronouns, I think it would sound better and whose else's is the battery if not yours? Don't have a better idea for planned sleep, maybe just planned sleep actions? REPOSITORY R122 Powerdevil REVISION DETAIL https://phabricator.kde.org/D19838 To: rooty, #vdg, #plasma, broulik, ngraham, filipf Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
rooty updated this revision to Diff 54123. rooty added a comment. Make sleep prompt more natural-sounding REPOSITORY R122 Powerdevil CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D19838?vs=54121=54123 BRANCH master REVISION DETAIL https://phabricator.kde.org/D19838 AFFECTED FILES daemon/powerdevilcore.cpp To: rooty, #vdg, #plasma, broulik, ngraham, filipf Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
rooty updated this revision to Diff 54121. rooty added a comment. Fix "be go" REPOSITORY R122 Powerdevil CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D19838?vs=54118=54121 BRANCH master REVISION DETAIL https://phabricator.kde.org/D19838 AFFECTED FILES daemon/powerdevilcore.cpp To: rooty, #vdg, #plasma, broulik, ngraham, filipf Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
rooty added a comment. I'm not sold on the use of pronouns here, we could actually do without them If we agree to keep the pronouns, I'm not going to object but... we can sound both non-technical and professional at the same time :D P.S. I could use input on "All planned sleep", it's less technical but it's plain weird :D REPOSITORY R122 Powerdevil REVISION DETAIL https://phabricator.kde.org/D19838 To: rooty, #vdg, #plasma, broulik, ngraham, filipf Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
rooty updated this revision to Diff 54118. rooty added a comment. Remove "as soon as possible" (less anxiety-inducing) REPOSITORY R122 Powerdevil CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D19838?vs=54116=54118 BRANCH master REVISION DETAIL https://phabricator.kde.org/D19838 AFFECTED FILES daemon/powerdevilcore.cpp To: rooty Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
D19838: [powerdevil] Touch up messages/prompts
rooty created this revision. Herald added a project: Plasma. Herald added a subscriber: plasma-devel. rooty requested review of this revision. REPOSITORY R122 Powerdevil BRANCH master REVISION DETAIL https://phabricator.kde.org/D19838 AFFECTED FILES daemon/powerdevilcore.cpp To: rooty Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
