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-ios/Session/Meta/Translations
Morgan Pretty 661720a988 Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign
# Conflicts:
#	Session.xcodeproj/project.pbxproj
#	Session/Meta/Translations/ar.lproj/Localizable.strings
#	Session/Meta/Translations/be.lproj/Localizable.strings
#	Session/Meta/Translations/bg.lproj/Localizable.strings
#	Session/Meta/Translations/bn.lproj/Localizable.strings
#	Session/Meta/Translations/cs.lproj/Localizable.strings
#	Session/Meta/Translations/da.lproj/Localizable.strings
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/el.lproj/Localizable.strings
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/eo.lproj/Localizable.strings
#	Session/Meta/Translations/es-ES.lproj/Localizable.strings
#	Session/Meta/Translations/fa.lproj/Localizable.strings
#	Session/Meta/Translations/fi.lproj/Localizable.strings
#	Session/Meta/Translations/fil.lproj/Localizable.strings
#	Session/Meta/Translations/fr.lproj/Localizable.strings
#	Session/Meta/Translations/hi.lproj/Localizable.strings
#	Session/Meta/Translations/hr.lproj/Localizable.strings
#	Session/Meta/Translations/hu.lproj/Localizable.strings
#	Session/Meta/Translations/id.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.lproj/Localizable.strings
#	Session/Meta/Translations/ko.lproj/Localizable.strings
#	Session/Meta/Translations/ku.lproj/Localizable.strings
#	Session/Meta/Translations/lt.lproj/Localizable.strings
#	Session/Meta/Translations/lv.lproj/Localizable.strings
#	Session/Meta/Translations/ne-NP.lproj/Localizable.strings
#	Session/Meta/Translations/nl.lproj/Localizable.strings
#	Session/Meta/Translations/no.lproj/Localizable.strings
#	Session/Meta/Translations/pl.lproj/Localizable.strings
#	Session/Meta/Translations/pt-BR.lproj/Localizable.strings
#	Session/Meta/Translations/pt-PT.lproj/Localizable.strings
#	Session/Meta/Translations/ro.lproj/Localizable.strings
#	Session/Meta/Translations/ru.lproj/Localizable.strings
#	Session/Meta/Translations/si-LK.lproj/Localizable.strings
#	Session/Meta/Translations/sk.lproj/Localizable.strings
#	Session/Meta/Translations/sl.lproj/Localizable.strings
#	Session/Meta/Translations/sv-SE.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/tr.lproj/Localizable.strings
#	Session/Meta/Translations/uk.lproj/Localizable.strings
#	Session/Meta/Translations/vi.lproj/Localizable.strings
#	Session/Meta/Translations/zh-CN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-TW.lproj/Localizable.strings
#	SessionMessagingKit/Configuration.swift
#	SessionUtilitiesKit/Database/Storage.swift
1 year ago
..
ar.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
be.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
bg.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
bn.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
cs.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
da.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
de.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
el.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
en.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
eo.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
es-ES.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
fa.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
fi.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
fil.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
fr.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
hi.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
hr.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
hu.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
id.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
it.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
ja.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
ko.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
ku.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
lt.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
lv.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
ne-NP.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
nl.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
no.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
pl.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
pt-BR.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
pt-PT.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
ro.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
ru.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
si-LK.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
sk.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
sl.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
sv-SE.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
th.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
tr.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
uk.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
vi.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
zh-CN.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
zh-TW.lproj Merge remote-tracking branch 'upstream/dev' into disappearing-message-redesign 1 year ago
TRANSLATIONS.md Organize files 5 years ago
remove_unused_strings.swift Remove unused strings 4 years ago