[geeklog-cvs] geeklog: Merged with upstream
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Tue Apr 10 12:40:57 EDT 2012
changeset 8590:2da121130eca
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/2da121130eca
user: Rouslan Placella <rouslan at placella.com>
date: Tue Apr 10 17:39:02 2012 +0100
description:
Merged with upstream
diffstat:
language/afrikaans.php | 77 +-
language/afrikaans_utf-8.php | 77 +-
language/bosnian.php | 77 +-
language/bosnian_utf-8.php | 77 +-
language/bulgarian.php | 77 +-
language/bulgarian_utf-8.php | 77 +-
language/catalan.php | 77 +-
language/catalan_utf-8.php | 77 +-
language/chinese_simplified_utf-8.php | 77 +-
language/chinese_traditional_utf-8.php | 77 +-
language/croatian.php | 77 +-
language/croatian_utf-8.php | 77 +-
language/czech.php | 77 +-
language/czech_utf-8.php | 77 +-
language/danish.php | 77 +-
language/danish_utf-8.php | 77 +-
language/dutch.php | 77 +-
language/dutch_utf-8.php | 77 +-
language/english.php | 4424 +++++----
language/english_utf-8.php | 4 +-
language/estonian.php | 77 +-
language/estonian_utf-8.php | 77 +-
language/farsi_utf-8.php | 77 +-
language/finnish.php | 77 +-
language/finnish_utf-8.php | 77 +-
language/french_canada.php | 77 +-
language/french_canada_utf-8.php | 77 +-
language/french_france.php | 76 +-
language/french_france_utf-8.php | 441 +-
language/german.php | 131 +-
language/german_formal.php | 131 +-
language/german_formal_utf-8.php | 131 +-
language/german_utf-8.php | 131 +-
language/hebrew_utf-8.php | 77 +-
language/hellenic.php | 77 +-
language/hellenic_utf-8.php | 77 +-
language/indonesian.php | 77 +-
language/indonesian_utf-8.php | 77 +-
language/italian.php | 76 +-
language/italian_utf-8.php | 76 +-
language/japanese_utf-8.php | 74 +-
language/korean.php | 77 +-
language/korean_utf-8.php | 77 +-
language/norwegian.php | 77 +-
language/norwegian_utf-8.php | 77 +-
language/polish.php | 77 +-
language/polish_utf-8.php | 77 +-
language/portuguese.php | 77 +-
language/portuguese_brazil.php | 77 +-
language/portuguese_brazil_utf-8.php | 77 +-
language/portuguese_utf-8.php | 77 +-
language/romanian.php | 77 +-
language/romanian_utf-8.php | 77 +-
language/russian.php | 77 +-
language/russian_utf-8.php | 77 +-
language/serbian.php | 77 +-
language/serbian_utf-8.php | 77 +-
language/slovak.php | 77 +-
language/slovak_utf-8.php | 77 +-
language/slovenian.php | 77 +-
language/slovenian_utf-8.php | 77 +-
language/spanish.php | 77 +-
language/spanish_argentina.php | 77 +-
language/spanish_argentina_utf-8.php | 77 +-
language/spanish_utf-8.php | 77 +-
language/swedish.php | 77 +-
language/swedish_utf-8.php | 77 +-
language/turkish.php | 77 +-
language/turkish_utf-8.php | 77 +-
language/ukrainian.php | 77 +-
language/ukrainian_koi8-u.php | 77 +-
language/ukrainian_utf-8.php | 77 +-
plugins/calendar/autoinstall.php | 2 +-
plugins/calendar/functions.inc | 81 +
plugins/calendar/install_defaults.php | 6 +-
plugins/calendar/install_updates.php | 6 +-
plugins/calendar/language/czech.php | 20 +-
plugins/calendar/language/czech_utf-8.php | 20 +-
plugins/calendar/language/danish.php | 20 +-
plugins/calendar/language/danish_utf-8.php | 20 +-
plugins/calendar/language/dutch.php | 20 +-
plugins/calendar/language/dutch_utf-8.php | 20 +-
plugins/calendar/language/english.php | 4 +-
plugins/calendar/language/english_utf-8.php | 4 +-
plugins/calendar/language/estonian.php | 20 +-
plugins/calendar/language/estonian_utf-8.php | 20 +-
plugins/calendar/language/french_canada.php | 20 +-
plugins/calendar/language/french_canada_utf-8.php | 20 +-
plugins/calendar/language/french_france.php | 20 +-
plugins/calendar/language/french_france_utf-8.php | 25 +-
plugins/calendar/language/german.php | 20 +-
plugins/calendar/language/german_formal.php | 20 +-
plugins/calendar/language/german_formal_utf-8.php | 20 +-
plugins/calendar/language/german_utf-8.php | 20 +-
plugins/calendar/language/hebrew_utf-8.php | 20 +-
plugins/calendar/language/italian.php | 20 +-
plugins/calendar/language/italian_utf-8.php | 20 +-
plugins/calendar/language/japanese_utf-8.php | 20 +-
plugins/calendar/language/korean.php | 20 +-
plugins/calendar/language/korean_utf-8.php | 20 +-
plugins/calendar/language/russian.php | 20 +-
plugins/calendar/language/russian_utf-8.php | 20 +-
plugins/calendar/language/slovak.php | 20 +-
plugins/calendar/language/slovak_utf-8.php | 20 +-
plugins/calendar/language/slovenian.php | 20 +-
plugins/calendar/language/slovenian_utf-8.php | 20 +-
plugins/calendar/language/spanish.php | 20 +-
plugins/calendar/language/spanish_utf-8.php | 20 +-
plugins/calendar/language/ukrainian.php | 20 +-
plugins/calendar/language/ukrainian_koi8-u.php | 20 +-
plugins/calendar/language/ukrainian_utf-8.php | 20 +-
plugins/links/language/french_france_utf-8.php | 172 +-
plugins/polls/autoinstall.php | 2 +-
plugins/polls/functions.inc | 80 +
plugins/polls/install_defaults.php | 6 +-
plugins/polls/install_updates.php | 6 +-
plugins/polls/language/chinese_simplified_utf-8.php | 21 +-
plugins/polls/language/chinese_traditional_utf-8.php | 21 +-
plugins/polls/language/dutch.php | 21 +-
plugins/polls/language/dutch_utf-8.php | 21 +-
plugins/polls/language/english.php | 4 +-
plugins/polls/language/english_utf-8.php | 4 +-
plugins/polls/language/estonian.php | 21 +-
plugins/polls/language/estonian_utf-8.php | 21 +-
plugins/polls/language/french_canada.php | 21 +-
plugins/polls/language/french_canada_utf-8.php | 21 +-
plugins/polls/language/french_france.php | 21 +-
plugins/polls/language/french_france_utf-8.php | 96 +-
plugins/polls/language/german.php | 21 +-
plugins/polls/language/german_formal.php | 21 +-
plugins/polls/language/german_formal_utf-8.php | 21 +-
plugins/polls/language/german_utf-8.php | 21 +-
plugins/polls/language/hebrew_utf-8.php | 21 +-
plugins/polls/language/italian.php | 21 +-
plugins/polls/language/italian_utf-8.php | 21 +-
plugins/polls/language/japanese_utf-8.php | 21 +-
plugins/polls/language/korean.php | 21 +-
plugins/polls/language/korean_utf-8.php | 21 +-
plugins/polls/language/russian.php | 21 +-
plugins/polls/language/russian_utf-8.php | 21 +-
plugins/polls/language/slovenian.php | 21 +-
plugins/polls/language/slovenian_utf-8.php | 21 +-
plugins/polls/language/spanish.php | 21 +-
plugins/polls/language/spanish_utf-8.php | 21 +-
plugins/polls/language/ukrainian.php | 21 +-
plugins/polls/language/ukrainian_koi8-u.php | 21 +-
plugins/polls/language/ukrainian_utf-8.php | 21 +-
plugins/spamx/language/dutch.php | 79 +-
plugins/spamx/language/dutch_utf-8.php | 79 +-
plugins/spamx/language/estonian.php | 23 +-
plugins/spamx/language/estonian_utf-8.php | 23 +-
plugins/spamx/language/farsi_utf-8.php | 23 +-
plugins/spamx/language/french_canada.php | 23 +-
plugins/spamx/language/french_canada_utf-8.php | 23 +-
plugins/spamx/language/french_france.php | 23 +-
plugins/spamx/language/french_france_utf-8.php | 25 +-
plugins/spamx/language/hebrew_utf-8.php | 23 +-
plugins/spamx/language/italian.php | 23 +-
plugins/spamx/language/italian_utf-8.php | 23 +-
plugins/spamx/language/japanese_utf-8.php | 23 +-
plugins/spamx/language/russian.php | 23 +-
plugins/spamx/language/russian_utf-8.php | 23 +-
plugins/spamx/language/slovenian.php | 23 +-
plugins/spamx/language/slovenian_utf-8.php | 23 +-
plugins/spamx/language/spanish.php | 23 +-
plugins/spamx/language/spanish_utf-8.php | 23 +-
plugins/spamx/language/ukrainian.php | 23 +-
plugins/spamx/language/ukrainian_koi8-u.php | 23 +-
plugins/spamx/language/ukrainian_utf-8.php | 23 +-
plugins/staticpages/language/chinese_simplified_utf-8.php | 1 +
plugins/staticpages/language/chinese_traditional_utf-8.php | 1 +
plugins/staticpages/language/czech.php | 1 +
plugins/staticpages/language/czech_utf-8.php | 1 +
plugins/staticpages/language/danish.php | 1 +
plugins/staticpages/language/danish_utf-8.php | 1 +
plugins/staticpages/language/dutch.php | 1 +
plugins/staticpages/language/dutch_utf-8.php | 1 +
plugins/staticpages/language/estonian.php | 1 +
plugins/staticpages/language/estonian_utf-8.php | 1 +
plugins/staticpages/language/farsi_utf-8.php | 1 +
plugins/staticpages/language/french_canada.php | 1 +
plugins/staticpages/language/french_canada_utf-8.php | 1 +
plugins/staticpages/language/french_france.php | 1 +
plugins/staticpages/language/french_france_utf-8.php | 20 +-
plugins/staticpages/language/german.php | 1 +
plugins/staticpages/language/german_formal.php | 1 +
plugins/staticpages/language/german_formal_utf-8.php | 1 +
plugins/staticpages/language/german_utf-8.php | 1 +
plugins/staticpages/language/hebrew_utf-8.php | 1 +
plugins/staticpages/language/italian.php | 1 +
plugins/staticpages/language/italian_utf-8.php | 1 +
plugins/staticpages/language/japanese_utf-8.php | 1 +
plugins/staticpages/language/korean.php | 1 +
plugins/staticpages/language/korean_utf-8.php | 1 +
plugins/staticpages/language/polish.php | 1 +
plugins/staticpages/language/polish_utf-8.php | 1 +
plugins/staticpages/language/portuguese_brazil.php | 1 +
plugins/staticpages/language/portuguese_brazil_utf-8.php | 1 +
plugins/staticpages/language/slovenian.php | 1 +
plugins/staticpages/language/slovenian_utf-8.php | 1 +
plugins/staticpages/language/spanish.php | 1 +
plugins/staticpages/language/spanish_utf-8.php | 1 +
plugins/staticpages/language/swedish.php | 1 +
plugins/staticpages/language/swedish_utf-8.php | 1 +
plugins/staticpages/language/turkish.php | 1 +
plugins/staticpages/language/turkish_utf-8.php | 1 +
plugins/staticpages/language/ukrainian.php | 1 +
plugins/staticpages/language/ukrainian_koi8-u.php | 1 +
plugins/staticpages/language/ukrainian_utf-8.php | 1 +
plugins/xmlsitemap/language/french_france_utf-8.php | 32 +-
public_html/admin/install/language/chinese_simplified_utf-8.php | 3 +-
public_html/admin/install/language/chinese_traditional_utf-8.php | 3 +-
public_html/admin/install/language/german.php | 3 +-
public_html/admin/install/language/hebrew_utf-8.php | 3 +-
public_html/admin/install/language/japanese_utf-8.php | 7 +-
public_html/admin/install/language/polish.php | 3 +-
public_html/admin/plugins/spamx/index.php | 2 +-
public_html/directory.php | 2 +-
public_html/docs/history | 25 +-
public_html/layout/newpro/css/common.css | 82 +
public_html/layout/newpro/list.thtml | 1 -
public_html/layout/professional/style.css | 78 +-
public_html/layout/professional_css/css/common.css | 83 +
public_html/layout/professional_css/list.thtml | 1 -
public_html/lib-common.php | 142 +-
system/lib-sessions.php | 48 +-
system/lib-topic.php | 2 +-
227 files changed, 8856 insertions(+), 4461 deletions(-)
diffs (truncated from 27375 to 300 lines):
diff -r 56ee35fb26ee -r 2da121130eca language/afrikaans.php
--- a/language/afrikaans.php Sat Mar 24 12:58:59 2012 +0000
+++ b/language/afrikaans.php Tue Apr 10 17:39:02 2012 +0100
@@ -179,7 +179,10 @@
136 => 'Warning: Javascript recommended for enhanced functionality',
137 => 'Warning: Javascript required to enable functionality',
138 => "Click <a href=\"{$_CONF['site_url']}/usersettings.php\" rel=\"nofollow\">here</a> to disable the advanced editor and use the default editor which does not require JavaScript",
- 139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage"
+ 139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage",
+ 'facebook' => 'Login with Facebook',
+ 'twitter' => 'Login with Twitter',
+ 'linkedin' => 'Login with LinkedIn'
);
###############################################################################
@@ -229,7 +232,8 @@
41 => 'Hello %s,',
42 => 'Unsubscribe',
43 => 'Unsubscribe from reply notifications',
- 44 => 'Your Name'
+ 44 => 'Your Name',
+ 45 => "Thank you for your comment. You must wait {$_CONF['commentspeedlimit']} seconds to post a new comment."
);
###############################################################################
@@ -396,7 +400,9 @@
163 => 'Re-Authentication Failed',
164 => 'You have exceeded the number of allowed attempts for re-authentication. The operation has been aborted and your recent changes were lost, sorry.',
165 => 'Use Advanced Editor',
- 166 => 'Re-synch Remote Account'
+ 166 => 'Re-synch Remote Account',
+ 167 => 'Remote login',
+ 168 => 'You may also login with one on of the below remote authentication services'
);
###############################################################################
@@ -685,8 +691,8 @@
2 => 'Jy het nie voldoende regte om hierdie blok te wysig nie.',
3 => 'Blokverwerker',
4 => 'Daar was \'n probleem met die lees van hierdie voer (sien error.log vir besonderhede).',
- 5 => '',
- 6 => '',
+ 5 => 'Yes',
+ 6 => 'No',
7 => 'Almal',
8 => 'Blok Beveiligingsvlak',
9 => 'Blok Volgorde',
@@ -700,11 +706,11 @@
17 => 'Blokinhoud',
18 => 'Vul asseblief die Blok se titel- en inhoudvelde in',
19 => 'Blokbestuurder',
- 20 => '',
+ 20 => 'Regular Blocks',
21 => 'Blok SecLev',
- 22 => '',
+ 22 => 'Dynamic Blocks',
23 => 'Blok Volgorde',
- 24 => '',
+ 24 => 'Dynamic',
25 => 'Om \'n blok te wysig of verwyder, kliek op daardie blok se wysig ikoon hieronder. Om \'n nuwe blok te skep, kliek op "Maak Nuwe" hierbo. Om \'n blok te skuif, kliek op die pyltjies op of die [R] en [L] bokse.',
26 => 'Uitlegblok',
27 => 'PHP-Blok',
@@ -724,10 +730,10 @@
41 => 'Regs',
42 => 'U moet die bloktitel en blokvolgorde insleutel vir Geeklog se standaardblokke.',
43 => 'Slegs Tuisblad',
- 44 => '',
+ 44 => 'Multiple',
45 => "U probeer om toegang tot 'n blok te verkry waartoe u nie regte het nie. Hierdie poging is aangeteken. Gaan terug na die <a href=\"{$_CONF['site_admin_url']}/block.php\">blokadministrasieskerm</a>.",
46 => 'Skuif',
- 47 => '',
+ 47 => 'None',
48 => 'Bloknaam',
49 => ' (geen spasies en moet uniek wees)',
50 => 'The Block Name can not be empty',
@@ -748,7 +754,8 @@
65 => 'Volgorde',
66 => 'Autotags',
67 => 'Check to allow autotags',
- 68 => 'The feed for this portal block is too long to display. Please set a maximum number of articles to import for the block in the block setup screen, or a global maximum in Geeklog Configuration.'
+ 68 => 'The feed for this portal block is too long to display. Please set a maximum number of articles to import for the block in the block setup screen, or a global maximum in Geeklog Configuration.',
+ 69 => 'Plugin Name'
);
###############################################################################
@@ -882,7 +889,26 @@
27 => 'of Laai Onderwerp Ikoon',
28 => 'Maksimum',
29 => 'Lêer Oplaai Foute',
- 30 => 'Stories in Topic'
+ 30 => 'Stories in Topic',
+ 31 => 'You have used a restricted Topic ID. Please choose another one.',
+ 32 => 'Parent Topic',
+ 33 => 'Inherit',
+ 34 => 'Items of child topic are inherited',
+ 35 => 'Hidden',
+ 36 => 'Topic will be hidden and cannot be viewed directly, only inherited',
+ 37 => 'Root',
+ 38 => 'All',
+ 39 => 'Homepage Only',
+ 40 => 'Assign one or more topics. ',
+ 41 => 'If "All" is selected then the item will appear for all topics. If "Homepage Only" is selected then item will appear just on the homepage. Else you must select at least one topic to assign the item too. ',
+ 42 => 'Inherit contains the list of assigned topics. If the topic is selected then the item will be inherited by the parent topic. You must save your item first before anything is listed in the inherit box. ',
+ 43 => 'Default contains the list of assigned topics. This is the default topic that will be used when displaying the item if the actually topic the user is in is not found. ',
+ 44 => 'Inherit',
+ 45 => 'Default',
+ 46 => 'Your parent topic cannot be the Archive topic. Please choose a different Parent Topic.',
+ 47 => 'An Archive Topic cannot have any child topics. Please remove any child topics before making a topic the Archive Topic.',
+ 48 => 'Parent Topic Id not found.',
+ 'breadcrumb_separator' => '>'
);
###############################################################################
@@ -1757,6 +1783,8 @@
'site_admin_url' => 'Admin URL',
'site_mail' => 'Site E-Mail',
'noreply_mail' => 'No-Reply E-Mail',
+ 'mail_cc_enabled' => 'Allow to Send Carbon Copies',
+ 'mail_cc_default' => '"Carbon Copy" on by Default',
'site_name' => 'Site Name',
'site_slogan' => 'Slogan',
'owner_name' => 'Owner Name',
@@ -1884,7 +1912,6 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
- 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => 'Show "Contributed By"?"',
'hideviewscount' => 'Hide Views Count?',
'hideemailicon' => 'Hide E-Mail Icon?',
@@ -1939,6 +1966,8 @@
'passwordspeedlimit' => 'Password Speed Limit',
'login_attempts' => 'Max. Login Attempts',
'login_speedlimit' => 'Login Speed Limit',
+ 'pass_alg' => 'Password Hash Algorithm',
+ 'pass_stretch' => 'Hash Stretch Count',
'user_html' => 'User HTML',
'admin_html' => 'Admin HTML',
'advanced_html' => 'Additional HTML for Adv. Editor',
@@ -1946,6 +1975,7 @@
'allowed_protocols' => 'Allowed Protocols',
'disable_autolinks' => 'Disable Autotags?',
'clickable_links' => 'Make URLs clickable?',
+ 'linktext_maxlen' => 'Max Link Text Length',
'compressed_output' => 'Send compressed output?',
'frame_options' => 'Protection against "clickjacking"',
'censormode' => 'Censor Mode?',
@@ -1967,6 +1997,8 @@
'article_comment_close_days' => 'Days to close comments (default)',
'comment_close_rec_stories' => 'Number of most recent stories enabled for comments',
'allow_reply_notifications' => 'Allow comment reply notifications?',
+ 'comment_on_same_page' => 'Comment on Same Page?',
+ 'show_comments_at_replying' => 'Show Comments at Replying?',
'search_style' => 'Results List Style',
'search_limits' => 'Page Limits',
'search_show_num' => 'Show Result Number?',
@@ -1977,7 +2009,10 @@
'search_def_keytype' => 'Default Search Method',
'search_def_sort' => 'Default Sort Order',
'autotag_permissions_story' => '[story: ] Permissions',
- 'autotag_permissions_user' => '[user: ] Permissions'
+ 'autotag_permissions_user' => '[user: ] Permissions',
+ 'disable_breadcrumbs_topics' => 'Disable Topic Breadcrumbs',
+ 'disable_breadcrumbs_articles' => 'Disable Article Breadcrumbs',
+ 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs'
);
$LANG_configsubgroups['Core'] = array(
@@ -2033,7 +2068,9 @@
'fs_perm_topic' => 'Topic Default Permission',
'fs_perm_block' => 'Block Default Permission',
'fs_webservices' => 'Webservices',
- 'fs_autotag_permissions' => 'Autotag Usage Permissions'
+ 'fs_autotag_permissions' => 'Autotag Usage Permissions',
+ 'fs_breadcrumbs' => 'Breadcrumbs',
+ 'fs_pass' => 'Password Settings'
);
$LANG_tab['Core'] = array(
@@ -2075,7 +2112,8 @@
'tab_censoring' => 'Censoring',
'tab_iplookup' => 'IP Lookup',
'tab_permissions' => 'Permissions',
- 'tab_webservices' => 'Webservices'
+ 'tab_webservices' => 'Webservices',
+ 'tab_topics' => 'Topics'
);
$LANG_configselects['Core'] = array(
@@ -2107,7 +2145,8 @@
25 => array('New Stories' => 'story', 'New Comments' => 'comment', 'New Trackbacks' => 'trackback', 'New Pingbacks' => 'pingback', 'New Users' => 'user'),
26 => array('G (General Audiences)' => 'G', 'PG (Parental Guidance)' => 'PG', 'R (Restricted)' => 'R', 'X (Explicit)' => 'X'),
27 => array('Hits (asc)' => 'hits|asc', 'Hits (desc)' => 'hits|desc', 'Date (asc)' => 'date|asc', 'Date (desc)' => 'date|desc', 'Title (asc)' => 'title|asc', 'Title (desc)' => 'title|desc', 'Author (asc)' => 'uid|asc', 'Author (desc)' => 'uid|desc'),
- 28 => array('No access' => 0, 'Use' => 2)
+ 28 => array('No access' => 0, 'Use' => 2),
+ 29 => array('md5' => 0, 'sha1' => 1, 'sha256' => 2, 'sha512' => 3, 'blowfish' => 4)
);
###############################################################################
@@ -2122,6 +2161,7 @@
'comparison' => 'This field does not match the comparison operation',
'date' => 'This field must be in date format',
'year' => 'This field must be in year format such as 2010',
+ 'yearOrRange' => 'This field must be in a year format such as 2010 or range like 2010 - 2012',
'time' => 'This field must be in time format',
'datetime' => 'This field must be in datetime format',
'boolean' => 'This field must be in boolean',
@@ -2152,7 +2192,8 @@
'path_to_netpbm' => 'You must set image library to netpbm and fill this field with directory where the binaries from the Netpbm package are kept',
'language' => 'Language file does not exist',
'timezone' => 'Invalid timezone',
- 'single_char' => 'This field must be a single character'
+ 'single_char' => 'This field must be a single character',
+ 'hash' => 'This field must be a hash function supported by your version of PHP'
);
diff -r 56ee35fb26ee -r 2da121130eca language/afrikaans_utf-8.php
--- a/language/afrikaans_utf-8.php Sat Mar 24 12:58:59 2012 +0000
+++ b/language/afrikaans_utf-8.php Tue Apr 10 17:39:02 2012 +0100
@@ -179,7 +179,10 @@
136 => 'Warning: Javascript recommended for enhanced functionality',
137 => 'Warning: Javascript required to enable functionality',
138 => "Click <a href=\"{$_CONF['site_url']}/usersettings.php\" rel=\"nofollow\">here</a> to disable the advanced editor and use the default editor which does not require JavaScript",
- 139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage"
+ 139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage",
+ 'facebook' => 'Login with Facebook',
+ 'twitter' => 'Login with Twitter',
+ 'linkedin' => 'Login with LinkedIn'
);
###############################################################################
@@ -229,7 +232,8 @@
41 => 'Hello %s,',
42 => 'Unsubscribe',
43 => 'Unsubscribe from reply notifications',
- 44 => 'Your Name'
+ 44 => 'Your Name',
+ 45 => "Thank you for your comment. You must wait {$_CONF['commentspeedlimit']} seconds to post a new comment."
);
###############################################################################
@@ -396,7 +400,9 @@
163 => 'Re-Authentication Failed',
164 => 'You have exceeded the number of allowed attempts for re-authentication. The operation has been aborted and your recent changes were lost, sorry.',
165 => 'Use Advanced Editor',
- 166 => 'Re-synch Remote Account'
+ 166 => 'Re-synch Remote Account',
+ 167 => 'Remote login',
+ 168 => 'You may also login with one on of the below remote authentication services'
);
###############################################################################
@@ -685,8 +691,8 @@
2 => 'Jy het nie voldoende regte om hierdie blok te wysig nie.',
3 => 'Blokverwerker',
4 => 'Daar was \'n probleem met die lees van hierdie voer (sien error.log vir besonderhede).',
- 5 => '',
- 6 => '',
+ 5 => 'Yes',
+ 6 => 'No',
7 => 'Almal',
8 => 'Blok Beveiligingsvlak',
9 => 'Blok Volgorde',
@@ -700,11 +706,11 @@
17 => 'Blokinhoud',
18 => 'Vul asseblief die Blok se titel- en inhoudvelde in',
19 => 'Blokbestuurder',
- 20 => '',
+ 20 => 'Regular Blocks',
21 => 'Blok SecLev',
- 22 => '',
+ 22 => 'Dynamic Blocks',
23 => 'Blok Volgorde',
- 24 => '',
+ 24 => 'Dynamic',
25 => 'Om \'n blok te wysig of verwyder, kliek op daardie blok se wysig ikoon hieronder. Om \'n nuwe blok te skep, kliek op "Maak Nuwe" hierbo. Om \'n blok te skuif, kliek op die pyltjies op of die [R] en [L] bokse.',
26 => 'Uitlegblok',
27 => 'PHP-Blok',
@@ -724,10 +730,10 @@
41 => 'Regs',
42 => 'U moet die bloktitel en blokvolgorde insleutel vir Geeklog se standaardblokke.',
43 => 'Slegs Tuisblad',
- 44 => '',
+ 44 => 'Multiple',
45 => "U probeer om toegang tot 'n blok te verkry waartoe u nie regte het nie. Hierdie poging is aangeteken. Gaan terug na die <a href=\"{$_CONF['site_admin_url']}/block.php\">blokadministrasieskerm</a>.",
46 => 'Skuif',
- 47 => '',
+ 47 => 'None',
48 => 'Bloknaam',
49 => ' (geen spasies en moet uniek wees)',
50 => 'The Block Name can not be empty',
@@ -748,7 +754,8 @@
65 => 'Volgorde',
66 => 'Autotags',
67 => 'Check to allow autotags',
- 68 => 'The feed for this portal block is too long to display. Please set a maximum number of articles to import for the block in the block setup screen, or a global maximum in Geeklog Configuration.'
+ 68 => 'The feed for this portal block is too long to display. Please set a maximum number of articles to import for the block in the block setup screen, or a global maximum in Geeklog Configuration.',
+ 69 => 'Plugin Name'
);
More information about the geeklog-cvs
mailing list