You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
session-desktop/_locales
sachaaaaa a0f67c22da Merge branch 'textsecure/master' into merge_1_21_0
* textsecure/master: (26 commits)
  v1.21.0
  v1.21.0-beta.4
  Dark Theme: Preserve blue background on app loading screen
  Localization updates
  Fix width of audio player when window is very narrow
  A number of small fixes for Link Previews
  Get rid of the white flash when the app starts up (#3083)
  v1.21.0-beta.3
  Lint fixes
  Introduce new language: NB
  Fail over to all numbers in retry if errors don't have numbers
  Use the proper method for pulling attachments off disk for retry
  Fix rendering bug with verified state in updateVerified()
  Update electron-builder and electron-updater
  Ensure that dialog pops up when permissions denied for voice note
  Lint fixes
  Large update to localization strings
  Link Previews
  Ensure that blocked messages are dropped even after sealed sender
  Don't linkify quoted message contents
  ...

# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	_locales/cs/messages.json
#	background.html
#	config/default.json
#	index.html
#	js/models/conversations.js
#	js/modules/web_api.js
#	js/settings_start.js
#	js/views/conversation_view.js
#	js/views/settings_view.js
#	package.json
#	protos/SignalService.proto
#	stylesheets/_index.scss
#	stylesheets/_settings.scss
6 years ago
..
ar Merge branch 'textsecure/master' into merge_1_21_0 6 years ago
bg Merge branch 'textsecure/master' into merge_1_21_0 6 years ago
ca Localization updates 6 years ago
cs Merge branch 'textsecure/master' into merge_1_21_0 6 years ago
da Localization updates 6 years ago
de Localization updates 6 years ago
el Localization updates 6 years ago
en Merge branch 'textsecure/master' into merge_1_21_0 6 years ago
eo Localization updates 6 years ago
es Localization updates 6 years ago
es_419 Fix up tests. 6 years ago
et Localization updates 6 years ago
fa Localization updates 6 years ago
fi Localization updates 6 years ago
fr Localization updates 6 years ago
he Localization updates 6 years ago
hi Merge branch 'textsecure/master' into merge_1_21_0 6 years ago
hr Merge branch 'textsecure/master' into merge_1_21_0 6 years ago
hu Localization updates 6 years ago
id Localization updates 6 years ago
it Localization updates 6 years ago
ja Localization updates 6 years ago
km Localization updates 6 years ago
kn Merge branch 'textsecure/master' into merge_1_21_0 6 years ago
ko Merge branch 'textsecure/master' into merge_1_21_0 6 years ago
lt Localization updates 6 years ago
mk Merge branch 'textsecure/master' into merge_1_21_0 6 years ago
nb Localization updates 6 years ago
nl Localization updates 6 years ago
no Localization updates 6 years ago
pl Localization updates 6 years ago
pt_BR Localization updates 6 years ago
pt_PT Localization updates 6 years ago
ro Localization updates 6 years ago
ru Localization updates 6 years ago
sk Localization updates 6 years ago
sl Localization updates 6 years ago
sq Localization updates 6 years ago
sr Merge branch 'textsecure/master' into merge_1_21_0 6 years ago
sv Localization updates 6 years ago
th Localization updates 6 years ago
tr Localization updates 6 years ago
uk Merge branch 'textsecure/master' into merge_1_21_0 6 years ago
vi Merge branch 'textsecure/master' into merge_1_21_0 6 years ago
zh_CN Localization updates 6 years ago
zh_TW Localization updates 6 years ago