diff options
author | Christopher Smith <chris@jalakai.co.uk> | 2013-10-21 18:54:34 +0100 |
---|---|---|
committer | Christopher Smith <chris@jalakai.co.uk> | 2013-10-21 18:54:34 +0100 |
commit | fa457f5d82989812f1961cb9643c0b55824ba0b3 (patch) | |
tree | ea4e6325a9a9d760f6603758449a70ac50cc052d /lib/plugins/plugin | |
parent | 4b94edc8e8badb6bcdc25b41f73310a8e323ba92 (diff) | |
parent | 7951a37379700f564a20c882a920086b49c473c8 (diff) | |
download | rpg-fa457f5d82989812f1961cb9643c0b55824ba0b3.tar.gz rpg-fa457f5d82989812f1961cb9643c0b55824ba0b3.tar.bz2 |
Merge branch 'master' into FS#2867
Diffstat (limited to 'lib/plugins/plugin')
-rw-r--r-- | lib/plugins/plugin/classes/ap_info.class.php | 2 | ||||
-rw-r--r-- | lib/plugins/plugin/lang/da/lang.php | 3 | ||||
-rw-r--r-- | lib/plugins/plugin/lang/he/lang.php | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/lib/plugins/plugin/classes/ap_info.class.php b/lib/plugins/plugin/classes/ap_info.class.php index b3826b944..89b78fa2d 100644 --- a/lib/plugins/plugin/classes/ap_info.class.php +++ b/lib/plugins/plugin/classes/ap_info.class.php @@ -14,7 +14,7 @@ class ap_info extends ap_manage { usort($component_list, array($this,'component_sort')); foreach ($component_list as $component) { - if (($obj = &plugin_load($component['type'],$component['name'],false,true)) === null) continue; + if (($obj = plugin_load($component['type'],$component['name'],false,true)) === null) continue; $compname = explode('_',$component['name']); if($compname[1]){ diff --git a/lib/plugins/plugin/lang/da/lang.php b/lib/plugins/plugin/lang/da/lang.php index d2751fa1b..07077eaa1 100644 --- a/lib/plugins/plugin/lang/da/lang.php +++ b/lib/plugins/plugin/lang/da/lang.php @@ -12,6 +12,7 @@ * @author rasmus@kinnerup.com * @author Michael Pedersen subben@gmail.com * @author Mikael Lyngvig <mikael@lyngvig.org> + * @author Jens Hyllegaard <jens.hyllegaard@gmail.com> */ $lang['menu'] = 'Håndter udvidelser'; $lang['download'] = 'Hent og tilføj ny udvidelse'; @@ -23,7 +24,7 @@ $lang['btn_settings'] = 'indstillinger'; $lang['btn_download'] = 'Hent'; $lang['btn_enable'] = 'Gem'; $lang['url'] = 'URL-adresse'; -$lang['installed'] = 'Tliføjet:'; +$lang['installed'] = 'Tilføjet:'; $lang['lastupdate'] = 'Sidst opdateret:'; $lang['source'] = 'Kilde:'; $lang['unknown'] = 'ukendt'; diff --git a/lib/plugins/plugin/lang/he/lang.php b/lib/plugins/plugin/lang/he/lang.php index 47253e335..7753c23cf 100644 --- a/lib/plugins/plugin/lang/he/lang.php +++ b/lib/plugins/plugin/lang/he/lang.php @@ -1,8 +1,8 @@ <?php + /** - * hebrew language file - * * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * * @author DoK <kamberd@yahoo.com> * @author Dotan Kamber <kamberd@yahoo.com> * @author Moshe Kaplan <mokplan@gmail.com> |