diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-04-14 10:22:48 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-04-14 10:22:48 +0200 |
| commit | 9704bcf1c3574ac8eb7fd1e0185e08d8870953fd (patch) | |
| tree | 052a87695489cfe46c64ca4f985dca32434a67b4 | |
| parent | 1e25b2aa5b97a8af96dd1690df2f19d03002750d (diff) | |
| parent | 802c21a7937e96f48eea27eb5f662816bcaf86ec (diff) | |
Merge pull request #58 from jelmer/fix-typo-assoziated
Fix two typos: assoziated -> associated.
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/ui/ConversationFragment.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 20b2c60ad..209f484cd 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -21,7 +21,7 @@ <string name="participant">Participant</string> <string name="visitor">Visitor</string> <string name="enter_new_name">Enter a new name:</string> - <string name="remove_contact_text">Do you want to delete %s from your roster. The conversation assoziated with this account will not be removed.</string> + <string name="remove_contact_text">Do you want to delete %s from your roster. The conversation associated with this account will not be removed.</string> <string name="untrusted_cert_hint">The server %s presented you with an untrusted, possible self signed, certificate.</string> <string name="account_info">Server Info</string> <string name="register_account">Register new account on server</string> diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java index 61843b820..06ed41e5c 100644 --- a/src/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/eu/siacs/conversations/ui/ConversationFragment.java @@ -518,7 +518,7 @@ public class ConversationFragment extends Fragment { getActivity()); builder.setTitle("No openPGP key found"); builder.setIconAttribute(android.R.attr.alertDialogIcon); - builder.setMessage("There is no openPGP key assoziated with this contact"); + builder.setMessage("There is no openPGP key associated with this contact"); builder.setNegativeButton("Cancel", null); builder.setPositiveButton("Send plain text", new DialogInterface.OnClickListener() { |