Skip to content

Commit

Permalink
lang updated
Browse files Browse the repository at this point in the history
  • Loading branch information
john-preston committed Feb 25, 2016
1 parent fe71cb9 commit 1313cd1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
11 changes: 6 additions & 5 deletions Telegram/Resources/lang.strings
Original file line number Diff line number Diff line change
Expand Up @@ -561,8 +561,10 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org

"lng_channel_public_link_copied" = "Link copied to clipboard.";

"lng_forwarded" = "Forwarded from {original}";
"lng_forwarded_via" = "Forwarded from {original} via {inline_bot}";
"lng_forwarded" = "Forwarded from {user}";
"lng_forwarded_channel" = "Forwarded from {channel}";
"lng_forwarded_via" = "Forwarded from {user} via {inline_bot}";
"lng_forwarded_via" = "Forwarded from {channel} via {inline_bot}";
"lng_forwarded_signed" = "{channel} ({user})";
"lng_in_reply_to" = "In reply to";

Expand Down Expand Up @@ -653,6 +655,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_message_ph" = "Write a message..";
"lng_comment_ph" = "Write a comment..";
"lng_broadcast_ph" = "Broadcast a message..";
"lng_broadcast_silent_ph" = "Silent broadcast..";
"lng_record_cancel" = "Release outside this field to cancel";
"lng_will_be_notified" = "Members will be notified when you post";
"lng_wont_be_notified" = "Members will not be notified when you post";
Expand Down Expand Up @@ -763,8 +766,6 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
"lng_send_image_too_large" = "Could not send a file, because it is larger than 1.5 GB :(";
"lng_send_folder" = "Could not send «{name}» because it is a directory :(";

"lng_edit_placeholder" = "Message text";

"lng_forward_choose" = "Choose recipient..";
"lng_forward_cant" = "Sorry, no way to forward here :(";
"lng_forward_confirm" = "Forward to {recipient}?";
Expand Down Expand Up @@ -851,7 +852,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org

"lng_new_version_wrap" = "Telegram Desktop was updated to version {version}\n\n{changes}\n\nFull version history is available here:\n{link}";
"lng_new_version_minor" = "— Bug fixes and other minor improvements";
"lng_new_version_text" = "— Adaptive layout for wide screens switch added to Settings\n— Linux version crash fix";
"lng_new_version_text" = "— Edit your messages in channels and supergroups.\n— Share links to specific posts in channels via the post context menu.\n— Add admin signatures to messages in channels.\n— Send silent messages in channels that will not notify members. Useful for non-urgent or late night posting.";

"lng_menu_insert_unicode" = "Insert Unicode control character";

Expand Down
2 changes: 1 addition & 1 deletion Telegram/SourceFiles/boxes/photosendbox.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ EditCaptionBox::EditCaptionBox(HistoryItem *msg) : AbstractBox(st::boxWideWidth)
_field->setCtrlEnterSubmit(CtrlEnterSubmitBoth);
} else {
QString text = textApplyEntities(msg->originalText(), msg->originalEntities());
_field = new InputArea(this, st::editTextArea, lang(lng_edit_placeholder), text);
_field = new InputArea(this, st::editTextArea, lang(lng_photo_caption), text);
// _field->setMaxLength(MaxMessageSize); // entities can make text in input field larger but still valid
_field->setCtrlEnterSubmit(cCtrlEnter() ? CtrlEnterSubmitCtrlEnter : CtrlEnterSubmitEnter);
}
Expand Down

0 comments on commit 1313cd1

Please sign in to comment.