sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Fix two typos: assoziated -> associated.
This commit is contained in:
Daniel Gultsch 2014-04-14 10:22:48 +02:00
parent 1e25b2aa5b 802c21a793
commit 9704bcf1c3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@ -21,7 +21,7 @@
<string name="participant">Participant</string> <string name="participant">Participant</string>
<string name="visitor">Visitor</string> <string name="visitor">Visitor</string>
<string name="enter_new_name">Enter a new name:</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="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="account_info">Server Info</string>
<string name="register_account">Register new account on server</string> <string name="register_account">Register new account on server</string>

2
src/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -518,7 +518,7 @@ public class ConversationFragment extends Fragment {
getActivity()); getActivity());
builder.setTitle("No openPGP key found"); builder.setTitle("No openPGP key found");
builder.setIconAttribute(android.R.attr.alertDialogIcon); 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.setNegativeButton("Cancel", null);
builder.setPositiveButton("Send plain text", builder.setPositiveButton("Send plain text",
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {