Merge branch 'edge' into meteor-1.8

6 files changed, 56 insertions, 46 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62279e0e..b9f1e536 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# v2.39 2019-03-06 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix](https://github.com/wekan/wekan/commit/e845fe3e7130d111be4c3a73e2551738c980ff7b)
+  [manifest](https://github.com/wekan/wekan/issues/2168) and
+  [icon](https://github.com/wekan/wekan/issues/1692) paths. Thanks to xet7.
+    
+Thanks to above GitHub users for their contributions, and translators for their translations.
+
 # v2.38 2019-03-06 Wekan release
 
 This release adds the following new features:
diff --git a/Stackerfile.yml b/Stackerfile.yml
index 02bebae3..c09b6bf7 100644
--- a/Stackerfile.yml
+++ b/Stackerfile.yml
@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.38.0"
+appVersion: "v2.39.0"
 files:
   userUploads:
     - README.md
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index 50585aa4..c0b66e94 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -7,10 +7,10 @@ head
     where the application is deployed with a path prefix, but it seems to be
     difficult to do that cleanly with Blaze -- at least without adding extra
     packages.
-  link(rel="shortcut icon" href="/public/wekan-favicon.png")
-  link(rel="apple-touch-icon" href="/public/wekan-favicon.png")
-  link(rel="mask-icon" href="/public/wekan-150.svg")
-  link(rel="manifest" href="/public/wekan-manifest.json")
+  link(rel="shortcut icon" href="wekan-favicon.png")
+  link(rel="apple-touch-icon" href="wekan-favicon.png")
+  link(rel="mask-icon" href="wekan-150.svg")
+  link(rel="manifest" href="wekan-manifest.json")
 
 template(name="userFormsLayout")
   section.auth-layout
diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json
index c63af8ab..2e741473 100644
--- a/i18n/es.i18n.json
+++ b/i18n/es.i18n.json
@@ -1,37 +1,37 @@
 {
     "accept": "Aceptar",
     "act-activity-notify": "Notificación de actividad",
-    "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-addAttachment": "añadido el adjunto __attachment__ a la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-deleteAttachment": "eliminado el adjunto __attachment__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-addSubtask": "añadida la subtarea __subtask__ a la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-addLabel": "añadida la etiqueta __label__ a la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-removeLabel": "eliminada la etiqueta __label__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-addChecklist": "añadida la lista de verificación __checklist__ a la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-addChecklistItem": "añadido el elemento __checklistItem__ a la lista de verificación __checklist__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-removeChecklist": "eliminada la lista de verificación __checklist__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-removeChecklistItem": "eliminado el elemento __checklistItem__ de la lista de verificación __checkList__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-checkedItem": "marcado el elemento __checklistItem__ de la lista de verificación __checklist__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-uncheckedItem": "desmarcado el elemento __checklistItem__ de la lista de verificación __checklist__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-completeChecklist": "completada la lista de verificación __checklist__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-uncompleteChecklist": "no completada la lista de verificación __checklist__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-addComment": "comentario en la tarjeta__card__: __comment__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-createBoard": "creado el tablero __board__",
+    "act-createCard": "creada la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-createCustomField": "creado el campo personalizado __customField__ en la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-createList": "añadida la lista __list__ al tablero __board__",
+    "act-addBoardMember": "añadido el mimbro __member__ al tablero __board__",
+    "act-archivedBoard": "El tablero __board__ se ha movido a Archivo",
+    "act-archivedCard": "La tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__ se ha movido a Archivo",
+    "act-archivedList": "La lista __list__ del carril __swimlane__ del tablero __board__ se ha movido a Archivo",
+    "act-archivedSwimlane": "El carril __swimlane__ del tablero __board__ se ha movido a Archivo",
+    "act-importBoard": "importado el tablero __board__",
+    "act-importCard": "importada la tarjeta __card__ a la lista __list__ del carrril __swimlane__ del tablero __board__",
+    "act-importList": "importada la lista __list__ al carril __swimlane__ del tablero __board__",
+    "act-joinMember": "añadido el miembro __member__ a la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-moveCard": "movida la tarjeta __card__ de la lista __oldList__ del carril __oldSwimlane__ del tablero __oldBoard__ a la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-removeBoardMember": "eliminado el miembro __member__ del tablero __board__",
+    "act-restoredCard": "restaurada la tarjeta __card__ a la lista __list__ del carril __swimlane__ del tablero __board__",
+    "act-unjoinMember": "eliminado el miembro __member__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
     "act-withBoardTitle": "__board__",
     "act-withCardTitle": "[__board__] __card__",
     "actions": "Acciones",
@@ -56,14 +56,14 @@
     "activity-unchecked-item": "desmarcado %s en lista  %s de %s",
     "activity-checklist-added": "ha añadido una lista de verificación a %s",
     "activity-checklist-removed": "eliminada una lista de verificación desde %s ",
-    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed": "completada la lista de verificación __checklist__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
     "activity-checklist-uncompleted": "no completado la lista %s de %s",
     "activity-checklist-item-added": "ha añadido el elemento de la lista de verificación a '%s' en %s",
     "activity-checklist-item-removed": "eliminado un elemento de la lista de verificación desde '%s' en %s",
     "add": "Añadir",
     "activity-checked-item-card": "marcado %s en la lista de verificación %s",
     "activity-unchecked-item-card": "desmarcado %s en la lista de verificación %s",
-    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed-card": "completada la lista de verificación __checklist__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__",
     "activity-checklist-uncompleted-card": "no completó la lista de verificación %s",
     "add-attachment": "Añadir adjunto",
     "add-board": "Añadir tablero",
@@ -243,7 +243,7 @@
     "decline": "Declinar",
     "default-avatar": "Avatar por defecto",
     "delete": "Eliminar",
-    "deleteCustomFieldPopup-title": "¿Borrar el campo personalizado?",
+    "deleteCustomFieldPopup-title": "¿Eliminar el campo personalizado?",
     "deleteLabelPopup-title": "¿Eliminar la etiqueta?",
     "description": "Descripción",
     "disambiguateMultiLabelPopup-title": "Desambiguar la acción de etiqueta",
@@ -542,8 +542,8 @@
     "requested-by": "Solicitado por",
     "board-delete-notice": "Se eliminarán todas las listas, tarjetas y acciones asociadas a este tablero. Esta acción no puede deshacerse.",
     "delete-board-confirm-popup": "Se eliminarán todas las listas, tarjetas, etiquetas y actividades, y no podrás recuperar los contenidos del tablero. Esta acción no puede deshacerse.",
-    "boardDeletePopup-title": "¿Borrar el tablero?",
-    "delete-board": "Borrar el tablero",
+    "boardDeletePopup-title": "¿Eliminar el tablero?",
+    "delete-board": "Eliminar el tablero",
     "default-subtasks-board": "Subtareas para el tablero __board__",
     "default": "Por defecto",
     "queue": "Cola",
@@ -563,10 +563,10 @@
     "no-parent": "No mostrar la tarjeta padre",
     "activity-added-label": "añadida etiqueta %s a %s",
     "activity-removed-label": "eliminada etiqueta '%s' desde %s",
-    "activity-delete-attach": "borrado un adjunto desde %s",
+    "activity-delete-attach": "eliminado un adjunto desde %s",
     "activity-added-label-card": "añadida etiqueta '%s'",
     "activity-removed-label-card": "eliminada etiqueta '%s'",
-    "activity-delete-attach-card": "borrado un adjunto",
+    "activity-delete-attach-card": "eliminado un adjunto",
     "r-rule": "Regla",
     "r-add-trigger": "Añadir disparador",
     "r-add-action": "Añadir acción",
diff --git a/package.json b/package.json
index 9ea32773..7ad6e4e1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.38.0",
+  "version": "v2.39.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index 8ba296e4..36091f6e 100644
--- a/sandstorm-pkgdef.capnp
+++ b/sandstorm-pkgdef.capnp
@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 240,
+    appVersion = 241,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "2.38.0~2019-03-06"),
+    appMarketingVersion = (defaultText = "2.39.0~2019-03-06"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,