[geeklog-cvs] geeklog: Updated help screen, now that it's also possible to mig...

Sun Sep 6 08:55:36 EDT 2009

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/6bf0c8bab156
changeset: 7289:6bf0c8bab156
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 06 13:18:55 2009 +0200
description:
Updated help screen, now that it's also possible to migrate an existing database

diffstat:

 public_html/admin/install/language/chinese_simplified_utf-8.php  |   2 +-
 public_html/admin/install/language/chinese_traditional_utf-8.php |   2 +-
 public_html/admin/install/language/english.php                   |   2 +-
 public_html/admin/install/language/german.php                    |  10 +++++-----
 public_html/admin/install/language/hebrew_utf-8.php              |   2 +-
 public_html/admin/install/language/japanese_utf-8.php            |   2 +-
 public_html/admin/install/language/polish.php                    |   2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diffs (99 lines):

diff -r 71c20c696961 -r 6bf0c8bab156 public_html/admin/install/language/chinese_simplified_utf-8.php

--- a/public_html/admin/install/language/chinese_simplified_utf-8.php	Sun Sep 06 13:07:25 2009 +0200
+++ b/public_html/admin/install/language/chinese_simplified_utf-8.php	Sun Sep 06 13:18:55 2009 +0200
@@ -342,7 +342,7 @@
     'site_mail' => 'è¿™æ˜¯æ‰€æœ‰å¿—ä¹å¯„å‡ºçš„ç”µé‚®çš„å›žä¿¡åœ°å€å’Œåœ¨è¾›è¿ªåŠ çš„è”ç»œä¿¡æ¯.',
     'noreply_mail' => 'è¿™æ˜¯ç³»ç»Ÿç”µé‚®çš„å¯„ä¿¡è€
åœ°å€ç”¨äºŽç”¨æˆ·ç™»è®°æ—¶ç‰ç‰. è¿™åº”å½“æ˜¯è·Ÿç½‘ç«™ç”µé‚®åŒæ ·æˆ–ä¸€ä¸ªæ— æ³•å›žä¿¡çš„åœ°å€é¿å
å†’åè€
å€Ÿç€ç½‘ç«™ç™»è®°æ¥å½•å–ä½ çš„åœ°å€. è‹¥è¿™ç”µé‚®ä¸è·Ÿä¸Šé¢ä¸€æ ·, å»ºè®®ä½ åŠ ä¸€ä¸ªä¿¡æ¯åœ¨ä½ å¯„å‡ºçš„ç”µé‚®é‡Œ.',
     'utf8' => 'æŒ‡ç¤ºä½ æ˜¯å¦è¦ç”¨ UTF-8 ä¸ºä½ ç½‘ç«™çš„é»˜è®¤å—åº“. è¿™åœ¨å¤šè¨€è¯çš„ç½‘ç«™ä¸Šä¼šæœ‰å¸®åŠ©.',
-    'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer.',
+    'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer. Alternatively, you can also migrate the current contents of the database.',
     'plugin_upload' => 'Choose a plugin archive (in .zip, .tar.gz, or .tgz format) to upload and install.'
 );
 
diff -r 71c20c696961 -r 6bf0c8bab156 public_html/admin/install/language/chinese_traditional_utf-8.php
--- a/public_html/admin/install/language/chinese_traditional_utf-8.php	Sun Sep 06 13:07:25 2009 +0200
+++ b/public_html/admin/install/language/chinese_traditional_utf-8.php	Sun Sep 06 13:18:55 2009 +0200
@@ -342,7 +342,7 @@
     'site_mail' => 'é€™æ˜¯æ‰€æœ‰å¿—æ¨‚å¯„å‡ºçš„é›»éƒµçš„å›žä¿¡ä½å€å’Œåœ¨è¾›è¿ªåŠ çš„è¯çµ¡è³‡è¨Š.',
     'noreply_mail' => 'é€™æ˜¯ç³»çµ±é›»éƒµçš„å¯„ä¿¡è€
