Merge pull request #19464 from mattermost/fix/weblate-conflicts
Fix/weblate conflicts
Этот коммит содержится в:
@@ -4821,7 +4821,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "web.error.unsupported_browser.min_os_version.windows",
|
"id": "web.error.unsupported_browser.min_os_version.windows",
|
||||||
"translation": "Windows 7+"
|
"translation": "Windows 8.1+"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "web.error.unsupported_browser.min_os_version.mac",
|
"id": "web.error.unsupported_browser.min_os_version.mac",
|
||||||
@@ -4833,7 +4833,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "web.error.unsupported_browser.min_browser_version.firefox",
|
"id": "web.error.unsupported_browser.min_browser_version.firefox",
|
||||||
"translation": "Version 78+"
|
"translation": "Version 91+"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "web.error.unsupported_browser.min_browser_version.edge",
|
"id": "web.error.unsupported_browser.min_browser_version.edge",
|
||||||
|
|||||||
@@ -61,7 +61,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "web.error.unsupported_browser.min_os_version.windows",
|
"id": "web.error.unsupported_browser.min_os_version.windows",
|
||||||
"translation": "Windows 7+"
|
"translation": "Windows 8.1+"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "web.error.unsupported_browser.min_os_version.mac",
|
"id": "web.error.unsupported_browser.min_os_version.mac",
|
||||||
@@ -73,7 +73,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "web.error.unsupported_browser.min_browser_version.firefox",
|
"id": "web.error.unsupported_browser.min_browser_version.firefox",
|
||||||
"translation": "Version 78+"
|
"translation": "Version 91+"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "web.error.unsupported_browser.min_browser_version.edge",
|
"id": "web.error.unsupported_browser.min_browser_version.edge",
|
||||||
@@ -9305,5 +9305,9 @@
|
|||||||
{
|
{
|
||||||
"id": "api.config.migrate_config_restricted.app_error",
|
"id": "api.config.migrate_config_restricted.app_error",
|
||||||
"translation": "Config migration is restricted due to instance type."
|
"translation": "Config migration is restricted due to instance type."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "api.user.authorize_oauth_user.saml_response_too_long.app_error",
|
||||||
|
"translation": "SAML response is too long"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -4801,7 +4801,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "web.error.unsupported_browser.min_os_version.windows",
|
"id": "web.error.unsupported_browser.min_os_version.windows",
|
||||||
"translation": "Windows 7+"
|
"translation": "Windows 8.1+"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "web.error.unsupported_browser.min_os_version.mac",
|
"id": "web.error.unsupported_browser.min_os_version.mac",
|
||||||
@@ -4813,7 +4813,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "web.error.unsupported_browser.min_browser_version.firefox",
|
"id": "web.error.unsupported_browser.min_browser_version.firefox",
|
||||||
"translation": "Versie 78+"
|
"translation": "Versie 91+"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "web.error.unsupported_browser.min_browser_version.edge",
|
"id": "web.error.unsupported_browser.min_browser_version.edge",
|
||||||
@@ -9305,5 +9305,9 @@
|
|||||||
{
|
{
|
||||||
"id": "api.config.migrate_config_restricted.app_error",
|
"id": "api.config.migrate_config_restricted.app_error",
|
||||||
"translation": "Configurariemigratie is beperkt vanwege het type instantie."
|
"translation": "Configurariemigratie is beperkt vanwege het type instantie."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "api.user.authorize_oauth_user.saml_response_too_long.app_error",
|
||||||
|
"translation": "SAML antwoord is te lang"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -4781,7 +4781,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "web.error.unsupported_browser.min_os_version.windows",
|
"id": "web.error.unsupported_browser.min_os_version.windows",
|
||||||
"translation": "Windows 7+"
|
"translation": "Windows 8.1+"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "web.error.unsupported_browser.min_os_version.mac",
|
"id": "web.error.unsupported_browser.min_os_version.mac",
|
||||||
@@ -4793,7 +4793,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "web.error.unsupported_browser.min_browser_version.firefox",
|
"id": "web.error.unsupported_browser.min_browser_version.firefox",
|
||||||
"translation": "Wersja 78+"
|
"translation": "Wersja 91+"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "web.error.unsupported_browser.min_browser_version.edge",
|
"id": "web.error.unsupported_browser.min_browser_version.edge",
|
||||||
@@ -9306,5 +9306,9 @@
|
|||||||
{
|
{
|
||||||
"id": "api.config.migrate_config_restricted.app_error",
|
"id": "api.config.migrate_config_restricted.app_error",
|
||||||
"translation": "Migracja konfiguracji jest ograniczona ze względu na typ instancji."
|
"translation": "Migracja konfiguracji jest ograniczona ze względu na typ instancji."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "api.user.authorize_oauth_user.saml_response_too_long.app_error",
|
||||||
|
"translation": "Odpowiedź SAML jest zbyt długa"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -5897,7 +5897,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "web.error.unsupported_browser.min_browser_version.firefox",
|
"id": "web.error.unsupported_browser.min_browser_version.firefox",
|
||||||
"translation": "Sürüm 78+"
|
"translation": "Sürüm 91+"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "web.error.unsupported_browser.min_browser_version.safari",
|
"id": "web.error.unsupported_browser.min_browser_version.safari",
|
||||||
@@ -5909,7 +5909,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "web.error.unsupported_browser.min_os_version.windows",
|
"id": "web.error.unsupported_browser.min_os_version.windows",
|
||||||
"translation": "Windows 7+"
|
"translation": "Windows 8.1+"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "web.error.unsupported_browser.no_longer_support_version",
|
"id": "web.error.unsupported_browser.no_longer_support_version",
|
||||||
@@ -9305,5 +9305,9 @@
|
|||||||
{
|
{
|
||||||
"id": "api.config.migrate_config_restricted.app_error",
|
"id": "api.config.migrate_config_restricted.app_error",
|
||||||
"translation": "Kopya türü nedeniyle yapılandırma aktarımı kısıtlı."
|
"translation": "Kopya türü nedeniyle yapılandırma aktarımı kısıtlı."
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "api.user.authorize_oauth_user.saml_response_too_long.app_error",
|
||||||
|
"translation": "SAML yanıtı çok uzun"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user