aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-05-04 10:47:00 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-05-04 10:47:00 +0200
commitb334582eff72bbe531b68c70e69b658d5e4de280 (patch)
tree745a3bd5b59c4777892f2061434859b517fca306
parentdee7fd3eabcb22f4ef1ecbde1ab544da0ed55b49 (diff)
parent7047d68165db137cb6acdf084c218a77e17e8e80 (diff)
Merge pull request #1827 from ka7/spelling_fix_no_translations
spelling fixes
-rw-r--r--CHANGELOG.md6
-rw-r--r--README.md2
-rw-r--r--src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java2
-rw-r--r--src/main/java/eu/siacs/conversations/services/XmppConnectionService.java2
-rw-r--r--src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java2
-rw-r--r--src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java4
6 files changed, 9 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85dd1f3b..da54f8e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -171,7 +171,7 @@
####Version 1.4.0
* send button turns into quick action button to offer faster access to take photo, send location or record audio
-* visually seperate merged messages
+* visually separate merged messages
* faster reconnects of failed accounts after network switches
* r/o vcard avatars for contacts
* various bug fixes
@@ -264,7 +264,7 @@
* Download HTTP images
* Show avatars in MUC tiles
* Disabled SSLv3
-* Performance improvments
+* Performance improvements
* bug fixes
####Version 0.7.3
@@ -313,7 +313,7 @@
####Version 0.4
* OTR file encryption
* keep OTR messages and files on device until both parties or online at the same time
-* XEP-0333. Mark wether the other party has read your messages
+* XEP-0333. Mark whether the other party has read your messages
* Delayed messages are now tagged properly
* Share images from the Gallery
* Infinit history scrolling
diff --git a/README.md b/README.md
index 9683b6fe..b288e676 100644
--- a/README.md
+++ b/README.md
@@ -282,7 +282,7 @@ manage accounts and choose renew PGP announcement from the contextual menu.
#### How does the encryption for conferences work?
-For conferences only OMEMO and OpenPGP are suppored as encryption method. (OTR
+For conferences only OMEMO and OpenPGP are supported as encryption method. (OTR
does not work with multiple participants).
##### OMEMO
diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
index a24e4530..86d23761 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
@@ -350,7 +350,7 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
public void registerDevices(final Jid jid, @NonNull final Set<Integer> deviceIds) {
if (jid.toBareJid().equals(account.getJid().toBareJid())) {
if (!deviceIds.isEmpty()) {
- Log.d(Config.LOGTAG, getLogprefix(account) + "Received non-empty own device list. Resetting publish attemps and pepBroken status.");
+ Log.d(Config.LOGTAG, getLogprefix(account) + "Received non-empty own device list. Resetting publish attempts and pepBroken status.");
pepBroken = false;
numPublishTriesOnEmptyPep = 0;
}
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index ec4b0463..5fd8a053 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -2528,7 +2528,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
callback.success(avatar);
}
Log.d(Config.LOGTAG, account.getJid().toBareJid()
- + ": succesfuly fetched pep avatar for " + avatar.owner);
+ + ": successfully fetched pep avatar for " + avatar.owner);
return;
}
} else {
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 4dc5492e..c1e26a70 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -485,7 +485,7 @@ public class XmppConnection implements Runnable {
if ("true".equals(enabled.getAttribute("resume"))) {
this.streamId = enabled.getAttribute("id");
Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
- + ": stream managment(" + smVersion
+ + ": stream management(" + smVersion
+ ") enabled (resumable)");
} else {
Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index beed92fa..c9ee6bdc 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -266,7 +266,7 @@ public class JingleConnection implements Transferable {
@Override
public void established() {
Log.d(Config.LOGTAG,
- "succesfully connected to our own primary candidate");
+ "successfully connected to our own primary candidate");
mergeCandidate(candidate);
sendInitRequest();
}
@@ -594,7 +594,7 @@ public class JingleConnection implements Transferable {
this.connect();
} else {
Log.d(Config.LOGTAG,
- "ignoring because file is already in transmission or we havent sent our candidate yet");
+ "ignoring because file is already in transmission or we haven't sent our candidate yet");
}
return true;
} else {