diff options
| author | Christian S <christian@pix-art.de> | 2015-08-26 20:03:02 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-08-26 20:03:02 +0200 |
| commit | 85e35b3a75804203f226219abcfc86582892fb30 (patch) | |
| tree | ceb391c2b3f7cf098c0dff988e02dd4be941ac5d /src/main/res/values-ko | |
| parent | dfe58eaf341efe988f80faf5dc888900d28aa37a (diff) | |
| parent | 0f0054ef8629a285726a9190a297a43f91494af4 (diff) | |
Merge branch 'siacs-master' into development
Diffstat (limited to 'src/main/res/values-ko')
| -rw-r--r-- | src/main/res/values-ko/strings.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml index 5c51b293a..40ec19098 100644 --- a/src/main/res/values-ko/strings.xml +++ b/src/main/res/values-ko/strings.xml @@ -76,7 +76,6 @@ <string name="delete_messages">메세지 삭제 </string> <string name="also_end_conversation">나중에 이 대화 끝내기 </string> <string name="choose_presence">연락할 프레즌스 선택 </string> - <string name="send_plain_text_message">평문 메세지 전송 </string> <string name="send_otr_message">OTR 암호화된 메세지 전송 </string> <string name="send_pgp_message">OpenPGP 암호화된 메세지 전송 </string> <string name="your_nick_has_been_changed">닉네임이 변경되었습니다 </string> @@ -147,7 +146,6 @@ <string name="account_status_regis_not_sup">서버가 등록을 지원하지 않습니다</string> <string name="account_status_security_error">보안 오류 </string> <string name="account_status_incompatible_server">호환되지 않는 서버 </string> - <string name="encryption_choice_none">평문 </string> <string name="encryption_choice_otr">OTR</string> <string name="encryption_choice_pgp">OpenPGP </string> <string name="mgmt_account_edit">계정 편집 </string> |