ä½å€ç”¨æ–¼ç”¨æˆ¶ç™»è¨˜æ™‚ç‰ç‰. é€™æ‡‰ç•¶æ˜¯è·Ÿç¶²ç«™é›»éƒµåŒæ¨£æˆ–ä¸€å€‹ç„¡æ³•å›žä¿¡çš„ä½å€é¿å
å†’åè€
å€Ÿè‘—ç¶²ç«™ç™»è¨˜ä¾†éŒ„å–ä½ çš„åœ°å€. è‹¥é€™é›»éƒµä¸è·Ÿä¸Šé¢ä¸€æ¨£, å»ºè°ä½ åŠ ä¸€å€‹è³‡è¨Šåœ¨ä½ å¯„å‡ºçš„é›»éƒµè£.',
     'utf8' => 'æŒ‡ç¤ºä½ æ˜¯å¦è¦ç”¨ UTF-8 ç‚ºä½ ç¶²ç«™çš„é»˜èªå—å½¢æª”. é€™åœ¨å¤šè¨€èªžçš„ç¶²ç«™ä¸Šæœƒæœ‰å¹«åŠ©.',
-    'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer.',
+    'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer. Alternatively, you can also migrate the current contents of the database.',
     'plugin_upload' => 'Choose a plugin archive (in .zip, .tar.gz, or .tgz format) to upload and install.'
 );
 
diff -r 71c20c696961 -r 6bf0c8bab156 public_html/admin/install/language/english.php
--- a/public_html/admin/install/language/english.php	Sun Sep 06 13:07:25 2009 +0200
+++ b/public_html/admin/install/language/english.php	Sun Sep 06 13:18:55 2009 +0200
@@ -341,7 +341,7 @@
     'site_mail' => 'This is the return address for all email sent by Geeklog and contact info displayed in syndication feeds.',
     'noreply_mail' => 'This is the sender\'s address of emails sent by the system when users register, etc. This should be either the same as Site Email or a bouncing address to prevent spammers from getting your email address by registering on the site. If this is NOT the same as above, there will be a message in sent messages that replying to those emails is recommended.',
     'utf8' => 'Indicate whether to use UTF-8 as the default character set for your site. Recommended especially for multi-lingual setups.',
-    'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer.',
+    'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer. Alternatively, you can also migrate the current contents of the database.',
     'plugin_upload' => 'Choose a plugin archive (in .zip, .tar.gz, or .tgz format) to upload and install.'
 );
 
diff -r 71c20c696961 -r 6bf0c8bab156 public_html/admin/install/language/german.php
--- a/public_html/admin/install/language/german.php	Sun Sep 06 13:07:25 2009 +0200
+++ b/public_html/admin/install/language/german.php	Sun Sep 06 13:18:55 2009 +0200
@@ -327,9 +327,9 @@
 // help.php
 
 $LANG_HELP = array(
-    0 => 'Geeklog Installation Support',
-    'site_name' => 'The name of your website.',
-    'site_slogan' => 'A simple description of your website.',
+    0 => 'Hilfe zur Geeklog-Installation',
+    'site_name' => 'Der Name Deiner Website.',
+    'site_slogan' => 'Ein Motto oder eine kurze Beschreibung Deiner Website.',
     'db_type' => 'Geeklog can be installed using either a MySQL or Microsoft SQL database. If you are not sure which option to select contact your hosting provider.</p><p class="indent"><strong>Hinweis:</strong> InnoDB-Tabellen können zu besserer Performance auf (sehr) großen Websites führen, machen den Backup-Prozess aber komplizierter.',
     'db_host' => 'The network name (or IP address) of your database server. This is typically "localhost". If you are not sure contact your hosting provider.',
     'db_name' => 'The name of your database. If you are not sure what this is contact your hosting provider.',
@@ -341,8 +341,8 @@
     'site_mail' => 'This is the return address for all email sent by Geeklog and contact info displayed in syndication feeds.',
     'noreply_mail' => 'This is the sender\'s address of emails sent by the system when users register, etc. This should be either the same as Site Email or a bouncing address to prevent spammers from getting your email address by registering on the site. If this is NOT the same as above, there will be a message in sent messages that replying to those emails is recommended.',
     'utf8' => 'Indicate whether to use UTF-8 as the default character set for your site. Recommended especially for multi-lingual setups.',
-    'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer.',
-    'plugin_upload' => 'Choose a plugin archive (in .zip, .tar.gz, or .tgz format) to upload and install.'
+    'migrate_file' => 'Wähle ein Backup, das migriert werden soll. Dies kann eine Datei in Deinem "backups"-Verzeichnis sein, Du kannst eine Backup-Datei hochladen, oder Du kannst den aktuellen Inhalt der Datenbank migrieren.',
+    'plugin_upload' => 'Wähle ein Plugin-Archiv (in den Formaten .zip, .tar.gz oder .tgz format) zum Hochladen und Installieren.'
 );
 
 // which texts to use as labels, so they don't have to be translated again
