more consistency in descriptions relating to different k-9 packages

metadata/apps.droidnotify.txt

@@ -9,7 +9,7 @@ Auto Name:Notify Lite
 Summary:Notification management tool
 Description:
 This application will display a popup window for missed calls, text messages, 
-calendar events and emails (via the official K-9 app only, not ours). 
+calendar events and emails via [[com.fsck.k9]].
 It is extremely customizable with many options to suit your needs and style. 
 Extra themes are available as apks from the website.
 

metadata/com.fsck.k9.txt

@@ -8,19 +8,22 @@ Name:K-9 Mail (dev)
 Auto Name:K-9 Mail
 Summary:Full-featured email client
 Description:
-This is the K-9 mail development team's build. For a better update experience
+This is the K-9 Mail development team's build. For a better update experience
 via F-Droid, we recommend switching to the F-Droid build: [[org.fdroid.k9]]. 
 You can install it alongside this version, and easily migrate your accounts 
 and settings.
 
-E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP.  Packed
+E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP.
-with features and highly configurable.  Import and export of settings is
+Can do encryption if [[org.thialfihar.android.apg]] is installed.
-possible so that all that's required to setup the app after a wipe is to enter
+Settings and account configurations can be exported so that they can be imported
-the account passwords.
+easily if you are switching packages/signatures: a file manager will need to be 
+already installed to achieve this.
 
-If you would like to contribute financially to k9mail, please consider
+If you would like to contribute financially to k9mail, consider 
-donating to the local SPCA (Societies for the prevention of cruelty to
+donating to the local SPCA (Societies for the prevention of cruelty to animals).
-animals).
+
+[https://github.com/k9mail/k-9/wiki/ReleaseNotes Major version notes] ; 
+[https://github.com/k9mail/k-9/raw/master/res/raw/changelog.xml Changelog]
 .
 
 Repo Type:git

metadata/de.cketti.dashclock.k9.txt

@@ -4,15 +4,17 @@ Web Site:
 Source Code:https://github.com/cketti/DashClock_K-9
 Issue Tracker:https://github.com/cketti/DashClock_K-9/issues
 
-Name:DashClock: K-9 (dev) Unread 
+Name:DashClock: K-9 Mail (dev)
 Auto Name:K-9 Mail DashClock Extension
 Summary:Display email info on the lockscreen
 Description:
-'''Only works with the official K-9 package''', [[com.fsck.k9]].
 [[net.nurik.roman.dashclock]] extension that displays the number of
-unread emails from [[com.fsck.k9]].
+unread emails from [[com.fsck.k9]], from your choice of accounts.
-Marking messages as read in K-9 only reliably updates the unread count 
+
-for v4.4xx+ of K-9.
+'''Only works with the K-9 developer's package'''
+
+Marking messages as read in K-9 won't reliably update the unread count 
+if you are using v4.201 of K-9 — current versions of K-9 should work fine.
 .
 
 Repo Type:git

metadata/org.fdroid.dashclock.k9.txt

@@ -4,16 +4,14 @@ Web Site:
 Source Code:https://github.com/cketti/DashClock_K-9
 Issue Tracker:https://github.com/cketti/DashClock_K-9/issues
 
-Name:DashClock: K-9 Unread Count
+Name:DashClock: K-9 Mail~
 Auto Name:K-9 Mail DashClock Extension
 Summary:Display email info on the lockscreen
 Description:
 [[net.nurik.roman.dashclock]] extension that displays the number of
 unread emails from [[org.fdroid.k9]], from your choice of accounts.
 
-'''Only works with our K-9 package. The package name for this has
+'''Only works with F-Droid's K-9 package'''
-been changed, so you can install the official build too and have it work 
-with the official build of K-9.'''
 
 Marking messages as read in K-9 won't reliably update the unread count 
 if you are using v4.201 of K-9 — current versions of K-9 should work fine.

metadata/org.fdroid.k9.txt

@@ -6,25 +6,21 @@ Issue Tracker:http://code.google.com/p/k9mail/issues/list
 
 Auto Name:K-9 Mail
 Name:K-9 Mail~
-Summary:Email client
+Summary:Full-featured email client
 Description:
-'''N.B''' This package has a different name to the developer builds of K-9 — 
+This package only contains versions built from source by F-Droid.
-therefore, they could be installed alongside each other.
+There should be very little difference with the developer package.
 However, be warned that apps found elsewhere that integrate with K-9 may not 
-work with our versions. 
+work with these versions. 
-The '~' has been appended to the app name for differentiation.
 
 E-mail client supporting multiple accounts, POP3, IMAP and Push IMAP.
-Can do encryption if [[org.thialfihar.android.apg]] is installed; stay tuned: 
+Can do encryption if [[org.thialfihar.android.apg]] is installed.
-more GPG clients are coming soon.
-
 Settings and account configurations can be exported so that they can be imported
 easily if you are switching packages/signatures: a file manager will need to be 
 already installed to achieve this.
 
 If you would like to contribute financially to k9mail, consider
-donating to the local SPCA
+donating to the local SPCA (societies for the prevention of cruelty to animals).
-(societies for the prevention of cruelty to animals).
 
 [https://github.com/k9mail/k-9/wiki/ReleaseNotes Major version notes] ; 
 [https://github.com/k9mail/k-9/raw/master/res/raw/changelog.xml Changelog]

metadata/org.thialfihar.android.apg.txt

@@ -8,9 +8,11 @@ FlattrID:164412
 Auto Name:APG
 Summary:Encrypt email and files
 Description:
+'''The *-fdroid build only works with [[org.fdroid.k9]]. Other versions work
+with [[com.fsck.k9]], which are the K-9 developers' builds.'''
+
 APG is a port of OpenPGP for Android. Use it to encrypt and decrypt files, 
-and in conjunction with [[org.fdroid.k9]] or [[com.fsck.k9]], having chosen 
+and in conjunction with K-9 Mail, to seamlessly add support for encrypting and 
-the appropriate version below, to seamlessly add support for encrypting and 
 decrypting emails, as well as adding and verifying digital signatures.
 .
 

metadata/se.erikofsweden.findmyphone.txt

@@ -7,8 +7,8 @@ Issue Tracker:
 Auto Name:FindMyPhone
 Summary:Helps you find a mislaid phone
 Description:
-'''Only the *-fdroid build works with our K-9 package. Other versions work
+'''The *-fdroid build only works with [[org.fdroid.k9]]. Other versions work
-with the official K-9 package'''
+with [[com.fsck.k9]], which are the K-9 developers' builds.'''
 
 If you lose your phone having this app installed can help you find it. 
 Upon receipt of an SMS or email, FindMyPhone gets your location and 
@@ -18,8 +18,7 @@ accurate location to be obtained.
 The app will fall back to using Google's network location API, but we recommend
 you disable that nonfree software anyway. 
 Currently supports activating by sending a secret
-message via SMS or an email to [[org.fdroid.k9]] (or the official K-9 build,
+message via SMS or an email to K-9 Mail.
-depending on the version you install). 
 The resulting location is sent via SMS.
 
 Status: Beta.