From 802c21a7937e96f48eea27eb5f662816bcaf86ec Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Apr 2014 02:22:03 +0200 Subject: Fix two typos: assoziated -> associated. --- res/values/strings.xml | 2 +- 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 20b2c60a..209f484c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -21,7 +21,7 @@ Participant Visitor Enter a new name: - Do you want to delete %s from your roster. The conversation assoziated with this account will not be removed. + Do you want to delete %s from your roster. The conversation associated with this account will not be removed. The server %s presented you with an untrusted, possible self signed, certificate. Server Info Register new account on server diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java index 61843b82..06ed41e5 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() { -- cgit v1.2.3