diff options
| author | John McLear <john@mclear.co.uk> | 2014-12-31 13:32:09 +0000 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2014-12-31 13:32:09 +0000 |
| commit | 036b7d28902f768e056013ff87dc1da2b6d4c8a1 (patch) | |
| tree | f05b88a8859db302952793d61f94f9824f4d08c2 /src/locales | |
| parent | 4b6df17e99cb099425a466bee12b15f0751bf3fd (diff) | |
| parent | a07d1722fc6532d5497bccac63f9196717ebce34 (diff) | |
| download | etherpad-lite-036b7d28902f768e056013ff87dc1da2b6d4c8a1.zip | |
Merge pull request #2418 from ether/etherpad-export-and-import
Full Pad portability (Export/Import)
Diffstat (limited to 'src/locales')
| -rw-r--r-- | src/locales/en.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/locales/en.json b/src/locales/en.json index 130b59cb..7f5846fd 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -45,6 +45,7 @@ "pad.importExport.import": "Upload any text file or document", "pad.importExport.importSuccessful": "Successful!", "pad.importExport.export": "Export current pad as:", + "pad.importExport.exportetherpad": "Etherpad", "pad.importExport.exporthtml": "HTML", "pad.importExport.exportplain": "Plain text", "pad.importExport.exportword": "Microsoft Word", @@ -130,6 +131,7 @@ "pad.impexp.importing": "Importing...", "pad.impexp.confirmimport": "Importing a file will overwrite the current text of the pad. Are you sure you want to proceed?", "pad.impexp.convertFailed": "We were not able to import this file. Please use a different document format or copy paste manually", + "pad.impexp.padHasData": "We were not able to import this file because this Pad has already had changes, please import to a new pad", "pad.impexp.uploadFailed": "The upload failed, please try again", "pad.impexp.importfailed": "Import failed", "pad.impexp.copypaste": "Please copy paste", |