From a137f7a22ff238d9999bf2676d8d7fde0d0ad2df Mon Sep 17 00:00:00 2001 From: DrKLO Date: Tue, 18 Nov 2014 15:37:11 +0300 Subject: [PATCH] Bug fixes --- .../org/telegram/ui/ActionBar/ActionBar.java | 6 +-- .../org/telegram/ui/Cells/ChatMediaCell.java | 12 +++--- .../java/org/telegram/ui/ChatActivity.java | 37 +++++++++++++------ .../org/telegram/ui/ContactsActivity.java | 10 ++++- .../java/org/telegram/ui/LaunchActivity.java | 6 +++ .../org/telegram/ui/LocationActivity.java | 3 +- .../java/org/telegram/ui/ProfileActivity.java | 5 ++- .../org/telegram/ui/SettingsActivity.java | 3 +- .../org/telegram/ui/Views/AvatarDrawable.java | 6 +-- .../res/drawable-v21/bar_selector_orange.xml | 2 +- .../res/drawable-v21/bar_selector_pink.xml | 2 +- .../res/drawable-v21/bar_selector_yellow.xml | 2 +- .../main/res/drawable/bar_selector_orange.xml | 6 +-- .../main/res/drawable/bar_selector_pink.xml | 6 +-- .../main/res/drawable/bar_selector_yellow.xml | 6 +-- .../res/layout/location_attach_layout.xml | 2 +- .../src/main/res/values-ar/strings.xml | 2 + .../src/main/res/values-de/strings.xml | 6 ++- .../src/main/res/values-it/strings.xml | 2 + .../src/main/res/values-ko/strings.xml | 2 + .../src/main/res/values-nl/strings.xml | 8 ++-- .../src/main/res/values-pt-rBR/strings.xml | 6 ++- .../src/main/res/values-pt-rPT/strings.xml | 6 ++- TMessagesProj/src/main/res/values/strings.xml | 6 ++- 24 files changed, 100 insertions(+), 52 deletions(-) diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java index c5634d07..4ae92f59 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBar.java @@ -232,7 +232,7 @@ public class ActionBar extends FrameLayout { createSubtitleTextView(); } if (subTitleTextView != null) { - subTitleTextView.setVisibility(value != null ? VISIBLE : GONE); + subTitleTextView.setVisibility(value != null && !isSearchFieldVisible ? VISIBLE : GONE); subTitleTextView.setText(value); positionTitle(getMeasuredWidth(), getMeasuredHeight()); } @@ -274,7 +274,7 @@ public class ActionBar extends FrameLayout { } if (titleTextView != null) { lastTitle = value; - titleTextView.setVisibility(value != null ? VISIBLE : GONE); + titleTextView.setVisibility(value != null && !isSearchFieldVisible ? VISIBLE : GONE); titleTextView.setText(value); positionTitle(getMeasuredWidth(), getMeasuredHeight()); } @@ -433,7 +433,7 @@ public class ActionBar extends FrameLayout { createTitleTextView(); } if (titleTextView != null) { - titleTextView.setVisibility(textToSet != null ? VISIBLE : GONE); + titleTextView.setVisibility(textToSet != null && !isSearchFieldVisible ? VISIBLE : GONE); titleTextView.setText(textToSet); positionTitle(getMeasuredWidth(), getMeasuredHeight()); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMediaCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMediaCell.java index d206027f..4ac648c4 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMediaCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMediaCell.java @@ -807,11 +807,13 @@ public class ChatMediaCell extends ChatBaseCell implements MediaController.FileD if (allowedToSetPhoto == value) { return; } - allowedToSetPhoto = value; - if (value && currentMessageObject != null && currentMessageObject.type == 1) { - MessageObject temp = currentMessageObject; - currentMessageObject = null; - setMessageObject(temp); + if (currentMessageObject != null && currentMessageObject.type == 1) { + allowedToSetPhoto = value; + if (value) { + MessageObject temp = currentMessageObject; + currentMessageObject = null; + setMessageObject(temp); + } } } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index cc19bdc5..22dac0cf 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -594,19 +594,32 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not actionBar.hideActionMode(); updateVisibleRows(); } else if (id == delete) { - ArrayList ids = new ArrayList(selectedMessagesIds.keySet()); - ArrayList random_ids = null; - if (currentEncryptedChat != null) { - random_ids = new ArrayList(); - for (HashMap.Entry entry : selectedMessagesIds.entrySet()) { - MessageObject msg = entry.getValue(); - if (msg.messageOwner.random_id != 0 && msg.type != 10) { - random_ids.add(msg.messageOwner.random_id); - } - } + if (getParentActivity() == null) { + return; } - MessagesController.getInstance().deleteMessages(ids, random_ids, currentEncryptedChat); - actionBar.hideActionMode(); + AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); + builder.setMessage(LocaleController.formatString("AreYouSureDeleteMessages", R.string.AreYouSureDeleteMessages, LocaleController.formatPluralString("messages", selectedMessagesIds.size()))); + builder.setTitle(LocaleController.getString("AppName", R.string.AppName)); + builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + ArrayList ids = new ArrayList(selectedMessagesIds.keySet()); + ArrayList random_ids = null; + if (currentEncryptedChat != null) { + random_ids = new ArrayList(); + for (HashMap.Entry entry : selectedMessagesIds.entrySet()) { + MessageObject msg = entry.getValue(); + if (msg.messageOwner.random_id != 0 && msg.type != 10) { + random_ids.add(msg.messageOwner.random_id); + } + } + } + MessagesController.getInstance().deleteMessages(ids, random_ids, currentEncryptedChat); + actionBar.hideActionMode(); + } + }); + builder.setNegativeButton(LocaleController.getString("Cancel", R.string.Cancel), null); + showAlertDialog(builder); } else if (id == forward) { Bundle args = new Bundle(); args.putBoolean("onlySelect", true); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java index 1c8142cf..deba9e8f 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java @@ -120,7 +120,15 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter actionBar.setBackButtonImage(R.drawable.ic_ab_back); actionBar.setAllowOverlayTitle(true); - actionBar.setTitle(destroyAfterSelect ? LocaleController.getString("SelectContact", R.string.SelectContact) : LocaleController.getString("Contacts", R.string.Contacts)); + if (destroyAfterSelect) { + if (returnAsResult) { + actionBar.setTitle(LocaleController.getString("SelectContact", R.string.SelectContact)); + } else { + actionBar.setTitle(LocaleController.getString("NewMessageTitle", R.string.NewMessageTitle)); + } + } else { + actionBar.setTitle(LocaleController.getString("Contacts", R.string.Contacts)); + } actionBar.setActionBarMenuOnItemClick(new ActionBar.ActionBarMenuOnItemClick() { @Override diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java index 41ec715f..9785b7d1 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java @@ -349,6 +349,12 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa } catch (Exception e) { FileLog.e("tmessages", e); } + } else { + if (AndroidUtilities.isTablet()) { + drawerLayoutContainer.setAllowOpenDrawer(actionBarLayout.fragmentsStack.size() <= 1 && layersActionBarLayout.fragmentsStack.isEmpty()); + } else { + drawerLayoutContainer.setAllowOpenDrawer(actionBarLayout.fragmentsStack.size() <= 1); + } } handleIntent(getIntent(), false, savedInstanceState != null); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java index 2f810775..be7760ae 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java @@ -153,7 +153,8 @@ public class LocationActivity extends BaseFragment implements NotificationCenter View bottomView = fragmentView.findViewById(R.id.location_bottom_view); TextView sendButton = (TextView) fragmentView.findViewById(R.id.location_send_button); if (sendButton != null) { - sendButton.setText(LocaleController.getString("SendLocation", R.string.SendLocation)); + sendButton.setText(LocaleController.getString("SendLocation", R.string.SendLocation).toUpperCase()); + sendButton.setTypeface(AndroidUtilities.getTypeface("fonts/rmedium.ttf")); } mapView = (MapView)fragmentView.findViewById(R.id.map_view); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java index 131b3180..2a365a56 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java @@ -697,7 +697,8 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. layoutParams.topMargin = (actionBar.getOccupyStatusBar() ? AndroidUtilities.statusBarHeight : 0) + AndroidUtilities.getCurrentActionBarHeight() + actionBar.getExtraHeight() - AndroidUtilities.dp(29.5f); writeButton.setLayoutParams(layoutParams); ViewProxy.setAlpha(writeButton, diff); - writeButton.setVisibility(diff == 0 ? View.GONE : View.VISIBLE); + writeButton.setEnabled(diff > 0.02); + writeButton.setVisibility(diff <= 0.02 ? View.GONE : View.VISIBLE); } avatarImage.imageReceiver.setRoundRadius(AndroidUtilities.dp(avatarSize / 2)); @@ -1063,7 +1064,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. photo = chat.photo.photo_small; photoBig = chat.photo.photo_big; } - avatarImage.setImage(photo, "50_50", new AvatarDrawable(chat)); + avatarImage.setImage(photo, "50_50", new AvatarDrawable(chat, true)); avatarImage.imageReceiver.setVisible(!PhotoViewer.getInstance().isShowingImage(photoBig), false); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java index 4160af3f..acdade1c 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java @@ -885,7 +885,8 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter layoutParams.topMargin = (actionBar.getOccupyStatusBar() ? AndroidUtilities.statusBarHeight : 0) + AndroidUtilities.getCurrentActionBarHeight() + actionBar.getExtraHeight() - AndroidUtilities.dp(29.5f); writeButton.setLayoutParams(layoutParams); ViewProxy.setAlpha(writeButton, diff); - writeButton.setVisibility(diff == 0 ? View.GONE : View.VISIBLE); + writeButton.setEnabled(diff > 0.02); + writeButton.setVisibility(diff <= 0.02 ? View.GONE : View.VISIBLE); avatarImage.imageReceiver.setRoundRadius(AndroidUtilities.dp(avatarSize / 2)); layoutParams = (FrameLayout.LayoutParams) avatarImage.getLayoutParams(); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Views/AvatarDrawable.java b/TMessagesProj/src/main/java/org/telegram/ui/Views/AvatarDrawable.java index d99d4785..5a5b7795 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Views/AvatarDrawable.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Views/AvatarDrawable.java @@ -31,9 +31,9 @@ public class AvatarDrawable extends Drawable { private static Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG); private static TextPaint namePaint; private static int[] arrColors = {0xffe56555, 0xfff28c48, 0xffeec764, 0xff76c84d, 0xff5fbed5, 0xff549cdd, 0xff8e85ee, 0xfff2749a}; - private static int[] arrColorsProfiles = {0xffd86f65, 0xffdc9663, 0xffdebc68, 0xff67b35d, 0xff56a2bb, 0xff5c98cd, 0xff8c79d2, 0xffda738e}; - private static int[] arrColorsProfilesBack = {0xffca6056, 0xffcf8550, 0xffcfa742, 0xff56a14c, 0xff4492ac, 0xff4c84b6, 0xff7d6ac4, 0xffc9637e}; - private static int[] arrColorsProfilesText = {0xfff9cbc5, 0xfffadbc4, 0xfff7e7bf, 0xffc0edba, 0xffb8e2f0, 0xffb3d7f7, 0xffcdc4ed, 0xfff2cfd8}; + private static int[] arrColorsProfiles = {0xffd86f65, 0xfff69d61, 0xfffabb3c, 0xff67b35d, 0xff56a2bb, 0xff5c98cd, 0xff8c79d2, 0xfff37fa6}; + private static int[] arrColorsProfilesBack = {0xffca6056, 0xfff18944, 0xfff2b02c, 0xff56a14c, 0xff4492ac, 0xff4c84b6, 0xff7d6ac4, 0xffe66b94}; + private static int[] arrColorsProfilesText = {0xfff9cbc5, 0xfffdddc8, 0xfffce5bb, 0xffc0edba, 0xffb8e2f0, 0xffb3d7f7, 0xffcdc4ed, 0xfffed1e0}; private static int[] arrColorsButtons = {R.drawable.bar_selector_red, R.drawable.bar_selector_orange, R.drawable.bar_selector_yellow, R.drawable.bar_selector_green, R.drawable.bar_selector_cyan, R.drawable.bar_selector_blue, R.drawable.bar_selector_violet, R.drawable.bar_selector_pink}; diff --git a/TMessagesProj/src/main/res/drawable-v21/bar_selector_orange.xml b/TMessagesProj/src/main/res/drawable-v21/bar_selector_orange.xml index 5a4c89bc..2d5c96c8 100644 --- a/TMessagesProj/src/main/res/drawable-v21/bar_selector_orange.xml +++ b/TMessagesProj/src/main/res/drawable-v21/bar_selector_orange.xml @@ -1,4 +1,4 @@ + android:color="#ffe67429"> \ No newline at end of file diff --git a/TMessagesProj/src/main/res/drawable-v21/bar_selector_pink.xml b/TMessagesProj/src/main/res/drawable-v21/bar_selector_pink.xml index d3fa48d1..72f76405 100644 --- a/TMessagesProj/src/main/res/drawable-v21/bar_selector_pink.xml +++ b/TMessagesProj/src/main/res/drawable-v21/bar_selector_pink.xml @@ -1,4 +1,4 @@ + android:color="#ffd44e7b"> \ No newline at end of file diff --git a/TMessagesProj/src/main/res/drawable-v21/bar_selector_yellow.xml b/TMessagesProj/src/main/res/drawable-v21/bar_selector_yellow.xml index 2559175d..f0ee5a20 100644 --- a/TMessagesProj/src/main/res/drawable-v21/bar_selector_yellow.xml +++ b/TMessagesProj/src/main/res/drawable-v21/bar_selector_yellow.xml @@ -1,4 +1,4 @@ + android:color="#ffef9f09"> \ No newline at end of file diff --git a/TMessagesProj/src/main/res/drawable/bar_selector_orange.xml b/TMessagesProj/src/main/res/drawable/bar_selector_orange.xml index b468c53f..e1880b1e 100644 --- a/TMessagesProj/src/main/res/drawable/bar_selector_orange.xml +++ b/TMessagesProj/src/main/res/drawable/bar_selector_orange.xml @@ -2,17 +2,17 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + - + - + diff --git a/TMessagesProj/src/main/res/drawable/bar_selector_pink.xml b/TMessagesProj/src/main/res/drawable/bar_selector_pink.xml index 4990bc1a..9d81d09d 100644 --- a/TMessagesProj/src/main/res/drawable/bar_selector_pink.xml +++ b/TMessagesProj/src/main/res/drawable/bar_selector_pink.xml @@ -2,17 +2,17 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + - + - + diff --git a/TMessagesProj/src/main/res/drawable/bar_selector_yellow.xml b/TMessagesProj/src/main/res/drawable/bar_selector_yellow.xml index 819c2e95..98da9c12 100644 --- a/TMessagesProj/src/main/res/drawable/bar_selector_yellow.xml +++ b/TMessagesProj/src/main/res/drawable/bar_selector_yellow.xml @@ -2,17 +2,17 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + - + - + diff --git a/TMessagesProj/src/main/res/layout/location_attach_layout.xml b/TMessagesProj/src/main/res/layout/location_attach_layout.xml index 163f904c..0775f305 100644 --- a/TMessagesProj/src/main/res/layout/location_attach_layout.xml +++ b/TMessagesProj/src/main/res/layout/location_attach_layout.xml @@ -20,7 +20,7 @@ android:layout_marginRight="15dp" android:layout_marginLeft="15dp" android:gravity="center" - android:textSize="18dp" + android:textSize="14dp" android:textColor="#316f9f" android:background="@drawable/location_send_button_states" android:id="@+id/location_send_button"/> diff --git a/TMessagesProj/src/main/res/values-ar/strings.xml b/TMessagesProj/src/main/res/values-ar/strings.xml index 21c97014..16e52016 100644 --- a/TMessagesProj/src/main/res/values-ar/strings.xml +++ b/TMessagesProj/src/main/res/values-ar/strings.xml @@ -143,6 +143,7 @@ الرد على %1$s %1$s %2$s + رسالة جديدة اختر جهة اتصال لا توجد جهات اتصال بعد http://telegram.org/dl2 مرحبا! هيا نستخدم تيليجرام: @@ -399,6 +400,7 @@ هل أنت متأكد من أنك تريد بدء محادثة سرية؟ هل أنت متأكد من رغبتك في إلغاء التسجيل؟ هل أنت متأكد من رغبتك في حذف سجل المحادثات؟ + هل أنت متأكد من رغبتك في حذف %1$s؟ هل ترغب في إرسال رسالة إلى %1$s؟ ؟%1$s هل تريد إعادة توجيه الرسائل إلى .Sorry, this feature is currently not available in your country diff --git a/TMessagesProj/src/main/res/values-de/strings.xml b/TMessagesProj/src/main/res/values-de/strings.xml index d694f644..f61035af 100644 --- a/TMessagesProj/src/main/res/values-de/strings.xml +++ b/TMessagesProj/src/main/res/values-de/strings.xml @@ -143,6 +143,7 @@ %1$s antworten %1$s %2$s + Neue Nachricht Kontakt auswählen Noch keine Kontakte Hey, lass uns zu Telegram wechseln: http://telegram.org/dl2 @@ -308,7 +309,7 @@ Bearbeite wer deinen Online Status sieht. Wer kann deinen Online Status sehen? Ausnahmen hinzufügen - Wichtig: Du kannst den \"zuletzt online\" Status nur von Personen sehen, mit denen du auch deinen teilst. Ansonsten wird die ungefähre Zeit angezeigt (kürzlich, innerhalb einer Woche, innerhalb eines Monats). + Wichtig: Du kannst den \"zuletzt gesehen\" Status nur von Personen sehen, mit denen du auch deinen teilst. Ansonsten wird die ungefähre Zeit angezeigt (kürzlich, innerhalb einer Woche, innerhalb eines Monats). Immer teilen mit Niemals teilen mit Hier kannst du Kontakte hinzufügen, für die eine Ausnahme gemacht werden soll. @@ -388,7 +389,7 @@ %1$s zur Gruppe hinzufügen?\n\nAnzahl der letzten Nachrichten für die Weiterleitung: Nachrichten an %1$s weiterleiten? Nachricht an %1$s senden? - Möchtest du dich wirklich abmelden?\n\n\Du kannst Telegram von all deinen Geräten gleichzeitig nutzen.\n\nWichtig: Abmelden löscht deine Geheimen Chats. + 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? Diese Gruppe wirklich löschen und verlassen? Möchtest du wirklich diesen Chat löschen? @@ -399,6 +400,7 @@ Geheimen Chat starten? Bist du dir sicher, dass du die Registrierung abbrechen willst? Möchtest du wirklich den Verlauf löschen? + Sicher, dass du %1$s löschen willst? Nachricht an %1$s senden? Weiterleiten an %1$s? Verzeihung, diese Funktion ist derzeit in deinem Land nicht verfügbar. diff --git a/TMessagesProj/src/main/res/values-it/strings.xml b/TMessagesProj/src/main/res/values-it/strings.xml index f11a1f0d..ec2540a2 100644 --- a/TMessagesProj/src/main/res/values-it/strings.xml +++ b/TMessagesProj/src/main/res/values-it/strings.xml @@ -143,6 +143,7 @@ Rispondi a %1$s %1$s %2$s + Nuovo messaggio Seleziona contatto Ancora nessun contatto Ehi, è il momento di passare a Telegram: http://telegram.org/dl2 @@ -399,6 +400,7 @@ Iniziare una chat segreta? Sei sicuro di volere eliminare questa registrazione? Sei sicuro di volere eliminare la cronologia? + Sei sicuro di voler eliminare %1$s? Inviare messaggi a %1$s? Inoltra messaggi a %1$s? Ci spiace, questa funzione non è disponibile nel tuo paese. diff --git a/TMessagesProj/src/main/res/values-ko/strings.xml b/TMessagesProj/src/main/res/values-ko/strings.xml index 6c6a227d..4d0c865c 100644 --- a/TMessagesProj/src/main/res/values-ko/strings.xml +++ b/TMessagesProj/src/main/res/values-ko/strings.xml @@ -143,6 +143,7 @@ %1$s님에게 답장하기 %2$s %1$s + 새 메시지 대화상대 선택 대화상대가 없습니다 텔레그램으로 초대합니다! http://telegram.org/dl2 @@ -399,6 +400,7 @@ 비밀대화를 시작할까요? 정말로 가입을 취소하시겠습니까? 정말로 대화내용을 지우시겠습니까? + %1$s: 정말로 삭제하시겠습니까? %1$s 그룹에 메시지를 보낼까요? %1$s 그룹에 메시지를 전달할까요? 이 기능은 회원님의 국가에서는 사용할 수 없습니다. diff --git a/TMessagesProj/src/main/res/values-nl/strings.xml b/TMessagesProj/src/main/res/values-nl/strings.xml index aa02dedd..ca7444d5 100644 --- a/TMessagesProj/src/main/res/values-nl/strings.xml +++ b/TMessagesProj/src/main/res/values-nl/strings.xml @@ -143,6 +143,7 @@ Antwoord op %1$s %1$s %2$s + Nieuw bericht Kies een contact Nog geen contacten Hey! Zullen we overstappen op Telegram? http://telegram.org/dl2 @@ -319,7 +320,7 @@ Toevoegen Sorry, te veel verzoeken. Momenteel is het niet mogelijk om de privacyinstellingen te wijzigen, even geduld alsjeblieft. Logt alle apparaten behalve deze uit. - Druk langdurig op een gebruiker om deze te verwijderen. + Gebruiker vasthouden om te verwijderen. Video bewerken Originele video @@ -390,7 +391,7 @@ Berichten naar %1$s verzenden? 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? - Weet je zeker dat je alles wilt verwijderen en de groep wilt verlaten? + Echt alles verwijderen en de groep verlaten? Weet je zeker dat je dit gesprek wilt verwijderen? Weet je zeker dat je je contactinformatie wilt delen? Weet je zeker dat je deze persoon wilt blokkeren? @@ -398,7 +399,8 @@ Weet je zeker dat je deze contactpersoon wilt verwijderen? Weet je zeker dat je een geheime chat wilt starten? Weet je zeker dat je de registratie wilt annuleren? - Weet je zeker dat je de geschiedenis wilt wissen? + Geschiedenis echt wissen? + %1$s echt verwijderen? Berichten naar %1$s verzenden? Berichten naar %1$s doorsturen? Sorry, deze functie is momenteel niet beschikbaar in jouw land. diff --git a/TMessagesProj/src/main/res/values-pt-rBR/strings.xml b/TMessagesProj/src/main/res/values-pt-rBR/strings.xml index d9ad4695..3811da6a 100644 --- a/TMessagesProj/src/main/res/values-pt-rBR/strings.xml +++ b/TMessagesProj/src/main/res/values-pt-rBR/strings.xml @@ -143,6 +143,7 @@ Responder para %1$s %1$s %2$s + Nova Mensagem Selecionar Contato Ainda não há contatos Ei, vamos mudar para o Telegram: http://telegram.org/dl2 @@ -308,7 +309,7 @@ Alterar quem pode ver o seu Último Acesso. Quem pode ver o seu Último Acesso? Adicionar exceções - Importante: você não poderá ver o tempo de Último Acesso das pessoas com quem você não compartilha o seu tempo de Último Acesso. Será exibido um tempo aproximado (recentemente, na última semana, no último mês). + Importante: você não será capaz de ver quando foi o Último Acesso para as pessoas com quem você não compartilha quando foi seu Último Acesso. Você visualizará a última vez visto aproximada. (recentemente, dentro de uma semana, dentro de um mês). Sempre Mostrar Para Nunca Mostrar Para Estas configurações irão substituir os valores anteriores. @@ -319,7 +320,7 @@ Adicionar Usuários Desculpe, muitas solicitações. Impossível alterar os ajustes de privacidade agora, por favor aguarde. Sair de todos os dispositivos, exceto este. - Toque e segure no usuário para desbloquear + Toque e segure no usuário para deletar. Editar Vídeo Vídeo Original @@ -399,6 +400,7 @@ Você tem certeza que deseja começar um chat secreto? Você tem certeza que deseja cancelar o registro? Você tem certeza que deseja limpar o histórico? + Você tem certeza que deseja deletar %1$s? Enviar mensagens para %1$s? Encaminhar mensagem para %1$s? Desculpe, esta funcionalidade não está disponível para seu país. diff --git a/TMessagesProj/src/main/res/values-pt-rPT/strings.xml b/TMessagesProj/src/main/res/values-pt-rPT/strings.xml index a6e24b34..9d43ec23 100644 --- a/TMessagesProj/src/main/res/values-pt-rPT/strings.xml +++ b/TMessagesProj/src/main/res/values-pt-rPT/strings.xml @@ -143,6 +143,7 @@ Responder para %1$s %1$s %2$s + Nova Mensagem Selecionar Contato Ainda não há contatos Ei, vamos mudar para o Telegram: http://telegram.org/dl2 @@ -308,7 +309,7 @@ Alterar quem pode ver o seu Último Acesso. Quem pode ver o seu Último Acesso? Adicionar exceções - Importante: você não poderá ver o tempo de Último Acesso das pessoas com quem você não compartilha o seu tempo de Último Acesso. Será exibido um tempo aproximado (recentemente, na última semana, no último mês). + Importante: você não será capaz de ver quando foi o Último Acesso para as pessoas com quem você não compartilha quando foi seu Último Acesso. Você visualizará a última vez visto aproximada. (recentemente, dentro de uma semana, dentro de um mês). Sempre Mostrar Para Nunca Mostrar Para Estas configurações irão substituir os valores anteriores. @@ -319,7 +320,7 @@ Adicionar Usuários Desculpe, muitas solicitações. Impossível alterar os ajustes de privacidade agora, por favor aguarde. Sair de todos os dispositivos, exceto este. - Toque e segure no usuário para desbloquear + Toque e segure no usuário para deletar. Editar Vídeo Vídeo Original @@ -399,6 +400,7 @@ Você tem certeza que deseja começar um chat secreto? Você tem certeza que deseja cancelar o registro? Você tem certeza que deseja limpar o histórico? + Você tem certeza que deseja deletar %1$s? Enviar mensagens para %1$s? Encaminhar mensagem para %1$s? Desculpe, esta funcionalidade não está disponível para seu país. diff --git a/TMessagesProj/src/main/res/values/strings.xml b/TMessagesProj/src/main/res/values/strings.xml index 93ab6455..c694fc8d 100644 --- a/TMessagesProj/src/main/res/values/strings.xml +++ b/TMessagesProj/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ - + Telegram @@ -157,6 +157,7 @@ last seen within a week last seen within a month last seen a long time ago + New Message Send message to... Enter group name @@ -308,7 +309,7 @@ Change who can see your Last Seen time. Who can see your Last Seen time? Add exceptions - Important: you won\'t be able to see Last Seen times for people with whom you don\'t share your Last Seen time. Approximate last seen will be shown instead (recently, within a week, witin a month). + Important: you won\'t be able to see Last Seen times for people with whom you don\'t share your Last Seen time. Approximate last seen will be shown instead (recently, within a week, within a month). Always Share With Never Share With These settings will override the values above. @@ -399,6 +400,7 @@ Are you sure you want to start a secret chat? Are you sure you want to cancel registration? Are you sure you want to clear history? + Are you sure you want to delete %1$s? Send messages to %1$s? Forward messages to %1$s? Sorry, this feature is currently not available in your country.