diff options
| author | Maxime Quandalle <maxime@quandalle.com> | 2015-10-20 20:06:26 +0200 |
|---|---|---|
| committer | Maxime Quandalle <maxime@quandalle.com> | 2015-10-20 20:06:26 +0200 |
| commit | 7a5f030cc807c6a0a5addd8da59dc853dd4bd426 (patch) | |
| tree | 784e5197277b8971eced858e1be9efb88b973cfd /i18n | |
| parent | f3fc154eb0cf25c46871510a0d4004037188ec15 (diff) | |
| parent | 118b434a5aad35df8eefea85624ab9abafab56f0 (diff) | |
| download | wekan-7a5f030cc807c6a0a5addd8da59dc853dd4bd426.tar.gz wekan-7a5f030cc807c6a0a5addd8da59dc853dd4bd426.tar.bz2 wekan-7a5f030cc807c6a0a5addd8da59dc853dd4bd426.zip | |
Merge branch 'xavierpriour-devel' into devel
Conflicts:
models/import.js
Diffstat (limited to 'i18n')
| -rw-r--r-- | i18n/en.i18n.json | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index efc6128d..0823ba08 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -8,6 +8,7 @@ "activity-created": "created %s", "activity-excluded": "excluded %s from %s", "activity-imported": "imported %s into %s from %s", + "activity-imported-board": "imported %s from %s", "activity-joined": "joined %s", "activity-moved": "moved %s from %s to %s", "activity-on": "on %s", @@ -54,6 +55,7 @@ "boardChangeColorPopup-title": "Change Board Background", "boardChangeTitlePopup-title": "Rename Board", "boardChangeVisibilityPopup-title": "Change Visibility", + "boardImportBoardPopup-title": "Import board from Trello", "boardMenuPopup-title": "Board Menu", "boards": "Boards", "bucket-example": "Like “Bucket List” for example", @@ -66,8 +68,6 @@ "card-edit-attachments": "Edit attachments", "card-edit-labels": "Edit labels", "card-edit-members": "Edit members", - "card-json": "Go to a Trello card, select 'Share and more...' then 'Export JSON' and copy the resulting text", - "card-json-placeholder": "Paste your valid JSON data here", "card-labels-title": "Change the labels for the card.", "card-members-title": "Add or remove members of the board from the card.", "cardAttachmentsPopup-title": "Attach From", @@ -136,7 +136,11 @@ "header-logo-title": "Go back to your boards page.", "home": "Home", "import": "Import", + "import-board": "import from Trello", + "import-board-trello-instruction": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text", "import-card": "Import a Trello card", + "import-card-trello-instruction": "Go to a Trello card, select 'Share and more...' then 'Export JSON' and copy the resulting text", + "import-json-placeholder": "Paste your valid JSON data here", "info": "Infos", "initials": "Initials", "joined": "joined", @@ -175,6 +179,7 @@ "normal": "Normal", "normal-desc": "Can view and edit cards. Can't change settings.", "optional": "optional", + "or": "or", "page-maybe-private": "This page may be private. You may be able to view it by <a href='%s'>logging in</a>.", "page-not-found": "Page not found.", "password": "Password", |