OpenSource/Telegram-Android
OpenSource/Telegram-Android
1
0
Fork 0
mirror of https://github.com/DrKLO/Telegram.git synced 2024-12-22 06:25:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'dev'

Browse source
This commit is contained in:
DrKLO 2014-03-23 16:24:04 +04:00
commit d4703e32b0
6 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java
View file

@ -4539,7 +4539,7 @@ public class MessagesController implements NotificationCenter.NotificationCenter
final String notificationData = new JSONArray().put(jsonData).toString();
i.putExtra("messageType", "PEBBLE_ALERT");
i.putExtra("sender", "MyAndroidApp");
i.putExtra("sender", LocaleController.formatString("AppName", R.string.AppName));
i.putExtra("notificationData", notificationData);
ApplicationLoader.applicationContext.sendBroadcast(i);

1
TMessagesProj/src/main/res/values-ar/strings.xml
View file

@ -249,6 +249,7 @@
<string name="AutomaticPhotoDownloadPrivateChats">المحادثات</string>
<string name="Events">الأحداث</string>
<string name="ContactJoined">اشترك صديق في تيليجرام</string>
<string name="Pebble">PEBBLE</string>
<!--media view-->
<string name="NoMedia">لا توجد وسائط بعد</string>

1
TMessagesProj/src/main/res/values-de/strings.xml
View file

@ -249,6 +249,7 @@
<string name="AutomaticPhotoDownloadPrivateChats">Private Chats</string>
<string name="Events">EREIGNISSE</string>
<string name="ContactJoined">Kontakt ist Telegram beigetreten</string>
<string name="Pebble">PEBBLE</string>
<!--media view-->
<string name="NoMedia">Noch keine geteilten Medien vorhanden</string>

1
TMessagesProj/src/main/res/values-es/strings.xml
View file

@ -249,6 +249,7 @@
<string name="AutomaticPhotoDownloadPrivateChats">Chats</string>
<string name="Events">EVENTOS</string>
<string name="ContactJoined">Un contacto se unió a Telegram</string>
<string name="Pebble">PEBBLE</string>
<!--media view-->
<string name="NoMedia">No hay fotos ni vídeos compartidos aún</string>

4
TMessagesProj/src/main/res/values-it/strings.xml
View file

@ -106,6 +106,7 @@
<string name="YouLeft">Hai abbandonato il gruppo</string>
<string name="DeleteThisGroup">Elimina questo gruppo</string>
<string name="SlideToCancel">TRASCINA PER ANNULLARE</string>
<string name="SaveToDownloads">Salva in download</string>
<!--notification-->
<string name="EncryptedChatRequested">Chat segreta richiesta</string>
@ -243,10 +244,12 @@
<string name="SendByEnter">Usa invio per inoltrare il messaggio</string>
<string name="TerminateAllSessions">Termina tutte le sessioni</string>
<string name="AutomaticPhotoDownload">SCARICA AUTOMATICAMENTE LE FOTO</string>
<string name="AutomaticAudioDownload">SCARICAMENTO AUDIO AUTOMATICO</string>
<string name="AutomaticPhotoDownloadGroups">Chat di gruppo</string>
<string name="AutomaticPhotoDownloadPrivateChats">Chat private</string>
<string name="Events">EVENTI</string>
<string name="ContactJoined">Un nuovo contatto utilizza Telegram</string>
<string name="Pebble">PEBBLE</string>
<!--media view-->
<string name="NoMedia">Nessun media condiviso</string>
@ -331,6 +334,7 @@
<string name="AddToTheGroup">Desideri aggiungere %1$s al gruppo?</string>
<string name="ForwardMessagesTo">Desideri inoltrare il messaggio a %1$s?</string>
<string name="DeleteChatQuestion">Desideri eliminare la chat?</string>
<!--Intro view-->
<string name="Page1Title">Telegram</string>
<string name="Page2Title">Veloce</string>

1
TMessagesProj/src/main/res/values-nl/strings.xml
View file

@ -249,6 +249,7 @@
<string name="AutomaticPhotoDownloadPrivateChats">Privégesprekken</string>
<string name="Events">GEBEURTENISSEN</string>
<string name="ContactJoined">Contact lid geworden van Telegram</string>
<string name="Pebble">PEBBLE</string>
<!--media view-->
<string name="NoMedia">Nog geen media gedeeld</string>