translations PR 20170905 (#882)

* Fix search and search preview

* Add "in:" and "from:" search modifiers

android/app/build.gradle

@@ -91,7 +91,7 @@ android {
         applicationId "com.mattermost.rnbeta"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 48
+        versionCode 49
         versionName "1.2.0"
         multiDexEnabled true
         ndk {

app/actions/views/channel.js

@@ -167,13 +167,14 @@ export function loadFilesForPostIfNecessary(postId) {
     };
 }
 
-export function loadThreadIfNecessary(rootId) {
+export function loadThreadIfNecessary(rootId, channelId) {
     return async (dispatch, getState) => {
         const state = getState();
-        const {posts} = state.entities.posts;
+        const {posts, postsInChannel} = state.entities.posts;
+        const channelPosts = postsInChannel[channelId];
 
-        if (rootId && !posts[rootId]) {
-            getPostThread(rootId)(dispatch, getState);
+        if (rootId && (!posts[rootId] || !channelPosts || !channelPosts[rootId])) {
+            getPostThread(rootId, false)(dispatch, getState);
         }
     };
 }

app/components/badge.js

@@ -91,7 +91,7 @@ export default class Badge extends PureComponent {
         setTimeout(() => {
             this.setNativeProps({
                 style: {
-                    display: 'flex'
+                    opacity: 1
                 }
             });
         }, 100);
@@ -125,7 +125,7 @@ export default class Badge extends PureComponent {
             >
                 <View
                     ref='badgeContainer'
-                    style={[styles.badge, this.props.style, {display: 'none'}]}
+                    style={[styles.badge, this.props.style, {opacity: 0}]}
                 >
                     <View style={styles.wrapper}>
                         {this.renderText()}

app/components/markdown/markdown_code_block/markdown_code_block.js

@@ -187,6 +187,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
             overflow: 'scroll' // Doesn't actually cause a scrollbar, but stops text from wrapping
         },
         codeText: {
+            color: changeOpacity(theme.centerChannelColor, 0.65),
             fontSize: 12,
             lineHeight: 18
         },

app/components/search_preview/search_preview.js

@@ -52,9 +52,17 @@ export default class SearchPreview extends PureComponent {
     };
 
     state = {
-        showPosts: false
+        showPosts: false,
+        animationEnded: false
     };
 
+    componentWillReceiveProps(nextProps) {
+        const {animationEnded, showPosts} = this.state;
+        if (animationEnded && !showPosts && nextProps.posts.length) {
+            this.setState({showPosts: true});
+        }
+    }
+
     handleClose = () => {
         this.refs.view.zoomOut().then(() => {
             if (this.props.onClose) {
@@ -74,6 +82,7 @@ export default class SearchPreview extends PureComponent {
     };
 
     showPostList = () => {
+        this.setState({animationEnded: true});
         if (!this.state.showPosts && this.props.posts.length) {
             this.setState({showPosts: true});
         }

app/screens/channel/channel_post_list/channel_post_list.js

@@ -133,7 +133,7 @@ class ChannelPostList extends PureComponent {
         const channelId = post.channel_id;
         const rootId = (post.root_id || post.id);
 
-        actions.loadThreadIfNecessary(post.root_id);
+        actions.loadThreadIfNecessary(post.root_id, channelId);
         actions.selectPost(rootId);
 
         let title;

app/screens/code/code.js

@@ -107,6 +107,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
             paddingVertical: 4
         },
         codeText: {
+            color: changeOpacity(theme.centerChannelColor, 0.65),
             fontFamily: getCodeFont(),
             fontSize: 12,
             lineHeight: 18

app/screens/search/search.js

@@ -6,6 +6,7 @@ import PropTypes from 'prop-types';
 import {injectIntl, intlShape} from 'react-intl';
 import {
     Dimensions,
+    Keyboard,
     Platform,
     StyleSheet,
     Text,
@@ -14,6 +15,7 @@ import {
     View
 } from 'react-native';
 import IonIcon from 'react-native-vector-icons/Ionicons';
+import AwesomeIcon from 'react-native-vector-icons/FontAwesome';
 
 import {General, RequestStatus} from 'mattermost-redux/constants';
 
@@ -32,6 +34,7 @@ import {changeOpacity, makeStyleSheetFromTheme} from 'app/utils/theme';
 const SECTION_HEIGHT = 20;
 const RECENT_LABEL_HEIGHT = 42;
 const RECENT_SEPARATOR_HEIGHT = 3;
+const MODIFIER_LABEL_HEIGHT = 58;
 const POSTS_PER_PAGE = ViewTypes.POST_VISIBILITY_CHUNK_SIZE;
 const SEARCHING = 'searching';
 const NO_RESULTS = 'no results';
@@ -99,7 +102,7 @@ class Search extends Component {
             setTimeout(() => {
                 this.refs.list.getWrapperRef().getListRef().scrollToOffset({
                     animated: true,
-                    offset: SECTION_HEIGHT + (recentLenght * RECENT_LABEL_HEIGHT) + ((recentLenght - 1) * RECENT_SEPARATOR_HEIGHT)
+                    offset: SECTION_HEIGHT + (2 * MODIFIER_LABEL_HEIGHT) + (recentLenght * RECENT_LABEL_HEIGHT) + ((recentLenght + 1) * RECENT_SEPARATOR_HEIGHT)
                 });
             }, 200);
         }
@@ -121,7 +124,8 @@ class Search extends Component {
         const channel = channels.find((c) => c.id === channelId);
         const rootId = (post.root_id || post.id);
 
-        actions.loadThreadIfNecessary(post.root_id);
+        Keyboard.dismiss();
+        actions.loadThreadIfNecessary(rootId, channelId);
         actions.selectPost(rootId);
 
         let title;
@@ -149,11 +153,7 @@ class Search extends Component {
             }
         };
 
-        if (Platform.OS === 'android') {
-            navigator.showModal(options);
-        } else {
-            navigator.push(options);
-        }
+        navigator.push(options);
     };
 
     handleSelectionChange = (event) => {
@@ -173,6 +173,10 @@ class Search extends Component {
         }
     };
 
+    keyModifierExtractor = (item) => {
+        return `modifier-${item.value}`;
+    };
+
     keyRecentExtractor = (item) => {
         return `recent-${item.terms}`;
     };
@@ -205,7 +209,8 @@ class Search extends Component {
         const focusedPostId = post.id;
         const channelId = post.channel_id;
 
-        actions.getPostThread(focusedPostId);
+        Keyboard.dismiss();
+        actions.getPostThread(focusedPostId, false);
         actions.getPostsBefore(channelId, focusedPostId, 0, POSTS_PER_PAGE);
         actions.getPostsAfter(channelId, focusedPostId, 0, POSTS_PER_PAGE);
 
@@ -224,6 +229,40 @@ class Search extends Component {
         actions.removeSearchTerms(currentTeamId, item.terms);
     };
 
+    renderModifiers = ({item}) => {
+        const {theme} = this.props;
+        const style = getStyleFromTheme(theme);
+
+        return (
+            <TouchableHighlight
+                key={item.modifier}
+                underlayColor={changeOpacity(theme.sidebarTextHoverBg, 0.5)}
+                onPress={() => preventDoubleTap(this.setModifierValue, this, item.value)}
+            >
+                <View style={style.modifierItemContainer}>
+                    <View style={style.modifierItemWrapper}>
+                        <View style={style.modifierItemLabelContainer}>
+                            <View style={style.modifierLabelIconContainer}>
+                                <AwesomeIcon
+                                    style={style.modifierLabelIcon}
+                                    name='plus-square-o'
+                                />
+                            </View>
+                            <Text
+                                style={style.modifierItemLabel}
+                            >
+                                {item.modifier}
+                            </Text>
+                        </View>
+                        <Text style={style.modifierItemDescription}>
+                            {item.description}
+                        </Text>
+                    </View>
+                </View>
+            </TouchableHighlight>
+        );
+    };
+
     renderPost = ({item, index}) => {
         const {channels, posts, theme} = this.props;
         const style = getStyleFromTheme(theme);
@@ -297,15 +336,19 @@ class Search extends Component {
         const {title} = section;
         const style = getStyleFromTheme(theme);
 
-        return (
-            <View style={style.sectionWrapper}>
-                <View style={style.sectionContainer}>
-                    <Text style={style.sectionLabel}>
-                        {title}
-                    </Text>
+        if (title) {
+            return (
+                <View style={style.sectionWrapper}>
+                    <View style={style.sectionContainer}>
+                        <Text style={style.sectionLabel}>
+                            {title}
+                        </Text>
+                    </View>
                 </View>
-            </View>
-        );
+            );
+        }
+
+        return <View/>;
     };
 
     renderRecentItem = ({item}) => {
@@ -353,6 +396,17 @@ class Search extends Component {
         actions.searchPosts(currentTeamId, terms, isOrSearch);
     };
 
+    setModifierValue = (modifier) => {
+        const {value} = this.state;
+        if (!value) {
+            this.handleTextChanged(modifier);
+        } else if (value.endsWith(' ')) {
+            this.handleTextChanged(`${value}${modifier}`);
+        } else {
+            this.handleTextChanged(`${value} ${modifier}`);
+        }
+    };
+
     setRecentValue = (recent) => {
         const {terms, isOrSearch} = recent;
         this.handleTextChanged(terms);
@@ -405,7 +459,28 @@ class Search extends Component {
 
         const {channelName, postId, preview, value} = this.state;
         const style = getStyleFromTheme(theme);
-        const sections = [];
+        const sections = [{
+            data: [{
+                value: 'from:',
+                modifier: `from:${intl.formatMessage({id: 'mobile.search.from_modifier_title', defaultMessage: 'username'})}`,
+                description: intl.formatMessage({
+                    id: 'mobile.search.from_modifier_description',
+                    defaultMessage: 'to find posts from specific users'
+                })
+            }, {
+                value: 'in:',
+                modifier: `in:${intl.formatMessage({id: 'mobile.search.in_modifier_title', defaultMessage: 'channel-name'})}`,
+                description: intl.formatMessage({
+                    id: 'mobile.search.in_modifier_description',
+                    defaultMessage: 'to find posts in specific channels'
+                })
+            }],
+            key: 'modifiers',
+            title: '',
+            renderItem: this.renderModifiers,
+            keyExtractor: this.keyModifierExtractor,
+            ItemSeparatorComponent: this.renderRecentSeparator
+        }];
 
         if (recent.length) {
             sections.push({
@@ -520,7 +595,8 @@ class Search extends Component {
                     style={style.sectionList}
                     renderSectionHeader={this.renderSectionHeader}
                     sections={sections}
-                    keyboardShouldPersistTaps='handled'
+                    keyboardShouldPersistTaps='always'
+                    keyboardDismissMode='interactive'
                     stickySectionHeadersEnabled={Platform.OS === 'ios'}
                 />
                 {previewComponent}
@@ -559,6 +635,38 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme) => {
             fontSize: 12,
             fontWeight: '600'
         },
+        modifierItemContainer: {
+            alignItems: 'center',
+            flex: 1,
+            flexDirection: 'row',
+            height: MODIFIER_LABEL_HEIGHT
+        },
+        modifierItemWrapper: {
+            flex: 1,
+            flexDirection: 'column',
+            paddingHorizontal: 16
+        },
+        modifierItemLabelContainer: {
+            alignItems: 'center',
+            flexDirection: 'row'
+        },
+        modifierLabelIconContainer: {
+            alignItems: 'center',
+            marginRight: 5
+        },
+        modifierLabelIcon: {
+            fontSize: 16,
+            color: changeOpacity(theme.centerChannelColor, 0.5)
+        },
+        modifierItemLabel: {
+            fontSize: 14,
+            color: theme.centerChannelColor
+        },
+        modifierItemDescription: {
+            fontSize: 12,
+            color: changeOpacity(theme.centerChannelColor, 0.5),
+            marginTop: 5
+        },
         recentItemContainer: {
             alignItems: 'center',
             flex: 1,

assets/base/i18n/de.json

@@ -9,6 +9,7 @@
   "about.hash": "Build Hash:",
   "about.hashee": "EE Build Hash:",
   "about.licensed": "Lizenziert durch:",
+  "about.notice": "Mattermost is made possible by the open source software used in our <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> and <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a> apps.",
   "about.number": "Build Nummer:",
   "about.teamEditionLearn": "Schließen Sie sich der Mattermost Community an auf ",
   "about.teamEditionSt": "Ihre gesamte Team-Kommunikation an einem Ort, sofort durchsuchbar und überall verfügbar.",
@@ -1297,15 +1298,14 @@
   "claim.email_to_oauth.switchTo": "Konto zu {uiType} wechseln",
   "claim.email_to_oauth.title": "Konto von E-Mail/Passwort auf {uiType} wechseln",
   "claim.ldap_to_email.confirm": "Passwort bestätigen",
-  "claim.ldap_to_email.email": "Sie werden die E-Mail-Adresse {email} zum Login verwenden",
-  "claim.ldap_to_email.enterLdapPwd": "Geben Sie Ihr {ldapPassword} für das {site} E-Mail-Konto ein",
-  "claim.ldap_to_email.enterPwd": "Geben Sie ein neues Passwort für Ihr E-Mail-Konto ein",
+  "claim.ldap_to_email.email": "After switching your authentication method, you will use {email} to login. Your AD/LDAP credentials will no longer allow access to Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "New email login password:",
   "claim.ldap_to_email.ldapPasswordError": "Bitte geben Sie Ihr AD/LDAP Passwort ein.",
   "claim.ldap_to_email.ldapPwd": "AD/LDAP Passwort",
   "claim.ldap_to_email.pwd": "Passwort",
   "claim.ldap_to_email.pwdError": "Bitte geben Sie Ihr Passwort ein.",
   "claim.ldap_to_email.pwdNotMatch": "Die Passwörter stimmen nicht überein.",
-  "claim.ldap_to_email.ssoType": "Sobald Sie Ihr Konto in Anspruch nehmen, können Sie sich nur noch mit Ihrer E-Mail-Adresse und Ihrem Passwort anmelden",
   "claim.ldap_to_email.switchTo": "Zugang auf E-Mail-Adresse/Passwort umstellen",
   "claim.ldap_to_email.title": "AD/LDAP Zugang auf E-Mail-Adresse/Passwort umstellen",
   "claim.oauth_to_email.confirm": "Passwort bestätigen",
@@ -1840,6 +1840,7 @@
   "mobile.file_upload.more": "Mehr",
   "mobile.file_upload.video": "Videobibliothek",
   "mobile.help.title": "Hilfe",
+  "mobile.image_preview.save": "Save Image",
   "mobile.intro_messages.DM": "Dies ist der Start der Privatnachrichten mit {teammate}. Privatnachrichten und hier geteilte Dateien sind für Personen außerhalb dieses Bereichs nicht sichtbar.",
   "mobile.intro_messages.default_message": "Dies ist der Kanal, den Teammitglieder sehen, wenn sie sich anmelden - benutzen Sie ihn zum Veröffentlichen von Aktualisierungen, die jeder kennen muss.",
   "mobile.intro_messages.default_welcome": "Willkommen bei {name}!",
@@ -2055,6 +2056,7 @@
   "rename_channel.handleHolder": "Kleinbuchstaben oder Ziffern",
   "rename_channel.lowercase": "Dürfen nur Kleinbuchstaben oder Ziffern sein",
   "rename_channel.maxLength": "Dieses Feld muss kleiner als {maxLength, number} Zeichen sein",
+  "rename_channel.minLength": "Channel name must be {minLength, number} or more characters",
   "rename_channel.required": "Dieses Feld wird erforderlich",
   "rename_channel.save": "Speichern",
   "rename_channel.title": "Kanal umbenennen",
@@ -2166,6 +2168,7 @@
   "sidebar.createGroup": "Einen neuen privaten Kanal erstellen",
   "sidebar.direct": "DIREKTNACHRICHTEN",
   "sidebar.favorite": "KANALFAVORITEN",
+  "sidebar.leave": "Kanal verlassen",
   "sidebar.mainMenu": "Main Menu",
   "sidebar.more": "Mehr",
   "sidebar.moreElips": "Mehr...",

assets/base/i18n/en.json

@@ -9,6 +9,7 @@
   "about.hash": "Build Hash:",
   "about.hashee": "EE Build Hash:",
   "about.licensed": "Licensed to:",
+  "about.notice": "Mattermost is made possible by the open source software used in our <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> and <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a> apps.",
   "about.number": "Build Number:",
   "about.teamEditionLearn": "Join the Mattermost community at ",
   "about.teamEditionSt": "All your team communication in one place, instantly searchable and accessible anywhere.",
@@ -1297,15 +1298,14 @@
   "claim.email_to_oauth.switchTo": "Switch account to {uiType}",
   "claim.email_to_oauth.title": "Switch Email/Password Account to {uiType}",
   "claim.ldap_to_email.confirm": "Confirm Password",
-  "claim.ldap_to_email.email": "You will use the email {email} to login",
-  "claim.ldap_to_email.enterLdapPwd": "Enter your {ldapPassword} for your {site} email account",
-  "claim.ldap_to_email.enterPwd": "Enter a new password for your email account",
+  "claim.ldap_to_email.email": "After switching your authentication method, you will use {email} to login. Your AD/LDAP credentials will no longer allow access to Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "New email login password:",
   "claim.ldap_to_email.ldapPasswordError": "Please enter your AD/LDAP password.",
   "claim.ldap_to_email.ldapPwd": "AD/LDAP Password",
   "claim.ldap_to_email.pwd": "Password",
   "claim.ldap_to_email.pwdError": "Please enter your password.",
   "claim.ldap_to_email.pwdNotMatch": "Passwords do not match.",
-  "claim.ldap_to_email.ssoType": "Upon claiming your account, you will only be able to login with your email and password",
   "claim.ldap_to_email.switchTo": "Switch account to email/password",
   "claim.ldap_to_email.title": "Switch AD/LDAP Account to Email/Password",
   "claim.oauth_to_email.confirm": "Confirm Password",
@@ -1906,7 +1906,11 @@
   "mobile.routes.thread_dm": "Direct Message Thread",
   "mobile.routes.user_profile": "Profile",
   "mobile.routes.user_profile.send_message": "Send Message",
+  "mobile.search.from_modifier_description": "to find posts from specific users",
+  "mobile.search.from_modifier_title": "username",
   "mobile.search.jump": "JUMP",
+  "mobile.search.in_modifier_description": "to find posts in specific channels",
+  "mobile.search.in_modifier_title": "channel-name",
   "mobile.search.no_results": "No Results Found",
   "mobile.select_team.choose": "Your teams:",
   "mobile.select_team.join_open": "Open teams you can join",
@@ -2067,6 +2071,7 @@
   "rename_channel.handleHolder": "lowercase alphanumeric characters",
   "rename_channel.lowercase": "Must be lowercase alphanumeric characters",
   "rename_channel.maxLength": "This field must be less than {maxLength, number} characters",
+  "rename_channel.minLength": "Channel name must be {minLength, number} or more characters",
   "rename_channel.required": "This field is required",
   "rename_channel.save": "Save",
   "rename_channel.title": "Rename Channel",
@@ -2178,6 +2183,7 @@
   "sidebar.createGroup": "Create new private channel",
   "sidebar.direct": "DIRECT MESSAGES",
   "sidebar.favorite": "FAVORITE CHANNELS",
+  "sidebar.leave": "Leave channel",
   "sidebar.mainMenu": "Main Menu",
   "sidebar.more": "More",
   "sidebar.moreElips": "More...",

assets/base/i18n/es.json

@@ -9,6 +9,7 @@
   "about.hash": "Hash de compilación:",
   "about.hashee": "Hash de compilación de EE:",
   "about.licensed": "Licenciado a:",
+  "about.notice": "Mattermost es hecho posible con software de código abierto utilizado en nuestra <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>plataforma</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>aplicación de escritorio</a> y <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>aplicaciones móviles</a>.",
   "about.number": "Número de compilación:",
   "about.teamEditionLearn": "Únete a la comunidad Mattermost en ",
   "about.teamEditionSt": "Todas las comunicaciones de tu equipo en un solo lugar, con búsquedas instantáneas y accesible de todas partes.",
@@ -28,8 +29,10 @@
   "activity_log.sessionsDescription": "Las sesiones son creadas cuando inicias sesión desde un nuevo navegador en un dispositivo. Las Sesiones te permiten utilizar Mattermost sin tener que volver a iniciar sesión por un período de tiempo especificado por el Administrador de Sistema. Si deseas cerrar sesión antes de que se cumpla este tiempo, Utiliza el botón de 'Cerrar Sesión' en la parte de abajo.",
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "Android App Nativa",
+  "activity_log_modal.androidNativeClassicApp": "App Clásica Nativa de Android",
   "activity_log_modal.desktop": "App Nativa de Escritorio",
   "activity_log_modal.iphoneNativeApp": "iPhone App Nativa",
+  "activity_log_modal.iphoneNativeClassicApp": "App Clásica Nativa de iPhone",
   "add_command.autocomplete": "Autocompletar",
   "add_command.autocomplete.help": "(Opcional) Mostrar el comando de barra en la lista de autocompletado.",
   "add_command.autocompleteDescription": "Descripción del Autocompletado",
@@ -148,6 +151,18 @@
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML 2.0",
   "admin.banner.heading": "Nota:",
+  "admin.client_versions.androidLatestVersion": "Última Versión de Android",
+  "admin.client_versions.androidLatestVersionHelp": "La última versión de Android liberada",
+  "admin.client_versions.androidMinVersion": "Mínima versión de Android",
+  "admin.client_versions.androidMinVersionHelp": "La mínima versión compatible de Android",
+  "admin.client_versions.desktopLatestVersion": "Última versión de Escritorio",
+  "admin.client_versions.desktopLatestVersionHelp": "La última versión de Escritorio liberada",
+  "admin.client_versions.desktopMinVersion": "Mínima versión de Escritorio",
+  "admin.client_versions.desktopMinVersionHelp": "La mínima version compatible de Escritorio",
+  "admin.client_versions.iosLatestVersion": "Última versión de IOS",
+  "admin.client_versions.iosLatestVersionHelp": "La última versión de IOS liberada",
+  "admin.client_versions.iosMinVersion": "Mínima versión de IOS",
+  "admin.client_versions.iosMinVersionHelp": "La mínima versión compatible de IOS",
   "admin.cluster.enableDescription": "Cuando es verdadero, Mattermost se ejecutará en modo de Alta Disponibilidad. Por favor, consulta la <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target='_blank'>documentación</a> para obtener más información acerca de la configuración de Alta Disponibilidad para Mattermost.",
   "admin.cluster.enableTitle": "Habilitar el Modo De Alta Disponibilidad:",
   "admin.cluster.interNodeListenAddressDesc": "La dirección en la que escuchará el servidor para comunicarse con otros servidores.",
@@ -651,15 +666,15 @@
   "admin.password.symbol": "Al menos un símbolo (por ejemplo,\"~!@#$%^&*()\")",
   "admin.password.uppercase": "Al menos una letra en mayúscula",
   "admin.plugins.jira": "JIRA (Beta)",
-  "admin.plugins.jira.channelParamNamePlaceholder": "nombre del canal",
+  "admin.plugins.jira.channelParamNamePlaceholder": "URL del canal",
   "admin.plugins.jira.enabledDescription": "Cuando es verdadero, se puede configurar JIRA webhooks para publicar mensajes en Mattermost. Para ayudar a combatir los ataques de phishing, todos los mensajes están marcados por una  etiqueta BOT.",
-  "admin.plugins.jira.enabledLabel": "Habilitado:",
+  "admin.plugins.jira.enabledLabel": "Habilitar JIRA:",
   "admin.plugins.jira.secretDescription": "Esta clave secreta se utiliza para autenticar a Mattermost.",
   "admin.plugins.jira.secretLabel": "Clave Secreta:",
   "admin.plugins.jira.secretParamPlaceholder": "clave secreta",
   "admin.plugins.jira.secretRegenerateDescription": "Regenera la clave secreta para la de dirección URL del webhook. La regeneración de la clave secreta invalida su actual integración de JIRA.",
   "admin.plugins.jira.setupDescription": "Utiliza esta URL del webhook para configurar la integración de JIRA. Ver {webhookDocsLink} para obtener más información.",
-  "admin.plugins.jira.teamParamPlaceholder": "nombre del equipo",
+  "admin.plugins.jira.teamParamPlaceholder": "URL del equipo",
   "admin.plugins.jira.userDescription": "Seleccione el nombre de usuario que será utilizado por esta integración.",
   "admin.plugins.jira.userLabel": "Usuario:",
   "admin.plugins.jira.webhookDocsLink": "documentación",
@@ -719,8 +734,8 @@
   "admin.saml.emailAttrDesc": "El atributo de la Aserción SAML que se utilizará para rellenar las direcciones de correo electrónico de los usuarios en Mattermost.",
   "admin.saml.emailAttrEx": "Ej.: \"Email\" o \"PrimaryEmail\"",
   "admin.saml.emailAttrTitle": "Atributo de Correo Electrónico:",
-  "admin.saml.enableDescription": "Cuando es verdadero, Mattermost permite el inicio de sesión mediante SAML. Por favor, consulte la <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>documentation</a> para obtener más información acerca de la configuración de SAML para Mattermost.",
-  "admin.saml.enableTitle": "Habilitar el inicio de Sesión con SAML:",
+  "admin.saml.enableDescription": "Cuando es verdadero, Mattermost permite el inicio de sesión mediante SAML 2.0. Por favor, consulte la <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>documentation</a> para obtener más información acerca de la configuración de SAML para Mattermost.",
+  "admin.saml.enableTitle": "Habilitar el inicio de Sesión con SAML 2.0:",
   "admin.saml.encryptDescription": "Si es falso, Mattermost no se descifrará las Aserciones SAML cifrados con su el Certificado Público del Proveedor de Servicio. No se recomienda para entornos de producción. Solo para probar.",
   "admin.saml.encryptTitle": "Habilitar el Cifrado:",
   "admin.saml.firstnameAttrDesc": "(Opcional) El atributo de la Aserción SAML que se utilizará para rellenar el nombre de los usuarios en Mattermost.",
@@ -856,6 +871,7 @@
   "admin.sidebar.advanced": "Avanzado",
   "admin.sidebar.audits": "Auditorías",
   "admin.sidebar.authentication": "Autenticación",
+  "admin.sidebar.client_versions": "Versión de Clientes",
   "admin.sidebar.cluster": "Alta disponibilidad",
   "admin.sidebar.compliance": "Cumplimiento",
   "admin.sidebar.configuration": "Configuración",
@@ -1297,15 +1313,14 @@
   "claim.email_to_oauth.switchTo": "Cambiar cuenta a {uiType}",
   "claim.email_to_oauth.title": "Cambiar Cuenta de Correo/Contraseña a {uiType}",
   "claim.ldap_to_email.confirm": "Confirmar Contraseña",
-  "claim.ldap_to_email.email": "Para iniciar sesión debes utilizar el correo electrónico {email}",
-  "claim.ldap_to_email.enterLdapPwd": "Ingresa tu {ldapPassword} para tu cuenta de correo electrónico en {site}",
-  "claim.ldap_to_email.enterPwd": "Ingresa una nueva contraseña para tu cuenta de correo",
+  "claim.ldap_to_email.email": "Después de cambiar el método de autenticación, utilizarás {email} para iniciar sesión. Tus credenciales de AD/LDAP ya no permitirán el acceso a Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "Nueva contraseña de inicio de sesión con correo electrónico:",
   "claim.ldap_to_email.ldapPasswordError": "Por favor ingresa tu contraseña de AD/LDAP.",
   "claim.ldap_to_email.ldapPwd": "Contraseña de AD/LDAP",
   "claim.ldap_to_email.pwd": "Contraseña",
   "claim.ldap_to_email.pwdError": "Por favor ingresa tu contraseña.",
   "claim.ldap_to_email.pwdNotMatch": "Las contraseñas no coinciden.",
-  "claim.ldap_to_email.ssoType": "Al cambiar el tipo de cuenta, sólo podrás iniciar sesión con tu correo electrónico y contraseña.",
   "claim.ldap_to_email.switchTo": "Cambiar cuenta a correo/contraseña",
   "claim.ldap_to_email.title": "Cambiar la cuenta de AD/LDAP a Correo/Contraseña",
   "claim.oauth_to_email.confirm": "Confirmar Contraseña",
@@ -1832,6 +1847,15 @@
   "mobile.custom_list.no_results": "Sin resultados",
   "mobile.drawer.teamsTitle": "Equipos",
   "mobile.edit_post.title": "Editando Mensaje",
+  "mobile.emoji_picker.activity": "ACTIVIDAD",
+  "mobile.emoji_picker.custom": "PERSONALIZADO",
+  "mobile.emoji_picker.flags": "BANDERAS",
+  "mobile.emoji_picker.foods": "COMIDA",
+  "mobile.emoji_picker.nature": "NATURALEZA",
+  "mobile.emoji_picker.objects": "OBJETOS",
+  "mobile.emoji_picker.people": "PERSONAS",
+  "mobile.emoji_picker.places": "LUGARES",
+  "mobile.emoji_picker.symbols": "SIMBOLOS",
   "mobile.error_handler.button": "Reiniciar",
   "mobile.error_handler.description": "\nPresiona reiniciar para abrir la aplicación de nuevo. Después de reiniciar, puedes reportar el problema desde el menú de configuración.\n",
   "mobile.error_handler.title": "Ocurrió un error inesperado.",
@@ -1840,6 +1864,7 @@
   "mobile.file_upload.more": "Más",
   "mobile.file_upload.video": "Librería de Videos",
   "mobile.help.title": "Ayuda",
+  "mobile.image_preview.save": "Guardar imagen",
   "mobile.intro_messages.DM": "Este es el inicio de tu historial de mensajes directos con {teammate}.Los mensajes directos y archivos que se comparten aquí no son mostrados a personas fuera de esta área.",
   "mobile.intro_messages.default_message": "Es es el primer canal que tus compañeros ven cuando se registran - puedes utilizarlo para enviar mensajes que todos deben leer.",
   "mobile.intro_messages.default_welcome": "¡Bienvenido a {name}!",
@@ -1848,11 +1873,11 @@
   "mobile.loading_members": "Cargando Miembros...",
   "mobile.loading_posts": "Cargando Mensajes...",
   "mobile.login_options.choose_title": "Selecciona un método para iniciar sesión",
-  "mobile.managed.blocked_by": "Blocked by {vendor}",
-  "mobile.managed.exit": "Editar",
-  "mobile.managed.jailbreak": "Jailbroken devices are not trusted by {vendor}, please exit the app.",
-  "mobile.managed.secured_by": "Secured by {vendor}",
-  "mobile.markdown.code.plusMoreLines": "+{count, number} more lines",
+  "mobile.managed.blocked_by": "Bloqueado por {vendor}",
+  "mobile.managed.exit": "Salir",
+  "mobile.managed.jailbreak": "{vendor} no confía en los dispositivos con jailbreak, por favor, salga de la aplicación.",
+  "mobile.managed.secured_by": "Asegurado por {vendor}",
+  "mobile.markdown.code.plusMoreLines": "+{count, number} más líneas",
   "mobile.more_dms.start": "Comenzar",
   "mobile.more_dms.title": "Nueva Conversación",
   "mobile.notice_mobile_link": "aplicaciones móviles",
@@ -1871,6 +1896,7 @@
   "mobile.post.failed_retry": "Intentar de nuevo",
   "mobile.post.failed_title": "No se pudo enviar el mensaje",
   "mobile.post.retry": "Actualizar",
+  "mobile.post_info.add_reaction": "Reaccionar",
   "mobile.request.invalid_response": "Se recibió una respuesta no válida del servidor.",
   "mobile.routes.channelInfo": "Información",
   "mobile.routes.channelInfo.createdBy": "Creado por {creator} el ",
@@ -1880,8 +1906,8 @@
   "mobile.routes.channel_members.action_message": "Debes seleccionar al menos un miembro a ser removido del canal.",
   "mobile.routes.channel_members.action_message_confirm": "¿Seguro quieres remover al miembro seleccionado del canal?",
   "mobile.routes.channels": "Canales",
-  "mobile.routes.code": "{language} Code",
-  "mobile.routes.code.noLanguage": "Code",
+  "mobile.routes.code": "Código {language}",
+  "mobile.routes.code.noLanguage": "Código",
   "mobile.routes.enterServerUrl": "URL del servidor",
   "mobile.routes.login": "Inicio de Sesión",
   "mobile.routes.loginOptions": "Selector Inicio de Sesión",
@@ -1934,7 +1960,7 @@
   "msg_typing.someone": "Alguien",
   "multiselect.add": "Agregar",
   "multiselect.go": "Ir",
-  "multiselect.list.notFound": "No se encontraron usuarios",
+  "multiselect.list.notFound": "No se encontraron elementos",
   "multiselect.numPeopleRemaining": "Utiliza ↑↓ para navegar, ↵ para seleccionar. Puedes agregar {num, number} {num, plural, one {persona} other {personas}} más. ",
   "multiselect.numRemaining": "Puedes agregar {num, number} más",
   "multiselect.placeholder": "Buscar y agregar miembros",
@@ -2055,6 +2081,7 @@
   "rename_channel.handleHolder": "Debe tener caracteres alfanuméricos y en minúscula",
   "rename_channel.lowercase": "Debe tener caracteres alfanumericos y minúscula",
   "rename_channel.maxLength": "Este campo debe tener menos de {maxLength, number} caracteres",
+  "rename_channel.minLength": "Nombre del canal debe ser de {minLength, number} o más caracteres",
   "rename_channel.required": "Este campo es obligatorio",
   "rename_channel.save": "Guardar",
   "rename_channel.title": "Renombrar Canal",
@@ -2113,60 +2140,61 @@
   "setting_upload.import": "Importar",
   "setting_upload.noFile": "No ha seleccionado un archivo",
   "setting_upload.select": "Selecciona un archivo",
-  "shortcuts.browser.channel_next": "Forward in history:\tAlt|Right",
-  "shortcuts.browser.channel_next.mac": "Forward in history:\t⌘|]",
-  "shortcuts.browser.channel_prev": "Back in history:\tAlt|Left",
-  "shortcuts.browser.channel_prev.mac": "Back in history:\t⌘|[",
-  "shortcuts.browser.font_decrease": "Zoom out:\tCtrl|-",
-  "shortcuts.browser.font_decrease.mac": "Zoom out:\t⌘|-",
-  "shortcuts.browser.font_increase": "Zoom in:\tCtrl|+",
-  "shortcuts.browser.font_increase.mac": "Zoom in:\t⌘|+",
-  "shortcuts.browser.header": "Built-in Browser Commands",
-  "shortcuts.browser.highlight_next": "Highlight text to the next line:\tShift|Down",
-  "shortcuts.browser.highlight_prev": "Highlight text to the previous line:\tShift|Up",
-  "shortcuts.browser.input.header": "Works inside an input field",
-  "shortcuts.browser.newline": "Create a new line:\tShift|Enter",
+  "shortcuts.browser.channel_next": "Adelante en la historia:\tAlt|Derecha",
+  "shortcuts.browser.channel_next.mac": "Adelante en la historia::\t⌘|]",
+  "shortcuts.browser.channel_prev": "Atrás en la historia:\tAlt|Izquierda",
+  "shortcuts.browser.channel_prev.mac": "Atrás en la historia:\t⌘|[",
+  "shortcuts.browser.font_decrease": "Alejar zoom:\tCtrl|-",
+  "shortcuts.browser.font_decrease.mac": "Alejar zoom:\t⌘|-",
+  "shortcuts.browser.font_increase": "Acercar zoom:\tCtrl|+",
+  "shortcuts.browser.font_increase.mac": "Acercar zoom:\t⌘|+",
+  "shortcuts.browser.header": "Comandos del navegador Incorporados",
+  "shortcuts.browser.highlight_next": "Resaltar el texto en la línea siguiente:\tShift|Abajo",
+  "shortcuts.browser.highlight_prev": "Resaltar el texto en la línea anterior:\tShift|Hasta",
+  "shortcuts.browser.input.header": "Funcionan en el interior de un campo de entrada",
+  "shortcuts.browser.newline": "Crea una nueva linea:\tShift|Retorno",
   "shortcuts.files.header": "Archivos",
-  "shortcuts.files.upload": "Upload files:\tCtrl|U",
-  "shortcuts.files.upload.mac": "Upload files:\t⌘|U",
+  "shortcuts.files.upload": "Subir archivos:\tCtrl|U",
+  "shortcuts.files.upload.mac": "Subir archivos:\t⌘|U",
   "shortcuts.header": "Atajos de teclado",
-  "shortcuts.info": "Begin a message with / for a list of all the commands at your disposal.",
-  "shortcuts.msgs.comp.channel": "Channel:\t~|[a-z]|Tab",
-  "shortcuts.msgs.comp.emoji": "Emoji:\t:|[a-z]|Tab",
+  "shortcuts.info": "Comienza un mensaje con / para una lista de comandos a tu disposición.",
+  "shortcuts.msgs.comp.channel": "Canal:\t~|[a-z]|Tab",
+  "shortcuts.msgs.comp.emoji": "Emoticon:\t:|[a-z]|Tab",
   "shortcuts.msgs.comp.header": "Autocompletar",
-  "shortcuts.msgs.comp.username": "Username:\t@|[a-z]|Tab",
-  "shortcuts.msgs.edit": "Edit last message in channel:\tUp",
-  "shortcuts.msgs.header": "Mensaje",
-  "shortcuts.msgs.input.header": "Works inside an empty input field",
-  "shortcuts.msgs.mark_as_read": "Mark current channel as read:\tEsc",
-  "shortcuts.msgs.reply": "Reply to last message in channel:\tShift|Up",
-  "shortcuts.msgs.reprint_next": "Reprint next message:\tCtrl|Down",
-  "shortcuts.msgs.reprint_next.mac": "Reprint next message:\t⌘|Down",
-  "shortcuts.msgs.reprint_prev": "Reprint previous message:\tCtrl|Up",
-  "shortcuts.msgs.reprint_prev.mac": "Reprint previous message:\t⌘|Up",
-  "shortcuts.nav.direct_messages_menu": "Direct messages menu:\tCtrl|Shift|K",
-  "shortcuts.nav.direct_messages_menu.mac": "Direct messages menu:\t⌘|Shift|K",
-  "shortcuts.nav.header": "Navigation",
-  "shortcuts.nav.next": "Next channel:\tAlt|Down",
-  "shortcuts.nav.next.mac": "Next channel:\t⌥|Down",
-  "shortcuts.nav.prev": "Previous channel:\tAlt|Up",
-  "shortcuts.nav.prev.mac": "Previous channel:\t⌥|Up",
-  "shortcuts.nav.recent_mentions": "Recent mentions:\tCtrl|Shift|M",
-  "shortcuts.nav.recent_mentions.mac": "Recent mentions:\t⌘|Shift|M",
-  "shortcuts.nav.settings": "Account settings:\tCtrl|Shift|A",
-  "shortcuts.nav.settings.mac": "Account settings:\t⌘|Shift|A",
-  "shortcuts.nav.switcher": "Quick channel switcher:\tCtrl|K",
-  "shortcuts.nav.switcher.mac": "Quick channel switcher:\t⌘|K",
-  "shortcuts.nav.unread_next": "Next unread channel:\tAlt|Shift|Down",
-  "shortcuts.nav.unread_next.mac": "Next unread channel:\t⌥|Shift|Down",
-  "shortcuts.nav.unread_prev": "Previous unread channel:\tAlt|Shift|Up",
-  "shortcuts.nav.unread_prev.mac": "Previous unread channel:\t⌥|Shift|Up",
+  "shortcuts.msgs.comp.username": "Nombre de usuario:\t@|[a-z]|tab",
+  "shortcuts.msgs.edit": "Editar el ultimo mensaje en el canal:\tArriba",
+  "shortcuts.msgs.header": "Mensajes",
+  "shortcuts.msgs.input.header": "Funciona dentro de un campo de entrada vacío",
+  "shortcuts.msgs.mark_as_read": "Marca el canal actual como leído:\tEsc",
+  "shortcuts.msgs.reply": "Responder al último mensaje en el canal:\tShift|Arriba",
+  "shortcuts.msgs.reprint_next": "Vuelve a imprimir el siguiente mensaje:\tCtrl|Abajo",
+  "shortcuts.msgs.reprint_next.mac": "Vuelve a imprimir el siguiente mensaje:\t⌘|Abajo",
+  "shortcuts.msgs.reprint_prev": "Vuelve a imprimir el mensaje anterior:\tCtrl|Arriba",
+  "shortcuts.msgs.reprint_prev.mac": "Vuelve a imprimir el mensaje anterior:\t⌘|Arriba",
+  "shortcuts.nav.direct_messages_menu": "Menú de mensajes directos:\tCtrl|Shift|K",
+  "shortcuts.nav.direct_messages_menu.mac": "Menú de mensajes directos:\t⌘|Shift|K",
+  "shortcuts.nav.header": "Navegación",
+  "shortcuts.nav.next": "Canal siguiente:\tAlt|Abajo",
+  "shortcuts.nav.next.mac": "Canal siguiente:\t⌥|Abajo",
+  "shortcuts.nav.prev": "Canal anterior:\tAlt|Arriba",
+  "shortcuts.nav.prev.mac": "Canal anterior:\t⌥|Arriba",
+  "shortcuts.nav.recent_mentions": "Menciones recientes:\tCtrl|Shift|M",
+  "shortcuts.nav.recent_mentions.mac": "Menciones recientes:\t⌘|Shift|M",
+  "shortcuts.nav.settings": "Configuración de la cuenta:\tCtrl|Shift|A",
+  "shortcuts.nav.settings.mac": "Configuración de la cuenta:\t⌘|Shift|A",
+  "shortcuts.nav.switcher": "Cambio rápido de canal:\tCtrl|K",
+  "shortcuts.nav.switcher.mac": "Cambio rápido de canal:\t⌘|K",
+  "shortcuts.nav.unread_next": "Próximo canal no leído:\tAlt|Shit|Abajo",
+  "shortcuts.nav.unread_next.mac": "Próximo canal no leído:\t⌥|Shift|Abajo",
+  "shortcuts.nav.unread_prev": "Canal no leído anterior:\tAlt|Shift|Arriba",
+  "shortcuts.nav.unread_prev.mac": "Canal no leído anterior:\t⌥|Shift|Arriba",
   "sidebar.channels": "CANALES PÚBLICOS",
   "sidebar.createChannel": "Crear nuevo canal público",
   "sidebar.createGroup": "Crear nuevo canal privado",
   "sidebar.direct": "MENSAJES DIRECTOS",
   "sidebar.favorite": "FAVORITOS",
-  "sidebar.mainMenu": "Main Menu",
+  "sidebar.leave": "Abandonar Canal",
+  "sidebar.mainMenu": "Menú principal",
   "sidebar.more": "Más",
   "sidebar.moreElips": "Más...",
   "sidebar.otherMembers": "Fuera de este equipo",

assets/base/i18n/fr.json

@@ -9,6 +9,7 @@
   "about.hash": "Hash de version :",
   "about.hashee": "Hash de version EE :",
   "about.licensed": "Licence accordée à :",
+  "about.notice": "Mattermost is made possible by the open source software used in our <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> and <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a> apps.",
   "about.number": "Numéro de compilation :",
   "about.teamEditionLearn": "Rejoignez la communauté Mattermost sur ",
   "about.teamEditionSt": "Toute la communication de votre équipe en un seul endroit, consultable instantanément et accessible de partout.",
@@ -1297,15 +1298,14 @@
   "claim.email_to_oauth.switchTo": "Changer de compte pour {uiType}",
   "claim.email_to_oauth.title": "Changer l'adresse e-mail/mot de passe pour {uiType}",
   "claim.ldap_to_email.confirm": "Confirmer le mot de passe",
-  "claim.ldap_to_email.email": "Vous devrez utiliser l'adresse e-mail {email} pour vous connecter.",
-  "claim.ldap_to_email.enterLdapPwd": "Veuillez spécifier votre {ldapPassword} pour votre compte {site}",
-  "claim.ldap_to_email.enterPwd": "Veuillez spécifier un nouveau mot de passe pour votre compte",
+  "claim.ldap_to_email.email": "After switching your authentication method, you will use {email} to login. Your AD/LDAP credentials will no longer allow access to Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "New email login password:",
   "claim.ldap_to_email.ldapPasswordError": "Veuillez spécifier votre mot de passe AD/LDAP.",
   "claim.ldap_to_email.ldapPwd": "Mot de passe AD/LDAP",
   "claim.ldap_to_email.pwd": "Mot de passe",
   "claim.ldap_to_email.pwdError": "Veuillez spécifier votre mot de passe.",
   "claim.ldap_to_email.pwdNotMatch": "Les mots de passe ne correspondent pas.",
-  "claim.ldap_to_email.ssoType": "Une fois votre compte modifié, vous ne pourrez plus vous connecter qu'avec votre adresse e-mail et votre mot de passe.",
   "claim.ldap_to_email.switchTo": "Basculez le type de connexion de votre compte sur le couple adresse e-mail / mot de passe",
   "claim.ldap_to_email.title": "Basculer le type de connexion de votre compte de AD/LDAP vers le couple adresse e-mail / mot de passe",
   "claim.oauth_to_email.confirm": "Confirmez le mot de passe",
@@ -1840,6 +1840,7 @@
   "mobile.file_upload.more": "Plus…",
   "mobile.file_upload.video": "Bibliothèque vidéo",
   "mobile.help.title": "Aide",
+  "mobile.image_preview.save": "Save Image",
   "mobile.intro_messages.DM": "Vous êtes au début de votre historique de messages avec {teammate}. Les messages privés et les fichiers partagés ici ne sont pas visibles par les autres utilisateurs.",
   "mobile.intro_messages.default_message": "Il s'agit du premier canal que les utilisateurs voient lorsqu'ils s'inscrivent. Utilisez‑le pour poster des informations que tout le monde devrait connaître.",
   "mobile.intro_messages.default_welcome": "Bienvenue {name} !",
@@ -2055,6 +2056,7 @@
   "rename_channel.handleHolder": "caractères alphanumériques minuscules",
   "rename_channel.lowercase": "Doit être en caractères alphanumériques minuscules",
   "rename_channel.maxLength": "Ce champ doit être inférieur à {maxLength, number} caractères",
+  "rename_channel.minLength": "Channel name must be {minLength, number} or more characters",
   "rename_channel.required": "Ce champ est obligatoire",
   "rename_channel.save": "Enregistrer",
   "rename_channel.title": "Renommer le canal",
@@ -2166,6 +2168,7 @@
   "sidebar.createGroup": "Créer un nouveau canal privé",
   "sidebar.direct": "MESSAGES PRIVÉS",
   "sidebar.favorite": "CANAUX FAVORIS",
+  "sidebar.leave": "Quitter le canal",
   "sidebar.mainMenu": "Main Menu",
   "sidebar.more": "Plus…",
   "sidebar.moreElips": "Plus...",

assets/base/i18n/it.json

@@ -9,6 +9,7 @@
   "about.hash": "Hash di compilazione:",
   "about.hashee": "Hash di compilazione EE:",
   "about.licensed": "Licenziato a:",
+  "about.notice": "Mattermost è stato possibile grazie al software open source usato dalla nostra <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>piattaforma</a>, dall'app <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> e dalle app <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a>.",
   "about.number": "Numero di compilazione:",
   "about.teamEditionLearn": "Entra nella comunità Mattermost su ",
   "about.teamEditionSt": "Tutte le tue comunicazioni in un posto, instantaneamente ricercabili e accessibili ovunque.",
@@ -28,8 +29,10 @@
   "activity_log.sessionsDescription": "Una sessione è creata quando viene eseguito l'accesso utilizzando un browser. Le sessioni permettono al sistema di non chiedere ripetutamente agli utenti di effettuare l'accesso per un periodo specificato dall'Amministratore di Sistema. Per uscire e terminare una sessione è possibile utilizzare il pulsante 'Esci'.",
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "Applicazione nativa Android",
+  "activity_log_modal.androidNativeClassicApp": "App Android Native Classic",
   "activity_log_modal.desktop": "Applicazione nativa Desktop",
   "activity_log_modal.iphoneNativeApp": "Applicazione nativa iPhone",
+  "activity_log_modal.iphoneNativeClassicApp": "App iPhone Native Classic",
   "add_command.autocomplete": "Completamento automatico",
   "add_command.autocomplete.help": "(Opzionale) Visualizza i comandi slash nella lista di auto-completamento.",
   "add_command.autocompleteDescription": "Descrizione Autocompletamento",
@@ -148,6 +151,18 @@
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML 2.0",
   "admin.banner.heading": "Attenzione:",
+  "admin.client_versions.androidLatestVersion": "Ultima Versione Android",
+  "admin.client_versions.androidLatestVersionHelp": "L'ultima versione rilasciata di Android",
+  "admin.client_versions.androidMinVersion": "Versione Minima di Android",
+  "admin.client_versions.androidMinVersionHelp": "La versione minima di Android richiesta",
+  "admin.client_versions.desktopLatestVersion": "Ultima Versione Desktop",
+  "admin.client_versions.desktopLatestVersionHelp": "L'ultima versione Desktop rilasciata",
+  "admin.client_versions.desktopMinVersion": "Versione Minima Desktop",
+  "admin.client_versions.desktopMinVersionHelp": "La versione minima Desktop richiesta",
+  "admin.client_versions.iosLatestVersion": "Ultima versione IOS",
+  "admin.client_versions.iosLatestVersionHelp": "L'ultima versione rilasciata per IOS",
+  "admin.client_versions.iosMinVersion": "Versione minima per IOS",
+  "admin.client_versions.iosMinVersionHelp": "La versione minima per IOS richiesta",
   "admin.cluster.enableDescription": "Quando abilitato, Mattermost funzionerà in modalità Alta disponibilità. Vedi la <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target='_blank'>documentazione</a> per altri particolari sulla configurazione dell'alta disponibilità di Mattermost.",
   "admin.cluster.enableTitle": "Abilita modalità Alta disponibilità:",
   "admin.cluster.interNodeListenAddressDesc": "Indirizzo a cui il server si metterà in ascolto per comunicare con altri server.",
@@ -313,7 +328,7 @@
   "admin.email.notification.contents.full.description": "Il nome del mittente e del canale sono inclusi nelle notifiche email.</br>Tipicamente utilizzato per ragioni di conformità se Mattermost contiene informazioni confidenziale e la politica sulla privacy indica che non possono essere memorizzate nelle email.",
   "admin.email.notification.contents.generic": "Invia una descrizione generica solo con il mittente",
   "admin.email.notification.contents.generic.description": "Solo il nome del mittente, senza informazioni sul canale o sul contenuto del messaggio.</br>Tipicamente utilizzato per ragioni di conformità se Mattermost contiene informazioni confidenziali e la politica sulla privacy indica che non possono essere memorizzate nelle email.",
-  "admin.email.notification.contents.title": "Contenuto Notifiche Email:",
+  "admin.email.notification.contents.title": "Contenuto Notifiche Email: ",
   "admin.email.notificationDisplayDescription": "Nome visualizzato nell'account di posta, usato per le email di notifica di Mattermost.",
   "admin.email.notificationDisplayExample": "Es: \"Notifica Mattermost\", \"System\", \"No-Reply\"",
   "admin.email.notificationDisplayTitle": "Nome visualizzato nelle notifiche:",
@@ -651,15 +666,15 @@
   "admin.password.symbol": "Almeno un simbolo (es. \"~!@#$%^&*()\")",
   "admin.password.uppercase": "Almeno una lettera maiuscola",
   "admin.plugins.jira": "JIRA (Beta)",
-  "admin.plugins.jira.channelParamNamePlaceholder": "channelname",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelurl",
   "admin.plugins.jira.enabledDescription": "Se vero, puoi configurare i webhook JIRA per inviare messaggi in Mattermost. Per aiutare a combattere i tentativi di phishing, tutte le pubblicazioni saranno etichettate come BOT.",
-  "admin.plugins.jira.enabledLabel": "Abilitato:",
+  "admin.plugins.jira.enabledLabel": "Attiva JIRA:",
   "admin.plugins.jira.secretDescription": "Questo segreto è utilizzato per autenticarsi in Mattermost.",
   "admin.plugins.jira.secretLabel": "Segreto:",
   "admin.plugins.jira.secretParamPlaceholder": "segreto",
   "admin.plugins.jira.secretRegenerateDescription": "Rigenera il segreto per il webhook. Rigenerare il segreto invalida tutte le integrazioni JIRA esistenti.",
   "admin.plugins.jira.setupDescription": "Utilizza questo webhook per configurare l'integrazione con JIRA. Vedere {webhookDocsLink} per ulteriori informazioni.",
-  "admin.plugins.jira.teamParamPlaceholder": "teamname",
+  "admin.plugins.jira.teamParamPlaceholder": "teamurl",
   "admin.plugins.jira.userDescription": "Seleziona il nome utente utilizzato dall'integrazione.",
   "admin.plugins.jira.userLabel": "Utente:",
   "admin.plugins.jira.webhookDocsLink": "documentazione",
@@ -719,8 +734,8 @@
   "admin.saml.emailAttrDesc": "L'attributo nell'asserzione SAML che verrà usato per popolare il campo indirizzo email degli utenti in Mattermost.",
   "admin.saml.emailAttrEx": "Es.: \"Email\" or \"PrimaryEmail\"",
   "admin.saml.emailAttrTitle": "Attributo Email:",
-  "admin.saml.enableDescription": "Quando abilitato, Mattermost permette il login usando SAML. Vedi la <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>documentazione</a> per altri particolari sulla configurazione SAML di Mattermost.",
-  "admin.saml.enableTitle": "Abilita accesso con SAML:",
+  "admin.saml.enableDescription": "Quando abilitato, Mattermost permette il login usando SAML 2.0. Vedi la <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>documentazione</a> per altri particolari sulla configurazione SAML di Mattermost.",
+  "admin.saml.enableTitle": "Abilita accesso con SAML 2.0:",
   "admin.saml.encryptDescription": "Se falso, Mattermost non decodificherà le Asserzioni SAML codificate con il tuo Service Provider Public Certificate. Sconsigliato in ambienti di produzione. Solo per test.",
   "admin.saml.encryptTitle": "Abilita Codifica:",
   "admin.saml.firstnameAttrDesc": "(Opzionale) L'attributo nell'asserzione SAML che verrà usato per popolare il campo nome degli utenti in Mattermost.",
@@ -856,6 +871,7 @@
   "admin.sidebar.advanced": "Avanzate",
   "admin.sidebar.audits": "Conformità e Controllo",
   "admin.sidebar.authentication": "Autenticazione",
+  "admin.sidebar.client_versions": "Versioni del client",
   "admin.sidebar.cluster": "Alta Disponibilità (HA)",
   "admin.sidebar.compliance": "Conformità",
   "admin.sidebar.configuration": "Configurazione",
@@ -1297,15 +1313,14 @@
   "claim.email_to_oauth.switchTo": "Cambia account to {uiType}",
   "claim.email_to_oauth.title": "Cambia account Email/Password a {uiType}",
   "claim.ldap_to_email.confirm": "Conferma password",
-  "claim.ldap_to_email.email": "Devi usare la email {email} per accedere",
-  "claim.ldap_to_email.enterLdapPwd": "Inserisci la tua {ldapPassword} per il tuo account email {site}",
-  "claim.ldap_to_email.enterPwd": "Inserisci una nuova password per il tuo account email",
+  "claim.ldap_to_email.email": "Dopo aver cambiato il metodo di autenticazione, userai {email} per autenticarti. Le credenziali AD/LDAP non daranno più accesso a Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "Nuova password per login tramite email:",
   "claim.ldap_to_email.ldapPasswordError": "Inserisci la tua password AD/LDAP.",
   "claim.ldap_to_email.ldapPwd": "Password AD/LDAP",
   "claim.ldap_to_email.pwd": "Password",
   "claim.ldap_to_email.pwdError": "Inserisci la tua password.",
   "claim.ldap_to_email.pwdNotMatch": "Le password non corrispondono.",
-  "claim.ldap_to_email.ssoType": "Dopo aver convalidato il tuo account, potrai accedere solo con la tua email e password",
   "claim.ldap_to_email.switchTo": "Cambia account a email/password",
   "claim.ldap_to_email.title": "Cambia account AD/LDAP a Email/Password",
   "claim.oauth_to_email.confirm": "Conferma password",
@@ -1832,6 +1847,15 @@
   "mobile.custom_list.no_results": "Nessun risultato",
   "mobile.drawer.teamsTitle": "Gruppi",
   "mobile.edit_post.title": "Modifica Messaggio",
+  "mobile.emoji_picker.activity": "ATTIVITA'",
+  "mobile.emoji_picker.custom": "PERSONALIZZATO",
+  "mobile.emoji_picker.flags": "BANDIERE",
+  "mobile.emoji_picker.foods": "CIBI",
+  "mobile.emoji_picker.nature": "NATURA",
+  "mobile.emoji_picker.objects": "OGGETTI",
+  "mobile.emoji_picker.people": "PERSONE",
+  "mobile.emoji_picker.places": "LUOGHI",
+  "mobile.emoji_picker.symbols": "SIMBOLI",
   "mobile.error_handler.button": "Riavvia",
   "mobile.error_handler.description": "\nClicca riavvia per aprire di nuovo l'app. Dopo il riavvio, puoi segnalare il problema dal menu impostazioni.\n",
   "mobile.error_handler.title": "Rilevato errore non previsto",
@@ -1840,6 +1864,7 @@
   "mobile.file_upload.more": "Più",
   "mobile.file_upload.video": "Libreria video",
   "mobile.help.title": "Aiuto",
+  "mobile.image_preview.save": "Salva Immagine",
   "mobile.intro_messages.DM": "Questo è l'inizio della tua conversazione privata con {teammate}. Messaggi diretti e file condivisi qui non saranno accessibili ad altre persone.",
   "mobile.intro_messages.default_message": "Questo è il primo canale che i colleghi vedranno una volta effettuato l'accesso - usalo per comunicare aggiornamenti che chiunque dovrebbe conoscere.",
   "mobile.intro_messages.default_welcome": "Benvenuto a {name}!",
@@ -1848,11 +1873,11 @@
   "mobile.loading_members": "Caricamento Membri...",
   "mobile.loading_posts": "Caricamento Messaggi...",
   "mobile.login_options.choose_title": "Seleziona il tuo metodo di login",
-  "mobile.managed.blocked_by": "Blocked by {vendor}",
-  "mobile.managed.exit": "Modifica",
-  "mobile.managed.jailbreak": "Jailbroken devices are not trusted by {vendor}, please exit the app.",
-  "mobile.managed.secured_by": "Secured by {vendor}",
-  "mobile.markdown.code.plusMoreLines": "+{count, number} more lines",
+  "mobile.managed.blocked_by": "Bloccati da {vendor}",
+  "mobile.managed.exit": "Esci",
+  "mobile.managed.jailbreak": "Dispositivi con jailbreak considerati non sicuri da {vendor}, per favore uscire dall'app.",
+  "mobile.managed.secured_by": "Verificato da {vendor}",
+  "mobile.markdown.code.plusMoreLines": "+{count, number} più righe",
   "mobile.more_dms.start": "Inizio",
   "mobile.more_dms.title": "Nuova Conversazione",
   "mobile.notice_mobile_link": "apps per smartphone",
@@ -1871,6 +1896,7 @@
   "mobile.post.failed_retry": "Riprova",
   "mobile.post.failed_title": "Impossibile inviare il messaggio",
   "mobile.post.retry": "Aggiorna",
+  "mobile.post_info.add_reaction": "Aggiungi reazione",
   "mobile.request.invalid_response": "Risposta non valida ricevuta dal server.",
   "mobile.routes.channelInfo": "Informazioni",
   "mobile.routes.channelInfo.createdBy": "Creato da {creator} il  ",
@@ -1880,8 +1906,8 @@
   "mobile.routes.channel_members.action_message": "Devi selezionare almeno un membro da rimuovere dal canale.",
   "mobile.routes.channel_members.action_message_confirm": "Sei sicuro di voler rimuovere i membri selezionati dal canale?",
   "mobile.routes.channels": "Canale",
-  "mobile.routes.code": "{language} Code",
-  "mobile.routes.code.noLanguage": "Code",
+  "mobile.routes.code": "{language} codice",
+  "mobile.routes.code.noLanguage": "Codice",
   "mobile.routes.enterServerUrl": "Immettere l'URL del server",
   "mobile.routes.login": "Login",
   "mobile.routes.loginOptions": "Selezionatore Login",
@@ -1934,7 +1960,7 @@
   "msg_typing.someone": "Qualcuno",
   "multiselect.add": "Aggiungi",
   "multiselect.go": "Vai",
-  "multiselect.list.notFound": "Nessun utente trovato",
+  "multiselect.list.notFound": "Nessun elemento trovato",
   "multiselect.numPeopleRemaining": "Usa ↑↓ per navigare, ↵ per scegliere. Puoi aggiungere {num, number} più {num, plural, one {person} altre {people}}. ",
   "multiselect.numRemaining": "Si possono ancora aggiungere {num, number}",
   "multiselect.placeholder": "Cercare ed aggiungere membri",
@@ -2055,6 +2081,7 @@
   "rename_channel.handleHolder": "caratteri alfanumerici minuscoli",
   "rename_channel.lowercase": "Devono essere caratteri alfanumerici minuscoli",
   "rename_channel.maxLength": "Questo campo può essere al massimo di {maxLength, number} caratteri",
+  "rename_channel.minLength": "Il nome del canale deve essere lungo almeno {minLength, number} caratteri",
   "rename_channel.required": "Il campo è richiesto",
   "rename_channel.save": "Salva",
   "rename_channel.title": "Rinomina Canale",
@@ -2113,60 +2140,61 @@
   "setting_upload.import": "Importa",
   "setting_upload.noFile": "Nessun file selezionato.",
   "setting_upload.select": "Seleziona file",
-  "shortcuts.browser.channel_next": "Forward in history:\tAlt|Right",
-  "shortcuts.browser.channel_next.mac": "Forward in history:\t⌘|]",
-  "shortcuts.browser.channel_prev": "Back in history:\tAlt|Left",
-  "shortcuts.browser.channel_prev.mac": "Back in history:\t⌘|[",
-  "shortcuts.browser.font_decrease": "Zoom out:\tCtrl|-",
-  "shortcuts.browser.font_decrease.mac": "Zoom out:\t⌘|-",
-  "shortcuts.browser.font_increase": "Zoom in:\tCtrl|+",
-  "shortcuts.browser.font_increase.mac": "Zoom in:\t⌘|+",
-  "shortcuts.browser.header": "Built-in Browser Commands",
-  "shortcuts.browser.highlight_next": "Highlight text to the next line:\tShift|Down",
-  "shortcuts.browser.highlight_prev": "Highlight text to the previous line:\tShift|Up",
-  "shortcuts.browser.input.header": "Works inside an input field",
-  "shortcuts.browser.newline": "Create a new line:\tShift|Enter",
-  "shortcuts.files.header": "Files",
-  "shortcuts.files.upload": "Upload files:\tCtrl|U",
-  "shortcuts.files.upload.mac": "Upload files:\t⌘|U",
+  "shortcuts.browser.channel_next": "Avanti nella cronologia:\tAlt|Right",
+  "shortcuts.browser.channel_next.mac": "Avanti nella cronologia:\t⌘|]",
+  "shortcuts.browser.channel_prev": "Indietro nella cronologia:\tAlt|Left",
+  "shortcuts.browser.channel_prev.mac": "Indietro nella cronologia:\t⌘|[",
+  "shortcuts.browser.font_decrease": "Zoom indietro:\tCtrl|-",
+  "shortcuts.browser.font_decrease.mac": "Zoom indietro:\t⌘|-",
+  "shortcuts.browser.font_increase": "Zoom avanti:\tCtrl|+",
+  "shortcuts.browser.font_increase.mac": "Zoom avanti:\t⌘|+",
+  "shortcuts.browser.header": "Comandi integrati nel browser",
+  "shortcuts.browser.highlight_next": "Evidenzia il testo sulla riga successiva:\tShift|Down",
+  "shortcuts.browser.highlight_prev": "Evidenzia il testo sulla riga precedente:\tShift|Up",
+  "shortcuts.browser.input.header": "Lavoro all'interno di un campo testo",
+  "shortcuts.browser.newline": "Crea una nuova riga:\tShift|Enter",
+  "shortcuts.files.header": "File",
+  "shortcuts.files.upload": "Carica file:\tCtrl|U",
+  "shortcuts.files.upload.mac": "Carica file:\t⌘|U",
   "shortcuts.header": "Scorciatoie da tastiera",
-  "shortcuts.info": "Begin a message with / for a list of all the commands at your disposal.",
-  "shortcuts.msgs.comp.channel": "Channel:\t~|[a-z]|Tab",
+  "shortcuts.info": "Inizia un messaggio con / per una lista dei comandi disponibili.",
+  "shortcuts.msgs.comp.channel": "Canale:\t~|[a-z]|Tab",
   "shortcuts.msgs.comp.emoji": "Emoji:\t:|[a-z]|Tab",
   "shortcuts.msgs.comp.header": "Completamento automatico",
-  "shortcuts.msgs.comp.username": "Username:\t@|[a-z]|Tab",
-  "shortcuts.msgs.edit": "Edit last message in channel:\tUp",
-  "shortcuts.msgs.header": "Messaggio",
-  "shortcuts.msgs.input.header": "Works inside an empty input field",
-  "shortcuts.msgs.mark_as_read": "Mark current channel as read:\tEsc",
-  "shortcuts.msgs.reply": "Reply to last message in channel:\tShift|Up",
-  "shortcuts.msgs.reprint_next": "Reprint next message:\tCtrl|Down",
-  "shortcuts.msgs.reprint_next.mac": "Reprint next message:\t⌘|Down",
-  "shortcuts.msgs.reprint_prev": "Reprint previous message:\tCtrl|Up",
-  "shortcuts.msgs.reprint_prev.mac": "Reprint previous message:\t⌘|Up",
-  "shortcuts.nav.direct_messages_menu": "Direct messages menu:\tCtrl|Shift|K",
-  "shortcuts.nav.direct_messages_menu.mac": "Direct messages menu:\t⌘|Shift|K",
-  "shortcuts.nav.header": "Navigation",
-  "shortcuts.nav.next": "Next channel:\tAlt|Down",
-  "shortcuts.nav.next.mac": "Next channel:\t⌥|Down",
-  "shortcuts.nav.prev": "Previous channel:\tAlt|Up",
-  "shortcuts.nav.prev.mac": "Previous channel:\t⌥|Up",
-  "shortcuts.nav.recent_mentions": "Recent mentions:\tCtrl|Shift|M",
-  "shortcuts.nav.recent_mentions.mac": "Recent mentions:\t⌘|Shift|M",
-  "shortcuts.nav.settings": "Account settings:\tCtrl|Shift|A",
-  "shortcuts.nav.settings.mac": "Account settings:\t⌘|Shift|A",
-  "shortcuts.nav.switcher": "Quick channel switcher:\tCtrl|K",
-  "shortcuts.nav.switcher.mac": "Quick channel switcher:\t⌘|K",
-  "shortcuts.nav.unread_next": "Next unread channel:\tAlt|Shift|Down",
-  "shortcuts.nav.unread_next.mac": "Next unread channel:\t⌥|Shift|Down",
-  "shortcuts.nav.unread_prev": "Previous unread channel:\tAlt|Shift|Up",
-  "shortcuts.nav.unread_prev.mac": "Previous unread channel:\t⌥|Shift|Up",
+  "shortcuts.msgs.comp.username": "Nome utente:\t@|[a-z]|Tab",
+  "shortcuts.msgs.edit": "Modifica l'ultimo messaggio del canale:\tUp",
+  "shortcuts.msgs.header": "Messaggi",
+  "shortcuts.msgs.input.header": "Lavora all'interno di un campo di testo",
+  "shortcuts.msgs.mark_as_read": "Segna il canale corrente come letto:\tEsc",
+  "shortcuts.msgs.reply": "Rispondi all'ultimo messaggio nel canale:\tShift|Up",
+  "shortcuts.msgs.reprint_next": "Ristampa il prossimo messaggio:\tCtrl|Down",
+  "shortcuts.msgs.reprint_next.mac": "Ristampa il prossimo messaggio:\t⌘|Down",
+  "shortcuts.msgs.reprint_prev": "Ristampa il messaggio precedente:\tCtrl|Up",
+  "shortcuts.msgs.reprint_prev.mac": "Ristampa il messaggio precedente:\t⌘|Up",
+  "shortcuts.nav.direct_messages_menu": "Menu messaggio diretto:\tCtrl|Shift|K",
+  "shortcuts.nav.direct_messages_menu.mac": "Menu messaggio diretto:\t⌘|Shift|K",
+  "shortcuts.nav.header": "Navigazione",
+  "shortcuts.nav.next": "Prossimo canale:\tAlt|Down",
+  "shortcuts.nav.next.mac": "Prossimo canale:\t⌥|Down",
+  "shortcuts.nav.prev": "Canale precedente:\tAlt|Up",
+  "shortcuts.nav.prev.mac": "Canale precedente:\t⌥|Up",
+  "shortcuts.nav.recent_mentions": "Citazioni recenti:\tCtrl|Shift|M",
+  "shortcuts.nav.recent_mentions.mac": "Citazioni recenti:\t⌘|Shift|M",
+  "shortcuts.nav.settings": "Impostazioni account:\tCtrl|Shift|A",
+  "shortcuts.nav.settings.mac": "Impostazioni account:\t⌘|Shift|A",
+  "shortcuts.nav.switcher": "Selezione rapida del canale:\tCtrl|K",
+  "shortcuts.nav.switcher.mac": "Selezione rapida del canale:\t⌘|K",
+  "shortcuts.nav.unread_next": "Prossimo canale da leggere:\tAlt|Shift|Down",
+  "shortcuts.nav.unread_next.mac": "Prossimo canale da leggere:\t⌥|Shift|Down",
+  "shortcuts.nav.unread_prev": "Canale da leggere precedente:\tAlt|Shift|Up",
+  "shortcuts.nav.unread_prev.mac": "Canale da leggere precedente:\t⌥|Shift|Up",
   "sidebar.channels": "CANALI PUBBLICI",
   "sidebar.createChannel": "Crea un canale pubblico",
   "sidebar.createGroup": "Crea un canale privato",
   "sidebar.direct": "MESSAGGI DIRETTI",
   "sidebar.favorite": "CANALI PREFERITI",
-  "sidebar.mainMenu": "Main Menu",
+  "sidebar.leave": "Abbandona canale",
+  "sidebar.mainMenu": "Menu principale",
   "sidebar.more": "Più",
   "sidebar.moreElips": "Più...",
   "sidebar.otherMembers": "Fuori da questo gruppo",
@@ -2248,7 +2276,7 @@
   "suggestion.loading": "Caricamento...",
   "suggestion.mention.all": "ATTENZIONE: Questo citerà tutti nel canale",
   "suggestion.mention.channel": "Notifica tutti nel canale",
-  "suggestion.mention.channels": "Mie canali",
+  "suggestion.mention.channels": "Miei canali",
   "suggestion.mention.here": "Notifica tutti gli utenti online nel canale",
   "suggestion.mention.in_channel": "Canali",
   "suggestion.mention.members": "Membri del canale",
@@ -2630,13 +2658,13 @@
   "user.settings.tokens.description_mobile": "<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">I Token di accesso</a> sono simili ai Token di sessione e possono essere usati dalle integrazioni per <a href=\"https://about.mattermost.com/default-api-authentication\" target=\"_blank\">autenticarsi con le API REST</a>. Crea nuovi token sul tuo desktop.",
   "user.settings.tokens.id": "ID Token: ",
   "user.settings.tokens.name": "Descrizione del Token: ",
-  "user.settings.tokens.nameHelp": "Inserire una descrizione del Token, per ricordare il suo scopo.",
+  "user.settings.tokens.nameHelp": "Inserire una descrizione del token, per ricordare il suo scopo.",
   "user.settings.tokens.nameRequired": "Per favore, inserire una descrizione.",
   "user.settings.tokens.save": "Salva",
   "user.settings.tokens.title": "Gestisci Token di Accesso personali",
   "user.settings.tokens.token": "Token di Accesso: ",
   "user.settings.tokens.tokenId": "Token ID: ",
-  "user.settings.tokens.userAccessTokensNone": "Nessun Token di accesso personale.",
+  "user.settings.tokens.userAccessTokensNone": "Nessun token di accesso personale.",
   "user_list.notFound": "Nessun utente trovato",
   "user_profile.send.dm": "Invia messaggio",
   "user_profile.webrtc.call": "Avvia videochiamata",

assets/base/i18n/ja.json

@@ -9,6 +9,7 @@
   "about.hash": "ビルドハッシュ値:",
   "about.hashee": "EEビルドハッシュ値:",
   "about.licensed": "ライセンス供給先:",
+  "about.notice": "Mattermostは我々の<a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a>, <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a>でオープンソース・ソフトウェアとして利用可能です。",
   "about.number": "ビルド番号:",
   "about.teamEditionLearn": "Mattermostコミュニティーに参加する: ",
   "about.teamEditionSt": "あなたのチームの全てのコミュニケーションを一箇所で、すぐに検索可能で、どこからでもアクセスできるものにします。",
@@ -28,8 +29,10 @@
   "activity_log.sessionsDescription": "セッションは新しいブラウザーまたはデバイスからログインからログインした時に作成されます。Mattermostはシステム管理者が指定した期間内であればログインし直すことなく使用できます。すぐにログアウトしたい場合には、「ログアウト」ボタンを使用することで、セッションを終了させることができます。",
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "Androidネイティブアプリ",
+  "activity_log_modal.androidNativeClassicApp": "Androidネイティブクラシックアプリ",
   "activity_log_modal.desktop": "ネイティブデスクトップアプリ",
   "activity_log_modal.iphoneNativeApp": "iPhoneネイティブアプリ",
+  "activity_log_modal.iphoneNativeClassicApp": "iPhoneネイティブクラシックアプリ",
   "add_command.autocomplete": "自動補完",
   "add_command.autocomplete.help": "(オプション) 自動補完リストにスラッシュコマンドを表示する。",
   "add_command.autocompleteDescription": "自動補完の説明",
@@ -148,6 +151,18 @@
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML 2.0",
   "admin.banner.heading": "注意:",
+  "admin.client_versions.androidLatestVersion": "最新のAndroidバージョン",
+  "admin.client_versions.androidLatestVersionHelp": "最新リリースのAndroidバージョン",
+  "admin.client_versions.androidMinVersion": "最小のAndroidバージョン",
+  "admin.client_versions.androidMinVersionHelp": "最小の対応Androidバージョン",
+  "admin.client_versions.desktopLatestVersion": "最新のデスクトップバージョン",
+  "admin.client_versions.desktopLatestVersionHelp": "最新リリースのデスクトップバージョン",
+  "admin.client_versions.desktopMinVersion": "最小のデスクトップバージョン",
+  "admin.client_versions.desktopMinVersionHelp": "最小の対応デスクトップバージョン",
+  "admin.client_versions.iosLatestVersion": "最新のiOSバージョン",
+  "admin.client_versions.iosLatestVersionHelp": "最新リリースのiOSバージョン",
+  "admin.client_versions.iosMinVersion": "最小iOSバージョン",
+  "admin.client_versions.iosMinVersionHelp": "最小の対応iOSバージョン",
   "admin.cluster.enableDescription": "有効な場合、Mattermostは高可用モードで動作するようになります。高可用モードの設定について詳しくは、<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target='_blank'>説明文書</a>を参照してください。",
   "admin.cluster.enableTitle": "高可用モードを有効にする:",
   "admin.cluster.interNodeListenAddressDesc": "他のサーバーと通信するための接続待ちアドレスです。",
@@ -651,15 +666,15 @@
   "admin.password.symbol": "少なくとも1つの記号が必要です(例: \"~!@#$%^&*()\")",
   "admin.password.uppercase": "少なくとも1つの英大文字が必要です",
   "admin.plugins.jira": "JIRA (ベータ)",
-  "admin.plugins.jira.channelParamNamePlaceholder": "チャンネル名",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelurl",
   "admin.plugins.jira.enabledDescription": "有効な場合、Mattermostへのメッセージ投稿のためのJIRAウェブフックを設定できるようになります。フィッシング攻撃対策のため、全ての投稿にはBOTタグが表示されます。",
-  "admin.plugins.jira.enabledLabel": "有効:",
+  "admin.plugins.jira.enabledLabel": "JIRAを有効にする:",
   "admin.plugins.jira.secretDescription": "この秘密情報はMattermostへの認証に使われます。",
   "admin.plugins.jira.secretLabel": "秘密情報:",
   "admin.plugins.jira.secretParamPlaceholder": "秘密情報",
   "admin.plugins.jira.secretRegenerateDescription": "ウェブフックURLエンドポイントの秘密情報を再生成する。秘密情報の再生成は既存のJIRA統合機能を無効化します。",
   "admin.plugins.jira.setupDescription": "JIRA統合機能のセットアップには、このウェブフックURLを使用してください。詳しくは {webhookDocsLink} を参照してください。",
-  "admin.plugins.jira.teamParamPlaceholder": "チーム名",
+  "admin.plugins.jira.teamParamPlaceholder": "teamurl",
   "admin.plugins.jira.userDescription": "この統合機能が付与されるユーザー名を選択してください。",
   "admin.plugins.jira.userLabel": "ユーザー:",
   "admin.plugins.jira.webhookDocsLink": "説明文書",
@@ -856,6 +871,7 @@
   "admin.sidebar.advanced": "詳細",
   "admin.sidebar.audits": "コンプライアンスと監査",
   "admin.sidebar.authentication": "認証",
+  "admin.sidebar.client_versions": "クライアントバージョン",
   "admin.sidebar.cluster": "高可用",
   "admin.sidebar.compliance": "コンプライアンス",
   "admin.sidebar.configuration": "設定",
@@ -1297,15 +1313,14 @@
   "claim.email_to_oauth.switchTo": "アカウントを{uiType}に切り替える",
   "claim.email_to_oauth.title": "電子メールアドレスとパスワードによるログインのアカウントを{uiType}に切り替える",
   "claim.ldap_to_email.confirm": "パスワードをもう一度入力してください",
-  "claim.ldap_to_email.email": "電子メールアドレス{email}をログインに使用します",
-  "claim.ldap_to_email.enterLdapPwd": "{site}電子メールアカウントの{ldapPassword}を入力してください",
-  "claim.ldap_to_email.enterPwd": "電子メールアカウントの新しいパスワードを入力してください",
+  "claim.ldap_to_email.email": "認証方法の切り替え後は、{email}でログインするようになります。AD/LDAP認証情報はMattermstへのアクセスに利用できなくなります。",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "新しい電子メールログイン用パスワード:",
   "claim.ldap_to_email.ldapPasswordError": "AD/LDAPパスワードを入力してください。",
   "claim.ldap_to_email.ldapPwd": "AD/LDAPパスワード",
   "claim.ldap_to_email.pwd": "パスワード",
   "claim.ldap_to_email.pwdError": "パスワードを入力してください。",
   "claim.ldap_to_email.pwdNotMatch": "パスワードが一致していません。",
-  "claim.ldap_to_email.ssoType": "この変更をすることで、電子メールアドレスとパスワードでのみログインできるようになります",
   "claim.ldap_to_email.switchTo": "アカウントを電子メールアドレス/パスワードに切り替える",
   "claim.ldap_to_email.title": "AD/LDAPアカウントを電子メールアドレス/パスワードに切り替える",
   "claim.oauth_to_email.confirm": "パスワードをもう一度入力してください",
@@ -1832,6 +1847,15 @@
   "mobile.custom_list.no_results": "該当するものはありません",
   "mobile.drawer.teamsTitle": "チーム",
   "mobile.edit_post.title": "メッセージ編集中",
+  "mobile.emoji_picker.activity": "アクティビティ",
+  "mobile.emoji_picker.custom": "カスタム",
+  "mobile.emoji_picker.flags": "国旗",
+  "mobile.emoji_picker.foods": "食べ物",
+  "mobile.emoji_picker.nature": "自然",
+  "mobile.emoji_picker.objects": "オブジェクト",
+  "mobile.emoji_picker.people": "人々",
+  "mobile.emoji_picker.places": "場所",
+  "mobile.emoji_picker.symbols": "シンボル",
   "mobile.error_handler.button": "再起動",
   "mobile.error_handler.description": "\nアプリケーションを再開するために再起動をクリックしてください。再起動した後、設定メニューから問題を報告してください。\n",
   "mobile.error_handler.title": "予期しないエラーが発生しました。",
@@ -1840,6 +1864,7 @@
   "mobile.file_upload.more": "もっと",
   "mobile.file_upload.video": "ビデオライブラリー",
   "mobile.help.title": "ヘルプ",
+  "mobile.image_preview.save": "画像の保存",
   "mobile.intro_messages.DM": "{teammate}とのダイレクトメッセージの履歴の最初です。ダイレクトメッセージとそこで共有されているファイルは、この領域の外のユーザーからは見ることができません。",
   "mobile.intro_messages.default_message": "ここはチームメイトが利用登録した際に最初に見るチャンネルです - みんなが知るべき情報を投稿してください。",
   "mobile.intro_messages.default_welcome": "{name}へようこそ!",
@@ -1852,7 +1877,7 @@
   "mobile.managed.exit": "終了",
   "mobile.managed.jailbreak": "Jailbrokenデバイスは{vendor}から信頼されていません。アプリを終了してください。",
   "mobile.managed.secured_by": "{vendor}により保護されました",
-  "mobile.markdown.code.plusMoreLines": "+{count, number} more lines",
+  "mobile.markdown.code.plusMoreLines": "+{count, number}行",
   "mobile.more_dms.start": "先頭",
   "mobile.more_dms.title": "新しい会話",
   "mobile.notice_mobile_link": "モバイルアプリ",
@@ -1871,6 +1896,7 @@
   "mobile.post.failed_retry": "再実行",
   "mobile.post.failed_title": "メッセージを送信できませんでした",
   "mobile.post.retry": "更新",
+  "mobile.post_info.add_reaction": "リアクションを追加する",
   "mobile.request.invalid_response": "サーバーから不正なレスポンスを受け取りました。",
   "mobile.routes.channelInfo": "情報",
   "mobile.routes.channelInfo.createdBy": "{creator} によって作成 ",
@@ -1880,8 +1906,8 @@
   "mobile.routes.channel_members.action_message": "チャンネルから削除するメンバーを少なくとも一人選択してください。",
   "mobile.routes.channel_members.action_message_confirm": "本当に選択したメンバーをチャンネルから削除しますか?",
   "mobile.routes.channels": "チャンネル",
-  "mobile.routes.code": "{language} Code",
-  "mobile.routes.code.noLanguage": "Code",
+  "mobile.routes.code": "{language} コード",
+  "mobile.routes.code.noLanguage": "コード",
   "mobile.routes.enterServerUrl": "サーバーURLを入力してください",
   "mobile.routes.login": "ログイン",
   "mobile.routes.loginOptions": "ログイン選択",
@@ -2055,6 +2081,7 @@
   "rename_channel.handleHolder": "小文字の英数字にしてください",
   "rename_channel.lowercase": "小文字の英数字にしてください",
   "rename_channel.maxLength": "このフィールドは {maxLength, number} 文字未満でなくてはなりません",
+  "rename_channel.minLength": "チャンネル名は {minLength, number} 文字以上でなくてはなりません",
   "rename_channel.required": "この項目は必須です",
   "rename_channel.save": "保存する",
   "rename_channel.title": "チャンネル名を変更する",
@@ -2113,8 +2140,8 @@
   "setting_upload.import": "インポートする",
   "setting_upload.noFile": "ファイルが選択されていません。",
   "setting_upload.select": "ファイルを選択してください",
-  "shortcuts.browser.channel_next": "履歴の先へ:\tAlt|Right",
-  "shortcuts.browser.channel_next.mac": "履歴の先へ:\t⌘|]",
+  "shortcuts.browser.channel_next": "履歴の次へ:\tAlt|Right",
+  "shortcuts.browser.channel_next.mac": "履歴の次へ:\t⌘|]",
   "shortcuts.browser.channel_prev": "履歴の前へ:\tAlt|Left",
   "shortcuts.browser.channel_prev.mac": "履歴の前へ:\t⌘|[",
   "shortcuts.browser.font_decrease": "ズームアウト:\tCtrl|-",
@@ -2122,8 +2149,8 @@
   "shortcuts.browser.font_increase": "ズームイン:\tCtrl|+",
   "shortcuts.browser.font_increase.mac": "ズームイン:\t⌘|+",
   "shortcuts.browser.header": "内蔵ブラウザコマンド",
-  "shortcuts.browser.highlight_next": "次の行へテキストをハイライトする:\tShift|Down",
-  "shortcuts.browser.highlight_prev": "前の行へテキストをハイライトする:\tShift|Up",
+  "shortcuts.browser.highlight_next": "次の行のテキストをハイライトする:\tShift|Down",
+  "shortcuts.browser.highlight_prev": "前の行のテキストをハイライトする:\tShift|Up",
   "shortcuts.browser.input.header": "入力欄で動作する",
   "shortcuts.browser.newline": "改行する:\tShift|Enter",
   "shortcuts.files.header": "ファイル",
@@ -2166,7 +2193,8 @@
   "sidebar.createGroup": "新しい非公開チャンネルを作成する",
   "sidebar.direct": "ダイレクトメッセージ",
   "sidebar.favorite": "お気に入りチャンネル",
-  "sidebar.mainMenu": "Main Menu",
+  "sidebar.leave": "チャンネルから脱退する",
+  "sidebar.mainMenu": "メインメニュー",
   "sidebar.more": "もっと",
   "sidebar.moreElips": "もっと…",
   "sidebar.otherMembers": "このチームの外側",

assets/base/i18n/ko.json

@@ -9,6 +9,7 @@
   "about.hash": "빌드 해쉬:",
   "about.hashee": "EE 빌드 해쉬:",
   "about.licensed": "다음 사용자에게 허가되었습니다:",
+  "about.notice": "Mattermost is made possible by the open source software used in our <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> and <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a> apps.",
   "about.number": "빌드 넘버:",
   "about.teamEditionLearn": "Mattermost 커뮤니티에 참여 ",
   "about.teamEditionSt": "모든 팀 커뮤니케이션 활동을 한 곳에 모아 빠르게 찾고 공유할 수 있습니다.",
@@ -1297,15 +1298,14 @@
   "claim.email_to_oauth.switchTo": "Switch account to {uiType}",
   "claim.email_to_oauth.title": "이메일/패스워드 계정을 {uiType} 계정으로 변경",
   "claim.ldap_to_email.confirm": "패스워드 확인",
-  "claim.ldap_to_email.email": "You will use the email {email} to login",
-  "claim.ldap_to_email.enterLdapPwd": "Enter your {ldapPassword} for your {site} email account",
-  "claim.ldap_to_email.enterPwd": "Enter a new password for your email account",
+  "claim.ldap_to_email.email": "After switching your authentication method, you will use {email} to login. Your AD/LDAP credentials will no longer allow access to Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "New email login password:",
   "claim.ldap_to_email.ldapPasswordError": "LDAP 패스워드를 입력하세요.",
   "claim.ldap_to_email.ldapPwd": "LDAP 패스워드",
   "claim.ldap_to_email.pwd": "패스워드",
   "claim.ldap_to_email.pwdError": "패스워드를 입력하세요.",
   "claim.ldap_to_email.pwdNotMatch": "패스워드가 일치하지 않습니다.",
-  "claim.ldap_to_email.ssoType": "Upon claiming your account, you will only be able to login with your email and password",
   "claim.ldap_to_email.switchTo": "Switch account to email/password",
   "claim.ldap_to_email.title": "Switch LDAP Account to Email/Password",
   "claim.oauth_to_email.confirm": "패스워드 확인",
@@ -1840,6 +1840,7 @@
   "mobile.file_upload.more": "더 보기",
   "mobile.file_upload.video": "Video Library",
   "mobile.help.title": "도움말",
+  "mobile.image_preview.save": "Save Image",
   "mobile.intro_messages.DM": "{teammate}와 개인 메시지의 시작입니다. 개인 메시지나 여기서 공유된 파일들은 외부에서 보여지지 않습니다.",
   "mobile.intro_messages.default_message": "This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.",
   "mobile.intro_messages.default_welcome": "Welcome to {name}!",
@@ -2055,6 +2056,7 @@
   "rename_channel.handleHolder": "Must be lowercase alphanumeric characters",
   "rename_channel.lowercase": "Must be lowercase alphanumeric characters",
   "rename_channel.maxLength": "This field must be less than {maxLength, number} characters",
+  "rename_channel.minLength": "Channel name must be {minLength, number} or more characters",
   "rename_channel.required": "필수 항목입니다.",
   "rename_channel.save": "저장",
   "rename_channel.title": "채널 이름 변경",
@@ -2166,6 +2168,7 @@
   "sidebar.createGroup": "공개 채널 만들기",
   "sidebar.direct": "DIRECT MESSAGES",
   "sidebar.favorite": "FAVORITE CHANNELS",
+  "sidebar.leave": "채널 떠나기",
   "sidebar.mainMenu": "Main Menu",
   "sidebar.more": "더 보기",
   "sidebar.moreElips": "더 보기...",

assets/base/i18n/nl.json

@@ -9,6 +9,7 @@
   "about.hash": "Compilatiehash:",
   "about.hashee": "EE Compilatiehash:",
   "about.licensed": "Licentie verleend aan:",
+  "about.notice": "Mattermost is made possible by the open source software used in our <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> and <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a> apps.",
   "about.number": "Compilatienummer:",
   "about.teamEditionLearn": "Kom bij de Mattermost-gemeenschap op ",
   "about.teamEditionSt": "Alle team-communicatie op één plaats, doorzoekbaar en van overal bereikbaar.",
@@ -1297,15 +1298,14 @@
   "claim.email_to_oauth.switchTo": "Wissel account naar {uiType}",
   "claim.email_to_oauth.title": "Wissel e-mail/wachtwoord account naar {uiType}",
   "claim.ldap_to_email.confirm": "Bevestig het wachtwoord",
-  "claim.ldap_to_email.email": "Je zult het e-mail adres {email} gebruik om in te loggen",
-  "claim.ldap_to_email.enterLdapPwd": "Voer uw {ldapPassword} in voor uw {site} e-mail account",
-  "claim.ldap_to_email.enterPwd": "Voer een nieuw wachtwoord in voor uw e-mail account",
+  "claim.ldap_to_email.email": "After switching your authentication method, you will use {email} to login. Your AD/LDAP credentials will no longer allow access to Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "New email login password:",
   "claim.ldap_to_email.ldapPasswordError": "Voer uw AD/LDAP wachtwoord in.",
   "claim.ldap_to_email.ldapPwd": "AD/LDAP wachtwoord",
   "claim.ldap_to_email.pwd": "Wachtwoord",
   "claim.ldap_to_email.pwdError": "Voer uw wachtwoord in.",
   "claim.ldap_to_email.pwdNotMatch": "De wachtwoorden zijn niet gelijk.",
-  "claim.ldap_to_email.ssoType": "Wanneer je je account claimt, kan je alleen inloggen met je emailadres en wachtwoord.",
   "claim.ldap_to_email.switchTo": "Schakel account naar e-mail/wachtwoord",
   "claim.ldap_to_email.title": "Schakel AD/LDAP account naar e-mail/wachtwoord",
   "claim.oauth_to_email.confirm": "Bevestig uw wachtwoord",
@@ -1840,6 +1840,7 @@
   "mobile.file_upload.more": "Meer",
   "mobile.file_upload.video": "Video Library",
   "mobile.help.title": "Help",
+  "mobile.image_preview.save": "Save Image",
   "mobile.intro_messages.DM": "Dit is de start van uw privé berichten historiek met teamlid {teammate}.<br /> Privé berichten en bestanden die hier gedeeld worden zijn niet zichtbaar voor anderen.",
   "mobile.intro_messages.default_message": "This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.",
   "mobile.intro_messages.default_welcome": "Welcome to {name}!",
@@ -2055,6 +2056,7 @@
   "rename_channel.handleHolder": "Kan enkel kleine letters en nummers zijn",
   "rename_channel.lowercase": "Kan enkel kleine letters en nummers zijn",
   "rename_channel.maxLength": "This field must be less than {maxLength, number} characters",
+  "rename_channel.minLength": "Channel name must be {minLength, number} or more characters",
   "rename_channel.required": "Dit veld is verplicht",
   "rename_channel.save": "Opslaan",
   "rename_channel.title": "Hernoem kanaal...",
@@ -2166,6 +2168,7 @@
   "sidebar.createGroup": "Maak een publiek kanaal",
   "sidebar.direct": "DIRECT MESSAGES",
   "sidebar.favorite": "FAVORITE CHANNELS",
+  "sidebar.leave": "Verlaat kanaal",
   "sidebar.mainMenu": "Main Menu",
   "sidebar.more": "Meer",
   "sidebar.moreElips": "Meer...",

assets/base/i18n/pl.json

@@ -9,6 +9,7 @@
   "about.hash": "Wartość skrótu kompilacji",
   "about.hashee": "Build Hash wersji enterprise:",
   "about.licensed": "Licencjonowany dla:",
+  "about.notice": "Mattermost is made possible by the open source software used in our <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> and <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a> apps.",
   "about.number": "Numer kompilacji:",
   "about.teamEditionLearn": "Dołącz do społeczności Mattermost na stronie ",
   "about.teamEditionSt": "Cała komunikacja Twojego zespołu w jednym miejscu, z natychmiastowym przeszukiwaniem i dostępna z każdego miejsca.",
@@ -719,7 +720,7 @@
   "admin.saml.emailAttrDesc": "Atrybut SAML który będzie używany do wypełnienia adresu email użytkowników w Mattermost.",
   "admin.saml.emailAttrEx": "Np.: \"Email\" lub \"PrimaryEmail\"",
   "admin.saml.emailAttrTitle": "Atrybut Email:",
-  "admin.saml.enableDescription": "Gdy włączone, Mattermost będzie działał w trybie Wysokiej Dostępności (HA). Proszę przeczytać <a href='http://docs.mattermost.com/deployment/cluster.html' target='_blank'>dokumentację (język angielski)</a> żeby dowiedzieć się więcej o konfiguracji trybu Wysokiej Dostępności w Mattermost.",
+  "admin.saml.enableDescription": "Gdy włączone, Mattermost pozwoli na logowanie przy użyciu SAML 2.0. Proszę przeczytać <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>dokumentację</a> (j. angielski), aby dowiedzieć się więcej o konfiguracji SAML w Mattermost.",
   "admin.saml.enableTitle": "Pozwól zalogować się z SAML:",
   "admin.saml.encryptDescription": "When false, Mattermost will not decrypt SAML Assertions encrypted with your Service Provider Public Certificate. Not recommended for production environments. For testing only.",
   "admin.saml.encryptTitle": "Włącz Szyfrowanie:",
@@ -1297,15 +1298,14 @@
   "claim.email_to_oauth.switchTo": "Przełącz konto na {uiType}",
   "claim.email_to_oauth.title": "Przełącz konto Email/hasło na {uiType}",
   "claim.ldap_to_email.confirm": "Potwierdź hasło",
-  "claim.ldap_to_email.email": "Będziesz używał emaila {email} do logowania",
-  "claim.ldap_to_email.enterLdapPwd": "Podaj hasło do {ldapPassword} dla {site}",
-  "claim.ldap_to_email.enterPwd": "Wprowadź nowe hasło dla Twojego konta e-mail",
+  "claim.ldap_to_email.email": "After switching your authentication method, you will use {email} to login. Your AD/LDAP credentials will no longer allow access to Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "New email login password:",
   "claim.ldap_to_email.ldapPasswordError": "Proszę wprowadzić hasło AD/LDAP.",
   "claim.ldap_to_email.ldapPwd": "Hasło AD/LDAP",
   "claim.ldap_to_email.pwd": "Hasło",
   "claim.ldap_to_email.pwdError": "Proszę wprowadzić hasło.",
   "claim.ldap_to_email.pwdNotMatch": "Hasła nie zgadzają się.",
-  "claim.ldap_to_email.ssoType": "Po założeniu konta, będziesz mógł się zalogować tylko za pomocą twojego emaila i hasła",
   "claim.ldap_to_email.switchTo": "Przełącz na adres e-mail/hasło",
   "claim.ldap_to_email.title": "Przełącz konto AD/LDAP na adres e-mail/hasło",
   "claim.oauth_to_email.confirm": "Potwierdź hasło",
@@ -1840,6 +1840,7 @@
   "mobile.file_upload.more": "Więcej",
   "mobile.file_upload.video": "Biblioteka wideo",
   "mobile.help.title": "Pomoc",
+  "mobile.image_preview.save": "Save Image",
   "mobile.intro_messages.DM": "To początek historii wiadomości z użytkownikiem {teammate}. Bezpośrednie wiadomości i wysłane w nich pliki nie są widoczne dla osób spoza tego obszaru.",
   "mobile.intro_messages.default_message": "To jest pierwszy kanał który zobaczą członkowie zespołu po zarejestrowaniu się - używaj go do publikowania informacji, o których wszyscy muszą wiedzieć.",
   "mobile.intro_messages.default_welcome": "Witaj w {name}!",
@@ -2055,6 +2056,7 @@
   "rename_channel.handleHolder": "alfanumeryczne znaki z małej litery",
   "rename_channel.lowercase": "Musi składać się z alfanumerycznych znaków z małej litery",
   "rename_channel.maxLength": "This field must be less than {maxLength, number} characters",
+  "rename_channel.minLength": "Channel name must be {minLength, number} or more characters",
   "rename_channel.required": "To pole jest wymagane",
   "rename_channel.save": "Zapisz",
   "rename_channel.title": "Zmień nazwę kanału",
@@ -2166,6 +2168,7 @@
   "sidebar.createGroup": "Stwórz nowy kanał prywatny",
   "sidebar.direct": "DIRECT MESSAGES",
   "sidebar.favorite": "FAVORITE CHANNELS",
+  "sidebar.leave": "Opuść kanał",
   "sidebar.mainMenu": "Main Menu",
   "sidebar.more": "Więcej",
   "sidebar.moreElips": "Więcej...",

assets/base/i18n/pt-BR.json

@@ -9,6 +9,7 @@
   "about.hash": "Hash de Compilação:",
   "about.hashee": "Hash de Compilação EE:",
   "about.licensed": "Licenciado para:",
+  "about.notice": "Mattermost é possível graças ao software de código aberto usado na nossa <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platforma</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> e app <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>móvel</a>.",
   "about.number": "O Número de Compilação:",
   "about.teamEditionLearn": "Junte-se a comunidade Mattermost em ",
   "about.teamEditionSt": "Toda comunicação da sua equipe em um só lugar, instantaneamente pesquisável e acessível em qualquer lugar.",
@@ -28,8 +29,10 @@
   "activity_log.sessionsDescription": "Sessões são criadas quando você efetuar login em um novo navegador em um dispositivo. Sessões permitem que você use Mattermost sem ter que logar novamente por um período de tempo especificado pelo administrador do sistema. Se você deseja sair mais cedo, use o botão 'Logout' abaixo para terminar uma sessão.",
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "App Nativo para Android",
+  "activity_log_modal.androidNativeClassicApp": "App Clássico Android Nativo",
   "activity_log_modal.desktop": "Aplicativo Nativo Desktop",
   "activity_log_modal.iphoneNativeApp": "App Nativo para iPhone",
+  "activity_log_modal.iphoneNativeClassicApp": "App Clássico iPhone Nativo",
   "add_command.autocomplete": "Autocompletar",
   "add_command.autocomplete.help": "(Opcional) Exibir comandos slash na lista de auto preenchimento.",
   "add_command.autocompleteDescription": "Autocompletar Descrição: ",
@@ -148,6 +151,18 @@
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML 2.0",
   "admin.banner.heading": "Nota:",
+  "admin.client_versions.androidLatestVersion": "Última Versão Android",
+  "admin.client_versions.androidLatestVersionHelp": "A versão mais recente lançada para Android",
+  "admin.client_versions.androidMinVersion": "Versão Mínima Android",
+  "admin.client_versions.androidMinVersionHelp": "A versão Android miníma compatível",
+  "admin.client_versions.desktopLatestVersion": "Ultima Versão Desktop",
+  "admin.client_versions.desktopLatestVersionHelp": "A versão mais recente lançada para Desktop",
+  "admin.client_versions.desktopMinVersion": "Versão Mínima Desktop",
+  "admin.client_versions.desktopMinVersionHelp": "A versão Desktop miníma compatível",
+  "admin.client_versions.iosLatestVersion": "Última Versão IOS",
+  "admin.client_versions.iosLatestVersionHelp": "A versão mais recente lançada para IOS",
+  "admin.client_versions.iosMinVersion": "Versão Mínima IOS",
+  "admin.client_versions.iosMinVersionHelp": "A versão IOS miníma compatível",
   "admin.cluster.enableDescription": "Quando verdadeiro, Mattermost irá executar no modo de Alta Disponibilidade. Por favor leia <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentação</a> para aprender mais sobre configurar Alta Disponibilidade para o Mattermost.",
   "admin.cluster.enableTitle": "Ativar modo Alta Disponibilidade:",
   "admin.cluster.interNodeListenAddressDesc": "O endereço que o servidor irá escutar para a comunicação com os outros servidores.",
@@ -651,15 +666,15 @@
   "admin.password.symbol": "Pelo menos um símbolo (ex. \"~!@#$%^&*()\")",
   "admin.password.uppercase": "Pelo menos uma letra maiuscula",
   "admin.plugins.jira": "JIRA (Beta)",
-  "admin.plugins.jira.channelParamNamePlaceholder": "channelname",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelurl",
   "admin.plugins.jira.enabledDescription": "Quando verdadeiro, você pode configurar os webhooks do JIRA para postar mensagens no Mattermost. Para ajudar a combater ataques de phishing, todas as postagens são rotuladas por uma tag BOT.",
-  "admin.plugins.jira.enabledLabel": "Habilitado:",
+  "admin.plugins.jira.enabledLabel": "Ativar JIRA:",
   "admin.plugins.jira.secretDescription": "Está chave secreta é usada para autenticar no Mattermost.",
   "admin.plugins.jira.secretLabel": "Chave Secreta:",
   "admin.plugins.jira.secretParamPlaceholder": "chave secreta",
   "admin.plugins.jira.secretRegenerateDescription": "Gerar novamente a chave secreta para a URL do webhook. Gerando uma nova chave secreta invalida suas integrações com o JIRA.",
   "admin.plugins.jira.setupDescription": "Use esta URL do webhook para configurar a integração do JIRA. Veja {webhookDocsLink} para saber mais.",
-  "admin.plugins.jira.teamParamPlaceholder": "teamname",
+  "admin.plugins.jira.teamParamPlaceholder": "teamurl",
   "admin.plugins.jira.userDescription": "Selecione o nome de usuário para o qual essa integração está anexada.",
   "admin.plugins.jira.userLabel": "Usuário:",
   "admin.plugins.jira.webhookDocsLink": "documentação",
@@ -856,6 +871,7 @@
   "admin.sidebar.advanced": "Avançado",
   "admin.sidebar.audits": "Conformidade e Auditoria",
   "admin.sidebar.authentication": "Autenticação",
+  "admin.sidebar.client_versions": "Versões dos Clientes",
   "admin.sidebar.cluster": "Alta Disponibilidade",
   "admin.sidebar.compliance": "Conformidade",
   "admin.sidebar.configuration": "Configuração",
@@ -1297,15 +1313,14 @@
   "claim.email_to_oauth.switchTo": "Trocar a conta para {uiType}",
   "claim.email_to_oauth.title": "Trocar E-mail/Senha da Conta para {uiType}",
   "claim.ldap_to_email.confirm": "Confirmar senha",
-  "claim.ldap_to_email.email": "Você vai usar o email {email} para logar",
-  "claim.ldap_to_email.enterLdapPwd": "Entre a sua senha {ldapPassword} para o sua conta de email {site}",
-  "claim.ldap_to_email.enterPwd": "Entre a nova senha para o sua conta com email",
+  "claim.ldap_to_email.email": "Depois de alterar o seu método de autenticação, você vai usar {email} para logar. Suas credenciais AD/LDAP deixarão de permitir o acesso ao Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "Nova senha de login por e-mail:",
   "claim.ldap_to_email.ldapPasswordError": "Por favor digite a sua senha AD/LDAP.",
   "claim.ldap_to_email.ldapPwd": "Senha AD/LDAP",
   "claim.ldap_to_email.pwd": "Senha",
   "claim.ldap_to_email.pwdError": "Por favor digite a sua senha.",
   "claim.ldap_to_email.pwdNotMatch": "As senha não correspondem.",
-  "claim.ldap_to_email.ssoType": "Após a alteração do tipo de conta, você só vai ser capaz de logar com seu e-mail e senha",
   "claim.ldap_to_email.switchTo": "Trocar a conta para e-mail/senha",
   "claim.ldap_to_email.title": "Alternar Conta AD/LDAP para E-mail/Senha",
   "claim.oauth_to_email.confirm": "Confirmar Senha",
@@ -1832,6 +1847,15 @@
   "mobile.custom_list.no_results": "Nenhum Resultado",
   "mobile.drawer.teamsTitle": "Equipes",
   "mobile.edit_post.title": "Editando a Mensagem",
+  "mobile.emoji_picker.activity": "ATIVIDADE",
+  "mobile.emoji_picker.custom": "PERSONALIZADO",
+  "mobile.emoji_picker.flags": "BANDEIRAS",
+  "mobile.emoji_picker.foods": "COMIDAS",
+  "mobile.emoji_picker.nature": "NATUREZA",
+  "mobile.emoji_picker.objects": "OBJETOS",
+  "mobile.emoji_picker.people": "PESSOAS",
+  "mobile.emoji_picker.places": "LUGARES",
+  "mobile.emoji_picker.symbols": "SIMBOLOS",
   "mobile.error_handler.button": "Relançar",
   "mobile.error_handler.description": "\nClique relançar para abrir a app novamente. Após o reinício, você pode relatar o problema no menu the configuração.\n",
   "mobile.error_handler.title": "Ocorreu um erro inesperado",
@@ -1840,6 +1864,7 @@
   "mobile.file_upload.more": "Mais",
   "mobile.file_upload.video": "Galeria de Videos",
   "mobile.help.title": "Ajuda",
+  "mobile.image_preview.save": "Salvar imagem",
   "mobile.intro_messages.DM": "Este é o início do seu histórico de mensagens diretas com {teammate}. Mensagens diretas e arquivos compartilhados aqui não são mostrados para pessoas de fora desta área.",
   "mobile.intro_messages.default_message": "Este é o primeiro canal da equipe veja quando eles se registrarem - use para postar atualizações que todos devem saber.",
   "mobile.intro_messages.default_welcome": "Bem-vindo ao {name}!",
@@ -1852,7 +1877,7 @@
   "mobile.managed.exit": "Editar",
   "mobile.managed.jailbreak": "Os dispositivos com Jailbroken não são confiáveis ​​para {vendor}, por favor saia do aplicativo.",
   "mobile.managed.secured_by": "Garantido por {vendor} ",
-  "mobile.markdown.code.plusMoreLines": "+{count, number} more lines",
+  "mobile.markdown.code.plusMoreLines": "mais +{count, number} linhas",
   "mobile.more_dms.start": "Início",
   "mobile.more_dms.title": "Nova Conversa",
   "mobile.notice_mobile_link": "aplicativos móveis",
@@ -1871,6 +1896,7 @@
   "mobile.post.failed_retry": "Tentar novamente",
   "mobile.post.failed_title": "Não foi possível enviar sua mensagem",
   "mobile.post.retry": "Atualizar",
+  "mobile.post_info.add_reaction": "Adicionar Reação",
   "mobile.request.invalid_response": "Recebido uma resposta inválida do servidor.",
   "mobile.routes.channelInfo": "Informações",
   "mobile.routes.channelInfo.createdBy": "Criado por {creator} em ",
@@ -1880,8 +1906,8 @@
   "mobile.routes.channel_members.action_message": "Você deve selecionar pelo menos um membro para remover do canal.",
   "mobile.routes.channel_members.action_message_confirm": "Você tem certeza que quer remover o membro selecionado do canal?",
   "mobile.routes.channels": "Canais",
-  "mobile.routes.code": "{language} Code",
-  "mobile.routes.code.noLanguage": "Code",
+  "mobile.routes.code": "{language} Código",
+  "mobile.routes.code.noLanguage": "Código",
   "mobile.routes.enterServerUrl": "Informe a URL do Servidor",
   "mobile.routes.login": "Login",
   "mobile.routes.loginOptions": "Selecionador de Login",
@@ -2055,6 +2081,7 @@
   "rename_channel.handleHolder": "caracteres minúsculos alfanuméricos",
   "rename_channel.lowercase": "Tem de ser caracteres minúsculos alfanuméricos",
   "rename_channel.maxLength": "Este campo precisa ter menos de {maxLength, number} caracteres",
+  "rename_channel.minLength": "Nome do canal deve ter {minLength, number} caracteres ou mais",
   "rename_channel.required": "Este campo é obrigatório",
   "rename_channel.save": "Salvar",
   "rename_channel.title": "Renomear Canal",
@@ -2166,7 +2193,8 @@
   "sidebar.createGroup": "Criar um novo canal privado",
   "sidebar.direct": "MENSAGENS DIRETAS",
   "sidebar.favorite": "CANAIS FAVORITOS",
-  "sidebar.mainMenu": "Main Menu",
+  "sidebar.leave": "Deixar o canal",
+  "sidebar.mainMenu": "Menu Principal",
   "sidebar.more": "Mais",
   "sidebar.moreElips": "Mais...",
   "sidebar.otherMembers": "Fora desta equipe",

assets/base/i18n/ru.json

@@ -9,6 +9,7 @@
   "about.hash": "Хэш сборки:",
   "about.hashee": "Хэш сборки EE:",
   "about.licensed": "Лицензия зарегистрирована на:",
+  "about.notice": "Mattermost is made possible by the open source software used in our <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> and <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a> apps.",
   "about.number": "Номер сборки:",
   "about.teamEditionLearn": "Присоединяйтесь к сообществу Mattermost на ",
   "about.teamEditionSt": "Всё общение вашей команды собрано в одном месте, с мгновенным поиском и доступом отовсюду.",
@@ -1297,15 +1298,14 @@
   "claim.email_to_oauth.switchTo": "Переключить аккаунт на {uiType}",
   "claim.email_to_oauth.title": "Переключить E-Mail/Пароль аккаунт на {uiType}",
   "claim.ldap_to_email.confirm": "Подтвердить пароль",
-  "claim.ldap_to_email.email": "Вы будете использовать email {email} для входа в систему",
-  "claim.ldap_to_email.enterLdapPwd": "Введите ваш {ldapPassword} для вашего почтового аккаунта {site}",
-  "claim.ldap_to_email.enterPwd": "Введите новый пароль для вашего почтового аккаунта",
+  "claim.ldap_to_email.email": "After switching your authentication method, you will use {email} to login. Your AD/LDAP credentials will no longer allow access to Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "New email login password:",
   "claim.ldap_to_email.ldapPasswordError": "Пожалуйста, введите свой пароль AD/LDAP.",
   "claim.ldap_to_email.ldapPwd": "Пароль AD/LDAP",
   "claim.ldap_to_email.pwd": "Пароль",
   "claim.ldap_to_email.pwdError": "Введите ваш пароль.",
   "claim.ldap_to_email.pwdNotMatch": "Пароли не совпадают.",
-  "claim.ldap_to_email.ssoType": "Upon claiming your account, you will only be able to login with your email and password",
   "claim.ldap_to_email.switchTo": "Переключить аккаунт на email/пароль",
   "claim.ldap_to_email.title": "Переключить AD/LDAP на Email/Password",
   "claim.oauth_to_email.confirm": "Подтвердить пароль",
@@ -1840,6 +1840,7 @@
   "mobile.file_upload.more": "Еще",
   "mobile.file_upload.video": "Библиотека видео",
   "mobile.help.title": "Помощь",
+  "mobile.image_preview.save": "Save Image",
   "mobile.intro_messages.DM": "Начало истории личных сообщений с {teammate}. Личные сообщения и файлы доступны здесь и не видны за пределами этой области.",
   "mobile.intro_messages.default_message": "Это первый канал, который видит новый участник группы - используйте его для отправки сообщений, которые должны увидеть все.",
   "mobile.intro_messages.default_welcome": "Добро пожаловать в {name}!",
@@ -2055,6 +2056,7 @@
   "rename_channel.handleHolder": "буквы или цифры в нижнем регистре",
   "rename_channel.lowercase": "Должны быть буквы или цифры в нижнем регистре",
   "rename_channel.maxLength": "This field must be less than {maxLength, number} characters",
+  "rename_channel.minLength": "Channel name must be {minLength, number} or more characters",
   "rename_channel.required": "Обязательное поле",
   "rename_channel.save": "Сохранить",
   "rename_channel.title": "Переименовать канал",
@@ -2166,6 +2168,7 @@
   "sidebar.createGroup": "Создать приватный канал",
   "sidebar.direct": "ЛИЧНЫЕ СООБЩЕНИЯ",
   "sidebar.favorite": "ИЗБРАННЫЕ КАНАЛЫ",
+  "sidebar.leave": "Покинуть Канал",
   "sidebar.mainMenu": "Main Menu",
   "sidebar.more": "Еще",
   "sidebar.moreElips": "Еще...",

assets/base/i18n/tr.json

@@ -9,6 +9,7 @@
   "about.hash": "Yapım Karması:",
   "about.hashee": "Kurumsal Yapım Karması:",
   "about.licensed": "Lisans sahibi:",
+  "about.notice": "Mattermost is made possible by the open source software used in our <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> and <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a> apps.",
   "about.number": "Yapım Numarası:",
   "about.teamEditionLearn": "Mattermost topluluğuna katılın: ",
   "about.teamEditionSt": "Tüm takım iletişimi tek bir yerde, anında aranabilir ve her yerden erişilebilir.",
@@ -28,8 +29,10 @@
   "activity_log.sessionsDescription": "Oturumlar, bir aygıttan yeni bir tarayıcıda oturum açtığınızda oluşturulur. Oturum, Sistem Yöneticisi tarafından belirtilen süre boyunca yeniden oturum açmanız gerekmeden Mattermost kullanmanızı sağlar. Süre dolmadan önce oturumunuzu kapatmak isterseniz, aşağıdaki 'Oturum Kapatma' düğmesini kullanın.",
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "Doğal Android Uygulaması",
+  "activity_log_modal.androidNativeClassicApp": "Android Doğal Klasik Uygulama",
   "activity_log_modal.desktop": "Doğal Masaüstü Uygulaması",
   "activity_log_modal.iphoneNativeApp": "Doğal iPhone Uygulaması",
+  "activity_log_modal.iphoneNativeClassicApp": "iPhone Doğal Klasik Uygulama",
   "add_command.autocomplete": "Otomatik doldur",
   "add_command.autocomplete.help": "(İsteğe bağlı) Bölü komutu otomatik tamamlama listesinde görüntülensin.",
   "add_command.autocompleteDescription": "Otomatik Tamamlama Açıklaması",
@@ -148,6 +151,18 @@
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML 2.0",
   "admin.banner.heading": "Not:",
+  "admin.client_versions.androidLatestVersion": "Son Android Sürümü",
+  "admin.client_versions.androidLatestVersionHelp": "Son yayınlanan Android sürümü",
+  "admin.client_versions.androidMinVersion": "En Düşük Android Sürümü",
+  "admin.client_versions.androidMinVersionHelp": "Uyumlu en düşük Android sürümü",
+  "admin.client_versions.desktopLatestVersion": "Son Masaüstü Sürümü",
+  "admin.client_versions.desktopLatestVersionHelp": "Son yayınlanan Masaüstü sürümü",
+  "admin.client_versions.desktopMinVersion": "En Düşük Masaüstü Sürümü",
+  "admin.client_versions.desktopMinVersionHelp": "Uyumlu en düşük Masaüstü sürümü",
+  "admin.client_versions.iosLatestVersion": "Son iOS sürümü",
+  "admin.client_versions.iosLatestVersionHelp": "Son yayınlanan iOS sürümü",
+  "admin.client_versions.iosMinVersion": "En düşük iOS sürümü",
+  "admin.client_versions.iosMinVersionHelp": "Uyumlu en düşük iOS sürümü",
   "admin.cluster.enableDescription": "Bu seçenek etkinleştirildiğinde, Mattermost Yüksek Erişilebilirlik kipinde çalışır. Mattermost Yüksek Erişilebilirlik ayarları hakkında ayrıntılı bilgi almak için <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target='_blank'>belgelere bakın</a>.",
   "admin.cluster.enableTitle": "Yüksek Erişilebilirlik Kipi Kullanılsın:",
   "admin.cluster.interNodeListenAddressDesc": "Sunucunun diğer sunucular ile iletişim kurmak için dinleyeceği adres.",
@@ -651,15 +666,15 @@
   "admin.password.symbol": "En az bir simge (Örnek: \"~!@#$%^&*()\")",
   "admin.password.uppercase": "En az bir büyük harf",
   "admin.plugins.jira": "JIRA (Beta)",
-  "admin.plugins.jira.channelParamNamePlaceholder": "kanaladi",
+  "admin.plugins.jira.channelParamNamePlaceholder": "kanaladresi",
   "admin.plugins.jira.enabledDescription": "Bu seçenek etkinleştirildiğinde, Mattermost iletileri gönderirken JIRA web bağlantıları belirtebilirsiniz. Sahtecilik girişimlerini engellemeye yardımcı olmak için tüm iletiler BOT kod imi ile etiketlenir.",
-  "admin.plugins.jira.enabledLabel": "Etkin:",
+  "admin.plugins.jira.enabledLabel": "JIRA kullanılsın:",
   "admin.plugins.jira.secretDescription": "Mattermost kimlik doğrulaması için kullanılacak parola.",
   "admin.plugins.jira.secretLabel": "Parola:",
   "admin.plugins.jira.secretParamPlaceholder": "parola",
   "admin.plugins.jira.secretRegenerateDescription": "Web bağlantısı uç noktasının parolasını yeniden üretir. Parolanın yeniden üretilmesi varolan JIRA bütünleştirmelerinizi geçersiz kılar.",
   "admin.plugins.jira.setupDescription": "JIRA bütünleştirmesini kurmak için bu bağlantı adresini kullanın. Ayrıntılı bilgi almak için {webhookDocsLink} bölümüne bakın.",
-  "admin.plugins.jira.teamParamPlaceholder": "takimadi",
+  "admin.plugins.jira.teamParamPlaceholder": "takimadresi",
   "admin.plugins.jira.userDescription": "Bu bütünleştirmenin ekleneceği kullanıcı adını seçin.",
   "admin.plugins.jira.userLabel": "Kullanıcı:",
   "admin.plugins.jira.webhookDocsLink": "belgeler",
@@ -856,6 +871,7 @@
   "admin.sidebar.advanced": "Gelişmiş",
   "admin.sidebar.audits": "Uygunluk ve Denetim",
   "admin.sidebar.authentication": "Kimlik Doğrulama",
+  "admin.sidebar.client_versions": "İstemci Sürümleri",
   "admin.sidebar.cluster": "Yüksek Erişilebilirlik",
   "admin.sidebar.compliance": "Uygunluk",
   "admin.sidebar.configuration": "Ayarlar",
@@ -1297,15 +1313,14 @@
   "claim.email_to_oauth.switchTo": "Hesabı {uiType} olarak değiştir",
   "claim.email_to_oauth.title": "E-posta/Parola Hesabını {uiType} olarak değiştir",
   "claim.ldap_to_email.confirm": "Parola Onayı",
-  "claim.ldap_to_email.email": "Oturum açmak için {email} adresini kullanacaksınız",
-  "claim.ldap_to_email.enterLdapPwd": "{site} e-posta hesabınız için {ldapPassword} yazın",
-  "claim.ldap_to_email.enterPwd": "E-posta hesabınız için yeni bir parola yazın",
+  "claim.ldap_to_email.email": "Kimlik doğrulama yöntemini değiştirdiğinizde oturum açmak için {email} kullanacaksınız. AD/LDAP kimlik doğrulama bilgilerinizi kullanarak Mattermost oturumu açamayacaksınız.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "Yeni e-posta ile oturum açma parolası:",
   "claim.ldap_to_email.ldapPasswordError": "Lütfen AD/LDAP parolanızı yazın.",
   "claim.ldap_to_email.ldapPwd": "AD/LDAP Parolası",
   "claim.ldap_to_email.pwd": "Parola",
   "claim.ldap_to_email.pwdError": "Lütfen parolanızı yazın.",
   "claim.ldap_to_email.pwdNotMatch": "Parola ve onayı aynı değil.",
-  "claim.ldap_to_email.ssoType": "Hesabınıza göre yalnız e-posta adresi ve parola ile oturum açabilirsiniz",
   "claim.ldap_to_email.switchTo": "Hesabı E-posta/Parola olarak değiştir",
   "claim.ldap_to_email.title": "AD/LDAP hesabını E-posta/Parola olarak değiştir",
   "claim.oauth_to_email.confirm": "Parola Onayı",
@@ -1832,6 +1847,15 @@
   "mobile.custom_list.no_results": "Herhangi bir sonuç bulunamadı",
   "mobile.drawer.teamsTitle": "Takımlar",
   "mobile.edit_post.title": "İleti Düzenleniyor",
+  "mobile.emoji_picker.activity": "ETKİNLİK",
+  "mobile.emoji_picker.custom": "ÖZEL",
+  "mobile.emoji_picker.flags": "İŞARETLER",
+  "mobile.emoji_picker.foods": "YİYECEKLER",
+  "mobile.emoji_picker.nature": "DOĞA",
+  "mobile.emoji_picker.objects": "NESNELER",
+  "mobile.emoji_picker.people": "KİŞİLER",
+  "mobile.emoji_picker.places": "YERLER",
+  "mobile.emoji_picker.symbols": "SİMGELER",
   "mobile.error_handler.button": "Yeniden başlat",
   "mobile.error_handler.description": "\nUygulamayı açmak için yeniden başlat üzerine tıklayın. Yeniden başlatıldıktan sonra ayarlar menüsünden sorunu bildirebilirsiniz.\n",
   "mobile.error_handler.title": "Beklenmeyen bir sorun çıktı",
@@ -1840,6 +1864,7 @@
   "mobile.file_upload.more": "Diğer",
   "mobile.file_upload.video": "Görüntü Kitaplığı",
   "mobile.help.title": "Yardım",
+  "mobile.image_preview.save": "Görseli Kaydet",
   "mobile.intro_messages.DM": "{teammate} takım arkadaşınız ile doğrudan ileti geçmişinizin başlangıcı. Bu bölüm dışındaki kişiler burada paylaşılan doğrudan ileti ve dosyaları göremez.",
   "mobile.intro_messages.default_message": "Takım arkadaşlarınız kayıt olduğunda görecekleri ilk kanal budur. Bu kanalı herkesin bilmesi gereken iletiler için kullanın.",
   "mobile.intro_messages.default_welcome": "{name} üzerine hoş geldiniz!",
@@ -1852,7 +1877,7 @@
   "mobile.managed.exit": "Çık",
   "mobile.managed.jailbreak": "Jailbreak uygulanmış aygıtlara {vendor} tarafından güvenilmiyor, lütfen uygulamadan çıkın.",
   "mobile.managed.secured_by": "{vendor} tarafından korunuyor",
-  "mobile.markdown.code.plusMoreLines": "+{count, number} more lines",
+  "mobile.markdown.code.plusMoreLines": "+{count, number} satır daha",
   "mobile.more_dms.start": "Başlat",
   "mobile.more_dms.title": "Yeni Konuşma",
   "mobile.notice_mobile_link": "mobil uygulamalar",
@@ -1871,6 +1896,7 @@
   "mobile.post.failed_retry": "Yeniden Dene",
   "mobile.post.failed_title": "İletinizi gönderilemedi",
   "mobile.post.retry": "Yenile",
+  "mobile.post_info.add_reaction": "Tepki Ekle",
   "mobile.request.invalid_response": "Sunucudan geçersiz bir yanıt alındı.",
   "mobile.routes.channelInfo": "Bilgiler",
   "mobile.routes.channelInfo.createdBy": "{creator} tarafından şu zamanda oluşturuldu ",
@@ -1880,8 +1906,8 @@
   "mobile.routes.channel_members.action_message": "Kanaldan çıkarılacak en az bir üye seçmelisiniz.",
   "mobile.routes.channel_members.action_message_confirm": "Seçilmiş üyeleri kanaldan çıkarmak istediğinize emin misiniz?",
   "mobile.routes.channels": "Kanallar",
-  "mobile.routes.code": "{language} Code",
-  "mobile.routes.code.noLanguage": "Code",
+  "mobile.routes.code": "{language} Kodu",
+  "mobile.routes.code.noLanguage": "Kod",
   "mobile.routes.enterServerUrl": "Sunucu Adresini Yazın",
   "mobile.routes.login": "Oturum Aç",
   "mobile.routes.loginOptions": "Oturum Açma Seçici",
@@ -2055,6 +2081,7 @@
   "rename_channel.handleHolder": "küçük alfasayısal karakterler",
   "rename_channel.lowercase": "Küçük alfasayısal karakterler olmalı",
   "rename_channel.maxLength": "Bu alana en fazla {maxLength, number} karakter yazılabilir",
+  "rename_channel.minLength": "Kanal adında en az {minLength, number} karakter bulunmalıdır",
   "rename_channel.required": "Bu alan zorunludur",
   "rename_channel.save": "Kaydet",
   "rename_channel.title": "Kanalı Yeniden Adlandır",
@@ -2166,7 +2193,8 @@
   "sidebar.createGroup": "Yeni özel kanal ekle",
   "sidebar.direct": "DOĞRUDAN İLETİLER",
   "sidebar.favorite": "BEĞENDİĞİM KANALLAR",
-  "sidebar.mainMenu": "Main Menu",
+  "sidebar.leave": "Kanaldan Ayrıl",
+  "sidebar.mainMenu": "Ana Menü",
   "sidebar.more": "Diğer",
   "sidebar.moreElips": "Diğer...",
   "sidebar.otherMembers": "Bu takımın dışında",

assets/base/i18n/zh-CN.json

@@ -9,6 +9,7 @@
   "about.hash": "构建哈希：",
   "about.hashee": "构建EE哈希：",
   "about.licensed": "授权于：",
+  "about.notice": "Mattermost is made possible by the open source software used in our <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> and <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a> apps.",
   "about.number": "编译号：",
   "about.teamEditionLearn": "加入Mattermost社区",
   "about.teamEditionSt": "所有团队的通讯一站式解决，随时随地可搜索和访问。",
@@ -28,8 +29,10 @@
   "activity_log.sessionsDescription": "当您在设备的新浏览器中登录时，将创建会话。会话让您使用Mattermost时无需在系统管理员限定的时间段内重新登录。如果您希望早些退出，点击下方的‘注销’按钮结束会话。",
   "activity_log_modal.android": "安卓",
   "activity_log_modal.androidNativeApp": "Android本地App",
+  "activity_log_modal.androidNativeClassicApp": "安卓经典应用",
   "activity_log_modal.desktop": "电脑应用",
   "activity_log_modal.iphoneNativeApp": "iPhone本地App",
+  "activity_log_modal.iphoneNativeClassicApp": "iPhone 经典应用",
   "add_command.autocomplete": "自动完成",
   "add_command.autocomplete.help": "(可选) 在自动完成列表显示斜杠命令。",
   "add_command.autocompleteDescription": "自动完成描述",
@@ -148,6 +151,18 @@
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML 2.0",
   "admin.banner.heading": "注释：",
+  "admin.client_versions.androidLatestVersion": "最新的安卓版本",
+  "admin.client_versions.androidLatestVersionHelp": "最新的安卓版本",
+  "admin.client_versions.androidMinVersion": "最低安卓版本",
+  "admin.client_versions.androidMinVersionHelp": "最低兼容的安卓版本",
+  "admin.client_versions.desktopLatestVersion": "最新的桌面版本",
+  "admin.client_versions.desktopLatestVersionHelp": "最新的桌面版本",
+  "admin.client_versions.desktopMinVersion": "最低的桌面版本",
+  "admin.client_versions.desktopMinVersionHelp": "最低兼容的桌面版本",
+  "admin.client_versions.iosLatestVersion": "最新的 IOS 版本",
+  "admin.client_versions.iosLatestVersionHelp": "最新的 IOS 版本",
+  "admin.client_versions.iosMinVersion": "最低的 IOS 版本",
+  "admin.client_versions.iosMinVersionHelp": "最低兼容的 IOS 版本",
   "admin.cluster.enableDescription": "当设为是时，Mattermost 将以高可用性模式运行。请参考<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target='_blank'>文档</a>了解 Mattermost 的高可用性。",
   "admin.cluster.enableTitle": "开启高可用性模式：",
   "admin.cluster.interNodeListenAddressDesc": "服务器与其他服务器通讯的监听地址。",
@@ -587,7 +602,7 @@
   "admin.log.locationPlaceholder": "输入你的文件位置",
   "admin.log.locationTitle": "日志文件目录：",
   "admin.log.logSettings": "日志设置",
-  "admin.logs.bannerDesc": "到 报告 > 用户 并在搜索过滤器输入 ID 以用户 ID 查找用户。",
+  "admin.logs.bannerDesc": "到 报告 > 用户 并在搜索过滤器输入 ID 以用户 ID  或令牌 ID 查找用户。",
   "admin.logs.reload": "重载",
   "admin.logs.title": "服务器日志",
   "admin.manage_roles.additionalRoles": "选择帐号额外的权限。<a href=\"https://about.mattermost.com/default-permissions\" target=\"_blank\">阅读更多关于角色于权限</a>。",
@@ -651,15 +666,15 @@
   "admin.password.symbol": "至少有一个符号 (例如：\"~!@#$%^&*()\")",
   "admin.password.uppercase": "至少有一个大写字母",
   "admin.plugins.jira": "JIRA (Beta)",
-  "admin.plugins.jira.channelParamNamePlaceholder": "channelname",
+  "admin.plugins.jira.channelParamNamePlaceholder": "channelurl",
   "admin.plugins.jira.enabledDescription": "当设为是时，您可以设置 JIRA webhooks 发送消息到 Mattermost。为了避免钓鱼攻击，所有消息会被标上 BOT 标签。",
-  "admin.plugins.jira.enabledLabel": "已启用：",
+  "admin.plugins.jira.enabledLabel": "开启 JIRA：",
   "admin.plugins.jira.secretDescription": "此秘钥用于和 Mattermost 验证。",
   "admin.plugins.jira.secretLabel": "秘钥：",
   "admin.plugins.jira.secretParamPlaceholder": "secret",
   "admin.plugins.jira.secretRegenerateDescription": "重新生成 webhook 网址端点秘钥。重新生成秘钥将使现有 JIRA 整合无效。",
   "admin.plugins.jira.setupDescription": "使用 webhook 网址设置 JIRA 整合。参见 {webhookDocsLink} 了解详情。",
-  "admin.plugins.jira.teamParamPlaceholder": "teamname",
+  "admin.plugins.jira.teamParamPlaceholder": "teamurl",
   "admin.plugins.jira.userDescription": "选择此整合关联的用户名。",
   "admin.plugins.jira.userLabel": "用户：",
   "admin.plugins.jira.webhookDocsLink": "文档",
@@ -719,8 +734,8 @@
   "admin.saml.emailAttrDesc": "使用SAML断言中的属性做为Mattermost中用户的电子邮箱地址。",
   "admin.saml.emailAttrEx": "例如 \"Email\" 或 \"PrimaryEmail\"",
   "admin.saml.emailAttrTitle": "邮箱属性：",
-  "admin.saml.enableDescription": "当设为是时，Mattermost允许通过SAML登陆。请参考<a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>文档</a>了解Mattermost配置SAML。",
-  "admin.saml.enableTitle": "开启SAML登入：",
+  "admin.saml.enableDescription": "当设为是时，Mattermost 允许通过 SAML 2.0 登陆。请参考<a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>文档</a>了解 Mattermost 配置 SAML。",
+  "admin.saml.enableTitle": "开启 SAML 2.0 登入：",
   "admin.saml.encryptDescription": "当设为否时，Mattermost 将不会用使用您的服务提供者公开证书解密 SAML 断言。不推荐在正式环境中使用。仅供测试。",
   "admin.saml.encryptTitle": "开启加密：",
   "admin.saml.firstnameAttrDesc": "(可选) 使用SAML断言中的属性做为 Mattermost 中用户的昵称。",
@@ -807,9 +822,9 @@
   "admin.service.insecureTlsTitle": "启用不安全的对外连接：",
   "admin.service.integrationAdmin": "限制只有管理员能管理整合：",
   "admin.service.integrationAdminDesc": "当设为是时，webhhoks 和斜杠命令只由团队和系统管理员可以创建、修改和查看，同时只有系统管理员可以操作 OAuth 2.0 应用。整合在管理员创建后所有人可以使用。",
-  "admin.service.internalConnectionsDesc": "In testing environments, such as when developing integrations locally on a development machine, use this setting to specify domains, IP addresses, or CIDR notations to allow internal connections. <b>Not recommended for use in production</b>, since this can allow a user to extract confidential data from your server or internal network.<br /><br />By default, user-supplied URLs such as those used for Open Graph metadata, webhooks, or slash commands will not be allowed to connect to reserved IP addresses including loopback or link-local addresses used for internal networks. Push notification, OAuth 2.0 and WebRTC server URLs are trusted and not affected by this setting.",
+  "admin.service.internalConnectionsDesc": "在测试环境中，比如在开发设备上本地开发整合时，使用此设定指定域名，IP 地址，或 CIDR 来允许内部连接。<b>不推荐在正式环境中使用</b>，因为这将允许用户从您的服务器或内部网络提取敏感数据。<br /><br />默认情况下，用户提供的 Open Graph，webhooks，或斜杠命令网址不允许连接到预留 IP 地址包括回环或用于内部网络的本地地址。推送通知，OAuth 2.0 以及 WebRTC 服务器地址为受信任网址并不受此设定影响。",
   "admin.service.internalConnectionsEx": "webhooks.internal.example.com 127.0.0.1 10.0.16.0/28",
-  "admin.service.internalConnectionsTitle": "Allow untrusted internal connections to: ",
+  "admin.service.internalConnectionsTitle": "允许不受信任的内部连接到：",
   "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt 证书缓存文件：",
   "admin.service.letsEncryptCertificateCacheFileDescription": "从 Let's Encrypt 服务获取的证书和其他数据将储存于此文件。",
   "admin.service.listenAddress": "监听地址：",
@@ -856,6 +871,7 @@
   "admin.sidebar.advanced": "高级",
   "admin.sidebar.audits": "合规性与审计",
   "admin.sidebar.authentication": "验证",
+  "admin.sidebar.client_versions": "客户端版本",
   "admin.sidebar.cluster": "高可用性",
   "admin.sidebar.compliance": "合规",
   "admin.sidebar.configuration": "配置",
@@ -1297,15 +1313,14 @@
   "claim.email_to_oauth.switchTo": "切换账户到 {uiType}",
   "claim.email_to_oauth.title": "切换邮箱/密码账号到 {uiType}",
   "claim.ldap_to_email.confirm": "确认密码",
-  "claim.ldap_to_email.email": "您将使用电子邮件{email}登录",
-  "claim.ldap_to_email.enterLdapPwd": "输入 {site} 电子邮件帐号的 {ldapPassword}",
-  "claim.ldap_to_email.enterPwd": "输入您的新电子邮件帐号密码",
+  "claim.ldap_to_email.email": "After switching your authentication method, you will use {email} to login. Your AD/LDAP credentials will no longer allow access to Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "New email login password:",
   "claim.ldap_to_email.ldapPasswordError": "请输入您的 AD/LDAP 密码。",
   "claim.ldap_to_email.ldapPwd": "AD/LDAP 密码",
   "claim.ldap_to_email.pwd": "密码",
   "claim.ldap_to_email.pwdError": "请输入您的密码。",
   "claim.ldap_to_email.pwdNotMatch": "密码不匹配。",
-  "claim.ldap_to_email.ssoType": "领取您的帐号后，您只能用您的电子邮箱地址和密码登入",
   "claim.ldap_to_email.switchTo": "切换到电子邮件/密码的账户",
   "claim.ldap_to_email.title": "切换到电子邮件/密码的 AD/LDAP 账户",
   "claim.oauth_to_email.confirm": "确认密码",
@@ -1832,6 +1847,15 @@
   "mobile.custom_list.no_results": "无结果",
   "mobile.drawer.teamsTitle": "团队",
   "mobile.edit_post.title": "编辑消息",
+  "mobile.emoji_picker.activity": "活动",
+  "mobile.emoji_picker.custom": "自定义",
+  "mobile.emoji_picker.flags": "标志",
+  "mobile.emoji_picker.foods": "食物",
+  "mobile.emoji_picker.nature": "自然",
+  "mobile.emoji_picker.objects": "物体",
+  "mobile.emoji_picker.people": "人物",
+  "mobile.emoji_picker.places": "地点",
+  "mobile.emoji_picker.symbols": "符号",
   "mobile.error_handler.button": "重加载",
   "mobile.error_handler.description": "\n点击重启动应用。重启后，您可以在设定菜单汇报问题。\n",
   "mobile.error_handler.title": "发生未知错误",
@@ -1840,6 +1864,7 @@
   "mobile.file_upload.more": "更多",
   "mobile.file_upload.video": "视频库",
   "mobile.help.title": "帮助",
+  "mobile.image_preview.save": "Save Image",
   "mobile.intro_messages.DM": "这是您和{teammate}私信记录的开端。此区域外的人不能看到这里共享的私信和文件。",
   "mobile.intro_messages.default_message": "这是团队成员注册后第一个看到的频道 - 使用它发布所有人需要知道的消息。",
   "mobile.intro_messages.default_welcome": "欢迎来到 {name}！",
@@ -1848,10 +1873,10 @@
   "mobile.loading_members": "正在加载成员...",
   "mobile.loading_posts": "正在加载消息...",
   "mobile.login_options.choose_title": "选择您的登入方式",
-  "mobile.managed.blocked_by": "Blocked by {vendor}",
-  "mobile.managed.exit": "编辑",
-  "mobile.managed.jailbreak": "Jailbroken devices are not trusted by {vendor}, please exit the app.",
-  "mobile.managed.secured_by": "Secured by {vendor}",
+  "mobile.managed.blocked_by": "被 {vendor} 封锁",
+  "mobile.managed.exit": "退出",
+  "mobile.managed.jailbreak": "越狱的设备不被 {vendor} 信任，请退出应用。",
+  "mobile.managed.secured_by": "被 {vendor} 安全保护",
   "mobile.markdown.code.plusMoreLines": "+{count, number} more lines",
   "mobile.more_dms.start": "开始",
   "mobile.more_dms.title": "新建对话",
@@ -1871,6 +1896,7 @@
   "mobile.post.failed_retry": "重试",
   "mobile.post.failed_title": "无法发送您的消息",
   "mobile.post.retry": "刷新",
+  "mobile.post_info.add_reaction": "Add Reaction",
   "mobile.request.invalid_response": "从服务器收到了无效回应。",
   "mobile.routes.channelInfo": "信息",
   "mobile.routes.channelInfo.createdBy": "{creator} 创建于 ",
@@ -1880,8 +1906,8 @@
   "mobile.routes.channel_members.action_message": "您必须至少选择一个要移出频道的成员。",
   "mobile.routes.channel_members.action_message_confirm": "您确定要将选择的成员移出频道？",
   "mobile.routes.channels": "频道",
-  "mobile.routes.code": "{language} Code",
-  "mobile.routes.code.noLanguage": "Code",
+  "mobile.routes.code": "{language} 代码",
+  "mobile.routes.code.noLanguage": "代码",
   "mobile.routes.enterServerUrl": "输入服务器网址",
   "mobile.routes.login": "登录",
   "mobile.routes.loginOptions": "登入选择器",
@@ -1934,7 +1960,7 @@
   "msg_typing.someone": "有人",
   "multiselect.add": "添加",
   "multiselect.go": "转到",
-  "multiselect.list.notFound": "没有找到用户",
+  "multiselect.list.notFound": "没有找到项目",
   "multiselect.numPeopleRemaining": "使用↑↓浏览，↵选择。您可以添加 {num, number} 位用户。",
   "multiselect.numRemaining": "您还可以添加 {num, number} 位",
   "multiselect.placeholder": "搜索并添加成员",
@@ -2055,6 +2081,7 @@
   "rename_channel.handleHolder": "小写字母符",
   "rename_channel.lowercase": "必须小写字母数字字符",
   "rename_channel.maxLength": "此字段必须小于 {maxLength, number} 个字符",
+  "rename_channel.minLength": "Channel name must be {minLength, number} or more characters",
   "rename_channel.required": "该字段不能为空",
   "rename_channel.save": "保存",
   "rename_channel.title": "重命名频道",
@@ -2113,32 +2140,32 @@
   "setting_upload.import": "导入",
   "setting_upload.noFile": "未选择文件。",
   "setting_upload.select": "选择文件",
-  "shortcuts.browser.channel_next": "Forward in history:\tAlt|Right",
-  "shortcuts.browser.channel_next.mac": "Forward in history:\t⌘|]",
-  "shortcuts.browser.channel_prev": "Back in history:\tAlt|Left",
-  "shortcuts.browser.channel_prev.mac": "Back in history:\t⌘|[",
-  "shortcuts.browser.font_decrease": "Zoom out:\tCtrl|-",
-  "shortcuts.browser.font_decrease.mac": "Zoom out:\t⌘|-",
-  "shortcuts.browser.font_increase": "Zoom in:\tCtrl|+",
-  "shortcuts.browser.font_increase.mac": "Zoom in:\t⌘|+",
-  "shortcuts.browser.header": "Built-in Browser Commands",
-  "shortcuts.browser.highlight_next": "Highlight text to the next line:\tShift|Down",
-  "shortcuts.browser.highlight_prev": "Highlight text to the previous line:\tShift|Up",
-  "shortcuts.browser.input.header": "Works inside an input field",
-  "shortcuts.browser.newline": "Create a new line:\tShift|Enter",
+  "shortcuts.browser.channel_next": "历史里前进：\tAlt|Right",
+  "shortcuts.browser.channel_next.mac": "历史里前进：\t⌘|]",
+  "shortcuts.browser.channel_prev": "历史里后退：\tAlt|Left",
+  "shortcuts.browser.channel_prev.mac": "历史里后退：\t⌘|[",
+  "shortcuts.browser.font_decrease": "缩小：\tCtrl|-",
+  "shortcuts.browser.font_decrease.mac": "缩小：\t⌘|-",
+  "shortcuts.browser.font_increase": "放大：\tCtrl|+",
+  "shortcuts.browser.font_increase.mac": "放大：\t⌘|+",
+  "shortcuts.browser.header": "浏览器自带命令",
+  "shortcuts.browser.highlight_next": "高亮到下一行：\tShift|Down",
+  "shortcuts.browser.highlight_prev": "高亮到上一行：\tShift|Up",
+  "shortcuts.browser.input.header": "在输入栏工作",
+  "shortcuts.browser.newline": "创建新一行：\tShift|Enter",
   "shortcuts.files.header": "文件",
-  "shortcuts.files.upload": "Upload files:\tCtrl|U",
-  "shortcuts.files.upload.mac": "Upload files:\t⌘|U",
+  "shortcuts.files.upload": "上传文件：\tCtrl|U",
+  "shortcuts.files.upload.mac": "上传文件：\t⌘|U",
   "shortcuts.header": "键盘快捷键",
   "shortcuts.info": "Begin a message with / for a list of all the commands at your disposal.",
-  "shortcuts.msgs.comp.channel": "Channel:\t~|[a-z]|Tab",
-  "shortcuts.msgs.comp.emoji": "Emoji:\t:|[a-z]|Tab",
+  "shortcuts.msgs.comp.channel": "频道：\t~|[a-z]|Tab",
+  "shortcuts.msgs.comp.emoji": "表情符：\t:|[a-z]|Tab",
   "shortcuts.msgs.comp.header": "自动完成",
-  "shortcuts.msgs.comp.username": "Username:\t@|[a-z]|Tab",
-  "shortcuts.msgs.edit": "Edit last message in channel:\tUp",
+  "shortcuts.msgs.comp.username": "用户名：\t@|[a-z]|Tab",
+  "shortcuts.msgs.edit": "编辑频道里上一条消息：\tUp",
   "shortcuts.msgs.header": "信息",
-  "shortcuts.msgs.input.header": "Works inside an empty input field",
-  "shortcuts.msgs.mark_as_read": "Mark current channel as read:\tEsc",
+  "shortcuts.msgs.input.header": "在空输入栏工作",
+  "shortcuts.msgs.mark_as_read": "标当前频道为已读：\tEsc",
   "shortcuts.msgs.reply": "Reply to last message in channel:\tShift|Up",
   "shortcuts.msgs.reprint_next": "Reprint next message:\tCtrl|Down",
   "shortcuts.msgs.reprint_next.mac": "Reprint next message:\t⌘|Down",
@@ -2146,27 +2173,28 @@
   "shortcuts.msgs.reprint_prev.mac": "Reprint previous message:\t⌘|Up",
   "shortcuts.nav.direct_messages_menu": "Direct messages menu:\tCtrl|Shift|K",
   "shortcuts.nav.direct_messages_menu.mac": "Direct messages menu:\t⌘|Shift|K",
-  "shortcuts.nav.header": "Navigation",
-  "shortcuts.nav.next": "Next channel:\tAlt|Down",
-  "shortcuts.nav.next.mac": "Next channel:\t⌥|Down",
-  "shortcuts.nav.prev": "Previous channel:\tAlt|Up",
-  "shortcuts.nav.prev.mac": "Previous channel:\t⌥|Up",
+  "shortcuts.nav.header": "导航",
+  "shortcuts.nav.next": "下个频道：\tAlt|Down",
+  "shortcuts.nav.next.mac": "下个频道：\t⌥|Down",
+  "shortcuts.nav.prev": "上个频道：\tAlt|Up",
+  "shortcuts.nav.prev.mac": "上个频道：\t⌥|Up",
   "shortcuts.nav.recent_mentions": "Recent mentions:\tCtrl|Shift|M",
   "shortcuts.nav.recent_mentions.mac": "Recent mentions:\t⌘|Shift|M",
-  "shortcuts.nav.settings": "Account settings:\tCtrl|Shift|A",
-  "shortcuts.nav.settings.mac": "Account settings:\t⌘|Shift|A",
-  "shortcuts.nav.switcher": "Quick channel switcher:\tCtrl|K",
-  "shortcuts.nav.switcher.mac": "Quick channel switcher:\t⌘|K",
-  "shortcuts.nav.unread_next": "Next unread channel:\tAlt|Shift|Down",
-  "shortcuts.nav.unread_next.mac": "Next unread channel:\t⌥|Shift|Down",
-  "shortcuts.nav.unread_prev": "Previous unread channel:\tAlt|Shift|Up",
-  "shortcuts.nav.unread_prev.mac": "Previous unread channel:\t⌥|Shift|Up",
+  "shortcuts.nav.settings": "帐号设定：\tCtrl|Shift|A",
+  "shortcuts.nav.settings.mac": "帐号设定：\t⌘|Shift|A",
+  "shortcuts.nav.switcher": "快速频道切换：\tCtrl|K",
+  "shortcuts.nav.switcher.mac": "快速频道切换：\t⌘|K",
+  "shortcuts.nav.unread_next": "下一个未读频道：\tAlt|Shift|Down",
+  "shortcuts.nav.unread_next.mac": "下一个未读频道：\t⌥|Shift|Down",
+  "shortcuts.nav.unread_prev": "上一个未读频道：\tAlt|Shift|Up",
+  "shortcuts.nav.unread_prev.mac": "上一个未读频道：\t⌥|Shift|Up",
   "sidebar.channels": "公开频道",
   "sidebar.createChannel": "创建公共频道",
   "sidebar.createGroup": "创建私有频道",
   "sidebar.direct": "私信",
   "sidebar.favorite": "我的最爱频道",
-  "sidebar.mainMenu": "Main Menu",
+  "sidebar.leave": "离开频道",
+  "sidebar.mainMenu": "主菜单",
   "sidebar.more": "更多",
   "sidebar.moreElips": "更多...",
   "sidebar.otherMembers": "此团队之外",

assets/base/i18n/zh-TW.json

@@ -9,6 +9,7 @@
   "about.hash": "編譯 Hash：",
   "about.hashee": "企業版編譯 Hash：",
   "about.licensed": "授權給：",
+  "about.notice": "Mattermost is made possible by the open source software used in our <a href=\"https://about.mattermost.com/platform-notice-txt/\" target='_blank'>platform</a>, <a href=\"https://about.mattermost.com/desktop-notice-txt/\" target='_blank'>desktop</a> and <a href=\"https://about.mattermost.com/mobile-notice-txt/\" target='_blank'>mobile</a> apps.",
   "about.number": "編譯序號：",
   "about.teamEditionLearn": "加入 Mattermost 社群：",
   "about.teamEditionSt": "您的團隊溝通皆在同處，隨時隨地皆可搜尋與存取。",
@@ -1297,15 +1298,14 @@
   "claim.email_to_oauth.switchTo": "切換帳號至 {uiType}",
   "claim.email_to_oauth.title": "由電子郵件地址/密碼帳號切換成 {uiType} 帳號",
   "claim.ldap_to_email.confirm": "密碼確認",
-  "claim.ldap_to_email.email": "用電子郵件地址 {email} 登入",
-  "claim.ldap_to_email.enterLdapPwd": "輸入 {site} 電子郵件帳戶的 {ldapPassword}",
-  "claim.ldap_to_email.enterPwd": "輸入電子郵件帳戶新密碼",
+  "claim.ldap_to_email.email": "After switching your authentication method, you will use {email} to login. Your AD/LDAP credentials will no longer allow access to Mattermost.",
+  "claim.ldap_to_email.enterLdapPwd": "{ldapPassword}:",
+  "claim.ldap_to_email.enterPwd": "New email login password:",
   "claim.ldap_to_email.ldapPasswordError": "請輸入 AD/LDAP 密碼。",
   "claim.ldap_to_email.ldapPwd": "AD/LDAP 密碼",
   "claim.ldap_to_email.pwd": "密碼",
   "claim.ldap_to_email.pwdError": "請輸入密碼。",
   "claim.ldap_to_email.pwdNotMatch": "密碼不相符。",
-  "claim.ldap_to_email.ssoType": "設定完成後，將只能用電子郵件地址/密碼登入",
   "claim.ldap_to_email.switchTo": "切換帳戶到電子郵件地址/密碼",
   "claim.ldap_to_email.title": "切換 AD/LDAP 帳戶到電子郵件地址/密碼",
   "claim.oauth_to_email.confirm": "密碼確認",
@@ -1840,6 +1840,7 @@
   "mobile.file_upload.more": "更多",
   "mobile.file_upload.video": "媒體櫃",
   "mobile.help.title": "說明",
+  "mobile.image_preview.save": "Save Image",
   "mobile.intro_messages.DM": "這是跟{teammate}之間直接訊息的起頭。直接訊息跟在這邊分享的檔案除了在此處以外的人都看不到。",
   "mobile.intro_messages.default_message": "這將是團隊成員註冊後第一個看到的頻道，請利用它張貼所有人都應該知道的事項。",
   "mobile.intro_messages.default_welcome": "歡迎來到{name}！",
@@ -2055,6 +2056,7 @@
   "rename_channel.handleHolder": "請用小寫英數字",
   "rename_channel.lowercase": "請用小寫英數字",
   "rename_channel.maxLength": "此欄位必須少於 {maxLength, number} 字",
+  "rename_channel.minLength": "Channel name must be {minLength, number} or more characters",
   "rename_channel.required": "此欄位是必需的",
   "rename_channel.save": "儲存",
   "rename_channel.title": "變更頻道名稱",
@@ -2166,6 +2168,7 @@
   "sidebar.createGroup": "建立私人頻道",
   "sidebar.direct": "直接傳訊",
   "sidebar.favorite": "我的最愛",
+  "sidebar.leave": "離開頻道",
   "sidebar.mainMenu": "Main Menu",
   "sidebar.more": "更多",
   "sidebar.moreElips": "更多...",

fastlane/metadata/android/en-US/full_description.txt

@@ -1,4 +1,4 @@
-Requires Mattermost Server v3.10+. Older servers will not be able to connect. 
+Requires Mattermost Server v4.0+. Older servers will not be able to connect. 
 
 -------
 

ios/Mattermost.xcodeproj/project.pbxproj

@@ -1468,7 +1468,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				ENABLE_BITCODE = NO;
@@ -1507,7 +1507,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				ENABLE_BITCODE = NO;

ios/Mattermost/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>48</string>
+	<string>49</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

ios/MattermostTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>48</string>
+	<string>49</string>
 </dict>
 </plist>

yarn.lock

@@ -3656,7 +3656,7 @@ makeerror@1.0.x:
 
 mattermost-redux@mattermost/mattermost-redux#master:
   version "0.0.1"
-  resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/09be668d27afd13ea9f3618f4c368c0d0a0db485"
+  resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/1afaf513717108b609c4dc677cf49d474624e0ca"
   dependencies:
     deep-equal "1.0.1"
     harmony-reflect "1.5.1"