Merge branch 'devel'

8 files changed, 49 insertions, 41 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1c27816..84092412 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v0.58 2017-11-23 Wekan release
+
+This release adds the following new features:
+
+* Updated translations.
+
+Thanks to all translators.
+
 # v0.57 2017-11-23 Wekan release
 
 This release adds the following new features:
diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json
index ae764e45..5a02d3b4 100644
--- a/i18n/ca.i18n.json
+++ b/i18n/ca.i18n.json
@@ -2,8 +2,8 @@
     "accept": "Accepta",
     "act-activity-notify": "[Wekan] Notificació d'activitat",
     "act-addAttachment": "adjuntat __attachment__ a __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __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": "creat __board__",
     "act-createCard": "afegit/da __card__ a __list__",
@@ -224,7 +224,7 @@
     "import-board-c": "Importa tauler",
     "import-board-title-trello": "Importa tauler des de Trello",
     "import-board-title-wekan": "I",
-    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
+    "import-sandstorm-warning": "Estau segur que voleu esborrar aquesta checklist?",
     "from-trello": "Des de Trello",
     "from-wekan": "Des de Wekan",
     "import-board-instruction-trello": "En el teu tauler Trello, ves a 'Menú', 'Més'.' Imprimir i Exportar', 'Exportar JSON', i copia el text resultant.",
@@ -238,7 +238,7 @@
     "info": "Versió",
     "initials": "Inicials",
     "invalid-date": "Data invàlida",
-    "invalid-time": "Invalid time",
+    "invalid-time": "Temps Invàlid",
     "joined": "s'ha unit",
     "just-invited": "Has estat convidat a aquest tauler",
     "keyboard-shortcuts": "Dreceres de teclat",
@@ -413,7 +413,7 @@
     "no": "No",
     "accounts": "Comptes",
     "accounts-allowEmailChange": "Permet modificar correu electrònic",
-    "createdAt": "Created at",
-    "verified": "Verified",
-    "active": "Active"
+    "createdAt": "Creat ",
+    "verified": "Verificat",
+    "active": "Actiu"
 }
\ No newline at end of file
diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json
index c1cc1560..e79ce31e 100644
--- a/i18n/de.i18n.json
+++ b/i18n/de.i18n.json
@@ -103,7 +103,7 @@
     "card-delete-suggest-archive": "Sie können eine Karte archivieren, um sie von dem Board zu entfernen und die Aktivitäten zu behalten.",
     "card-due": "Ende",
     "card-due-on": "Ende am",
-    "card-spent": "Spent Time",
+    "card-spent": "Aufgewendete Zeit",
     "card-edit-attachments": "Anhänge ändern",
     "card-edit-labels": "Labels ändern",
     "card-edit-members": "Mitglieder ändern",
@@ -176,7 +176,7 @@
     "soft-wip-limit": "Soft WIP-Limit",
     "editCardStartDatePopup-title": "Startdatum ändern",
     "editCardDueDatePopup-title": "Enddatum ändern",
-    "editCardSpentTimePopup-title": "Change spent time",
+    "editCardSpentTimePopup-title": "Aufgewendete Zeit ändern",
     "editLabelPopup-title": "Label ändern",
     "editNotificationPopup-title": "Benachrichtigung ändern",
     "editProfilePopup-title": "Profil ändern",
@@ -238,7 +238,7 @@
     "info": "Version",
     "initials": "Initialen",
     "invalid-date": "Ungültiges Datum",
-    "invalid-time": "Invalid time",
+    "invalid-time": "Ungültige Zeitangabe",
     "joined": "beigetreten",
     "just-invited": "Sie wurden soeben zu diesem Board eingeladen",
     "keyboard-shortcuts": "Tastaturkürzel",
@@ -340,11 +340,11 @@
     "team": "Team",
     "this-board": "dieses Board",
     "this-card": "diese Karte",
