[geeklog-cvs] geeklog: Merge with upstream
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sun Apr 8 10:04:46 EDT 2012
changeset 8587:782100857d34
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/782100857d34
user: Tom <websitemaster at cogeco.net>
date: Sun Apr 08 10:03:47 2012 -0400
description:
Merge with upstream
diffstat:
language/afrikaans.php | 4 +-
language/afrikaans_utf-8.php | 4 +-
language/bosnian.php | 4 +-
language/bosnian_utf-8.php | 4 +-
language/bulgarian.php | 4 +-
language/bulgarian_utf-8.php | 4 +-
language/catalan.php | 4 +-
language/catalan_utf-8.php | 4 +-
language/chinese_simplified_utf-8.php | 4 +-
language/chinese_traditional_utf-8.php | 4 +-
language/croatian.php | 4 +-
language/croatian_utf-8.php | 4 +-
language/czech.php | 4 +-
language/czech_utf-8.php | 4 +-
language/danish.php | 4 +-
language/danish_utf-8.php | 4 +-
language/dutch.php | 4 +-
language/dutch_utf-8.php | 4 +-
language/english.php | 4424 +++++++++--------
language/english_utf-8.php | 2 +-
language/estonian.php | 4 +-
language/estonian_utf-8.php | 4 +-
language/farsi_utf-8.php | 4 +-
language/finnish.php | 4 +-
language/finnish_utf-8.php | 4 +-
language/french_canada.php | 4 +-
language/french_canada_utf-8.php | 4 +-
language/french_france.php | 4 +-
language/french_france_utf-8.php | 4 +-
language/german.php | 60 +-
language/german_formal.php | 60 +-
language/german_formal_utf-8.php | 60 +-
language/german_utf-8.php | 60 +-
language/hebrew_utf-8.php | 4 +-
language/hellenic.php | 4 +-
language/hellenic_utf-8.php | 4 +-
language/indonesian.php | 4 +-
language/indonesian_utf-8.php | 4 +-
language/italian.php | 4 +-
language/italian_utf-8.php | 4 +-
language/japanese_utf-8.php | 4 +-
language/korean.php | 4 +-
language/korean_utf-8.php | 4 +-
language/norwegian.php | 4 +-
language/norwegian_utf-8.php | 4 +-
language/polish.php | 4 +-
language/polish_utf-8.php | 4 +-
language/portuguese.php | 4 +-
language/portuguese_brazil.php | 4 +-
language/portuguese_brazil_utf-8.php | 4 +-
language/portuguese_utf-8.php | 4 +-
language/romanian.php | 4 +-
language/romanian_utf-8.php | 4 +-
language/russian.php | 4 +-
language/russian_utf-8.php | 4 +-
language/serbian.php | 4 +-
language/serbian_utf-8.php | 4 +-
language/slovak.php | 4 +-
language/slovak_utf-8.php | 4 +-
language/slovenian.php | 4 +-
language/slovenian_utf-8.php | 4 +-
language/spanish.php | 4 +-
language/spanish_argentina.php | 4 +-
language/spanish_argentina_utf-8.php | 4 +-
language/spanish_utf-8.php | 4 +-
language/swedish.php | 4 +-
language/swedish_utf-8.php | 4 +-
language/turkish.php | 4 +-
language/turkish_utf-8.php | 4 +-
language/ukrainian.php | 4 +-
language/ukrainian_koi8-u.php | 4 +-
language/ukrainian_utf-8.php | 4 +-
plugins/calendar/language/czech.php | 251 +-
plugins/calendar/language/czech_utf-8.php | 251 +-
plugins/calendar/language/danish.php | 253 +-
plugins/calendar/language/danish_utf-8.php | 253 +-
plugins/calendar/language/dutch.php | 252 +-
plugins/calendar/language/dutch_utf-8.php | 252 +-
plugins/calendar/language/estonian.php | 255 +-
plugins/calendar/language/estonian_utf-8.php | 255 +-
plugins/calendar/language/french_canada.php | 254 +-
plugins/calendar/language/french_canada_utf-8.php | 254 +-
plugins/calendar/language/french_france.php | 255 +-
plugins/calendar/language/french_france_utf-8.php | 255 +-
plugins/calendar/language/german.php | 252 +-
plugins/calendar/language/german_formal.php | 252 +-
plugins/calendar/language/german_formal_utf-8.php | 252 +-
plugins/calendar/language/german_utf-8.php | 252 +-
plugins/calendar/language/hebrew_utf-8.php | 252 +-
plugins/calendar/language/italian.php | 251 +-
plugins/calendar/language/italian_utf-8.php | 251 +-
plugins/calendar/language/japanese_utf-8.php | 259 +-
plugins/calendar/language/korean.php | 254 +-
plugins/calendar/language/korean_utf-8.php | 254 +-
plugins/calendar/language/russian.php | 251 +-
plugins/calendar/language/russian_utf-8.php | 251 +-
plugins/calendar/language/slovak.php | 251 +-
plugins/calendar/language/slovak_utf-8.php | 251 +-
plugins/calendar/language/slovenian.php | 255 +-
plugins/calendar/language/slovenian_utf-8.php | 255 +-
plugins/calendar/language/spanish.php | 256 +-
plugins/calendar/language/spanish_utf-8.php | 256 +-
plugins/calendar/language/ukrainian.php | 251 +-
plugins/calendar/language/ukrainian_koi8-u.php | 251 +-
plugins/calendar/language/ukrainian_utf-8.php | 251 +-
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/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 +-
134 files changed, 11385 insertions(+), 2577 deletions(-)
diffs (truncated from 16079 to 300 lines):
diff -r 329c8e9e04c0 -r 782100857d34 language/afrikaans.php
--- a/language/afrikaans.php Sun Apr 08 09:59:23 2012 -0400
+++ b/language/afrikaans.php Sun Apr 08 10:03:47 2012 -0400
@@ -400,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'
);
###############################################################################
diff -r 329c8e9e04c0 -r 782100857d34 language/afrikaans_utf-8.php
--- a/language/afrikaans_utf-8.php Sun Apr 08 09:59:23 2012 -0400
+++ b/language/afrikaans_utf-8.php Sun Apr 08 10:03:47 2012 -0400
@@ -400,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'
);
###############################################################################
diff -r 329c8e9e04c0 -r 782100857d34 language/bosnian.php
--- a/language/bosnian.php Sun Apr 08 09:59:23 2012 -0400
+++ b/language/bosnian.php Sun Apr 08 10:03:47 2012 -0400
@@ -404,7 +404,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'
);
###############################################################################
diff -r 329c8e9e04c0 -r 782100857d34 language/bosnian_utf-8.php
--- a/language/bosnian_utf-8.php Sun Apr 08 09:59:23 2012 -0400
+++ b/language/bosnian_utf-8.php Sun Apr 08 10:03:47 2012 -0400
@@ -404,7 +404,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'
);
###############################################################################
diff -r 329c8e9e04c0 -r 782100857d34 language/bulgarian.php
--- a/language/bulgarian.php Sun Apr 08 09:59:23 2012 -0400
+++ b/language/bulgarian.php Sun Apr 08 10:03:47 2012 -0400
@@ -400,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'
);
###############################################################################
diff -r 329c8e9e04c0 -r 782100857d34 language/bulgarian_utf-8.php
--- a/language/bulgarian_utf-8.php Sun Apr 08 09:59:23 2012 -0400
+++ b/language/bulgarian_utf-8.php Sun Apr 08 10:03:47 2012 -0400
@@ -400,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'
);
###############################################################################
diff -r 329c8e9e04c0 -r 782100857d34 language/catalan.php
--- a/language/catalan.php Sun Apr 08 09:59:23 2012 -0400
+++ b/language/catalan.php Sun Apr 08 10:03:47 2012 -0400
@@ -398,7 +398,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'
);
###############################################################################
diff -r 329c8e9e04c0 -r 782100857d34 language/catalan_utf-8.php
--- a/language/catalan_utf-8.php Sun Apr 08 09:59:23 2012 -0400
+++ b/language/catalan_utf-8.php Sun Apr 08 10:03:47 2012 -0400
@@ -398,7 +398,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'
);
###############################################################################
diff -r 329c8e9e04c0 -r 782100857d34 language/chinese_simplified_utf-8.php
--- a/language/chinese_simplified_utf-8.php Sun Apr 08 09:59:23 2012 -0400
+++ b/language/chinese_simplified_utf-8.php Sun Apr 08 10:03:47 2012 -0400
@@ -403,7 +403,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'
);
###############################################################################
diff -r 329c8e9e04c0 -r 782100857d34 language/chinese_traditional_utf-8.php
--- a/language/chinese_traditional_utf-8.php Sun Apr 08 09:59:23 2012 -0400
+++ b/language/chinese_traditional_utf-8.php Sun Apr 08 10:03:47 2012 -0400
@@ -403,7 +403,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'
);
###############################################################################
diff -r 329c8e9e04c0 -r 782100857d34 language/croatian.php
--- a/language/croatian.php Sun Apr 08 09:59:23 2012 -0400
+++ b/language/croatian.php Sun Apr 08 10:03:47 2012 -0400
@@ -400,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'
);
###############################################################################
diff -r 329c8e9e04c0 -r 782100857d34 language/croatian_utf-8.php
--- a/language/croatian_utf-8.php Sun Apr 08 09:59:23 2012 -0400
+++ b/language/croatian_utf-8.php Sun Apr 08 10:03:47 2012 -0400
@@ -402,7 +402,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'
);
###############################################################################
diff -r 329c8e9e04c0 -r 782100857d34 language/czech.php
--- a/language/czech.php Sun Apr 08 09:59:23 2012 -0400
+++ b/language/czech.php Sun Apr 08 10:03:47 2012 -0400
@@ -399,7 +399,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'
);
###############################################################################
diff -r 329c8e9e04c0 -r 782100857d34 language/czech_utf-8.php
--- a/language/czech_utf-8.php Sun Apr 08 09:59:23 2012 -0400
+++ b/language/czech_utf-8.php Sun Apr 08 10:03:47 2012 -0400
@@ -399,7 +399,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'
);
###############################################################################
diff -r 329c8e9e04c0 -r 782100857d34 language/danish.php
--- a/language/danish.php Sun Apr 08 09:59:23 2012 -0400
+++ b/language/danish.php Sun Apr 08 10:03:47 2012 -0400
@@ -399,7 +399,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'
);
###############################################################################
diff -r 329c8e9e04c0 -r 782100857d34 language/danish_utf-8.php
--- a/language/danish_utf-8.php Sun Apr 08 09:59:23 2012 -0400
+++ b/language/danish_utf-8.php Sun Apr 08 10:03:47 2012 -0400
@@ -399,7 +399,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'
);
###############################################################################
diff -r 329c8e9e04c0 -r 782100857d34 language/dutch.php
--- a/language/dutch.php Sun Apr 08 09:59:23 2012 -0400
+++ b/language/dutch.php Sun Apr 08 10:03:47 2012 -0400
@@ -406,7 +406,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'
);
###############################################################################
diff -r 329c8e9e04c0 -r 782100857d34 language/dutch_utf-8.php
--- a/language/dutch_utf-8.php Sun Apr 08 09:59:23 2012 -0400
+++ b/language/dutch_utf-8.php Sun Apr 08 10:03:47 2012 -0400
@@ -406,7 +406,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'
);
###############################################################################
diff -r 329c8e9e04c0 -r 782100857d34 language/english.php
--- a/language/english.php Sun Apr 08 09:59:23 2012 -0400
+++ b/language/english.php Sun Apr 08 10:03:47 2012 -0400
@@ -1,2211 +1,2213 @@
-<?php
-
-###############################################################################
-# english.php
-#
-# This is the English language file for Geeklog
-# Special thanks to Mischa Polivanov for his work on this project
-#
-# Copyright (C) 2000 Jason Whittenburg
-# jwhitten AT securitygeeks DOT com
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-###############################################################################
-
-$LANG_CHARSET = 'iso-8859-1';
-
-###############################################################################
-# Array Format:
-# $LANGXX[YY]: $LANG - variable name
-# XX - file id number
-# YY - phrase id number
-###############################################################################
-
-###############################################################################
-# USER PHRASES - These are file phrases used in end user scripts
-###############################################################################
-
-###############################################################################
-# lib-common.php
-
-$LANG01 = array(
More information about the geeklog-cvs
mailing list