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
Ryan Miller 005efc8952 Merge branch 'unstable' into standardised_strings_merge
# Conflicts:
#	.gitignore
#	_locales/en/messages.json
#	ts/components/DebugLogView.tsx
#	ts/components/SessionWrapperModal.tsx
#	ts/components/basic/SessionHTMLRenderer.tsx
#	ts/components/basic/SessionRadio.tsx
#	ts/components/buttons/MenuButton.tsx
#	ts/components/conversation/SessionConversation.tsx
#	ts/components/conversation/SubtleNotification.tsx
#	ts/components/conversation/TimerNotification.tsx
#	ts/components/conversation/composition/CompositionBox.tsx
#	ts/components/conversation/message/message-content/MessageText.tsx
#	ts/components/conversation/message/message-item/InteractionNotification.tsx
#	ts/components/conversation/message/reactions/ReactionPopup.tsx
#	ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx
#	ts/components/conversation/right-panel/overlay/disappearing-messages/DisappearingModes.tsx
#	ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx
#	ts/components/dialog/BanOrUnbanUserDialog.tsx
#	ts/components/dialog/DeleteAccountModal.tsx
#	ts/components/dialog/EditProfileDialog.tsx
#	ts/components/dialog/ModeratorsAddDialog.tsx
#	ts/components/dialog/OnionStatusPathDialog.tsx
#	ts/components/dialog/ReactListModal.tsx
#	ts/components/dialog/SessionSeedModal.tsx
#	ts/components/dialog/SessionSetPasswordDialog.tsx
#	ts/components/dialog/UserDetailsDialog.tsx
#	ts/components/leftpane/LeftPaneSectionHeader.tsx
#	ts/components/leftpane/LeftPaneSettingSection.tsx
#	ts/components/leftpane/conversation-list-item/InteractionItem.tsx
#	ts/components/leftpane/overlay/OverlayClosedGroup.tsx
#	ts/components/leftpane/overlay/OverlayCommunity.tsx
#	ts/components/leftpane/overlay/OverlayMessage.tsx
#	ts/components/leftpane/overlay/SessionJoinableDefaultRooms.tsx
#	ts/components/leftpane/overlay/choose-action/ContactsListWithBreaks.tsx
#	ts/components/leftpane/overlay/choose-action/OverlayChooseAction.tsx
#	ts/components/menu/Menu.tsx
#	ts/components/registration/RegistrationStages.tsx
#	ts/components/registration/RegistrationUserDetails.tsx
#	ts/components/registration/SignInTab.tsx
#	ts/components/registration/SignUpTab.tsx
#	ts/components/settings/SessionSettings.tsx
#	ts/components/settings/SessionSettingsHeader.tsx
#	ts/components/settings/ZoomingSessionSlider.tsx
#	ts/components/settings/section/CategoryAppearance.tsx
#	ts/components/settings/section/CategoryHelp.tsx
#	ts/components/settings/section/CategoryPermissions.tsx
#	ts/components/settings/section/CategoryPrivacy.tsx
#	ts/hooks/useParamSelector.ts
#	ts/mains/main_renderer.tsx
#	ts/models/message.ts
#	ts/node/menu.ts
#	ts/node/tray_icon.ts
#	ts/session/constants.ts
#	ts/session/disappearing_messages/timerOptions.ts
#	ts/session/utils/Toast.tsx
#	ts/state/selectors/search.ts
#	ts/test/session/unit/selectors/conversations_test.ts
#	ts/types/LocalizerKeys.ts
#	ts/types/Util.ts
#	ts/window.d.ts
#	yarn.lock
8 months ago
..
ar chore: pull crowdin changes 2 years ago
be Merge branch 'unstable' into userconfig_disappearingmessage 2 years ago
bg chore: pull crowdin changes 2 years ago
ca chore: pull crowdin changes 2 years ago
cs chore: pull crowdin changes 2 years ago
da chore: pull crowdin changes 2 years ago
de chore: pull crowdin changes 2 years ago
el chore: pull crowdin changes 2 years ago
en feat: add custom tags for i18n 8 months ago
eo chore: pull crowdin changes 2 years ago
es chore: pull crowdin changes 2 years ago
es_419 chore: pull crowdin changes 2 years ago
et chore: pull crowdin changes 2 years ago
fa chore: pull crowdin changes 2 years ago
fi chore: pull crowdin changes 2 years ago
fil chore: pull crowdin changes 2 years ago
fr chore: pull crowdin changes 2 years ago
he chore: pull crowdin changes 2 years ago
hi chore: pull crowdin changes 2 years ago
hr chore: pull crowdin changes 2 years ago
hu chore: pull crowdin changes 2 years ago
hy-AM chore: pull crowdin changes 2 years ago
id chore: pull crowdin changes 2 years ago
it chore: pull crowdin changes 2 years ago
ja chore: pull crowdin changes 2 years ago
ka Merge branch 'unstable' into userconfig_disappearingmessage 2 years ago
km chore: pull crowdin changes 2 years ago
kmr chore: pull crowdin changes 2 years ago
kn Merge branch 'unstable' into userconfig_disappearingmessage 2 years ago
ko chore: pull crowdin changes 2 years ago
lt chore: pull crowdin changes 2 years ago
lv Merge branch 'unstable' into userconfig_disappearingmessage 2 years ago
mk chore: pull crowdin changes 2 years ago
nb chore: pull crowdin changes 2 years ago
nl chore: pull crowdin changes 2 years ago
no chore: pull crowdin changes 2 years ago
pa Merge branch 'unstable' into userconfig_disappearingmessage 2 years ago
pl chore: pull crowdin changes 2 years ago
pt_BR chore: pull crowdin changes 2 years ago
pt_PT chore: pull crowdin changes 2 years ago
ro chore: pull crowdin changes 2 years ago
ru chore: pull crowdin changes 2 years ago
si chore: pull crowdin changes 2 years ago
sk chore: pull crowdin changes 2 years ago
sl chore: pull crowdin changes 2 years ago
sq chore: pull crowdin changes 2 years ago
sr chore: pull crowdin changes 2 years ago
sv chore: pull crowdin changes 2 years ago
ta Merge branch 'unstable' into userconfig_disappearingmessage 2 years ago
th chore: pull crowdin changes 2 years ago
tl Merge branch 'unstable' into userconfig_disappearingmessage 2 years ago
tr feat: updated turkish translations 9 months ago
uk chore: pull crowdin changes 2 years ago
uz chore: pull crowdin changes 2 years ago
vi chore: pull crowdin changes 2 years ago
zh_CN chore: pull crowdin changes 2 years ago
zh_TW chore: pull crowdin changes 2 years ago