diff --git a/i18next/common.babel b/i18next/common.babel
index 1b06d9387a..beac5421ed 100644
--- a/i18next/common.babel
+++ b/i18next/common.babel
@@ -814,6 +814,138 @@
+
+ ActionRequired
+
+
+
+
+
+ ar-SA
+ false
+
+
+ az-Latn-AZ
+ false
+
+
+ bg-BG
+ false
+
+
+ cs-CZ
+ false
+
+
+ de-DE
+ false
+
+
+ el-GR
+ false
+
+
+ en-US
+ false
+
+
+ es-ES
+ false
+
+
+ fi-FI
+ false
+
+
+ fr-FR
+ false
+
+
+ hy-AM
+ false
+
+
+ it-IT
+ false
+
+
+ ja-JP
+ false
+
+
+ ko-KR
+ false
+
+
+ lo-LA
+ false
+
+
+ lv-LV
+ false
+
+
+ nl-NL
+ false
+
+
+ pl-PL
+ false
+
+
+ pt-BR
+ false
+
+
+ pt-PT
+ false
+
+
+ ro-RO
+ false
+
+
+ ru-RU
+ false
+
+
+ si-SI
+ false
+
+
+ sk-SK
+ false
+
+
+ sl-SI
+ false
+
+
+ sr-Cyrl-RS
+ false
+
+
+ sr-Latn-RS
+ false
+
+
+ tr-TR
+ false
+
+
+ uk-UA
+ false
+
+
+ vi-VN
+ false
+
+
+ zh-CN
+ false
+
+
+
Actions
@@ -7282,270 +7414,6 @@
-
- ConflictResolveDescription
-
-
-
-
-
- ar-SA
- false
-
-
- az-Latn-AZ
- false
-
-
- bg-BG
- false
-
-
- cs-CZ
- false
-
-
- de-DE
- false
-
-
- el-GR
- false
-
-
- en-US
- false
-
-
- es-ES
- false
-
-
- fi-FI
- false
-
-
- fr-FR
- false
-
-
- hy-AM
- false
-
-
- it-IT
- false
-
-
- ja-JP
- false
-
-
- ko-KR
- false
-
-
- lo-LA
- false
-
-
- lv-LV
- false
-
-
- nl-NL
- false
-
-
- pl-PL
- false
-
-
- pt-BR
- false
-
-
- pt-PT
- false
-
-
- ro-RO
- false
-
-
- ru-RU
- false
-
-
- si-SI
- false
-
-
- sk-SK
- false
-
-
- sl-SI
- false
-
-
- sr-Cyrl-RS
- false
-
-
- sr-Latn-RS
- false
-
-
- tr-TR
- false
-
-
- uk-UA
- false
-
-
- vi-VN
- false
-
-
- zh-CN
- false
-
-
-
-
- ConflictResolveDescriptionFiles
-
-
-
-
-
- ar-SA
- false
-
-
- az-Latn-AZ
- false
-
-
- bg-BG
- false
-
-
- cs-CZ
- false
-
-
- de-DE
- false
-
-
- el-GR
- false
-
-
- en-US
- false
-
-
- es-ES
- false
-
-
- fi-FI
- false
-
-
- fr-FR
- false
-
-
- hy-AM
- false
-
-
- it-IT
- false
-
-
- ja-JP
- false
-
-
- ko-KR
- false
-
-
- lo-LA
- false
-
-
- lv-LV
- false
-
-
- nl-NL
- false
-
-
- pl-PL
- false
-
-
- pt-BR
- false
-
-
- pt-PT
- false
-
-
- ro-RO
- false
-
-
- ru-RU
- false
-
-
- si-SI
- false
-
-
- sk-SK
- false
-
-
- sl-SI
- false
-
-
- sr-Cyrl-RS
- false
-
-
- sr-Latn-RS
- false
-
-
- tr-TR
- false
-
-
- uk-UA
- false
-
-
- vi-VN
- false
-
-
- zh-CN
- false
-
-
-
ConflictResolveSelectAction
@@ -7678,138 +7546,6 @@
-
- ConflictResolveTitle
-
-
-
-
-
- ar-SA
- false
-
-
- az-Latn-AZ
- false
-
-
- bg-BG
- false
-
-
- cs-CZ
- false
-
-
- de-DE
- false
-
-
- el-GR
- false
-
-
- en-US
- false
-
-
- es-ES
- false
-
-
- fi-FI
- false
-
-
- fr-FR
- false
-
-
- hy-AM
- false
-
-
- it-IT
- false
-
-
- ja-JP
- false
-
-
- ko-KR
- false
-
-
- lo-LA
- false
-
-
- lv-LV
- false
-
-
- nl-NL
- false
-
-
- pl-PL
- false
-
-
- pt-BR
- false
-
-
- pt-PT
- false
-
-
- ro-RO
- false
-
-
- ru-RU
- false
-
-
- si-SI
- false
-
-
- sk-SK
- false
-
-
- sl-SI
- false
-
-
- sr-Cyrl-RS
- false
-
-
- sr-Latn-RS
- false
-
-
- tr-TR
- false
-
-
- uk-UA
- false
-
-
- vi-VN
- false
-
-
- zh-CN
- false
-
-
-
Connect
@@ -8602,6 +8338,270 @@
+
+ CopyAndKeepAll
+
+
+
+
+
+ ar-SA
+ false
+
+
+ az-Latn-AZ
+ false
+
+
+ bg-BG
+ false
+
+
+ cs-CZ
+ false
+
+
+ de-DE
+ false
+
+
+ el-GR
+ false
+
+
+ en-US
+ false
+
+
+ es-ES
+ false
+
+
+ fi-FI
+ false
+
+
+ fr-FR
+ false
+
+
+ hy-AM
+ false
+
+
+ it-IT
+ false
+
+
+ ja-JP
+ false
+
+
+ ko-KR
+ false
+
+
+ lo-LA
+ false
+
+
+ lv-LV
+ false
+
+
+ nl-NL
+ false
+
+
+ pl-PL
+ false
+
+
+ pt-BR
+ false
+
+
+ pt-PT
+ false
+
+
+ ro-RO
+ false
+
+
+ ru-RU
+ false
+
+
+ si-SI
+ false
+
+
+ sk-SK
+ false
+
+
+ sl-SI
+ false
+
+
+ sr-Cyrl-RS
+ false
+
+
+ sr-Latn-RS
+ false
+
+
+ tr-TR
+ false
+
+
+ uk-UA
+ false
+
+
+ vi-VN
+ false
+
+
+ zh-CN
+ false
+
+
+
+
+ CopyAndKeepBothFolders
+
+
+
+
+
+ ar-SA
+ false
+
+
+ az-Latn-AZ
+ false
+
+
+ bg-BG
+ false
+
+
+ cs-CZ
+ false
+
+
+ de-DE
+ false
+
+
+ el-GR
+ false
+
+
+ en-US
+ false
+
+
+ es-ES
+ false
+
+
+ fi-FI
+ false
+
+
+ fr-FR
+ false
+
+
+ hy-AM
+ false
+
+
+ it-IT
+ false
+
+
+ ja-JP
+ false
+
+
+ ko-KR
+ false
+
+
+ lo-LA
+ false
+
+
+ lv-LV
+ false
+
+
+ nl-NL
+ false
+
+
+ pl-PL
+ false
+
+
+ pt-BR
+ false
+
+
+ pt-PT
+ false
+
+
+ ro-RO
+ false
+
+
+ ru-RU
+ false
+
+
+ si-SI
+ false
+
+
+ sk-SK
+ false
+
+
+ sl-SI
+ false
+
+
+ sr-Cyrl-RS
+ false
+
+
+ sr-Latn-RS
+ false
+
+
+ tr-TR
+ false
+
+
+ uk-UA
+ false
+
+
+ vi-VN
+ false
+
+
+ zh-CN
+ false
+
+
+
CopyHere
@@ -9790,6 +9790,138 @@
+
+ CreateFolderDescription
+
+
+
+
+
+ ar-SA
+ false
+
+
+ az-Latn-AZ
+ false
+
+
+ bg-BG
+ false
+
+
+ cs-CZ
+ false
+
+
+ de-DE
+ false
+
+
+ el-GR
+ false
+
+
+ en-US
+ false
+
+
+ es-ES
+ false
+
+
+ fi-FI
+ false
+
+
+ fr-FR
+ false
+
+
+ hy-AM
+ false
+
+
+ it-IT
+ false
+
+
+ ja-JP
+ false
+
+
+ ko-KR
+ false
+
+
+ lo-LA
+ false
+
+
+ lv-LV
+ false
+
+
+ nl-NL
+ false
+
+
+ pl-PL
+ false
+
+
+ pt-BR
+ false
+
+
+ pt-PT
+ false
+
+
+ ro-RO
+ false
+
+
+ ru-RU
+ false
+
+
+ si-SI
+ false
+
+
+ sk-SK
+ false
+
+
+ sl-SI
+ false
+
+
+ sr-Cyrl-RS
+ false
+
+
+ sr-Latn-RS
+ false
+
+
+ tr-TR
+ false
+
+
+ uk-UA
+ false
+
+
+ vi-VN
+ false
+
+
+ zh-CN
+ false
+
+
+
CreateFormFillingRoom
@@ -21274,6 +21406,138 @@
+
+ EnterPasswordDescription
+
+
+
+
+
+ ar-SA
+ false
+
+
+ az-Latn-AZ
+ false
+
+
+ bg-BG
+ false
+
+
+ cs-CZ
+ false
+
+
+ de-DE
+ false
+
+
+ el-GR
+ false
+
+
+ en-US
+ false
+
+
+ es-ES
+ false
+
+
+ fi-FI
+ false
+
+
+ fr-FR
+ false
+
+
+ hy-AM
+ false
+
+
+ it-IT
+ false
+
+
+ ja-JP
+ false
+
+
+ ko-KR
+ false
+
+
+ lo-LA
+ false
+
+
+ lv-LV
+ false
+
+
+ nl-NL
+ false
+
+
+ pl-PL
+ false
+
+
+ pt-BR
+ false
+
+
+ pt-PT
+ false
+
+
+ ro-RO
+ false
+
+
+ ru-RU
+ false
+
+
+ si-SI
+ false
+
+
+ sk-SK
+ false
+
+
+ sl-SI
+ false
+
+
+ sr-Cyrl-RS
+ false
+
+
+ sr-Latn-RS
+ false
+
+
+ tr-TR
+ false
+
+
+ uk-UA
+ false
+
+
+ vi-VN
+ false
+
+
+ zh-CN
+ false
+
+
+
Error
@@ -24310,6 +24574,534 @@
+
+ FileActionRequired
+
+
+
+
+
+ ar-SA
+ false
+
+
+ az-Latn-AZ
+ false
+
+
+ bg-BG
+ false
+
+
+ cs-CZ
+ false
+
+
+ de-DE
+ false
+
+
+ el-GR
+ false
+
+
+ en-US
+ false
+
+
+ es-ES
+ false
+
+
+ fi-FI
+ false
+
+
+ fr-FR
+ false
+
+
+ hy-AM
+ false
+
+
+ it-IT
+ false
+
+
+ ja-JP
+ false
+
+
+ ko-KR
+ false
+
+
+ lo-LA
+ false
+
+
+ lv-LV
+ false
+
+
+ nl-NL
+ false
+
+
+ pl-PL
+ false
+
+
+ pt-BR
+ false
+
+
+ pt-PT
+ false
+
+
+ ro-RO
+ false
+
+
+ ru-RU
+ false
+
+
+ si-SI
+ false
+
+
+ sk-SK
+ false
+
+
+ sl-SI
+ false
+
+
+ sr-Cyrl-RS
+ false
+
+
+ sr-Latn-RS
+ false
+
+
+ tr-TR
+ false
+
+
+ uk-UA
+ false
+
+
+ vi-VN
+ false
+
+
+ zh-CN
+ false
+
+
+
+
+ FilesAlreadyContains
+
+
+
+
+
+ ar-SA
+ false
+
+
+ az-Latn-AZ
+ false
+
+
+ bg-BG
+ false
+
+
+ cs-CZ
+ false
+
+
+ de-DE
+ false
+
+
+ el-GR
+ false
+
+
+ en-US
+ false
+
+
+ es-ES
+ false
+
+
+ fi-FI
+ false
+
+
+ fr-FR
+ false
+
+
+ hy-AM
+ false
+
+
+ it-IT
+ false
+
+
+ ja-JP
+ false
+
+
+ ko-KR
+ false
+
+
+ lo-LA
+ false
+
+
+ lv-LV
+ false
+
+
+ nl-NL
+ false
+
+
+ pl-PL
+ false
+
+
+ pt-BR
+ false
+
+
+ pt-PT
+ false
+
+
+ ro-RO
+ false
+
+
+ ru-RU
+ false
+
+
+ si-SI
+ false
+
+
+ sk-SK
+ false
+
+
+ sl-SI
+ false
+
+
+ sr-Cyrl-RS
+ false
+
+
+ sr-Latn-RS
+ false
+
+
+ tr-TR
+ false
+
+
+ uk-UA
+ false
+
+
+ vi-VN
+ false
+
+
+ zh-CN
+ false
+
+
+
+
+ FilesAndFoldersAlreadyContains
+
+
+
+
+
+ ar-SA
+ false
+
+
+ az-Latn-AZ
+ false
+
+
+ bg-BG
+ false
+
+
+ cs-CZ
+ false
+
+
+ de-DE
+ false
+
+
+ el-GR
+ false
+
+
+ en-US
+ false
+
+
+ es-ES
+ false
+
+
+ fi-FI
+ false
+
+
+ fr-FR
+ false
+
+
+ hy-AM
+ false
+
+
+ it-IT
+ false
+
+
+ ja-JP
+ false
+
+
+ ko-KR
+ false
+
+
+ lo-LA
+ false
+
+
+ lv-LV
+ false
+
+
+ nl-NL
+ false
+
+
+ pl-PL
+ false
+
+
+ pt-BR
+ false
+
+
+ pt-PT
+ false
+
+
+ ro-RO
+ false
+
+
+ ru-RU
+ false
+
+
+ si-SI
+ false
+
+
+ sk-SK
+ false
+
+
+ sl-SI
+ false
+
+
+ sr-Cyrl-RS
+ false
+
+
+ sr-Latn-RS
+ false
+
+
+ tr-TR
+ false
+
+
+ uk-UA
+ false
+
+
+ vi-VN
+ false
+
+
+ zh-CN
+ false
+
+
+
+
+ FilesAndFolderWillNotBeCopied
+
+
+
+
+
+ ar-SA
+ false
+
+
+ az-Latn-AZ
+ false
+
+
+ bg-BG
+ false
+
+
+ cs-CZ
+ false
+
+
+ de-DE
+ false
+
+
+ el-GR
+ false
+
+
+ en-US
+ false
+
+
+ es-ES
+ false
+
+
+ fi-FI
+ false
+
+
+ fr-FR
+ false
+
+
+ hy-AM
+ false
+
+
+ it-IT
+ false
+
+
+ ja-JP
+ false
+
+
+ ko-KR
+ false
+
+
+ lo-LA
+ false
+
+
+ lv-LV
+ false
+
+
+ nl-NL
+ false
+
+
+ pl-PL
+ false
+
+
+ pt-BR
+ false
+
+
+ pt-PT
+ false
+
+
+ ro-RO
+ false
+
+
+ ru-RU
+ false
+
+
+ si-SI
+ false
+
+
+ sk-SK
+ false
+
+
+ sl-SI
+ false
+
+
+ sr-Cyrl-RS
+ false
+
+
+ sr-Latn-RS
+ false
+
+
+ tr-TR
+ false
+
+
+ uk-UA
+ false
+
+
+ vi-VN
+ false
+
+
+ zh-CN
+ false
+
+
+
FillFormButton
@@ -25102,6 +25894,402 @@
+
+ FolderActionRequired
+
+
+
+
+
+ ar-SA
+ false
+
+
+ az-Latn-AZ
+ false
+
+
+ bg-BG
+ false
+
+
+ cs-CZ
+ false
+
+
+ de-DE
+ false
+
+
+ el-GR
+ false
+
+
+ en-US
+ false
+
+
+ es-ES
+ false
+
+
+ fi-FI
+ false
+
+
+ fr-FR
+ false
+
+
+ hy-AM
+ false
+
+
+ it-IT
+ false
+
+
+ ja-JP
+ false
+
+
+ ko-KR
+ false
+
+
+ lo-LA
+ false
+
+
+ lv-LV
+ false
+
+
+ nl-NL
+ false
+
+
+ pl-PL
+ false
+
+
+ pt-BR
+ false
+
+
+ pt-PT
+ false
+
+
+ ro-RO
+ false
+
+
+ ru-RU
+ false
+
+
+ si-SI
+ false
+
+
+ sk-SK
+ false
+
+
+ sl-SI
+ false
+
+
+ sr-Cyrl-RS
+ false
+
+
+ sr-Latn-RS
+ false
+
+
+ tr-TR
+ false
+
+
+ uk-UA
+ false
+
+
+ vi-VN
+ false
+
+
+ zh-CN
+ false
+
+
+
+
+ FoldersAlreadyContains
+
+
+
+
+
+ ar-SA
+ false
+
+
+ az-Latn-AZ
+ false
+
+
+ bg-BG
+ false
+
+
+ cs-CZ
+ false
+
+
+ de-DE
+ false
+
+
+ el-GR
+ false
+
+
+ en-US
+ false
+
+
+ es-ES
+ false
+
+
+ fi-FI
+ false
+
+
+ fr-FR
+ false
+
+
+ hy-AM
+ false
+
+
+ it-IT
+ false
+
+
+ ja-JP
+ false
+
+
+ ko-KR
+ false
+
+
+ lo-LA
+ false
+
+
+ lv-LV
+ false
+
+
+ nl-NL
+ false
+
+
+ pl-PL
+ false
+
+
+ pt-BR
+ false
+
+
+ pt-PT
+ false
+
+
+ ro-RO
+ false
+
+
+ ru-RU
+ false
+
+
+ si-SI
+ false
+
+
+ sk-SK
+ false
+
+
+ sl-SI
+ false
+
+
+ sr-Cyrl-RS
+ false
+
+
+ sr-Latn-RS
+ false
+
+
+ tr-TR
+ false
+
+
+ uk-UA
+ false
+
+
+ vi-VN
+ false
+
+
+ zh-CN
+ false
+
+
+
+
+ FoldersAndFilesWillBeCopied
+
+
+
+
+
+ ar-SA
+ false
+
+
+ az-Latn-AZ
+ false
+
+
+ bg-BG
+ false
+
+
+ cs-CZ
+ false
+
+
+ de-DE
+ false
+
+
+ el-GR
+ false
+
+
+ en-US
+ false
+
+
+ es-ES
+ false
+
+
+ fi-FI
+ false
+
+
+ fr-FR
+ false
+
+
+ hy-AM
+ false
+
+
+ it-IT
+ false
+
+
+ ja-JP
+ false
+
+
+ ko-KR
+ false
+
+
+ lo-LA
+ false
+
+
+ lv-LV
+ false
+
+
+ nl-NL
+ false
+
+
+ pl-PL
+ false
+
+
+ pt-BR
+ false
+
+
+ pt-PT
+ false
+
+
+ ro-RO
+ false
+
+
+ ru-RU
+ false
+
+
+ si-SI
+ false
+
+
+ sk-SK
+ false
+
+
+ sl-SI
+ false
+
+
+ sr-Cyrl-RS
+ false
+
+
+ sr-Latn-RS
+ false
+
+
+ tr-TR
+ false
+
+
+ uk-UA
+ false
+
+
+ vi-VN
+ false
+
+
+ zh-CN
+ false
+
+
+
FormFilingRoomDescription
@@ -35002,6 +36190,402 @@
+
+ MergeAndOverwrite
+
+
+
+
+
+ ar-SA
+ false
+
+
+ az-Latn-AZ
+ false
+
+
+ bg-BG
+ false
+
+
+ cs-CZ
+ false
+
+
+ de-DE
+ false
+
+
+ el-GR
+ false
+
+
+ en-US
+ false
+
+
+ es-ES
+ false
+
+
+ fi-FI
+ false
+
+
+ fr-FR
+ false
+
+
+ hy-AM
+ false
+
+
+ it-IT
+ false
+
+
+ ja-JP
+ false
+
+
+ ko-KR
+ false
+
+
+ lo-LA
+ false
+
+
+ lv-LV
+ false
+
+
+ nl-NL
+ false
+
+
+ pl-PL
+ false
+
+
+ pt-BR
+ false
+
+
+ pt-PT
+ false
+
+
+ ro-RO
+ false
+
+
+ ru-RU
+ false
+
+
+ si-SI
+ false
+
+
+ sk-SK
+ false
+
+
+ sl-SI
+ false
+
+
+ sr-Cyrl-RS
+ false
+
+
+ sr-Latn-RS
+ false
+
+
+ tr-TR
+ false
+
+
+ uk-UA
+ false
+
+
+ vi-VN
+ false
+
+
+ zh-CN
+ false
+
+
+
+
+ MergeFolders
+
+
+
+
+
+ ar-SA
+ false
+
+
+ az-Latn-AZ
+ false
+
+
+ bg-BG
+ false
+
+
+ cs-CZ
+ false
+
+
+ de-DE
+ false
+
+
+ el-GR
+ false
+
+
+ en-US
+ false
+
+
+ es-ES
+ false
+
+
+ fi-FI
+ false
+
+
+ fr-FR
+ false
+
+
+ hy-AM
+ false
+
+
+ it-IT
+ false
+
+
+ ja-JP
+ false
+
+
+ ko-KR
+ false
+
+
+ lo-LA
+ false
+
+
+ lv-LV
+ false
+
+
+ nl-NL
+ false
+
+
+ pl-PL
+ false
+
+
+ pt-BR
+ false
+
+
+ pt-PT
+ false
+
+
+ ro-RO
+ false
+
+
+ ru-RU
+ false
+
+
+ si-SI
+ false
+
+
+ sk-SK
+ false
+
+
+ sl-SI
+ false
+
+
+ sr-Cyrl-RS
+ false
+
+
+ sr-Latn-RS
+ false
+
+
+ tr-TR
+ false
+
+
+ uk-UA
+ false
+
+
+ vi-VN
+ false
+
+
+ zh-CN
+ false
+
+
+
+
+ MergeFoldersDescription
+
+
+
+
+
+ ar-SA
+ false
+
+
+ az-Latn-AZ
+ false
+
+
+ bg-BG
+ false
+
+
+ cs-CZ
+ false
+
+
+ de-DE
+ false
+
+
+ el-GR
+ false
+
+
+ en-US
+ false
+
+
+ es-ES
+ false
+
+
+ fi-FI
+ false
+
+
+ fr-FR
+ false
+
+
+ hy-AM
+ false
+
+
+ it-IT
+ false
+
+
+ ja-JP
+ false
+
+
+ ko-KR
+ false
+
+
+ lo-LA
+ false
+
+
+ lv-LV
+ false
+
+
+ nl-NL
+ false
+
+
+ pl-PL
+ false
+
+
+ pt-BR
+ false
+
+
+ pt-PT
+ false
+
+
+ ro-RO
+ false
+
+
+ ru-RU
+ false
+
+
+ si-SI
+ false
+
+
+ sk-SK
+ false
+
+
+ sl-SI
+ false
+
+
+ sr-Cyrl-RS
+ false
+
+
+ sr-Latn-RS
+ false
+
+
+ tr-TR
+ false
+
+
+ uk-UA
+ false
+
+
+ vi-VN
+ false
+
+
+ zh-CN
+ false
+
+
+
MobileAndroid
@@ -36322,6 +37906,138 @@
+
+ MultiplyOverwrite
+
+
+
+
+
+ ar-SA
+ false
+
+
+ az-Latn-AZ
+ false
+
+
+ bg-BG
+ false
+
+
+ cs-CZ
+ false
+
+
+ de-DE
+ false
+
+
+ el-GR
+ false
+
+
+ en-US
+ false
+
+
+ es-ES
+ false
+
+
+ fi-FI
+ false
+
+
+ fr-FR
+ false
+
+
+ hy-AM
+ false
+
+
+ it-IT
+ false
+
+
+ ja-JP
+ false
+
+
+ ko-KR
+ false
+
+
+ lo-LA
+ false
+
+
+ lv-LV
+ false
+
+
+ nl-NL
+ false
+
+
+ pl-PL
+ false
+
+
+ pt-BR
+ false
+
+
+ pt-PT
+ false
+
+
+ ro-RO
+ false
+
+
+ ru-RU
+ false
+
+
+ si-SI
+ false
+
+
+ sk-SK
+ false
+
+
+ sl-SI
+ false
+
+
+ sr-Cyrl-RS
+ false
+
+
+ sr-Latn-RS
+ false
+
+
+ tr-TR
+ false
+
+
+ uk-UA
+ false
+
+
+ vi-VN
+ false
+
+
+ zh-CN
+ false
+
+
+
MyDocuments
@@ -41470,6 +43186,138 @@
+
+ PasswordRequired
+
+
+
+
+
+ ar-SA
+ false
+
+
+ az-Latn-AZ
+ false
+
+
+ bg-BG
+ false
+
+
+ cs-CZ
+ false
+
+
+ de-DE
+ false
+
+
+ el-GR
+ false
+
+
+ en-US
+ false
+
+
+ es-ES
+ false
+
+
+ fi-FI
+ false
+
+
+ fr-FR
+ false
+
+
+ hy-AM
+ false
+
+
+ it-IT
+ false
+
+
+ ja-JP
+ false
+
+
+ ko-KR
+ false
+
+
+ lo-LA
+ false
+
+
+ lv-LV
+ false
+
+
+ nl-NL
+ false
+
+
+ pl-PL
+ false
+
+
+ pt-BR
+ false
+
+
+ pt-PT
+ false
+
+
+ ro-RO
+ false
+
+
+ ru-RU
+ false
+
+
+ si-SI
+ false
+
+
+ sk-SK
+ false
+
+
+ sl-SI
+ false
+
+
+ sr-Cyrl-RS
+ false
+
+
+ sr-Latn-RS
+ false
+
+
+ tr-TR
+ false
+
+
+ uk-UA
+ false
+
+
+ vi-VN
+ false
+
+
+ zh-CN
+ false
+
+
+
PaymentsTitle
@@ -57574,6 +59422,138 @@
+
+ SkipFolderDescription
+
+
+
+
+
+ ar-SA
+ false
+
+
+ az-Latn-AZ
+ false
+
+
+ bg-BG
+ false
+
+
+ cs-CZ
+ false
+
+
+ de-DE
+ false
+
+
+ el-GR
+ false
+
+
+ en-US
+ false
+
+
+ es-ES
+ false
+
+
+ fi-FI
+ false
+
+
+ fr-FR
+ false
+
+
+ hy-AM
+ false
+
+
+ it-IT
+ false
+
+
+ ja-JP
+ false
+
+
+ ko-KR
+ false
+
+
+ lo-LA
+ false
+
+
+ lv-LV
+ false
+
+
+ nl-NL
+ false
+
+
+ pl-PL
+ false
+
+
+ pt-BR
+ false
+
+
+ pt-PT
+ false
+
+
+ ro-RO
+ false
+
+
+ ru-RU
+ false
+
+
+ si-SI
+ false
+
+
+ sk-SK
+ false
+
+
+ sl-SI
+ false
+
+
+ sr-Cyrl-RS
+ false
+
+
+ sr-Latn-RS
+ false
+
+
+ tr-TR
+ false
+
+
+ uk-UA
+ false
+
+
+ vi-VN
+ false
+
+
+ zh-CN
+ false
+
+
+
SkipTitle
diff --git a/packages/client/src/pages/Confirm/sub-components/createUser.js b/packages/client/src/pages/Confirm/sub-components/createUser.js
index 0db86fc8c9..560928f164 100644
--- a/packages/client/src/pages/Confirm/sub-components/createUser.js
+++ b/packages/client/src/pages/Confirm/sub-components/createUser.js
@@ -320,7 +320,9 @@ const CreateUserForm = (props) => {
culture: currentCultureName,
};
- signupOAuth(signupAccount)
+ const confirmKey = linkData.confirmHeader;
+
+ signupOAuth(signupAccount, confirmKey)
.then(() => {
const url = roomData.roomId
? `/rooms/shared/${roomData.roomId}/filter?folder=${roomData.roomId}/`
diff --git a/packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js b/packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
index 76b188ceb9..2e65b2b9eb 100644
--- a/packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
+++ b/packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
@@ -379,6 +379,7 @@ class FilesTableHeader extends React.Component {
columnInfoPanelStorageName,
sortBy,
sortOrder,
+ isRecentTab,
});
} else {
this.state = {
@@ -388,6 +389,7 @@ class FilesTableHeader extends React.Component {
columnInfoPanelStorageName,
sortBy,
sortOrder,
+ isRecentTab,
};
}
};
@@ -447,7 +449,7 @@ class FilesTableHeader extends React.Component {
isTrashFolder !== prevProps.isTrashFolder ||
columnStorageName !== prevProps.columnStorageName ||
columnInfoPanelStorageName !== prevProps.columnInfoPanelStorageName ||
- isRecentTab !== prevProps.isRecentTab ||
+ isRecentTab !== this.state.isRecentTab ||
showStorageInfo !== prevProps.showStorageInfo ||
sortBy !== this.state.sortBy ||
sortOrder !== this.state.sortOrder
diff --git a/packages/shared/api/people/index.ts b/packages/shared/api/people/index.ts
index b64cfcf53f..2a994e3f1c 100644
--- a/packages/shared/api/people/index.ts
+++ b/packages/shared/api/people/index.ts
@@ -346,12 +346,16 @@ export function linkOAuth(serializedProfile) {
});
}
-export function signupOAuth(signupAccount) {
- return request({
+export function signupOAuth(signupAccount, confirmKey = null) {
+ const options = {
method: "post",
url: "people/thirdparty/signup",
data: signupAccount,
- });
+ };
+
+ if (confirmKey) options.headers = { confirm: confirmKey };
+
+ return request(options);
}
export function unlinkOAuth(provider) {
diff --git a/public/locales/ar-SA/Common.json b/public/locales/ar-SA/Common.json
index a4c8401b4d..a35d878a9e 100644
--- a/public/locales/ar-SA/Common.json
+++ b/public/locales/ar-SA/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "الملفات المشتركة",
"CompanyName": "اسم الشركة",
"Confirmation": "تأكيد",
- "ConflictResolveDescription": "الملف الذي يحمل الاسم <1>{{file}} موجود بالفعل في المجلد <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} المستندات التي تحمل الاسم نفسه موجودة بالفعل في المجلد <1> {{folder}} .",
"ConflictResolveSelectAction": "الرجاء تحديد الإجراء:",
- "ConflictResolveTitle": "تأكيد الكتابة",
"Connect": "ربط",
"Content": "المحتوى",
"Context": "السياق",
diff --git a/public/locales/az/Common.json b/public/locales/az/Common.json
index 079e3218f0..6939190a01 100644
--- a/public/locales/az/Common.json
+++ b/public/locales/az/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Ümumi fayllar",
"CompanyName": "Şirkət adı",
"Confirmation": "Təsdiqləmə",
- "ConflictResolveDescription": "<1>{{file}} adlı fayl artıq <1>{{folder}} qovluğunda mövcuddur. ",
- "ConflictResolveDescriptionFiles": "{{filesCount}} sənəd sayı artıq <1>{{folder}} qovluğunda mövcuddur.",
"ConflictResolveSelectAction": "Xahiş edirik əməliyyatı seçin:",
- "ConflictResolveTitle": "Üzərinə yazmanın təsdiqlənməsi",
"Connect": "Qoşulmaq",
"Content": "Kontent",
"Context": "Kontekst",
diff --git a/public/locales/bg/Common.json b/public/locales/bg/Common.json
index 951f30caf5..41cec76f26 100644
--- a/public/locales/bg/Common.json
+++ b/public/locales/bg/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Общи файлове",
"CompanyName": "Име на фирмата",
"Confirmation": "Потвърждение",
- "ConflictResolveDescription": "Файл с име <1>{{file}} вече съществува в папка <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} документа с едно и също име вече съществуват в папката <1>{{folder}}.",
"ConflictResolveSelectAction": "Моля, изберете действие:",
- "ConflictResolveTitle": "Потвърждение за презаписване",
"Connect": "Свържи",
"Content": "Съдържание",
"Context": "Контекст",
diff --git a/public/locales/cs/Common.json b/public/locales/cs/Common.json
index 9e708c667c..b0f22bc91e 100644
--- a/public/locales/cs/Common.json
+++ b/public/locales/cs/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Společné soubory",
"CompanyName": "Název společnosti",
"Confirmation": "Potvrzení",
- "ConflictResolveDescription": "Soubor s názvem <1>{{file}} již existuje ve složce <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "Ve složce <1>{{folder}} již existuje {{filesCount}} dokumentů se stejným názvem.",
"ConflictResolveSelectAction": "Prosím, vyberte akci:",
- "ConflictResolveTitle": "Potvrzení o přepsání",
"Connect": "Připojit",
"Content": "Obsah",
"Context": "Kontext",
diff --git a/public/locales/de/Common.json b/public/locales/de/Common.json
index 56fc4cd80b..37a8ef0488 100644
--- a/public/locales/de/Common.json
+++ b/public/locales/de/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Gemeinsame Dateien",
"CompanyName": "Name des Unternehmens",
"Confirmation": "Bestätigung",
- "ConflictResolveDescription": "Die Datei <1>{{file}} existiert bereits im Ordner <1>{{folder}}",
- "ConflictResolveDescriptionFiles": "im Ordner <1>{{folder}} sind bereits {{filesCount}} Dokumente mit dem gleichen Namen vorhanden.",
"ConflictResolveSelectAction": "Bitte wählen Sie die Aktion aus:",
- "ConflictResolveTitle": "Bestätigung überschreiben",
"Connect": "Verbinden",
"Content": "Inhalt",
"Context": "Kontext",
diff --git a/public/locales/el-GR/Common.json b/public/locales/el-GR/Common.json
index 1fbb51f66f..9532fd27ac 100644
--- a/public/locales/el-GR/Common.json
+++ b/public/locales/el-GR/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Κοινά αρχε",
"CompanyName": "Όνομα εταιρείας",
"Confirmation": "Επιβεβαίωση",
- "ConflictResolveDescription": "Το αρχείο με το όνομα <1>{{file}} υπάρχει ήδη στον φάκελο <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} έγγραφα με το ίδιο όνομα υπάρχουν ήδη στον φάκελο <1>{{folder}}.",
"ConflictResolveSelectAction": "Επιλέξτε την ενέργεια",
- "ConflictResolveTitle": "Επιβεβαίωση αντικατάστασης",
"Connect": "Σύνδεση",
"Content": "Περιεχόμενο",
"Context": "Συμφραζόμενα",
diff --git a/public/locales/en/Common.json b/public/locales/en/Common.json
index 7ae991a9fb..0a27ee1c01 100644
--- a/public/locales/en/Common.json
+++ b/public/locales/en/Common.json
@@ -5,6 +5,7 @@
"AccessRights": "Access rights",
"Accounts": "Accounts",
"Action": "Action",
+ "ActionRequired": "Action required",
"Actions": "Actions",
"Activate": "Activate",
"Active": "Active",
@@ -54,22 +55,15 @@
"CommonFiles": "Common files",
"CompanyName": "Company name",
"Confirmation": "Confirmation",
- "ConflictResolveDescription": "The file with the name <1>{{file}} already exists in the folder <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} documents with the same name already exist in the folder <1>{{folder}}.",
"ConflictResolveSelectAction": "Please select the action:",
- "ConflictResolveTitle": "Overwrite confirmation",
- "ActionRequired": "Action required",
- "FileActionRequired": "The destination already contains a file named «<1>{{fileName}}».",
- "FolderActionRequired": "The destination already contains a folder named «<1>{{folderName}}».",
- "FilesAlreadyContains": "The destination already contains files with the same name.",
- "FoldersAlreadyContains": "The destination already contains folders with the same name.",
- "FilesAndFoldersAlreadyContains": "The destination already contains files and folders with the same name.",
"Connect": "Connect",
"Content": "Content",
"Context": "Context",
"ContinueButton": "Continue",
"ContinueWith": "Continue with",
"Copy": "Copy",
+ "CopyAndKeepAll": "Copy and keep all",
+ "CopyAndKeepBothFolders": "Copy and keep both folders",
"CopyHere": "Copy here",
"CopyOperation": "Copying",
"CopyPublicLink": "Copy public link",
@@ -78,11 +72,8 @@
"CreateAndCopy": "Create and copy",
"CreateCopy": "Create copy",
"CreateDescription": "There will be two different files in the folder.",
- "CreateFolderDescription": "There will be two different folders in the destination",
- "FoldersAndFilesWillBeCopied": "Folders and files will be copied in the destination",
"CreateFileCopy": "Create file copy",
- "CopyAndKeepBothFolders": "Copy and keep both folders",
- "CopyAndKeepAll": "Copy and keep all",
+ "CreateFolderDescription": "There will be two different folders in the destination",
"CreateFormFillingRoom": "Create Form filling room",
"CreateMasterFormFromFile": "Create Form Template from file",
"CreatePDFForm": "Create PDF Form",
@@ -171,6 +162,7 @@
"EncryptionFilePreparing": "Preparing file for encryption",
"EncryptionKeysReload": "Encryption keys must be re-entered",
"EnterName": "Enter name",
+ "EnterPasswordDescription": "File <1>«{{fileName}}» is located in the password-protected room. Please enter a password for the room",
"Error": "Error",
"Error401Text": "Sorry, the resource is not currently accessible.",
"Error403Text": "Sorry, access denied.",
@@ -194,12 +186,19 @@
"Example": "Example: {{example}}",
"ExpiredLink": "Expired link",
"FeedbackAndSupport": "Feedback & Support",
+ "FileActionRequired": "The destination already contains a file named «<1>{{fileName}}».",
+ "FilesAlreadyContains": "The destination already contains files with the same name.",
+ "FilesAndFoldersAlreadyContains": "The destination already contains files and folders with the same name.",
+ "FilesAndFolderWillNotBeCopied": "Files and folder will not be copied",
"FillFormButton": "Fill",
"FillingFormRooms": "Filling form",
"FillingFormsRoomDescription": "Build, share and fill document templates or work with the ready presets to quickly create documents of any type.",
"FillingFormsRoomTitle": "Filling forms room",
"Finish": "Finish",
"FirstName": "First name",
+ "FolderActionRequired": "The destination already contains a folder named «<1>{{folderName}}».",
+ "FoldersAlreadyContains": "The destination already contains folders with the same name.",
+ "FoldersAndFilesWillBeCopied": "Folders and files will be copied in the destination",
"FormFilingRoomDescription": "Upload PDF forms into the room. Invite users to fill out a PDF form. Review completed forms and analyze data automatically collected in a spreadsheet.",
"FormFilingRoomTitle": "Form Filling Room",
"FormRoom": "Form room",
@@ -275,6 +274,9 @@
"MeLabel": "Me",
"Member": "Member",
"Members": "Members",
+ "MergeAndOverwrite": "Merge and overwrite",
+ "MergeFolders": "Merge folders",
+ "MergeFoldersDescription": "Two folders will be merged into one with all the contents",
"MobileAndroid": "Get {{organizationName}} Documents on Google Play",
"MobileIos": "Download {{organizationName}} Documents on the App Store",
"MobileLinux": "Download {{organizationName}} Desktop Editors for Linux",
@@ -285,11 +287,10 @@
"MoveTo": "Move to",
"MoveToFolderMessage": "You can't move the folder to its subfolder",
"MoveToOperation": "Moving",
+ "MultiplyOverwrite": "Several folders will be merged into one, files will be overwritten with the version update",
"MyDocuments": "My documents",
"Name": "Name",
"NeedPassword": "You need a password to access the room",
- "EnterPasswordDescription": "File <1>«{{fileName}}» is located in the password-protected room. Please enter a password for the room",
- "PasswordRequired": "Password required",
"NewDocument": "New document",
"NewFolder": "New folder",
"NewMasterForm": "New form template",
@@ -333,10 +334,6 @@
"OtherOperations": "Other operations",
"OverwriteDescription": "The new file will replace the existing one as a new version.",
"OverwriteTitle": "Overwrite with version update",
- "MergeFolders": "Merge folders",
- "MergeFoldersDescription": "Two folders will be merged into one with all the contents",
- "MergeAndOverwrite": "Merge and overwrite",
- "MultiplyOverwrite": "Several folders will be merged into one, files will be overwritten with the version update",
"Owner": "Owner",
"PageOfTotalPage": "{{page}} of {{totalPage}}",
"Paid": "Paid",
@@ -346,6 +343,7 @@
"PasswordLimitSpecialSymbols": "special characters",
"PasswordLimitUpperCase": "capital letters",
"PasswordMinimumLength": "Minimum length",
+ "PasswordRequired": "Password required",
"PaymentsTitle": "Payments",
"People": "People",
"PerUserMonth": "<1>{{currencySymbol}}<1>{{price}} per admin/power user/month",
@@ -469,7 +467,6 @@
"SizeImageLarge": "The image size is too large, please select another image.",
"SkipDescription": "No file will be copied. The original file will be retained in the destination folder.",
"SkipFolderDescription": "No folder will be copied",
- "FilesAndFolderWillNotBeCopied": "Files and folder will not be copied",
"SkipTitle": "Skip",
"SomethingWentWrong": "Something went wrong.",
"SortBy": "Sort by",
diff --git a/public/locales/es/Common.json b/public/locales/es/Common.json
index 15ce89e7fb..23d8062288 100644
--- a/public/locales/es/Common.json
+++ b/public/locales/es/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Archivos comunes",
"CompanyName": "Nombre de empresa",
"Confirmation": "Confirmación",
- "ConflictResolveDescription": "El archivo con el nombre <1>{{file}} ya existe en la carpeta <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} documentos con el mismo nombre ya existen en la carpeta <1>{{folder}}.",
"ConflictResolveSelectAction": "Por favor, seleccione la acción:",
- "ConflictResolveTitle": "Confirmación de sobrescritura",
"Connect": "Conectar",
"Content": "Contenido",
"Context": "Contexto",
diff --git a/public/locales/fi/Common.json b/public/locales/fi/Common.json
index c8e13c24a5..4bb4c61aa3 100644
--- a/public/locales/fi/Common.json
+++ b/public/locales/fi/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Yleiset kansiot",
"CompanyName": "Yrityksen nimi",
"Confirmation": "Vahvistus",
- "ConflictResolveDescription": "Tiedosto, jonka nimi on <1>{{file}}, on jo kansiossa <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} samannimistä asiakirjaa on jo olemassa kansiossa <1>{{folder}}.",
"ConflictResolveSelectAction": "Valitse toiminto:",
- "ConflictResolveTitle": "Korvaamisen vahvistus",
"Connect": "Yhdistä",
"Content": "Sisältö",
"Context": "Konteksti",
diff --git a/public/locales/fr/Common.json b/public/locales/fr/Common.json
index ee688f1e69..1b44b99cf2 100644
--- a/public/locales/fr/Common.json
+++ b/public/locales/fr/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Fichiers communs",
"CompanyName": "Nom de l'entreprise",
"Confirmation": "Confirmation",
- "ConflictResolveDescription": "Le fichier portant le nom <1>{{file}} existe déjà dans le dossier <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} les documents portant le même nom existent déjà dans le dossier <1>{{folder}}.",
"ConflictResolveSelectAction": "Veuillez sélectionner une action :",
- "ConflictResolveTitle": "Confirmation de l'écrasement",
"Connect": "Connexion",
"Content": "Contenu",
"Context": "Contexte",
diff --git a/public/locales/hy-AM/Common.json b/public/locales/hy-AM/Common.json
index a6d75da377..786e79152b 100644
--- a/public/locales/hy-AM/Common.json
+++ b/public/locales/hy-AM/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Ընդհանուր ֆայլեր",
"CompanyName": "Ընկերության անվանում",
"Confirmation": "Հաստատում",
- "ConflictResolveDescription": "Այց անունով ֆայլը՝ <1>{{file}} արդեն առկա է պանակում <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} նույն անունով փաստաթղթեր արդեն կան պանակում <1>{{folder}}:",
"ConflictResolveSelectAction": "Խնդրում ենք ընտրել գործողությունը:",
- "ConflictResolveTitle": "Վերագրել հաստատումը",
"Connect": "Կապակցվել",
"Content": "Բովանդակություն",
"Context": "Համատեքստ",
diff --git a/public/locales/it/Common.json b/public/locales/it/Common.json
index 08f285ab55..c951d7375c 100644
--- a/public/locales/it/Common.json
+++ b/public/locales/it/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "File comuni",
"CompanyName": "Nome azienda",
"Confirmation": "Conferma",
- "ConflictResolveDescription": "Il file con il nome <1>{{file}} già esiste nella cartella <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} documenti con lo stesso nome esistono già nella cartella <1>{{folder}}.",
"ConflictResolveSelectAction": "Ti preghiamo di selezionare l'azione:",
- "ConflictResolveTitle": "Confermare sovrascrittura",
"Connect": "Collega",
"Content": "Contenuto",
"Context": "Contesto",
diff --git a/public/locales/ja-JP/Common.json b/public/locales/ja-JP/Common.json
index b5f68c7e30..dcfe689b6d 100644
--- a/public/locales/ja-JP/Common.json
+++ b/public/locales/ja-JP/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "共通のファイル",
"CompanyName": "企業名",
"Confirmation": "確認事項",
- "ConflictResolveDescription": "フォルダ<1>{{folder}}内に<1>{{file}}という名前のファイルがすでに存在しています。",
- "ConflictResolveDescriptionFiles": "{{filesCount}}フォルダ<1>{{folder}}に同名のドキュメントがすでに存在しています。",
"ConflictResolveSelectAction": "アクションをお選びください：",
- "ConflictResolveTitle": "上書き確認",
"Connect": "接続",
"Content": "コンテンツ",
"Context": "コンテキスト",
diff --git a/public/locales/ko-KR/Common.json b/public/locales/ko-KR/Common.json
index dd7ab20db6..9de0cc9a1c 100644
--- a/public/locales/ko-KR/Common.json
+++ b/public/locales/ko-KR/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "공통 파일",
"CompanyName": "회사 이름",
"Confirmation": "확인",
- "ConflictResolveDescription": "<1>{{file}} 이름의 파일이 <1>{{folder}} 폴더에 이미 존재합니다.",
- "ConflictResolveDescriptionFiles": "같은 이름의 문서 {{filesCount}}개가 <1>{{folder}} 폴더에 이미 존재합니다.",
"ConflictResolveSelectAction": "작업 선택:",
- "ConflictResolveTitle": "덮어쓰기",
"Connect": "연결",
"Content": "콘텐츠",
"Context": "문맥",
diff --git a/public/locales/lo-LA/Common.json b/public/locales/lo-LA/Common.json
index a64232a2c4..fb81799148 100644
--- a/public/locales/lo-LA/Common.json
+++ b/public/locales/lo-LA/Common.json
@@ -51,10 +51,7 @@
"CommonFiles": "ໄຟລ໌ທົ່ວໄປ",
"CompanyName": "ຊື່ບໍລິສັດ",
"Confirmation": "ການຢັ້ງຢືນຕົວຕົນ",
- "ConflictResolveDescription": "ຊື່ໄຟລ໌ <1>{{file}} ມີຢູ່ໃນໂຟນເດີ <1>{{folder}} ແລ້ວ.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} ມີເອກະສານຊື່ດ່ຽວກັນໃນໂໄນເດີ້ແລ້ວ <1>{{folder}}.",
"ConflictResolveSelectAction": "ກະລຸນາເລືອກການດຳເນີນການ",
- "ConflictResolveTitle": "ຢືນຢັນການທັບ",
"Connect": "ຕິດຕໍ່",
"Content": "ເນື້ອຫາ",
"Context": "ສະພາບການ",
diff --git a/public/locales/lv/Common.json b/public/locales/lv/Common.json
index cdd6ba4897..89e278a553 100644
--- a/public/locales/lv/Common.json
+++ b/public/locales/lv/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Kopīgi faili",
"CompanyName": "Uzņēmuma nosaukums",
"Confirmation": "Apstiprinājums",
- "ConflictResolveDescription": "Fails ar nosaukumu <1>{{file}} jau pastāv mapē <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} dokumenti ar tādu pašu nosaukumu jau pastāv mapē <1>{{folder}}.",
"ConflictResolveSelectAction": "Lūdzu, atlasiet darbību:",
- "ConflictResolveTitle": "Pārrakstiet apstiprinājumu",
"Connect": "Savienot",
"Content": "Saturs",
"Context": "Konteksts",
diff --git a/public/locales/nl/Common.json b/public/locales/nl/Common.json
index b0690438e3..282b11dd4d 100644
--- a/public/locales/nl/Common.json
+++ b/public/locales/nl/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Algemene bestanden",
"CompanyName": "Bedrijfsnaam",
"Confirmation": "Bevestiging",
- "ConflictResolveDescription": "Het bestand met de naam <1>{{file}} bestaat al in de map <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} documenten met dezelfde naam al bestaan in de map <1>{{folder}}.",
"ConflictResolveSelectAction": "Kies de actie:",
- "ConflictResolveTitle": "Overschrijf bevestiging",
"Connect": "Verbinden",
"Content": "Inhoud",
"Context": "Context",
diff --git a/public/locales/pl/Common.json b/public/locales/pl/Common.json
index eb1a5838e2..30fc2c36af 100644
--- a/public/locales/pl/Common.json
+++ b/public/locales/pl/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Wspólne pliki",
"CompanyName": "Nama Perusahaan",
"Confirmation": "Potwierdzenie",
- "ConflictResolveDescription": "Plik o nazwie <1>{{file}} istnieje już w folderze <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} dokument(y/ów) o tej samej nazwie istnieje(-ją) już w folderze <1>{{folder}}.",
"ConflictResolveSelectAction": "Wybierz działanie:",
- "ConflictResolveTitle": "Potwierdź zastąpienie",
"Connect": "Podłącz",
"Content": "Treść",
"Context": "Kontekst",
diff --git a/public/locales/pt-BR/Common.json b/public/locales/pt-BR/Common.json
index e02bf120fb..fb76fc24af 100644
--- a/public/locales/pt-BR/Common.json
+++ b/public/locales/pt-BR/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Arquivos comuns",
"CompanyName": "Nome da empresa",
"Confirmation": "Confirmação",
- "ConflictResolveDescription": "O arquivo com o nome <1>{{file}} já existe na pasta <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} Os documentos com o mesmo nome já existem na pasta <1>{{folder}}.",
"ConflictResolveSelectAction": "Selecione a ação:",
- "ConflictResolveTitle": "Confirmação de substituição",
"Connect": "Conectar",
"Content": "Conteúdo",
"Context": "Contexto",
diff --git a/public/locales/pt/Common.json b/public/locales/pt/Common.json
index 8b91e0f231..23f861e5ad 100644
--- a/public/locales/pt/Common.json
+++ b/public/locales/pt/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Arquivos comuns",
"CompanyName": "Nome da empresa",
"Confirmation": "Confirmação",
- "ConflictResolveDescription": "O ficheiro com o nome <1>{{file}} já existe na pasta <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} documentos com o mesmo nome já existem na pasta <1>{{folder}}.",
"ConflictResolveSelectAction": "Selecione a ação:",
- "ConflictResolveTitle": "Confirmação de substituição",
"Connect": "Ligar",
"Content": "Conteúdo",
"Context": "Contexto",
diff --git a/public/locales/ro/Common.json b/public/locales/ro/Common.json
index 5c5f999fd8..3fcb91302a 100644
--- a/public/locales/ro/Common.json
+++ b/public/locales/ro/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Fișiere comune",
"CompanyName": "Numele companiei",
"Confirmation": "Confirmare",
- "ConflictResolveDescription": "Fișierul cu numele <1>{{file}} există deja în dosarul <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} fișiere cu același nume exista deja în folderul<1>{{folder}}.",
"ConflictResolveSelectAction": "Selectați acțiune:",
- "ConflictResolveTitle": "Confirmarea suprascrierii",
"Connect": "Adaugă cont",
"Content": "Conținut",
"Context": "Context",
diff --git a/public/locales/ru/Common.json b/public/locales/ru/Common.json
index 0f351371d6..1d7f8ab658 100644
--- a/public/locales/ru/Common.json
+++ b/public/locales/ru/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Общие файлы",
"CompanyName": "Название компании",
"Confirmation": "Подтверждение",
- "ConflictResolveDescription": "Файл с именем <1>{{file}} уже существует в папке <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} документов с одинаковыми именами уже существуют в папке <1>{{folder}}.",
"ConflictResolveSelectAction": "Пожалуйста, выберите действие:",
- "ConflictResolveTitle": "Подтверждение перезаписи",
"Connect": "Подключить",
"Content": "Контент",
"Context": "Контекст",
diff --git a/public/locales/si/Common.json b/public/locales/si/Common.json
index 71432891bd..edb6f1ee04 100644
--- a/public/locales/si/Common.json
+++ b/public/locales/si/Common.json
@@ -51,10 +51,7 @@
"CommonFiles": "සාමාන්ය ගොනු",
"CompanyName": "සමාගමේ නම",
"Confirmation": "තහවුරු කිරීම",
- "ConflictResolveDescription": "<1>{{file}} නම සහිත ගොනුවක් දැනටමත් <1>{{folder}} බහාලුමේ පවතී.",
- "ConflictResolveDescriptionFiles": "සමාන නම සහිත ලේඛන {{filesCount}} ක් දැනටමත් <1>{{folder}} බහාලුමේ පවතී.",
"ConflictResolveSelectAction": "ක්රියාමාර්ගය තෝරන්න:",
- "ConflictResolveTitle": "උඩින් ලිවීම තහවුරුව",
"Connect": "සබඳින්න",
"Content": "අන්තර්ගතය",
"Context": "සන්දර්භය",
diff --git a/public/locales/sk/Common.json b/public/locales/sk/Common.json
index 6c8d1fad08..f5df7ce062 100644
--- a/public/locales/sk/Common.json
+++ b/public/locales/sk/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Spoločné súbory",
"CompanyName": "Meno spoločnosti",
"Confirmation": "Potvrdenie",
- "ConflictResolveDescription": "Súbor s názvom <1>{{file}} už v priečinku <1>{{folder}} existuje.",
- "ConflictResolveDescriptionFiles": "Dokumenty {{filesCount}} s rovnakými názvami už v priečinku <1>{{folder}} existujú.",
"ConflictResolveSelectAction": "Vyberte akciu:",
- "ConflictResolveTitle": "Potvrdenie prepísania",
"Connect": "Pripojiť",
"Content": "Obsah",
"Context": "Kontext",
diff --git a/public/locales/sl/Common.json b/public/locales/sl/Common.json
index e95a18965c..fe649bb273 100644
--- a/public/locales/sl/Common.json
+++ b/public/locales/sl/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Skupne datoteke",
"CompanyName": "Ime podjetja",
"Confirmation": "Potrditev",
- "ConflictResolveDescription": "Datoteka z imenom <1>{{file}} že obstaja v mapi <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} dokumentov z enakim imenom že obstaja v mapi <1>{{folder}}.",
"ConflictResolveSelectAction": "Prosim, izberite akcijo:",
- "ConflictResolveTitle": "Prepišite potrditev",
"Connect": "Poveži",
"Content": "Vsebina",
"Context": "Kontekst",
diff --git a/public/locales/sr-Cyrl-RS/Common.json b/public/locales/sr-Cyrl-RS/Common.json
index 49555cc5b5..3630e6f150 100644
--- a/public/locales/sr-Cyrl-RS/Common.json
+++ b/public/locales/sr-Cyrl-RS/Common.json
@@ -51,10 +51,7 @@
"CommonFiles": "Заједничке датотеке",
"CompanyName": "Име компаније",
"Confirmation": "Конфирмација",
- "ConflictResolveDescription": "Датотека са именом <1>{{file}} вец́ постоји у фолдеру <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} докумената са истим именом вец́ постоје у фолдеру <1>{{folder}}.",
"ConflictResolveSelectAction": "Изаберите радњу:",
- "ConflictResolveTitle": "Потврда поновног уписивања",
"Connect": "Повежи",
"Content": "Садржај",
"Context": "Контекст",
diff --git a/public/locales/sr-Latn-RS/Common.json b/public/locales/sr-Latn-RS/Common.json
index aa918a056c..9f9c9a60f3 100644
--- a/public/locales/sr-Latn-RS/Common.json
+++ b/public/locales/sr-Latn-RS/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Zajedničke datoteke",
"CompanyName": "Ime kompanije",
"Confirmation": "Konfirmacija",
- "ConflictResolveDescription": "Datoteka sa imenom <1>{{file}} već postoji u folderu <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} dokumenata sa istim imenom već postoje u folderu <1>{{folder}}.",
"ConflictResolveSelectAction": "Molim vas odaberite akciju:",
- "ConflictResolveTitle": "Potvrda prepisivanja",
"Connect": "Poveži",
"Content": "Sadržaj",
"Context": "Kontekst",
diff --git a/public/locales/tr/Common.json b/public/locales/tr/Common.json
index 28b04bd1ce..8d3c7798a0 100644
--- a/public/locales/tr/Common.json
+++ b/public/locales/tr/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Ortak dosyalar",
"CompanyName": "Şirket ismi",
"Confirmation": "Onay",
- "ConflictResolveDescription": "<1>{{file}} isimli dosya <1>{{folder}} klasöründe zaten mevcut.",
- "ConflictResolveDescriptionFiles": "{{filesCount}} belgeleri, <1>{{folder}} klasöründe aynı isimle zaten mevcut.",
"ConflictResolveSelectAction": "Lütfen işlemi seçin:",
- "ConflictResolveTitle": "Üstüne yazma onayı",
"Connect": "Bağlan",
"Content": "İçerik",
"Context": "Bağlam",
diff --git a/public/locales/uk-UA/Common.json b/public/locales/uk-UA/Common.json
index eed65ac974..5853f5921e 100644
--- a/public/locales/uk-UA/Common.json
+++ b/public/locales/uk-UA/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Загальні файли",
"CompanyName": "Назва компанії",
"Confirmation": "Підтвердження",
- "ConflictResolveDescription": "Файл із іменем <1>{{file}} уже існує в папці <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": "Документи ({{filesCount}}) з таким ім'ям вже існують у папці <1>{{folder}}.",
"ConflictResolveSelectAction": "Оберіть дію:",
- "ConflictResolveTitle": "Підтвердження перезапису",
"Connect": "Підключити",
"Content": "Зміст",
"Context": "Контекст",
diff --git a/public/locales/vi/Common.json b/public/locales/vi/Common.json
index 17725ab57b..0cb3732520 100644
--- a/public/locales/vi/Common.json
+++ b/public/locales/vi/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "Các tập tin chung",
"CompanyName": "Tên công ty",
"Confirmation": "Xác nhận",
- "ConflictResolveDescription": " Tệp có tên <1>{{file}} đã tồn tại trong thư mục <1>{{folder}}.",
- "ConflictResolveDescriptionFiles": " {{filesCount}} tài liệu có cùng tên đã tồn tại trong thư mục <1>{{folder}}.",
"ConflictResolveSelectAction": "Vui lòng chọn hành động:",
- "ConflictResolveTitle": "Xác nhận ghi đè",
"Connect": "Kết nối",
"Content": "Nội dung",
"Context": "Bối cảnh",
diff --git a/public/locales/zh-CN/Common.json b/public/locales/zh-CN/Common.json
index 76c515e545..efcf45ec28 100644
--- a/public/locales/zh-CN/Common.json
+++ b/public/locales/zh-CN/Common.json
@@ -54,10 +54,7 @@
"CommonFiles": "公共文件",
"CompanyName": "企业名称",
"Confirmation": "确认",
- "ConflictResolveDescription": "<1>{{folder}}文件夹中已有名称为<1>{{file}}的文件。",
- "ConflictResolveDescriptionFiles": "<1>{{folder}}文件夹中已有{{filesCount}}个名称相同的文档。",
"ConflictResolveSelectAction": "请选择操作：",
- "ConflictResolveTitle": "覆盖确认",
"Connect": "连接",
"Content": "内容",
"Context": "上下文",