-------- Forwarded Message -------- Subject: Re: [Replicant] [PATCH] fix #1853 "Ecryption" typo in Settings App Date: Sun, 25 Nov 2018 12:00:14 +0100 From: Fil <[email protected]> To: Denis 'GNUtoo' Carikli <[email protected]> Hello all, as I promised to Joonas, here's a revised patch bearing the commit message that Denis suggested. Joonas, please let me know if changing the message by hand worked and you were able to push it. Otherwise, I can redo the patch from scratch. Cheers, everybody! Fil On 10/09/2018 12:10 AM, Denis 'GNUtoo' Carikli wrote: > On Mon, 08 Oct 2018 13:55:00 +0000 > Joonas Kylmälä <[email protected]> wrote: > >> Hi, > Hi, > >> Denis 'GNUtoo' Carikli: >>> On Sun, 2 Sep 2018 21:17:21 +0200 >>> Fil <[email protected]> wrote: >>> >>>> From e17c05cfe9665ff1ec9dffbf46f90be18e44fa3d Mon Sep 17 00:00:00 >>>> 2001 From: Fil Bergamo <[email protected]> >>>> Date: Sun, 2 Sep 2018 16:44:44 +0000 >>>> Subject: [PATCH] fix #1853 "Ecryption" typo in Settings App >>> Maybe mention the fact that the #1853 is a bug. >>> Something like that would be better: >>>> fix bug #1853 ("Ecryption" typo in Settings App) >> I researched online this topic a bit and maybe providing ticket ID in >> commit message is not so good idea: >> <https://hackernoon.com/on-git-commit-messages-and-issue-trackers-f700f3cbb5a7?gi=1821111258f>. >> The article mentions that issue tracker could change in future >> therefore making those IDs in Git meaningless. As we don't publish >> and review our patches in the issue tracker it means that if one >> wants to sent patch to this mailing list they must also mention in a >> cover letter / patch which issue the patch addresses but we would >> have to do it anyways since one needs to tell also to what repository >> the patch is for. So I don't think it is a big deal to drop the >> ticket ID from the commit message. > I'm aware of that. > > Different projects probably have different views on the topic. It also > depends a lot on how such thing is used or abused: Adding a pointer to > a bugreport should not be a substitute for writing good enough commit > messages. > > For instance the Linux project sometimes has some pointers to > the associated bug report: >> commit 7ce5c8cd753f9afa8e79e9ec40351998e354f239 > [...] >> libata: mask swap internal and hardware tag >> > [commit message] >> Fixes: 28361c403683 ("libata: add extra internal command") >> Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=201151 >> Cc: [email protected] >> Reported-by: Paul Sbarra <[email protected]> >> Tested-by: Paul Sbarra <[email protected]> >> Signed-off-by: Jens Axboe <[email protected]> > Here adding a link to the bugreport might be interesting, as we know > that this was discovered through a bugreport and we might want to look > how the bug was discovered and fixed. > >> What I suggest for the commit message is "Fix "Ecryption" typo". > As the patch is simple enough, merging it with the above commit > message/summary and then closing the bugreport with a pointer to the > fix also works for me. > > Acked-by: Denis 'GNUtoo' Carikli <[email protected]> > > Denis.
From e17c05cfe9665ff1ec9dffbf46f90be18e44fa3d Mon Sep 17 00:00:00 2001 From: Fil Bergamo <[email protected]> Date: Sun, 2 Sep 2018 16:44:44 +0000 Subject: [PATCH] "Fix "Ecryption" typo". Signed-off-by: Fil Bergamo <[email protected]> --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 6a8993266..f0c3449e1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -832,7 +832,7 @@ media, and other files. After you encrypt your phone, assuming you\u2019ve set up a screen lock (that is, a pattern or numeric PIN or password), you\u2019ll need to unlock the screen to decrypt the phone every time you power it on. The only other way to decrypt is to perform a factory - data reset, erasing all your data.\n\nEcryption can fail sometimes, so please create a backup of + data reset, erasing all your data.\n\nEncryption can fail sometimes, so please create a backup of your data before you proceed!\n\nEncryption takes an hour or more. You must start with a charged battery and keep your phone plugged in throughout the process. If you interrupt it, you\u2019ll lose some or all of your data.</string> -- 2.11.0
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Replicant mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/replicant