diff -r 71c20c696961 -r 6bf0c8bab156 public_html/admin/install/language/hebrew_utf-8.php
--- a/public_html/admin/install/language/hebrew_utf-8.php	Sun Sep 06 13:07:25 2009 +0200
+++ b/public_html/admin/install/language/hebrew_utf-8.php	Sun Sep 06 13:18:55 2009 +0200
@@ -337,7 +337,7 @@
     'site_mail' => '×–×•×”×™ ×”×›×ª×•×‘×ª ×”×—×•×–×¨×ª ×‘×›×œ ×”×•×“×¢×•×ª ×”××™×ž×™×™×œ ×©×™×©×œ×—×• ×ž-Geeklog ×•×‘×ž×™×“×¢ ×¦×¨×• ×§×©×¨ ×©×ž×•×¦×’ ×‘×”×–× ×•×ª ×¡×™× ×“×™×§×¦×™×”.',
     'noreply_mail' => '×–×•×”×™ ×›×ª×•×‘×ª ×”×©×•×œ×— ×©×œ ×”×•×“×¢×•×ª ××™×ž×™×™×œ ×©× ×©×œ×—×•×ª ×¢×œ ×™×“×™ ×”×ž×¢×¨×›×ª ×›×©×ž×©×ª×ž×©×™× × ×¨×©×ž×™× ×•×›×“×•×ž×”. ×”×™× ×¦×¨×™×›×” ×œ×”×™×•×ª ×–×”×” ×œ×›×ª×•×‘×ª ×”××™×ž×™×™×œ ×©×œ ×”××ª×¨ ××• ×œ×”×™×•×ª ×›×ª×•×‘×ª ×©×œ× ×ž×§×‘×œ×ª ×”×•×“×¢×•×ª ×›×“×™ ×œ×ž× ×•×¢ ×ž×¡×¤××ž×¨×™× ×œ×”×©×™×’ ××ª ×›×ª×•×‘×ª ×”××™×ž×™×™×œ ×©×œ×›× ×¢×œ ×™×“×™ ×”×¨×©×ž×” ×œ××ª×¨. ×× ×”×™× ×œ× ×–×”×” ×œ×›×ª×•×‘×ª ×”×¨×’×™×œ×”, ×ª×”×™×” ×”×•×“×¢×” ×‘×”×•×“×¢×•×ª ×©×™×©×œ×—×• ×©×œ× ×ž×•×ž×œ×¥ ×œ×¢× ×•×ª ×œ×”×Ÿ.',
     'utf8' => '×¦×™×™× ×• ×”×× ×œ×”×©×ª×ž×© ×‘-UTF-8 ×‘×ª×•×¨ ×§×™×“×•×“ ×‘×¨×™×¨×ª ×”×ž×—×“×œ ×©×œ ×”××ª×¨ ×©×œ×›×. ×ž×•×ž×œ×¥ ×‘×¢×™×§×¨ ×œ×”×ª×§× ×•×ª ×¨×‘ ×œ×©×•× ×™×•×ª.',
-    'migrate_file' => '×‘×™×—×¨×• ××ª ×§×•×‘×¥ ×”×’×™×‘×•×™ ×©×‘×¨×¦×•× ×›× ×©×™× ×“×•×“. ×”×•× ×™×›×•×œ ×œ×”×™×•×ª ×§×•×‘×¥ ×§×™×™× ×‘×¡×¤×¨×™×™×ª "backups" ×©×œ×›× ××• ×©×ª×•×›×œ×• ×œ×”×¢×œ×•×ª ×§×•×‘×¥ ×ž×”×ž×—×©×‘ ×©×œ×›×.',
+    'migrate_file' => '×‘×™×—×¨×• ××ª ×§×•×‘×¥ ×”×’×™×‘×•×™ ×©×‘×¨×¦×•× ×›× ×©×™× ×“×•×“. ×”×•× ×™×›×•×œ ×œ×”×™×•×ª ×§×•×‘×¥ ×§×™×™× ×‘×¡×¤×¨×™×™×ª "backups" ×©×œ×›× ××• ×©×ª×•×›×œ×• ×œ×”×¢×œ×•×ª ×§×•×‘×¥ ×ž×”×ž×—×©×‘ ×©×œ×›×. Alternatively, you can also migrate the current contents of the database.',
     'plugin_upload' => '×‘×™×—×¨×• ××¨×›×™×•×Ÿ plugin (×‘×¦×•×¨×ª zip, tar.gz ××• tgz) ×‘×©×‘×™×œ ×œ×”×¢×œ×•×ª ×•×œ×”×ª×§×™×Ÿ.'
 );
 
