From 28270a87d163154e6a776f9d50279dc9c5c09481 Mon Sep 17 00:00:00 2001 From: DrKLO Date: Mon, 6 Oct 2014 01:23:57 +0400 Subject: [PATCH] Added open on phone button on Android Wear, bug fixes --- TMessagesProj/build.gradle | 2 +- .../telegram/android/AndroidUtilities.java | 2 +- .../telegram/android/ContactsController.java | 4 +- .../android/GcmBroadcastReceiver.java | 2 - .../org/telegram/android/ImageLoader.java | 2 +- .../telegram/android/LocaleController.java | 38 +++++++++++-------- .../org/telegram/android/MediaController.java | 8 ++-- .../org/telegram/android/MessageObject.java | 2 +- .../android/NotificationsController.java | 15 +++++++- .../telegram/messenger/BuffersStorage.java | 2 +- .../telegram/messenger/HandshakeAction.java | 2 +- .../org/telegram/messenger/TcpConnection.java | 2 +- .../org/telegram/messenger/UserConfig.java | 2 +- .../java/org/telegram/ui/ChatActivity.java | 4 +- .../org/telegram/ui/ChatProfileActivity.java | 2 +- .../java/org/telegram/ui/LaunchActivity.java | 5 +-- .../org/telegram/ui/LoginActivitySmsView.java | 6 +-- .../telegram/ui/Views/VideoTimelineView.java | 2 +- .../src/main/res/values-ar/strings.xml | 14 ++++++- .../src/main/res/values-de/strings.xml | 38 ++++++++++++------- .../src/main/res/values-es/strings.xml | 20 +++++++--- .../src/main/res/values-it/strings.xml | 26 +++++++++---- .../src/main/res/values-nl/strings.xml | 26 +++++++++---- .../src/main/res/values-pt-rBR/strings.xml | 14 ++++++- .../src/main/res/values-pt-rPT/strings.xml | 14 ++++++- TMessagesProj/src/main/res/values/strings.xml | 16 ++++++-- 26 files changed, 182 insertions(+), 88 deletions(-) diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index 3458dd885..097c0cd34 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -80,7 +80,7 @@ android { defaultConfig { minSdkVersion 8 targetSdkVersion 19 - versionCode 345 + versionCode 346 versionName "1.9.3" } } diff --git a/TMessagesProj/src/main/java/org/telegram/android/AndroidUtilities.java b/TMessagesProj/src/main/java/org/telegram/android/AndroidUtilities.java index 969d49959..00c4ecb6e 100644 --- a/TMessagesProj/src/main/java/org/telegram/android/AndroidUtilities.java +++ b/TMessagesProj/src/main/java/org/telegram/android/AndroidUtilities.java @@ -35,7 +35,7 @@ public class AndroidUtilities { private static final Hashtable typefaceCache = new Hashtable(); private static int prevOrientation = -10; private static boolean waitingForSms = false; - private static final Integer smsLock = 2; + private static final Object smsLock = new Object(); public static int externalCacheNotAvailableState = 0; public static int statusBarHeight = 0; diff --git a/TMessagesProj/src/main/java/org/telegram/android/ContactsController.java b/TMessagesProj/src/main/java/org/telegram/android/ContactsController.java index 59ef6766d..c5dfd57bc 100644 --- a/TMessagesProj/src/main/java/org/telegram/android/ContactsController.java +++ b/TMessagesProj/src/main/java/org/telegram/android/ContactsController.java @@ -40,10 +40,10 @@ import java.util.concurrent.ConcurrentHashMap; public class ContactsController { private Account currentAccount; private boolean loadingContacts = false; - private static final Integer loadContactsSync = 1; + private static final Object loadContactsSync = new Object(); private boolean ignoreChanges = false; private boolean contactsSyncInProgress = false; - private final Integer observerLock = 1; + private final Object observerLock = new Object(); public boolean contactsLoaded = false; private boolean contactsBookLoaded = false; private String lastContactsVersions = ""; diff --git a/TMessagesProj/src/main/java/org/telegram/android/GcmBroadcastReceiver.java b/TMessagesProj/src/main/java/org/telegram/android/GcmBroadcastReceiver.java index ebd061984..04f282cb6 100644 --- a/TMessagesProj/src/main/java/org/telegram/android/GcmBroadcastReceiver.java +++ b/TMessagesProj/src/main/java/org/telegram/android/GcmBroadcastReceiver.java @@ -16,13 +16,11 @@ import android.content.Intent; import org.json.JSONObject; import org.telegram.messenger.ConnectionsManager; import org.telegram.messenger.FileLog; -import org.telegram.messenger.Utilities; import org.telegram.ui.ApplicationLoader; public class GcmBroadcastReceiver extends BroadcastReceiver { public static final int NOTIFICATION_ID = 1; - private static final Integer sync = 1; @Override public void onReceive(final Context context, final Intent intent) { diff --git a/TMessagesProj/src/main/java/org/telegram/android/ImageLoader.java b/TMessagesProj/src/main/java/org/telegram/android/ImageLoader.java index df84cb69e..d4d941d49 100644 --- a/TMessagesProj/src/main/java/org/telegram/android/ImageLoader.java +++ b/TMessagesProj/src/main/java/org/telegram/android/ImageLoader.java @@ -161,7 +161,7 @@ public class ImageLoader { private class CacheOutTask implements Runnable { private Thread runningThread = null; - private final Integer sync = 1; + private final Object sync = new Object(); private CacheImage cacheImage = null; private boolean isCancelled = false; diff --git a/TMessagesProj/src/main/java/org/telegram/android/LocaleController.java b/TMessagesProj/src/main/java/org/telegram/android/LocaleController.java index febbab75d..475372188 100644 --- a/TMessagesProj/src/main/java/org/telegram/android/LocaleController.java +++ b/TMessagesProj/src/main/java/org/telegram/android/LocaleController.java @@ -663,9 +663,11 @@ public class LocaleController { } else if (dateDay + 1 == day && year == dateYear) { return String.format("%s %s %s", LocaleController.getString("LastSeen", R.string.LastSeen), LocaleController.getString("YesterdayAt", R.string.YesterdayAt), formatterDay.format(new Date(date * 1000))); } else if (year == dateYear) { - return String.format("%s %s %s %s", LocaleController.getString("LastSeenDate", R.string.LastSeenDate), formatterMonth.format(new Date(date * 1000)), LocaleController.getString("OtherAt", R.string.OtherAt), formatterDay.format(new Date(date * 1000))); + String format = LocaleController.formatString("formatDateAtTime", R.string.formatDateAtTime, formatterMonth.format(new Date(date * 1000)), formatterDay.format(new Date(date * 1000))); + return String.format("%s %s", LocaleController.getString("LastSeenDate", R.string.LastSeenDate), format); } else { - return String.format("%s %s %s %s", LocaleController.getString("LastSeenDate", R.string.LastSeenDate), formatterYear.format(new Date(date * 1000)), LocaleController.getString("OtherAt", R.string.OtherAt), formatterDay.format(new Date(date * 1000))); + String format = LocaleController.formatString("formatDateAtTime", R.string.formatDateAtTime, formatterYear.format(new Date(date * 1000)), formatterDay.format(new Date(date * 1000))); + return String.format("%s %s", LocaleController.getString("LastSeenDate", R.string.LastSeenDate), format); } } @@ -707,21 +709,25 @@ public class LocaleController { } chatFullDate = FastDateFormat.getInstance(formatString, locale); - formatterWeek = FastDateFormat.getInstance("EEE", locale); - - if (lang != null) { - if (is24HourFormat) { - formatterDay = FastDateFormat.getInstance("HH:mm", locale); - } else { - if (lang.toLowerCase().equals("ar")) { - formatterDay = FastDateFormat.getInstance("h:mm a", locale); - } else { - formatterDay = FastDateFormat.getInstance("h:mm a", Locale.US); - } - } - } else { - formatterDay = FastDateFormat.getInstance("h:mm a", Locale.US); + formatString = getStringInternal("formatterWeek", R.string.formatterWeek); + if (formatString == null || formatString.length() == 0) { + formatString = "EEE"; } + formatterWeek = FastDateFormat.getInstance(formatString, locale); + + if (is24HourFormat) { + formatString = getStringInternal("formatterDay24H", R.string.formatterDay24H); + } else { + formatString = getStringInternal("formatterDay12H", R.string.formatterDay12H); + } + if (formatString == null || formatString.length() == 0) { + if (is24HourFormat) { + formatString = "HH:mm"; + } else { + formatString = "h:mm a"; + } + } + formatterDay = FastDateFormat.getInstance(formatString, locale); } public static String stringForMessageListDate(long date) { diff --git a/TMessagesProj/src/main/java/org/telegram/android/MediaController.java b/TMessagesProj/src/main/java/org/telegram/android/MediaController.java index f68def86a..c91e00354 100644 --- a/TMessagesProj/src/main/java/org/telegram/android/MediaController.java +++ b/TMessagesProj/src/main/java/org/telegram/android/MediaController.java @@ -196,7 +196,7 @@ public class MediaController implements NotificationCenter.NotificationCenterDel private long lastPlayPcm; private int ignoreFirstProgress = 0; private Timer progressTimer = null; - private final Integer progressTimerSync = 1; + private final Object progressTimerSync = new Object(); private AudioRecord audioRecorder = null; private TLRPC.TL_audio recordingAudio = null; @@ -208,10 +208,10 @@ public class MediaController implements NotificationCenter.NotificationCenterDel private DispatchQueue playerQueue; private ArrayList usedPlayerBuffers = new ArrayList(); private ArrayList freePlayerBuffers = new ArrayList(); - private final Integer playerSync = 2; - private final Integer playerObjectSync = 3; + private final Object playerSync = new Object(); + private final Object playerObjectSync = new Object(); - private final Integer sync = 1; + private final Object sync = new Object(); private ArrayList recordBuffers = new ArrayList(); private ByteBuffer fileBuffer; diff --git a/TMessagesProj/src/main/java/org/telegram/android/MessageObject.java b/TMessagesProj/src/main/java/org/telegram/android/MessageObject.java index e249226fb..ca7f86343 100644 --- a/TMessagesProj/src/main/java/org/telegram/android/MessageObject.java +++ b/TMessagesProj/src/main/java/org/telegram/android/MessageObject.java @@ -214,7 +214,7 @@ public class MessageObject { } } } else if (message.action instanceof TLRPC.TL_messageActionLoginUnknownLocation) { - String date = String.format("%s %s %s", LocaleController.formatterYear.format(((long)message.date) * 1000), LocaleController.getString("OtherAt", R.string.OtherAt), LocaleController.formatterDay.format(((long)message.date) * 1000)); + String date = LocaleController.formatString("formatDateAtTime", R.string.formatDateAtTime, LocaleController.formatterYear.format(((long)message.date) * 1000), LocaleController.formatterDay.format(((long)message.date) * 1000)); TLRPC.User to_user = UserConfig.getCurrentUser(); if (to_user == null) { if (users != null) { diff --git a/TMessagesProj/src/main/java/org/telegram/android/NotificationsController.java b/TMessagesProj/src/main/java/org/telegram/android/NotificationsController.java index 9bcfcf38c..3aa873fac 100644 --- a/TMessagesProj/src/main/java/org/telegram/android/NotificationsController.java +++ b/TMessagesProj/src/main/java/org/telegram/android/NotificationsController.java @@ -136,7 +136,7 @@ public class NotificationsController { } else if (messageObject.messageOwner.action instanceof TLRPC.TL_messageActionUserUpdatedPhoto) { msg = LocaleController.formatString("NotificationContactNewPhoto", R.string.NotificationContactNewPhoto, ContactsController.formatName(user.first_name, user.last_name)); } else if (messageObject.messageOwner.action instanceof TLRPC.TL_messageActionLoginUnknownLocation) { - String date = String.format("%s %s %s", LocaleController.formatterYear.format(((long) messageObject.messageOwner.date) * 1000), LocaleController.getString("OtherAt", R.string.OtherAt), LocaleController.formatterDay.format(((long) messageObject.messageOwner.date) * 1000)); + String date = LocaleController.formatString("formatDateAtTime", R.string.formatDateAtTime, LocaleController.formatterYear.format(((long) messageObject.messageOwner.date) * 1000), LocaleController.formatterDay.format(((long) messageObject.messageOwner.date) * 1000)); msg = LocaleController.formatString("NotificationUnrecognizedDevice", R.string.NotificationUnrecognizedDevice, UserConfig.getCurrentUser().first_name, date, messageObject.messageOwner.action.title, messageObject.messageOwner.action.address); } } else { @@ -385,7 +385,7 @@ public class NotificationsController { if (pushDialogs.size() == 1) { detailText = LocaleController.formatPluralString("NewMessages", total_unread_count); } else { - detailText = String.format("%s %s", LocaleController.formatPluralString("NewMessages", total_unread_count), LocaleController.formatPluralString("FromContacts", pushDialogs.size())); + detailText = LocaleController.formatString("NotificationMessagesPeopleDisplayOrder", R.string.NotificationMessagesPeopleDisplayOrder, LocaleController.formatPluralString("NewMessages", total_unread_count), LocaleController.formatPluralString("FromContacts", pushDialogs.size())); } NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(ApplicationLoader.applicationContext) @@ -583,12 +583,23 @@ public class NotificationsController { text += message; } + Intent intent = new Intent(ApplicationLoader.applicationContext, LaunchActivity.class); + intent.setAction("com.tmessages.openchat" + Math.random() + Integer.MAX_VALUE); + intent.setFlags(32768); + if (chat != null) { + intent.putExtra("chatId", chat.id); + } else if (user != null) { + intent.putExtra("userId", user.id); + } + PendingIntent contentIntent = PendingIntent.getActivity(ApplicationLoader.applicationContext, 0, intent, PendingIntent.FLAG_ONE_SHOT); + NotificationCompat.Builder builder = new NotificationCompat.Builder(ApplicationLoader.applicationContext) .setContentTitle(name) .setSmallIcon(R.drawable.notification) .setGroup("messages") .setContentText(text) .setGroupSummary(false) + .setContentIntent(contentIntent) .extend(new NotificationCompat.WearableExtender().addAction(action)); notificationManager.notify(notificationId, builder.build()); diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/BuffersStorage.java b/TMessagesProj/src/main/java/org/telegram/messenger/BuffersStorage.java index 5c39ae078..db28c5c73 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/BuffersStorage.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/BuffersStorage.java @@ -19,7 +19,7 @@ public class BuffersStorage { private final ArrayList freeBuffers32768; private final ArrayList freeBuffersBig; private boolean isThreadSafe; - private final static Integer sync = 1; + private final static Object sync = new Object(); private static volatile BuffersStorage Instance = null; public static BuffersStorage getInstance() { diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/HandshakeAction.java b/TMessagesProj/src/main/java/org/telegram/messenger/HandshakeAction.java index 49f6cedaf..770dbd6f3 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/HandshakeAction.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/HandshakeAction.java @@ -87,7 +87,7 @@ public class HandshakeAction extends Action implements TcpConnection.TcpConnecti reqPQMsgData = sendMessageData(reqPq, generateMessageId()); } - final Integer lock = 1; + final Object lock = new Object(); static ArrayList> serverPublicKeys = null; HashMap selectPublicKey(ArrayList fingerprints) { synchronized (lock) { diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/TcpConnection.java b/TMessagesProj/src/main/java/org/telegram/messenger/TcpConnection.java index 263ed8fdc..a2afb811c 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/TcpConnection.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/TcpConnection.java @@ -48,7 +48,7 @@ public class TcpConnection extends ConnectionContext { private boolean hasSomeDataSinceLastConnect = false; private int willRetryConnectCount = 5; private boolean isNextPort = false; - private final Integer timerSync = 1; + private final Object timerSync = new Object(); private boolean wasConnected; private int lastPacketLength; diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/UserConfig.java b/TMessagesProj/src/main/java/org/telegram/messenger/UserConfig.java index a1e375373..f27723f54 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/UserConfig.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/UserConfig.java @@ -28,7 +28,7 @@ public class UserConfig { public static String contactsHash = ""; public static String importHash = ""; public static boolean blockedUsersLoaded = false; - private final static Integer sync = 1; + private final static Object sync = new Object(); public static boolean saveIncomingPhotos = false; public static int contactsVersion = 1; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index 59b2734fd..819c0e375 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -1270,8 +1270,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not if (info != null) { count = info.participants.size(); } - if (onlineCount > 0 && count != 0) { - actionBarLayer.setSubtitle(String.format("%s, %d %s", LocaleController.formatPluralString("Members", count), onlineCount, LocaleController.getString("Online", R.string.Online))); + if (onlineCount > 1 && count != 0) { + actionBarLayer.setSubtitle(String.format("%s, %s", LocaleController.formatPluralString("Members", count), LocaleController.formatPluralString("Online", onlineCount))); } else { actionBarLayer.setSubtitle(LocaleController.formatPluralString("Members", count)); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java index 1545a3e73..8f4ba8269 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatProfileActivity.java @@ -630,7 +630,7 @@ public class ChatProfileActivity extends BaseFragment implements NotificationCen } if (count != 0 && onlineCount > 1) { - onlineText.setText(Html.fromHtml(String.format("%s, %d %s", LocaleController.formatPluralString("Members", count), onlineCount, LocaleController.getString("Online", R.string.Online)))); + onlineText.setText(Html.fromHtml(String.format("%s, %d %s", LocaleController.formatPluralString("Members", count), onlineCount, LocaleController.formatPluralString("Online", onlineCount)))); } else { onlineText.setText(LocaleController.formatPluralString("Members", count)); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java index d5770b107..f2d27cbde 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java @@ -562,9 +562,8 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa pushOpened = true; } } else if (showDialogsList) { - for (int a = 1; a < actionBarLayout.fragmentsStack.size(); a++) { - actionBarLayout.removeFragmentFromStack(actionBarLayout.fragmentsStack.get(a)); - a--; + if (!AndroidUtilities.isTablet()) { + actionBarLayout.removeAllFragments(); } pushOpened = false; isNew = false; diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LoginActivitySmsView.java b/TMessagesProj/src/main/java/org/telegram/ui/LoginActivitySmsView.java index ace4d2365..d9187fba1 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LoginActivitySmsView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LoginActivitySmsView.java @@ -54,7 +54,7 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente private Timer timeTimer; private Timer codeTimer; - private static final Integer timerSync = 1; + private static final Object timerSync = new Object(); private volatile int time = 60000; private volatile int codeTime = 15000; private double lastCurrentTime; @@ -165,7 +165,7 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente destroyTimer(); destroyCodeTimer(); - timeText.setText(String.format("%s 1:00", LocaleController.getString("CallText", R.string.CallText))); + timeText.setText(LocaleController.formatString("CallText", R.string.CallText, 1, 0)); lastCurrentTime = System.currentTimeMillis(); problemText.setVisibility(time < 1000 ? VISIBLE : GONE); @@ -230,7 +230,7 @@ public class LoginActivitySmsView extends SlideView implements NotificationCente if (time >= 1000) { int minutes = time / 1000 / 60; int seconds = time / 1000 - minutes * 60; - timeText.setText(String.format("%s %d:%02d", LocaleController.getString("CallText", R.string.CallText), minutes, seconds)); + timeText.setText(LocaleController.formatString("CallText", R.string.CallText, minutes, seconds)); } else { timeText.setText(LocaleController.getString("Calling", R.string.Calling)); destroyTimer(); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Views/VideoTimelineView.java b/TMessagesProj/src/main/java/org/telegram/ui/Views/VideoTimelineView.java index 926c08db4..92e2ef3a2 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Views/VideoTimelineView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Views/VideoTimelineView.java @@ -41,7 +41,7 @@ public class VideoTimelineView extends View { private VideoTimelineViewDelegate delegate = null; private ArrayList frames = new ArrayList(); private AsyncTask currentTask = null; - private static final Integer sync = 1; + private static final Object sync = new Object(); private long frameTimeOffset = 0; private int frameWidth = 0; private int frameHeight = 0; diff --git a/TMessagesProj/src/main/res/values-ar/strings.xml b/TMessagesProj/src/main/res/values-ar/strings.xml index 2796762a4..5ac5f3ad4 100644 --- a/TMessagesProj/src/main/res/values-ar/strings.xml +++ b/TMessagesProj/src/main/res/values-ar/strings.xml @@ -15,7 +15,7 @@ رمز التفعيل تم إرسال رسالة قصيرة تحتوي على رمز التفعيل الخاص بك - سنتصل بك خلال + %1$d:%2$02d سنتصل بك خلال جاري الاتصال بك ... رمز التفعيل الرقم خاطئ؟ @@ -154,13 +154,13 @@ الرد Reply to %1$s Reply to %1$s + %1$s %2$s اختر جهة اتصال لا توجد جهات اتصال بعد http://telegram.org/dl2 مرحبا! هيا نستخدم تيليجرام: اليوم الساعة أمس الساعة - الساعة متصل غير متصل آخر ظهور @@ -398,6 +398,12 @@ تيليجرام]]> الرسائل مشفرة بشكل قوي وتستطيع تدمير ذاتها إبدأ المراسلة + %1$d متصل + %1$d متصل + %1$d متصل + %1$d متصل + %1$d متصل + %1$d متصل لا يوجد أعضاء %1$d عضو %1$d عضوان @@ -434,6 +440,10 @@ dd.MM.yyyy d MMMM d MMMM yyyy + EEE + HH:mm + h:mm a + %1$s \'الساعة\' %2$s CACHE_TAG \ No newline at end of file diff --git a/TMessagesProj/src/main/res/values-de/strings.xml b/TMessagesProj/src/main/res/values-de/strings.xml index 97e1b0009..0159a1e37 100644 --- a/TMessagesProj/src/main/res/values-de/strings.xml +++ b/TMessagesProj/src/main/res/values-de/strings.xml @@ -15,7 +15,7 @@ Dein Code Wir haben dir eine SMS mit einem Aktivierungscode zugeschickt - Wir rufen dich an in + Wir rufen dich an in %1$d:%2$02d Wir rufen dich an… Code Falsche Nummer? @@ -96,13 +96,13 @@ Ausgewählt: %d MEINE TELEFONNUMMER TEILEN ZU KONTAKTEN HINZUFÜGEN - %s hat dich zu einem geheimen Chat eingeladen. - Du hast %s zu einem geheimen Chat eingeladen. + %s hat dich zu einem\nEnde-zu-Ende verschlüsselten\nGeheimen Chat eingeladen. + Du hast %s zu einem\nEnde-zu-Ende verschlüsselten\nGeheimen Chat eingeladen. Geheime Chats in Kürze: - Ende-zu-Ende Verschlüsselung - Keine Serverspeicherung - Selbstzerstörungs-Timer - Verbieten Weiterleitung + Keine Serverspeicherung + Selbstzerstörungs-Timer + Verbieten Weiterleitung + Löschen sich bei Abmeldung Du wurdest aus der Gruppe entfernt Du hast die Gruppe verlassen Diese Gruppe löschen @@ -152,15 +152,15 @@ %1$s,\nWir haben eine Anmeldung von einem neuen Gerät am %2$s festgestellt.\n\nGerät: %3$s\nStandort: %4$s\n\nWenn du das nicht selbst gewesen bist, melde alle anderen Sitzungen in den Telegram Einstellungen unverzüglich ab.\n\nMit freundlichen Grüßen,\nDas Telegram Team %1$s hat das Profilbild geändert Beantworten - Reply to %1$s - Reply to %1$s + %1$s antworten + %1$s antworten + %1$s %2$s Kontakt auswählen Noch keine Kontakte Hey, lass uns zu Telegram wechseln: http://telegram.org/dl2 heute um gestern um - um online offline zul. online @@ -256,7 +256,7 @@ Aktiviert Deaktiviert Mitteilungsdienst - Sofern Google Play Dienste ausreichend für deine Mitteilungen sind, kannst du unseren Mitteilungsdienst abschalten. Wir empfehlen allerdings, unseren Dienst dauerhaft aktiviert zu lassen um über neue Nachrichten in Echtzeit informiert zu werden. + Sofern Google Play Dienste ausreichend für deine Mitteilungen sind, kannst du unseren Mitteilungsdienst 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 W-LAN @@ -380,7 +380,7 @@ Geheimen Chat starten? mit meinem Namen weiterleiten Nachricht an %1$s senden? - Nachrichten an %1$s weiterleiten? + Weiterleiten an %1$s? Telegram Schnell @@ -397,7 +397,13 @@ Telegram]]> lässt sich von verschiedenen Geräten]]>gleichzeitig nutzen. Telegram]]>-Nachrichten sind stark verschlüsselt]]>und können sich selbst zerstören. Jetzt beginnen - + + %1$d online + %1$d online + %1$d online + %1$d online + %1$d online + %1$d online keine Mitglieder %1$d Mitglied %1$d Mitglieder @@ -433,7 +439,11 @@ dd.MM.yy dd.MM.yyyy d MMMM - d MMMM yyyy + d MMMM, yyyy + EEE + HH:mm + h:mm a + %1$s \'um\' %2$s CACHE_TAG \ No newline at end of file diff --git a/TMessagesProj/src/main/res/values-es/strings.xml b/TMessagesProj/src/main/res/values-es/strings.xml index 3ef00b5dd..63e25cca4 100644 --- a/TMessagesProj/src/main/res/values-es/strings.xml +++ b/TMessagesProj/src/main/res/values-es/strings.xml @@ -15,7 +15,7 @@ Tu código Enviamos un SMS con el código de activación al número - Te llamaremos en + Te llamaremos en %1$d:%2$02d Llamándote... Código ¿Número incorrecto? @@ -152,15 +152,15 @@ %1$s,\nDetectamos un inicio de sesión en tu cuenta desde un nuevo dispositivo, el %2$s\n\nDispositivo: %3$s\nUbicación: %4$s\n\nSi no eras tú, puedes ir a Ajustes - Cerrar todas las otras sesiones.\n\nAtentamente,\nEl equipo de Telegram %1$s actualizó su foto de perfil Responder - Reply to %1$s - Reply to %1$s + Responder a %1$s + Responder a %1$s + %1$s %2$s Elegir contacto Aún sin contactos Oye, cambiémonos a Telegram: http://telegram.org/dl2 hoy a las ayer a las - a las en línea fuera de línea últ. vez @@ -397,7 +397,13 @@ Telegram]]> te permite acceder a tus]]>mensajes desde múltiples dispositivos. Telegram]]> posee mensajes fuertemente]]>cifrados y se pueden autodestruir. Empieza a conversar - + + %1$d en línea + %1$d en línea + %1$d en línea + %1$d en línea + %1$d en línea + %1$d en línea sin miembros %1$d miembro %1$d miembros @@ -434,6 +440,10 @@ dd.MM.yyyy d \'de\' MMMM d \'de\' MMMM \'de\' yyyy + EEE + HH:mm + h:mm a + %1$s \'a las\' %2$s CACHE_TAG \ No newline at end of file diff --git a/TMessagesProj/src/main/res/values-it/strings.xml b/TMessagesProj/src/main/res/values-it/strings.xml index befdbb860..2a1499a31 100644 --- a/TMessagesProj/src/main/res/values-it/strings.xml +++ b/TMessagesProj/src/main/res/values-it/strings.xml @@ -15,7 +15,7 @@ Il tuo codice Abbiamo inviato un SMS al tuo telefono con il codice di attivazione - Ti telefoneremo tra + Ti telefoneremo tra %1$d:%2$02d Ti stiamo chiamando… Codice Numero errato? @@ -152,15 +152,15 @@ %1$s,\nAbbiamo rilevato un accesso al tuo account da un nuovo dispositivo %2$s\n\nDispositivo: %3$s\nPosizione: %4$s\n\nSe non sei stato tu, puoi andare su Impostazioni - Termina tutte le sessioni.\n\nGrazie,\nil team di Telegram %1$s ha aggiornato la foto del profilo Rispondi - Reply to %1$s - Reply to %1$s + Rispondi a %1$s + Rispondi a %1$s + %1$s %2$s Seleziona contatto Ancora nessun contatto Ciao, passa a Telegram: http://telegram.org/dl2 oggi alle ieri alle - alle in linea non in linea ultimo accesso @@ -379,8 +379,8 @@ Eliminare questo contatto? Iniziare una chat segreta? inoltra dal mio nome - Inviare i messaggi a %1$s? - Vuoi inoltrare i messaggi a %1$s? + Inviare messaggi a %1$s? + Inoltra messaggi a %1$s? Telegram Veloce @@ -397,7 +397,13 @@ Telegram]]> ti consente di accedere]]>ai messaggi da più dispositivi. Telegram]]> cifra in maniera sicura i messaggi]]>e può far sì che si autodistruggano. Inizia a inviare messaggi - + + %1$d in linea + %1$d in linea + %1$d in linea + %1$d in linea + %1$d in linea + %1$d in linea nessun membro %1$d membro %1$d membri @@ -433,7 +439,11 @@ dd.MM.yy dd.MM.yyyy d MMMM - d MMMM yyyy + d MMMM, yyyy + EEE + HH:mm + h:mm a + %1$s \'alle\' %2$s CACHE_TAG \ No newline at end of file diff --git a/TMessagesProj/src/main/res/values-nl/strings.xml b/TMessagesProj/src/main/res/values-nl/strings.xml index 403e510cd..273e0eca9 100644 --- a/TMessagesProj/src/main/res/values-nl/strings.xml +++ b/TMessagesProj/src/main/res/values-nl/strings.xml @@ -15,7 +15,7 @@ Je code We hebben een sms met een activatiecode verzonden naar je telefoon - We bellen je over + We bellen je over %1$d:%2$02d We bellen je… Code Verkeerd nummer? @@ -152,15 +152,15 @@ %1$s,\nEr is op je account ingelogd vanaf een nieuw apparaat op %2$s\n\nApparaat: %3$s\nLocatie: %4$s\n\nAls jij dit niet was, kun je alle sessies beëindigen via Instellingen – Beëindig alle andere sessies.\n\nBedankt,\nHet Telegram-team %1$s heeft zijn/haar profielfoto gewijzigd Antwoord - Reply to %1$s - Reply to %1$s + Antwoord op %1$s + Antwoord op %1$s + %1$s %2$s Kies een contact Nog geen contacten Hey! Zullen we overstappen op Telegram? http://telegram.org/dl2 vandaag om gisteren om - om online offline gezien @@ -380,7 +380,7 @@ Weet je zeker dat je een geheime chat wilt starten? doorsturen via mijn eigen naam Berichten naar %1$s verzenden? - Berichten doorsturen naar %1$s? + Berichten naar %1$s doorsturen? Telegram Snel @@ -397,7 +397,13 @@ Telegram]]> biedt toegang tot je berichten]]>vanaf meerdere apparaten. Telegram]]> berichten zijn sterk versleuteld]]>en kunnen zichzelf vernietigen. Begin met chatten - + + %1$d online + %1$d online + %1$d online + %1$d online + %1$d online + %1$d online geen deelnemers %1$d deelnemer %1$d deelnemers @@ -430,10 +436,14 @@ van %1$d contactpersonen dd MMM - dd.MM.yy - dd.MM.yyyy + dd-MM-yy + dd-MM-yyyy d MMMM d MMMM yyyy + EEE + HH:mm + h:mm a + %1$s \'om\' %2$s CACHE_TAG \ No newline at end of file diff --git a/TMessagesProj/src/main/res/values-pt-rBR/strings.xml b/TMessagesProj/src/main/res/values-pt-rBR/strings.xml index 515b1dfb1..a5e6957ef 100644 --- a/TMessagesProj/src/main/res/values-pt-rBR/strings.xml +++ b/TMessagesProj/src/main/res/values-pt-rBR/strings.xml @@ -15,7 +15,7 @@ Seu código Enviamos uma SMS com um código de ativação para o seu telefone - Vamos te ligar em + Vamos te ligar em %1$d:%2$02d Estamos te ligando... Código Número incorreto? @@ -154,13 +154,13 @@ Responder Reply to %1$s Reply to %1$s + %1$s %2$s Selecionar Contato Ainda não há contatos Ei, vamos mudar para o Telegram: http://telegram.org/dl2 hoje às ontem às - às online offline visto @@ -398,6 +398,12 @@ Telegram]]> possui mensagens fortemente]]>encriptadas e podem se auto-destruir. Comece a conversar + %1$d online + %1$d online + %1$d online + %1$d online + %1$d online + %1$d online sem membros %1$d membro %1$d membros @@ -434,6 +440,10 @@ dd.MM.yyyy d MMMM d MMMM yyyy + EEE + HH:mm + h:mm a + %1$s \'às\' %2$s CACHE_TAG \ No newline at end of file diff --git a/TMessagesProj/src/main/res/values-pt-rPT/strings.xml b/TMessagesProj/src/main/res/values-pt-rPT/strings.xml index 85c128467..248e03ab9 100644 --- a/TMessagesProj/src/main/res/values-pt-rPT/strings.xml +++ b/TMessagesProj/src/main/res/values-pt-rPT/strings.xml @@ -15,7 +15,7 @@ Seu código Enviamos uma SMS com um código de ativação para o seu telefone - Vamos te ligar em + Vamos te ligar em %1$d:%2$02d Estamos te ligando... Código Número incorreto? @@ -154,13 +154,13 @@ Responder Reply to %1$s Reply to %1$s + %1$s %2$s Selecionar Contato Ainda não há contatos Ei, vamos mudar para o Telegram: http://telegram.org/dl2 hoje às ontem às - às online offline visto @@ -398,6 +398,12 @@ Telegram]]> possui mensagens fortemente]]>encriptadas e podem se auto-destruir. Comece a conversar + %1$d online + %1$d online + %1$d online + %1$d online + %1$d online + %1$d online sem membros %1$d membro %1$d membros @@ -434,6 +440,10 @@ dd.MM.yyyy d MMMM d MMMM yyyy + EEE + HH:mm + h:mm a + %1$s \'às\' %2$s CACHE_TAG \ No newline at end of file diff --git a/TMessagesProj/src/main/res/values/strings.xml b/TMessagesProj/src/main/res/values/strings.xml index f139a53e4..0bbdd0680 100644 --- a/TMessagesProj/src/main/res/values/strings.xml +++ b/TMessagesProj/src/main/res/values/strings.xml @@ -15,7 +15,7 @@ Your code We\'ve sent an SMS with an activation code to your phone - We will call you in + We will call you in %1$d:%2$02d Calling you... Code Wrong number? @@ -154,13 +154,13 @@ Reply Reply to %1$s Reply to %1$s + %1$s %2$s Select Contact No contacts yet Hey, let\'s switch to Telegram: http://telegram.org/dl2 today at yesterday at - at online offline last seen @@ -397,7 +397,13 @@ Telegram]]> lets you access your messages]]>from multiple devices. Telegram]]> messages are heavily encrypted]]>and can self-destruct. Start Messaging - + + %1$d online + %1$d online + %1$d online + %1$d online + %1$d online + %1$d online no members %1$d member %1$d members @@ -434,6 +440,10 @@ dd.MM.yyyy MMMM d MMMM d, yyyy + EEE + HH:mm + h:mm a + %1$s \'at\' %2$s CACHE_TAG \ No newline at end of file