Merge branch 'edge' into meteor-1.8

1 files changed, 34 insertions, 25 deletions

diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json
index cb2e0822..809e4298 100644
--- a/i18n/ca.i18n.json
+++ b/i18n/ca.i18n.json
@@ -1,28 +1,37 @@
 {
     "accept": "Accepta",
     "act-activity-notify": "Notificació d'activitat",
-    "act-addAttachment": "afegit__adjunt__ a la __fitxa__",
-    "act-addSubtask": "added subtask __checklist__ to __card__",
-    "act-addChecklist": "afegida la checklist _checklist__ a __card__",
-    "act-addChecklistItem": "afegit __checklistItem__ a la checklist __checklist__ on __card__",
-    "act-addComment": "comentat a __card__: __comment__",
-    "act-createBoard": "nou __tauler__",
-    "act-createCard": "afegit/da __card__ a __list__",
-    "act-createCustomField": "created custom field __customField__",
-    "act-createList": "llista __afegida__ al __tauler__",
-    "act-addBoardMember": "usuari __afegit__ al __tauler__",
-    "act-archivedBoard": "__tauler__ mogut al Arxiu",
-    "act-archivedCard": "__fitxa__ moguda al Arxiu",
-    "act-archivedList": "__llista__ mogud al Arxiu",
-    "act-archivedSwimlane": "__swimlane__ moved to Archive",
-    "act-importBoard": "tauler __importat__",
-    "act-importCard": "__card__ importat",
-    "act-importList": "__list__ importat",
-    "act-joinMember": "afegit/da __member__ a __card__",
-    "act-moveCard": "mou __card__ de __oldList__ a __list__",
-    "act-removeBoardMember": "elimina __usuari__ del __tauler__",
-    "act-restoredCard": "fitxa __restaurada__ al __tauler__",
-    "act-unjoinMember": "elimina __member__ de __card__",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __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__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
     "act-withBoardTitle": "__tauler__",
     "act-withCardTitle": "[__tauler__] __fitxa__",
     "actions": "Accions",
@@ -47,14 +56,14 @@
     "activity-unchecked-item": "unchecked %s in checklist %s of %s",
     "activity-checklist-added": "Checklist afegida a %s",
     "activity-checklist-removed": "removed a checklist from %s",
-    "activity-checklist-completed": "completed the checklist %s of %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
     "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
     "activity-checklist-item-added": "afegida entrada de checklist de '%s' a %s",
     "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
     "add": "Afegeix",
     "activity-checked-item-card": "checked %s in checklist %s",
     "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "completed the checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
     "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
     "add-attachment": "Afegeix adjunt",
     "add-board": "Afegeix Tauler",
@@ -112,7 +121,7 @@
     "boardChangeTitlePopup-title": "Canvia el nom tauler",
     "boardChangeVisibilityPopup-title": "Canvia visibilitat",
     "boardChangeWatchPopup-title": "Canvia seguiment",
-    "boardMenuPopup-title": "Menú del tauler",
+    "boardMenuPopup-title": "Board Settings",
     "boards": "Taulers",
     "board-view": "Visió del tauler",
     "board-view-cal": "Calendari",