From 1dfddcb3fa742afe90df7fefe1471cac06798f2a Mon Sep 17 00:00:00 2001 From: Daniel Lerch Date: Fri, 6 Sep 2019 12:05:27 +0200 Subject: [PATCH] Update copyright information in footers --- inc/ko.inc.php | 17 +++++++++++- index.php | 12 +-------- install/default/config/footer.php | 8 +++--- install/index.php | 12 +-------- locallang/locallang.de.php | 44 +++++++++++++------------------ locallang/locallang.de_DE.php | 32 +++++++++------------- locallang/locallang.en.php | 42 +++++++++++++---------------- locallang/locallang.fr.php | 41 ++++++++++++++-------------- locallang/locallang.nl.php | 42 +++++++++++++---------------- 9 files changed, 110 insertions(+), 140 deletions(-) diff --git a/inc/ko.inc.php b/inc/ko.inc.php index 0c80d01..7009b93 100644 --- a/inc/ko.inc.php +++ b/inc/ko.inc.php @@ -18,7 +18,7 @@ * *******************************************************************************/ -define('VERSION', 'R45'); +define('VERSION', '1.0.0-preview.0'); //Reservation: Objekt-Bild @@ -14000,6 +14000,21 @@ function ko_include_js($files, $module='') { +function ko_print_long_footer() { + echo ''; + echo ''.getLL('kool').' '; + echo sprintf(getLL('copyright_notice'), VERSION, '', '').'
'; + if(WARRANTY_GIVER != "") { + echo sprintf(getLL('copyright_warranty'), ''.WARRANTY_GIVER.''); + } else { + echo getLL('copyright_no_warranty').' '; + } + print " ".sprintf(getLL('copyright_free_software'), '', ''); + print ''; +} + + + function ko_list_set_sorting($table, $sortCol) { $rows = db_select_data($table, 'WHERE 1', 'id,sort,'.$sortCol, "ORDER BY $sortCol ASC"); diff --git a/index.php b/index.php index f3db78b..000b3ce 100644 --- a/index.php +++ b/index.php @@ -347,17 +347,7 @@ '; -print ''.getLL("kool").' '.sprintf(getLL("copyright_notice"), VERSION).'
'; -if(WARRANTY_GIVER != "") { - print sprintf(getLL("copyright_warranty"), ''.WARRANTY_GIVER.''); -} else { - print getLL("copyright_no_warranty")." "; -} -print " ".sprintf(getLL("copyright_free_software"), '', '')."
"; -print getLL("copyright_obstruction"); -print ''; -//--- end of copyright notice +ko_print_long_footer(); ?> diff --git a/install/default/config/footer.php b/install/default/config/footer.php index 965751c..af99c84 100644 --- a/install/default/config/footer.php +++ b/install/default/config/footer.php @@ -1,17 +1,17 @@

