From c6cd679bc170be73b30eef8eb04cfa62314b8ac2 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 23 Sep 2015 13:39:37 +0300 Subject: [PATCH] langs updated --- Telegram/Resources/lang.strings | 45 +++++++++++++++----------------- Telegram/SourceFiles/history.cpp | 6 ++--- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/Telegram/Resources/lang.strings b/Telegram/Resources/lang.strings index 1d3ed4b01..9e841d7b8 100644 --- a/Telegram/Resources/lang.strings +++ b/Telegram/Resources/lang.strings @@ -170,7 +170,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org "lng_settings_save" = "Save"; "lng_settings_upload" = "Set Profile Photo"; -"lng_settings_crop_profile" = "Select square area for your profile photo"; +"lng_settings_crop_profile" = "Select a square area for your profile photo"; "lng_settings_uploading_photo" = "Uploading photo.."; "lng_username_title" = "Change username"; @@ -408,31 +408,31 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org "lng_create_group_next" = "Next"; "lng_create_group_create" = "Create"; "lng_create_group_title" = "New Group"; -"lng_create_group_about" = "Groups have up to 200 members and are good for smaller communities"; +"lng_create_group_about" = "Groups are ideal for smaller communities, they can have up to 200 members"; "lng_create_channel_title" = "New Channel"; -"lng_create_channel_about" = "Channels have unlimited number of members and are good for connecting with large audiences"; +"lng_create_channel_about" = "Channels are a tool for broadcasting your messages to unlimited audiences"; "lng_create_public_channel_title" = "Public Channel"; -"lng_create_public_channel_about" = "Everyone will be able to join your channel"; +"lng_create_public_channel_about" = "Anyone can find the channel in search and join"; "lng_create_private_channel_title" = "Private Channel"; -"lng_create_private_channel_about" = "Only those who have the invitation link will be able to join your channel"; +"lng_create_private_channel_about" = "Only people with a special invite link may join"; "lng_create_channel_comments" = "Enable Comments"; "lng_create_channel_comments_about" = "If you enable comments, members will be able to discuss your posts in the channel"; "lng_create_group_save" = "Save"; "lng_create_group_skip" = "Skip"; "lng_create_channel_link_invalid" = "This link is invalid"; -"lng_create_channel_link_occupied" = "This link is already occupied"; -"lng_create_channel_link_too_short" = "This link is too short"; -"lng_create_channel_link_bad_symbols" = "This link has bad symbols"; +"lng_create_channel_link_occupied" = "Sorry, this link is already occupied"; +"lng_create_channel_link_too_short" = "Sorry, this link is too short"; +"lng_create_channel_link_bad_symbols" = "Sorry, this link has bad symbols"; "lng_create_channel_link_available" = "This link is available"; -"lng_create_channel_link_copied" = "The link was copied to clipboard"; +"lng_create_channel_link_copied" = "Link copied to clipboard"; -"lng_create_group_crop" = "Select square area for group photo"; -"lng_create_channel_crop" = "Select square area for channel photo"; +"lng_create_group_crop" = "Select a square area for group photo"; +"lng_create_channel_crop" = "Select a square area for channel photo"; -"lng_failed_add_participant" = "Could not add user. Try again later."; -"lng_failed_add_not_mutual" = "Sorry, if a person left a group, only a\nmutual contact can bring them back\n(they need to have your phone\nnumber, and you need theirs)."; -"lng_failed_add_not_mutual_channel" = "Sorry, if a person left a channel, only a\nmutual contact can bring them back\n(they need to have your phone\nnumber, and you need theirs)."; +"lng_failed_add_participant" = "Could not add user. Please try again later."; +"lng_failed_add_not_mutual" = "Sorry, if a person leaves a group, only a\nmutual contact can bring them back\n(they need to have your phone\nnumber, and you need theirs)."; +"lng_failed_add_not_mutual_channel" = "Sorry, if a person leaves a channel, only a\nmutual contact can bring them back\n(they need to have your phone\nnumber, and you need theirs)."; "lng_sure_delete_contact" = "Are you sure, you want to delete {contact} from your contact list?"; "lng_sure_delete_history" = "Are you sure, you want to delete all message history with {contact}?\n\nThis action cannot be undone."; @@ -447,18 +447,15 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org "lng_action_add_user" = "{from} added {user}"; "lng_action_add_you" = "{from} added you to this channel"; "lng_action_you_joined" = "You joined this channel"; -"lng_action_kick_user" = "{from} kicked {user}"; +"lng_action_kick_user" = "{from} removed {user}"; "lng_action_user_left" = "{from} left the group"; -"lng_action_user_left_channel" = "{from} left the channel"; "lng_action_user_joined" = "{from} joined the group"; -"lng_action_user_joined_channel" = "{from} joined the channel"; "lng_action_user_joined_by_link" = "{from} joined the group via invite link"; -"lng_action_user_joined_by_link_channel" = "{from} joined the channel via invite link"; "lng_action_user_registered" = "{from} just joined Telegram"; "lng_action_removed_photo" = "{from} removed group photo"; -"lng_action_removed_photo_channel" = "Channel photo was removed"; +"lng_action_removed_photo_channel" = "Channel photo removed"; "lng_action_changed_photo" = "{from} updated group photo"; -"lng_action_changed_photo_channel" = "Channel photo was updated"; +"lng_action_changed_photo_channel" = "Channel photo updated"; "lng_action_changed_title" = "{from} changed group name to «{title}»"; "lng_action_changed_title_channel" = "Channel name was changed to «{title}»"; "lng_action_created_chat" = "{from} created group «{title}»"; @@ -468,12 +465,12 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org "lng_channel_hide_comments" = "Hide comments"; "lng_channel_not_accessible" = "Sorry, this channel is not accessible."; -"lng_channels_too_much_public_existing" = "Sorry, you have created\ntoo many public channels.\n\nFirst you need to delete one of them."; +"lng_channels_too_much_public_existing" = "Sorry, you have created\ntoo many public channels already.\n\nPlease delete one first."; "lng_channels_too_much_public" = "Sorry, you have created\ntoo many public channels.\n\nYou can either create a private channel\nor delete one of your public channels first."; "lng_group_invite_bad_link" = "This invite link is broken\nor has expired."; -"lng_group_invite_want_join" = "Do you want to join group «{title}»?"; -"lng_group_invite_want_join_channel" = "Do you want to join channel «{title}»?"; +"lng_group_invite_want_join" = "Do you want to join the group «{title}»?"; +"lng_group_invite_want_join_channel" = "Do you want to join the channel «{title}»?"; "lng_group_invite_join" = "Join"; "lng_group_invite_link" = "Invite link"; @@ -484,7 +481,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org "lng_group_invite_copied" = "Invite link copied to clipboard."; "lng_group_invite_no_room" = "Unable to join this group because there are\ntoo many members in it already."; -"lng_channel_public_link_copied" = "Public channel link copied to clipboard."; +"lng_channel_public_link_copied" = "Link copied to clipboard."; "lng_forwarded_from" = "Forwarded from"; "lng_in_reply_to" = "In reply to"; diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp index b67de76f9..b166ca4f1 100644 --- a/Telegram/SourceFiles/history.cpp +++ b/Telegram/SourceFiles/history.cpp @@ -7268,7 +7268,7 @@ void HistoryServiceMsg::setMessageByAction(const MTPmessageAction &action) { case mtpc_messageActionChatAddUser: { const MTPDmessageActionChatAddUser &d(action.c_messageActionChatAddUser()); if (peerFromUser(d.vuser_id) == _from->id) { - text = channelId() ? lng_action_user_joined_channel(lt_from, from) : lng_action_user_joined(lt_from, from); + text = lng_action_user_joined(lt_from, from); } else { UserData *u = App::user(peerFromUser(d.vuser_id)); second = TextLinkPtr(new PeerLink(u)); @@ -7284,7 +7284,7 @@ void HistoryServiceMsg::setMessageByAction(const MTPmessageAction &action) { case mtpc_messageActionChatJoinedByLink: { const MTPDmessageActionChatJoinedByLink &d(action.c_messageActionChatJoinedByLink()); if (true || peerFromUser(d.vinviter_id) == _from->id) { - text = channelId() ? lng_action_user_joined_by_link_channel(lt_from, from) : lng_action_user_joined_by_link(lt_from, from); + text = lng_action_user_joined_by_link(lt_from, from); //} else { //UserData *u = App::user(App::peerFromUser(d.vinviter_id)); //second = TextLinkPtr(new PeerLink(u)); @@ -7314,7 +7314,7 @@ void HistoryServiceMsg::setMessageByAction(const MTPmessageAction &action) { case mtpc_messageActionChatDeleteUser: { const MTPDmessageActionChatDeleteUser &d(action.c_messageActionChatDeleteUser()); if (peerFromUser(d.vuser_id) == _from->id) { - text = channelId() ? lng_action_user_left_channel(lt_from, from) : lng_action_user_left(lt_from, from); + text = lng_action_user_left(lt_from, from); } else { UserData *u = App::user(peerFromUser(d.vuser_id)); second = TextLinkPtr(new PeerLink(u));