[geeklog-hg] geeklog: Merged with upstream
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sun Oct 28 11:24:44 EDT 2012
changeset 8872:f32de78ba49c
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/f32de78ba49c
user: Tom <websitemaster at cogeco.net>
date: Sun Oct 28 10:10:42 2012 -0400
description:
Merged 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 | 1 -
language/english_utf-8.php | 1 -
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 | 4 ++++
language/german_formal.php | 4 ++++
language/german_formal_utf-8.php | 4 ++++
language/german_utf-8.php | 4 ++++
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 | 1 -
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 ++++
72 files changed, 276 insertions(+), 3 deletions(-)
diffs (truncated from 999 to 300 lines):
diff -r 341613bd8934 -r f32de78ba49c language/afrikaans.php
--- a/language/afrikaans.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/afrikaans.php Sun Oct 28 10:10:42 2012 -0400
@@ -909,6 +909,10 @@
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.',
49 => 'This Topic ID is already being used. Please choose another one.',
+ 50 => 'Yes',
+ 51 => 'No',
+ 52 => 'Story',
+ 53 => 'Image',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home'
);
diff -r 341613bd8934 -r f32de78ba49c language/afrikaans_utf-8.php
--- a/language/afrikaans_utf-8.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/afrikaans_utf-8.php Sun Oct 28 10:10:42 2012 -0400
@@ -909,6 +909,10 @@
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.',
49 => 'This Topic ID is already being used. Please choose another one.',
+ 50 => 'Yes',
+ 51 => 'No',
+ 52 => 'Story',
+ 53 => 'Image',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home'
);
diff -r 341613bd8934 -r f32de78ba49c language/bosnian.php
--- a/language/bosnian.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/bosnian.php Sun Oct 28 10:10:42 2012 -0400
@@ -913,6 +913,10 @@
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.',
49 => 'This Topic ID is already being used. Please choose another one.',
+ 50 => 'Yes',
+ 51 => 'No',
+ 52 => 'Story',
+ 53 => 'Image',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home'
);
diff -r 341613bd8934 -r f32de78ba49c language/bosnian_utf-8.php
--- a/language/bosnian_utf-8.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/bosnian_utf-8.php Sun Oct 28 10:10:42 2012 -0400
@@ -913,6 +913,10 @@
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.',
49 => 'This Topic ID is already being used. Please choose another one.',
+ 50 => 'Yes',
+ 51 => 'No',
+ 52 => 'Story',
+ 53 => 'Image',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home'
);
diff -r 341613bd8934 -r f32de78ba49c language/bulgarian.php
--- a/language/bulgarian.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/bulgarian.php Sun Oct 28 10:10:42 2012 -0400
@@ -909,6 +909,10 @@
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.',
49 => 'This Topic ID is already being used. Please choose another one.',
+ 50 => 'Yes',
+ 51 => 'No',
+ 52 => 'Story',
+ 53 => 'Image',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home'
);
diff -r 341613bd8934 -r f32de78ba49c language/bulgarian_utf-8.php
--- a/language/bulgarian_utf-8.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/bulgarian_utf-8.php Sun Oct 28 10:10:42 2012 -0400
@@ -909,6 +909,10 @@
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.',
49 => 'This Topic ID is already being used. Please choose another one.',
+ 50 => 'Yes',
+ 51 => 'No',
+ 52 => 'Story',
+ 53 => 'Image',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home'
);
diff -r 341613bd8934 -r f32de78ba49c language/catalan.php
--- a/language/catalan.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/catalan.php Sun Oct 28 10:10:42 2012 -0400
@@ -907,6 +907,10 @@
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.',
49 => 'This Topic ID is already being used. Please choose another one.',
+ 50 => 'Yes',
+ 51 => 'No',
+ 52 => 'Story',
+ 53 => 'Image',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home'
);
diff -r 341613bd8934 -r f32de78ba49c language/catalan_utf-8.php
--- a/language/catalan_utf-8.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/catalan_utf-8.php Sun Oct 28 10:10:42 2012 -0400
@@ -907,6 +907,10 @@
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.',
49 => 'This Topic ID is already being used. Please choose another one.',
+ 50 => 'Yes',
+ 51 => 'No',
+ 52 => 'Story',
+ 53 => 'Image',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home'
);
diff -r 341613bd8934 -r f32de78ba49c language/chinese_simplified_utf-8.php
--- a/language/chinese_simplified_utf-8.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/chinese_simplified_utf-8.php Sun Oct 28 10:10:42 2012 -0400
@@ -912,6 +912,10 @@
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.',
49 => 'This Topic ID is already being used. Please choose another one.',
+ 50 => 'Yes',
+ 51 => 'No',
+ 52 => 'Story',
+ 53 => 'Image',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home'
);
diff -r 341613bd8934 -r f32de78ba49c language/chinese_traditional_utf-8.php
--- a/language/chinese_traditional_utf-8.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/chinese_traditional_utf-8.php Sun Oct 28 10:10:42 2012 -0400
@@ -912,6 +912,10 @@
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.',
49 => 'This Topic ID is already being used. Please choose another one.',
+ 50 => 'Yes',
+ 51 => 'No',
+ 52 => 'Story',
+ 53 => 'Image',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home'
);
diff -r 341613bd8934 -r f32de78ba49c language/croatian.php
--- a/language/croatian.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/croatian.php Sun Oct 28 10:10:42 2012 -0400
@@ -909,6 +909,10 @@
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.',
49 => 'This Topic ID is already being used. Please choose another one.',
+ 50 => 'Yes',
+ 51 => 'No',
+ 52 => 'Story',
+ 53 => 'Image',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home'
);
diff -r 341613bd8934 -r f32de78ba49c language/croatian_utf-8.php
--- a/language/croatian_utf-8.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/croatian_utf-8.php Sun Oct 28 10:10:42 2012 -0400
@@ -911,6 +911,10 @@
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.',
49 => 'This Topic ID is already being used. Please choose another one.',
+ 50 => 'Yes',
+ 51 => 'No',
+ 52 => 'Story',
+ 53 => 'Image',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home'
);
diff -r 341613bd8934 -r f32de78ba49c language/czech.php
--- a/language/czech.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/czech.php Sun Oct 28 10:10:42 2012 -0400
@@ -908,6 +908,10 @@
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.',
49 => 'This Topic ID is already being used. Please choose another one.',
+ 50 => 'Yes',
+ 51 => 'No',
+ 52 => 'Story',
+ 53 => 'Image',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home'
);
diff -r 341613bd8934 -r f32de78ba49c language/czech_utf-8.php
--- a/language/czech_utf-8.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/czech_utf-8.php Sun Oct 28 10:10:42 2012 -0400
@@ -908,6 +908,10 @@
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.',
49 => 'This Topic ID is already being used. Please choose another one.',
+ 50 => 'Yes',
+ 51 => 'No',
+ 52 => 'Story',
+ 53 => 'Image',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home'
);
diff -r 341613bd8934 -r f32de78ba49c language/danish.php
--- a/language/danish.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/danish.php Sun Oct 28 10:10:42 2012 -0400
@@ -908,6 +908,10 @@
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.',
49 => 'This Topic ID is already being used. Please choose another one.',
+ 50 => 'Yes',
+ 51 => 'No',
+ 52 => 'Story',
+ 53 => 'Image',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home'
);
diff -r 341613bd8934 -r f32de78ba49c language/danish_utf-8.php
--- a/language/danish_utf-8.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/danish_utf-8.php Sun Oct 28 10:10:42 2012 -0400
@@ -908,6 +908,10 @@
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.',
49 => 'This Topic ID is already being used. Please choose another one.',
+ 50 => 'Yes',
+ 51 => 'No',
+ 52 => 'Story',
+ 53 => 'Image',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home'
);
diff -r 341613bd8934 -r f32de78ba49c language/dutch.php
--- a/language/dutch.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/dutch.php Sun Oct 28 10:10:42 2012 -0400
@@ -915,6 +915,10 @@
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.',
49 => 'This Topic ID is already being used. Please choose another one.',
+ 50 => 'Yes',
+ 51 => 'No',
+ 52 => 'Story',
+ 53 => 'Image',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home'
);
diff -r 341613bd8934 -r f32de78ba49c language/dutch_utf-8.php
--- a/language/dutch_utf-8.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/dutch_utf-8.php Sun Oct 28 10:10:42 2012 -0400
@@ -915,6 +915,10 @@
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.',
49 => 'This Topic ID is already being used. Please choose another one.',
+ 50 => 'Yes',
+ 51 => 'No',
+ 52 => 'Story',
+ 53 => 'Image',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home'
);
diff -r 341613bd8934 -r f32de78ba49c language/english.php
--- a/language/english.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/english.php Sun Oct 28 10:10:42 2012 -0400
@@ -870,7 +870,6 @@
6 => 'Deleting a topic deletes all stories, submissions and blocks associated with it (as long as they are only associated with that deleted topic).',
7 => 'Please fill in the Topic ID and Topic Name fields',
8 => 'Topic Manager',
-// 9 => 'To modify or delete a topic, click on that topic. To create a new topic, click on "Create New" above. You will find your access level for each topic in parenthesis. The asterisk(*) denotes the default topic.',
9 => 'To modify or delete a topic, click on that topic\'s edit icon below. To create a new topic, click on "Create New" above. The asterisk(*) denotes the default topic.',
10 => 'Sort Order',
11 => 'Stories/Page',
diff -r 341613bd8934 -r f32de78ba49c language/english_utf-8.php
--- a/language/english_utf-8.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/english_utf-8.php Sun Oct 28 10:10:42 2012 -0400
@@ -870,7 +870,6 @@
6 => 'Deleting a topic deletes all stories, submissions and blocks associated with it (as long as they are only associated with that deleted topic).',
7 => 'Please fill in the Topic ID and Topic Name fields',
8 => 'Topic Manager',
-// 9 => 'To modify or delete a topic, click on that topic. To create a new topic, click on "Create New" above. You will find your access level for each topic in parenthesis. The asterisk(*) denotes the default topic.',
9 => 'To modify or delete a topic, click on that topic\'s edit icon below. To create a new topic, click on "Create New" above. The asterisk(*) denotes the default topic.',
10 => 'Sort Order',
11 => 'Stories/Page',
diff -r 341613bd8934 -r f32de78ba49c language/estonian.php
--- a/language/estonian.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/estonian.php Sun Oct 28 10:10:42 2012 -0400
@@ -910,6 +910,10 @@
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.',
49 => 'This Topic ID is already being used. Please choose another one.',
+ 50 => 'Yes',
+ 51 => 'No',
+ 52 => 'Story',
+ 53 => 'Image',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home'
);
diff -r 341613bd8934 -r f32de78ba49c language/estonian_utf-8.php
--- a/language/estonian_utf-8.php Sun Oct 28 09:58:39 2012 -0400
+++ b/language/estonian_utf-8.php Sun Oct 28 10:10:42 2012 -0400
@@ -910,6 +910,10 @@
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.',
49 => 'This Topic ID is already being used. Please choose another one.',
+ 50 => 'Yes',
+ 51 => 'No',
+ 52 => 'Story',
+ 53 => 'Image',
'breadcrumb_separator' => '>',
More information about the geeklog-cvs
mailing list