oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
session-ios/Session/Meta/Translations
History
Morgan Pretty 534343f8b0 Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 
# Conflicts:
#	Session/Closed Groups/NewClosedGroupVC.swift
#	Session/Conversations/ConversationVC+Interaction.swift
#	Session/Conversations/ConversationVC.swift
#	Session/Conversations/ConversationViewModel.swift
#	Session/Conversations/Settings/ThreadSettingsViewModel.swift
#	Session/Home/GlobalSearch/GlobalSearchViewController.swift
#	Session/Home/HomeVC.swift
#	Session/Home/New Conversation/NewDMVC.swift
#	Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift
#	Session/Meta/Translations/de.lproj/Localizable.strings
#	Session/Meta/Translations/en.lproj/Localizable.strings
#	Session/Meta/Translations/es.lproj/Localizable.strings
#	Session/Meta/Translations/fa.lproj/Localizable.strings
#	Session/Meta/Translations/fi.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/id-ID.lproj/Localizable.strings
#	Session/Meta/Translations/it.lproj/Localizable.strings
#	Session/Meta/Translations/ja.lproj/Localizable.strings
#	Session/Meta/Translations/nl.lproj/Localizable.strings
#	Session/Meta/Translations/pl.lproj/Localizable.strings
#	Session/Meta/Translations/pt_BR.lproj/Localizable.strings
#	Session/Meta/Translations/ru.lproj/Localizable.strings
#	Session/Meta/Translations/si.lproj/Localizable.strings
#	Session/Meta/Translations/sk.lproj/Localizable.strings
#	Session/Meta/Translations/sv.lproj/Localizable.strings
#	Session/Meta/Translations/th.lproj/Localizable.strings
#	Session/Meta/Translations/vi-VN.lproj/Localizable.strings
#	Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
#	Session/Meta/Translations/zh_CN.lproj/Localizable.strings
#	Session/Settings/BlockedContactsViewController.swift
#	Session/Settings/NukeDataModal.swift
#	Session/Settings/SettingsViewModel.swift
#	SessionMessagingKit/Shared Models/SessionThreadViewModel.swift
#	SessionUIKit/Components/ConfirmationModal.swift
 		2023-05-18 17:34:25 +10:00
..
.tx Organize files 2020-11-12 08:48:41 +11:00
bin Organize files 2020-11-12 08:48:41 +11:00
de.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
en.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
es.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
fa.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
fi.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
fr.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
hi.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
hr.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
id-ID.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
it.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
ja.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
nl.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
pl.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
pt_BR.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
ru.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
si.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
sk.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
sv.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
th.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
vi-VN.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
zh-Hant.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
zh_CN.lproj Merge remote-tracking branch 'upstream/dev' into feature/updated-user-config-handling 2023-05-18 17:34:25 +10:00
TRANSLATIONS.md Organize files 2020-11-12 08:48:41 +11:00
remove_unused_strings.swift Remove unused strings 2021-04-29 15:20:11 +10:00