diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index 87d555a03..daf2e0c4e 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -83,7 +83,7 @@ android { defaultConfig { minSdkVersion 8 targetSdkVersion 19 - versionCode 279 + versionCode 280 versionName "1.6.0" } } diff --git a/TMessagesProj/jni/Android.mk b/TMessagesProj/jni/Android.mk index a45cb8de3..33857ab90 100755 --- a/TMessagesProj/jni/Android.mk +++ b/TMessagesProj/jni/Android.mk @@ -234,6 +234,7 @@ LOCAL_SRC_FILES += \ ./audio.c \ ./gif.c \ ./utils.c \ -./image.c +./image.c \ +./fake.c include $(BUILD_SHARED_LIBRARY) \ No newline at end of file diff --git a/TMessagesProj/jni/fake.c b/TMessagesProj/jni/fake.c new file mode 100644 index 000000000..95b86f6fe --- /dev/null +++ b/TMessagesProj/jni/fake.c @@ -0,0 +1,6 @@ +#include + +void fakeFunction() { + printf("some androids has buggy native loader, so i should check size of libs in java to know that native library is correct. So each changed native library should has diffrent size in different app versions. This function will increase lib size for few bytes :)"); + printf("bla blablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablablabla"); +} diff --git a/TMessagesProj/libs/armeabi-v7a/libtmessages.so b/TMessagesProj/libs/armeabi-v7a/libtmessages.so index 078cb27f2..8ffd1fbc4 100755 Binary files a/TMessagesProj/libs/armeabi-v7a/libtmessages.so and b/TMessagesProj/libs/armeabi-v7a/libtmessages.so differ diff --git a/TMessagesProj/libs/armeabi/libtmessages.so b/TMessagesProj/libs/armeabi/libtmessages.so index 710cbf15b..f24065136 100755 Binary files a/TMessagesProj/libs/armeabi/libtmessages.so and b/TMessagesProj/libs/armeabi/libtmessages.so differ diff --git a/TMessagesProj/libs/x86/libtmessages.so b/TMessagesProj/libs/x86/libtmessages.so index 317753d38..f251e2320 100755 Binary files a/TMessagesProj/libs/x86/libtmessages.so and b/TMessagesProj/libs/x86/libtmessages.so differ diff --git a/TMessagesProj/src/main/java/org/telegram/android/MessagesController.java b/TMessagesProj/src/main/java/org/telegram/android/MessagesController.java index a484627ec..e631586e2 100644 --- a/TMessagesProj/src/main/java/org/telegram/android/MessagesController.java +++ b/TMessagesProj/src/main/java/org/telegram/android/MessagesController.java @@ -1346,9 +1346,9 @@ public class MessagesController implements NotificationCenter.NotificationCenter loadingDialogs = false; if (resetEnd) { dialogsEndReached = false; - NotificationCenter.getInstance().postNotificationName(dialogsNeedReload); } loadDialogs(offset, serverOffset, count, false); + NotificationCenter.getInstance().postNotificationName(dialogsNeedReload); } }); return; diff --git a/TMessagesProj/src/main/java/org/telegram/android/MessagesStorage.java b/TMessagesProj/src/main/java/org/telegram/android/MessagesStorage.java index a98c54c06..35378986a 100644 --- a/TMessagesProj/src/main/java/org/telegram/android/MessagesStorage.java +++ b/TMessagesProj/src/main/java/org/telegram/android/MessagesStorage.java @@ -876,7 +876,7 @@ public class MessagesStorage { if (arg.startsWith(q)) { ByteBufferDesc data = buffersStorage.getFreeBuffer(cursor.byteArrayLength(0)); ByteBufferDesc data2 = buffersStorage.getFreeBuffer(cursor.byteArrayLength(6)); - if (data != null && cursor.byteBufferValue(0, data.buffer) != 0 && cursor.byteBufferValue(0, data2.buffer) != 0) { + if (data != null && cursor.byteBufferValue(0, data.buffer) != 0 && cursor.byteBufferValue(6, data2.buffer) != 0) { TLRPC.EncryptedChat chat = (TLRPC.EncryptedChat) TLClassStore.Instance().TLdeserialize(data, data.readInt32()); chat.user_id = cursor.intValue(2); chat.a_or_b = cursor.byteArrayValue(3); diff --git a/TMessagesProj/src/main/java/org/telegram/android/NativeLoader.java b/TMessagesProj/src/main/java/org/telegram/android/NativeLoader.java index ab7dc59cc..970facb40 100644 --- a/TMessagesProj/src/main/java/org/telegram/android/NativeLoader.java +++ b/TMessagesProj/src/main/java/org/telegram/android/NativeLoader.java @@ -24,9 +24,9 @@ import java.util.zip.ZipFile; public class NativeLoader { private static final long sizes[] = new long[] { - 795280, //armeabi - 844452, //armeabi-v7a - 1242164, //x86 + 799376, //armeabi + 848548, //armeabi-v7a + 1246260, //x86 0, //mips }; diff --git a/TMessagesProj/src/main/java/org/telegram/android/NotificationsController.java b/TMessagesProj/src/main/java/org/telegram/android/NotificationsController.java index 66a446a45..e03e61c20 100644 --- a/TMessagesProj/src/main/java/org/telegram/android/NotificationsController.java +++ b/TMessagesProj/src/main/java/org/telegram/android/NotificationsController.java @@ -235,6 +235,10 @@ public class NotificationsController { } TLRPC.User user = MessagesController.getInstance().users.get(user_id); + TLRPC.Chat chat = null; + if (chat_id != 0) { + chat = MessagesController.getInstance().chats.get(chat_id); + } TLRPC.FileLocation photoPath = null; boolean notifyDisabled = false; @@ -306,8 +310,16 @@ public class NotificationsController { } else if (user_id != 0) { intent.putExtra("userId", user_id); } - if (pushDialogs.size() == 1 && user.photo != null && user.photo.photo_small != null && user.photo.photo_small.volume_id != 0 && user.photo.photo_small.local_id != 0) { - photoPath = user.photo.photo_small; + if (pushDialogs.size() == 1) { + if (chat != null) { + if (chat.photo != null && chat.photo.photo_small != null && chat.photo.photo_small.volume_id != 0 && chat.photo.photo_small.local_id != 0) { + photoPath = chat.photo.photo_small; + } + } else { + if (user.photo != null && user.photo.photo_small != null && user.photo.photo_small.volume_id != 0 && user.photo.photo_small.local_id != 0) { + photoPath = user.photo.photo_small; + } + } } } else { intent.putExtra("encId", (int)(dialog_id >> 32)); @@ -320,7 +332,11 @@ public class NotificationsController { name = LocaleController.getString("AppName", R.string.AppName); replace = false; } else { - name = Utilities.formatName(user.first_name, user.last_name); + if (chat != null) { + name = chat.title; + } else { + name = Utilities.formatName(user.first_name, user.last_name); + } } String detailText = null; @@ -351,7 +367,11 @@ public class NotificationsController { } if (pushDialogs.size() == 1) { if (replace) { - message = message.replace(name + ": ", "").replace(name + " ", ""); + if (chat != null) { + message = message.replace(" @ " + name, ""); + } else { + message = message.replace(name + ": ", "").replace(name + " ", ""); + } } } inboxStyle.addLine(message); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index 8a5d152a6..6c47363c8 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -1046,7 +1046,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not if (currentEncryptedChat == null) { if (messageObject.messageOwner.id <= 0 && messageObject.isOut()) { if (messageObject.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SEND_ERROR) { - return 0; + if (!(messageObject.messageOwner.media instanceof TLRPC.TL_messageMediaEmpty)) { + return 0; + } else { + return 6; + } } else { return -1; } @@ -1096,7 +1100,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not if (messageObject.type == 7) { return -1; } else if (messageObject.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SEND_ERROR) { - return 0; + if (!(messageObject.messageOwner.media instanceof TLRPC.TL_messageMediaEmpty)) { + return 0; + } else { + return 6; + } } else if (messageObject.type == 10 || messageObject.type == 11 || messageObject.messageOwner.send_state == MessagesController.MESSAGE_SEND_STATE_SENDING) { if (messageObject.messageOwner.id == 0) { return -1; @@ -1171,7 +1179,9 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not message = holder.message; } - if (getMessageType(message) < 2) { + int type = getMessageType(message); + + if (type < 2 || type == 6) { return; } addToSelectedMessages(message); @@ -2552,7 +2562,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not selectedMessagesCanCopyIds.clear(); selectedMessagesIds.clear(); - if (single || type < 2) { + if (single || type < 2 || type == 6) { if (type >= 0) { selectedObject = message; if (getParentActivity() == null) { @@ -2562,35 +2572,35 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not CharSequence[] items = null; - if (currentEncryptedChat == null) { - if (type == 0) { - items = new CharSequence[] {LocaleController.getString("Retry", R.string.Retry), LocaleController.getString("Delete", R.string.Delete)}; - } else if (type == 1) { - items = new CharSequence[] {LocaleController.getString("Delete", R.string.Delete)}; - } else if (type == 2) { - items = new CharSequence[] {LocaleController.getString("Forward", R.string.Forward), LocaleController.getString("Delete", R.string.Delete)}; - } else if (type == 3) { - items = new CharSequence[] {LocaleController.getString("Forward", R.string.Forward), LocaleController.getString("Copy", R.string.Copy), LocaleController.getString("Delete", R.string.Delete)}; - } else if (type == 4) { - items = new CharSequence[] {LocaleController.getString(selectedObject.messageOwner.media instanceof TLRPC.TL_messageMediaDocument ? "SaveToDownloads" : "SaveToGallery", - selectedObject.messageOwner.media instanceof TLRPC.TL_messageMediaDocument ? R.string.SaveToDownloads : R.string.SaveToGallery), LocaleController.getString("Forward", R.string.Forward), LocaleController.getString("Delete", R.string.Delete)}; - } else if (type == 5) { - items = new CharSequence[] {LocaleController.getString("ApplyLocalizationFile", R.string.ApplyLocalizationFile), LocaleController.getString("SaveToDownloads", R.string.SaveToDownloads), LocaleController.getString("Forward", R.string.Forward), LocaleController.getString("Delete", R.string.Delete)}; - } + if (type == 0) { + items = new CharSequence[] {LocaleController.getString("Retry", R.string.Retry), LocaleController.getString("Delete", R.string.Delete)}; + } else if (type == 1) { + items = new CharSequence[] {LocaleController.getString("Delete", R.string.Delete)}; + } else if (type == 6) { + items = new CharSequence[] {LocaleController.getString("Retry", R.string.Retry), LocaleController.getString("Copy", R.string.Copy), LocaleController.getString("Delete", R.string.Delete)}; } else { - if (type == 0) { - items = new CharSequence[] {LocaleController.getString("Retry", R.string.Retry), LocaleController.getString("Delete", R.string.Delete)}; - } else if (type == 1) { - items = new CharSequence[] {LocaleController.getString("Delete", R.string.Delete)}; - } else if (type == 2) { - items = new CharSequence[] {LocaleController.getString("Delete", R.string.Delete)}; - } else if (type == 3) { - items = new CharSequence[] {LocaleController.getString("Copy", R.string.Copy), LocaleController.getString("Delete", R.string.Delete)}; - } else if (type == 4) { - items = new CharSequence[] {LocaleController.getString(selectedObject.messageOwner.media instanceof TLRPC.TL_messageMediaDocument ? "SaveToDownloads" : "SaveToGallery", - selectedObject.messageOwner.media instanceof TLRPC.TL_messageMediaDocument ? R.string.SaveToDownloads : R.string.SaveToGallery), LocaleController.getString("Delete", R.string.Delete)}; - } else if (type == 5) { - items = new CharSequence[] {LocaleController.getString("ApplyLocalizationFile", R.string.ApplyLocalizationFile), LocaleController.getString("Delete", R.string.Delete)}; + if (currentEncryptedChat == null) { + if (type == 2) { + items = new CharSequence[]{LocaleController.getString("Forward", R.string.Forward), LocaleController.getString("Delete", R.string.Delete)}; + } else if (type == 3) { + items = new CharSequence[]{LocaleController.getString("Forward", R.string.Forward), LocaleController.getString("Copy", R.string.Copy), LocaleController.getString("Delete", R.string.Delete)}; + } else if (type == 4) { + items = new CharSequence[]{LocaleController.getString(selectedObject.messageOwner.media instanceof TLRPC.TL_messageMediaDocument ? "SaveToDownloads" : "SaveToGallery", + selectedObject.messageOwner.media instanceof TLRPC.TL_messageMediaDocument ? R.string.SaveToDownloads : R.string.SaveToGallery), LocaleController.getString("Forward", R.string.Forward), LocaleController.getString("Delete", R.string.Delete)}; + } else if (type == 5) { + items = new CharSequence[]{LocaleController.getString("ApplyLocalizationFile", R.string.ApplyLocalizationFile), LocaleController.getString("SaveToDownloads", R.string.SaveToDownloads), LocaleController.getString("Forward", R.string.Forward), LocaleController.getString("Delete", R.string.Delete)}; + } + } else { + if (type == 2) { + items = new CharSequence[]{LocaleController.getString("Delete", R.string.Delete)}; + } else if (type == 3) { + items = new CharSequence[]{LocaleController.getString("Copy", R.string.Copy), LocaleController.getString("Delete", R.string.Delete)}; + } else if (type == 4) { + items = new CharSequence[]{LocaleController.getString(selectedObject.messageOwner.media instanceof TLRPC.TL_messageMediaDocument ? "SaveToDownloads" : "SaveToGallery", + selectedObject.messageOwner.media instanceof TLRPC.TL_messageMediaDocument ? R.string.SaveToDownloads : R.string.SaveToGallery), LocaleController.getString("Delete", R.string.Delete)}; + } else if (type == 5) { + items = new CharSequence[]{LocaleController.getString("ApplyLocalizationFile", R.string.ApplyLocalizationFile), LocaleController.getString("Delete", R.string.Delete)}; + } } } @@ -2637,14 +2647,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not } else if (type == 4) { if (currentEncryptedChat == null) { if (i == 0) { - String fileName = selectedObject.getFileName(); - if (selectedObject.type == 3) { - MediaController.saveFile(fileName, selectedObject.messageOwner.attachPath, getParentActivity(), 1, null); - } else if (selectedObject.type == 1) { - MediaController.saveFile(fileName, selectedObject.messageOwner.attachPath, getParentActivity(), 0, null); - } else if (selectedObject.type == 8 || selectedObject.type == 9) { - MediaController.saveFile(fileName, selectedObject.messageOwner.attachPath, getParentActivity(), 2, selectedObject.messageOwner.media.document.file_name); - } + processSelectedOption(4); } else if (i == 1) { processSelectedOption(2); } else if (i == 2) { @@ -2658,54 +2661,30 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not } } } else if (type == 5) { - if (currentEncryptedChat == null) { - if (i == 1) { - String fileName = selectedObject.getFileName(); - if (selectedObject.type == 3) { - MediaController.saveFile(fileName, selectedObject.messageOwner.attachPath, getParentActivity(), 1, null); - } else if (selectedObject.type == 1) { - MediaController.saveFile(fileName, selectedObject.messageOwner.attachPath, getParentActivity(), 0, null); - } else if (selectedObject.type == 8 || selectedObject.type == 9) { - MediaController.saveFile(fileName, selectedObject.messageOwner.attachPath, getParentActivity(), 2, selectedObject.messageOwner.media.document.file_name); - } - } else if (i == 2) { - processSelectedOption(2); - } else if (i == 3) { - processSelectedOption(1); - } + if (i == 0) { + processSelectedOption(5); } else { - if (i == 1) { - processSelectedOption(1); + if (currentEncryptedChat == null) { + if (i == 1) { + processSelectedOption(4); + } else if (i == 2) { + processSelectedOption(2); + } else if (i == 3) { + processSelectedOption(1); + } + } else { + if (i == 1) { + processSelectedOption(1); + } } } + } else if (type == 6) { if (i == 0) { - File locFile = null; - if (selectedObject.messageOwner.attachPath != null && selectedObject.messageOwner.attachPath.length() != 0) { - File f = new File(selectedObject.messageOwner.attachPath); - if (f.exists()) { - locFile = f; - } - } - if (locFile == null) { - File f = new File(AndroidUtilities.getCacheDir(), selectedObject.getFileName()); - if (f.exists()) { - locFile = f; - } - } - if (locFile != null) { - if (LocaleController.getInstance().applyLanguageFile(locFile)) { - presentFragment(new LanguageSelectActivity()); - } else { - if (getParentActivity() == null) { - return; - } - AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); - builder.setTitle(LocaleController.getString("AppName", R.string.AppName)); - builder.setMessage(LocaleController.getString("IncorrectLocalization", R.string.IncorrectLocalization)); - builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), null); - showAlertDialog(builder); - } - } + processSelectedOption(0); + } else if (i == 1) { + processSelectedOption(3); + } else if (i == 2) { + processSelectedOption(1); } } } @@ -2723,8 +2702,11 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not } private void processSelectedOption(int option) { + if (selectedObject == null) { + return; + } if (option == 0) { - if (selectedObject != null && selectedObject.messageOwner.id < 0) { + if (selectedObject.messageOwner.id < 0) { if (selectedObject.type == 0) { if (selectedObject.messageOwner instanceof TLRPC.TL_messageForwarded) { MessagesController.getInstance().sendMessage(selectedObject, dialog_id); @@ -2771,44 +2753,72 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not chatListView.setSelectionFromTop(messages.size() - 1, -100000 - chatListView.getPaddingTop()); } } else if (option == 1) { - if (selectedObject != null) { - ArrayList ids = new ArrayList(); - ids.add(selectedObject.messageOwner.id); - removeUnreadPlane(true); - ArrayList random_ids = null; - if (currentEncryptedChat != null && selectedObject.messageOwner.random_id != 0 && selectedObject.type != 10) { - random_ids = new ArrayList(); - random_ids.add(selectedObject.messageOwner.random_id); - } - MessagesController.getInstance().deleteMessages(ids, random_ids, currentEncryptedChat); - selectedObject = null; + ArrayList ids = new ArrayList(); + ids.add(selectedObject.messageOwner.id); + removeUnreadPlane(true); + ArrayList random_ids = null; + if (currentEncryptedChat != null && selectedObject.messageOwner.random_id != 0 && selectedObject.type != 10) { + random_ids = new ArrayList(); + random_ids.add(selectedObject.messageOwner.random_id); } + MessagesController.getInstance().deleteMessages(ids, random_ids, currentEncryptedChat); } else if (option == 2) { - if (selectedObject != null) { - forwaringMessage = selectedObject; - selectedObject = null; - - Bundle args = new Bundle(); - args.putBoolean("onlySelect", true); - args.putBoolean("serverOnly", true); - args.putString("selectAlertString", LocaleController.getString("ForwardMessagesTo", R.string.ForwardMessagesTo)); - MessagesActivity fragment = new MessagesActivity(args); - fragment.setDelegate(this); - presentFragment(fragment); - } + forwaringMessage = selectedObject; + Bundle args = new Bundle(); + args.putBoolean("onlySelect", true); + args.putBoolean("serverOnly", true); + args.putString("selectAlertString", LocaleController.getString("ForwardMessagesTo", R.string.ForwardMessagesTo)); + MessagesActivity fragment = new MessagesActivity(args); + fragment.setDelegate(this); + presentFragment(fragment); } else if (option == 3) { - if (selectedObject != null) { - if(android.os.Build.VERSION.SDK_INT < 11) { - android.text.ClipboardManager clipboard = (android.text.ClipboardManager)ApplicationLoader.applicationContext.getSystemService(Context.CLIPBOARD_SERVICE); - clipboard.setText(selectedObject.messageText); - } else { - android.content.ClipboardManager clipboard = (android.content.ClipboardManager)ApplicationLoader.applicationContext.getSystemService(Context.CLIPBOARD_SERVICE); - android.content.ClipData clip = android.content.ClipData.newPlainText("label", selectedObject.messageText); - clipboard.setPrimaryClip(clip); + if(android.os.Build.VERSION.SDK_INT < 11) { + android.text.ClipboardManager clipboard = (android.text.ClipboardManager)ApplicationLoader.applicationContext.getSystemService(Context.CLIPBOARD_SERVICE); + clipboard.setText(selectedObject.messageText); + } else { + android.content.ClipboardManager clipboard = (android.content.ClipboardManager)ApplicationLoader.applicationContext.getSystemService(Context.CLIPBOARD_SERVICE); + android.content.ClipData clip = android.content.ClipData.newPlainText("label", selectedObject.messageText); + clipboard.setPrimaryClip(clip); + } + } else if (option == 4) { + String fileName = selectedObject.getFileName(); + if (selectedObject.type == 3) { + MediaController.saveFile(fileName, selectedObject.messageOwner.attachPath, getParentActivity(), 1, null); + } else if (selectedObject.type == 1) { + MediaController.saveFile(fileName, selectedObject.messageOwner.attachPath, getParentActivity(), 0, null); + } else if (selectedObject.type == 8 || selectedObject.type == 9) { + MediaController.saveFile(fileName, selectedObject.messageOwner.attachPath, getParentActivity(), 2, selectedObject.messageOwner.media.document.file_name); + } + } else if (option == 5) { + File locFile = null; + if (selectedObject.messageOwner.attachPath != null && selectedObject.messageOwner.attachPath.length() != 0) { + File f = new File(selectedObject.messageOwner.attachPath); + if (f.exists()) { + locFile = f; + } + } + if (locFile == null) { + File f = new File(AndroidUtilities.getCacheDir(), selectedObject.getFileName()); + if (f.exists()) { + locFile = f; + } + } + if (locFile != null) { + if (LocaleController.getInstance().applyLanguageFile(locFile)) { + presentFragment(new LanguageSelectActivity()); + } else { + if (getParentActivity() == null) { + return; + } + AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity()); + builder.setTitle(LocaleController.getString("AppName", R.string.AppName)); + builder.setMessage(LocaleController.getString("IncorrectLocalization", R.string.IncorrectLocalization)); + builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), null); + showAlertDialog(builder); } - selectedObject = null; } } + selectedObject = null; } @Override @@ -2834,7 +2844,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not } if (messageObject.messageOwner.media != null && !(messageObject.messageOwner.media instanceof TLRPC.TL_messageMediaEmpty)) { if (messageObject.messageOwner.media.photo instanceof TLRPC.TL_photo) { - MessagesController.getInstance().sendMessage((TLRPC.TL_photo)messageObject.messageOwner.media.photo, null, did); + MessagesController.getInstance().sendMessage((TLRPC.TL_photo) messageObject.messageOwner.media.photo, null, did); } else if (messageObject.messageOwner.media.audio instanceof TLRPC.TL_audio) { messageObject.messageOwner.media.audio.path = messageObject.messageOwner.attachPath; MessagesController.getInstance().sendMessage((TLRPC.TL_audio)messageObject.messageOwner.media.audio, did); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/MessagesActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/MessagesActivity.java index 979fba570..6a98eca3b 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/MessagesActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/MessagesActivity.java @@ -389,11 +389,6 @@ public class MessagesActivity extends BaseFragment implements NotificationCenter } } }); - - if (MessagesController.getInstance().loadingDialogs) { - progressView.setVisibility(View.VISIBLE); - } - } else { ViewGroup parent = (ViewGroup)fragmentView.getParent(); if (parent != null) { diff --git a/TMessagesProj/src/main/res/values-ar/strings.xml b/TMessagesProj/src/main/res/values-ar/strings.xml index f10e5c393..eac750ab2 100644 --- a/TMessagesProj/src/main/res/values-ar/strings.xml +++ b/TMessagesProj/src/main/res/values-ar/strings.xml @@ -22,12 +22,12 @@ جاري الاتصال بك ... رمز التفعيل الرقم خاطئ؟ - Didn\'t get the code? + هل استقبلت الرمز؟ اسمك اختر الاسم الأول واسم العائلة - + الاسم الأول اسم العائلة إلغاء التسجيل @@ -110,7 +110,7 @@ قم بالسحب للإلغاء حفظ في الجهاز تطبيق ملف التعريب - Unsupported attachment + المرفق غير مدعوم تم طلب محادثة سرية @@ -171,7 +171,7 @@ أدخل اسم للمجموعة اسم المجموعة جميع جهات الاتصال - %1$d/%2$d members + %1$d/%2$d عضو أدخل سم للمجموعة @@ -269,12 +269,12 @@ بواسطة WiFi فقط الاسم الأول اسم العائلة - LED Color - Popup Notification - No popup - Only when screen "on" - Only when screen "off" - Always show popup + لون إضاءة الـ LED + إشعارات منبثقة + بدون إشعارات منبثقة + فقط عندما تكون الشاشة تعمل + فقط عندما تكون الشاشة مطفأة + دائمًا أظهر الإشعارات المنبثقة لا توجد وسائط بعد @@ -295,8 +295,8 @@ حفظ في الجهاز %1$d من %2$d الألبوم - All Photos - No photos yet + جميع الصور + لا توجد صور حتى الآن التالي @@ -356,25 +356,25 @@ اسم العائلة غير صحيح جاري التحميل ... ليس لديك أي مشغل مقاطع مرئية، يرجى تنزيل أية مشغل - Please send an email to sms@telegram.org and explain your problem. + يرجى التفضل بإرسال بريد الكتروني إلى sms@telegram.org وشرح مشكلتك. لا يوجد لديك تطبيق يمكنه فتح \'%1$s\'، يرجى تنزيل تطبيق مناسب للإستمرار هذا المستخدم ليس لديه تيليجرام بعد ، هل ترغب في دعوته الآن؟ هل أنت متأكد؟ هل تريد إضافة جهة اتصال؟ - Add %1$s to the group?\n\nNumber of last messages to forward: + هل ترغب في إضافة %1$s للمجموعة؟\n\n\n\nعدد الرسائل الحديثة المراد إعادة تحويلها: ؟%1$s هل تريد إعادة توجيه الرسائل إلى هل تريد حذف هذه الدردشة؟ - Send messages to %1$s? - Are you sure you want to logout? - Are you sure you want to terminate all other sessions? - Are you sure you want to delete and leave group? - Are you sure you want to delete this chat? - Are you sure that you want to share your contact info? - Are you sure you want to block this contact? - Are you sure you want to unblock this contact? - Are you sure you want to delete this contact? - Are you sure you want to start secret chat? - forward from my name + هل ترغب في إرسال رسالة إلى %1$s؟ + هل أنت متأكد من رغبتك في تسجيل الخروج؟ + هل أنت متأكد من تسجيل الخروج من جميع الأجهزة الأخرى باستثناء هذا الجهاز؟ + هل أنت متأكد من رغبتك في مغادرة المجموعة وحذفها؟ + هل أنت متأكد من رغبتك في حذف المجموعة؟ + هل أنت متأكد من رغبتك في مشاركة جهة الاتصال الخاصة بك؟ + هل أنت متأكد من رغبتك في حظر جهة الاتصال هذه؟ + هل أنت متأكد من رغبتك في إزالة الحظر عن جهة الاتصال هذه؟ + هل أنت متأكد من رغبتك في حذف جهة الاتصال هذه؟ + هل أنت متأكد من رغبتك في بدء محادثة سرية؟ + أعد الإرسال باستخدام اسمي تيليجرام @@ -394,40 +394,36 @@ إبدأ المراسلة - no members - %1$d member - %1$d members - %1$d members - %1$d members - %1$d members - - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - - no new messages - %1$d new message - %1$d new messages - %1$d new messages - %1$d new messages - %1$d new messages - - no messages - %1$d message - %1$d messages - %1$d messages - %1$d messages - %1$d messages - - from no contacts - from %1$d contact - from %1$d contacts - from %1$d contacts - from %1$d contacts - from %1$d contacts + لا يوجد أعضاء + %1$d عضو + %1$d عضوان + %1$d أعضاء + %1$d عضو + %1$d عضو + كذلك %1$d عضو آخر يقوب بالكتابة + كذلك %1$d عضو آخر يقوم بالكتابة + كذلك %1$d عضوان آخران يقومان بالكتابة + كذلك %1$d أعضاء آخرون يقومون بالكتابة + كذلك %1$d عضو آخرون يقومون بالكتابة + كذلك %1$d عضو آخرون يقومون بالكتابة + لا يوجد رسائل جديدة + %1$d رسالة جديدة + %1$d رسالتان جديدتان + %1$d رسائل جديدة + %1$d رسالة جديدة + %1$d رسالة جديدة + لا يوجد رسائل + %1$d رسالة + %1$d رسالتان + %1$d رسائل + %1$d رسالة + %1$d رسالة + ليس من جهة اتصال + من %1$d جهة اتصال + من %1$d جهتان اتصال + من %1$d جهات اتصال + من %1$d جهة اتصال + من %1$d جهة اتصال CACHE_TAG diff --git a/TMessagesProj/src/main/res/values-de/strings.xml b/TMessagesProj/src/main/res/values-de/strings.xml index e3584e2f4..84cd6eb9c 100644 --- a/TMessagesProj/src/main/res/values-de/strings.xml +++ b/TMessagesProj/src/main/res/values-de/strings.xml @@ -22,7 +22,7 @@ Wir rufen dich an… Code Falsche Nummer? - Didn\'t get the code? + Code nicht erhalten? Dein Name @@ -110,7 +110,7 @@ WISCHEN UM ABZUBRECHEN Im Ordner Downloads speichern Standort-Datei benutzen - Unsupported attachment + Nicht unterstützte Datei Geheimen Chat angefordert @@ -171,7 +171,7 @@ Gruppennamen eingeben Gruppenname ALLE KONTAKTE - %1$d/%2$d members + %1$d/%2$d Mitglieder GRUPPENNAMEN EINGEBEN @@ -223,7 +223,7 @@ DEINE TELEFONNUMMER NACHRICHTEN Benachrichtigung - Nachrichtenvorschau + Vorschau GRUPPEN Nachrichtenton auswählen IN-APP @@ -266,15 +266,15 @@ Sofern Google Play Dienste ausreichend für deine Benachrichtigungen sind, kannst du unseren Benachrichtigungsdienst abschalten. Wir empfehlen allerdings, unseren Dienst dauerhaft aktiviert zu lassen um über neue Nachrichten in Echtzeit informiert zu werden. sortiert nach Kontakte importieren - nur über WLAN + Nur über W-LAN Vorname Nachname - LED Farbe - Popup Notification - No popup - Only when screen "on" - Only when screen "off" - Always show popup + LED-Farbe + Popup-Benachrichtigung + Kein Popup + Nur wenn Bildschirm „an“ + Nur wenn Bildschirm „aus“ + Popups immer anzeigen Noch keine geteilten Medien vorhanden @@ -295,8 +295,8 @@ In der Galerie speichern %1$d von %2$d Galerie - All Photos - No photos yet + Alle Fotos + Noch keine Fotos Weiter @@ -356,25 +356,25 @@ Ungültiger Nachname Lädt… Du hast keinen Videoplayer. Bitte installiere einen um fortzufahren. - Please send an email to sms@telegram.org and explain your problem. + Bitte sende uns eine Email an sms@telegram.org mit einer Beschreibung des Problems. Du hast keine App, die den Dokumententyp \'%1$s\' öffnen kann. Dieser Benutzer hat noch kein Telegram. Möchtest du ihn einladen? Bist du sicher? Kontakt hinzufügen? - Add %1$s to the group?\n\nNumber of last messages to forward: + %1$s zur Gruppe hinzufügen?\n\nAnzahl der letzten Nachrichten für die Weiterleitung: Nachrichten an %1$s weiterleiten? Diesen Chat löschen? - Send messages to %1$s? - Are you sure you want to logout? - Are you sure you want to terminate all other sessions? - Are you sure you want to delete and leave group? - Are you sure you want to delete this chat? - Are you sure that you want to share your contact info? - Are you sure you want to block this contact? - Are you sure you want to unblock this contact? - Are you sure you want to delete this contact? - Are you sure you want to start secret chat? - forward from my name + Nachricht an %1$s senden? + Möchtest du dich wirklich abmelden? + 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? + Möchtest du wirklich die eigenen Kontaktdaten teilen? + Diesen Kontakt wirklich blockieren? + Blockierung für diesen Kontakt wirklich aufheben? + Diesen Kontakt wirklich löschen? + Wirklich einen geheimen Chat starten? + mit meinem Namen weiterleiten Telegram @@ -394,40 +394,36 @@ Jetzt beginnen - no members - %1$d member - %1$d members - %1$d members - %1$d members - %1$d members - - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - - no new messages - %1$d new message - %1$d new messages - %1$d new messages - %1$d new messages - %1$d new messages - - no messages - %1$d message - %1$d messages - %1$d messages - %1$d messages - %1$d messages - - from no contacts - from %1$d contact - from %1$d contacts - from %1$d contacts - from %1$d contacts - from %1$d contacts + keine Mitglieder + %1$d Mitglied + %1$d Mitglieder + %1$d Mitglieder + %1$d Mitglieder + %1$d Mitglieder + und %1$d weitere Personen schreiben + und %1$d weitere Personen schreiben + und %1$d weitere Personen schreiben + und %1$d weitere Personen schreiben + und %1$d weitere Personen schreiben + und %1$d weitere Personen schreiben + keine neuen Nachrichten + %1$d neue Nachricht + %1$d neue Nachrichten + %1$d neue Nachrichten + %1$d neue Nachrichten + %1$d neue Nachrichten + keine Nachrichten + %1$d Nachricht + %1$d Nachrichten + %1$d Nachrichten + %1$d Nachrichten + %1$d Nachrichten + von keinem Kontakt + von %1$d Kontakt + von %1$d Kontakten + von %1$d Kontakten + von %1$d Kontakten + von %1$d Kontakten CACHE_TAG diff --git a/TMessagesProj/src/main/res/values-es/strings.xml b/TMessagesProj/src/main/res/values-es/strings.xml index 8dbf8860a..7844177da 100644 --- a/TMessagesProj/src/main/res/values-es/strings.xml +++ b/TMessagesProj/src/main/res/values-es/strings.xml @@ -22,7 +22,7 @@ Llamándote... Código ¿Número incorrecto? - Didn\'t get the code? + ¿No recibiste el código? Tu nombre @@ -110,7 +110,7 @@ DESLIZA PARA CANCELAR Guardar en descargas Aplicar archivo de traducción - Unsupported attachment + Adjunto no soportado Chat secreto solicitado @@ -171,7 +171,7 @@ El nombre del grupo Nombre del grupo TODOS LOS CONTACTOS - %1$d/%2$d members + %1$d/%2$d miembros INGRESA EL NOMBRE DEL GRUPO @@ -266,15 +266,15 @@ Si los servicios de google play son suficientes para recibir notificaciones, puedes desactivar el \'Servicio de notificaciones\'. Sin embargo, te recomendamos activarlos para mantener la aplicación funcionando en segundo plano y recibir notificaciones de forma instantánea. Ordenar por Importar contactos - Sólo vía WiFi + Solo vía Wifi Nombre Apellido Color del LED - Popup Notification - No popup - Only when screen "on" - Only when screen "off" - Always show popup + Notificación emergente + Sin notificación emergente + Sólo con pantalla encendida + Sólo con pantalla apagada + Siempre mostrar notificación emergente No hay fotos ni vídeos compartidos aún @@ -295,8 +295,8 @@ Guardar en galería %1$d de %2$d Galería - All Photos - No photos yet + Todas + No hay fotos aún Siguiente @@ -356,25 +356,25 @@ Apellido/s inválido/s Cargando... No tienes reproductor de vídeo. Por favor, instala uno para continuar. - Please send an email to sms@telegram.org and explain your problem. + Por favor, envía un correo a sms@telegram.org y explica tu problema. No tienes una aplicación que pueda manejar el tipo mime \'%1$s\'. Por favor, instala una para continuar Este usuario no tiene Telegram aún. ¿Enviarle una invitación? ¿Estás seguro? ¿Añadir contacto? - Add %1$s to the group?\n\nNumber of last messages to forward: + ¿Añadir a %1$s al grupo?\n\nNúmero de los últimos mensajes para reenviar: ¿Reenviar mensajes a %1$s? ¿Eliminar este chat? - Send messages to %1$s? - Are you sure you want to logout? - Are you sure you want to terminate all other sessions? - Are you sure you want to delete and leave group? - Are you sure you want to delete this chat? - Are you sure that you want to share your contact info? - Are you sure you want to block this contact? - Are you sure you want to unblock this contact? - Are you sure you want to delete this contact? - Are you sure you want to start secret chat? - forward from my name + ¿Enviar mensajes a %1$s? + ¿Estás seguro/a que quieres cerrar sesión? + ¿Estás seguro/a que quieres terminar todas las otras sesiones? + ¿Estás seguro/a que quieres eliminar y dejar el grupo? + ¿Estás seguro/a que quieres eliminar este chat? + ¿Estás seguro/a que quieres compartir tu información de contacto? + ¿Estás seguro/a que quieres bloquear este contacto? + ¿Estás seguro/a que quieres desbloquear este contacto? + ¿Estás seguro/a que quieres eliminar este contacto? + ¿Estás seguro/a que quieres iniciar un chat secreto? + reenviar desde mi nombre Telegram @@ -394,40 +394,36 @@ Empieza a conversar - no members - %1$d member - %1$d members - %1$d members - %1$d members - %1$d members - - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - - no new messages - %1$d new message - %1$d new messages - %1$d new messages - %1$d new messages - %1$d new messages - - no messages - %1$d message - %1$d messages - %1$d messages - %1$d messages - %1$d messages - - from no contacts - from %1$d contact - from %1$d contacts - from %1$d contacts - from %1$d contacts - from %1$d contacts + sin miembros + %1$d miembro + %1$d miembros + %1$d miembros + %1$d miembros + %1$d miembros + y %1$d personas más están escribiendo + y %1$d personas más están escribiendo + y %1$d personas más están escribiendo + y %1$d personas más están escribiendo + y %1$d personas más están escribiendo + y %1$d personas más están escribiendo + no hay mensajes nuevos + %1$d nuevo mensaje + %1$d nuevos mensajes + %1$d nuevos mensajes + %1$d nuevos mensajes + %1$d nuevos mensajes + no hay mensajes + %1$d mensaje + %1$d mensajes + %1$d mensajes + %1$d mensajes + %1$d mensajes + unused + de %1$d contacto + de %1$d contactos + de %1$d contactos + de %1$d contactos + de %1$d contactos CACHE_TAG diff --git a/TMessagesProj/src/main/res/values-it/strings.xml b/TMessagesProj/src/main/res/values-it/strings.xml index b5d372459..b19229744 100644 --- a/TMessagesProj/src/main/res/values-it/strings.xml +++ b/TMessagesProj/src/main/res/values-it/strings.xml @@ -22,7 +22,7 @@ Ti stiamo chiamando… Codice Numero errato? - Didn\'t get the code? + Non hai ricevuto il codice? Il tuo nome @@ -110,7 +110,7 @@ TRASCINA PER ANNULLARE Salva in download Applica file di localizzazione - Unsupported attachment + Allegato non supportato Chat segreta richiesta @@ -171,7 +171,7 @@ Immetti il nome del gruppo Nome gruppo TUTTI I CONTATTI - %1$d/%2$d members + %1$d/%2$d membri INSERISCI IL NOME DEL GRUPPO @@ -269,12 +269,12 @@ Solo tramite WiFi Nome Cognome - LED Color - Popup Notification - No popup - Only when screen "on" - Only when screen "off" - Always show popup + Colore LED + Notifica popup + Nessun popup + Solo con schermo acceso + Solo con schermo spento + Mostra sempre i popup Nessun media condiviso @@ -356,25 +356,25 @@ Cognome non valido Caricamento… Non hai un lettore video, per favore installane uno per continuare - Please send an email to sms@telegram.org and explain your problem. + Invia un’email a sms@telegram.org spiegandoci il problema. Non hai nessuna applicazione che può gestire il tipo mime \'%1$s\', installane una per continuare Questo utente non ha ancora Telegram, vuoi invitarlo? Sei sicuro? Vuoi aggiungere il contatto? - Add %1$s to the group?\n\nNumber of last messages to forward: + Aggiungere %1$s al gruppo?\n\nNumero di messaggi recenti da inoltrare: Vuoi inoltrare i messaggi a %1$s? Vuoi eliminare questa chat? - Send messages to %1$s? - Are you sure you want to logout? - Are you sure you want to terminate all other sessions? - Are you sure you want to delete and leave group? - Are you sure you want to delete this chat? - Are you sure that you want to share your contact info? - Are you sure you want to block this contact? - Are you sure you want to unblock this contact? - Are you sure you want to delete this contact? - Are you sure you want to start secret chat? - forward from my name + Inviare i messaggi a %1$s? + Terminare la sessione? + Chiudere tutte le altre sessioni? + Eliminare il gruppo e uscire da esso? + Eliminare questa chat? + Condividere le proprie informazioni di contatto? + Bloccare questo contatto? + Sbloccare questo contatto? + Eliminare questo contatto? + Iniziare una chat segreta? + inoltra dal mio nome Telegram @@ -394,40 +394,36 @@ Inizia a inviare messaggi - no members - %1$d member - %1$d members - %1$d members - %1$d members - %1$d members - - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - - no new messages - %1$d new message - %1$d new messages - %1$d new messages - %1$d new messages - %1$d new messages - - no messages - %1$d message - %1$d messages - %1$d messages - %1$d messages - %1$d messages - - from no contacts - from %1$d contact - from %1$d contacts - from %1$d contacts - from %1$d contacts - from %1$d contacts + nessun membro + %1$d membro + %1$d membri + %1$d membri + %1$d membri + %1$d membri + e %1$d altre persone stanno scrivendo + e %1$d altra persona stanno scrivendo + e %1$d altre persone stanno scrivendo + e %1$d altre persone stanno scrivendo + e %1$d altre persone stanno scrivendo + e %1$d altre persone stanno scrivendo + nessun nuovo messaggio + %1$d nuovo messaggio + %1$d nuovi messaggi + %1$d nuovi messaggi + %1$d nuovi messaggi + %1$d nuovi messaggi + nessun messaggio + %1$d messaggio + %1$d messaggi + %1$d messaggi + %1$d messaggi + %1$d messaggi + da nessun contatto + da %1$d contatto + da %1$d contatti + da %1$d contatti + da %1$d contatti + da %1$d contatti CACHE_TAG diff --git a/TMessagesProj/src/main/res/values-nl/strings.xml b/TMessagesProj/src/main/res/values-nl/strings.xml index a619042ee..438f1cb48 100644 --- a/TMessagesProj/src/main/res/values-nl/strings.xml +++ b/TMessagesProj/src/main/res/values-nl/strings.xml @@ -22,7 +22,7 @@ We bellen je… Code Verkeerd nummer? - Didn\'t get the code? + Geen code ontvangen? Je naam @@ -110,7 +110,7 @@ SLEEP OM TE ANNULEREN Opslaan in Downloads Vertaling toepassen - Unsupported attachment + Bijlageformaat niet ondersteund Privégesprek aangevraagd @@ -171,7 +171,7 @@ Groepsnaam... Groepsnaam ALLE CONTACTEN - %1$d/%2$d members + %1$d/%2$d deelnemers GROEPSNAAM INSTELLEN @@ -269,12 +269,12 @@ Alleen via WiFi Voornaam Achternaam - LED Color - Popup Notification - No popup - Only when screen "on" - Only when screen "off" - Always show popup + LED kleur + Popup melding + Geen popup + Alleen wanneer scherm \"aan\" staat + Alleen wanneer scherm \"uit\" staat + Altijd popup tonen Nog geen media gedeeld @@ -356,25 +356,25 @@ Ongeldige achternaam Bezig met laden… Je hebt geen mediaspeler. Installeer een mediaspeler om door te gaan. - Please send an email to sms@telegram.org and explain your problem. + Stuur aub een emailbericht naar sms@telegram.org en beschrijf uw probleem Je hebt geen applicaties die het MIME-type \'%1$s\' ondersteunen. Installeer een geschikte applicatie om door te gaan. Deze gebruiker heeft nog geen Telegram. Wil je een uitnodiging sturen? Weet je het zeker? Contact toevoegen? - Add %1$s to the group?\n\nNumber of last messages to forward: + %1$s toevoegen aan de groep?\n\nAantal recente berichten om door te sturen: Berichten doorsturen naar %1$s? Dit gesprek verwijderen? - Send messages to %1$s? - Are you sure you want to logout? - Are you sure you want to terminate all other sessions? - Are you sure you want to delete and leave group? - Are you sure you want to delete this chat? - Are you sure that you want to share your contact info? - Are you sure you want to block this contact? - Are you sure you want to unblock this contact? - Are you sure you want to delete this contact? - Are you sure you want to start secret chat? - forward from my name + Berichten naar %1$s verzenden? + Weet u zeker dat u wil uitloggen? + Alle andere apparaten afmelden? + Deze groep verlaten en groep verwijderen? + Dit gesprek verwijderen? + Deze contact-informatie delen? + Deze persoon blokkeren? + Deze persoon deblokkeren? + Deze contactpersoon verwijderen? + Een privégesprek starten? + doorsturen via mijn eigen naam Telegram @@ -394,40 +394,36 @@ Begin nu met chatten - no members - %1$d member - %1$d members - %1$d members - %1$d members - %1$d members - - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - - no new messages - %1$d new message - %1$d new messages - %1$d new messages - %1$d new messages - %1$d new messages - - no messages - %1$d message - %1$d messages - %1$d messages - %1$d messages - %1$d messages - - from no contacts - from %1$d contact - from %1$d contacts - from %1$d contacts - from %1$d contacts - from %1$d contacts + geen deelnemers + %1$d deelnemer + %1$d deelnemers + %1$d deelnemers + %1$d deelnemers + %1$d deelnemers + en nog %1$d personen zijn aan het typen + en nog %1$d personen zijn aan het typen + en nog %1$d personen zijn aan het typen + en nog %1$d personen zijn aan het typen + en nog %1$d personen zijn aan het typen + en nog %1$d personen zijn aan het typen + geen nieuwe berichten + %1$d nieuw bericht + %1$d nieuwe berichten + %1$d nieuwe berichten + %1$d nieuwe berichten + %1$d nieuwe berichten + geen berichten + %1$d bericht + %1$d berichten + %1$d berichten + %1$d berichten + %1$d berichten + van geen enkel contactpersoon + van %1$d contactpersoon + van %1$d contactpersonen + van %1$d contactpersonen + van %1$d contactpersonen + van %1$d contactpersonen CACHE_TAG diff --git a/TMessagesProj/src/main/res/values-pt-rBR/strings.xml b/TMessagesProj/src/main/res/values-pt-rBR/strings.xml index c55d07fa8..29b169a33 100644 --- a/TMessagesProj/src/main/res/values-pt-rBR/strings.xml +++ b/TMessagesProj/src/main/res/values-pt-rBR/strings.xml @@ -22,7 +22,7 @@ Estamos te ligando... Código Número incorreto? - Didn\'t get the code? + Não recebeu o código? Seu nome @@ -99,8 +99,8 @@ %s convidou você para uma conversa secreta. Você convidou %s para uma conversa secreta. Conversas secretas: - Utilizam criptografia ponto a ponto - Não deixam rastro em nossos servidores + Utilizam criptografia ponta a ponta + Não deixam rasto em nossos servidores Têm temporizador para a autodestruição das mensagens Não permitem o reencaminhamento Você foi removido deste grupo @@ -110,7 +110,7 @@ DESLIZE PARA CANCELAR Salvar em downloads Aplicar arquivo de localização - Unsupported attachment + Anexo não suportado Conversa secreta solicitada @@ -171,7 +171,7 @@ Digite o nome do grupo Nome do grupo TODOS OS CONTATOS - %1$d/%2$d members + %1$d/%2$d membros DIGITE O NOME DO GRUPO @@ -266,15 +266,15 @@ Se os serviços do Google Play forem suficientes para você receber as notificações, você pode desabilitar o \"Serviço de Notificações\". Porém, nós recomendamos deixá-lo ativo para que o aplicativo continue rodando em segundo plano e recebendo notificações instantâneas. Ordenar Por Importar Contatos - Unicamente com WiFi + Apenas por WiFi Primeiro nome Sobrenome - LED Color - Popup Notification - No popup - Only when screen "on" - Only when screen "off" - Always show popup + Cor do LED + Notificação Popup + Sem popup + Somente com a tela ligada + Somente com a tela desligada + Sempre mostrar popup Ainda não há mídia compartilhada @@ -295,7 +295,7 @@ Salvar na galeria %1$d de %2$d Galeria - Todas as fotos + Todas as Fotos Ainda não há fotos @@ -356,25 +356,25 @@ Sobrenome inválido Carregando... Você não possui um reprodutor de vídeo, instale um para continuar - Please send an email to sms@telegram.org and explain your problem. + Por favor, envie um email para sms@telegram.org e explique seu problema. Você não possui algum aplicativo que pode lidar com o tipo MIME \'%1$s\'. Por favor, instale um para continuar Este usuário ainda não possui Telegram, deseja enviar um convite? Você tem certeza? Adicionar contato? - Add %1$s to the group?\n\nNumber of last messages to forward: + Adicionar %1$s para o grupo?\n\nNúmero das últimas mensagens para encaminhar: Encaminhar mensagem para %1$s? Apagar esta conversa? - Send messages to %1$s? - Are you sure you want to logout? - Are you sure you want to terminate all other sessions? - Are you sure you want to delete and leave group? - Are you sure you want to delete this chat? - Are you sure that you want to share your contact info? - Are you sure you want to block this contact? - Are you sure you want to unblock this contact? - Are you sure you want to delete this contact? - Are you sure you want to start secret chat? - forward from my name + Enviar mensagens para %1$s? + Você tem certeza que deseja sair dessa sessão? + Você tem certeza que deseja terminar todas as outras sessões? + Você tem certeza que deseja deletar e sair do grupo? + Você tem certeza que deseja deletar esta conversa? + Você tem certeza que deseja compartilhar as informações do seu contato? + Você tem certeza que deseja bloquear este contato? + Você tem certeza que deseja desbloquear este contato? + Você tem certeza que deseja deletar este contato? + Você tem certeza que deseja iniciar uma conversa secreta? + encaminhar pelo meu nome Telegram @@ -385,49 +385,45 @@ Baseado na nuvem Privado Bem-vindo à era das mensagens rápidas e seguras - Telegram]]> envia mensagens mais rapidamente do que]]>qualquer outro aplicativo - Telegram]]> será gratuito para sempre. Sem propaganda.]]>Sem taxa de assinatura - Telegram]]> mantém suas mensagens seguras]]>contra ataques de hackers - Telegram]]> não tem limites para o tamanho de]]>suas mídias e conversas - Telegram]]> permite que você acesse suas mensagens]]>a partir de vários dispositivos - As mensagens do Telegram]]> são fortemente criptografadas]]>e podem se autodestruir + Telegram]]> envia mensagens mais rapidamente do que qualquer outro aplicativo + Telegram]]> será gratuito para sempre. Sem propaganda. Sem taxa de assinatura + Telegram]]> mantém suas mensagens seguras contra ataques de hackers + Telegram]]> não tem limites para o tamanho de suas mídias e conversas + Telegram]]> permite que você acesse suas mensagens a partir de vários dispositivos + As mensagens do Telegram]]> são fortemente criptografadas e podem se autodestruir Comece a conversar - no members - %1$d member - %1$d members - %1$d members - %1$d members - %1$d members - - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - and %1$d more people are typing - - no new messages - %1$d new message - %1$d new messages - %1$d new messages - %1$d new messages - %1$d new messages - - no messages - %1$d message - %1$d messages - %1$d messages - %1$d messages - %1$d messages - - from no contacts - from %1$d contact - from %1$d contacts - from %1$d contacts - from %1$d contacts - from %1$d contacts + sem membros + %1$d membro + %1$d membros + %1$d membros + %1$d membros + %1$d membros + e mais %1$d pessoas estão escrevendo + e mais %1$d pessoa está escrevendo + e mais %1$d pessoas estão escrevendo + e mais %1$d pessoas estão escrevendo + e mais %1$d pessoas estão escrevendo + e mais %1$d pessoas estão escrevendo + sem novas mensagens + %1$d nova mensagem + %1$d novas mensagens + %1$d novas mensagens + %1$d novas mensagens + %1$d novas mensagens + sem mensagem + %1$d mensagem + %1$d mensagens + %1$d mensagens + %1$d mensagens + %1$d mensagens + de nenhum contato + de %1$d contato + de %1$d contatos + de %1$d contatos + de %1$d contatos + de %1$d contatos CACHE_TAG diff --git a/TMessagesProj/src/main/res/values/strings.xml b/TMessagesProj/src/main/res/values/strings.xml index 8b676e2b4..3ee815832 100644 --- a/TMessagesProj/src/main/res/values/strings.xml +++ b/TMessagesProj/src/main/res/values/strings.xml @@ -376,7 +376,6 @@ Are you sure you want to start secret chat? forward from my name - Telegram Fast @@ -401,28 +400,24 @@ %1$d members %1$d members %1$d members - and %1$d more people are typing and %1$d more people are typing and %1$d more people are typing and %1$d more people are typing and %1$d more people are typing and %1$d more people are typing - no new messages %1$d new message %1$d new messages %1$d new messages %1$d new messages %1$d new messages - no messages %1$d message %1$d messages %1$d messages %1$d messages %1$d messages - from no contacts from %1$d contact from %1$d contacts