- - -'; -//--- end of copyright notice +ko_print_long_footer(); ?>
-kOOL - the church tool + + + + '; -print ''.getLL("kool").' '.sprintf(getLL("copyright_notice"), VERSION).'
'; -if(defined("WARRANTY_GIVER")) { - print sprintf(getLL("copyright_warranty"), ''.WARRANTY_GIVER.' '); -} else { - print getLL("copyright_no_warranty")." "; -} -print sprintf(getLL("copyright_free_software"), '', '')."
"; -print getLL("copyright_obstruction"); -print '
diff --git a/locallang/locallang.de.php b/locallang/locallang.de.php index e9dc2f1..d12b802 100644 --- a/locallang/locallang.de.php +++ b/locallang/locallang.de.php @@ -1,30 +1,25 @@ "kOOL - das Kirchen-Tool", +'kool' => "OpenKool - das Kirchen-Tool", 'submenu_daten_neuer_termin' => "Neuer Termin", 'submenu_daten_all_events' => "Liste anzeigen", 'submenu_daten_calendar' => "Kalender", @@ -1494,11 +1489,10 @@ 'multiedit_title' => "Mehrfache Bearbeitung", 'error_file_not_found' => "Kann Datei nicht finden", 'error_not_allowed' => "Keine Berechtigung", -'copyright_notice' => "Version %s, Copyright © 2003-2015 Renzo Lauper - Plugins are copyright of their respective owners.", -'copyright_warranty' => "Warranty is supplied by %s.", -'copyright_no_warranty' => "kOOL comes with ABSOLUTELY NO WARRANTY.", -'copyright_free_software' => "This is free software, and you are welcome to redistribute it under %scertain conditions%s.", -'copyright_obstruction' => "Obstructing the appearance of this notice is prohibited by law.", +'copyright_notice' => "Version %s, Copyright © 2003-2015 Renzo Lauper, © 2019 Daniel Lerch und %sandere%s.", +'copyright_warranty' => "Die Gewährleistung wird von %s übernommen.", +'copyright_no_warranty' => "Es wird keinerlei Gewährleistung übernommen.", +'copyright_free_software' => "OpenKool ist freie Software. Weitere Informationen finden sie in der %sLizenz%s.", 'submenu_admin_change_password' => "Passwort ändern", 'error_admin_15' => "Bisheriges Passwort stimmt nicht.", 'error_admin_16' => "Die neuen Passwörter stimmen nicht überein.", diff --git a/locallang/locallang.de_DE.php b/locallang/locallang.de_DE.php index 0de3a2c..710f63e 100644 --- a/locallang/locallang.de_DE.php +++ b/locallang/locallang.de_DE.php @@ -1,28 +1,22 @@ "kOOL - the church tool", +'kool' => "OpenKool - the church tool", 'submenu_daten_neuer_termin' => "Add event", 'submenu_daten_all_events' => "List all events", 'submenu_daten_calendar' => "Calendar", @@ -2749,11 +2744,10 @@ 'multiedit_title_forAll' => "Change all to:", 'error_file_not_found' => "Can not find file", 'error_not_allowed' => "Action not allowed", -'copyright_notice' => "Version %s, Copyright © 2003-2015 Renzo Lauper - Plugins are copyright of their respective owners.", +'copyright_notice' => "Version %s, Copyright © 2003-2015 Renzo Lauper, © 2019 Daniel Lerch and %sothers%s.", 'copyright_warranty' => "Warranty is supplied by %s.", -'copyright_no_warranty' => "kOOL comes with ABSOLUTELY NO WARRANTY.", -'copyright_free_software' => "This is free software, and you are welcome to redistribute it under %scertain conditions%s.", -'copyright_obstruction' => "Obstructing the appearance of this notice is prohibited by law.", +'copyright_no_warranty' => "There is absolutely no warranty given.", +'copyright_free_software' => "OpenKool is free software. Refer to our %slicense%s for further information.", 'session_timeout' => 'The current kOOL session is about to time out.', 'session_timedout' => 'The current kOOL session has timed out.', 'peoplesearch_toomany' => 'Too many hits', diff --git a/locallang/locallang.fr.php b/locallang/locallang.fr.php index 8953003..8bb907e 100644 --- a/locallang/locallang.fr.php +++ b/locallang/locallang.fr.php @@ -1,30 +1,25 @@ "OK", +'kool' => "OpenKool - l'outil pour l'église", 'aa_double' => "Il existe déjà une personne avec ce nom dans la base de données. Si vous désirez modifier les informations pour cette personne, vous pouvez cliquer sur son nom.", 'aa_double_choose' => "Il existe déjà plusieurs entrées avec ce nom. Merci de choisir dans la liste celles que vous désirez modifier.", 'aa_double_new' => "Ou alors cliquez sur «Nouveau» afin de créer une nouvelle entrée avec ce nom.", @@ -81,6 +76,10 @@ 'center' => "Milieu", 'children' => "? Et colonne des parents", 'columns' => "Colonne", +'copyright_notice' => "Version %s, Copyright © 2003-2015 Renzo Lauper, © 2019 Daniel Lerch et %sautres%s.", +'copyright_warranty' => "La garantie est fournie par %s.", +'copyright_no_warranty' => "Il n'y a absolument aucune garantie donnée.", +'copyright_free_software' => "OpenKool est logiciel libre. Consultez notre %slicence%s pour plus d'informations.", 'daten_cal_day' => "Calendrier journalier", 'daten_cal_event' => "Événement", 'daten_cal_month' => "Calendrier mensuel", @@ -604,7 +603,6 @@ 'ko_kleingruppen_confirm_delete' => "Vraiment supprimer le GB ?", 'ko_kleingruppen_delete' => "Supprimer le GB", 'ko_leute_anrede_family' => "Famille", -'kool' => "kOOL - l'outil pour l'église", 'kota_formlegend_ko_eventgruppen' => "Ces champs seront préremplis lors de la création d'un nouveau rendez-vous", 'kota_ko_event_enddatum' => "Date de fin", 'kota_ko_event_endzeit' => "Heure de fin", @@ -1045,6 +1043,7 @@ 'next' => "Plus loin", 'no' => "Non", 'not' => "Pas", +'OK' => 'OK', 'ok' => "Ok", 'other' => "Autre", 'page' => "Page", diff --git a/locallang/locallang.nl.php b/locallang/locallang.nl.php index 27d7ee6..bcd28bd 100644 --- a/locallang/locallang.nl.php +++ b/locallang/locallang.nl.php @@ -1,30 +1,25 @@ "kOOL - the church tool", +'kool' => "OpenKool - the church tool", 'submenu_daten_neuer_termin' => "Activiteit toevoegen", 'submenu_daten_all_events' => "Alle Activiteiten tonen", 'submenu_daten_cal_monat' => "Kalender", @@ -86,11 +81,10 @@ 'submenu_fileshare_title_shares' => "Bestanden", 'error_file_not_found' => "Kan bestand niet vinden", 'error_not_allowed' => "Actie niet toegestaan", -'copyright_notice' => "Versie %s, Copyright © 2003-2012 Renzo Lauper - Plugins zijn het copyright van hun respectievelijke eigenaren.", +'copyright_notice' => "Versie %s, Auteursrecht © 2003-2015 Renzo Lauper, © 2019 Daniel Lerch en %sanderen%s.", 'copyright_warranty' => "Garantie wordt verleend door %s.", -'copyright_no_warranty' => "kOOL biedt GEEN ENKELE GARANTIE", -'copyright_free_software' => "Dit is vrije software en het staat u vrij deze opnieuw te distribueren onder %sbepaalde condities%s.", -'copyright_obstruction' => "Het belemmeren van de weergave van dit bericht is door de wet verboden.", +'copyright_no_warranty' => "Er wordt absoluut geen garantie gegeven.", +'copyright_free_software' => "OpenKool is vrije software. Meer informatie is te vinden in de %svergunning%s.", 'fileshare_list_footer_move_label' => "geselecteerde bestanden verplaatsen naar:", 'fileshare_list_footer_move_button1' => "verplaatsen", 'fileshare_list_footer_move_button2' => "kopiëren",