Skip to content

Commit 028f5d9

Browse files
author
DrKLO
committed
Bug fixes, locale update
1 parent 901655c commit 028f5d9

3 files changed

Lines changed: 63 additions & 63 deletions

File tree

‎TMessagesProj/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ android {
8282
defaultConfig {
8383
minSdkVersion 8
8484
targetSdkVersion 22
85-
versionCode 466
85+
versionCode 467
8686
versionName "2.6.0"
8787
}
8888
}

‎TMessagesProj/src/main/java/org/telegram/ui/Adapters/MentionsAdapter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public int compare(TLRPC.User lhs, TLRPC.User rhs) {
111111
int lhsNum = users.indexOf(lhs.id);
112112
int rhsNum = users.indexOf(rhs.id);
113113
if (lhsNum != -1 && rhsNum != -1) {
114-
return Integer.compare(lhsNum, rhsNum);
114+
return lhsNum < rhsNum ? -1 : (lhsNum == rhsNum ? 0 : 1);
115115
} else if (lhsNum != -1 && rhsNum == -1) {
116116
return -1;
117117
} else if (lhsNum == -1 && rhsNum != -1) {

‎TMessagesProj/src/main/res/values-ko/strings.xml‎

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -298,10 +298,10 @@
298298
<string name="ChangePhoneHelp">인증코드 메시지를 새 번호로 전송하겠습니다.</string>
299299
<string name="ChangePhoneNumberOccupied">그 번호는 이미 텔레그램 계정에 연결되어 있습니다. 새 번호로 이동하기 전에 %1$s 계정에서 탈퇴해 주세요.</string>
300300
<string name="NotificationsOther">기타</string>
301-
<string name="NotificationsDisabled">끄기</string>
302-
<string name="VibrationDisabled">끄기</string>
303-
<string name="LedDisabled">끄기</string>
304-
<string name="RepeatDisabled">끄기</string>
301+
<string name="NotificationsDisabled">비활성화됨</string>
302+
<string name="VibrationDisabled">비활성화됨</string>
303+
<string name="LedDisabled">비활성화됨</string>
304+
<string name="RepeatDisabled">끔</string>
305305
<!--passcode view-->
306306
<string name="Passcode">잠금번호</string>
307307
<string name="ChangePasscode">잠금번호 변경</string>
@@ -360,9 +360,9 @@
360360
<string name="Grain">그레인</string>
361361
<string name="Sharpen">선명</string>
362362
<string name="Blur">흐림</string>
363-
<string name="BlurOff">Off</string>
364-
<string name="BlurLinear">Linear</string>
365-
<string name="BlurRadial">Radial</string>
363+
<string name="BlurOff">끔</string>
364+
<string name="BlurLinear">선형</string>
365+
<string name="BlurRadial">방사형</string>
366366
<string name="AreYouSureDeletePhoto">이 사진을 삭제하시겠습니까?</string>
367367
<string name="AreYouSureDeleteVideo">이 동영상을 삭제하시겠습니까?</string>
368368
<string name="DiscardChanges">변경을 취소하시겠습니까?</string>
@@ -616,60 +616,60 @@
616616
<string name="Users_many">%1$d명의 대화상대</string>
617617
<string name="Users_other">%1$d명의 대화상대</string>
618618
<!--forwarded messages-->
619-
<string name="ForwardedMessage_zero">%1$d forwarded messages</string>
620-
<string name="ForwardedMessage_one">Forwarded message</string>
621-
<string name="ForwardedMessage_two">%1$d forwarded messages</string>
622-
<string name="ForwardedMessage_few">%1$d forwarded messages</string>
623-
<string name="ForwardedMessage_many">%1$d forwarded messages</string>
624-
<string name="ForwardedMessage_other">%1$d forwarded messages</string>
625-
<string name="ForwardedFile_zero">%1$d forwarded files</string>
626-
<string name="ForwardedFile_one">Forwarded file</string>
627-
<string name="ForwardedFile_two">%1$d forwarded files</string>
628-
<string name="ForwardedFile_few">%1$d forwarded files</string>
629-
<string name="ForwardedFile_many">%1$d forwarded files</string>
630-
<string name="ForwardedFile_other">%1$d forwarded files</string>
631-
<string name="ForwardedPhoto_zero">%1$d forwarded photos</string>
632-
<string name="ForwardedPhoto_one">Forwarded photo</string>
633-
<string name="ForwardedPhoto_two">%1$d forwarded photos</string>
634-
<string name="ForwardedPhoto_few">%1$d forwarded photos</string>
635-
<string name="ForwardedPhoto_many">%1$d forwarded photos</string>
636-
<string name="ForwardedPhoto_other">%1$d forwarded photos</string>
637-
<string name="ForwardedVideo_zero">%1$d forwarded videos</string>
638-
<string name="ForwardedVideo_one">Forwarded video</string>
639-
<string name="ForwardedVideo_two">%1$d forwarded videos</string>
640-
<string name="ForwardedVideo_few">%1$d forwarded videos</string>
641-
<string name="ForwardedVideo_many">%1$d forwarded videos</string>
642-
<string name="ForwardedVideo_other">%1$d forwarded videos</string>
643-
<string name="ForwardedAudio_zero">%1$d forwarded audios</string>
644-
<string name="ForwardedAudio_one">Forwarded audio</string>
645-
<string name="ForwardedAudio_two">%1$d forwarded audios</string>
646-
<string name="ForwardedAudio_few">%1$d forwarded audios</string>
647-
<string name="ForwardedAudio_many">%1$d forwarded audios</string>
648-
<string name="ForwardedAudio_other">%1$d forwarded audios</string>
649-
<string name="ForwardedLocation_zero">%1$d forwarded locations</string>
650-
<string name="ForwardedLocation_one">Forwarded location</string>
651-
<string name="ForwardedLocation_two">%1$d forwarded locations</string>
652-
<string name="ForwardedLocation_few">%1$d forwarded locations</string>
653-
<string name="ForwardedLocation_many">%1$d forwarded locations</string>
654-
<string name="ForwardedLocation_other">%1$d forwarded locations</string>
655-
<string name="ForwardedContact_zero">%1$d forwarded contacts</string>
656-
<string name="ForwardedContact_one">Forwarded contact</string>
657-
<string name="ForwardedContact_two">%1$d forwarded contacts</string>
658-
<string name="ForwardedContact_few">%1$d forwarded contacts</string>
659-
<string name="ForwardedContact_many">%1$d forwarded contacts</string>
660-
<string name="ForwardedContact_other">%1$d forwarded contacts</string>
661-
<string name="ForwardedSticker_zero">%1$d forwarded stickers</string>
662-
<string name="ForwardedSticker_one">Forwarded sticker</string>
663-
<string name="ForwardedSticker_two">%1$d forwarded stickers</string>
664-
<string name="ForwardedSticker_few">%1$d forwarded stickers</string>
665-
<string name="ForwardedSticker_many">%1$d forwarded stickers</string>
666-
<string name="ForwardedSticker_other">%1$d forwarded stickers</string>
667-
<string name="AndOther_zero">and %1$d others</string>
668-
<string name="AndOther_one">and %1$d other</string>
669-
<string name="AndOther_two">and %1$d others</string>
670-
<string name="AndOther_few">and %1$d others</string>
671-
<string name="AndOther_many">and %1$d others</string>
672-
<string name="AndOther_other">and %1$d others</string>
619+
<string name="ForwardedMessage_zero">%1$d 개의 전달된 메시지</string>
620+
<string name="ForwardedMessage_one">전달된 메시지</string>
621+
<string name="ForwardedMessage_two">%1$d 개의 전달된 메시지</string>
622+
<string name="ForwardedMessage_few">%1$d 개의 전달된 메시지</string>
623+
<string name="ForwardedMessage_many">%1$d 개의 전달된 메시지</string>
624+
<string name="ForwardedMessage_other">%1$d 개의 전달된 메시지</string>
625+
<string name="ForwardedFile_zero">%1$d 개의 전달된 파일</string>
626+
<string name="ForwardedFile_one">전달된 파일</string>
627+
<string name="ForwardedFile_two">%1$d 개의 전달된 파일</string>
628+
<string name="ForwardedFile_few">%1$d 개의 전달된 파일</string>
629+
<string name="ForwardedFile_many">%1$d 개의 전달된 파일</string>
630+
<string name="ForwardedFile_other">%1$d 개의 전달된 파일</string>
631+
<string name="ForwardedPhoto_zero">%1$d 개의 전달된 사진</string>
632+
<string name="ForwardedPhoto_one">전달된 사진</string>
633+
<string name="ForwardedPhoto_two">%1$d 개의 전달된 사진</string>
634+
<string name="ForwardedPhoto_few">%1$d 개의 전달된 사진</string>
635+
<string name="ForwardedPhoto_many">%1$d 개의 전달된 사진</string>
636+
<string name="ForwardedPhoto_other">%1$d 개의 전달된 사진</string>
637+
<string name="ForwardedVideo_zero">%1$d 개의 전달된 사진</string>
638+
<string name="ForwardedVideo_one">전달된 비디오</string>
639+
<string name="ForwardedVideo_two">%1$d 개의 전달된 비디오</string>
640+
<string name="ForwardedVideo_few">%1$d 개의 전달된 비디오</string>
641+
<string name="ForwardedVideo_many">%1$d 개의 전달된 비디오</string>
642+
<string name="ForwardedVideo_other">%1$d 개의 전달된 비디오</string>
643+
<string name="ForwardedAudio_zero">%1$d 개의 전달된 오디오</string>
644+
<string name="ForwardedAudio_one">전달된 오디오</string>
645+
<string name="ForwardedAudio_two">%1$d 개의 전달된 오디오</string>
646+
<string name="ForwardedAudio_few">%1$d 개의 전달된 오디오</string>
647+
<string name="ForwardedAudio_many">%1$d 개의 전달된 오디오</string>
648+
<string name="ForwardedAudio_other">%1$d 개의 전달된 오디오</string>
649+
<string name="ForwardedLocation_zero">%1$d 개의 전달된 위치</string>
650+
<string name="ForwardedLocation_one">전달된 위치</string>
651+
<string name="ForwardedLocation_two">%1$d 개의 전달된 위치</string>
652+
<string name="ForwardedLocation_few">%1$d 개의 전달된 위치</string>
653+
<string name="ForwardedLocation_many">%1$d 개의 전달된 위치</string>
654+
<string name="ForwardedLocation_other">%1$d 개의 전달된 위치</string>
655+
<string name="ForwardedContact_zero">%1$d 개의 전달된 연락처</string>
656+
<string name="ForwardedContact_one">전달된 연락처</string>
657+
<string name="ForwardedContact_two">%1$d 개의 전달된 연락처</string>
658+
<string name="ForwardedContact_few">%1$d 개의 전달된 연락처</string>
659+
<string name="ForwardedContact_many">%1$d 개의 전달된 연락처</string>
660+
<string name="ForwardedContact_other">%1$d 개의 전달된 연락처</string>
661+
<string name="ForwardedSticker_zero">%1$d 개의 전달된 스티커</string>
662+
<string name="ForwardedSticker_one">전달된 스티커</string>
663+
<string name="ForwardedSticker_two">%1$d 개의 전달된 스티커</string>
664+
<string name="ForwardedSticker_few">%1$d 개의 전달된 스티커</string>
665+
<string name="ForwardedSticker_many">%1$d 개의 전달된 스티커</string>
666+
<string name="ForwardedSticker_other">%1$d 개의 전달된 스티커</string>
667+
<string name="AndOther_zero">및 %1$d 개</string>
668+
<string name="AndOther_one">및 %1$d 개</string>
669+
<string name="AndOther_two">및 %1$d 개</string>
670+
<string name="AndOther_few">및 %1$d 개</string>
671+
<string name="AndOther_many">및 %1$d 개</string>
672+
<string name="AndOther_other">및 %1$d 개</string>
673673
<!--date formatters-->
674674
<string name="formatterMonthYear">MMMM yyyy</string>
675675
<string name="formatterMonth">M\'월\' d\'일\'</string>

0 commit comments

Comments
 (0)