hiro/tdesktop
1
0
Fork 0
mirror of https://github.com/vale981/tdesktop synced 2025-03-06 02:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

langs updated

Browse source
This commit is contained in:
John Preston 2015-09-23 20:43:42 +03:00
commit e629c70f84
5 changed files with 26 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
Telegram/Resources/lang.strings
View file

@ -173,7 +173,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";
@ -421,31 +421,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 {count} members and are good for smaller communities";
"lng_create_group_about" = "Groups are ideal for smaller communities, they can have up to {count} 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.";
@ -460,18 +460,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}»";
@ -481,24 +478,23 @@ 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:";
"lng_group_invite_create" = "Create an invite link";
"lng_group_invite_about" = "Telegram users will be able to join\nyour group by following this link.";
"lng_channel_invite_about" = "Telegram users will be able to join\nyour channel by following this link.";
"lng_group_invite_create_new" = "Revoke invite link";
"lng_group_invite_about_new" = "Your previous link will be deactivated\nand we'll generate a new invite link for you.";
"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";
@ -681,8 +677,6 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
"lng_confirm_contact_data" = "New Contact";
"lng_add_contact" = "Create";
"lng_add_contact_button" = "Add Contact";
"lng_create_channel_button" = "Create Channel";
"lng_create_group_button" = "Create Group";
"lng_contacts_header" = "Contacts";
"lng_contact_not_joined" = "Unfortunately {name} did not join Telegram yet, but you can send your friend an invitation.\n\nWe will notify you about any of your contacts who is joining Telegram.";
"lng_try_other_contact" = "Try other";

6
Telegram/SourceFiles/history.cpp
View file

@ -7282,7 +7282,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));
@ -7298,7 +7298,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));
@ -7328,7 +7328,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));

2
Telegram/SourceFiles/historywidget.h
View file

@ -200,7 +200,7 @@ public:
// \xcc[\xb3\xbf\x8a] // 819, 831, 778
// QString bad1 = QString::fromUtf8("\xcc\xb3"), bad2 = QString::fromUtf8("\xcc\xbf"), bad3 = QString::fromUtf8("\xcc\x8a");
// [\x00\x01\x02\x07\x08\x0b-\x1f] // '\t' = 0x09
return (code >= 0x00 && code <= 0x02) || (code >= 0x07 && code <= 0x09) || (code >= 0x0b && code <= 0x1f) ||
return (/*code >= 0x00 && */code <= 0x02) || (code >= 0x07 && code <= 0x09) || (code >= 0x0b && code <= 0x1f) ||
(code == 819) || (code == 831) || (code == 778) || (code >= 8232 && code <= 8237);
}

2
Telegram/SourceFiles/profilewidget.cpp
View file

@ -425,7 +425,7 @@ void ProfileInner::onAdmins() {
void ProfileInner::onCreateInvitationLink() {
if (!_peerChat && !_peerChannel) return;
ConfirmBox *box = new ConfirmBox(lang(((_peerChat && _peerChat->invitationUrl.isEmpty()) || (_peerChannel && _peerChannel->invitationUrl.isEmpty())) ? (_peerChat ? lng_group_invite_about : lng_channel_invite_about) : lng_group_invite_about_new));
ConfirmBox *box = new ConfirmBox(lang((_peerChat && _peerChat->invitationUrl.isEmpty()) ? lng_group_invite_about : lng_group_invite_about_new));
connect(box, SIGNAL(confirmed()), this, SLOT(onCreateInvitationLinkSure()));
App::wnd()->showLayer(box);
}

2
Telegram/Telegram.pro
View file

@ -125,7 +125,6 @@ SOURCES += \
./SourceFiles/gui/boxshadow.cpp \
./SourceFiles/gui/button.cpp \
./SourceFiles/gui/contextmenu.cpp \
./SourceFiles/gui/countrycodeinput.cpp \
./SourceFiles/gui/countryinput.cpp \
./SourceFiles/gui/emoji_config.cpp \
./SourceFiles/gui/filedialog.cpp \
@ -219,7 +218,6 @@ HEADERS += \
./SourceFiles/gui/boxshadow.h \
./SourceFiles/gui/button.h \
./SourceFiles/gui/contextmenu.h \
./SourceFiles/gui/countrycodeinput.h \
./SourceFiles/gui/countryinput.h \
./SourceFiles/gui/emoji_config.h \
./SourceFiles/gui/filedialog.h \