From: Anže Videnič Date: Mon, 4 Jul 2016 14:23:47 +0000 (+0200) Subject: Merge commit '5ce20fc5d56a32584f8a2d18ae7cde91eb12a5a4' into taskChanges X-Git-Tag: timetracker_1.19-1~1700^2^2~1 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/commitdiff_plain/1a77a68a1622313c9ab4aaab0e39392450aa39cf?hp=3334a1d8a3cc149e014b84b6e46ee9d70fac6663 Merge commit '5ce20fc5d56a32584f8a2d18ae7cde91eb12a5a4' into taskChanges --- diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php index ed4c5195..e76482d0 100644 --- a/WEB-INF/lib/ttTeamHelper.class.php +++ b/WEB-INF/lib/ttTeamHelper.class.php @@ -758,7 +758,7 @@ class ttTeamHelper { $count++; $inactive_teams[] = $team_id; // Limit the array size for perfomance by allowing this operation on small chunks only. - if ($count >= 25) break; + if ($count >= 100) break; } } return $inactive_teams; diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php index 88f08e13..b0a022df 100644 --- a/WEB-INF/resources/fi.lang.php +++ b/WEB-INF/resources/fi.lang.php @@ -44,8 +44,7 @@ $i18n_key_words = array( 'menu.create_team' => 'Luo tiimi', 'menu.profile' => 'Profiili', 'menu.time' => 'Tunnit', -// TODO: translate the following: -// 'menu.expenses' => 'Expenses', +'menu.expenses' => 'Kulut', 'menu.reports' => 'Raportit', 'menu.charts' => 'Kaaviot', 'menu.projects' => 'Projektit', @@ -57,15 +56,12 @@ $i18n_key_words = array( 'menu.options' => 'Optiot', // Footer - strings on the bottom of most pages. -// TODO: translate the following: -// 'footer.contribute_msg' => 'You can contribute to Time Tracker in different ways.', +'footer.contribute_msg' => 'Voit osallistua Time Tracker -sovelluksen tuotekehitykseen monin tavoin.', // 'Credits' is a bit difficult to translate, the exact literal term might be 'Ansiot' or 'Antaa tunnustus' but that's not widely used in this meaning. // The term that is used is something like 'We are thanking' ('Kiitämme') but that does not sound good, either. So I just let it be as it was for time being as everybody (?) understands the meaning anyway. 'footer.credits' => 'Credits', 'footer.license' => 'Lisenssi', -// TODO: translate the following: -// 'footer.improve' => 'Contribute', // Translators: this could mean "Improve", if it makes better sense in your language. - // This is a link to a webpage that describes how to contribute to the project. +'footer.improve' => 'Osallistu kehitystyöhön', // Error messages. 'error.access_denied' => 'Pääsy estetty.', @@ -89,8 +85,7 @@ $i18n_key_words = array( 'error.no_login' => 'Tuntematon käyttäjänimi.', 'error.no_teams' => 'Tietokanta on tyhjä. Kirjaudu ylläpitäjänä ja luo uusi tiimi.', 'error.upload' => 'Virhe tiedoston lataus.', -// TODO: Translate the following: -// 'error.range_locked' => 'Date range is locked.', +'error.range_locked' => 'Aikaväli on lukittu.', 'error.mail_send' => 'Virhe postinlähetyksessä.', 'error.no_email' => 'Käyttäjätunnukseen ei ole liitetty sähköpostiosoitetta.', 'error.uncompleted_exists' => 'Kesken oleva syötetieto on jo olemassa. Sulje tai poista se.', @@ -186,8 +181,7 @@ $i18n_key_words = array( 'label.role_manager' => '(esimies)', 'label.role_comanager' => '(apu-esimies)', 'label.role_admin' => '(ylläpitäjä)', -// Translate the following string. -// 'label.page' => 'Page', +'label.page' => 'Sivu', // Labels for plugins (extensions to Time Tracker that provide additional features). 'label.custom_fields' => 'Omat kentät', 'label.type' => 'Tyyppi', @@ -198,9 +192,6 @@ $i18n_key_words = array( 'label.cron_schedule' => 'Cron-ajoitus', 'label.what_is_it' => 'Mikä se on?', -// TODO? missing? -'label.page' => 'Sivu', - // Form titles. 'title.login' => 'Kirjautuminen', 'title.teams' => 'Tiimit', @@ -257,10 +248,7 @@ $i18n_key_words = array( 'title.cf_add_dropdown_option' => 'Vaihtoehdon lisäys', 'title.cf_edit_dropdown_option' => 'Vaihtoehdon muokkaus', 'title.cf_delete_dropdown_option' => 'Vaihtoehdon poisto', -// NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks). -// It is also a name for the Locking plugin on the Team profile page. -// TODO: Translate the following: -// 'title.locking' => 'Locking', +'title.locking' => 'Lukitus', // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here. // Strings that are used in a single form must go to the specific form section. @@ -289,7 +277,7 @@ $i18n_key_words = array( // Strings that are used on multiple unrelated forms should be placed in shared sections such as label., etc. // Login form. See example at https://timetracker.anuko.com/login.php. -'form.login.forgot_password' => 'Salasana hukassa?', +'form.login.forgot_password' => 'Salasana unohtunut?', 'form.login.about' =>'Anuko Time Tracker on yksinkertainen ja helppokäyttöinen vapaan koodin tuntiseurantaohjelmisto.', // Resetting Password form. See example at https://timetracker.anuko.com/password_reset.php. diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php index 187bc813..e2a9dd02 100644 --- a/WEB-INF/resources/nl.lang.php +++ b/WEB-INF/resources/nl.lang.php @@ -86,8 +86,7 @@ $i18n_key_words = array( 'error.no_login' => 'Een medewerker met deze inlognaam bestaat niet.', 'error.no_teams' => 'Uw database is leeg. Meld je aan als admin en maak een nieuw team.', 'error.upload' => 'Fout bij het uploaden van het bestand.', -// TODO: Translate the following: -// 'error.range_locked' => 'Date range is locked.', +'error.range_locked' => 'Datums zijn geblokkeerd.', 'error.mail_send' => 'Fout bij het versturen van een e-mailbericht.', 'error.no_email' => 'Geen e-mailadres bekend voor dit account.', 'error.uncompleted_exists' => 'Niet afgeronde invoer bestaat al. Sluit of verwijder deze.', @@ -250,10 +249,7 @@ $i18n_key_words = array( 'title.cf_add_dropdown_option' => 'Uitvouwmogelijkheid toevoegen', 'title.cf_edit_dropdown_option' => 'Uitvouwmogelijkheid bewerken', 'title.cf_delete_dropdown_option' => 'Uitvouwmogelijkheid verwijderen', -// NOTE TO TRANSLATORS: Locking is a feature to lock records from modifications (ex: weekly on Mondays we lock all previous weeks). -// It is also a name for the Locking plugin on the Team profile page. -// TODO: Translate the following: -// 'title.locking' => 'Locking', +'title.locking' => 'Blokkeren', // Section for common strings inside combo boxes on forms. Strings shared between forms shall be placed here. // Strings that are used in a single form must go to the specific form section. diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 6921dfc8..f9a7eddc 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.9.25.3497 | Copyright © Anuko | +  Anuko Time Tracker 1.9.25.3499 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/mobile/time.tpl b/WEB-INF/templates/mobile/time.tpl index 46d8a5e6..8a57c8c1 100644 --- a/WEB-INF/templates/mobile/time.tpl +++ b/WEB-INF/templates/mobile/time.tpl @@ -41,7 +41,7 @@ task_names = new Array(); empty_label_project = '{$i18n.dropdown.select|escape:'javascript'}'; empty_label_task = '{$i18n.dropdown.select|escape:'javascript'}'; -// The populateDropdowns function populates the "project" and "task" dropdown controls +// The fillDropdowns function populates the "project" and "task" dropdown controls // with relevant values. function fillDropdowns() { if(document.body.contains(document.timeRecordForm.client)) diff --git a/WEB-INF/templates/mobile/time_edit.tpl b/WEB-INF/templates/mobile/time_edit.tpl index 7d1e66fe..f6381d6a 100644 --- a/WEB-INF/templates/mobile/time_edit.tpl +++ b/WEB-INF/templates/mobile/time_edit.tpl @@ -41,7 +41,7 @@ task_names = new Array(); empty_label_project = '{$i18n.dropdown.select|escape:'javascript'}'; empty_label_task = '{$i18n.dropdown.select|escape:'javascript'}'; -// The populateDropdowns function populates the "project" and "task" dropdown controls +// The fillDropdowns function populates the "project" and "task" dropdown controls // with relevant values. function fillDropdowns() { if(document.body.contains(document.timeRecordForm.client)) diff --git a/WEB-INF/templates/mobile/timer.tpl b/WEB-INF/templates/mobile/timer.tpl index 5df54cb8..c8df7988 100644 --- a/WEB-INF/templates/mobile/timer.tpl +++ b/WEB-INF/templates/mobile/timer.tpl @@ -41,13 +41,13 @@ task_names = new Array(); empty_label_project = '{$i18n.dropdown.select|escape:'javascript'}'; empty_label_task = '{$i18n.dropdown.select|escape:'javascript'}'; -// The populateDropdowns function populates the "project" and "task" dropdown controls +// The fillDropdowns function populates the "project" and "task" dropdown controls // with relevant values. function fillDropdowns() { - if(document.body.contains(document.timeRecordForm.client)) - fillProjectDropdown(document.timeRecordForm.client.value); + if(document.body.contains(document.timerRecordForm.client)) + fillProjectDropdown(document.timerRecordForm.client.value); - fillTaskDropdown(document.timeRecordForm.project.value); + fillTaskDropdown(document.timerRecordForm.project.value); } // The fillProjectDropdown function populates the project combo box with diff --git a/WEB-INF/templates/time.tpl b/WEB-INF/templates/time.tpl index 089e57cc..80b111ba 100644 --- a/WEB-INF/templates/time.tpl +++ b/WEB-INF/templates/time.tpl @@ -41,7 +41,7 @@ task_names = new Array(); empty_label_project = '{$i18n.dropdown.select|escape:'javascript'}'; empty_label_task = '{$i18n.dropdown.select|escape:'javascript'}'; -// The populateDropdowns function populates the "project" and "task" dropdown controls +// The fillDropdowns function populates the "project" and "task" dropdown controls // with relevant values. function fillDropdowns() { if(document.body.contains(document.timeRecordForm.client)) diff --git a/WEB-INF/templates/time_edit.tpl b/WEB-INF/templates/time_edit.tpl index 03e00087..c6431d90 100644 --- a/WEB-INF/templates/time_edit.tpl +++ b/WEB-INF/templates/time_edit.tpl @@ -41,7 +41,7 @@ task_names = new Array(); empty_label_project = '{$i18n.dropdown.select|escape:'javascript'}'; empty_label_task = '{$i18n.dropdown.select|escape:'javascript'}'; -// The populateDropdowns function populates the "project" and "task" dropdown controls +// The fillDropdowns function populates the "project" and "task" dropdown controls // with relevant values. function fillDropdowns() { if(document.body.contains(document.timeRecordForm.client))