diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 1febca0d3..a97a9600d 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -181,19 +181,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_signin_title" = "Cloud password check"; "lng_signin_desc" = "Please enter your cloud password."; -"lng_signin_recover_desc" = "Please enter the code from the e-mail\n{email}"; +"lng_signin_recover_desc" = "Please enter the code from the email\n{email}"; "lng_signin_password" = "Your cloud password"; -"lng_signin_code" = "Code from e-mail"; +"lng_signin_code" = "Code from email"; "lng_signin_recover" = "Forgot password?"; "lng_signin_recover_title" = "Password reset"; "lng_signin_hint" = "Hint: {password_hint}"; "lng_signin_recover_hint" = "Code was sent to {recover_email}"; "lng_signin_bad_password" = "You have entered a wrong password."; "lng_signin_wrong_code" = "You have entered an invalid code."; -"lng_signin_try_password" = "Having trouble accessing your e-mail?"; +"lng_signin_try_password" = "Having trouble accessing your email?"; "lng_signin_password_removed" = "Your cloud password was disabled.\nYou can set up a new one in Settings."; -"lng_signin_no_email_forgot" = "Since you didn't provide a recovery e-mail when setting up your password, your remaining options are either to remember your password or to reset your account."; -"lng_signin_cant_email_forgot" = "If you can't restore access to the e-mail, your remaining options are either to remember your password or to reset your account."; +"lng_signin_no_email_forgot" = "Since you didn't provide a recovery email when setting up your password, your remaining options are either to remember your password or to reset your account."; +"lng_signin_cant_email_forgot" = "If you can't restore access to the email, your remaining options are either to remember your password or to reset your account."; "lng_signin_reset_account" = "Reset your account"; "lng_signin_sure_reset" = "Warning!\n\nYou will lose all your chats and messages, along with any media and files you shared!\n\nDo you want to reset your account?"; "lng_signin_reset" = "Reset"; @@ -394,12 +394,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_cloud_password_hint" = "Enter password hint"; "lng_cloud_password_change_hint" = "Enter new password hint"; "lng_cloud_password_bad" = "Password and hint cannot be the same."; -"lng_cloud_password_email" = "Enter recovery e-mail"; -"lng_cloud_password_bad_email" = "Incorrect e-mail, please try other."; +"lng_cloud_password_email" = "Enter recovery email"; +"lng_cloud_password_bad_email" = "Incorrect email, please try other."; "lng_cloud_password_about" = "This password will be asked when you log in on a new device in addition to the SMS code."; -"lng_cloud_password_about_recover" = "Warning! Are you sure you don't want to\nadd a password recovery e-mail?\n\nIf you forget your password, you will\nlose access to your Telegram account."; -"lng_cloud_password_skip_email" = "Skip e-mail"; -"lng_cloud_password_almost" = "A confirmation link was sent to the\ne-mail you provided. Two-step verification will be enabled as soon as you follow that link."; +"lng_cloud_password_about_recover" = "Warning! Are you sure you don't want to\nadd a password recovery email?\n\nIf you forget your password, you will\nlose access to your Telegram account."; +"lng_cloud_password_skip_email" = "Skip email"; +"lng_cloud_password_almost" = "A confirmation link was sent to the\nemail you provided. Two-step verification will be enabled as soon as you follow that link."; "lng_cloud_password_was_set" = "Two-step verification enabled."; "lng_cloud_password_updated" = "Your cloud password was updated."; "lng_cloud_password_removed" = "Two-step verification was disabled."; diff --git a/Telegram/Resources/langs/lang_es.strings b/Telegram/Resources/langs/lang_es.strings index a43a2d6fa..68ce45d05 100644 --- a/Telegram/Resources/langs/lang_es.strings +++ b/Telegram/Resources/langs/lang_es.strings @@ -193,19 +193,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_signin_title" = "Contraseña"; "lng_signin_desc" = "Por favor, pon tu contraseña."; -"lng_signin_recover_desc" = "Por favor, pon el código desde el e-mail\n{email}"; +"lng_signin_recover_desc" = "Por favor, pon el código desde el email\n{email}"; "lng_signin_password" = "Tu contraseña"; -"lng_signin_code" = "Código desde el e-mail"; +"lng_signin_code" = "Código desde el email"; "lng_signin_recover" = "¿Olvidaste la contraseña?"; "lng_signin_recover_title" = "Restablecer contraseña"; "lng_signin_hint" = "Pista: {password_hint}"; "lng_signin_recover_hint" = "El código fue enviado a {recover_email}"; "lng_signin_bad_password" = "Pusiste la contraseña equivocada."; "lng_signin_wrong_code" = "Has ingresado un código inválido."; -"lng_signin_try_password" = "¿Tienes problemas para acceder a tu e-mail?"; +"lng_signin_try_password" = "¿Tienes problemas para acceder a tu email?"; "lng_signin_password_removed" = "Tu contraseña fue desactivada.\nPuedes configurar una nueva en Ajustes."; -"lng_signin_no_email_forgot" = "Como no estableciste un e-mail de recuperación \ncuando configuraste tu contraseña, las opciones restantes son recordar tu contraseña o restablecer tu cuenta."; -"lng_signin_cant_email_forgot" = "Si no puedes acceder a tu e-mail, las opciones restantes son recordar tu contraseña o restablecer tu cuenta."; +"lng_signin_no_email_forgot" = "Como no estableciste un email de recuperación \ncuando configuraste tu contraseña, las opciones restantes son recordar tu contraseña o restablecer tu cuenta."; +"lng_signin_cant_email_forgot" = "Si no puedes acceder a tu email, las opciones restantes son recordar tu contraseña o restablecer tu cuenta."; "lng_signin_reset_account" = "Restablecer tu cuenta"; "lng_signin_sure_reset" = "¡Advertencia!\n\n¡Perderás todos tus chats y mensajes, junto con la multimedia y archivos compartidos!\n\n¿Quieres restablecer tu cuenta?"; "lng_signin_reset" = "Restablecer"; @@ -406,12 +406,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_cloud_password_hint" = "Pon una pista para la contraseña"; "lng_cloud_password_change_hint" = "Pon una pista para la contraseña"; "lng_cloud_password_bad" = "La contraseña y la pista no pueden ser iguales."; -"lng_cloud_password_email" = "Pon un e-mail de recuperación"; -"lng_cloud_password_bad_email" = "E-mail incorrecto. Por favor, prueba otro."; +"lng_cloud_password_email" = "Pon un email de recuperación"; +"lng_cloud_password_bad_email" = "email incorrecto. Por favor, prueba otro."; "lng_cloud_password_about" = "Necesitarás la contraseña al iniciar sesión, además del código de activación."; -"lng_cloud_password_about_recover" = "¡Advertencia! ¿No quieres añadir un e-mail \nde recuperación para la contraseña?\n\nSi olvidas tu contraseña, perderás\nel acceso a tu cuenta de Telegram."; -"lng_cloud_password_skip_email" = "Omitir e-mail"; -"lng_cloud_password_almost" = "Un enlace de confirmación fue enviado \nal e-mail que estableciste. La verificación en dos pasos se activará en cuanto sigas ese enlace."; +"lng_cloud_password_about_recover" = "¡Advertencia! ¿No quieres añadir un email \nde recuperación para la contraseña?\n\nSi olvidas tu contraseña, perderás\nel acceso a tu cuenta de Telegram."; +"lng_cloud_password_skip_email" = "Omitir email"; +"lng_cloud_password_almost" = "Un enlace de confirmación fue enviado \nal email que estableciste. La verificación en dos pasos se activará en cuanto sigas ese enlace."; "lng_cloud_password_was_set" = "Verificación en dos pasos activada."; "lng_cloud_password_updated" = "Tu contraseña fue actualizada."; "lng_cloud_password_removed" = "Verificación en dos pasos desactivada."; @@ -1044,7 +1044,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_context_copy_link" = "Copiar enlace"; "lng_context_copy_post_link" = "Copiar enlace de la publicación"; -"lng_context_copy_email" = "Copiar e-mail"; +"lng_context_copy_email" = "Copiar email"; "lng_context_copy_hashtag" = "Copiar hashtag"; "lng_context_copy_mention" = "Copiar alias"; "lng_context_save_image" = "Guardar como..."; diff --git a/Telegram/Resources/langs/lang_it.strings b/Telegram/Resources/langs/lang_it.strings index 810f3a182..a0cd13e96 100644 --- a/Telegram/Resources/langs/lang_it.strings +++ b/Telegram/Resources/langs/lang_it.strings @@ -193,19 +193,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_signin_title" = "Verifica password"; "lng_signin_desc" = "Per favore inserisci la tua password."; -"lng_signin_recover_desc" = "Per favore inserisci il codice dall'e-mail\n{email}"; +"lng_signin_recover_desc" = "Per favore inserisci il codice dall'email\n{email}"; "lng_signin_password" = "La tua password"; -"lng_signin_code" = "Codice dall'e-mail"; +"lng_signin_code" = "Codice dall'email"; "lng_signin_recover" = "Password dimenticata?"; "lng_signin_recover_title" = "Ripristino password"; "lng_signin_hint" = "Suggerimento: {password_hint}"; "lng_signin_recover_hint" = "Il codice è stato inviato a {recover_email}"; "lng_signin_bad_password" = "Hai inserito una password errata."; "lng_signin_wrong_code" = "Hai inserito un codice non valido."; -"lng_signin_try_password" = "Hai problemi ad accedere alla tua e-mail?"; +"lng_signin_try_password" = "Hai problemi ad accedere alla tua email?"; "lng_signin_password_removed" = "La tua password è stata disattivata.\nNe puoi impostare una nuova dalle Impostazioni."; "lng_signin_no_email_forgot" = "Siccome non hai fornito un'email di recupero quando hai inserito la password, non ti resta che ricordarti la password o ripristinare il tuo account."; -"lng_signin_cant_email_forgot" = "Se non puoi recuperare l'accesso all'e-mail, non ti resta che ricordarti la password o ripristinare il tuo account."; +"lng_signin_cant_email_forgot" = "Se non puoi recuperare l'accesso all'email, non ti resta che ricordarti la password o ripristinare il tuo account."; "lng_signin_reset_account" = "Ripristina il tuo account"; "lng_signin_sure_reset" = "Attenzione!\n\nPerderai tutte le chat e i messaggi, insieme a tutti i media e i file condivisi!\n\nVuoi ripristinare il tuo account?"; "lng_signin_reset" = "Ripristina"; @@ -407,11 +407,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_cloud_password_change_hint" = "Inserisci un nuovo suggerimento"; "lng_cloud_password_bad" = "Password e suggerimento devono essere diversi."; "lng_cloud_password_email" = "Inserisci email di recupero"; -"lng_cloud_password_bad_email" = "E-mail non valida, riprova con un'altra."; +"lng_cloud_password_bad_email" = "email non valida, riprova con un'altra."; "lng_cloud_password_about" = "La password sarà richiesta quando ti connetti da un nuovo dispositivo insieme al codice."; -"lng_cloud_password_about_recover" = "Attenzione! Sicuro di non voler\naggiungere un'e-mail di recupero?\n\nSe dimentichi la tua password, perderai\nl'accesso al tuo account Telegram."; -"lng_cloud_password_skip_email" = "Salta e-mail"; -"lng_cloud_password_almost" = "Abbiamo inviato un link di conferma\nall'e-mail che ci hai fornito. La verifica in due passaggi sarà attivata non appena aprirai quel link."; +"lng_cloud_password_about_recover" = "Attenzione! Sicuro di non voler\naggiungere un'email di recupero?\n\nSe dimentichi la tua password, perderai\nl'accesso al tuo account Telegram."; +"lng_cloud_password_skip_email" = "Salta email"; +"lng_cloud_password_almost" = "Abbiamo inviato un link di conferma\nall'email che ci hai fornito. La verifica in due passaggi sarà attivata non appena aprirai quel link."; "lng_cloud_password_was_set" = "Verifica in due passaggi abilitata."; "lng_cloud_password_updated" = "La tua password è stata aggiornata."; "lng_cloud_password_removed" = "La verifica in due passaggi è stata disattivata."; diff --git a/Telegram/Resources/langs/lang_nl.strings b/Telegram/Resources/langs/lang_nl.strings index deab13ee5..0fb5fc1c9 100644 --- a/Telegram/Resources/langs/lang_nl.strings +++ b/Telegram/Resources/langs/lang_nl.strings @@ -193,19 +193,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_signin_title" = "Cloud-wachtwoord:"; "lng_signin_desc" = "Cloud-wachtwoord invoeren"; -"lng_signin_recover_desc" = "Voer de code uit de e-mail in\n{email}"; +"lng_signin_recover_desc" = "Voer de code uit de email in\n{email}"; "lng_signin_password" = "Je cloud-wachtwoord"; -"lng_signin_code" = "Code uit de e-mail"; +"lng_signin_code" = "Code uit de email"; "lng_signin_recover" = "Wachtwoord vergeten?"; "lng_signin_recover_title" = "Wachtwoord reset"; "lng_signin_hint" = "Hint: {password_hint}"; "lng_signin_recover_hint" = "De code is verstuurd naar {recover_email}"; "lng_signin_bad_password" = "Ongeldig wachtwoord."; "lng_signin_wrong_code" = "Je hebt een ongeldige code ingevoerd."; -"lng_signin_try_password" = "Kun je je e-mail niet benaderen?"; +"lng_signin_try_password" = "Kun je je email niet benaderen?"; "lng_signin_password_removed" = "Je cloud-wachtwoord is uitgeschakeld.\nVia instellingen kun je een nieuwe instellen."; -"lng_signin_no_email_forgot" = "Omdat je geen herstel-e-mailadres hebt opgegeven voor je wachtwoord zul je bij verlies van je wachtwoord je account moeten resetten."; -"lng_signin_cant_email_forgot" = "Als je geen toegang meer hebt tot je e-mail en je ingestelde wachtwoord zul je je account moeten resetten."; +"lng_signin_no_email_forgot" = "Omdat je geen herstel-emailadres hebt opgegeven voor je wachtwoord zul je bij verlies van je wachtwoord je account moeten resetten."; +"lng_signin_cant_email_forgot" = "Als je geen toegang meer hebt tot je email en je ingestelde wachtwoord zul je je account moeten resetten."; "lng_signin_reset_account" = "Account resetten"; "lng_signin_sure_reset" = "Let op:\n\nAl je chats, berichten en alle andere data gaan verloren als je verder gaat!\n\nEcht je account resetten?"; "lng_signin_reset" = "Reset"; @@ -406,12 +406,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_cloud_password_hint" = "Wachtwoordhint invoeren"; "lng_cloud_password_change_hint" = "Wachtwoordhint invoeren"; "lng_cloud_password_bad" = "De hint moet anders zijn dan je wachtwoord."; -"lng_cloud_password_email" = "Herstel-e-mailadres invoeren"; -"lng_cloud_password_bad_email" = "Ongeldig e-mailadres, probeer een andere."; +"lng_cloud_password_email" = "Herstel-emailadres invoeren"; +"lng_cloud_password_bad_email" = "Ongeldig emailadres, probeer een andere."; "lng_cloud_password_about" = "Dit wachtwoord is nodig als je inlogt vanaf een nieuw apparaat, naast de SMS-code."; "lng_cloud_password_about_recover" = "Let op: Echt geen herstel-emailadres\nopgeven voor je wachtwoord?\n\nBij verlies van je wachtwoord ben je\nook de toegang tot Telegram kwijt."; -"lng_cloud_password_skip_email" = "E-mail overslaan"; -"lng_cloud_password_almost" = "Een bevestigingslink is naar het e-mailadres verstuurd. \ntwee-staps-verificatie is actief na het klikken van de e-mail-link."; +"lng_cloud_password_skip_email" = "email overslaan"; +"lng_cloud_password_almost" = "Een bevestigingslink is naar het emailadres verstuurd. \ntwee-staps-verificatie is actief na het klikken van de email-link."; "lng_cloud_password_was_set" = "Twee-staps-verificatie ingeschakeld."; "lng_cloud_password_updated" = "Je cloud-wachtwoord is gewijzigd."; "lng_cloud_password_removed" = "Twee-staps-verificatie uitgeschakeld."; @@ -1044,7 +1044,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_context_copy_link" = "Link kopiëren"; "lng_context_copy_post_link" = "Berichtlink kopiëren"; -"lng_context_copy_email" = "E-mailadres kopiëren"; +"lng_context_copy_email" = "emailadres kopiëren"; "lng_context_copy_hashtag" = "Hashtag kopiëren"; "lng_context_copy_mention" = "Gebruikersnaam kopiëren"; "lng_context_save_image" = "Afbeelding opslaan als..."; diff --git a/Telegram/Resources/langs/lang_pt_BR.strings b/Telegram/Resources/langs/lang_pt_BR.strings index 1e1de2043..2485e0e02 100644 --- a/Telegram/Resources/langs/lang_pt_BR.strings +++ b/Telegram/Resources/langs/lang_pt_BR.strings @@ -193,19 +193,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_signin_title" = "Verificar senha"; "lng_signin_desc" = "Por favor, insira sua senha."; -"lng_signin_recover_desc" = "Por favor, insira o código de seu e-mail\n{email}"; +"lng_signin_recover_desc" = "Por favor, insira o código de seu email\n{email}"; "lng_signin_password" = "Sua senha"; -"lng_signin_code" = "Código do e-mail"; +"lng_signin_code" = "Código do email"; "lng_signin_recover" = "Esqueceu sua senha?"; "lng_signin_recover_title" = "Redefinir senha"; "lng_signin_hint" = "Dica: {password_hint}"; "lng_signin_recover_hint" = "Código enviado para {recover_email}"; "lng_signin_bad_password" = "Você colocou uma senha errada."; "lng_signin_wrong_code" = "Você inseriu um código inválido"; -"lng_signin_try_password" = "Problemas ao acessar seu e-mail?"; +"lng_signin_try_password" = "Problemas ao acessar seu email?"; "lng_signin_password_removed" = "Sua senha da nuvem foi desativada.\nVocê pode definir uma nova em Configurações."; -"lng_signin_no_email_forgot" = "Se você não providenciar um e-mail\nde recuperação ao configurar sua senha, suas opções restantes serão lembrar sua senha ou apagar sua conta."; -"lng_signin_cant_email_forgot" = "Se você não pode restaurar o acesso ao e-mail, suas opções restantes serão lembrar sua senha ou apagar sua conta."; +"lng_signin_no_email_forgot" = "Se você não providenciar um email\nde recuperação ao configurar sua senha, suas opções restantes serão lembrar sua senha ou apagar sua conta."; +"lng_signin_cant_email_forgot" = "Se você não pode restaurar o acesso ao email, suas opções restantes serão lembrar sua senha ou apagar sua conta."; "lng_signin_reset_account" = "Apagar sua conta"; "lng_signin_sure_reset" = "Atenção!\n\nVocê perderá todos seus chats e mensagens, juntamente com quaisquer mídias e arquivos!\n\nVocê deseja apagar sua conta?"; "lng_signin_reset" = "Apagar"; @@ -406,11 +406,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_cloud_password_hint" = "Insira uma dica de senha"; "lng_cloud_password_change_hint" = "Insira uma dica de senha"; "lng_cloud_password_bad" = "Senha e dica de senha não podem ser iguais."; -"lng_cloud_password_email" = "E-mail de recuperação"; -"lng_cloud_password_bad_email" = "E-mail incorreto, por favor, tente outro."; +"lng_cloud_password_email" = "email de recuperação"; +"lng_cloud_password_bad_email" = "email incorreto, por favor, tente outro."; "lng_cloud_password_about" = "Essa senha será requisitada quando você entrar em um novo dispositivo, após o seu PIN."; "lng_cloud_password_about_recover" = "Atenção! Você tem certeza que não quer\nadicionar um email para recuperação de senha?\n\nSe você esquecer sua senha, perderá\nseu acesso a sua conta no Telegram."; -"lng_cloud_password_skip_email" = "Pular e-mail"; +"lng_cloud_password_skip_email" = "Pular email"; "lng_cloud_password_almost" = "Link de confirmação enviado para\no email fornecido. A verificação em duas etapas será ativada assim que você abrir o link."; "lng_cloud_password_was_set" = "Verificação em duas etapas ativada."; "lng_cloud_password_updated" = "Sua senha da nuvem foi atualizada."; diff --git a/Telegram/SourceFiles/ui/text/text_entity.cpp b/Telegram/SourceFiles/ui/text/text_entity.cpp index 88279a4cb..4f9f0c803 100644 --- a/Telegram/SourceFiles/ui/text/text_entity.cpp +++ b/Telegram/SourceFiles/ui/text/text_entity.cpp @@ -24,7 +24,7 @@ QString ExpressionDomainExplicit() { } QString ExpressionMailNameAtEnd() { - // Matches e-mail first part (before '@') at the end of the string. + // Matches email first part (before '@') at the end of the string. // First we find a domain without protocol (like "gmail.com"), then // we find '@' before it and then we look for the name before '@'. return qsl("[a-zA-Z\\-_\\.0-9]{1,256}$");