Browse Source

Merge branch 'pr/494'

master
Igor Zhukov 10 years ago
parent
commit
eb978b82ea
  1. 2
      app/js/directives.js
  2. 1
      app/js/locales/de-de.json
  3. 2
      app/js/locales/en-us.json

2
app/js/directives.js

@ -37,7 +37,7 @@ angular.module('myApp.directives', ['myApp.filters']) @@ -37,7 +37,7 @@ angular.module('myApp.directives', ['myApp.filters'])
var dateFilter = $filter('myDate'),
dateSplitHtml = '<div class="im_message_date_split im_service_message_wrap"><div class="im_service_message"></div></div>',
unreadSplitHtml = '<div class="im_message_unread_split">Unread messages</div>',
unreadSplitHtml = '<div class="im_message_unread_split" my-i18n="unread_messages_split"></div>',
selectedClass = 'im_message_selected',
focusClass = 'im_message_focus',
unreadClass = 'im_message_unread',

1
app/js/locales/de-de.json

@ -66,6 +66,7 @@ @@ -66,6 +66,7 @@
"error_image_download_failed": "Download fehlgeschlagen",
"error_browser_no_local_file_system_video_md": "Dein Browser unterstützt nicht die {moz-link: https://developer.mozilla.org/en-US/docs/Web/API/LocalFileSystem | LocalFileSystem}-Funktion, welche zum Abspielen dieses Videos benötigt wird.\nBitte installiere {chrome-link: http://google.com/chrome | Google Chrome} oder benutze stattdessen die {telegram-link: https://telegram.org/ | mobile App}.",
"error_video_download_failed": "Videodownload fehlgeschlagen",
"unread_messages_split": "ungelesene Nachrichten",
"user_name_deleted": "Gelöscht",
"user_first_name_deleted": "Gelöscht",
"user_status_offline": "offline",

2
app/js/locales/en-us.json

@ -74,6 +74,8 @@ @@ -74,6 +74,8 @@
"error_browser_no_local_file_system_video_md": "Your browser doesn't support {moz-link: https://developer.mozilla.org/en-US/docs/Web/API/LocalFileSystem | LocalFileSystem} feature which is needed to play this video.\nPlease, install {chrome-link: http://google.com/chrome | Google Chrome} or use {telegram-link: https://telegram.org/ | mobile app} instead.",
"error_video_download_failed": "Video download failed",
"unread_messages_split": "Unread messages",
"user_name_deleted": "DELETED",
"user_first_name_deleted": "DELETED",
"user_status_offline": "offline",

Loading…
Cancel
Save