Merge pull request #58 from jelmer/fix-typo-assoziated

Daniel Gultsch created 12 years ago

Fix two typos: assoziated -> associated.

Change summary

res/values/strings.xml                                  | 2 +-
src/eu/siacs/conversations/ui/ConversationFragment.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

Detailed changes

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>

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() {