diff options
| -rw-r--r-- | en/about/license/index.php | 5 | ||||
| -rw-r--r-- | en/about/license/license.php | 3 | ||||
| -rw-r--r-- | langs/en/about/license.en.lang | 4 | ||||
| -rw-r--r-- | langs/sl/about/license.sl.lang | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/en/about/license/index.php b/en/about/license/index.php index 4dba6b3df..c4e852814 100644 --- a/en/about/license/index.php +++ b/en/about/license/index.php @@ -35,10 +35,11 @@ $prepared_license_strings = read_license_from_vcs($locale); '<a href="https://wiki.mageia.org/en/Licensing_policy">') . '</p>'; $unofficial_translation = array_shift($prepared_license_strings); $patents_warning = array_pop($prepared_license_strings); - if($locale != 'en') { echo sprintf('<%s>' . $unofficial_translation[0] . '</%s>' . PHP_EOL, $unofficial_translation[1], $unofficial_translation[1]); } + if($locale != 'en') { + echo sprintf('<%s>' . $unofficial_translation[0] . '</%s>' . PHP_EOL, $unofficial_translation[1], $unofficial_translation[1]); + } echo '</div><br>'; - _h('Mageia license', null, 'h2'); foreach($prepared_license_strings as $string) { echo sprintf('<%s>' . $string[0] . '</%s>' . PHP_EOL, $string[1], $string[1]); } diff --git a/en/about/license/license.php b/en/about/license/license.php index 720a0ebdc..4997bd7c7 100644 --- a/en/about/license/license.php +++ b/en/about/license/license.php @@ -2,6 +2,7 @@ function read_license_from_vcs($locale) { $license_strings = array( array('_: You can warn about unofficial translation here'), + array('Introduction', 'h3'), array('The operating system and the different components available in the Mageia distribution \nshall be called the \"Software Products\" hereafter. The Software Products include, but are not \nrestricted to, the set of programs, methods, rules and documentation related to the operating \nsystem and the different components of the Mageia distribution, and any applications \ndistributed with these products provided by Mageia\'s licensors or suppliers.'), array('1. License Agreement', 'h3'), array('Please read this document carefully. This document is a license agreement between you and \nMageia which applies to the Software Products.\nBy installing, duplicating or using any of the Software Products in any manner, you explicitly \naccept and fully agree to conform to the terms and conditions of this License. \nIf you disagree with any portion of the License, you are not allowed to install, duplicate or use \nthe Software Products. \nAny attempt to install, duplicate or use the Software Products in a manner which does not comply \nwith the terms and conditions of this License is void and will terminate your rights under this \nLicense. Upon termination of the License, you must immediately destroy all copies of the \nSoftware Products.'), @@ -43,7 +44,7 @@ function read_license_from_vcs($locale) { foreach($license_strings as $value) { str_replace(array(".", "_"), array(".", "_"), $value[0], $count); $num_of_sentences_for_translation += $count; - if(!empty($po_file[$value[0]]["msgstr"][0]) && $po_file[$value[0]]["msgstr"][0] != $value[0]) { + if(!empty($po_file[$value[0]]["msgstr"][0]) && trim($po_file[$value[0]]["msgstr"][0]) != "" && $po_file[$value[0]]["msgstr"][0] != $value[0]) { $license_string = $po_file[$value[0]]["msgstr"][0]; } else { $num_of_untranslated_sentences += $count; diff --git a/langs/en/about/license.en.lang b/langs/en/about/license.en.lang index 1cbe7a580..085b381a3 100644 --- a/langs/en/about/license.en.lang +++ b/langs/en/about/license.en.lang @@ -1,4 +1,4 @@ -# Generated by extract2lang.php on 2013-07-14T12:30:06+00:00 +# Generated by extract2lang.php on 2013-07-21T16:53:11+00:00 # Domain about/license # include translation strings from: # en/about/license/index.php @@ -18,6 +18,6 @@ Mageia license You can get more information about our licensing policy %shere</a>. -# en/about/license/index.php +46 +# en/about/license/index.php +47 ;Warning about patents Warning about patents diff --git a/langs/sl/about/license.sl.lang b/langs/sl/about/license.sl.lang index 0a30d76a0..e6de98f51 100644 --- a/langs/sl/about/license.sl.lang +++ b/langs/sl/about/license.sl.lang @@ -1,4 +1,4 @@ -# Generated by extract2lang.php on 2013-07-14T12:30:06+00:00 +# Generated by extract2lang.php on 2013-07-21T16:53:11+00:00 # Domain about/license # include translation strings from: # en/about/license/index.php @@ -18,6 +18,6 @@ Licenčna pogodba Mageia Več informacij o licenčni politiki je %stukaj</a>. -# en/about/license/index.php +46 +# en/about/license/index.php +47 ;Warning about patents Opozorilo o patentih |