RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update phrases.

This commit is contained in:
John Preston 2018-06-22 17:45:58 +01:00
parent 51189fd244
commit 10a0c6a086
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Telegram/Resources/langs/lang.strings
View File

@ -1654,12 +1654,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_passport_error_cant_read" = "Can't read this file. Please choose an image."; "lng_passport_error_cant_read" = "Can't read this file. Please choose an image.";
"lng_passport_bad_name" = "Please use latin characters only."; "lng_passport_bad_name" = "Please use latin characters only.";
"lng_export_title" = "Personal data export"; "lng_export_title" = "Export Personal Data";
"lng_export_progress_title" = "Exporting personal data"; "lng_export_progress_title" = "Exporting personal data";
"lng_export_option_info" = "Personal information"; "lng_export_option_info" = "Personal information";
"lng_export_option_contacts" = "Contacts list"; "lng_export_option_contacts" = "Contacts list";
"lng_export_option_sessions" = "Sessions list"; "lng_export_option_sessions" = "Sessions list";
"lng_export_header_chats" = "Chats export settings"; "lng_export_header_chats" = "Chat export settings";
"lng_export_option_personal_chats" = "Personal chats"; "lng_export_option_personal_chats" = "Personal chats";
"lng_export_option_bot_chats" = "Bot chats"; "lng_export_option_bot_chats" = "Bot chats";
"lng_export_option_private_groups" = "Private groups"; "lng_export_option_private_groups" = "Private groups";
@ -1691,17 +1691,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_export_state_video_message" = "Round video message"; "lng_export_state_video_message" = "Round video message";
"lng_export_state_sticker" = "Sticker"; "lng_export_state_sticker" = "Sticker";
"lng_export_state_gif" = "Animated GIF"; "lng_export_state_gif" = "Animated GIF";
"lng_export_progress" = "Note: Please don't close Telegram while exporting files and personal data."; "lng_export_progress" = "Note: You can close this window, but please don't quit Telegram while the export is running.";
"lng_export_stop" = "Stop"; "lng_export_stop" = "Stop";
"lng_export_sure_stop" = "Are you sure you want to stop exporting your data?\n\nThis action cannot be undone."; "lng_export_sure_stop" = "Are you sure you want to stop exporting your data?\n\nIf you do, you'll need to start over.";
"lng_export_about_done" = "Your data was successfully exported."; "lng_export_about_done" = "Your data was successfully exported.";
"lng_export_done" = "Show my data"; "lng_export_done" = "Show my data";
"lng_export_finished" = "Export is finished."; "lng_export_finished" = "Data export completed.";
"lng_export_total_files" = "Total files: {count}."; "lng_export_total_files" = "Total files: {count}.";
"lng_export_total_size" = "Total size: {size}."; "lng_export_total_size" = "Total size: {size}.";
"lng_export_folder" = "Choose export folder"; "lng_export_folder" = "Choose export folder";
"lng_export_invalid" = "Sorry, you have started a new data export, so this data export is now cancelled."; "lng_export_invalid" = "Sorry, you have started a new data export, so this data export is now cancelled.";
"lng_export_delay" = "Sorry, for security reasons this data export will be available for you:\n\n{date}\n\nAt this time please try again."; "lng_export_delay" = "Sorry, for security reasons, you will be able to begin downloading your data in 24 hours. We have notified all your devices about the export request to make sure it's authorized and give you time to react if it's not.\n\nPlease come back on {date} and repeat the request using the same device.";
// Wnd specific // Wnd specific

6
Telegram/SourceFiles/export/output/export_output_text.cpp
View File

@ -142,11 +142,11 @@ QByteArray SerializeMessage(
}; };
const auto wrapPeerName = [&](PeerId peerId) { const auto wrapPeerName = [&](PeerId peerId) {
const auto result = peer(peerId).name(); const auto result = peer(peerId).name();
return result.isEmpty() ? QByteArray("(unknown peer)") : result; return result.isEmpty() ? QByteArray("(deleted peer)") : result;
}; };
const auto wrapUserName = [&](int32 userId) { const auto wrapUserName = [&](int32 userId) {
const auto result = user(userId).name(); const auto result = user(userId).name();
return result.isEmpty() ? QByteArray("(unknown user)") : result; return result.isEmpty() ? QByteArray("(deleted user)") : result;
}; };
const auto pushFrom = [&](const QByteArray &label = "From") { const auto pushFrom = [&](const QByteArray &label = "From") {
if (message.fromId) { if (message.fromId) {
@ -869,9 +869,7 @@ Result TextWriter::writeChatEnd() {
} }
Result TextWriter::writeChatsEnd() { Result TextWriter::writeChatsEnd() {
if (_chats) {
_chats = nullptr; _chats = nullptr;
}
return Result::Success(); return Result::Success();
} }