On 09/02/2018 08:15 PM, Joonas Kylmälä wrote: > Hi, > > I can test it and push after the upstream merges. All the (non-merge) > commits to this point have contained the Signed-off-by line but it seems > like Replicant project has not formally established a meaning for it? I > have taken it's meaning as that one certifies it is originally created > by the patch sender and is compatible with the license. So just not to > break the pattern (yeah silly :D) and as a note that you have created > the patch could you add it?
Done! Please, find it attached. > > Joonas > > Fil: >> Hi, >> >> I finally found 5 minutes to correct the infamous typo mentioned in >> issue #1853[1] >> Thanks to Kurtis for doing the biggest job of researching the exact >> string inside the tree. >> Please find the related patch attached to this email. >> >> Can anybody push it and confirm? >> >> Thanks, >> >> Happy hacking, >> >> Fil >> >> [1] https://redmine.replicant.us/issues/1853 >> >> >> >> _______________________________________________ >> Replicant mailing list >> Replicant@osuosl.org >> https://lists.osuosl.org/mailman/listinfo/replicant >>
From e17c05cfe9665ff1ec9dffbf46f90be18e44fa3d Mon Sep 17 00:00:00 2001
From: Fil Bergamo <fil.berg...@riseup.net>
Date: Sun, 2 Sep 2018 16:44:44 +0000
Subject: [PATCH] fix #1853 "Ecryption" typo in Settings App
Signed-off-by: Fil Bergamo <fil.berg...@riseup.net>
---
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 Replicant@osuosl.org https://lists.osuosl.org/mailman/listinfo/replicant