-    "spent-time-hours": "Spent time (hours)",
-    "overtime-hours": "Overtime (hours)",
-    "overtime": "Overtime",
-    "has-overtime-cards": "Has overtime cards",
-    "has-spenttime-cards": "Has spenttime cards",
+    "spent-time-hours": "Aufgewendete Zeit (Stunden)",
+    "overtime-hours": "Überzeit (Stunden)",
+    "overtime": "Überzeit",
+    "has-overtime-cards": "Hat Karten mit Überzeit",
+    "has-spenttime-cards": "Hat Karten mit aufgewendeter Zeit",
     "time": "Zeit",
     "title": "Titel",
     "tracking": "Folgen",
diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json
index ece760e9..36d96f94 100644
--- a/i18n/es.i18n.json
+++ b/i18n/es.i18n.json
@@ -103,7 +103,7 @@
     "card-delete-suggest-archive": "Puede archivar una tarjeta para eliminarla del tablero y conservar la actividad.",
     "card-due": "Finalizar",
     "card-due-on": "Vence el",
-    "card-spent": "Spent Time",
+    "card-spent": "Tiempo consumido",
     "card-edit-attachments": "Editar los adjuntos",
     "card-edit-labels": "Editar las etiquetas",
     "card-edit-members": "Editar los miembros",
@@ -176,7 +176,7 @@
     "soft-wip-limit": "Límite flexible del WIP",
     "editCardStartDatePopup-title": "Cambiar la fecha de inicio",
     "editCardDueDatePopup-title": "Cambiar la fecha de vencimiento",
-    "editCardSpentTimePopup-title": "Change spent time",
+    "editCardSpentTimePopup-title": "Cambiar el tiempo consumido",
     "editLabelPopup-title": "Cambiar la etiqueta",
     "editNotificationPopup-title": "Editar las notificaciones",
     "editProfilePopup-title": "Editar el perfil",
@@ -238,7 +238,7 @@
     "info": "Versión",
     "initials": "Iniciales",
     "invalid-date": "Fecha no válida",
-    "invalid-time": "Invalid time",
+    "invalid-time": "Tiempo no válido",
     "joined": "se ha unido",
     "just-invited": "Has sido invitado a este tablero",
     "keyboard-shortcuts": "Atajos de teclado",
@@ -340,11 +340,11 @@
     "team": "Equipo",
     "this-board": "este tablero",
     "this-card": "esta tarjeta",
-    "spent-time-hours": "Spent time (hours)",
-    "overtime-hours": "Overtime (hours)",
-    "overtime": "Overtime",
-    "has-overtime-cards": "Has overtime cards",
-    "has-spenttime-cards": "Has spenttime cards",
+    "spent-time-hours": "Tiempo consumido (horas)",
+    "overtime-hours": "Tiempo excesivo (horas)",
+    "overtime": "Tiempo excesivo",
+    "has-overtime-cards": "Hay tarjetas con el tiempo excedido",
+    "has-spenttime-cards": "Hay tarjetas con el tiempo consumido",
     "time": "Hora",
     "title": "Título",
     "tracking": "Seguimiento",
diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json
index 47fc250b..06053e9c 100644
--- a/i18n/fr.i18n.json
+++ b/i18n/fr.i18n.json
@@ -103,7 +103,7 @@
     "card-delete-suggest-archive": "Vous pouvez archiver une carte pour la supprimer en préservant le suivi des activités.",
     "card-due": "À échéance",
     "card-due-on": "Échéance le",
-    "card-spent": "Spent Time",
+    "card-spent": "Temps passé",
     "card-edit-attachments": "Modifier les pièces jointes",
     "card-edit-labels": "Modifier les étiquettes",
     "card-edit-members": "Modifier les membres",
@@ -176,7 +176,7 @@
     "soft-wip-limit": "Limite Soft WIP",
     "editCardStartDatePopup-title": "Modifier la date de début",
     "editCardDueDatePopup-title": "Modifier la date d'échéance",
-    "editCardSpentTimePopup-title": "Change spent time",
+    "editCardSpentTimePopup-title": "Changer le temps passé",
     "editLabelPopup-title": "Modifier l'étiquette",
     "editNotificationPopup-title": "Modifier la notification",
     "editProfilePopup-title": "Modifier le profil",
@@ -238,7 +238,7 @@
     "info": "Version",
     "initials": "Initiales",
     "invalid-date": "Date invalide",
