diff options
-rw-r--r-- | CHANGELOG.md | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/MimeUtils.java | 6 | ||||
-rw-r--r-- | src/main/res/values/strings.xml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bf71abf9..29509ca8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ * make PEP avatars public to play nice with Prosody 0.11 * fixed re-sending failed files in group chats * OMEMO stability improvements -* context menu wen long pressing avatar in 1:1 chat +* context menu when long pressing avatar in 1:1 chat * synchronize group chat join/leaves across multiple clients * fixed sending PGP encrypted messages from quick reply * bug fixes diff --git a/src/main/java/de/pixart/messenger/utils/MimeUtils.java b/src/main/java/de/pixart/messenger/utils/MimeUtils.java index 0babfdf9d..d8b3f172c 100644 --- a/src/main/java/de/pixart/messenger/utils/MimeUtils.java +++ b/src/main/java/de/pixart/messenger/utils/MimeUtils.java @@ -478,7 +478,7 @@ public final class MimeUtils { * Returns the MIME type for the given extension. * * @param extension A file extension without the leading '.' - * @return The MIME type for the given extension or null iff there is none. + * @return The MIME type for the given extension or null if there is none. */ public static String guessMimeTypeFromExtension(String extension) { if (extension == null || extension.isEmpty()) { @@ -491,7 +491,7 @@ public final class MimeUtils { * Returns true if the given extension has a registered MIME type. * * @param extension A file extension without the leading '.' - * @return True iff there is an extension entry in the map. + * @return True if there is an extension entry in the map. */ public static boolean hasExtension(String extension) { if (extension == null || extension.isEmpty()) { @@ -506,7 +506,7 @@ public final class MimeUtils { * common extension for the given MIME type. * * @param mimeType A MIME type (i.e. text/plain) - * @return The extension for the given MIME type or null iff there is none. + * @return The extension for the given MIME type or null if there is none. */ public static String guessExtensionFromMimeType(String mimeType) { if (mimeType == null || mimeType.isEmpty()) { diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 1fcd8c745..611334782 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -842,7 +842,7 @@ <string name="device_does_not_support_unknown_source_op">Your device does not support allowing app installs from unknon sources.</string> <string name="reject_request">Reject request</string> <string name="error_message_copied_to_clipboard">Copied error message to clipboard</string> - <string name="pref_screen_security_summary">Treat the content as secure and preventing it from appearing in screenshots.</string> + <string name="pref_screen_security_summary">Treat the content as secure and prevent it from appearing in screenshots.</string> <string name="pref_screen_security">Forbid screenshots</string> <string name="omemo_decryption_failed">Failed to decrypt OMEMO message.</string> <string name="install_orbot">Install Orbot</string> |