Merge pull-request #847 (recurring tasks)

1 files changed, 47 insertions, 0 deletions

diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php
index 3e1ddd13..576e1a8f 100644
--- a/app/Locale/pt_BR/translations.php
+++ b/app/Locale/pt_BR/translations.php
@@ -846,6 +846,7 @@ return array(
     'Secret key: ' => 'Chave secreta:',
     'Test your device' => 'Teste o seu dispositivo',
     'Assign a color when the task is moved to a specific column' => 'Atribuir uma cor quando a tarefa é movida em uma coluna específica',
+<<<<<<< HEAD
     '%s via Kanboard' => '%s via Kanboard',
     'uploaded by: %s' => 'carregado por: %s',
     'uploaded on: %s' => 'carregado em: %s',
@@ -872,4 +873,50 @@ return array(
     // 'Start to type task title...' => '',
     // 'A task cannot be linked to itself' => '',
     // 'The exact same link already exists' => '',
+    // '%s via Kanboard' => '',
+    // 'uploaded by: %s' => '',
+    // 'uploaded on: %s' => '',
+    // 'size: %s' => '',
+    // 'Burndown chart for "%s"' => '',
+    // 'Burndown chart' => '',
+    // 'This chart show the task complexity over the time (Work Remaining).' => '',
+    // 'Screenshot taken %s' => '',
+    // 'Add a screenshot' => '',
+    // 'Take a screenshot and press CTRL+V or ⌘+V to paste here.' => '',
+    // 'Screenshot uploaded successfully.' => '',
+    // 'SEK - Swedish Krona' => '',
+    // 'The project identifier is an optional alphanumeric code used to identify your project.' => '',
+    // 'Identifier' => '',
+    // 'Postmark (incoming emails)' => '',
+    // 'Help on Postmark integration' => '',
+    // 'Mailgun (incoming emails)' => '',
+    // 'Help on Mailgun integration' => '',
+    // 'Sendgrid (incoming emails)' => '',
+    // 'Help on Sendgrid integration' => '',
+    // 'Disable two factor authentication' => '',
+    // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '',
+    // 'Action date' => '',
+    // 'Base date to calculate new due date' => '',
+    // 'Base date to calculate new due date: %s' => '',
+    // 'Created recurrent task: %s' => '',
+    // 'Day(s)' => '',
+    // 'Edit recurrence' => '',
+    // 'Existing due date' => '',
+    // 'Factor to calculate new due date' => '',
+    // 'Factor to calculate new due date: %s' => '',
+    // 'Generate recurrent task' => '',
+    // 'Month(s)' => '',
+    // 'No recurrent task is scheduled to generate' => '',
+    // 'Recurrence' => '',
+    // 'Recurrent task created by: %s' => '',
+    // 'Recurrent task has been generated' => '',
+    // 'Recurrent task is scheduled to generate' => '',
+    // 'Timeframe to calculate new due date' => '',
+    // 'Timeframe to calculate new due date: %s' => '',
+    // 'Trigger to generate recurrent task' => '',
+    // 'Trigger to generate recurrent task: %s' => '',
+    // 'When task is closed' => '',
+    // 'When task is moved from first column' => '',
+    // 'When task is moved to last column' => '',
+    // 'Year(s)' => '',
 );