summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md10
-rw-r--r--client/components/cards/cardDetails.jade14
-rw-r--r--i18n/cs.i18n.json2
-rw-r--r--i18n/de.i18n.json8
-rw-r--r--i18n/he.i18n.json10
-rw-r--r--i18n/pt-BR.i18n.json8
-rw-r--r--i18n/ru.i18n.json16
-rw-r--r--i18n/tr.i18n.json4
8 files changed, 41 insertions, 31 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0da3fd22..1c8d3564 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# Upcoming Wekan release
+
+This release fixes the following UI duplicates:
+
+- [Remove from card menu, because they also exist at card:
+ members, labels, attachments, dates received/start/due/end](https://github.com/wekan/wekan/issues/2242).
+ Thanks to sfahrenholz, jrsupplee and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
# v2.64 2019-04-23 Wekan release
This release adds the following new features:
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade
index 5fd7b748..bb633754 100644
--- a/client/components/cards/cardDetails.jade
+++ b/client/components/cards/cardDetails.jade
@@ -221,14 +221,14 @@ template(name="cardDetailsActionsPopup")
if canModifyCard
hr
ul.pop-over-list
- li: a.js-members {{_ 'card-edit-members'}}
- li: a.js-labels {{_ 'card-edit-labels'}}
- li: a.js-attachments {{_ 'card-edit-attachments'}}
+ //li: a.js-members {{_ 'card-edit-members'}}
+ //li: a.js-labels {{_ 'card-edit-labels'}}
+ //li: a.js-attachments {{_ 'card-edit-attachments'}}
li: a.js-custom-fields {{_ 'card-edit-custom-fields'}}
- li: a.js-received-date {{_ 'editCardReceivedDatePopup-title'}}
- li: a.js-start-date {{_ 'editCardStartDatePopup-title'}}
- li: a.js-due-date {{_ 'editCardDueDatePopup-title'}}
- li: a.js-end-date {{_ 'editCardEndDatePopup-title'}}
+ //li: a.js-received-date {{_ 'editCardReceivedDatePopup-title'}}
+ //li: a.js-start-date {{_ 'editCardStartDatePopup-title'}}
+ //li: a.js-due-date {{_ 'editCardDueDatePopup-title'}}
+ //li: a.js-end-date {{_ 'editCardEndDatePopup-title'}}
li: a.js-spent-time {{_ 'editCardSpentTimePopup-title'}}
li: a.js-set-card-color {{_ 'setCardColorPopup-title'}}
hr
diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json
index 185e4063..1320f36c 100644
--- a/i18n/cs.i18n.json
+++ b/i18n/cs.i18n.json
@@ -683,7 +683,7 @@
"error-ldap-login": "Během přihlašování nastala chyba",
"display-authentication-method": "Zobraz způsob ověřování",
"default-authentication-method": "Zobraz způsob ověřování",
- "duplicate-board": "Duplicate Board",
+ "duplicate-board": "Duplikovat tablo",
"people-number": "The number of people is:",
"swimlaneDeletePopup-title": "Delete Swimlane ?",
"swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json
index f2d3edc9..6dbbe6d5 100644
--- a/i18n/de.i18n.json
+++ b/i18n/de.i18n.json
@@ -685,8 +685,8 @@
"default-authentication-method": "Standardauthentifizierungsverfahren",
"duplicate-board": "Board duplizieren",
"people-number": "Anzahl der Personen:",
- "swimlaneDeletePopup-title": "Delete Swimlane ?",
- "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
- "restore-all": "Restore all",
- "delete-all": "Delete all"
+ "swimlaneDeletePopup-title": "Swimlane löschen?",
+ "swimlane-delete-pop": "Alle Aktionen werden aus dem Aktivitäts-Feed entfernt und du kannst die Swimlane auch nicht wiederherstellen: Es gibt kein Undo!",
+ "restore-all": "Alles wiederherstellen",
+ "delete-all": "Alles löschen"
} \ No newline at end of file
diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json
index 00c0d554..d80b2935 100644
--- a/i18n/he.i18n.json
+++ b/i18n/he.i18n.json
@@ -11,7 +11,7 @@
"act-addChecklist": "נוספה רשימת מטלות __checklist__ לכרטיס __card__ ברשימה __list__ שבמסלול __swimlane__ בלוח __board__",
"act-addChecklistItem": "נוסף פריט סימון __checklistItem__ לרשימת המטלות __checklist__ לכרטיס __card__ ברשימה __list__ במסלול __swimlane__ בלוח __board__",
"act-removeChecklist": "הוסרה רשימת מטלות __checklist__ מהכרטיס __card__ ברשימה __list__ שבמסלול __swimlane__ בלוח __board__",
- "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+ "act-removeChecklistItem": "פריט הסימון __checklistItem__ הוסר מרשימת המטלות __checkList__ בכרטיס __card__ ברשימה __list__ מהמסלול __swimlane__ בלוח __board__",
"act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
"act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
"act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
@@ -685,8 +685,8 @@
"default-authentication-method": "שיטת אימות כבררת מחדל",
"duplicate-board": "שכפול לוח",
"people-number": "מספר האנשים הוא:",
- "swimlaneDeletePopup-title": "Delete Swimlane ?",
- "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
- "restore-all": "Restore all",
- "delete-all": "Delete all"
+ "swimlaneDeletePopup-title": "למחוק מסלול?",
+ "swimlane-delete-pop": "כל הפעולות יוסרו מהזנת הפעילות ולא תהיה לך אפשרות לשחזר את המסלול. אי אפשר לחזור אחורה.",
+ "restore-all": "לשחזר הכול",
+ "delete-all": "למחוק הכול"
} \ No newline at end of file
diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json
index b5321f29..314a1359 100644
--- a/i18n/pt-BR.i18n.json
+++ b/i18n/pt-BR.i18n.json
@@ -685,8 +685,8 @@
"default-authentication-method": "Método de Autenticação Padrão",
"duplicate-board": "Duplicar Quadro",
"people-number": "O número de pessoas é:",
- "swimlaneDeletePopup-title": "Delete Swimlane ?",
- "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
- "restore-all": "Restore all",
- "delete-all": "Delete all"
+ "swimlaneDeletePopup-title": "Excluir Raia?",
+ "swimlane-delete-pop": "Todas as ações serão excluídas da lista de atividades e você não poderá recuperar a raia. Não há como desfazer.",
+ "restore-all": "Restaurar tudo",
+ "delete-all": "Excluir tudo"
} \ No newline at end of file
diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json
index 0e20f615..c56fc528 100644
--- a/i18n/ru.i18n.json
+++ b/i18n/ru.i18n.json
@@ -137,7 +137,7 @@
"board-archived": "Эта доска перемещена в архив.",
"card-comments-title": "Комментарии (%s)",
"card-delete-notice": "Это действие невозможно будет отменить. Все изменения, которые вы вносили в карточку будут потеряны.",
- "card-delete-pop": "Все действия будут удалены из ленты активности участников и вы не сможете заново открыть карточку. Действие необратимо",
+ "card-delete-pop": "Все действия будут удалены из ленты активности участников, и вы не сможете заново открыть карточку. Действие необратимо",
"card-delete-suggest-archive": "Вы можете переместить карточку в архив, чтобы убрать ее с доски, сохранив всю историю действий участников.",
"card-due": "Выполнить к",
"card-due-on": "Выполнить до",
@@ -148,7 +148,7 @@
"card-edit-members": "Изменить участников",
"card-labels-title": "Изменить метки для этой карточки.",
"card-members-title": "Добавить или удалить с карточки участников доски.",
- "card-start": "Дата начала",
+ "card-start": "В работе с",
"card-start-on": "Начнётся с",
"cardAttachmentsPopup-title": "Прикрепить из",
"cardCustomField-datePopup-title": "Изменить дату",
@@ -358,7 +358,7 @@
"listImportCardPopup-title": "Импортировать Trello карточку",
"listMorePopup-title": "Поделиться",
"link-list": "Ссылка на список",
- "list-delete-pop": "Все действия будут удалены из ленты активности участников и вы не сможете восстановить список. Данное действие необратимо.",
+ "list-delete-pop": "Все действия будут удалены из ленты активности участников, и вы не сможете восстановить список. Данное действие необратимо.",
"list-delete-suggest-archive": "Вы можете отправить список в Архив, чтобы убрать его с доски и при этом сохранить результаты.",
"lists": "Списки",
"swimlanes": "Дорожки",
@@ -534,7 +534,7 @@
"active": "Действующий",
"card-received": "Получено",
"card-received-on": "Получено с",
- "card-end": "Дата окончания",
+ "card-end": "Завершено",
"card-end-on": "Завершится до",
"editCardReceivedDatePopup-title": "Изменить дату получения",
"editCardEndDatePopup-title": "Изменить дату завершения",
@@ -685,8 +685,8 @@
"default-authentication-method": "Способ авторизации по умолчанию",
"duplicate-board": "Клонировать доску",
"people-number": "Количество человек:",
- "swimlaneDeletePopup-title": "Delete Swimlane ?",
- "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
- "restore-all": "Restore all",
- "delete-all": "Delete all"
+ "swimlaneDeletePopup-title": "Удалить дорожку?",
+ "swimlane-delete-pop": "Все действия будут удалены из ленты активности участников, и вы не сможете восстановить дорожку. Данное действие необратимо.",
+ "restore-all": "Восстановить все",
+ "delete-all": "Удалить все"
} \ No newline at end of file
diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json
index 777caa11..ca59e0a5 100644
--- a/i18n/tr.i18n.json
+++ b/i18n/tr.i18n.json
@@ -685,8 +685,8 @@
"default-authentication-method": "Default Authentication Method",
"duplicate-board": "Duplicate Board",
"people-number": "The number of people is:",
- "swimlaneDeletePopup-title": "Delete Swimlane ?",
+ "swimlaneDeletePopup-title": "Kulvar silinsin mi?",
"swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
"restore-all": "Restore all",
- "delete-all": "Delete all"
+ "delete-all": "Hepsini sil"
} \ No newline at end of file