-    "invalid-time": "Invalid time",
+    "invalid-time": "Temps invalide",
     "joined": "a rejoint",
     "just-invited": "Vous venez d'être invité à ce tableau",
     "keyboard-shortcuts": "Raccourcis clavier",
@@ -340,11 +340,11 @@
     "team": "Équipe",
     "this-board": "ce tableau",
     "this-card": "cette carte",
-    "spent-time-hours": "Spent time (hours)",
-    "overtime-hours": "Overtime (hours)",
-    "overtime": "Overtime",
-    "has-overtime-cards": "Has overtime cards",
-    "has-spenttime-cards": "Has spenttime cards",
+    "spent-time-hours": "Temps passé (heures)",
+    "overtime-hours": "Temps supplémentaire (heures)",
+    "overtime": "Temps supplémentaire",
+    "has-overtime-cards": "A des cartes avec du temps supplémentaire",
+    "has-spenttime-cards": "A des cartes avec du temps passé",
     "time": "Temps",
     "title": "Titre",
     "tracking": "Suivi",
diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json
index 62a29f06..266921ae 100644
--- a/i18n/he.i18n.json
+++ b/i18n/he.i18n.json
@@ -103,7 +103,7 @@
     "card-delete-suggest-archive": "ניתן להעביר לארכיון כרטיס כדי להסירו מהלוח ולשמר את הפעילות.",
     "card-due": "תאריך יעד",
     "card-due-on": "תאריך יעד",
-    "card-spent": "Spent Time",
+    "card-spent": "זמן שהושקע",
     "card-edit-attachments": "עריכת קבצים מצורפים",
     "card-edit-labels": "עריכת תוויות",
     "card-edit-members": "עריכת חברים",
@@ -176,7 +176,7 @@
     "soft-wip-limit": "מגבלת „בעבודה” רכה",
     "editCardStartDatePopup-title": "שינוי מועד התחלה",
     "editCardDueDatePopup-title": "שינוי מועד סיום",
-    "editCardSpentTimePopup-title": "Change spent time",
+    "editCardSpentTimePopup-title": "שינוי הזמן שהושקע",
     "editLabelPopup-title": "שינוי תווית",
     "editNotificationPopup-title": "שינוי דיווח",
     "editProfilePopup-title": "עריכת פרופיל",
@@ -238,7 +238,7 @@
     "info": "גרסא",
     "initials": "ראשי תיבות",
     "invalid-date": "תאריך שגוי",
-    "invalid-time": "Invalid time",
+    "invalid-time": "זמן שגוי",
     "joined": "הצטרף",
     "just-invited": "הוזמנת ללוח זה",
     "keyboard-shortcuts": "קיצורי מקלדת",
@@ -340,11 +340,11 @@
     "team": "צוות",
     "this-board": "לוח זה",
     "this-card": "כרטיס זה",
-    "spent-time-hours": "Spent time (hours)",
-    "overtime-hours": "Overtime (hours)",
-    "overtime": "Overtime",
-    "has-overtime-cards": "Has overtime cards",
-    "has-spenttime-cards": "Has spenttime cards",
+    "spent-time-hours": "זמן שהושקע (שעות)",
+    "overtime-hours": "שעות נוספות",
+    "overtime": "שעות נוספות",
+    "has-overtime-cards": "יש כרטיסי שעות נוספות",
+    "has-spenttime-cards": "יש כרטיסי זמן שהושקע",
     "time": "זמן",
     "title": "כותרת",
     "tracking": "מעקב",
diff --git a/package.json b/package.json
index 65800aa1..240acf2c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "0.57.0",
+  "version": "0.58.0",
   "description": "The open-source Trello-like kanban",
   "private": true,
   "scripts": {
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index a49f6dea..7b7fa2b1 100644
--- a/sandstorm-pkgdef.capnp
+++ b/sandstorm-pkgdef.capnp
@@ -25,7 +25,7 @@ const pkgdef :Spk.PackageDefinition = (
     appVersion = 43,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "0.57.0~2017-11-23"),
+    appMarketingVersion = (defaultText = "0.58.0~2017-11-23"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,