Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	app/Locale/de_DE/translations.php

1 files changed, 33 insertions, 21 deletions

diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php
index cde825e2..84da392f 100644
--- a/app/Locale/fi_FI/translations.php
+++ b/app/Locale/fi_FI/translations.php
@@ -260,9 +260,6 @@ return array(
     // 'External authentication failed' => '',
     // 'Your external account is linked to your profile successfully.' => '',
     'Email' => 'Sähköposti',
-    'Link my Google Account' => 'Linkitä Google-tili',
-    'Unlink my Google Account' => 'Poista Google-tilin linkitys',
-    'Login with my Google Account' => 'Kirjaudu Google tunnuksella',
     'Project not found.' => 'Projektia ei löytynyt.',
     'Task removed successfully.' => 'Tehtävä poistettiin onnistuneesti.',
     'Unable to remove this task.' => 'Tehtävän poistaminen epäonnistui.',
@@ -327,9 +324,6 @@ return array(
     'Maximum size: ' => 'Maksimikoko: ',
     'Unable to upload the file.' => 'Tiedoston lataus epäonnistui.',
     'Display another project' => 'Näytä toinen projekti',
-    'Login with my Github Account' => 'Kirjaudu sisään Github-tililläni',
-    'Link my Github Account' => 'Liitä Github-tilini',
-    'Unlink my Github Account' => 'Poista liitos Github-tiliini',
     'Created by %s' => 'Luonut: %s',
     'Last modified on %B %e, %Y at %k:%M %p' => 'Viimeksi muokattu %B %e, %Y kello %H:%M',
     'Tasks Export' => 'Tehtävien vienti',
@@ -395,8 +389,6 @@ return array(
     'Change password' => 'Vaihda salasana',
     'Password modification' => 'Salasanan vaihto',
     'External authentications' => 'Muut tunnistautumistavat',
-    'Google Account' => 'Google-tili',
-    'Github Account' => 'Github-tili',
     'Never connected.' => 'Ei koskaan liitetty.',
     'No account linked.' => 'Tiliä ei ole liitetty.',
     'Account linked.' => 'Tili on liitetty.',
@@ -846,10 +838,6 @@ return array(
     // 'This chart show the average lead and cycle time for the last %d tasks over the time.' => '',
     // 'Average time into each column' => '',
     // 'Lead and cycle time' => '',
-    // 'Google Authentication' => '',
-    // 'Help on Google authentication' => '',
-    // 'Github Authentication' => '',
-    // 'Help on Github authentication' => '',
     // 'Lead time: ' => '',
     // 'Cycle time: ' => '',
     // 'Time spent into each column' => '',
@@ -858,8 +846,6 @@ return array(
     // 'If the task is not closed the current time is used instead of the completion date.' => '',
     // 'Set automatically the start date' => '',
     // 'Edit Authentication' => '',
-    // 'Google Id' => '',
-    // 'Github Id' => '',
     // 'Remote user' => '',
     // 'Remote users do not store their password in Kanboard database, examples: LDAP, Google and Github accounts.' => '',
     // 'If you check the box "Disallow login form", credentials entered in the login form will be ignored.' => '',
@@ -917,14 +903,7 @@ return array(
     // 'Link type' => '',
     // 'Change task color when using a specific task link' => '',
     // 'Task link creation or modification' => '',
-    // 'Login with my Gitlab Account' => '',
     // 'Milestone' => '',
-    // 'Gitlab Authentication' => '',
-    // 'Help on Gitlab authentication' => '',
-    // 'Gitlab Id' => '',
-    // 'Gitlab Account' => '',
-    // 'Link my Gitlab Account' => '',
-    // 'Unlink my Gitlab Account' => '',
     // 'Documentation: %s' => '',
     // 'Switch to the Gantt chart view' => '',
     // 'Reset the search/filter box' => '',
@@ -1118,4 +1097,37 @@ return array(
     // 'Highest priority' => '',
     // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
     // 'Priority: %d' => '',
+    // 'Close a task when there is no activity' => '',
+    // 'Duration in days' => '',
+    // 'Send email when there is no activity on a task' => '',
+    // 'List of external links' => '',
+    // 'Unable to fetch link information.' => '',
+    // 'Daily background job for tasks' => '',
+    // 'Auto' => '',
+    // 'Related' => '',
+    // 'Attachment' => '',
+    // 'Title not found' => '',
+    // 'Web Link' => '',
+    // 'External links' => '',
+    // 'Add external link' => '',
+    // 'Type' => '',
+    // 'Dependency' => '',
+    // 'View internal links' => '',
+    // 'View external links' => '',
+    // 'Add internal link' => '',
+    // 'Add a new external link' => '',
+    // 'Edit external link' => '',
+    // 'External link' => '',
+    // 'Copy and paste your link here...' => '',
+    // 'URL' => '',
+    // 'There is no external link for the moment.' => '',
+    // 'Internal links' => '',
+    // 'There is no internal link for the moment.' => '',
+    // 'Assign to me' => '',
+    // 'Me' => '',
+    // 'Do not duplicate anything' => '',
+    // 'Projects management' => '',
+    // 'Users management' => '',
+    // 'Groups management' => '',
+    // 'Create from another project' => '',
 );