Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/Job/NotificationJob.php

1 files changed, 30 insertions, 33 deletions

diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php
index 92ed3424..7e28e9a9 100644
--- a/app/Locale/sr_Latn_RS/translations.php
+++ b/app/Locale/sr_Latn_RS/translations.php
@@ -299,7 +299,6 @@ return array(
     'Display another project' => 'Prikaži drugi projekat',
     'Created by %s' => 'Kreirao %s',
     'Tasks Export' => 'Izvoz zadataka',
-    'Tasks exportation for "%s"' => 'Izvoz zadataka za "%s"',
     'Start Date' => 'Početni datum',
     'End Date' => 'Krajni datum',
     'Execute' => 'Izvrši',
@@ -322,14 +321,9 @@ return array(
     'New sub-task' => 'Novi Pod-zadatak',
     'New attachment added "%s"' => 'Novi prilog ubačen "%s"',
     'New comment posted by %s' => 'Novi komentar ostavio %s',
-    // 'New attachment' => '',
     // 'New comment' => '',
     'Comment updated' => 'Komentar izmenjen',
     // 'New subtask' => '',
-    // 'Subtask updated' => '',
-    // 'Task updated' => '',
-    'Task closed' => 'Zadatak je zatvoren',
-    'Task opened' => 'Zadatak je otvoren',
     'I want to receive notifications only for those projects:' => 'Želim obaveštenja samo za ovaj projekat:',
     'view the task on Kanboard' => 'Pregledaj zadatke',
     'Public access' => 'Javni pristup',
@@ -386,14 +380,12 @@ return array(
     '%s updated the task #%d' => '%s izmenjen zadatak #%d',
     '%s created the task #%d' => '%s kreirao zadatak #%d',
     '%s closed the task #%d' => '%s zatvorio zadatak #%d',
-    '%s open the task #%d' => '%s otvorio zadatak #%d',
-    '%s moved the task #%d to the column "%s"' => '%s premestio zadatak #%d u kolonu "%s"',
-    '%s moved the task #%d to the position %d in the column "%s"' => '%s premestio zadatak #%d na pozycję %d w kolmnie "%s"',
+    '%s opened the task #%d' => '%s otvorio zadatak #%d',
     'Activity' => 'Aktivnosti',
     'Default values are "%s"' => 'Osnovne vrednosti su: "%s"',
     'Default columns for new projects (Comma-separated)' => 'Osnovne kolone za novi projekat (Odvojeni zarezom)',
     'Task assignee change' => 'Zmień osobę odpowiedzialną',
-    '%s change the assignee of the task #%d to %s' => '%s zamena dodele za zadatak #%d na %s',
+    '%s changed the assignee of the task #%d to %s' => '%s zamena dodele za zadatak #%d na %s',
     '%s changed the assignee of the task %s to %s' => '%s zamena dodele za zadatak %s na %s',
     'New password for the user "%s"' => 'Nova lozinka za korisnika "%s"',
     'Choose an event' => 'Izaberi događaj',
@@ -442,13 +434,10 @@ return array(
     'Percentage' => 'Procenat',
     'Number of tasks' => 'Broj zadataka',
     'Task distribution' => 'Podela zadataka',
-    'Reportings' => 'Izveštaji',
-    'Task repartition for "%s"' => 'Zaduženja zadataka za "%s"',
     'Analytics' => 'Analiza',
     'Subtask' => 'Pod-zadatak',
     'My subtasks' => 'Moji pod-zadaci',
     'User repartition' => 'Zaduženja korisnika',
-    'User repartition for "%s"' => 'Zaduženja korisnika za "%s"',
     'Clone this project' => 'Kopiraj projekat',
     'Column removed successfully.' => 'Kolumna usunięta pomyslnie.',
     'Not enough data to show the graph.' => 'Nedovoljno podataka za grafikon.',
@@ -465,10 +454,8 @@ return array(
     'This value must be numeric' => 'Vrednost mora biti broj',
     'Unable to create this task.' => 'Nije moguće kreirati zadatak.',
     'Cumulative flow diagram' => 'Zbirni dijagram toka',
-    'Cumulative flow diagram for "%s"' => 'Zbirni dijagram toka za "%s"',
     'Daily project summary' => 'Zbirni pregled po danima',
     'Daily project summary export' => 'Izvoz zbirnog pregleda po danima',
-    'Daily project summary export for "%s"' => 'Izvoz zbirnig pregleda po danima za "%s"',
     'Exports' => 'Izvoz',
     // 'This export contains the number of tasks per column grouped per day.' => '',
     'Active swimlanes' => 'Aktivni razdelnik',
@@ -494,7 +481,6 @@ return array(
     'Subtask Id' => 'ID pod-zadania',
     'Subtasks' => 'Pod-zadataka',
     'Subtasks Export' => 'Eksport pod-zadań',
-    'Subtasks exportation for "%s"' => 'Izvoz pod-zadań dla "%s"',
     'Task Title' => 'Naslov zadatka',
     'Untitled' => 'Bez naslova',
     'Application default' => 'Postavke aplikacje',
@@ -601,7 +587,7 @@ return array(
     // 'The currency rate have been added successfully.' => '',
     // 'Unable to add this currency rate.' => '',
     // 'Webhook URL' => '',
-    // '%s remove the assignee of the task %s' => '',
+    // '%s removed the assignee of the task %s' => '',
     // 'Enable Gravatar images' => '',
     // 'Information' => '',
     // 'Check two factor authentication code' => '',
@@ -615,7 +601,6 @@ return array(
     // 'Test your device' => '',
     // 'Assign a color when the task is moved to a specific column' => '',
     // '%s via Kanboard' => '',
-    // 'Burndown chart for "%s"' => '',
     // 'Burndown chart' => '',
     // 'This chart show the task complexity over the time (Work Remaining).' => '',
     // 'Screenshot taken %s' => '',
@@ -680,14 +665,8 @@ return array(
     // 'Move the task to another column when the category is changed' => '',
     // 'Send a task by email to someone' => '',
     // 'Reopen a task' => '',
-    // 'Column change' => '',
-    // 'Position change' => '',
-    // 'Swimlane change' => '',
-    // 'Assignee change' => '',
-    // '[%s] Overdue tasks' => '',
     // 'Notification' => '',
     // '%s moved the task #%d to the first swimlane' => '',
-    // '%s moved the task #%d to the swimlane "%s"' => '',
     // 'Swimlane' => '',
     // 'Gravatar' => '',
     // '%s moved the task %s to the first swimlane' => '',
@@ -758,8 +737,6 @@ return array(
     // 'Search by category: ' => '',
     // 'Search by description: ' => '',
     // 'Search by due date: ' => '',
-    // 'Lead and Cycle time for "%s"' => '',
-    // 'Average time spent into each column for "%s"' => '',
     // 'Average time spent into each column' => '',
     // 'Average time spent' => '',
     // 'This chart show the average time spent into each column for the last %d tasks.' => '',
@@ -800,7 +777,6 @@ return array(
     // 'License:' => '',
     // 'License' => '',
     // 'Enter the text below' => '',
-    // 'Gantt chart for %s' => '',
     // 'Sort by position' => '',
     // 'Sort by date' => '',
     // 'Add task' => '',
@@ -841,8 +817,6 @@ return array(
     // 'Version' => '',
     // 'Plugins' => '',
     // 'There is no plugin loaded.' => '',
-    // 'Set maximum column height' => '',
-    // 'Remove maximum column height' => '',
     // 'My notifications' => '',
     // 'Custom filters' => '',
     // 'Your custom filter have been created successfully.' => '',
@@ -947,7 +921,6 @@ return array(
     // 'Invalid captcha' => '',
     // 'The name must be unique' => '',
     // 'View all groups' => '',
-    // 'View group members' => '',
     // 'There is no user available.' => '',
     // 'Do you really want to remove the user "%s" from the group "%s"?' => '',
     // 'There is no group.' => '',
@@ -968,13 +941,10 @@ return array(
     // 'Enter group name...' => '',
     // 'Role:' => '',
     // 'Project members' => '',
-    // 'Compare hours for "%s"' => '',
     // '%s mentioned you in the task #%d' => '',
     // '%s mentioned you in a comment on the task #%d' => '',
     // 'You were mentioned in the task #%d' => '',
     // 'You were mentioned in a comment on the task #%d' => '',
-    // 'Mentioned' => '',
-    // 'Compare Estimated Time vs Actual Time' => '',
     // 'Estimated hours: ' => '',
     // 'Actual hours: ' => '',
     // 'Hours Spent' => '',
@@ -1216,5 +1186,32 @@ return array(
     // 'Global tags' => '',
     // 'There is no global tag at the moment.' => '',
     // 'This field cannot be empty' => '',
+    // 'Close a task when there is no activity in an specific column' => '',
+    // '%s removed a subtask for the task #%d' => '',
+    // '%s removed a comment on the task #%d' => '',
+    // 'Comment removed on task #%d' => '',
+    // 'Subtask removed on task #%d' => '',
     // 'Hide tasks in this column in the dashboard' => '',
+    // '%s removed a comment on the task %s' => '',
+    // '%s removed a subtask for the task %s' => '',
+    // 'Comment removed' => '',
+    // 'Subtask removed' => '',
+    // '%s set a new internal link for the task #%d' => '',
+    // '%s removed an internal link for the task #%d' => '',
+    // 'A new internal link for the task #%d have been defined' => '',
+    // 'Internal link removed for the task #%d' => '',
+    // '%s set a new internal link for the task %s' => '',
+    // '%s removed an internal link for the task %s' => '',
+    // 'Automatically set the due date on task creation' => '',
+    // 'Move the task to another column when closed' => '',
+    // 'Move the task to another column when not moved during a given period' => '',
+    // 'Dashboard for %s' => '',
+    // 'Tasks overview for %s' => '',
+    // 'Subtasks overview for %s' => '',
+    // 'Projects overview for %s' => '',
+    // 'Activity stream for %s' => '',
+    // 'Calendar for %s' => '',
+    // 'Notifications for %s' => '',
+    // 'Subtasks export' => '',
+    // 'Tasks exportation' => '',
 );