diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index c3e5f62f4..582bb1430 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -1129,8 +1129,12 @@ define([
config.msg = this.convertationTimeoutText;
break;
- case Asc.c_oAscError.ID.ConvertationError:
- config.msg = this.convertationErrorText;
+ case Asc.c_oAscError.ID.ConvertationOpenError:
+ config.msg = this.openErrorText;
+ break;
+
+ case Asc.c_oAscError.ID.ConvertationSaveError:
+ config.msg = this.saveErrorText;
break;
case Asc.c_oAscError.ID.DownloadError:
@@ -1865,7 +1869,6 @@ define([
reloadButtonText: 'Reload Page',
unknownErrorText: 'Unknown error.',
convertationTimeoutText: 'Convertation timeout exceeded.',
- convertationErrorText: 'Convertation failed.',
downloadErrorText: 'Download failed.',
unsupportedBrowserErrorText : 'Your browser is not supported.',
splitMaxRowsErrorText: 'The number of rows must be less than %1',
@@ -1931,7 +1934,9 @@ define([
textContactUs: 'Contact sales',
errorViewerDisconnect: 'Connection is lost. You can still view the document,
but will not be able to download until the connection is restored.',
warnLicenseExp: 'Your license has expired.
Please update your license and refresh the page.',
- titleLicenseExp: 'License expired'
+ titleLicenseExp: 'License expired',
+ openErrorText: 'An error has occurred while opening the file',
+ saveErrorText: 'An error has occurred while saving the file'
}
})(), DE.Controllers.Main || {}))
});
\ No newline at end of file
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 036cc7774..e411c8659 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -185,7 +185,9 @@
"DE.Controllers.LeftMenu.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
Are you sure you want to continue?",
"DE.Controllers.Main.applyChangesTextText": "Loading the changes...",
"DE.Controllers.Main.applyChangesTitleText": "Loading the Changes",
- "DE.Controllers.Main.convertationErrorText": "Conversion failed.",
+ "del_DE.Controllers.Main.convertationErrorText": "Conversion failed.",
+ "DE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
+ "DE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
"DE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.",
"DE.Controllers.Main.criticalErrorExtText": "Press \"OK\" to return to document list.",
"DE.Controllers.Main.criticalErrorTitle": "Error",
diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index a757db4bc..296c2c696 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -906,8 +906,12 @@ define([
config.msg = this.convertationTimeoutText;
break;
- case Asc.c_oAscError.ID.ConvertationError:
- config.msg = this.convertationErrorText;
+ case Asc.c_oAscError.ID.ConvertationOpenError:
+ config.msg = this.openErrorText;
+ break;
+
+ case Asc.c_oAscError.ID.ConvertationSaveError:
+ config.msg = this.saveErrorText;
break;
case Asc.c_oAscError.ID.DownloadError:
@@ -1638,7 +1642,6 @@ define([
reloadButtonText: 'Reload Page',
unknownErrorText: 'Unknown error.',
convertationTimeoutText: 'Convertation timeout exceeded.',
- convertationErrorText: 'Convertation failed.',
downloadErrorText: 'Download failed.',
unsupportedBrowserErrorText : 'Your browser is not supported.',
splitMaxRowsErrorText: 'The number of rows must be less than %1',
@@ -1734,7 +1737,9 @@ define([
textContactUs: 'Contact sales',
errorViewerDisconnect: 'Connection is lost. You can still view the document,
but will not be able to download until the connection is restored.',
warnLicenseExp: 'Your license has expired.
Please update your license and refresh the page.',
- titleLicenseExp: 'License expired'
+ titleLicenseExp: 'License expired',
+ openErrorText: 'An error has occurred while opening the file',
+ saveErrorText: 'An error has occurred while saving the file'
}
})(), PE.Controllers.Main || {}))
});
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index 2b3f5fa1f..553a9d416 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -102,7 +102,9 @@
"PE.Controllers.LeftMenu.textNoTextFound": "The data you have been searching for could not be found. Please adjust your search options.",
"PE.Controllers.Main.applyChangesTextText": "Loading data...",
"PE.Controllers.Main.applyChangesTitleText": "Loading Data",
- "PE.Controllers.Main.convertationErrorText": "Conversion failed.",
+ "del_PE.Controllers.Main.convertationErrorText": "Conversion failed.",
+ "PE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
+ "PE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
"PE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.",
"PE.Controllers.Main.criticalErrorExtText": "Press \"OK\" to return to document list.",
"PE.Controllers.Main.criticalErrorTitle": "Error",
diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
index c67ed6301..6afd59916 100644
--- a/apps/spreadsheeteditor/main/app/controller/Main.js
+++ b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -967,8 +967,12 @@ define([
config.msg = this.convertationTimeoutText;
break;
- case Asc.c_oAscError.ID.ConvertationError:
- config.msg = this.convertationErrorText;
+ case Asc.c_oAscError.ID.ConvertationOpenError:
+ config.msg = this.openErrorText;
+ break;
+
+ case Asc.c_oAscError.ID.ConvertationSaveError:
+ config.msg = this.saveErrorText;
break;
case Asc.c_oAscError.ID.DownloadError:
@@ -1868,7 +1872,6 @@ define([
reloadButtonText: 'Reload Page',
unknownErrorText: 'Unknown error.',
convertationTimeoutText: 'Convertation timeout exceeded.',
- convertationErrorText: 'Convertation failed.',
downloadErrorText: 'Download failed.',
unsupportedBrowserErrorText : 'Your browser is not supported.',
requestEditFailedTitleText: 'Access denied',
@@ -1951,7 +1954,9 @@ define([
confirmPutMergeRange: 'The source data contains merged cells.
They will be unmerged before they are pasted into the table.',
errorViewerDisconnect: 'Connection is lost. You can still view the document,
but will not be able to download until the connection is restored.',
warnLicenseExp: 'Your license has expired.
Please update your license and refresh the page.',
- titleLicenseExp: 'License expired'
+ titleLicenseExp: 'License expired',
+ openErrorText: 'An error has occurred while opening the file',
+ saveErrorText: 'An error has occurred while saving the file'
}
})(), SSE.Controllers.Main || {}))
});
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index 6aa1ffd4f..6726eaea2 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -123,7 +123,9 @@
"SSE.Controllers.LeftMenu.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
Are you sure you want to continue?",
"SSE.Controllers.Main.confirmMoveCellRange": "The destination cell range can contain data. Continue the operation?",
"SSE.Controllers.Main.confirmPutMergeRange": "The source data contained merged cells.
They had been unmerged before they were pasted into the table.",
- "SSE.Controllers.Main.convertationErrorText": "Conversion failed.",
+ "del_SSE.Controllers.Main.convertationErrorText": "Conversion failed.",
+ "SSE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
+ "SSE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
"SSE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.",
"SSE.Controllers.Main.criticalErrorExtText": "Press \"OK\" to return to document list.",
"SSE.Controllers.Main.criticalErrorTitle": "Error",