diff -r 71c20c696961 -r 6bf0c8bab156 public_html/admin/install/language/japanese_utf-8.php
--- a/public_html/admin/install/language/japanese_utf-8.php	Sun Sep 06 13:07:25 2009 +0200
+++ b/public_html/admin/install/language/japanese_utf-8.php	Sun Sep 06 13:18:55 2009 +0200
@@ -343,7 +343,7 @@
     'site_mail' => 'ã‚µã‚¤ãƒˆç®¡ç†è€
ã®Emailã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’å
¥åŠ›ã—ã¾ã™ã€‚',
     'noreply_mail' => 'ã‚µã‚¤ãƒˆç®¡ç†è€
ã®No-Reply Emailï¼ˆè¿”ä¿¡ã‚’å—ã‘ä»˜ã‘ãªã„Emailã‚¢ãƒ‰ãƒ¬ã‚¹ï¼‰ã‚’å
¥åŠ›ã—ã¾ã™ã€‚',
     'utf8' => 'ã‚µã‚¤ãƒˆã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆè¨€èªžã¨ã—ã¦UTF-8ã‚’ä½¿ç”¨ã™ã‚‹ã‹ã©ã†ã‹ã‚’æŒ‡ç¤ºã—ã¾ã™ã€‚å¤šè¨€èªžã‚µã‚¤ãƒˆã‚’ä½œæˆã™ã‚‹ãªã‚‰ã€ãƒã‚§ãƒƒã‚¯ã‚’å
¥ã‚Œã‚‹ã“ã¨ã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚',
-    'migrate_file' => 'ç§»è¡Œã™ã‚‹ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ãƒ•ã‚¡ã‚¤ãƒ«(*.sql)ã‚’é¸æŠžã—ã¾ã™ã€‚"backups"ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªå†
ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ã€ã‚ã‚‹ã„ã¯ã‚ãªãŸã®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ã‹ã‚‰ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã§ãã¾ã™ã€‚',
+    'migrate_file' => 'ç§»è¡Œã™ã‚‹ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ãƒ•ã‚¡ã‚¤ãƒ«(*.sql)ã‚’é¸æŠžã—ã¾ã™ã€‚"backups"ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªå†
ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ã€ã‚ã‚‹ã„ã¯ã‚ãªãŸã®ã‚³ãƒ³ãƒ”ãƒ¥ãƒ¼ã‚¿ã‹ã‚‰ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã§ãã¾ã™ã€‚ Alternatively, you can also migrate the current contents of the database.',
     'plugin_upload' => 'ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã™ã‚‹ãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã®åœ§ç¸®ãƒ•ã‚¡ã‚¤ãƒ«(in .zip, .tar.gz, or .tgz format)ã‚’é¸ã‚“ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„ã€‚'
 );
 
diff -r 71c20c696961 -r 6bf0c8bab156 public_html/admin/install/language/polish.php
--- a/public_html/admin/install/language/polish.php	Sun Sep 06 13:07:25 2009 +0200
+++ b/public_html/admin/install/language/polish.php	Sun Sep 06 13:18:55 2009 +0200
@@ -341,7 +341,7 @@
     'site_mail' => 'This is the return address for all email sent by Geeklog and contact info displayed in syndication feeds.',
     'noreply_mail' => 'This is the sender\'s address of emails sent by the system when users register, etc. This should be either the same as Site Email or a bouncing address to prevent spammers from getting your email address by registering on the site. If this is NOT the same as above, there will be a message in sent messages that replying to those emails is recommended.',
     'utf8' => 'Indicate whether to use UTF-8 as the default character set for your site. Recommended especially for multi-lingual setups.',
-    'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer.',
+    'migrate_file' => 'Choose the backup file you want to migrate. This can either be an exisiting file in your "backups" directory or you can upload a file from your computer. Alternatively, you can also migrate the current contents of the database.',
     'plugin_upload' => 'Choose a plugin archive (in .zip, .tar.gz, or .tgz format) to upload and install.'
 );
 

