From ebc4e124cbfe130fff6be6595ec7ef7d283fe5cf Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Wed, 12 Oct 2016 14:13:09 +0200 Subject: [PATCH] Adapt some layouts. --- TMessagesProj/jni/mr_wrapper.c | 11 +++ .../org/telegram/messenger/MrMailbox.java | 4 +- .../org/telegram/ui/CacheControlActivity.java | 34 ++++++-- .../ui/MrAccountSettingsActivity.java | 11 ++- .../telegram/ui/MrNameSettingsActivity.java | 22 ++++- .../telegram/ui/PrivacySettingsActivity.java | 2 +- .../org/telegram/ui/SettingsActivity.java | 80 +++++++++++++++---- .../src/main/res/values-de/strings.xml | 19 +---- .../src/main/res/values-es/strings.xml | 14 +--- .../src/main/res/values-it/strings.xml | 14 +--- .../src/main/res/values-nl/strings.xml | 14 +--- .../src/main/res/values-pt/strings.xml | 14 +--- TMessagesProj/src/main/res/values/strings.xml | 19 +---- 13 files changed, 149 insertions(+), 109 deletions(-) diff --git a/TMessagesProj/jni/mr_wrapper.c b/TMessagesProj/jni/mr_wrapper.c index 17889babc..021f43bfb 100644 --- a/TMessagesProj/jni/mr_wrapper.c +++ b/TMessagesProj/jni/mr_wrapper.c @@ -151,6 +151,17 @@ JNIEXPORT jstring Java_org_telegram_messenger_MrMailbox_MrMailboxGetConfig(JNIEn } +/* MrMailbox - misc. */ + +JNIEXPORT jstring Java_org_telegram_messenger_MrMailbox_MrMailboxGetInfo(JNIEnv *env, jclass c, jlong hMailbox) +{ + char* temp = mrmailbox_get_info((mrmailbox_t*)hMailbox); + jstring ret = JSTRING_NEW(temp); + free(temp); + return ret; +} + + /******************************************************************************* * MrChatlist ******************************************************************************/ diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java b/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java index 97a470203..a3cb44e84 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/MrMailbox.java @@ -87,6 +87,7 @@ public class MrMailbox { public native static int MrMailboxOpen (long hMailbox, String dbfile, String blobdir); public native static void MrMailboxClose (long hMailbox); public native static int MrMailboxConfigure (long hMailbox); + public native static int MrMailboxIsConfigured (long hMailbox); public native static int MrMailboxConnect (long hMailbox); public native static void MrMailboxDisconnect (long hMailbox); public native static int MrMailboxFetch (long hMailbox); @@ -98,7 +99,8 @@ public class MrMailbox { public native static int MrMailboxSetConfig (long hMailbox, String key, String value); // value may be NULL public native static String MrMailboxGetConfig (long hMailbox, String key, String def); // def may be NULL, returns empty string as NULL - public native static int MrMailboxIsConfigured (long hMailbox); + + public native static String MrMailboxGetInfo (long hMailbox); // MrChatlist objects public native static void MrChatlistUnref (long hChatlist); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/CacheControlActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/CacheControlActivity.java index dc6f426ac..02277696f 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/CacheControlActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/CacheControlActivity.java @@ -45,6 +45,7 @@ import org.telegram.ui.ActionBar.BaseFragment; import org.telegram.ui.ActionBar.BottomSheet; import org.telegram.ui.Adapters.BaseFragmentAdapter; import org.telegram.ui.Cells.CheckBoxCell; +import org.telegram.ui.Cells.HeaderCell; import org.telegram.ui.Cells.TextInfoPrivacyCell; import org.telegram.ui.Cells.TextSettingsCell; import org.telegram.ui.Components.LayoutHelper; @@ -56,6 +57,7 @@ public class CacheControlActivity extends BaseFragment { private ListAdapter listAdapter; + private int headlineRow; // EDIT BY MR -- added private int databaseRow; private int databaseInfoRow; private int keepMediaRow; @@ -64,6 +66,11 @@ public class CacheControlActivity extends BaseFragment { private int cacheInfoRow; private int rowCount; + private int typeTextSetting = 0; // EDIT BY MR -- no gaps, please + private int typeTextInfo = 1; + private int typeSectionTitle = 2; + private int typeCount = 3; // /EDIT BY MR -- no gaps, please + private long databaseSize = -1; private long cacheSize = -1; private long documentsSize = -1; @@ -82,6 +89,7 @@ public class CacheControlActivity extends BaseFragment { super.onFragmentCreate(); rowCount = 0; + headlineRow = -1;// rowCount++; // EDIT BY MR -- added keepMediaRow = rowCount++; keepMediaInfoRow = rowCount++; cacheRow = -1; // EDIT BY MR -- rowCount++; @@ -592,8 +600,17 @@ public class CacheControlActivity extends BaseFragment { @Override public View getView(int i, View view, ViewGroup viewGroup) { - int type = getItemViewType(i); - if (type == 0) { + int type_ = getItemViewType(i); + if (type_ == typeSectionTitle) { + if (view == null) { + view = new HeaderCell(mContext); + view.setBackgroundColor(0xffffffff); + } + if (i == headlineRow) { + ((HeaderCell) view).setText(LocaleController.getString("Settings", R.string.Settings)); + } + } + else if (type_ == typeTextSetting) { if (view == null) { view = new TextSettingsCell(mContext); view.setBackgroundColor(0xffffffff); @@ -620,7 +637,7 @@ public class CacheControlActivity extends BaseFragment { } textCell.setTextAndValue(LocaleController.getString("KeepMedia", R.string.KeepMedia), value, false); } - } else if (type == 1) { + } else if (type_ == typeTextInfo) { if (view == null) { view = new TextInfoPrivacyCell(mContext); } @@ -641,16 +658,19 @@ public class CacheControlActivity extends BaseFragment { @Override public int getItemViewType(int i) { if (i == databaseRow || i == cacheRow || i == keepMediaRow) { - return 0; + return typeTextSetting; } else if (i == databaseInfoRow || i == cacheInfoRow || i == keepMediaInfoRow) { - return 1; + return typeTextInfo; } - return 0; + else if(i==headlineRow) { + return typeSectionTitle; + } + return typeTextSetting; } @Override public int getViewTypeCount() { - return 2; + return typeCount; } @Override diff --git a/TMessagesProj/src/main/java/org/telegram/ui/MrAccountSettingsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/MrAccountSettingsActivity.java index 224e5ee66..266659150 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/MrAccountSettingsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/MrAccountSettingsActivity.java @@ -191,10 +191,12 @@ public class MrAccountSettingsActivity extends BaseFragment { // Warning: the widgets are created as needed and may not be present! String v; + /* if( !isModified() && MrMailbox.MrMailboxIsConfigured(MrMailbox.hMailbox)!=0 ) { finishFragment(); return; // nothing to do } + */ if( addrCell!=null) { v = addrCell.getValue().trim(); @@ -242,8 +244,12 @@ public class MrAccountSettingsActivity extends BaseFragment { } MrMailbox.MrMailboxConfigure(MrMailbox.hMailbox); + if( MrMailbox.MrMailboxConnect(MrMailbox.hMailbox)!=0 ) { + MrMailbox.MrMailboxFetch(MrMailbox.hMailbox); + } // show dialog + /* AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); builder.setTitle(LocaleController.getString("AppName", R.string.AppName)); builder.setMessage("Testing the server connection, this may take a moment."); @@ -254,6 +260,9 @@ public class MrAccountSettingsActivity extends BaseFragment { } }); showDialog(builder.create()); + */ + + finishFragment(); // disable this when a dialog is used NotificationCenter.getInstance().postNotificationName(NotificationCenter.mainUserInfoChanged); } @@ -457,7 +466,7 @@ public class MrAccountSettingsActivity extends BaseFragment { @Override public int getViewTypeCount() { - return 1; + return 1; /* SIC! internally, we ingnore the type, each row has its own type--otherwise text entry stuff would not work */ } @Override diff --git a/TMessagesProj/src/main/java/org/telegram/ui/MrNameSettingsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/MrNameSettingsActivity.java index a44876562..fe734a8cf 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/MrNameSettingsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/MrNameSettingsActivity.java @@ -45,6 +45,7 @@ import org.telegram.ui.ActionBar.ActionBar; import org.telegram.ui.ActionBar.ActionBarMenu; import org.telegram.ui.ActionBar.BaseFragment; import org.telegram.ui.Adapters.BaseFragmentAdapter; +import org.telegram.ui.Cells.HeaderCell; import org.telegram.ui.Cells.MrEditTextCell; import org.telegram.ui.Cells.TextInfoPrivacyCell; import org.telegram.ui.Cells.TextSettingsCell; @@ -56,12 +57,14 @@ public class MrNameSettingsActivity extends BaseFragment { // the list private ListAdapter listAdapter; + private int rowNameTitle; private int rowDisplayname; private int rowDisplaynameInfo; private int rowCount; private final int typeInfo = 0; // no gaps here! private final int typeTextEntry = 1; + private final int typeSection = 2; MrEditTextCell displaynameCell; // warning all these objects may be null! @@ -74,6 +77,7 @@ public class MrNameSettingsActivity extends BaseFragment { super.onFragmentCreate(); rowCount = 0; + rowNameTitle = -1; // rowCount++; rowDisplayname = rowCount++; rowDisplaynameInfo = rowCount++; @@ -211,12 +215,21 @@ public class MrNameSettingsActivity extends BaseFragment { @Override public View getView(int i, View view, ViewGroup viewGroup) { int type = getItemViewType__(i); - if (type == typeTextEntry) { + if (type == typeSection) { + if (view == null) { + view = new HeaderCell(mContext); + view.setBackgroundColor(0xffffffff); + } + if (i == rowNameTitle) { + ((HeaderCell) view).setText(LocaleController.getString("MyName", R.string.MyName)); + } + } + else if (type == typeTextEntry) { if (i == rowDisplayname) { if(displaynameCell==null) { displaynameCell = new MrEditTextCell(mContext); displaynameCell.setValueHintAndLabel(MrMailbox.MrMailboxGetConfig(MrMailbox.hMailbox, "displayname", ""), - "", LocaleController.getString("MyName", R.string.MyName), true); + "", "", true); } view = displaynameCell; } @@ -241,13 +254,16 @@ public class MrNameSettingsActivity extends BaseFragment { if (i == rowDisplayname) { return typeTextEntry; } + else if(i==rowNameTitle) { + return typeSection; + } return typeInfo; } @Override public int getViewTypeCount() { - return 1; + return 1; /* SIC! internally, we ingnore the type, each row has its own type--otherwise text entry stuff would not work */ } @Override diff --git a/TMessagesProj/src/main/java/org/telegram/ui/PrivacySettingsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/PrivacySettingsActivity.java index 889135ed4..b7fdd7ae1 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/PrivacySettingsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/PrivacySettingsActivity.java @@ -72,7 +72,7 @@ public class PrivacySettingsActivity extends BaseFragment implements Notificatio ContactsController.getInstance().loadPrivacySettings(); rowCount = 0; - privacySectionRow = rowCount++; + privacySectionRow = -1; //rowCount++; blockedRow = rowCount++; lastSeenRow = -1; // EDIT BY MR -- rowCount++; groupsRow = -1; // EDIT BY MR -- rowCount++; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java index 0c558567a..3622fb928 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java @@ -59,6 +59,7 @@ import org.telegram.ui.Cells.HeaderCell; import org.telegram.ui.Cells.ShadowSectionCell; import org.telegram.ui.Cells.TextCheckCell; import org.telegram.ui.Cells.TextDetailSettingsCell; +import org.telegram.ui.Cells.TextInfoPrivacyCell; import org.telegram.ui.Cells.TextSettingsCell; import org.telegram.ui.ActionBar.ActionBar; //import org.telegram.ui.ActionBar.ActionBarMenu; -- EDIT BY MR @@ -246,19 +247,17 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter askQuestionRow = -1; // EDIT BY MR -- rowCount++; telegramFaqRow = rowCount++; privacyPolicyRow = -1; // EDIT BY MR -- rowCount++; + sendLogsRow = -1; // EDIT BY MR + clearLogsRow = -1; // EDIT BY MR + switchBackendButtonRow = -1; // EDIT BY MR + /* EDIT BY MR if (BuildVars.DEBUG_VERSION) { sendLogsRow = rowCount++; clearLogsRow = rowCount++; switchBackendButtonRow = rowCount++; } - // EDIT BY MR - else { - sendLogsRow = -1; - clearLogsRow = -1; - switchBackendButtonRow = -1; - } - // /EDIT BY MR - versionRow = rowCount++; + */ + versionRow = -1; // EDIT BY MR -- rowCount++; contactsSectionRow = -1; // EDIT BY MR - rowCount++; contactsReimportRow = -1; // EDIT BY MR -rowCount++; contactsSortRow = -1; // EDIT BY MR -- rowCount++; @@ -446,9 +445,13 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter */ } else if (i == sendLogsRow) { + /* EDIT BY MR sendLogs(); + */ } else if (i == clearLogsRow) { + /* EDIT BY MR FileLog.cleanupLogs(); + */ } else if (i == sendByEnterRow) { SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE); boolean send = preferences.getBoolean("send_by_enter", false); @@ -488,6 +491,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter } else if (i == languageRow) { presentFragment(new LanguageSelectActivity()); } else if (i == switchBackendButtonRow) { + /* EDIT BY MR if (getParentActivity() == null) { return; } @@ -502,9 +506,24 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter }); builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null); showDialog(builder.create()); + */ } else if (i == telegramFaqRow) { + /* EDIT BY MR Browser.openUrl(getParentActivity(), LocaleController.getString("TelegramFaqUrl", R.string.TelegramFaqUrl)); - } + */ + // EDIT BY MR + AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); + builder.setTitle(LocaleController.getString("AppName", R.string.AppName) + " " + getVersion()); + builder.setMessage(MrMailbox.MrMailboxGetInfo(MrMailbox.hMailbox)+" Frontend based upon Telegram for Android."); + builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + ; + } + }); + showDialog(builder.create()); + // /EDIT BY MR + } else if (i == privacyPolicyRow) { /* EDIT BY MR Browser.openUrl(getParentActivity(), LocaleController.getString("PrivacyPolicyUrl", R.string.PrivacyPolicyUrl)); @@ -664,6 +683,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter @Override public boolean onItemLongClick(AdapterView parent, View view, int position, long id) { + /* EDIT BY MR if (position == versionRow) { pressCount++; if (pressCount >= 2) { @@ -693,6 +713,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter } return true; } + */ return false; } }); @@ -842,6 +863,34 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter return fragmentView; } + // EDIT BY MR + private String getVersion() + { + try { + PackageInfo pInfo = ApplicationLoader.applicationContext.getPackageManager().getPackageInfo(ApplicationLoader.applicationContext.getPackageName(), 0); + int code = pInfo.versionCode / 10; + String abi = ""; + switch (pInfo.versionCode % 10) { + case 0: + abi = "arm"; + break; + case 1: + abi = "arm-v7a"; + break; + case 2: + abi = "x86"; + break; + case 3: + abi = "universal"; + break; + } + return String.format(Locale.US, "V%s-%s", pInfo.versionName, abi); + } catch (Exception e) { + return "ErrVersion"; + } + } + // /EDIT BY MR + @Override protected void onDialogDismiss(Dialog dialog) { MediaController.getInstance().checkAutodownloadSettings(); @@ -1173,6 +1222,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter */ } + /* EDIT BY MR private void sendLogs() { try { ArrayList uris = new ArrayList<>(); @@ -1196,6 +1246,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter e.printStackTrace(); } } + */ private class ListAdapter extends BaseFragmentAdapter { private Context mContext; @@ -1300,7 +1351,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter } else if (i == switchBackendButtonRow) { textCell.setText("Switch Backend", true); } else if (i == telegramFaqRow) { - textCell.setText(LocaleController.getString("TelegramFAQ", R.string.TelegramFaq), true); + textCell.setText(LocaleController.getString("AboutThisProgram", R.string.AboutThisProgram), true); } else if (i == contactsReimportRow) { textCell.setText(LocaleController.getString("ImportContacts", R.string.ImportContacts), true); } else if (i == stickersRow) { @@ -1342,7 +1393,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter if (i == settingsSectionRow2) { ((HeaderCell) view).setText(LocaleController.getString("SETTINGS", R.string.SETTINGS)); } else if (i == supportSectionRow2) { - ((HeaderCell) view).setText(LocaleController.getString("Support", R.string.Support)); + ((HeaderCell) view).setText(LocaleController.getString("Info", R.string.Info)); // EDIT BY MR -- was: Support } else if (i == messagesSectionRow2) { ((HeaderCell) view).setText(LocaleController.getString("MessagesSettings", R.string.MessagesSettings)); } else if (i == mediaDownloadSection2) { @@ -1352,7 +1403,8 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter } } else if (type == 5) { if (view == null) { - view = new TextInfoCell(mContext); + view = new TextInfoPrivacyCell(mContext); + /* EDIT BY MR try { PackageInfo pInfo = ApplicationLoader.applicationContext.getPackageManager().getPackageInfo(ApplicationLoader.applicationContext.getPackageName(), 0); int code = pInfo.versionCode / 10; @@ -1371,11 +1423,11 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter abi = "universal"; break; } - ((TextInfoCell) view).setText(String.format(Locale.US, "V%s (%d), Backend V%s (%s)", - pInfo.versionName, code, MrMailbox.MrGetVersionStr(), abi)); // EDIT BY MR + ((TextInfoCell) view).setText(String.format(Locale.US, "Telegram for Android v%s (%d) %s", pInfo.versionName, code, abi)); } catch (Exception e) { FileLog.e("tmessages", e); } + */ } } else if (type == 6) { if (view == null) { diff --git a/TMessagesProj/src/main/res/values-de/strings.xml b/TMessagesProj/src/main/res/values-de/strings.xml index 8b4c82020..95075af28 100644 --- a/TMessagesProj/src/main/res/values-de/strings.xml +++ b/TMessagesProj/src/main/res/values-de/strings.xml @@ -469,8 +469,8 @@ Alle anderen Geräte abmelden Ereignisse Sprache - Fragen und Antworten - https://messenger.b44t.com/faq + Hilfe + https://messenger.b44t.com/help Datenschutzerklärung Lokalisierung löschen? Falsche Sprachdatei @@ -533,7 +533,7 @@ Direktes Teilen Letzte Chats im Teilen-Menü anzeigen - Cache-Einstellungen + Speicher Lokale Datenbank Textnachrichten-Cache leeren? Zwischengespeicherte Textnachrichten werden entfernt und die Datenbank optimiert um Speicherplatz zurückzuerhalten. Auf Null lässt sich die Größe jedoch nicht reduzieren, da die App einige Daten für den laufenden Betrieb benötigt.\n\nHinweis: Der Vorgang kann mehrere Minuten dauern. @@ -551,20 +551,12 @@ Bilder, Videos und andere Dateien, auf die du während dieser Zeit nicht zugegriffen]]> hast, werden von diesem Gerät gelöscht, um Speicherplatz zu sparen. Dauerhaft - Sitzungen - Aktuelles Gerät - Keine anderen Geräte - Du kannst dich von jedem Handy, Tablet und Computer bei Telegram mit derselben Telefonnummer anmelden. Alles wird immer sofort synchronisiert. - Andere Geräte Überprüfe alle deine angemeldeten Geräte. - Tippe auf eine Sitzung um sie zu beenden. - Dieses Gerät abmelden? inoffizielle Version Pincode-Sperre Pincode ändern Wenn du die Code-Sperre aktivierst, erscheint ein Schloss ganz oben über der Chatliste. Tippe auf das Schloss, um deine Chats zu sperren und zu entsperren.\n\nÜbrigens: Wenn du den Pincode vergisst, musst du Telegram löschen und neu installieren. Dadurch verlierst du alle Geheimen Chats. - Du wirst nun ein Schloss über der Chatliste sehen. Tippe darauf um deine Chats mit dem neuen Pincode zu sperren. Pincode Kennwort Aktuellen Pincode eingeben @@ -572,7 +564,6 @@ Neuen Pincode eingeben Deinen Pincode eingeben Neuen Pincode erneut eingben - Ungültiger Pincode Pincode falsch Auto-Sperre Sperrt App bei Inaktivität automatisch. @@ -660,8 +651,6 @@ Videobeschriftung Beschriftung - Dein Kennwort - Bitte aktuelles Kennwort eingeben Tut uns leid Da du für diesen Fall keine Email Adresse hinterlegt hast, kannst du nur noch hoffen, dass dir dein Kennwort wieder einfällt oder du musst dein Telegram Konto zurückzusetzen. Wir haben den Wiederherstellungscode an diese Adresse geschickt:\n\n%1$s @@ -818,7 +807,6 @@ Nachricht an %1$s senden? Kontakt senden an %1$s? Wirklich abmelden?\n\nDu kannst Telegram von all deinen Geräten gleichzeitig nutzen.\n\nWichtig: Abmelden löscht deine Geheimen Chats. - Sicher, dass du alle anderen Geräte abmelden möchtest? Gruppe löschen und verlassen? Möchtest du wirklich diesen Chat löschen? Deinen Standort teilen? @@ -1098,4 +1086,5 @@ Für bekannte E-Mail-Anbieter werden die weiteren Einstellungen automatisch ermittelt. Manchmal muss die IMAP-/SMTP-Funktion noch in der E-Mail-Weboberfläche eingeschaltet werden.\n\nBei Problemen kann der E-Mail-Anbieter oder ein Bekannter weiterhelfen. Konto nicht konfiguriert + Über LibreChat diff --git a/TMessagesProj/src/main/res/values-es/strings.xml b/TMessagesProj/src/main/res/values-es/strings.xml index d77f7fc81..015c5f0c4 100644 --- a/TMessagesProj/src/main/res/values-es/strings.xml +++ b/TMessagesProj/src/main/res/values-es/strings.xml @@ -470,7 +470,7 @@ Eventos Idioma Preguntas frecuentes - https://telegram.org/faq/es + https://messenger.b44t.com/help Política de privacidad ¿Eliminar traducción? Archivo de traducción incorrecto @@ -551,20 +551,12 @@ Las fotos, los vídeos y los archivos de los chats en la nube a los que no accedas]]> durante ese periodo de tiempo se eliminarán del dispositivo para liberar espacio. Siempre - Sesiones activas - Sesión actual - Sin otras sesiones activas - Puedes iniciar sesión en Telegram desde otro móvil, tablet o computador, usando el mismo número de teléfono. Todos tus datos se sincronizarán al instante. - Sesiones activas Controla tus sesiones en otros dispositivos. - Toca una sesión para cerrarla. - ¿Cerrar esta sesión? aplicación no oficial Código de acceso Cambiar código de acceso Cuando configuras un código, aparece un candado en la pantalla de chats. Toca sobre él para bloquear y desbloquear la aplicación.\n\nNota: si olvidas el código, tendrás que eliminar y reinstalar la aplicación. Perderás todos los chats secretos. - Ahora verás un candado en la pantalla de chats. Púlsalo para bloquear tu Telegram con tu nuevo código. PIN Contraseña Pon tu código de acceso actual @@ -572,7 +564,6 @@ Pon tu nuevo código de acceso Pon tu código de acceso Pon, otra vez, tu nuevo código - Código de acceso inválido Los códigos de acceso no coinciden Bloqueo automático El bloqueo se activará transcurrido este tiempo. @@ -660,8 +651,6 @@ Comentario de vídeo Comentario - Tu contraseña - Por favor, pon tu contraseña Lo sentimos Como no estableciste un e-mail de recuperación cuando configuraste tu contraseña, las opciones restantes son recordar tu contraseña o restablecer tu cuenta. Enviamos un código de recuperación al e-mail que nos diste:\n\n%1$s @@ -818,7 +807,6 @@ ¿Enviar mensajes a %1$s? ¿Enviar contacto a %1$s? ¿Quieres cerrar sesión?\n\nConsidera que puedes usar Telegram en todos tus dispositivos a la vez.\n\nRecuerda que, al cerrar sesión, eliminas todos tus chats secretos. - ¿Quieres terminar todas las otras sesiones? ¿Quieres eliminar y dejar el grupo? ¿Quieres eliminar este chat? ¿Compartir tu ubicación? diff --git a/TMessagesProj/src/main/res/values-it/strings.xml b/TMessagesProj/src/main/res/values-it/strings.xml index 0ad71a41c..cb3572347 100644 --- a/TMessagesProj/src/main/res/values-it/strings.xml +++ b/TMessagesProj/src/main/res/values-it/strings.xml @@ -470,7 +470,7 @@ Eventi Lingua Domande frequenti - https://telegram.org/faq/it + https://messenger.b44t.com/help Informativa sulla privacy Eliminare la traduzione? File di traduzione non valido @@ -551,20 +551,12 @@ Foto, video e altri file dalle chat nel cloud che non hai aperto]]> in questo periodo verranno eliminati dal dispositivo per preservare lo spazio sul disco. Per sempre - Sessioni attive - Sessione corrente - Nessun\'altra sessione attiva - Ti puoi connettere a Telegram da altri dispositivi mobili, tablet e desktop usando lo stesso numero. Tutti i tuoi dati saranno sincronizzati istantaneamente. - Sessioni attive Controlla le tue sessioni sugli altri dispositivi. - Premi su una sessione per terminarla. - Terminare questa sessione? app non ufficiale Blocco con codice Cambia codice Quando imposti un codice, un\'icona col lucchetto apparirà nella pagina delle chat. Premi su di essa per bloccare e sbloccare l\'app.\n\nNota: se ti dimentichi il codice, dovrai disinstallare e reinstallare l\'app. Tutte le chat segrete verranno perse. - Ora visualizzerai un\'icona col lucchetto nella pagina delle chat. Premi su di essa per bloccare la tua app Telegram con il codice. PIN Password Inserisci il tuo codice corrente @@ -572,7 +564,6 @@ Inserisci il nuovo codice Inserisci il tuo codice Reinserisci il nuovo codice - Codice non valido I codici non corrispondono Blocco automatico Richiede il codice se lontano per del tempo. @@ -660,8 +651,6 @@ Didascalia video Didascalia - La tua password - Inserisci la tua password Spiacenti Siccome non hai fornito un\'email di recupero quando hai impostato la tua password, non ti resta che ricordarti la password o ripristinare il tuo account. Abbiamo inviato un codice di ripristino alla e-mail che ci hai fornito:\n\n%1$s @@ -818,7 +807,6 @@ Inviare i messaggi a %1$s? Inviare contatto a %1$s? Sei sicuro di voler uscire?\n\nNota che puoi usare Telegram su tutti i tuoi dispositivi contemporaneamente.\n\nRicorda, uscendo eliminerai tutte le Chat Segrete. - Terminare tutte le altre sessioni? Sei sicuro di voler uscire ed eliminare il gruppo? Sei sicuro di voler eliminare questa chat? Condividere la tua posizione? diff --git a/TMessagesProj/src/main/res/values-nl/strings.xml b/TMessagesProj/src/main/res/values-nl/strings.xml index 6dac239a0..917c3b2df 100644 --- a/TMessagesProj/src/main/res/values-nl/strings.xml +++ b/TMessagesProj/src/main/res/values-nl/strings.xml @@ -470,7 +470,7 @@ Gebeurtenissen Taal Veelgestelde vragen - https://telegram.org/faq + https://messenger.b44t.com/help Privacybeleid Vertaling verwijderen? Ongeldig vertalingsbestand @@ -551,20 +551,12 @@ Foto\'s, video\'s en andere bestanden uit cloudchats die je gedurende deze periode niet hebt geopend]]> zullen worden verwijderd van dit apparaat om ruimte te besparen. Voor altijd - Actieve sessies - Huidige sessie - Geen andere actieve sessies - Je kunt in Telegram inloggen vanaf andere apparaten (mobiel, tablet, desktop) met hetzelfde telefoonnummer. Al je data zal direct worden gesynchroniseerd. - Actieve sessies Beheer je sessies van andere apparaten. - Tik op een sessie om deze te beëindigen. - Deze sessie beëindigen? onofficiële app Toegangscode-vergrendeling Toegangscode wijzigen Als je een toegangscode instelt verschijnt er een slotje op de chatspagina. Tik erop om Telegram te vergrendelen of te ontgrendelen.\n\nLet op: vergeet je de toegangscode dan zul je de app moeten verwijderen en herinstalleren. Alle geheime chats gaan daarbij verloren. - Je zult nu een slotje op de chatspagina zien. Tik erop om Telegram te vergrendelen met je nieuwe toegangscode. PIN Wachtwoord Huidige toegangscode invoeren @@ -572,7 +564,6 @@ Nieuwe toegangscode invoeren Toegangscode invoeren Toegangscode opnieuw invoeren - Ongeldige toegangscode Toegangscodes komen niet overeen Automatisch vergrendelen Vraag om toegangscode indien afwezig @@ -660,8 +651,6 @@ Video-onderschrift Onderschrift - Je wachtwoord - Wachtwoord invoeren Sorry Omdat je geen herstel-e-mailadres hebt opgegeven voor je wachtwoord zul je bij verlies van je wachtwoord je account moeten resetten. We hebben een herstelcode naar je opgegeven e-mailadres gestuurd:\n\n%1$s @@ -818,7 +807,6 @@ Berichten naar %1$s versturen? Contact delen met %1$s? Weet je zeker dat je wilt uitloggen?\n\nTelegram kun je naadloos op al je apparaten tegelijkertijd gebruiken.\n\nLet op! Als je uitlogt worden al je geheime chats verwijderd. - Alle apparaten behalve het huidige apparaat uitloggen? Verwijderen en de groep verlaten? Chat echt verwijderen? Locatie delen? diff --git a/TMessagesProj/src/main/res/values-pt/strings.xml b/TMessagesProj/src/main/res/values-pt/strings.xml index 4f26fd11c..513471fb3 100644 --- a/TMessagesProj/src/main/res/values-pt/strings.xml +++ b/TMessagesProj/src/main/res/values-pt/strings.xml @@ -470,7 +470,7 @@ Eventos Idioma Perguntas frequentes - https://telegram.org/faq + https://messenger.b44t.com/help Política de Privacidade Apagar localização? Arquivo de localização incorreto @@ -551,20 +551,12 @@ Fotos, vídeos e outros arquivos da nuvem que você não acessou]]> durante esse período serão removidos deste dispositivo para economizar espaço em disco. Permanentemente - Sessões Ativas - Sessão atual - Nenhuma outra sessão ativa - Você pode entrar no Telegram a partir de outro celular, tablet ou computador usando o mesmo número de telefone. Todos os seus dados serão sincronizados instantaneamente. - Sessões Ativas Controle suas sessões em outros aparelhos. - Toque em uma sessão para terminá-la. - Encerrar essa sessão? aplicativo não oficial Senha de Bloqueio Alterar Senha Quando você define uma senha adicional, um ícone de cadeado aparece na página de chats. Clique para bloquear e desbloquear o app.\n\nNota: se você esquecer a sua senha, terá de excluir e reinstalar o app. Todos os chats secretos serão perdidos. - Você verá o ícone do cadeado na página de chats. Clique para bloquear seu app do Telegram com a sua nova senha. PIN Senha Insira sua senha atual @@ -572,7 +564,6 @@ Insira sua nova senha Insira sua senha Re-insira sua nova senha - Senha inválida As senhas não são iguais Auto-bloquear Requisitar senha se estiver ausente por muito tempo. @@ -660,8 +651,6 @@ Legenda do Vídeo Legenda - Sua senha - Por favor, digite a sua senha Desculpe Como você não indicou um e-mail de recuperação quando configurou a sua senha, as únicas opções restantes são lembrar a senha ou apagar a sua conta. O código de recuperação foi enviado para o e-mail fornecido: \n\n%1$s @@ -818,7 +807,6 @@ Enviar mensagens para %1$s? Enviar contato para %1$s? Você tem certeza que desejar sair?\n\nSaiba que você pode usar o Telegram em vários dispositivos de uma vez.\n\nLembre-se, sair apaga todos os seus Chats Secretos. - Você tem certeza que deseja terminar todas as outras sessões? Você tem certeza que apagar e sair do grupo? Você tem certeza que deseja apagar esta conversa? Compartilhar sua localização? diff --git a/TMessagesProj/src/main/res/values/strings.xml b/TMessagesProj/src/main/res/values/strings.xml index 7f5987240..9087a0022 100644 --- a/TMessagesProj/src/main/res/values/strings.xml +++ b/TMessagesProj/src/main/res/values/strings.xml @@ -469,8 +469,8 @@ Terminate All Other Sessions Events Language - FAQ - https://messenger.b44t.com/faq + Help + https://messenger.b44t.com/help Privacy Policy Delete localization? Incorrect localization file @@ -533,7 +533,7 @@ Direct Share Show recent chats in share menu - Cache Settings + Storage Local Database Clear cached text messages? Clearing the local database will delete the texts of cached messages and compress the database to save internal disk space. Telegram needs some data to work, so database size will not reach zero.\n\nThis operation can take a few minutes to complete. @@ -551,20 +551,12 @@ Photos, videos and other files from cloud chats that you have not accessed]]> during this period will be removed from this device to save disk space. Forever - Active Sessions - Current session - No other active sessions - You can log in to Telegram from other mobile, tablet and desktop devices, using the same phone number. All your data will be instantly synchronized. - Active Sessions Control your sessions on other devices. - Tap on a session to terminate. - Terminate this session? unofficial app Passcode Lock Change Passcode When you set up an additional passcode, a lock icon will appear on the chats page. Tap it to lock and unlock your Telegram app.\n\nNote: if you forget the passcode, you\'ll need to delete and reinstall the app. All secret chats will be lost. - You will now see a lock icon on the chats page. Tap it to lock your Telegram app with your new passcode. PIN Password Enter your current passcode @@ -572,7 +564,6 @@ Enter your new passcode Enter your passcode Re-enter your new passcode - Invalid passcode Passcodes do not match Auto-lock Require passcode if away for a time. @@ -660,8 +651,6 @@ Video Caption Caption - Your Password - Please enter your password Sorry Since you haven\'t provided a recovery e-mail when setting up your password, your remaining options are either to remember your password or to reset your account. We have sent a recovery code to the e-mail you provided:\n\n%1$s @@ -818,7 +807,6 @@ Send messages to %1$s? Send contact to %1$s? Are you sure you want to log out?\n\nNote that you can seamlessly use Telegram on all your devices at once.\n\nRemember, logging out kills all your Secret Chats. - Are you sure you want to terminate all other sessions? Are you sure you want to delete and leave the group? Are you sure you want to delete this chat? Share your location? @@ -1098,4 +1086,5 @@ For known e-mail providers, the following settings are determinated automatically. Sometimes, IMAP/SMPT needs to be enabled in the e-mail web frontend.\n\nOn problems, ask your e-mail-provider or your friends. Account not configured + About LibreChat