php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/docs NEWS,1.1.2.12,1.1.2.13

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27345/docs

Modified Files:
      Tag: branch-smarty
	NEWS 
Log Message:
- Draft for new import framework. It's working, but might need some changes to make it a little more pretty
  Note: Please review your importer methods, like validateData() etc.

- Split importer and exporter up into two menuitems
- Don't let serendipity_guessInput() parse data, it should just act on the data given
- Add 'file' type to serendipity_guessInput(), implementing <input type="file">


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/Attic/NEWS,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -d -r1.1.2.12 -r1.1.2.13
--- NEWS	15 Nov 2004 10:55:31 -0000	1.1.2.12
+++ NEWS	15 Nov 2004 21:06:47 -0000	1.1.2.13
@@ -3,6 +3,9 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Rewrote importer to use import modules and class framework
+      (tomsommer)
+
     * New language: Traditional Chinese (Big5). Thanks to Andrew Huang!
 
     * Recent Entries plugin: New configuration directive to not display
@@ -922,4 +925,4 @@
 
     * Renamed "sebastian's weblog" theme to "blue" (sebastianbergmann)
 
-(Older NEWS see file NEWS_OLD)
\ No newline at end of file
+(Older NEWS see file NEWS_OLD)

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.15.2.10,1.15.2.11 serendipity_lang_cs.inc.php,1.61.2.10,1.61.2.11 serendipity_lang_cz.inc.php,1.61.2.9,1.61.2.10 serendipity_lang_da.inc.php,1.79.2.11,1.79.2.12 serendipity_lang_de.inc.php,1.98.2.12,1.98.2.13 serendipity_lang_en.inc.php,1.79.2.11,1.79.2.12 serendipity_lang_es.inc.php,1.77.2.11,1.77.2.12 serendipity_lang_fr.inc.php,1.58.2.12,1.58.2.13 serendipity_lang_it.inc.php,1.1.2.10,1.1.2.11 serendipity_lang_nl.inc.php,1.36.2.10,1.36.2.11 serendipity_lang_no.inc.php,1.2.2.10,1.2.2.11 serendipity_lang_pt.inc.php,1.36.2.11,1.36.2.12

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27345/lang

Modified Files:
      Tag: branch-smarty
	serendipity_lang_bg.inc.php serendipity_lang_cs.inc.php 
	serendipity_lang_cz.inc.php serendipity_lang_da.inc.php 
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
	serendipity_lang_es.inc.php serendipity_lang_fr.inc.php 
	serendipity_lang_it.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_no.inc.php serendipity_lang_pt.inc.php 
Log Message:
- Draft for new import framework. It's working, but might need some changes to make it a little more pretty
  Note: Please review your importer methods, like validateData() etc.

- Split importer and exporter up into two menuitems
- Don't let serendipity_guessInput() parse data, it should just act on the data given
- Add 'file' type to serendipity_guessInput(), implementing <input type="file">


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.61.2.10
retrieving revision 1.61.2.11
diff -u -d -r1.61.2.10 -r1.61.2.11
--- serendipity_lang_cs.inc.php	15 Nov 2004 10:22:04 -0000	1.61.2.10
+++ serendipity_lang_cs.inc.php	15 Nov 2004 21:06:49 -0000	1.61.2.11
@@ -185,8 +185,6 @@
 @define('ENTRIES_SUCCESSFULLY_INSERTED', 'Záznamy byly vloženy úspìšnì!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Záznamy nebyly vloženy úspìšnì!');
 @define('VIEW_FEED_EXPORT', 'Ukázat export');
-@define('IMPORT', 'Import');
-@define('EXPORT', 'Export');
 @define('YES', 'Ano');
 @define('NO', 'Ne');
 @define('USE_DEFAULT', 'Default');
@@ -473,8 +471,6 @@
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'V obojím');
 
 /* TRANSLATE */
-@define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.');
-@define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries');
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Unknown error occured, file not uploaded. Maybe your filesize is larger than the maximum size allowed by your server installation. Check with your ISP or edit your php.ini file to allow larger file size uploads.');
 @define('COMMENTS_WILL_BE_MODERATED', 'Submitted comments will be subject to moderation before being displayed.'); // Translate
 @define('YOU_HAVE_THESE_OPTIONS', 'You have the following options available:'); // Translate
@@ -591,8 +587,20 @@
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
+@define('IMPORT_ENTRIES', 'Import entries'); // Translate
+@define('EXPORT_ENTRIES', 'Export entries'); // Translate
+@define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate
+@define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate
+@define('IMPORT_SELECT', 'Please select the software you wish to import from'); // Translate
+@define('IMPORT_PLEASE_ENTER', 'Please enter the data as requested below'); // Translate
+@define('IMPORT_NOW', 'Import now!'); // Translate
+@define('IMPORT_STARTING', 'Starting import procedure...'); // Translate
+@define('IMPORT_FAILED', 'Import failed'); // Translate
+@define('IMPORT_DONE', 'Import successfully completed'); // Translate
+@define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate
+@define('EXPORT_FEED', 'Export full RSS feed'); // Translate
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.2.2.10
retrieving revision 1.2.2.11
diff -u -d -r1.2.2.10 -r1.2.2.11
--- serendipity_lang_no.inc.php	15 Nov 2004 10:22:05 -0000	1.2.2.10
+++ serendipity_lang_no.inc.php	15 Nov 2004 21:06:51 -0000	1.2.2.11
@@ -176,8 +176,6 @@
 @define('ENTRIES_SUCCESSFULLY_INSERTED', 'Artikler innsatt uten problemer!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Det var problemer under indsettelsen av artiklene!');
 @define('VIEW_FEED_EXPORT', 'Vis eksportert feed');
-@define('IMPORT', 'Importer');
-@define('EXPORT', 'Eksportér');
 @define('YES', 'Ja');
 @define('NO', 'Nei');
 @define('USE_DEFAULT', 'Default');
@@ -464,8 +462,6 @@
 @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Kun udvidet artikkel');
 @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Kun i oversikten');
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'Hele tiden');
-@define('RSS_IMPORT_DESC', 'RSS-import vil hente en RSS-feed og sette inn alle artiklene i denne i ditt arkiv. Du kan velge om du vil importere disse med UTKAST eller PUBLISER status. Kategorier i den fremmede feeden skal inneholde nøyaktig det samme navnet som de navn du har tastet inn i Serendipity. Via det andre feltet kan du velge hvilken kategori du vil plassere artikler som ikke matcher kategorier i den importerete feeden.');
-@define('RSS_IMPORT_CATEGORY', 'Bruk denne kategorien for kategoriløse artikler');
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Det oppstod en ukjent feil, filen ble ikke lastet opp. Kanskje er din filstørrelse større end den maksimale størrelse tillatt av ditt serveroppsett. Spør din webtilbyder eller rediger din php.ini fil for å tillate uploads av større filer.');
 @define('COMMENTS_WILL_BE_MODERATED', 'Kommentarer på denne artikkelen vil først bli vist når de er blitt godkjendt.');
 @define('YOU_HAVE_THESE_OPTIONS', 'Du har følgende muligheter:');
@@ -586,7 +582,19 @@
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
+@define('IMPORT_ENTRIES', 'Import entries'); // Translate
+@define('EXPORT_ENTRIES', 'Export entries'); // Translate
+@define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate
+@define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate
+@define('IMPORT_SELECT', 'Please select the software you wish to import from'); // Translate
+@define('IMPORT_PLEASE_ENTER', 'Please enter the data as requested below'); // Translate
+@define('IMPORT_NOW', 'Import now!'); // Translate
+@define('IMPORT_STARTING', 'Starting import procedure...'); // Translate
+@define('IMPORT_FAILED', 'Import failed'); // Translate
+@define('IMPORT_DONE', 'Import successfully completed'); // Translate
+@define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate
+@define('EXPORT_FEED', 'Export full RSS feed'); // Translate
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
 
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.36.2.10
retrieving revision 1.36.2.11
diff -u -d -r1.36.2.10 -r1.36.2.11
--- serendipity_lang_nl.inc.php	15 Nov 2004 10:22:05 -0000	1.36.2.10
+++ serendipity_lang_nl.inc.php	15 Nov 2004 21:06:51 -0000	1.36.2.11
@@ -185,8 +185,6 @@
 @define('ENTRIES_SUCCESSFULLY_INSERTED', 'Logs toegevoegd!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Logs werden NIET toegevoegd!');
 @define('VIEW_FEED_EXPORT', 'Toon export lijst');
-@define('IMPORT', 'Import');
-@define('EXPORT', 'Export');
 @define('YES', 'Ja');
 @define('NO', 'Neen');
 @define('USE_DEFAULT', 'Default');
@@ -472,8 +470,6 @@
 @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Extended entry only'); // Translate
 @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Overview page only'); // Translate
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'All times'); //Translate
-@define('RSS_IMPORT_DESC', 'The RSS import opent een RSS feed en voegt alle artikelen toe in de verzameling. Je kan kiezen of je deez wilt importeren als proef als gelijk wilt publiceren. Categorie&euml;n in de ge&iuml;mporteerde feed moeten exact dezelfde naam hebben als in Serendipity. Via de het andere invulveld kun je de categorie kiezen die er anders aan toegekend moet worden.');
-@define('RSS_IMPORT_CATEGORY', 'Gebruik deze categorie voor niet matchende ge&euml;mporteerde artikel');
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Er is een ongedefini&euml;erde fout opgetreden. Het bestand is niet geupload. Mogelijk is de bestandsgrootte groter dan het maximum toegestaan door de server. Vraag je ISP of bewerk je php.ini bestand om groter bestand uploads toe te laten.');
 @define('COMMENTS_WILL_BE_MODERATED', 'Reacties zullen eerst worden gemoderreerd voordat het getoond wordt.');
 @define('YOU_HAVE_THESE_OPTIONS', 'De volgende opties zijn mogelijk:');
@@ -596,8 +592,20 @@
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
+@define('IMPORT_ENTRIES', 'Import entries'); // Translate
+@define('EXPORT_ENTRIES', 'Export entries'); // Translate
+@define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate
+@define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate
+@define('IMPORT_SELECT', 'Please select the software you wish to import from'); // Translate
+@define('IMPORT_PLEASE_ENTER', 'Please enter the data as requested below'); // Translate
+@define('IMPORT_NOW', 'Import now!'); // Translate
+@define('IMPORT_STARTING', 'Starting import procedure...'); // Translate
+@define('IMPORT_FAILED', 'Import failed'); // Translate
+@define('IMPORT_DONE', 'Import successfully completed'); // Translate
+@define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate
+@define('EXPORT_FEED', 'Export full RSS feed'); // Translate
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.79.2.11
retrieving revision 1.79.2.12
diff -u -d -r1.79.2.11 -r1.79.2.12
--- serendipity_lang_en.inc.php	15 Nov 2004 10:22:05 -0000	1.79.2.11
+++ serendipity_lang_en.inc.php	15 Nov 2004 21:06:51 -0000	1.79.2.12
@@ -185,23 +185,6 @@
 @define('ENTRIES_SUCCESSFULLY_INSERTED', 'Entries successfully inserted!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Entries were not successfully inserted!');
 @define('VIEW_FEED_EXPORT', 'View feed export');
-@define('IMPORT', 'Import');
-@define('EXPORT', 'Export');
-@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...');
-@define('IMPORT_AGAIN_FORCE', 'Then try again. Alternatively, you may check the \'force\' box, which will force the entries into the existing architecture.');
-@define('MT_DATA_FILE', 'Movable Type data file');
-@define('FORCE', 'Force');
-@define('WORDPRESS_DATA', 'WordPress data');
-@define('MUST_BE_ADMIN', 'You must be an administrator to complete this action.');
-@define('CREATE_AUTHOR', 'Create author \'%s\'.');
-@define('CREATE_CATEGORY', 'Create category \'%s\'.');
-@define('MYSQL_REQUIRED', 'You must have the MySQL extension in order to perform this action.');
-@define('COULDNT_CONNECT', 'Could not connect to MySQL database: %s.');
-@define('COULDNT_SELECT_DB', 'Could not select database: %s.');
-@define('COULDNT_SELECT_USER_INFO', 'Could not select user information: %s.');
-@define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.');
-@define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.');
-@define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.');
 @define('YES', 'Yes');
 @define('NO', 'No');
 @define('USE_DEFAULT', 'Default');
@@ -483,9 +466,6 @@
 @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Extended entry only');
 @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Overview page only');
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'All times');
-@define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.');
-@define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries');
-
 @define('COMMENTS_WILL_BE_MODERATED', 'Submitted comments will be subject to moderation before being displayed.');
 @define('YOU_HAVE_THESE_OPTIONS', 'You have the following options available:');
 @define('THIS_COMMENT_NEEDS_REVIEW', 'Warning: This comment needs approval before it will be displayed');
@@ -591,5 +571,18 @@
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage');
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend');
 
+@define('IMPORT_ENTRIES', 'Import entries'); // Translate
+@define('EXPORT_ENTRIES', 'Export entries'); // Translate
+@define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate
+@define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate
+@define('IMPORT_SELECT', 'Please select the software you wish to import from'); // Translate
+@define('IMPORT_PLEASE_ENTER', 'Please enter the data as requested below'); // Translate
+@define('IMPORT_NOW', 'Import now!'); // Translate
+@define('IMPORT_STARTING', 'Starting import procedure...'); // Translate
+@define('IMPORT_FAILED', 'Import failed'); // Translate
+@define('IMPORT_DONE', 'Import successfully completed'); // Translate
+@define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate
+@define('EXPORT_FEED', 'Export full RSS feed'); // Translate
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.15.2.10
retrieving revision 1.15.2.11
diff -u -d -r1.15.2.10 -r1.15.2.11
--- serendipity_lang_bg.inc.php	15 Nov 2004 10:22:04 -0000	1.15.2.10
+++ serendipity_lang_bg.inc.php	15 Nov 2004 21:06:49 -0000	1.15.2.11
@@ -179,8 +179,6 @@
 @define('ENTRIES_SUCCESSFULLY_INSERTED', 'Ñúäúðæàíèåòî å ïóáëèêóâàíî óñïåøíî!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Ñúäúðæàíèåòî íå áåïå ïóáëèêóâàíî!');
 @define('VIEW_FEED_EXPORT', 'Ïîêàæè èçíàñÿíåòî íà íîâèíèòå');
-@define('IMPORT', 'Âìúêíè');
-@define('EXPORT', 'Èçíåñè');
 @define('YES', 'Äà');
 @define('NO', 'Íå');
 @define('CHECK_N_SAVE', 'Èçáåðè  &amp; Çàïàçè');
@@ -496,8 +494,6 @@
 @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Extended entry only'); // Translate
 @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Overview page only'); // Translate
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'All times'); // Translate
-@define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.'); // Translate
-@define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries'); // Translate
 @define('COMMENTS_WILL_BE_MODERATED', 'Submitted comments will be subject to moderation before being displayed.'); // Translate
 @define('YOU_HAVE_THESE_OPTIONS', 'You have the following options available:'); // Translate
 @define('THIS_COMMENT_NEEDS_REVIEW', 'Warning: This comment needs approval before it will be displayed'); // Translate
@@ -573,8 +569,20 @@
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
+@define('IMPORT_ENTRIES', 'Import entries'); // Translate
+@define('EXPORT_ENTRIES', 'Export entries'); // Translate
+@define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate
+@define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate
+@define('IMPORT_SELECT', 'Please select the software you wish to import from'); // Translate
+@define('IMPORT_PLEASE_ENTER', 'Please enter the data as requested below'); // Translate
+@define('IMPORT_NOW', 'Import now!'); // Translate
+@define('IMPORT_STARTING', 'Starting import procedure...'); // Translate
+@define('IMPORT_FAILED', 'Import failed'); // Translate
+@define('IMPORT_DONE', 'Import successfully completed'); // Translate
+@define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate
+@define('EXPORT_FEED', 'Export full RSS feed'); // Translate
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.36.2.11
retrieving revision 1.36.2.12
diff -u -d -r1.36.2.11 -r1.36.2.12
--- serendipity_lang_pt.inc.php	15 Nov 2004 10:22:05 -0000	1.36.2.11
+++ serendipity_lang_pt.inc.php	15 Nov 2004 21:06:52 -0000	1.36.2.12
@@ -181,8 +181,6 @@
 @define('ENTRIES_SUCCESSFULLY_INSERTED', 'Artigos adicionados corretamente!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Artigos não adicionados!');
 @define('VIEW_FEED_EXPORT', 'Exibir fonte da exportação');
-@define('IMPORT', 'Importar');
-@define('EXPORT', 'Exportar');
 @define('YES', 'Sim');
 @define('NO', 'Não');
 @define('USE_DEFAULT', 'Default');
@@ -466,8 +464,6 @@
 @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Apenas artigo extendido');
 @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Página de visão geral apenas');
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'Todas as vezes');
-@define('RSS_IMPORT_DESC', 'A importação de RSS irá buscar uma fonte RSS e inserir na sua base de artigos, todas as entradas contidas nele. Você pode escolher se quer importar os itens no estado de RASCUNHO ou PUBLICADO. Categorias no RSS externo precisam ter exatamente o mesmo nome que você informou no Serendipity. Através do outra caixa de texto, você pode escolher a categoria para a qual que você deseja ter os artigos de categorias desconhecidas associados.');
-@define('RSS_IMPORT_CATEGORY', 'Utilize essa categoria para artigos que não encontrem uma categoria no Serendipity');
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Ocorreu um erro desconhecido, o arquivo não foi transferido. Talvez o tamanho do arquivo seja maior que o permitido pelo seu servidor. Verifique com o seu servidor de internet, ou edite o php.ini para permitir transferência de arquivos de maior tamanho.');
 @define('COMMENTS_WILL_BE_MODERATED', 'Comentários enviados estarão sujeitos a moderação antes de serem exibidos.');
 @define('YOU_HAVE_THESE_OPTIONS', 'Você possui as seguintes opções disponíveis');
@@ -592,8 +588,20 @@
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
+@define('IMPORT_ENTRIES', 'Import entries'); // Translate
+@define('EXPORT_ENTRIES', 'Export entries'); // Translate
+@define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate
+@define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate
+@define('IMPORT_SELECT', 'Please select the software you wish to import from'); // Translate
+@define('IMPORT_PLEASE_ENTER', 'Please enter the data as requested below'); // Translate
+@define('IMPORT_NOW', 'Import now!'); // Translate
+@define('IMPORT_STARTING', 'Starting import procedure...'); // Translate
+@define('IMPORT_FAILED', 'Import failed'); // Translate
+@define('IMPORT_DONE', 'Import successfully completed'); // Translate
+@define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate
+@define('EXPORT_FEED', 'Export full RSS feed'); // Translate
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- serendipity_lang_it.inc.php	15 Nov 2004 10:22:05 -0000	1.1.2.10
+++ serendipity_lang_it.inc.php	15 Nov 2004 21:06:51 -0000	1.1.2.11
@@ -185,8 +185,6 @@
 @define('ENTRIES_SUCCESSFULLY_INSERTED', 'Notizie inserite con successo!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Notizie non inserite!');
 @define('VIEW_FEED_EXPORT', 'Vedi l\'esportazione del feed');
-@define('IMPORT', 'Importa');
-@define('EXPORT', 'Esporta');
 @define('YES', 'Sì');
 @define('NO', 'No');
 @define('USE_DEFAULT', 'Default');
@@ -468,9 +466,6 @@
 @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Solo notizia estesa');
 @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Solo pagina riassuntiva');
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'Sempre');
-@define('RSS_IMPORT_DESC', 'L\'importazione di RSS scarica un feed RSS e inserisce tutte le notizie nel tuo database degli articoli. Puoi scegliere se importare le notizie come BOZZA o come PUBBLICATA. Le categorie nel file importato devono avere lo stesso nome che è configurato in Serendipity. Con l\'altro campo di inserimento puoi scegliere in quale categoria mettere gli articoli che non corrispondono a nessuna categoria.');
-@define('RSS_IMPORT_CATEGORY', 'Usa questa categoria per le notizie importate non corrispondenti');
-
 @define('COMMENTS_WILL_BE_MODERATED', 'I commenti sottoposti sono soggetti a moderazione prima di essere mostrati.');
 @define('YOU_HAVE_THESE_OPTIONS', 'Sono disponibili le seguenti opzioni:');
 @define('THIS_COMMENT_NEEDS_REVIEW', 'Attenzione: Questo commento deve essere approvato prima di essere mostrato');
@@ -588,8 +583,20 @@
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
+@define('IMPORT_ENTRIES', 'Import entries'); // Translate
+@define('EXPORT_ENTRIES', 'Export entries'); // Translate
+@define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate
+@define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate
+@define('IMPORT_SELECT', 'Please select the software you wish to import from'); // Translate
+@define('IMPORT_PLEASE_ENTER', 'Please enter the data as requested below'); // Translate
+@define('IMPORT_NOW', 'Import now!'); // Translate
+@define('IMPORT_STARTING', 'Starting import procedure...'); // Translate
+@define('IMPORT_FAILED', 'Import failed'); // Translate
+@define('IMPORT_DONE', 'Import successfully completed'); // Translate
+@define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate
+@define('EXPORT_FEED', 'Export full RSS feed'); // Translate
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.79.2.11
retrieving revision 1.79.2.12
diff -u -d -r1.79.2.11 -r1.79.2.12
--- serendipity_lang_da.inc.php	15 Nov 2004 10:22:04 -0000	1.79.2.11
+++ serendipity_lang_da.inc.php	15 Nov 2004 21:06:50 -0000	1.79.2.12
@@ -179,8 +179,6 @@
 @define('ENTRIES_SUCCESSFULLY_INSERTED', 'Artikler indsat uden problemer!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Der var problemer under indsættelsen af artiklerne!');
 @define('VIEW_FEED_EXPORT', 'Vis eksporteret feed');
-@define('IMPORT', 'Importer');
-@define('EXPORT', 'Eksportér');
 @define('YES', 'Ja');
 @define('NO', 'Nej');
 @define('USE_DEFAULT', 'Default');
@@ -465,8 +463,6 @@
 @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Kun udvidet artikel');
 @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Kun i oversigten');
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'Hele tiden');
-@define('RSS_IMPORT_DESC', 'RSS import vil hente et RSS feed og indsætte alle artiklerne i denne i dit arkiv. Du kan vælge om du vil importere disse med UDKAST eller UDGIVET status. Kategorier i det fremmede feed skal indeholde det præcist samme navn som de navne du har indtastet i Serendipity. Via det andet felt kan du vælge hvilken kategori du vil placere artikler i, der ikke matcher kategorier i det importerede feed.');
-@define('RSS_IMPORT_CATEGORY', 'Brug denne kategori for kategoriløse artikler');
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Der skete en ukendt fejl, filen blev ikke uploaded. Måske er din filstørrelse større end den maximale størrelse tilladt af din serveropsætning. Spørg din webudbyder eller rediger din php.ini fil for at tillade uploads af større filer.');
 @define('COMMENTS_WILL_BE_MODERATED', 'Kommentarer på denne artikel vil først blive vist såfremt de bliver godkendt.');
 @define('YOU_HAVE_THESE_OPTIONS', 'Du har følgende muligheder:');
@@ -586,8 +582,20 @@
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
+@define('IMPORT_ENTRIES', 'Import entries'); // Translate
+@define('EXPORT_ENTRIES', 'Export entries'); // Translate
+@define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate
+@define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate
+@define('IMPORT_SELECT', 'Please select the software you wish to import from'); // Translate
+@define('IMPORT_PLEASE_ENTER', 'Please enter the data as requested below'); // Translate
+@define('IMPORT_NOW', 'Import now!'); // Translate
+@define('IMPORT_STARTING', 'Starting import procedure...'); // Translate
+@define('IMPORT_FAILED', 'Import failed'); // Translate
+@define('IMPORT_DONE', 'Import successfully completed'); // Translate
+@define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate
+@define('EXPORT_FEED', 'Export full RSS feed'); // Translate
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.58.2.12
retrieving revision 1.58.2.13
diff -u -d -r1.58.2.12 -r1.58.2.13
--- serendipity_lang_fr.inc.php	15 Nov 2004 10:22:05 -0000	1.58.2.12
+++ serendipity_lang_fr.inc.php	15 Nov 2004 21:06:51 -0000	1.58.2.13
@@ -185,8 +185,6 @@
 @define('ENTRIES_SUCCESSFULLY_INSERTED', 'Billets importés avec succès!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Les billets n\'ont pas pu être importés.');
 @define('VIEW_FEED_EXPORT', 'Voir l\'export du fil');
-@define('IMPORT', 'Importer');
-@define('EXPORT', 'Exporter');
 @define('YES', 'Oui');
 @define('NO', 'Non');
 @define('USE_DEFAULT', 'Default');
@@ -474,8 +472,6 @@
 @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Dans la vue détaillée seulement');
 @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Page d\'accueil seulement');
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'Sur la page d\'accueil et la vue détaillée');
-@define('RSS_IMPORT_DESC', 'L\'import de fil RSS télécharge tous les billets du fil et les insère dans votre liste de billets. Vous pouvez choisir si vous voulez importer les billets en tant que brouillons ou directement en publications. Les noms des catégories contenues dans le fil n\'ont pas besoin de correspondre exactement à celles que vous avez dans votre installation de Serendipity. En utilisant l\'autre champ de saisie, vous pouvez choisir la catégorie dans laquelle vous voulez insérer les billets dont la catégorie qui ne correspondent à aucune des vôtres.');
-@define('RSS_IMPORT_CATEGORY', 'Utiliser cette catégorie pour les billets à catégorie inconnue');
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Erreur: impossible d\'uploader le fichier. Peut-être que la taille du fichier est plus grande que ce que votre serveur autorise. Vérifiez avec votre administrateur système ou éditez votre fichier php.ini pour autoriser le téléchargement de fichiers plus volumineux.');
 @define('COMMENTS_WILL_BE_MODERATED', 'Les commentaires postés doivent être approuvés avant d\'être affichés dans le blog.');
 @define('YOU_HAVE_THESE_OPTIONS', 'Vous avez les possibilités suivantes:');
@@ -594,8 +590,20 @@
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
+@define('IMPORT_ENTRIES', 'Import entries'); // Translate
+@define('EXPORT_ENTRIES', 'Export entries'); // Translate
+@define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate
+@define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate
+@define('IMPORT_SELECT', 'Please select the software you wish to import from'); // Translate
+@define('IMPORT_PLEASE_ENTER', 'Please enter the data as requested below'); // Translate
+@define('IMPORT_NOW', 'Import now!'); // Translate
+@define('IMPORT_STARTING', 'Starting import procedure...'); // Translate
+@define('IMPORT_FAILED', 'Import failed'); // Translate
+@define('IMPORT_DONE', 'Import successfully completed'); // Translate
+@define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate
+@define('EXPORT_FEED', 'Export full RSS feed'); // Translate
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.61.2.9
retrieving revision 1.61.2.10
diff -u -d -r1.61.2.9 -r1.61.2.10
--- serendipity_lang_cz.inc.php	15 Nov 2004 10:22:04 -0000	1.61.2.9
+++ serendipity_lang_cz.inc.php	15 Nov 2004 21:06:50 -0000	1.61.2.10
@@ -184,8 +184,6 @@
 @define('ENTRIES_SUCCESSFULLY_INSERTED', 'Záznamy byly vlo¾eny úspì¹nì!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Záznamy nebyly vlo¾eny úspì¹nì!');
 @define('VIEW_FEED_EXPORT', 'Ukázat export');
-@define('IMPORT', 'Import');
-@define('EXPORT', 'Export');
 @define('YES', 'Ano');
 @define('NO', 'Ne');
 @define('USE_DEFAULT', 'Default');
@@ -470,8 +468,6 @@
 @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Pouze v roz¹íøené èásti');
 @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Pouze v popisu');
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'V obojím');
-@define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.');
-@define('RSS_IMPORT_CATEGORY', 'Use this category for non-matching imported entries');
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Unknown error occured, file not uploaded. Maybe your filesize is larger than the maximum size allowed by your server installation. Check with your ISP or edit your php.ini file to allow larger file size uploads.');
 @define('COMMENTS_WILL_BE_MODERATED', 'Submitted comments will be subject to moderation before being displayed.'); // Translate
 @define('YOU_HAVE_THESE_OPTIONS', 'You have the following options available:'); // Translate
@@ -589,8 +585,20 @@
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
+@define('IMPORT_ENTRIES', 'Import entries'); // Translate
+@define('EXPORT_ENTRIES', 'Export entries'); // Translate
+@define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate
+@define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate
+@define('IMPORT_SELECT', 'Please select the software you wish to import from'); // Translate
+@define('IMPORT_PLEASE_ENTER', 'Please enter the data as requested below'); // Translate
+@define('IMPORT_NOW', 'Import now!'); // Translate
+@define('IMPORT_STARTING', 'Starting import procedure...'); // Translate
+@define('IMPORT_FAILED', 'Import failed'); // Translate
+@define('IMPORT_DONE', 'Import successfully completed'); // Translate
+@define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate
+@define('EXPORT_FEED', 'Export full RSS feed'); // Translate
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.77.2.11
retrieving revision 1.77.2.12
diff -u -d -r1.77.2.11 -r1.77.2.12
--- serendipity_lang_es.inc.php	15 Nov 2004 10:22:05 -0000	1.77.2.11
+++ serendipity_lang_es.inc.php	15 Nov 2004 21:06:51 -0000	1.77.2.12
@@ -182,8 +182,6 @@
 @define('ENTRIES_SUCCESSFULLY_INSERTED', '¡Posts insertados correctamente!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', '¡No se ha podido insertar los posts!');
 @define('VIEW_FEED_EXPORT', 'View feed export');
-@define('IMPORT', 'Importar');
-@define('EXPORT', 'Exportar');
 @define('YES', 'Sí');
 @define('NO', 'No');
 @define('USE_DEFAULT', 'Predeterminado');
@@ -463,14 +461,11 @@
 @define('POWERED_BY_SHOW_TEXT_DESC', 'Mostrará "Serendipity Weblog" como texto');
 @define('POWERED_BY_SHOW_IMAGE', 'Mostrar "Serendipity" con una imagen');
 @define('POWERED_BY_SHOW_IMAGE_DESC', 'Mostrará el logotipo de Serendipity');
-/* TRANSLATE */
 @define('SETTINGS_SAVED_AT', 'La nueva configuración se ha guardado en la hora %s');
 @define('PLUGIN_ITEM_DISPLAY', '¿Dónde debería mostrarse el elemento?');
 @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Sólo en la entrada extendida');
 @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Sólo en la página general');
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'Siempre');
-@define('RSS_IMPORT_DESC', 'La importación RSS cogerá un fichero RSS e insertará todas las entradas que contiene para que formen parte de tu blog. Puedes escoger si quieres importar los elementos como PUBLICADOS o como BORRADOR. Las categorías en el fichero externo deben tener el mismo nombre que las categorías de Serendipity. Puedes escoger también la categoría que quieres que tengan las entradas que no coincidan con una categoría de Serendipity.');
-@define('RSS_IMPORT_CATEGORY', 'Usa esta categoría para las entradas importadas que no coincidan');
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Ocurrió un error desconocido, fichero no importado. Quizás el tamaño del fichero es mayor que el tamaño máximo permitido por tu instalación. Verifica con tu ISP o edita tu fichero php.ini para permitir que suba ficheros de tamaño más grande.');
 @define('COMMENTS_WILL_BE_MODERATED', 'Los comentarios enviados será sometidos a moderación antes de poder ser mostrados.');
 @define('YOU_HAVE_THESE_OPTIONS', 'Tienes disponibles las siguientes opciones:');
@@ -597,8 +592,20 @@
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
+@define('IMPORT_ENTRIES', 'Import entries'); // Translate
+@define('EXPORT_ENTRIES', 'Export entries'); // Translate
+@define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate
+@define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate
+@define('IMPORT_SELECT', 'Please select the software you wish to import from'); // Translate
+@define('IMPORT_PLEASE_ENTER', 'Please enter the data as requested below'); // Translate
+@define('IMPORT_NOW', 'Import now!'); // Translate
+@define('IMPORT_STARTING', 'Starting import procedure...'); // Translate
+@define('IMPORT_FAILED', 'Import failed'); // Translate
+@define('IMPORT_DONE', 'Import successfully completed'); // Translate
+@define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate
+@define('EXPORT_FEED', 'Export full RSS feed'); // Translate
 @define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
 @define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.98.2.12
retrieving revision 1.98.2.13
diff -u -d -r1.98.2.12 -r1.98.2.13
--- serendipity_lang_de.inc.php	15 Nov 2004 10:22:05 -0000	1.98.2.12
+++ serendipity_lang_de.inc.php	15 Nov 2004 21:06:50 -0000	1.98.2.13
@@ -181,8 +181,6 @@
 @define('ENTRIES_SUCCESSFULLY_INSERTED', 'Einträge erfolgreich importiert!');
 @define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Einträge konnten nicht importiert werden!');
 @define('VIEW_FEED_EXPORT', 'Feed einsehen');
-@define('IMPORT', 'Import');
-@define('EXPORT', 'Export');
 @define('YES', 'Ja');
 @define('NO', 'Nein');
 @define('USE_DEFAULT', 'Default');
@@ -467,8 +465,6 @@
 @define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Nur Artikel-Detailansicht');
 @define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Nur Artikelübersicht');
 @define('PLUGIN_ITEM_DISPLAY_BOTH', 'Überall');
-@define('RSS_IMPORT_DESC', 'Der RSS-Import liest einen RSS-Feed ein und fügt alle dort vorhandenen Artikel in die Artikeldatenbank ein. Ein importierter Artikel kann als VERÖFFENTLICHUNG oder ENTWURF eingefügt werden. Die Kategorien im importierten Feed müssen exakt denselben Namen enthalten wie die Namen ihrer Kategorien im Serendipity-Blog. Über das Dropdown-Menü kann gewählt werden, wie die Artikel kategorisiert werden sollen, wenn keine oder eine ungültige Angabe über die Kategorie im Feed enthalten ist.');
-@define('RSS_IMPORT_CATEGORY', 'Diese Kategorie für nicht zugeordnete importierte Einträge verwenden');
 @define('ERROR_UNKNOWN_NOUPLOAD', 'Ein Fehler trat beim Dateiupload auf. Vielleicht ist die Datei größer als durch die Server-Konfiguration zugelassen. Bitte mit Ihrem ISP absprechen oder die php.ini datei bearbeiten um größere Uploads zuzulassen.');
 @define('COMMENTS_WILL_BE_MODERATED', 'Kommentare werden erst nach redaktioneller Prüfung freigeschaltet.');
 @define('YOU_HAVE_THESE_OPTIONS', 'Folgende Möglichkeiten stehen zur Verfügung:');
@@ -588,8 +584,20 @@
 @define('INSTALL_OFFSET', 'Server Zeitunterschied');
 @define('INSTALL_OFFSET_DESC', 'Wieviele Stunden liegen zwischen der Uhrzeit des Servers und der eigenen Zeitzone');
 @define('STICKY_POSTINGS', 'Dauerhafte Einträge');
+@define('IMPORT_ENTRIES', 'Import entries'); // Translate
+@define('EXPORT_ENTRIES', 'Export entries'); // Translate
+@define('IMPORT_WELCOME', 'Welcome to the Serendipity import utility'); // Translate
+@define('IMPORT_WHAT_CAN', 'Here you can import entries from other weblog software applications'); // Translate
+@define('IMPORT_SELECT', 'Please select the software you wish to import from'); // Translate
+@define('IMPORT_PLEASE_ENTER', 'Please enter the data as requested below'); // Translate
+@define('IMPORT_NOW', 'Import now!'); // Translate
+@define('IMPORT_STARTING', 'Starting import procedure...'); // Translate
+@define('IMPORT_FAILED', 'Import failed'); // Translate
+@define('IMPORT_DONE', 'Import successfully completed'); // Translate
+@define('IMPORT_WEBLOG_APP', 'Weblog application'); // Translate
+@define('EXPORT_FEED', 'Export full RSS feed'); // Translate
 @define('INSTALL_FETCHLIMIT', 'Anzahl der Artikel auf der Startseite');
 @define('INSTALL_FETCHLIMIT_DESC', 'Wieviele Artikel sollen auf jeder Seite des Blogs angezeigt werden');
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

[php-blog-cvs] serendipity/include/admin/importers generic.inc.php,NONE,1.1.2.1 movabletype.inc.php,NONE,1.1.2.1 wordpress.inc.php,NONE,1.1.2.1

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin/importers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27345/include/admin/importers

Added Files:
      Tag: branch-smarty
	generic.inc.php movabletype.inc.php wordpress.inc.php 
Log Message:
- Draft for new import framework. It's working, but might need some changes to make it a little more pretty
  Note: Please review your importer methods, like validateData() etc.

- Split importer and exporter up into two menuitems
- Don't let serendipity_guessInput() parse data, it should just act on the data given
- Add 'file' type to serendipity_guessInput(), implementing <input type="file">


--- NEW FILE: generic.inc.php ---
<?php # $Id: generic.inc.php,v 1.1.2.1 2004/11/15 21:06:49 tomsommer Exp $

require_once 'bundled-libs/Onyx/RSS.php';


@define('STATUS', 'Status after import');
@define('RSS_IMPORT_DESC', 'The RSS import will fetch an RSS feed and insert all the entries contained there inside your article base. You can choose if you want to import the items in DRAFT or PUBLISHED state. Categories in the foreign feed need to contain the exact same name like you entered the names in Serendipity. Via the other input box you can choose the category you want to have entries associated which do not match the imported feed.');
@define('RSS_IMPORT_CATEGORY', 'Use this default category for entries without a matching category');


class Serendipity_Import_Generic extends Serendipity_Import {
    var $info        = array('software' => 'Generic RSS import');
    var $data        = array();
    var $inputFields = array();

    function Serendipity_Import_Generic($data) {
        $this->data = $data;
        $this->inputFields = array(array('text' => (RSS .' '. URL),
                                         'type' => 'input',
                                         'name' => 'url'),
                                   array('text' => STATUS,
                                         'type' => 'list',
                                         'name' => 'type',
                                         'value' => 'publish',
                                         'default' => array('draft' => DRAFT,
                                                            'publish' => PUBLISH)),
                                   array('text' => RSS_IMPORT_CATEGORY,
                                         'type' => 'list',
                                         'name' => 'category',
                                         'value' => 0,
                                         'default' => $this->_fuckCategoryList()),
                                    array('text' => RSS_IMPORT_BODYONLY,
                                         'type' => 'bool',
                                         'name' => 'bodyonly',
                                         'value' => 'false'));
    }

    function validateData() {
        return sizeof($this->data);
    }

    function getInputFields() {
        return $this->inputFields;
    }

    function _fuckCategoryList() {
        $res = serendipity_fetchCategories('all');
        $ret = array(0 => NO_CATEGORY);
        foreach ( $res as $v ) {
            $ret[$v['categoryid']] = $v['category_name'];
        }
        return $ret;
    }

    function buildEntry($item, &$entry) {
        global $serendipity;

        $entry    = array();
        $bodyonly = serendipity_get_bool($this->data['bodyonly']);
        $bodyonly = false;

        if ($item['description']) {
            $entry['body'] = utf8_decode($item['description']);
        }

        if ($item['content:encoded']) {
            if (!isset($entry['body']) || $bodyonly) {
                $data = &$entry['body'];
            } else {
                $data = &$entry['extended'];
            }

            // See if the 'description' element is a substring of the 'content:encoded' part. If it is,
            // we will only fetch the full 'content:encoded' part. If it's not a substring, we append
            // the 'content:encoded' part to either body or extended entry (respecting the 'bodyonly'
            // switch). We substract 4 letters because of possible '...' additions to an entry.
            $testbody = substr(trim(strip_tags($entry['body'])), 0, -4);
            if ($testbody != substr(trim(strip_tags($item['content:encoded'])), 0, strlen($testbody))) {
                $data .= utf8_decode($item['content:encoded']);
            } else {
                $data = utf8_decode($item['content:encoded']);
            }
        }

        $entry['title'] = utf8_decode($item['title']);
        $entry['timestamp'] = utf8_decode(strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date']));
        if ($entry['timestamp'] == -1) {
            $entry['timestamp'] = time();
        }

        if ($serendipity['POST']['type'] == 'draft') {
            $entry['isdraft'] = 'true';
        } else {
            $entry['isdraft'] = 'false';
        }

        if (!empty($item['category'])) {
            $cat = serendipity_fetchCategoryInfo(0, trim(utf8_decode($item['category'])));
            if (is_array($cat) && isset($cat['categoryid'])) {
                $entry['categories'][] = $cat['categoryid'];
            }
        }

        if (!is_array($entry['categories'])) {
            $entry['categories'][] = $this->data['category'];
        }

        if (!isset($entry['extended'])) {
            $entry['extended'] = '';
        }

        $entry['allow_comments'] = true;

        return true;
    }

    function import() {
        global $serendipity;

        $c = &new Onyx_RSS();
        $c->parse($this->data['url']);

        $serendipity['noautodiscovery'] = 1;
        while ($item = $c->getNextItem()) {
            if ($this->buildEntry($item, $entry)) {
                serendipity_updertEntry($entry);
            }
        }

        return true;
    }
}

return 'Serendipity_Import_Generic';

/* vim: set sts=4 ts=4 expandtab : */
?>

--- NEW FILE: wordpress.inc.php ---
<?php # $Id: wordpress.inc.php,v 1.1.2.1 2004/11/15 21:06:49 tomsommer Exp $

/*****************************************************************
 *                WordPress Importer, by Even                    *
 *****************************************************************/

@define('WORDPRESS_DATA', 'WordPress data');
@define('CREATE_AUTHOR', 'Create author \'%s\'.');
@define('CREATE_CATEGORY', 'Create category \'%s\'.');
@define('MYSQL_REQUIRED', 'You must have the MySQL extension in order to perform this action.');
@define('COULDNT_CONNECT', 'Could not connect to MySQL database: %s.');
@define('COULDNT_SELECT_DB', 'Could not select database: %s.');
@define('COULDNT_SELECT_USER_INFO', 'Could not select user information: %s.');
@define('COULDNT_SELECT_CATEGORY_INFO', 'Could not select category information: %s.');
@define('COULDNT_SELECT_ENTRY_INFO', 'Could not select entry information: %s.');
@define('COULDNT_SELECT_COMMENT_INFO', 'Could not select comment information: %s.');



class Serendipity_Import_WordPress extends Serendipity_Import {
    var $info        = array('software' => 'WordPress');
    var $data        = array();
    var $inputFields = array();


    function Serendipity_Import_WordPress($data) {
        $this->data = $data;
        $this->inputFields = array(array('text' => INSTALL_DBHOST,
                                         'type' => 'input',
                                         'name' => 'host'),
                                   array('text' => INSTALL_DBUSER,
                                         'type' => 'input',
                                         'name' => 'user'),
                                   array('text' => INSTALL_DBPASS,
                                         'type' => 'protected',
                                         'name' => 'pass'),
                                   array('text' => INSTALL_DBNAME,
                                         'type' => 'input',
                                         'name' => 'name'),
                                   array('text' => INSTALL_DBPREFIX,
                                         'type' => 'input',
                                         'name' => 'prefix'));
    }

    function validateData() {
        return sizeof($this->data);
    }

    function getInputFields() {
        return $this->inputFields;
    }

    function import() {
        global $serendipity;

        $this->data['prefix'] = serendipity_db_escape_string($this->data['prefix']);
        $users = array();
        $categories = array();
        $entries = array();

        if ( !extension_loaded('mysql') ) {
            return MYSQL_REQUIRED;;
        }

        $wpdb = @mysql_connect($this->data['host'], $this->data['user'], $this->data['pass']);
        if ( !$wpdb ) {
            return sprintf(COULDNT_CONNECT, $this->data['host']);
        }

        if ( !@mysql_select_db($this->data['name']) ) {
            return sprintf(COULDNT_SELECT_DB, mysql_error($wpdb));
        }

        /* Users */
        $res = @mysql_query("SELECT ID, user_login, user_pass, user_email, user_level FROM {$this->data['prefix']}users;", $wpdb);
        if ( !$res ) {
            return sprintf(COULDNT_COULDNT_SELECT_USER_INFO, mysql_error($wpdb));
        }

        for ( $x=0 ; $x<mysql_num_rows($res) ; $x++ ) {
            $users[$x] = mysql_fetch_assoc($res);

            $data = array('right_publish' => ($users[$x]['user_level'] >= 1) ? 1 : 0,
                          'username'      => $users[$x]['user_login'],
                          'password'      => $users[$x]['user_pass']); // WP uses md5, too.

            if ( $users[$x]['user_level'] <= 1 ) {
                $data['userlevel'] = USERLEVEL_EDITOR;
            } elseif ( $users[$x]['user_level'] < 5 ) {
                $data['userlevel'] = USERLEVEL_CHIEF;
            } else {
                $data['userlevel'] = USERLEVEL_ADMIN;
            }

            serendipity_db_insert('authors', $data);
            $users[$x]['authorid'] = serendipity_db_insert_id('authors', 'authorid');
        }

        /* Categories */
        $res = @mysql_query("SELECT cat_ID, cat_name, category_description, category_parent FROM {$this->data['prefix']}categories ORDER BY category_parent, cat_ID;", $wpdb);
        if ( !$res ) {
            return sprintf(COULDNT_SELECT_CATEGORY_INFO, mysql_error($wpdb));
        }

        // Get all the info we need
        for ( $x=0 ; $x<mysql_num_rows($res) ; $x++ )
            $categories[] = mysql_fetch_assoc($res);

        // Insert all categories as top level (we need to know everyone's ID before we can represent the hierarchy).
        for ( $x=0 ; $x<sizeof($categories) ; $x++ ) {
            $cat = array('category_name'        => $categories[$x]['cat_name'],
                         'category_description' => $categories[$x]['category_description'],
                         'parentid'             => 0, // <---
                         'category_left'        => 0,
                         'category_right'       => 0);

            serendipity_db_insert('category', $cat);
            $categories[$x]['categoryid'] = serendipity_db_insert_id('category', 'categoryid');
        }

        // There has to be a more efficient way of doing this...
        foreach ( $categories as $cat ) {
            if ( $cat['category_parent'] != 0 ) {
                // Find the parent
                $par_id = 0;
                foreach ( $categories as $possible_par ) {
                    if ( $possible_par['cat_ID'] == $cat['category_parent'] ) {
                        $par_id = $possible_par['categoryid'];
                        break;
                    }
                }

                if ( $par_id != 0 ) {
                  serendipity_db_query("UPDATE {$serendipity['dbPrefix']}category SET parentid={$par_id} WHERE categoryid={$cat['categoryid']};");
                } // else { echo "D'oh! " . random_string_of_profanity(); }
            }
        }

        serendipity_rebuildCategoryTree();

        /* Entries */
        $res = @mysql_query("SELECT * FROM {$this->data['prefix']}posts ORDER BY post_date;", $wpdb);
        if ( !$res ) {
            return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($wpdb));
        }

        for ( $x=0 ; $x<mysql_num_rows($res) ; $x++ ) {
            $entries[$x] = mysql_fetch_assoc($res);

            $entry = array('title' => $entries[$x]['post_title'],
                           'isdraft' => ($entries[$x]['post_status'] == 'publish') ? 'false' : 'true',
                           'allow_comments' => ($entries[$x]['comment_status '] == 'open ') ? 'true' : 'false',
                           'timestamp' => strtotime($entries[$x]['post_date']),
                           'body' => $entries[$x]['post_content']);

            foreach ( $users as $user ) {
                if ( $user['ID'] == $entries[$x]['post_author'] ) {
                    $entry['authorid'] = $user['authorid'];
                    break;
                }
            }

            if ( !is_int($entries[$x]['entryid'] = serendipity_updertEntry($entry)) ) {
                return $entries[$x]['entryid'];
            }
        }

        /* Entry/category */
        $res = @mysql_query("SELECT * FROM {$this->data['prefix']}post2cat;", $wpdb);
        if ( !$res ) {
            return sprintf(COULDNT_SELECT_ENTRY_INFO, mysql_error($wpdb));
        }

        while ( $a = mysql_fetch_assoc($res) ) {
            foreach ( $categories as $category ) {
                if ( $category['cat_ID'] == $a['category_id'] ) {
                    foreach ( $entries as $entry ) {
                        if ( $a['post_id'] == $entry['ID'] ) {
                            $data = array('entryid' => $entry['entryid'],
                                          'categoryid' => $category['categoryid']);
                            serendipity_db_insert('entrycat', $data);
                            break;
                        }
                    }
                    break;
                }
            }
        }

        /* Comments */
        $res = @mysql_query("SELECT * FROM {$this->data['prefix']}comments;", $wpdb);
        if ( !$res ) {
            return sprintf(COULDNT_SELECT_COMMENT_INFO, mysql_error($wpdb));
        }

        while ( $a = mysql_fetch_assoc($res) ) {
            foreach ( $entries as $entry ) {
                if ( $entry['ID'] == $a['comment_post_ID'] ) {
                    $comment = array('entry_id ' => $entry['entryid'],
                                     'parent_id' => 0,
                                     'timestamp' => strtotime($a['comment_date']),
                                     'author' => $a['comment_author'],
                                     'email' => $a['comment_author_email'],
                                     'url' => $a['comment_author_url'],
                                     'ip' => $a['comment_author_IP'],
                                     'status' => 'approved',
                                     'body' => $a['comment_content'],
                                     'type' => 'NORMAL');

                    serendipity_db_insert('comments', $comment);
                    serendipity_approveComment($cid, $id, true);
                }
            }
        }

        // That was fun.
        return true;
    }
}

return 'Serendipity_Import_WordPress';

/* vim: set sts=4 ts=4 expandtab : */
?>

--- NEW FILE: movabletype.inc.php ---
<?php # $Id: movabletype.inc.php,v 1.1.2.1 2004/11/15 21:06:49 tomsommer Exp $

/*****************************************************************
 *                MovableType Importer, by Even                  *
 *****************************************************************/

@define('MAX_COMPAT_OLD_BLOG', 'To enable maximum compatibility with your old blog, please...');
@define('MT_DATA_FILE', 'Movable Type data file');
@define('FORCE', 'Force');

class Serendipity_Import_MovableType extends Serendipity_Import {
    var $info        = array('software' => 'MovableType');
    var $data        = array();
    var $inputFields = array();

    function Serendipity_Import_MovableType($data) {
        $this->data = $data;
        $this->inputFields = array(array('text' => MT_DATA_FILE,
                                         'type' => 'file',
                                         'name' => 'mt_dat'),
                                   array('text' => FORCE,
                                         'type' => 'bool',
                                         'name' => 'mt_force',
                                         'default' => 'true'));
    }

    function validateData() {
        return sizeof($this->data);
    }

    function getInputFields() {
        return $this->inputFields;
    }


    function import() {
        global $serendipity;

        $force = ($this->data['force'] == 'true');
        $contents = file_get_contents($serendipity['FILES']['tmp_name']['mt_dat']);

        $authors = array();
        $categories = serendipity_fetchCategories();
        $tasks = array();

        $entries = array();
        $n = 0;
        foreach ( preg_split('/\r?\n--------\r?\n/', $contents) as $entry ) {
            if ( preg_match_all('/([A-Z ]+):( |\r?\n)(.*)\r?\n(-----)?/', $entry, $res) ) {
                $entries[$n]['categories'] = array();
                for ( $x=0 ; $x<sizeof($res[1]) ; $x++ ) {
                    switch ( $res[1][$x] ) {
                        case 'AUTHOR':
                            if ( !isset($authors[$res[3][$x]]) ) {
                                $au_inf = serendipity_fetchAuthor($res[3][$x]);
                                if ( !is_array($au_inf) ) {
                                    $tasks[] = sprintf(CREATE_AUTHOR, htmlspecialchars($res[3][$x]));
                                    $au_inf = serendipity_fetchAuthor($serendipity['authorid']);
                                }
                                $authors[$res[3][$x]] = $au_inf[0];
                            }
                            $entries[$n]['authorid'] = $authors[$res[3][$x]]['authorid'];
                            $entries[$n]['author'] = $authors[$res[3][$x]]['username'];
                            break;
                        case 'TITLE':
                            $entries[$n]['title'] = $res[3][$x];
                            break;
                        case 'STATUS':
                            $entries[$n]['isdraft'] = ($res[3][$x] == 'Publish') ? 'false' : 'true';
                            break;
                        case 'ALLOW COMMENTS':
                            $entries[$n]['allow_comments'] = ($res[3][$x] == '1') ? 'true' : 'false';
                            break;
                        case 'DATE':
                            $entries[$n]['timestamp'] = strtotime($res[3][$x]);
                            if ( $entries[$n]['timestamp'] == 0 ) {
                                $entries[$n]['timestamp'] = time();
                            }
                            break;
                        case 'BODY':
                            $entries[$n]['body'] = $res[3][$x];
                            break;
                        case 'EXTENDED BODY':
                            $entries[$n]['extended'] = $res[3][$x];
                            break;
                        case 'PRIMARY CATEGORY':
                        case 'CATEGORY':
                            $cat_found = false;
                            if ( is_array($categories) ) {
                                for ( $y=0 ; $y<sizeof($categories) ; $y++ ) {
                                    if ( $categories[$y]['category_name'] == $res[3][$x] ) {
                                        $cat_found = true;
                                        break;
                                    }
                                }
                            }
                            if ( $cat_found && !in_array($categories[$y]['categoryid'], $entries[$n]['categories']) ) {
                                $entries[$n]['categories'][] = $categories[$y]['categoryid'];
                                $entries[$n]['categories'][] = $categories[$y]['categoryid'];
                            }
                            else {
                                $tasks[] = sprintf(CREATE_CATEGORY, htmlspecialchars($res[3][$x]));
                            }
                            break;
                    }
                }
            }
            $n++;
        }

        if ( !sizeof($tasks) || $force == true ) {
            foreach ( $entries as $entry ) {
                if ( !is_int($r = serendipity_updertEntry($entry)) ) {
                    echo '<div class="important">' . $r . '</div>';
                }
            }
            return true;
        }
        else {
            return array_unique($tasks);
        }
    }
}
return 'Serendipity_Import_MovableType';
?>

[php-blog-cvs] serendipity/include/admin export.inc.php,NONE,1.1.2.1 import.inc.php,NONE,1.1.2.1 interop.inc.php,1.1.2.1,NONE rss_exchange.inc.php,1.1.2.1,NONE

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27345/include/admin

Added Files:
      Tag: branch-smarty
	export.inc.php import.inc.php 
Removed Files:
      Tag: branch-smarty
	interop.inc.php rss_exchange.inc.php 
Log Message:
- Draft for new import framework. It's working, but might need some changes to make it a little more pretty
  Note: Please review your importer methods, like validateData() etc.

- Split importer and exporter up into two menuitems
- Don't let serendipity_guessInput() parse data, it should just act on the data given
- Add 'file' type to serendipity_guessInput(), implementing <input type="file">


--- interop.inc.php DELETED ---

--- NEW FILE: import.inc.php ---
<?php # $Id: import.inc.php,v 1.1.2.1 2004/11/15 21:06:49 tomsommer Exp $

if (IN_serendipity !== true) {
    die ("Don't hack!");
}
if ( $serendipity['serendipityUserlevel'] != USERLEVEL_ADMIN ) {
    return;
}

/* For later use */
class Serendipity_Import {

}

if ( isset($serendipity['GET']['importFrom']) ) {

    /* Include the importer

       HIGH PRIORITY TODO: Must validate $serendipity['GET']['importFrom']
     */
    $class = @require_once(S9Y_INCLUDE_PATH . 'include/admin/importers/'. $serendipity['GET']['importFrom'] .'.inc.php');
    if ( !class_exists($class) ) {
        die('FAILURE: Unable to require import module, possible syntax error?');
    }

    /* Init the importer with form data */
    $importer = new $class($serendipity['POST']['import']);

    /* Yes sir, we are importing if we have valid data */
    if ( $importer->validateData() ) {
        echo IMPORT_STARTING . '<br />';

        /* import() MUST return (bool)true, otherwise we assume it failed */
        if ( ($result = $importer->import()) !== true ) {
            echo IMPORT_FAILED .': '. $result . '<br />';
        } else {
            echo IMPORT_DONE . '<br />';
        }


    /* Apprently we do not have valid data, ask for some */
    } else {
?>

<?php echo IMPORT_PLEASE_ENTER ?>:<br />
<br />
<form action="" method="POST">
  <table cellpadding="3" cellspacing="2">
    <?php foreach ( $importer->getInputFields() as $field ) { ?>
    <tr>
      <td><?php echo $field['text'] ?></td>
      <td><?php serendipity_guessInput($field['type'], 'serendipity[import]['. $field['name'] .']', $serendipity['POST']['import'][$field['name']], $field['default']) ?></td>
    </tr>
    <?php } ?>
    <tr>
      <td colspan="2" align="right"><input type="submit" value="<?php echo IMPORT_NOW ?>"></td>
    </tr>
  </table>
</form>
<?php
    }

} else {

    $importpath = S9Y_INCLUDE_PATH . 'include/admin/importers/';
    $dir        = opendir($importpath);
    $list       = array();
    while (($file = readdir($dir)) !== false ) {
        if (!is_file($importpath . $file)) {
            continue;
        }

        $class = include_once($importpath . $file);
        if ( class_exists($class) ) {
            $tmpClass = new $class(array());
            $list[substr($file, 0, strpos($file, '.'))] = $tmpClass->info['software'];
            unset($tmpClass);
        }
    }
    closedir($dir);
    natsort($list);
?>
<?php echo IMPORT_WELCOME ?>.<br />
<?php echo IMPORT_WHAT_CAN ?>. <br />
<br />
<?php echo IMPORT_SELECT ?>:<br />
<br />
<form action="" method="GET">
  <input type="hidden" name="serendipity[adminModule]" value="import">
  <strong><?php echo IMPORT_WEBLOG_APP ?>: </strong>
  <select name="serendipity[importFrom]">
    <?php foreach ($list as $v=>$k) { ?>
    <option value="<?php echo $v ?>"><?php echo $k ?></option>
    <?php } ?>
  </select>
  <input type="submit" value="<?php echo GO ?>">
</form>
<?php
}

/* vim: set sts=4 ts=4 expandtab : */
?>

--- rss_exchange.inc.php DELETED ---

--- NEW FILE: export.inc.php ---
<?php # $Id: export.inc.php,v 1.1.2.1 2004/11/15 21:06:49 tomsommer Exp $

if (IN_serendipity !== true) {
    die ("Don't hack!");
}

?>
  <div>
    <input type="submit" name="serendipity[export]" value="<?php echo EXPORT_FEED; ?>" onclick="location.href='<?php echo $serendipity['baseURL'] ?>rss.php?version=2.0&all=1'" />
  </div>
<?php
/* vim: set sts=4 ts=4 expandtab : */
?>

[php-blog-cvs] serendipity/lang serendipity_lang_tw.inc.php,NONE,1.1.2.1

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31179/lang

Added Files:
      Tag: branch-smarty
	serendipity_lang_tw.inc.php 
Log Message:
added chinese language


--- NEW FILE: serendipity_lang_tw.inc.php ---
<?php # $Id: serendipity_lang_tw.inc.php,v 1.1.2.1 2004/11/15 10:55:31 garvinhicking Exp $

##########################################################################
# serendipity - another blogger...                                       #
##########################################################################
#                                                                        #
# (c) 2003 Jannis Hermanns <J...@ha...>                                 #
# http://www.jannis.to/programming/serendipity.html                      #
#                                                                        #
##########################################################################

@define('LANG_CHARSET', 'big5');
@define('DATE_LOCALES', 'tw, zh, zh-TW');
@define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
@define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
@define('WYSIWYG_LANG', 'en');
@define('NUMBER_FORMAT_DECIMALS', '2');
@define('NUMBER_FORMAT_DECPOINT', '.');
@define('NUMBER_FORMAT_THOUSANDS', ',');

@define('SERENDIPITY_ADMIN_SUITE', 'Serendipity ºÞ²z®M¥ó');
@define('HAVE_TO_BE_LOGGED_ON', '½Ð¥ýµn¤J');
@define('WRONG_USERNAME_OR_PASSWORD', '±z¿é¤J¤F¿ù»~ªº±b¸¹©Î±K½X');
@define('APPEARANCE', '¥~Æ[°t¸m');
@define('MANAGE_STYLES', '§G´ººÞ²z');
@define('CONFIGURE_PLUGINS', '³]©w¥~±¾');
@define('ADMIN', 'ºÞ²z­û:');
@define('CONFIGURATION', 'ºÞ²z³]©w');
@define('IMPORT_EXPORT_ENTRIES', '¿é¤J/¿é¥X ¤å³¹');
@define('BACK_TO_BLOG', '¦^¨ì¤é°O­º­¶');
@define('LOGIN', 'µn¤J');
@define('LOGOUT', 'µn¥X');
@define('LOGGEDOUT', 'µn¥X.');
@define('CREATE', '«Ø¥ß');
@define('EDIT_THIS_CAT', '½s¿è "%s - %s"');
@define('SAVE', 'Àx¦s');
@define('NAME', '¦WºÙ');
@define('CLICK_CAT_TO_EDIT', 'ÂIÃþ§O¶i¦æ½s¿è');
@define('CREATE_NEW_CAT', '·s¼WÃþ§O');
@define('I_WANT_THUMB', '§Ú­n¦b¤å³¹¤º¨Ï¥ÎÁY¹Ï.');
@define('I_WANT_BIG_IMAGE', '§Ú­n¦b¤å³¹¤º¨Ï¥Î¤j«¬¹Ï¤ù.');
@define('I_WANT_NO_LINK', ' §Ú­n¥¦¥H¹Ï¤ùÅã¥Ü');
@define('I_WANT_IT_TO_LINK', '§Ú­n¥¦¥H³sµ²Åã¥Ü³o­Ó URL:');
@define('BACK', 'ªð¦^');
@define('FORWARD', '«e¶i');
@define('ANONYMOUS', '°Î¦W');
@define('LINK_TO_COMMENT', '³sµ²¨ì°jÅT #');
@define('SEND_MAIL_TO', '±H°e¶l¥ó¨ì');
@define('NEW_TRACKBACK_TO', '·sªº¤Þ¥Î¨ì');
@define('NEW_COMMENT_TO', '·sªº°jÅT¨ì');
@define('RECENT', '·s¤å®w...');
@define('OLDER', '¤å®w...');
@define('DONE', '§¹¦¨');
@define('WELCOME_BACK', 'Åwªï¦^¨Ó,');
@define('RUNNING', '±z¨Ï¥Îªº Serendipity ª©¥»¬O v.');
@define('ADD_PLUGIN', '¥[¤J¥~±¾');
@define('TITLE', '¼ÐÃD');
@define('DESCRIPTION', '²¤¶');
@define('PLACEMENT', '¦ì§}');
@define('DELETE', '§R°£');
@define('SAVE', 'Àx¦s');
@define('UP', '¤W');
@define('DOWN', '¤U');
@define('ENTRIES', '¤å³¹');
@define('NEW_ENTRY', '·s¼W¤å³¹');
@define('AUTHOR_SUITE', '¼¶¼g®M¥ó');
@define('EDIT_ENTRIES', '½s¿è¤å³¹');
@define('CATEGORIES', 'Ãþ§O');
@define('EDIT_CATEGORIES', 'ºÞ²zÃþ§O');
@define('WARNING_THIS_BLAHBLAH', "ĵ§i:\\n³o­Ó¥i¯à»Ý­nªø®É¶¡¦pªG¦³«Ü¦h¤£¬OÁY¹Ïªº¹Ï¤ù.");
@define('CREATE_THUMBS', '­««ØÁY¹Ï');
@define('MANAGE_IMAGES', 'ºÞ²z¹Ï¤ù');
@define('ADMIN_INTERFACE', 'ºÞ²z®M¥ó');
@define('SERENDIPITY_AUTHORING_SUITE', 'Serendipity ¼¶¼g®M¥ó');
@define('NAME', '¦WºÙ');
@define('EMAIL', 'Email');
@define('HOMEPAGE', 'ºô§}');
@define('COMMENT', '°jÅT');
@define('REMEMBER_INFO', '°O¦í¸ê®Æ? ');
@define('SUBMIT_COMMENT', '¶Ç°e°jÅT');
@define('NO_ENTRIES_TO_PRINT', '¨S¦³¤å³¹¥i¥HÅã¥Ü.');
@define('COMMENTS', '°jÅT');
@define('ADD_COMMENT', '·s¼W°jÅT');
@define('NO_COMMENTS', '¨S¦³°jÅT.');
@define('POSTED_BY', '§@ªÌ');
@define('ON', '¦b');
@define('A_NEW_COMMENT_BLAHBLAH', '·s°jÅT¤wµoªí¨ì±zªº¤é°O "%s", ¦b³o­Ó¤å³¹¸Ì­± "%s".');
@define('A_NEW_TRACKBACK_BLAHBLAH', '±zªº¤é°O¤å³¹ "%s" ¤w¦³¤F·sªº¤Þ¥Î.');
@define('NO_CATEGORY', '¨S¦³Ãþ§O');
@define('ENTRY_BODY', '¤å³¹¥D¤º®e');
@define('EXTENDED_BODY', '¤å³¹°Æ¤º®e');
@define('CATEGORY', 'Ãþ§O');
@define('EDIT', '½s¿è');
@define('NO_ENTRIES_BLAHBLAH', '§ä¤£¨ì¦¹¬d¸ß %s ªº¤å³¹' . "\n");
@define('YOUR_SEARCH_RETURNED_BLAHBLAH', '±z·j´Mªº %s Åã¥Ü¤F %s µ²ªG:');
@define('SEARCH_TOO_SHORT', '±z·j´Mªº¤å¦r¥²¶·¦h©ó 3 ­Ó¦rµü');
@define('IMAGE', '¹Ï¤ù');
@define('ERROR_FILE_NOT_EXISTS', '¿ù»~: Àɮפ£¦s¦b!');
@define('ERROR_FILE_EXISTS', '¿ù»~: ÀɮצWºÙ¤w³Q¨Ï¥Î, ½Ð­«·s¿é¤J!');
@define('ERROR_SOMETHING', '¿ù»~: ¦³¿ù»~.');
@define('ADDING_IMAGE', '·s¼W¹Ï¤ù...');
@define('THUMB_CREATED_DONE', 'ÁY¹Ï«Ø¥ß.<br>§¹¦¨.');
@define('ERROR_FILE_EXISTS_ALREADY', '¿ù»~: Àɮפw¦s¦b!');
@define('ERROR_UNKNOWN_NOUPLOAD', '¥¼ª¾ªº¿ù»~µo¥Í, ÀÉ®×ÁÙ¨S¤W¶Ç. ¤]³\§AªºÀɮפj©ó­­¨îªº¤j¤p. ½Ð¸ß°Ý±zªº ISP ©Î­×§ï±zªº php.ini ÀÉ.');
@define('GO', 'Ä~Äò!');
@define('NEWSIZE', '·s¤j¤p: ');
@define('RESIZE_BLAHBLAH', '<b>­«³]¤j¤p %s</b><p>');
@define('ORIGINAL_SIZE', '­ì¦³ªº¤j¤p: <i>%sx%s</i> ¹³¯À');
@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>¦b³o¸Ì±z¥i¥H­×§ï¹Ï¤ù¤j¤p. ¦pªG±z­n­×§ï¦¨¬Û¦Pªº¹Ï¤ù¤ñ¨Ò, ±z¥u»Ý­n¿é¤J¤@­Ó¼Æ­ÈµM«á«ö TAB -- ¨t²Î·|¦Û°ÊÀ°±z­pºâ¤ñ¨Ò¥H§K¥X¿ù</p>');
@define('QUICKJUMP_CALENDAR', '¤é¾ä§Ö³t¸õÅD');
@define('QUICKSEARCH', '§Ö³t·j´M');
@define('SEARCH_FOR_ENTRY', '·j´M¤å³¹');
@define('ARCHIVES', '«O¦s¤å®w');
@define('BROWSE_ARCHIVES', '¥H¤ë¥÷ÂsÄý«O¦s¤å®w');
@define('TOP_REFERRER', '¥D­n¨Ó·½');
@define('SHOWS_TOP_SITES', 'Åã¥Ü³sµ²¨ì±zªº¤é°Oªººô¯¸');
@define('TOP_EXITS', '¥D­n¥X·½');
@define('SHOWS_TOP_EXIT', 'Åã¥Ü±zªº¤é°Oªº¥D­n¥X·½');
@define('SYNDICATION', '¤å³¹¦P¨B');
@define('SHOWS_RSS_BLAHBLAH', 'Åã¥Ü RSS ¦P¨B³sµ²');
@define('PLUG', '¥~±¾');
@define('ADVERTISES_BLAHBLAH', '«Å¶Ç±zªººô¸ô¤é°O');
@define('HTML_NUGGET', 'HTML °T®§');
@define('HOLDS_A_BLAHBLAH', 'Åã¥Ü HTML °T®§¨ì°¼¦C');
@define('TITLE_FOR_NUGGET', '°T®§ªº¼ÐÃD');
@define('THE_NUGGET', 'HTML °T®§!');
@define('SYNDICATE_THIS_BLOG', '¦P¨B³o­Ó¤é°O');
@define('YOU_CHOSE', '±z¿ï¾Ü %s');
@define('IMAGE_SIZE', '¹Ï¤ù¤j¤p');
@define('IMAGE_AS_A_LINK', '¿é¤J¹Ï¤ù');
@define('POWERED_BY', 'Powered by');
@define('TRACKBACKS', '¤Þ¥Î');
@define('TRACKBACK', '¤Þ¥Î');
@define('NO_TRACKBACKS', '¨S¦³¤Þ¥Î');
@define('TOPICS_OF', '¥DÃD');
@define('VIEW_FULL', 'ÂsÄý¥þ³¡');
@define('VIEW_TOPICS', 'ÂsÄý¥DÃD');
@define('AT', '¦b');
@define('SET_AS_TEMPLATE', '¨Ï¥Î§G´º');
@define('IN', '¦b');
@define('EXCERPT', 'ºK­n');
@define('TRACKED', '¤Þ¥Î');
@define('LINK_TO_ENTRY', '³sµ²¨ì¤å³¹');
@define('LINK_TO_REMOTE_ENTRY', '³sµ²¨ì»·ºÝ¤å³¹');
@define('IP_ADDRESS', 'IP ¦ì§}');
@define('USER', '§@ªÌ');
@define('THUMBNAIL_USING_OWN', '¨Ï¥Î %s ·í¥¦ªºÁY¹Ï¤Ø¤o¦]¬°¹Ï¤ù¤w¸g«Ü¤p¤F.');
@define('THUMBNAIL_FAILED_COPY', '¨Ï¥Î %s ·í¥¦ªºÁY¹Ï, ¦ý¬OµLªk½Æ»s!');
@define('AUTHOR', 'µoªíªÌ');
@define('LAST_UPDATED', '³Ì«á§ó·s');
@define('TRACKBACK_SPECIFIC', '¤Þ¥Î¦¹¤å³¹¯S©wªº URI (ºô§})');
@define('DIRECT_LINK', 'ª½±µªº¤å³¹³sµ²');
@define('COMMENT_ADDED', '±zªº°jÅT¤w¦¨¥\¼W¤J. ');
@define('COMMENT_ADDED_CLICK', 'ÂI %s³o¸Ìªð¦^%s ¨ì°jÅT, ©MÂI %s³o¸ÌÃö³¬%s ³o­Óµøµ¡.');
@define('COMMENT_NOT_ADDED', '±zªº°jÅT¤£¯à¼W¤J¦]¬°¦¹½g¤å³¹¤£¤¹³\°jÅT. ');
@define('COMMENT_NOT_ADDED_CLICK', 'ÂI %s³o¸Ìªð¦^%s ¨ì°jÅT, ©MÂI %s³o¸ÌÃö³¬%s ³o­Óµøµ¡.');
@define('COMMENTS_DISABLE', '¤£¤¹³\°jÅT¨ì³o½g¤å³¹');
@define('COMMENTS_ENABLE', '¤¹³\°jÅT¨ì³o½g¤å³¹');
@define('COMMENTS_CLOSED', '§@ªÌ¤£¤¹³\°jÅT¨ì³o½g¤å³¹');
@define('EMPTY_COMMENT', '±zªº°jÅT¨S¦³¥ô¦ó°T®§, ½Ð %sªð¦^%s ­«¸Õ');
@define('ENTRIES_FOR', '¤å³¹µ¹ %s');
@define('DOCUMENT_NOT_FOUND', '§ä¤£¨ì¦¹½g¤å¥ó %s.');
@define('USERNAME', '±b¸¹');
@define('PASSWORD', '±K½X');
@define('AUTOMATIC_LOGIN', '¦Û°Êµn¤J');
@define('SERENDIPITY_INSTALLATION', 'Serendipity ¦w¸Ëµ{¦¡');
@define('LEFT', '¥ª');
@define('RIGHT', '¥k');
@define('HIDDEN', 'ÁôÂÃ');
@define('REMOVE_TICKED_PLUGINS', '²¾°£¤Ä¿ïªº¥~±¾');
@define('SAVE_CHANGES_TO_LAYOUT', 'Àx¦s¥~Æ[°t¸m');
@define('COMMENTS_FROM', '°jÅT¨Ó·½');
@define('ERROR', '¿ù»~');
@define('ENTRY_SAVED', '±zªº¤å³¹¤wÀx¦s');
@define('DELETE_SURE', '½T©w­n§R°£ #%s ¶Ü?');
@define('NOT_REALLY', 'ºâ¤F...');
@define('DUMP_IT', '§R°£§a!');
@define('RIP_ENTRY', 'R.I.P. ¤å³¹ #%s');
@define('CATEGORY_DELETED_ARTICLES_MOVED', 'Ãþ§O #%s ¤w§R°£. ¤峹¤w³Q²¾°Ê¨ìÃþ§O #%s');
@define('CATEGORY_DELETED', 'Ãþ§O #%s ¤w§R°£.');
@define('CATEGORY_REMAINING', '§R°£³o­ÓÃþ§OµM«á²¾°Ê¤å³¹¨ì: %s');
@define('INVALID_CATEGORY', '¨S¦³´£¨Ñ§R°£ªºÃþ§O');
@define('CATEGORY_SAVED', 'Ãþ§O¤wÀx¦s');
@define('SELECT_TEMPLATE', '½Ð¿ï¾Üºô¸ô¤é°Oªº§G´º');
@define('ENTRIES_SUCCESSFULLY_INSERTED', '§¹¦¨¼W¤J¤å³¹!');
@define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', '¨S¦³§¹¦¨¼W¤J¤å³¹!');
@define('VIEW_FEED_EXPORT', 'ÂsÄý¿é¥X');
@define('IMPORT', '¿é¤J');
@define('EXPORT', '¿é¥X');
@define('MAX_COMPAT_OLD_BLOG', '¬°¤F¯à°÷©M±zªºÂ¤é°O¦³³Ì¤jªº¬Û®e©Ê, ½Ð...');
@define('IMPORT_AGAIN_FORCE', 'µM«á¦b¸Õ¤@¦¸. ©ÎªÌ±z¥i¥H¤Ä¿ï \'±j¨î\' Äæ¦ì, ¥¦·|±j¨î±N±zªº¤å³¹¿é¤J¨ì²{¦³ªº¬[ºc.');
@define('MT_DATA_FILE', 'Movable Type ¸ê®ÆÀÉ');
@define('FORCE', '±j¨î');
@define('WORDPRESS_DATA', 'WordPress ¸ê®Æ');
@define('MUST_BE_ADMIN', '±z¥²¶·¬OºÞ²z­û¤~¯à°õ¦æ³o­Ó°Ê§@.');
@define('CREATE_AUTHOR', '·s¼W§@ªÌ \'%s\'.');
@define('CREATE_CATEGORY', '·s¼WÃþ§O \'%s\'.');
@define('MYSQL_REQUIRED', '±z¥²¶·­n¦³ MySQL ªºÂX¥R¥\¯à¤~¯à°õ¦æ³o­Ó°Ê§@.');
@define('COULDNT_CONNECT', '¤£¯àÁpµ²¨ì MySQL ¸ê®Æ®w: %s.');
@define('COULDNT_SELECT_DB', '¤£¯à¿ï¾Ü¸ê®Æ®w: %s.');
@define('COULDNT_SELECT_USER_INFO', '¤£¯à¿ï¾Ü¨Ï¥ÎªÌªº¸ê®Æ: %s.');
@define('COULDNT_SELECT_CATEGORY_INFO', '¤£¯à¿ï¾ÜÃþ§Oªº¸ê®Æ: %s.');
@define('COULDNT_SELECT_ENTRY_INFO', '¤£¯à¿ï¾Ü¤å³¹ªº¸ê®Æ: %s.');
@define('COULDNT_SELECT_COMMENT_INFO', '¤£¯à¿ï¾Ü°jÅTªº¸ê®Æ: %s.');
@define('YES', '¬O');
@define('NO', '§_');
@define('USE_DEFAULT', '¹w³]');
@define('CHECK_N_SAVE', 'Àx¦s');
@define('DIRECTORY_WRITE_ERROR', '¤£¯àŪ¼gÀɮק¨ %s. ½ÐÀˬdÅv­­.');
@define('DIRECTORY_CREATE_ERROR', 'Àɮק¨ %s ¤£¦s¦b¤]µLªk«Ø¥ß. ½Ð¦Û¤v«Ø¥ß³o­ÓÀɮק¨');
@define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; run <i>%s %s</i>');
@define('CANT_EXECUTE_BINARY', 'µLªk°õ¦æ %s ¸ê·½ÀÉ®×');
@define('FILE_WRITE_ERROR', 'µLªkŪ¼gÀÉ®× %s.');
@define('FILE_CREATE_YOURSELF', '½Ð¦Û¤v«Ø¥ß³o­ÓÀɮשÎÀˬdÅv­­');
@define('COPY_CODE_BELOW', '<br />* ½Ð½Æ»s¤U­±ªº¥N½XµM«á©ñ¤J %s ¨ì±zªº %s Àɮק¨:<b><pre>%s</pre></b>' . "\n");
@define('WWW_USER', '½Ð§ïÅÜ www ¨ì¨Ï¥ÎªÌªº Apache (i.e. nobody).');
@define('BROWSER_RELOAD', '§¹¦¨¤§«á, ­«·s¨ê·s±zªºÂsÄý¾¹.');
@define('DIAGNOSTIC_ERROR', '¨t²Î°»´ú¨ì¤@¨Ç¿ù»~:');
@define('SERENDIPITY_NOT_INSTALLED', 'Serendipity ÁÙ¨S¦w¸Ë§¹¦¨. ½Ð«ö <a href="%s">¦w¸Ë</a>.');
@define('INCLUDE_ERROR', 'serendipity ¿ù»~: µLªk¥]¬A %s - °h¥X.');
@define('DATABASE_ERROR', 'serendipity ¿ù»~: µLªk³sµ²¨ì¸ê®Æ®w - °h¥X.');
@define('ATTEMPT_SETUP_DATABASE', '¶i¦æ¸ê®Æ®w³]©w...');
@define('CHECK_DATABASE_EXISTS', 'Àˬd¸ê®Æ®w¬O§_¦s¦b. ¦pªG±z¬Ý¨ì¸ê®Æ®w¬d¸ß¿ù»~, ½Ð¤£¥ÎºÞ¥¦...');
@define('CREATE_DATABASE', '«Ø¥ß¹w³]¸ê®Æ®w³]©w...');
@define('DATABASE_DONE', '¸ê®Æ®w«Ø¥ß§¹¦¨');
@define('ATTEMPT_WRITE_FILE', 'Ū¼g %s ÀÉ®×...');
@define('SERENDIPITY_INSTALLED', '%sSerendipity ¤w¦w¸Ë§¹¦¨.%s ½Ð°O±o±zªº±K½X: "%s", ±zªº±b¸¹¬O "%s".%s±z²{¦b¥i¥H¨ì·s«Ø¥ßªº <a href="%s">ºô¸ô¤é°O</a>');
@define('WRITTEN_N_SAVED', 'Àx¦s§¹²¦');
@define('IMAGE_ALIGNMENT', '¹Ï¤ù¹ï»ô');
@define('ENTER_NEW_NAME', '¿é¤J·s¦WºÙµ¹: ');
@define('RESIZING', '­«³]¤j¤p');
@define('RESIZE_DONE', '§¹¦¨ (­«³] %s ­Ó¹Ï¤ù).');
@define('SYNCING', '¶i¦æ¸ê®Æ®w©M¹Ï¤ùÀɮק¨¦P¨B¤Æ');
@define('SYNC_DONE', '§¹¦¨ (¦P¨B¤F %s ­Ó¹Ï¤ù).');
@define('FILE_NOT_FOUND', '§ä¤£¨ìÀɮצWºÙ <b>%s</b>, ¤]³\¤w¸g³Q§R°£¤F?');
@define('ABORT_NOW', '©ñ±ó');
@define('REMOTE_FILE_NOT_FOUND', 'Àɮפ£¦b»·ºÝ¥D¾÷¤º, ±z½T©w³o­Ó URL: <b>%s</b> ¬O¥¿½Tªº¶Ü?');
@define('FILE_FETCHED', '%s ¨ú¦^¬° %s');
@define('FILE_UPLOADED', 'ÀÉ®× %s ¤W¶Ç¬° %s');
@define('WORD_OR', '©Î');
@define('SCALING_IMAGE', 'ÁY©ñ %s ¨ì %s x %s px');
@define('KEEP_PROPORTIONS', 'ºû«ù¤ñ¨Ò');
@define('REALLY_SCALE_IMAGE', '½T©w­nÁY©ñ¹Ï¤ù¶Ü? ³o­Ó°Ê§@¤£¯à´_­ì!');
@define('TOGGLE_ALL', '¤Á´«®i¶}');
@define('TOGGLE_OPTION', '¤Á´«¿ï¶µ');
@define('SUBSCRIBE_TO_THIS_ENTRY', '­q¾\³o½g¤å³¹');
@define('UNSUBSCRIBE_OK', "%s ¤w¨ú®ø­q¾\³o½g¤å³¹");
@define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', '·s°jÅT¨ì­q¾\ªº¤å³¹ "%s"');
@define('SUBSCRIPTION_MAIL', "±z¦n %s,\n\n±z­q¾\ªº¤å³¹¦³¤F·sªº°jÅT¦b \"%s\", ¼ÐÃD¬O \"%s\"\n°jÅTªºµoªíªÌ¬O: %s\n\n±z¥i¥H¦b³o§ä¨ì¦¹¤å³¹: %s\n\n±z¥i¥HÂI³o­Ó³sµ²¨ú®ø­q¾\: %s\n");
@define('SUBSCRIPTION_TRACKBACK_MAIL', "±z¦n %s,\n\n±z­q¾\ªº¤å³¹¦³¤F·sªº¤Þ¥Î¦b \"%s\", ¼ÐÃD¬O \"%s\"\n¤Þ¥Îªº§@ªÌ¬O: %s\n\n±z¥i¥H¦b³o§ä¨ì¦¹¤å³¹: %s\n\n±z¥i¥HÂI³o­Ó³sµ²¨ú®ø­q¾\: %s\n");
@define('SIGNATURE', "\n-- \n%s is powered by Serendipity.\nThe best blog around, you can use it too.\nCheck out <http://s9y.org> to find out how.");
@define('DATABASE_ALREADY_INSTALLED', '²¤¹L: ¸ê®Æ®w¤w¦w¸Ë');
@define('SYNDICATION_PLUGIN_091', 'RSS 0.91 feed');
@define('SYNDICATION_PLUGIN_10', 'RSS 1.0 feed');
@define('SYNDICATION_PLUGIN_20', 'RSS 2.0 feed');
@define('SYNDICATION_PLUGIN_20c', 'RSS 2.0 comments');
@define('SYNDICATION_PLUGIN_ATOM03', 'ATOM 0.3 feed');
@define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Äæ¦ì "managingEditor"');
@define('SYNDICATION_PLUGIN_WEBMASTER',  'Äæ¦ì "webMaster"');
@define('SYNDICATION_PLUGIN_BANNERURL', 'RSS feed ªº¹Ï¤ù');
@define('SYNDICATION_PLUGIN_BANNERWIDTH', '¹Ï¤ù¼e«×');
@define('SYNDICATION_PLUGIN_BANNERHEIGHT', '¹Ï¤ù°ª«×');
@define('SYNDICATION_PLUGIN_WEBMASTER_DESC',  'ºÞ²z­ûªº¹q¤l¶l¥ó, ¦pªG¦³. (ªÅ¥Õ: ÁôÂÃ) [RSS 2.0]');
@define('SYNDICATION_PLUGIN_MANAGINGEDITOR_DESC', '§@ªÌªº¹q¤l¶l¥ó, ¦pªG¦³. (ªÅ¥Õ: ÁôÂÃ) [RSS 2.0]');
@define('SYNDICATION_PLUGIN_BANNERURL_DESC', '¹Ï¤ùªº¦ì§} URL, ¥H GIF/JPEG/PNG ®æ¦¡, ¦pªG¦³. (ªÅ¥Õ: serendipity-logo)');
@define('SYNDICATION_PLUGIN_BANNERWIDTH_DESC', '¹³¯À, ³Ì¤j. 144');
@define('SYNDICATION_PLUGIN_BANNERHEIGHT_DESC', '¹³¯À, ³Ì¤j. 400');
@define('SYNDICATION_PLUGIN_TTL', 'Äæ¦ì "ttl" (time-to-live)');
@define('SYNDICATION_PLUGIN_TTL_DESC', '¹L´X¤ÀÄÁ«á±zªº¤å³¹¤£·|³Q¥~¨Óªººô¯¸©Îµ{¦¡Àx¦s¨ì§Ö¨ú°O¾Ð¸Ì (ªÅ¥Õ: ÁôÂÃ) [RSS 2.0]');
@define('SYNDICATION_PLUGIN_PUBDATE', 'Äæ¦ì "pubDate"');
@define('SYNDICATION_PLUGIN_PUBDATE_DESC', '"pubDate"-Äæ¦ì»Ý­n¤º´O¨ìRSS-ÀW¹D, ¥HÅã¥Ü³Ì«á¤å³¹ªº¤é´Á¶Ü?');
@define('CONTENT', '¤º®e');
@define('TYPE', 'Ãþ«¬');
@define('DRAFT', '¯ó½Z');
@define('PUBLISH', '¤½¶}');
@define('PREVIEW', '¹wÄý');
@define('DATE', '¤é´Á');
@define('DATE_FORMAT_2', 'Y-m-d H:i'); // Needs to be ISO 8601 compliant for date conversion!
@define('DATE_INVALID', 'ĵ§i: ±z´£¨Ñªº¤é´Á¤£¥¿½T. ¥¦¥²¶·¬O YYYY-MM-DD HH:MM ®æ¦¡.');
@define('CATEGORY_PLUGIN_DESC', 'Åã¥ÜÃþ§O²M³æ.');
@define('ALL_AUTHORS', '¥þ³¡§@ªÌ');
@define('CATEGORIES_TO_FETCH', 'Åã¥ÜÃþ§O');
@define('CATEGORIES_TO_FETCH_DESC', 'Åã¥Ü­þ¦ì§@ªÌªºÃþ§O?');
@define('PAGE_BROWSE_ENTRIES', '­¶¼Æ %s ¦@ %s, Á`¦@ %s ½g¤å³¹');
@define('PREVIOUS_PAGE', '¤W¤@­¶');
@define('NEXT_PAGE', '¤U¤@­¶');
@define('ALL_CATEGORIES', '¥þ³¡Ãþ§O');
@define('DO_MARKUP', '°õ¦æ¼Ð°OÂà´«');
@define('DO_MARKUP_DESCRIPTION', '®M¥Î¼Ð°OÂà´«¨ì¤å¦r (ªí±¡¹Ï®×, §Ö³t¼Ð°O¥H *, /, _, ...). Ãö³¬³o­Ó·|«O¯d¥ô¦ó HTML ¥N½X. ¹w³]¬OÃö³¬.');
@define('GENERAL_PLUGIN_DATEFORMAT', '¤é´Á®æ¦¡¤Æ');
@define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', '¤å³¹ªº¤é´Á®æ¦¡, ¨Ï¥Î PHP ªº strftime() ÅܼÆ. (¹w³]: "%s")');
@define('ERROR_TEMPLATE_FILE', 'µLªk¶}±Ò§G´ºÀÉ®×, ½Ð§ó·s serendipity!');
@define('ADVANCED_OPTIONS', '¶i¶¥¿ï¶µ');
@define('EDIT_ENTRY', '½s¿è¤å³¹');
@define('HTACCESS_ERROR', '­nÀˬd±zªº¥D¾÷¦w¸Ë³]©w, serendipity »Ý­nŪ¼gÀÉ®× ".htaccess". ¦ý¬O¦]¬°Åv­­¿ù»~, ¨S¦³¿ìªk¬°±zÀˬd. ½Ð§ïÅÜÀÉ®×Åv­­¹³³o¼Ë: <br />&nbsp;&nbsp;%s<br />µM«á­«·s¨ê·s³o­Óºô­¶.');
@define('SIDEBAR_PLUGINS', '°¼¦C¥~±¾');
@define('EVENT_PLUGINS', '¨Æ¥ó¥~±¾');
@define('SORT_ORDER', '±Æ§Ç');
@define('SORT_ORDER_NAME', 'ÀɮצWºÙ');
@define('SORT_ORDER_EXTENSION', '°ÆÀɦW');
@define('SORT_ORDER_SIZE', 'Àɮפj¤p');
@define('SORT_ORDER_WIDTH', '¹Ï¤ù¼e«×');
@define('SORT_ORDER_HEIGHT', '¹Ï¤ùªø«×');
@define('SORT_ORDER_DATE', '¤W¶Ç¤é´Á');
@define('SORT_ORDER_ASC', '»¼¼W±Æ§Ç');
@define('SORT_ORDER_DESC', '»¼´î±Æ§Ç');
@define('THUMBNAIL_SHORT', 'ÁY¹Ï');
@define('ORIGINAL_SHORT', '­ì©l');
@define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'ÁקK HTTP §Ö¨ú°O¾Ð');
@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', '¦pªG³]©w "¬O", ±zªº RSS feed ³]©w±N·|Åܦ¨¤£¥]¬A´î¤Ö¼eÀWªº§Ö¨ú°O¾Ð. «Øij±z³Ì¦n³]©w¬° "§_", ³o¼Ë«È¤áºÝ¤~¥i¥H¨Ï¥Î§Ö¨ú°O¾Ðªº¦n³B.');
@define('APPLY_MARKUP_TO', '®M¥Î¼Ð°O¨ì %s');
@define('CALENDAR_BEGINNING_OF_WEEK', '¤@¶gªº²Ä¤@¤Ñ');
@define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity °»´ú¨ì±zªº°t¸mª©¥»¬O %s, ¦ý¬O Serendipity ¥»¨­ªº¦w¸Ëª©¥»¬O %s, ½Ð§ó·s±zªºµ{¦¡ª©¥»! <a href="%s">§ó·s</a>');
@define('SERENDIPITY_UPGRADER_WELCOME', '±z¦n, Åwªï¨Ó¨ì Serendipity ªº§ó·s¨t²Î.');
@define('SERENDIPITY_UPGRADER_PURPOSE', '§ó·s¨t²Î·|À°±z§ó·s¨ì Serendipity ª©¥» %s.');
@define('SERENDIPITY_UPGRADER_WHY', '±z¬Ý¨ì³o­Ó°T®§¬O¦]¬°±z¦w¸Ë¤F Serendipity ª©¥» %s, ¦ý¬O±z¨S¦³§ó·s¸ê®Æ®w');
@define('SERENDIPITY_UPGRADER_DATABASE_UPDATES', '¸ê®Æ®w§ó·s (%s)');
@define('SERENDIPITY_UPGRADER_FOUND_SQL_FILES', '¨t²Î§ä¨ì¥H¤Uªº .sql ÀÉ, ¨º¨ÇÀÉ®×¥²¶·¥ý°õ¦æ¤~¯àÄ~Äò¦w¸Ë Serendipity');
@define('SERENDIPITY_UPGRADER_VERSION_SPECIFIC',  '¯S©wªºª©¥»¥ô°È');
@define('SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC', '¨S¦³¯S©wªºª©¥»¥ô°È');
@define('SERENDIPITY_UPGRADER_PROCEED_QUESTION', '½T©w­n°õ¦æ¤W­±ªº¥ô°È¶Ü?');
@define('SERENDIPITY_UPGRADER_PROCEED_ABORT', '§Ú¦Û¤v°õ¦æ');
@define('SERENDIPITY_UPGRADER_PROCEED_DOIT', '½ÐÀ°§Ú°õ¦æ');
@define('SERENDIPITY_UPGRADER_NO_UPGRADES', '±z¤£»Ý­n¶i¦æ¥ô¦ó§ó·s');
@define('SERENDIPITY_UPGRADER_CONSIDER_DONE', '°²¸Ë Serendipity §ó·s§¹¦¨§a');
@define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', '±z²¤¹L¤F§ó·s¥ô°È, ½Ð½T©w¸ê®Æ®w¤w¦w¸Ë§¹¦¨, ©M¨ä¥Lªº¥ô°È¦w¸ËµL»~');
@define('SERENDIPITY_UPGRADER_NOW_UPGRADED', '±zªº Serendipity ¥H§ó·s¦Üª©¥» %s');
@define('SERENDIPITY_UPGRADER_RETURN_HERE', '±z¥i¥HÂI %s³o¸Ì%s ªð¦^¤é°O­º­¶');
@define('MANAGE_USERS', 'ºÞ²z§@ªÌ');
@define('EDIT_USERS', '½s¿è§@ªÌ');
@define('CREATE_USERS', '·s¼W§@ªÌ');
@define('CREATE_NEW_USER', '·s¼W§@ªÌ');
@define('CREATE_NOT_AUTHORIZED', '±z¤£¯à­×§ï¸ò±z¬Û¦PÅv­­ªº§@ªÌ');
@define('CREATE_NOT_AUTHORIZED_USERLEVEL', '±z¤£¯à·s¼W¤ñ±z°ªÅv­­ªº§@ªÌ');
@define('CREATED_USER', '·s§@ªÌ %s ¤w¸g·s¼W');
@define('MODIFIED_USER', '§@ªÌ %s ªº¸ê®Æ¤w¸g§ó§ï');
@define('USER_SELF_INFO', 'µn¤J±b¸¹ %s, Åv­­ %s');
@define('USER_LEVEL', '§@ªÌÅv­­');
@define('DELETE_USER', '±z­n§R°£³o­Ó§@ªÌ #%d %s. ½T©w¶Ü? ³o·|¦b¥D­¶ÁôÂÃ¥L©Ò¼gªº¥ô¦ó¤å³¹.');
@define('DELETED_USER', '§@ªÌ #%d %s ¤w³Q§R°£.');
@define('LIMIT_TO_NUMBER', '­nÅã¥Ü¦h¤Ö¶µ¥Ø?');
@define('FILTER', '¹LÂo');
@define('ENTRIES_PER_PAGE', '¨C­¶Åã¥Üªº¤å³¹');
@define('XML_IMAGE_TO_DISPLAY', 'XML «ö¶s');
@define('XML_IMAGE_TO_DISPLAY_DESC','³sµ²¨ì XML Feeds ªº³£·|¥Î³o­Ó¹Ï¤ùªí¥Ü. ¤£¶ñ¼g±N·|¨Ï¥Î¹w³]ªº¹Ï¤ù, ©Î¿é¤J \'none\' Ãö³¬³o­Ó¥\¯à.');

@define('DIRECTORIES_AVAILABLE', '±z¥i¥H¦b¤l¥Ø¿ý¤ºÂI¥ô¦ó¥Ø¿ý¨Ó«Ø¥ß·sªº¥Ø¿ý.');
@define('ALL_DIRECTORIES', '¥þ³¡¥Øºñ');
@define('MANAGE_DIRECTORIES', 'ºÞ²z¥Ø¿ý');
@define('DIRECTORY_CREATED', '¥Ø¿ý <strong>%s</strong> ¤w¸g·s¼W.');
@define('NEW_DIRECTORY', '«Ø¥ß·s¥Ø¿ý');
@define('PARENT_DIRECTORY', '¥À¥Ø¿ý');
@define('DELETE_DIRECTORY', '§R°£³o­Ó¥Ø¿ý');
@define('CONFIRM_DELETE_DIRECTORY', '½T©w­n§R°£³o­Ó¥Ø¿ý¤ºªº¥þ³¡¤º®e¶Ü %s?');
@define('ERROR_NO_DIRECTORY', '¿ù»~: ¥Ø¿ý %s ¤£¦s¦b');
@define('FORCE_DELETE', '±j¨î§R°£¤£¦b´CÅé¸ê®Æ®wªºÀÉ®×');
@define('CHECKING_DIRECTORY', 'Àˬd¦¹¥Ø¿ýªºÀÉ®× %s');
@define('DELETING_FILE', '§R°£ÀÉ®× %s...');
@define('ERROR_DIRECTORY_NOT_EMPTY', '¤£¯à²¾°£¥¼²MªÅªº¥Ø¿ý. ¤Ä¿ï "±j¨î§R°£" ®Ö¨ú¤è¶ô¦pªG±z­n²¾°£³o¨ÇÀÉ®×, µM«á¦bÄ~Äò. ¦s¦bªºÀɮ׬O:');
@define('DIRECTORY_DELETE_FAILED', '¤£¯à§R°£¥Ø¿ý %s. ½ÐÀˬdÅv­­©Î¬Ý¤W­±ªº°T®§.');
@define('DIRECTORY_DELETE_SUCCESS', '¥Ø¿ý %s ¦¨¥\§R°£.');
@define('SKIPPING_FILE_EXTENSION', '²¤¹LÀÉ®×: ¨S¦³ %s ªº°ÆÀɦW.');
@define('SKIPPING_FILE_UNREADABLE', '²¤¹LÀÉ®×: %s ¤£¯àŪ¨ú.');
@define('FOUND_FILE', '§ä¨ì ·s/­×§ï ¹LªºÀÉ®×: %s.');
@define('ALREADY_SUBCATEGORY', '%s ¤w¸g¬O¦¹Ãþ§Oªº¤lÃþ§O %s.');
@define('PARENT_CATEGORY', '¥ÀÃþ§O');
@define('REPLY', '¦^ÂÐ');
@define('IN_REPLY_TO', '¦^ÂШì');
@define('TOP_LEVEL', '³Ì°ª¼h');
@define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s feed');
@define('PERMISSIONS', 'Åv­­');
@define('SETTINGS_SAVED_AT', '·s³]©w¤w¸g³QÀx¦s¨ì %s');

/* DATABASE SETTINGS */
@define('INSTALL_CAT_DB', '¸ê®Æ®w³]©w');
@define('INSTALL_CAT_DB_DESC', '±z¥i¥H¦b³o¿é¤J¥þ³¡ªº¸ê®Æ®w¸ê®Æ. Serendipity »Ý­n³o¨Ç¸ê®Æ¤~¯à¥¿±`¹B§@');
@define('INSTALL_DBTYPE', '¸ê®Æ®wÃþ«¬');
@define('INSTALL_DBTYPE_DESC', '¸ê®Æ®wÃþ«¬');
@define('INSTALL_DBHOST', '¸ê®Æ®w¥D¾÷');
@define('INSTALL_DBHOST_DESC', '¸ê®Æ®w¥D¾÷¦WºÙ');
@define('INSTALL_DBUSER', '¸ê®Æ®w±b¸¹');
@define('INSTALL_DBUSER_DESC', 'µn¤J¸ê®Æ®wªº±b¸¹');
@define('INSTALL_DBPASS', '¸ê®Æ®w±K½X');
@define('INSTALL_DBPASS_DESC', '±zªº¸ê®Æ®w±K½X');
@define('INSTALL_DBNAME', '¸ê®Æ®w¦WºÙ');
@define('INSTALL_DBNAME_DESC', '¸ê®Æ®w¦WºÙ');
@define('INSTALL_DBPREFIX', '¸ê®Æªí«e¸m¦WºÙ');
@define('INSTALL_DBPREFIX_DESC', '¸ê®Æªíªº«e¸m¦WºÙ, ¨Ò¦p serendipity_');

/* PATHS */
@define('INSTALL_CAT_PATHS', '¸ô®|³]©w');
@define('INSTALL_CAT_PATHS_DESC', 'µ¹Àɮק¨ªº¸ô®|. ¤£­n§Ñ¤F³Ì«áªº±×½u!');
@define('INSTALL_FULLPATH', '§¹¥þ¸ô®|');
@define('INSTALL_FULLPATH_DESC', '±zªº Serendipity ¦w¸Ëªº§¹¥þ¸ô®|©Mµ´¹ï¸ô®|');
@define('INSTALL_UPLOADPATH', '¤W¶Ç¸ô®|');
@define('INSTALL_UPLOADPATH_DESC', '¥þ³¡ªº¤W¶ÇÀÉ®×·|¦s¨ì³o¸Ì, ¥H \'§¹¥þ¸ô®|\' ªí¥Üªº¬Û¹ï¸ô®| - ¨Ò¦p \'uploads/\'');
@define('INSTALL_RELPATH', '¬Û¹ï¸ô®|');
@define('INSTALL_RELPATH_DESC', 'µ¹ÂsÄý¾¹ªº¸ô®|, ¨Ò¦p \'/serendipity/\'');
@define('INSTALL_RELTEMPLPATH', '¬Û¹ïªº§G´º¸ô®|');
@define('INSTALL_RELTEMPLPATH_DESC', '±z©ñ§G´ºªº¸ô®| - ¥H \'¬Û¹ï¸ô®|\' ªí¥Üªº¬Û¹ï¸ô®|');
@define('INSTALL_RELUPLOADPATH', '¬Û¹ïªº¤W¶Ç¸ô®|');
@define('INSTALL_RELUPLOADPATH_DESC', 'µ¹ÂsÄý¾¹¤W¶ÇÀɮתº¸ô®| - ¥H \'¬Û¹ï¸ô®|\' ªí¥Üªº¬Û¹ï¸ô®|');
@define('INSTALL_URL', 'ºô¸ô¤é°O URL');
@define('INSTALL_URL_DESC', '±zªº Serendipity ¦w¸Ëªº°ò¥» URL');
@define('INSTALL_INDEXFILE', 'Index ÀÉ®×');
@define('INSTALL_INDEXFILE_DESC', 'Serendipity ªº index ÀÉ®×');

/* Generel settings */
@define('INSTALL_CAT_SETTINGS', '¤@¯ë³]©w');
@define('INSTALL_CAT_SETTINGS_DESC', 'Serendipity ªº¤@¯ë³]©w');
@define('INSTALL_USERNAME', 'ºÞ²z­û±b¸¹');
@define('INSTALL_USERNAME_DESC', 'ºÞ²z­ûªºµn¤J¦WºÙ');
@define('INSTALL_PASSWORD', 'ºÞ²z­û±K½X');
@define('INSTALL_PASSWORD_DESC', 'ºÞ²z­ûªºµn¤J±K½X');
@define('INSTALL_EMAIL', '¹q¤l¶l¥ó');
@define('INSTALL_EMAIL_DESC', 'ºÞ²z­ûªº¹q¤l¶l¥ó');
@define('INSTALL_SENDMAIL', '±H°e¹q¤l¶l¥óµ¹ºÞ²z­û?');
@define('INSTALL_SENDMAIL_DESC', '·í¦³¤Hµo§G°jÅT¨ì±zªº¤å³¹®É­n¦¬¨ì¹q¤l¶l¥ó³qª¾¶Ü?');
@define('INSTALL_SUBSCRIBE', '¤¹³\¨Ï¥ÎªÌ­q¾\¤å³¹?');
@define('INSTALL_SUBSCRIBE_DESC', '±z¥i¥H¤¹³\¨Ï¥ÎªÌ¦¬¨ì¹q¤l¶l¥ó³qª¾, ·í¦³°jÅTµo§G®É¦o­Ì·|¦¬¨ì³qª¾.');
@define('INSTALL_BLOGNAME', '¤é°O¦WºÙ');
@define('INSTALL_BLOGNAME_DESC', '±zªº¤é°O¼ÐÃD');
@define('INSTALL_BLOGDESC', '¤é°O²¤¶');
@define('INSTALL_BLOGDESC_DESC', '¤¶²Ð±zªº¤é°O');
@define('INSTALL_LANG', '»y¨t');
@define('INSTALL_LANG_DESC', '±z¤é°O¨Ï¥Îªº»y¨t');

/* Appearance and options */
@define('INSTALL_CAT_DISPLAY', '¥~Æ[¤Î¿ï¶µ³]©w');
@define('INSTALL_CAT_DISPLAY_DESC', 'Åý±z³]©w Serendipity ªº¥~Æ[©M¨ä¥L³]©w');
@define('INSTALL_EXTERNALSTYLE', '¥~³¡ CSS');
@define('INSTALL_EXTERNALSTYLE_DESC', '±z¥i¥H¦b³o´£¨Ñ¤@­Ó¥~³¡ªº CSS URI, ¥[¤WºÞ²z¤¶­±´£¨Ñªº³]©w (¿é¤J \'none\' ¦pªG±z¤£»Ý­n³o­Ó)');
@define('INSTALL_WYSIWYG', '¨Ï¥Î WYSIWYG ½s¿è¾¹');
@define('INSTALL_WYSIWYG_DESC', '±z­n¨Ï¥Î WYSIWYG ½s¿è¾¹¶Ü? (¥i¦b IE5+ ¨Ï¥Î, ¬Y¨Ç³¡¤À¥i¨Ï¥Î©ó Mozilla 1.3+)');
@define('INSTALL_XHTML11', '±j¨î²Å¦X XHTML 1.1 ­n¨D');
@define('INSTALL_XHTML11_DESC', '±z¥i¥HÅý±zªº¤é°O±j¨î²Å¦X XHTML 1.1 ªº­n¨D (¹ïªºÂsÄý¾¹¥i¯à·|¦³ «á¥x/«e¥x ªº°ÝÃD)');
@define('INSTALL_POPUP', '¨Ï¥Î¼u¥Xµøµ¡');
@define('INSTALL_POPUP_DESC', '±z­n¦b°jÅT, ¤Þ¥Îµ¥¦a¤è¨Ï¥Î¼u¥Xµøµ¡¶Ü?');
@define('INSTALL_EMBED', '¨Ï¥Î¤º´O¥\¯à?');
@define('INSTALL_EMBED_DESC', '¦pªG§A­n±N Serendipity ¥H¤º´Oªº¤è¦¡©ñ¨ìºô­¶¤º, ¿ï¾Ü ¬O ·|Åý±z±Ë±ó¥ô¦ó¼ÐÃDµM«á¥uÅã¥Ü¤é°O¤º®e. ±z¥i¥H¥Î indexFile ³]©w¨Ó¨Ï¥Î¥]¸Ë¨ç¦¡Ãþ§O¥H«K±z©ñ¤Jºô­¶¼ÐÃD. ¸Ô±¡½Ð¬d¸ß README ÀÉ®×!');
@define('INSTALL_TOP_AS_LINKS', '¥H³sµ²Åã¥Ü ¥D­n¥X·½/¥D­n¨Ó·½?');
@define('INSTALL_TOP_AS_LINKS_DESC', '"§_": ¥X·½©M¨Ó·½±N¥Î¤å¦rÅã¥Ü¥HÁקK google ªº¼s§i. "¬O": ¥X·½©M¨Ó·½±N¥Î³sµ²Åã¥Ü. "¹w³]": ¥Î¥þ°Ï¸Ì­±ªº³]©w («Øij).');
@define('INSTALL_BLOCKREF', 'ªý¾×¨Ó·½');
@define('INSTALL_BLOCKREF_DESC', '¦³¥ô¦ó¯S®íªº¥D¾÷±z¤£·Q¦b¨Ó·½¸ÌÅã¥Ü¶Ü? ¥Î \';\' ¨Ó¤À¶}¥D¾÷¦WºÙ, ª`·N¥D¾÷¬O¥H¤l¦r¦ê¤è¦¡ªý¾×!');
@define('INSTALL_REWRITE', 'URL Rewriting');
@define('INSTALL_REWRITE_DESC', '½Ð¿ï¾Ü±z·Q¥Îªº URL Rewriting ¤è¦¡. ¶}±Ò rewrite ³W«h·|¥H¤ñ¸û²M·¡ªº¤è¦¡Åã¥Ü URL, ¥H«K·j´Mºô¯¸¯à¥¿½Tªºµn¤J±zªº¤å³¹. ±zªº¥D¾÷¥²¶·¤ä´© mod_rewrite ©Î "AllowOverride All" ¨ì±zªº Serendipity Àɮק¨. ¹w³]ªº³]©w¬O¨t²Î¦Û°ÊÀ°±z°»´úªº');

/* Imageconversion Settings */
@define('INSTALL_CAT_IMAGECONV', '¹Ï¤ùÂà´«³]©w');
@define('INSTALL_CAT_IMAGECONV_DESC', '½Ð³]©w Serendipity ³]©w¹Ï¤ùÂà´«ªº¤è¦¡');
@define('INSTALL_IMAGEMAGICK', '¨Ï¥Î Imagemagick');
@define('INSTALL_IMAGEMAGICK_DESC', '¦pªG¦³¦w¸Ë image magick, ±z­n¥Î¥¦¨Ó§ïÅܹϤù¤j¤p¶Ü?');
@define('INSTALL_IMAGEMAGICKPATH', 'Âà´«µ{¦¡¸ô®|');
@define('INSTALL_IMAGEMAGICKPATH_DESC', 'image magick Âà´«µ{¦¡ªº§¹¥þ¸ô®|©M¦WºÙ');
@define('INSTALL_THUMBSUFFIX', 'ÁY¹Ï«á¸m¦r¤¸');
@define('INSTALL_THUMBSUFFIX_DESC', 'ÁY¹Ï·|¥H¤U­±ªº®æ¦¡­«·s©R¦W: original.[«á¸m¦r¤¸].ext');
@define('INSTALL_THUMBWIDTH', 'ÁY¹Ï¤Ø«×');
@define('INSTALL_THUMBWIDTH_DESC', '¦Û°Ê«Ø¥ßÁY¹Ïªº³Ì¤j¼e«×');

/* Personal details */
@define('USERCONF_CAT_PERSONAL', '­Ó¤H¸ê®Æ³]©w');
@define('USERCONF_CAT_PERSONAL_DESC', '§ïÅܱzªº­Ó¤H¸ê®Æ');
@define('USERCONF_USERNAME', '±zªº±b¸¹');
@define('USERCONF_USERNAME_DESC', '±zµn¤Jºô¸ô¤é°Oªº¦WºÙ');
@define('USERCONF_PASSWORD', '±zªº±K½X');
@define('USERCONF_PASSWORD_DESC', '±zµn¤Jºô¸ô¤é°Oªº±K½X');
@define('USERCONF_USERLEVEL', '¨Ï¥ÎÅv­­');
@define('USERCONF_USERLEVEL_DESC', '¨Ï¥ÎÅv­­. ¥Î¥H¤U¤è¦¡: [USERLEVEL_ADMIN] - ºÞ²z­û, [USERLEVEL_CHIEF] - Á`½s¿è, [USERLEVEL_EDITOR] - ½s¿è§@ªÌ.');
@define('USERCONF_EMAIL', '±zªº¹q¤l¶l¥ó');
@define('USERCONF_EMAIL_DESC', '±z¨Ï¥Îªº¹q¤l¶l¥ó');
@define('USERCONF_SENDCOMMENTS', '±H°e°jÅT³qª¾?');
@define('USERCONF_SENDCOMMENTS_DESC', '·í¦³·s°jÅT¨ì±zªº¤å³¹®É­n³qª¾±z¶Ü?');
@define('USERCONF_SENDTRACKBACKS', '±H°e¤Þ¥Î³qª¾?');
@define('USERCONF_SENDTRACKBACKS_DESC', '·í¦³·s¤Þ¥Î¨ì±zªº¤å³¹®É­n³qª¾±z¶Ü?');
@define('USERCONF_ALLOWPUBLISH', 'Åv­­: ¥iµo§G¤å³¹?');
@define('USERCONF_ALLOWPUBLISH_DESC', '¤¹³\³o¦ì§@ªÌµo§G¤å³¹¶Ü?');
@define('SUCCESS', '§¹¦¨');
@define('POWERED_BY_SHOW_TEXT', '¥H¤å¦rÅã¥Ü "Serendipity"');
@define('POWERED_BY_SHOW_TEXT_DESC', '±N¥Î¤å¦rÅã¥Ü "Serendipity Weblog"');
@define('POWERED_BY_SHOW_IMAGE', '¥H logo Åã¥Ü "Serendipity"');
@define('POWERED_BY_SHOW_IMAGE_DESC', 'Åã¥Ü Serendipity ªº logo');
@define('PLUGIN_ITEM_DISPLAY', '¸Ó¶µ¥ØªºÅã¥Ü¦ì§}?');
@define('PLUGIN_ITEM_DISPLAY_EXTENDED', '¥u¦b°Æ¤º®eÅã¥Ü');
@define('PLUGIN_ITEM_DISPLAY_OVERVIEW', '¥u¦b·§Æ[¤ºÅã¥Ü');
@define('PLUGIN_ITEM_DISPLAY_BOTH', '¥Ã»·Åã¥Ü');
@define('RSS_IMPORT_DESC', 'RSS ªº¿é¤J¥\¯à¥i¥HÅý±zÂ^¨ú RSS feed ©M¿é¤J©Ò¦³ªº¤å³¹. ±z¥i¥H¿ï¾Ü¥Î¯ó½Z©Î¤½¶}ªº¤è¦¡¿é¤J. ¥~¨Ó feed ªºÃþ§O¦WºÙ¥²¶·¸ò±zªº Serendipity Ãþ§O¦WºÙ¬Û¦P. ¦pªGÃþ§O¦WºÙ¤£¬Û¦P, ±z¥i¥H¥Î¨ä¥LÄæ¦ì¿ï¾Ü±z­n³sµ²¤å³¹ªºÃþ§O.');
@define('RSS_IMPORT_CATEGORY', '¥Î³o­ÓÃþ§Oµ¹¤£¬Û¦Pªº¿é¤J¤å³¹');

@define('COMMENTS_WILL_BE_MODERATED', 'µo§Gªº°jÅT±N»Ý­nºÞ²z­ûªº¼f®Ö.');
@define('YOU_HAVE_THESE_OPTIONS', '±z¦³¥H¤U¿ï¾Ü:');
@define('THIS_COMMENT_NEEDS_REVIEW', 'ĵ§i: ³o­Ó°jÅT¶·¼f®Ö¤~·|Åã¥Ü');
@define('DELETE_COMMENT', '§R°£°jÅT');
@define('APPROVE_COMMENT', '»{¥i°jÅT');
@define('REQUIRES_REVIEW', '»Ý­n¼f®Ö');
@define('COMMENT_APPROVED', '°jÅT #%s ¤w¸g³q¹L¼f®Ö');
@define('COMMENT_DELETED', '°jÅT #%s ¤w¸g¦¨¥\§R°£');
@define('COMMENTS_MODERATE', '°jÅT©M¤Þ¥Î¨ì³o­Ó¤å³¹»Ý­nºÞ²z­ûªº¼f®Ö');
@define('THIS_TRACKBACK_NEEDS_REVIEW', 'ĵ§i: ³o­Ó¤Þ¥Î»Ý­nºÞ²z­ûªº¼f®Ö¤~·|Åã¥Ü');
@define('DELETE_TRACKBACK', '§R°£¤Þ¥Î');
@define('APPROVE_TRACKBACK', '»{¥i¤Þ¥Î');
@define('TRACKBACK_APPROVED', '¤Þ¥Î #%s ¤w¸g³q¹L¼f®Ö');
@define('TRACKBACK_DELETED', '¤Þ¥Î #%s ¤w¸g¦¨¥\§R°£');
@define('VIEW', 'ÂsÄý');
@define('COMMENT_ALREADY_APPROVED', '°jÅT #%s ¤w¸g³q¹L¼f®Ö');
@define('COMMENT_EDITED', '¤å³¹¤w³Q½s¿è');
@define('HIDE', 'ÁôÂÃ');
@define('VIEW_EXTENDED_ENTRY', 'Ä~Äò¾\Ū "%s"');
@define('TRACKBACK_SPECIFIC_ON_CLICK', '³o­Ó³sµ²¤£¬O¥Î¨ÓÂIªº. ¥¦¥]§t¤F³o­Ó¤å³¹ªº¤Þ¥Î URI. ±z¥i¥H±q±zªº¤é°O¤º¥Î³o­Ó URI ¨Ó¶Ç°e ping ©M¤Þ¥Î¨ì³o­Ó¤å³¹. ¦pªG­n½Æ»s³o­Ó³sµ², ¦b³sµ²¤WÂI¥kÁäµM«á¿ï¾Ü "½Æ»s³sµ²" (IE) ©Î "½Æ»s³sµ²¦ì§}" (Mozilla).');
@define('PLUGIN_SUPERUSER_HTTPS', '¥Î https µn¤J');
@define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Åýµn¤J³sµ²³s¨ì https ºô§}. ±zªº¥D¾÷¥²¶·¤ä´©³o¶µ¥\¯à!');
@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Åý¥~¨Ó³sµ²¥H³sµ²Åã¥Ü?');
@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', '"§_": ¥~¨Ó³sµ² (¥D­n¥X·½, ¥D­n¨Ó·½, °jÅT) ³£¤£·|¥H¤å¦rÅã¥Ü¥HÁקK google ¼s§i («Øij¨Ï¥Î). "¬O": ¥~¨Ó³sµ²±N¥H¶W³sµ²ªº¤è¦¡Åã¥Ü. ¥i¥H¦b°¼¦C¥~±¾»\¹L¦¹³]©w!');
@define('PAGE_BROWSE_COMMENTS', '­¶¼Æ %s ¦@ %s, Á`¦@ %s ­Ó°jÅT');
@define('FILTERS', '¹LÂo');
@define('FIND_ENTRIES', '·j´M¤å³¹');
@define('FIND_COMMENTS', '·j´M°jÅT');
@define('FIND_MEDIA', '·j´M´CÅé');
@define('FILTER_DIRECTORY', '¥Ø¿ý');
@define('SORT_BY', '±Æ§Ç');
@define('TRACKBACK_COULD_NOT_CONNECT', '¨S¦³°e¥X¤Þ¥Î: µLªk¶}±Ò½u¸ô¨ì %s ¥Î³s±µ°ð %d');
@define('MEDIA', '´CÅé');
@define('MEDIA_LIBRARY', '´CÅé¦s®w');
@define('ADD_MEDIA', '·s¼W´CÅé');
@define('ENTER_MEDIA_URL', '½Ð¿é¤JÀɮתº URL:');
@define('ENTER_MEDIA_UPLOAD', '½Ð¿ï¾Ü­n¤W¶ÇªºÀÉ®×:');
@define('SAVE_FILE_AS', 'Àx¦sÀÉ®×:');
@define('STORE_IN_DIRECTORY', 'Àx¦s¨ì¥H¤U¥Ø¿ý: ');
@define('ADD_MEDIA_BLAHBLAH', '<b>·s¼WÀɮרì´CÅé¦s®w:</b><p>±z¥i¥H¦b³o¤W¶Ç´CÅéÀÉ, ©Î§i¶D¨t²Î¨ì­þ´M§ä! ¦pªG±z¨S¦³·Q­nªº¹Ï¤ù, ±z¥i¥H¨ì <a href="http://images.google.com" target="_blank">google´M§ä¹Ï¤ù</a>.<p><b>¿ï¾Ü¤è¦¡:</b><br>');
@define('MEDIA_RENAME', '§ó§ïÀɮצWºÙ');
@define('IMAGE_RESIZE', '§ó§ï¹Ï¤ù¤Ø¤o');
@define('MEDIA_DELETE', '§R°£³o­ÓÀÉ®×');
@define('FILES_PER_PAGE', '¨C­¶Åã¥ÜªºÀÉ®×¼Æ');
@define('CLICK_FILE_TO_INSERT', 'ÂI¿ï±z­n¿é¤JªºÀÉ®×:');
@define('SELECT_FILE', '¿ï¾Ü­n¿é¤JªºÀÉ®×');
@define('MEDIA_FULLSIZE', '§¹¾ã¤Ø¤o');
@define('CALENDAR_BOW_DESC', '¤@­Ó§«ôªº²Ä¤@¤Ñ. ¹w³]¬O¬P´Á¤@');
@define('SUPERUSER', '¤é°OºÞ²z');
@define('ALLOWS_YOU_BLAHBLAH', '¦b°¼¦C´£¨Ñ³sµ²¨ì¤é°OºÞ²z');
@define('CALENDAR', '¤é¾ä');
@define('SUPERUSER_OPEN_ADMIN', '¶}±ÒºÞ²z­¶­±');
@define('SUPERUSER_OPEN_LOGIN', '¶}±Òµn¤J­¶­±');
@define('INVERT_SELECTIONS', 'ÄA­Ë¤Ä¿ï');
@define('COMMENTS_DELETE_CONFIRM', '½T©w­n§R°£¤Ä¿ïªº°jÅT¶Ü?');
@define('COMMENT_DELETE_CONFIRM', '½T©w­n§R°£°jÅT #%d, µo§GªÌ¬O %s?');
@define('DELETE_SELECTED_COMMENTS', '§R°£¤Ä¿ïªº°jÅT');
@define('VIEW_COMMENT', 'ÂsÄý°jÅT');
@define('VIEW_ENTRY', 'ÂsÄý¤å³¹');
@define('DELETE_FILE_FAIL' , 'µLªk§R°£ÀÉ®× <b>%s</b>');
@define('DELETE_THUMBNAIL', '§R°£¤F¹Ï¤ùÁY¹Ï <b>%s</b>');
@define('DELETE_FILE', '§R°£¤FÀÉ®× <b>%s</b>');
@define('ABOUT_TO_DELETE_FILE', '±z±N§R°£ÀÉ®× <b>%s</b><br />¦pªG±z¦³¦b¨ä¥Lªº¤å³¹¤º¨Ï¥Î³o­ÓÀÉ®×, ¨º­Ó³sµ²©Î¹Ï¤ù±N·|µL®Ä<br />½T©w­nÄ~Äò¶Ü?<br /><br />');
@define('TRACKBACK_SENDING', '¶Ç°e¤Þ¥Î¨ì URI %s...');
@define('TRACKBACK_SENT', '¤Þ¥Î§¹¦¨');
@define('TRACKBACK_FAILED', '¤Þ¥Î¿ù»~: %s');
@define('TRACKBACK_NOT_FOUND', '§ä¤£¨ì¤Þ¥ÎªºURI.');
@define('TRACKBACK_URI_MISMATCH', '¦Û°Ê·j´Mªº¤Þ¥Î¸ò¤Þ¥Î¥Ø¼Ð¤£¬Û¦P.');
@define('TRACKBACK_CHECKING', '·j´M <u>%s</u> ªº¤Þ¥Î...');
@define('TRACKBACK_NO_DATA', '¥Ø¼Ð¨S¦³¥ô¦ó¸ê®Æ');
@define('TRACKBACK_SIZE', '¥Ø¼Ð URI ¶W¥X¤F¤¹³\ªº %s bytes Àɮפj¤p.');
@define('COMMENTS_VIEWMODE_THREADED', '¤À½uµ{');
@define('COMMENTS_VIEWMODE_LINEAR', 'ª½½uµ{');
@define('DISPLAY_COMMENTS_AS', '°jÅTÅã¥Ü¤è¦¡');
@define('COMMENTS_FILTER_SHOW', 'Åã¥Ü');
@define('COMMENTS_FILTER_ALL', '¥þ³¡');
@define('COMMENTS_FILTER_APPROVED_ONLY', 'Åã¥Ü¼f®Ö°jÅT');
@define('COMMENTS_FILTER_NEED_APPROVAL', 'Åã¥Üµ¥«Ý¼f®Ö');
@define('RSS_IMPORT_BODYONLY', '±N¿é¤Jªº¤å¦r©ñ¨ì¥D¤º®e, ±N¤£©î¶}¹Lªøªº¤å³¹¨ì°Æ¤º®e¦a°Ï.');
@define('SYNDICATION_PLUGIN_FULLFEED', '¦b RSS feed ¸ÌÅã¥Ü¥þ³¡ªº¤å³¹');
@define('WEEK', '¶g');
@define('WEEKS', '¶g');
@define('MONTHS', '¤ë');
@define('DAYS', '¤é');
@define('ARCHIVE_FREQUENCY', '«O¦s¤å®wªº¶µ¥ØÀW²v');
@define('ARCHIVE_FREQUENCY_DESC', '«O¦s¤å®w¨Ï¥Îªº¶µ¥Ø²M³æ¶¡¹j');
@define('ARCHIVE_COUNT', '«O¦s¤å®wªº¶µ¥Ø¼Æ');
@define('ARCHIVE_COUNT_DESC', 'Åã¥Üªº¤ë, ¶g, ©Î¤é');
@define('BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS', '¤U­±¬O¦w¸Ë¦nªº¥~±¾');
@define('SIDEBAR_PLUGIN', '°¼¦C¥~±¾');
@define('EVENT_PLUGIN', '¨Æ¥ó¥~±¾');
@define('CLICK_HERE_TO_INSTALL_PLUGIN', 'ÂI³o¸Ì¦w¸Ë·s %s');
@define('UNKNOWN', '¥¼ª¾');
@define('VERSION', 'ª©¥»');
@define('NA', 'N/A');
@define('INSTALL', '¦w¸Ë');
@define('ALREADY_INSTALLED', '¤w¸g¦w¸Ë');
@define('SELECT_A_PLUGIN_TO_ADD', '½Ð¿ï¾Ü­n¦w¸Ëªº¥~±¾');
@define('QUICKSAVE', '§Ö³tÀx¦s');
@define('INSTALL_OFFSET', 'Server time Offset'); // Translate
@define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
@define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate

/* vim: set sts=4 ts=4 expandtab : */
?>

[php-blog-cvs] serendipity/include lang.inc.php,1.1.2.1,1.1.2.2

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31179/include

Modified Files:
      Tag: branch-smarty
	lang.inc.php 
Log Message:
added chinese language


Index: lang.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/Attic/lang.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- lang.inc.php	6 Nov 2004 11:22:49 -0000	1.1.2.1
+++ lang.inc.php	15 Nov 2004 10:55:31 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <?php # $Id$
 
-if (!defined('LANGUAGE_LIST')) define('LANGUAGE_LIST', 'en=>English,de=>German,da=>Danish,es=>Spanish,fr=>French,cs=>Czech (Win-1250),cz=>Czech (ISO-8859-2),nl=>Dutch,pt=>Portuguese Brazilian,bg=>Bulgarian,no=>Norwegian,it=>Italian');
+if (!defined('LANGUAGE_LIST')) define('LANGUAGE_LIST', 'en=>English,de=>German,da=>Danish,es=>Spanish,fr=>French,cs=>Czech (Win-1250),cz=>Czech (ISO-8859-2),nl=>Dutch,pt=>Portuguese Brazilian,bg=>Bulgarian,no=>Norwegian,it=>Italian,tw=>Traditional Chinese');
 
 if (!defined('serendipity_LANG_LOADED') || serendipity_LANG_LOADED !== true) {
     // Try and include preferred language from the configurated setting
@@ -11,7 +11,7 @@
         // If no config file is loaded, language includes are not available.
         // Now include one. Try to auto-guess the language by looking up the HTTP_ACCEPT_LANGUAGE.
         $serendipty['autolang'] = 'en';
-        $supported_languages = array('en', 'da', 'de', 'es', 'cs', 'cz', 'fr', 'nl', 'pt', 'bg', 'no', 'it');
+        $supported_languages = array('en', 'da', 'de', 'es', 'cs', 'cz', 'fr', 'nl', 'pt', 'bg', 'no', 'it', 'tw');
         $possible_languages = explode(',', (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : ''));
         if (is_array($possible_languages)) {
             foreach($possible_languages as $index => $lang) {

[php-blog-cvs] serendipity/docs NEWS,1.1.2.11,1.1.2.12

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31179/docs

Modified Files:
      Tag: branch-smarty
	NEWS 
Log Message:
added chinese language


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/Attic/NEWS,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -d -r1.1.2.11 -r1.1.2.12
--- NEWS	15 Nov 2004 10:33:46 -0000	1.1.2.11
+++ NEWS	15 Nov 2004 10:55:31 -0000	1.1.2.12
@@ -3,6 +3,8 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * New language: Traditional Chinese (Big5). Thanks to Andrew Huang!
+
     * Recent Entries plugin: New configuration directive to not display
       items already shown on frontpage. Thanks to Sebastian Raible!
       (garvinhicking)

[php-blog-cvs] serendipity/docs NEWS,1.1.2.10,1.1.2.11

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26522/docs

Modified Files:
      Tag: branch-smarty
	NEWS 
Log Message:
new config option to recent entries plugin, thanks to sebastian raible


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/Attic/NEWS,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- NEWS	15 Nov 2004 10:21:48 -0000	1.1.2.10
+++ NEWS	15 Nov 2004 10:33:46 -0000	1.1.2.11
@@ -3,6 +3,10 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Recent Entries plugin: New configuration directive to not display
+      items already shown on frontpage. Thanks to Sebastian Raible!
+      (garvinhicking)
+
     * Articles per page (default 15) can now be set within Configuration
       (garvinhicking)
 

[php-blog-cvs] serendipity/plugins/serendipity_plugin_recententries serendipity_plugin_recententries.php,1.9.2.3,1.9.2.4

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_recententries
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26522/plugins/serendipity_plugin_recententries

Modified Files:
      Tag: branch-smarty
	serendipity_plugin_recententries.php 
Log Message:
new config option to recent entries plugin, thanks to sebastian raible


Index: serendipity_plugin_recententries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -u -d -r1.9.2.3 -r1.9.2.4
--- serendipity_plugin_recententries.php	12 Nov 2004 15:43:30 -0000	1.9.2.3
+++ serendipity_plugin_recententries.php	15 Nov 2004 10:33:46 -0000	1.9.2.4
@@ -8,6 +8,10 @@
         @define('PLUGIN_RECENTENTRIES_BLAHBLAH', 'Zeigt die Titel der aktuellsten Einträge mit Datum');
         @define('PLUGIN_RECENTENTRIES_NUMBER', 'Anzahl der Einträge');
         @define('PLUGIN_RECENTENTRIES_NUMBER_BLAHBLAH', 'Wieviele Einträge sollen angezeigt werden? (Standard: 10)');
+        @define('PLUGIN_RECENTENTRIES_NUMBER_FROM', 'Angezeigte Einträge überspringen');
+        @define('PLUGIN_RECENTENTRIES_NUMBER_FROM_DESC', 'Nur die neuesten Einträge, die nicht schon auf der Hauptseite zu sehen sind, werden angezeigt. (Default: die neuesten ' . $serendipity['fetchLimit'] . ' werden übersprungen)');
+        @define('PLUGIN_RECENTENTRIES_NUMBER_FROM_RADIO_ALL', 'Alle anzeigen');
+        @define('PLUGIN_RECENTENTRIES_NUMBER_FROM_RADIO_RECENT', 'Einträge auf der Hauptseite überspringen');
         break;
 
     case 'en':
@@ -17,7 +21,10 @@
         @define('PLUGIN_RECENTENTRIES_BLAHBLAH', 'Shows the titles and dates of the most recent entries');
         @define('PLUGIN_RECENTENTRIES_NUMBER', 'Number of entries');
         @define('PLUGIN_RECENTENTRIES_NUMBER_BLAHBLAH', 'How many entries should be displayed? (Default: 10)');
-
+        @define('PLUGIN_RECENTENTRIES_NUMBER_FROM', 'Skip front page entries');
+        @define('PLUGIN_RECENTENTRIES_NUMBER_FROM_DESC', 'Only recent entries that are not on the front page will be shown. (Default: latest ' . $serendipity['fetchLimit'] . ' will be skipped)');
+        @define('PLUGIN_RECENTENTRIES_NUMBER_FROM_RADIO_ALL', 'Show all');
+        @define('PLUGIN_RECENTENTRIES_NUMBER_FROM_RADIO_RECENT', 'Skip front page items');
         break;
 }
 
@@ -28,8 +35,8 @@
         $propbag->add('description',   PLUGIN_RECENTENTRIES_BLAHBLAH);
         $propbag->add('stackable',     true);
         $propbag->add('author',        'Christian Machmeier');
-        $propbag->add('version',       '1.1');
-        $propbag->add('configuration', array('title', 'number', 'dateformat', 'category'));
+        $propbag->add('version',       '1.2');
+        $propbag->add('configuration', array('title', 'number', 'number_from', 'dateformat', 'category'));
     }
 
     function introspect_config_item($name, &$propbag) {
@@ -48,6 +55,17 @@
                 $propbag->add('default', 10);
                 break;
 
+                case 'number_from':
+                    $propbag->add('type', 'radio');
+                    $propbag->add('name', PLUGIN_RECENTENTRIES_NUMBER_FROM);
+                    $propbag->add('description', PLUGIN_RECENTENTRIES_NUMBER_FROM_DESC);
+                    $propbag->add('radio',  array(
+                        'value' => array('all', 'skip'),
+                        'desc'  => array(PLUGIN_RECENTENTRIES_NUMBER_FROM_RADIO_ALL, PLUGIN_RECENTENTRIES_NUMBER_FROM_RADIO_RECENT)
+                        ));
+                    $propbag->add('default', 'all');
+                break;
+
             case 'dateformat':
                 $propbag->add('type', 'string');
                 $propbag->add('name', GENERAL_PLUGIN_DATEFORMAT);
@@ -93,10 +111,11 @@
     function generate_content(&$title) {
         global $serendipity;
 
-        $number     = $this->get_config('number');
-        $dateformat = $this->get_config('dateformat');
-        $category   = $this->get_config('category', 'none');
-        $title      = $this->get_config('title', $title);
+        $number         = $this->get_config('number');
+        $dateformat     = $this->get_config('dateformat');
+        $category       = $this->get_config('category', 'none');
+        $title          = $this->get_config('title', $title);
+        $number_from_sw = $this->get_config('number_from');
 
         $sql_join   = '';
         $sql_where  = '';
@@ -110,10 +129,19 @@
             $number = 10;
         }
 
+        $sql_number = $number;
+
+        switch($number_from_switch) {
+            case 'skip':
+                $sql_number = serendipity_db_limit_sql(serendipity_db_limit($serendipity['fetchLimit'], $sql_number));
+                break;
+        }
+
         if (!$dateformat || strlen($dateformat) < 1) {
             $dateformat = '%A, %B %e %Y';
         }
 
+        if ($number_from > 0)
         $entries_query = "SELECT id,
                                                 title,
                                                 timestamp
@@ -122,7 +150,7 @@
                                           WHERE isdraft = 'false' AND timestamp <= " . serendipity_serverOffsetHour(time(), true) . "
                                                 $sql_where
                                        ORDER BY timestamp DESC
-                                          LIMIT $number";
+                                          LIMIT $sql_number";
         $entries = serendipity_db_query($entries_query);
 
         if (isset($entries) && is_array($entries)) {

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.1.2.2,1.1.2.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26202/include

Modified Files:
      Tag: branch-smarty
	functions_installer.inc.php 
Log Message:
missing rename


Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/Attic/functions_installer.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- functions_installer.inc.php	11 Nov 2004 11:15:55 -0000	1.1.2.2
+++ functions_installer.inc.php	15 Nov 2004 10:31:48 -0000	1.1.2.3
@@ -519,7 +519,7 @@
     // (do it after the dir stuff, as we need to be able to create the sqlite database)
     @include_once($_POST['serendipityPath'] . 'include/db/db.inc.php');
     // For shared installations, probe the file on include path
-    @include_once(S9Y_INCLUDE_PATH . 'include/db/serendipity_db.inc.php');
+    @include_once(S9Y_INCLUDE_PATH . 'include/db/db.inc.php');
 
     if (S9Y_DB_INCLUDED) {
         serendipity_db_probe($_POST, $errs);

[php-blog-cvs] serendipity/include/tpl config_local.tpl,1.1.2.2,1.1.2.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include/tpl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24185/include/tpl

Modified Files:
      Tag: branch-smarty
	config_local.tpl 
Log Message:
New configuration variable to set amount of entries per page


Index: config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/Attic/config_local.tpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- config_local.tpl	12 Nov 2004 15:43:24 -0000	1.1.2.2
+++ config_local.tpl	15 Nov 2004 10:22:04 -0000	1.1.2.3
@@ -32,6 +32,7 @@
 
 // INSTALL_CAT_DISPLAY
 # INSTALL_CAT_DISPLAY_DESC
+$serendipity['fetchLimit']           = '{INSTALL_FETCHLIMIT|fetchLimit|string|15|255}';     // INSTALL_FETCHLIMIT_DESC
 $serendipity['extCSS']               = '{INSTALL_EXTERNALSTYLE|extCSS|string|none|255}';    // INSTALL_EXTERNALSTYLE_DESC
 $serendipity['wysiwyg']              = '{INSTALL_WYSIWYG|wysiwyg|bool|0|0}';                // INSTALL_WYSIWYG_DESC
 $serendipity['XHTML11']              = '{INSTALL_XHTML11|XHTML11|bool|0|255}';              // INSTALL_XHTML11_DESC

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.1.2.7,1.1.2.8 genpage.inc.php,1.1.2.2,1.1.2.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24185/include

Modified Files:
      Tag: branch-smarty
	functions_entries.inc.php genpage.inc.php 
Log Message:
New configuration variable to set amount of entries per page


Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/Attic/functions_entries.inc.php,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- functions_entries.inc.php	15 Nov 2004 09:41:48 -0000	1.1.2.7
+++ functions_entries.inc.php	15 Nov 2004 10:21:48 -0000	1.1.2.8
@@ -476,7 +476,7 @@
         }
 
         $totalEntries = serendipity_getTotalEntries();
-        $totalPages   = ceil($totalEntries / (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15));
+        $totalPages   = ceil($totalEntries / $serendipity['fetchLimit']);
 
         if (!isset($serendipity['GET']['page'])) {
             $serendipity['GET']['page'] = 1;
@@ -632,7 +632,7 @@
 
     if (!isset($serendipity['GET']['id']) &&
             (!isset($serendipity['hidefooter']) || $serendipity['hidefooter'] == false) &&
-            (count($entries) <= (!empty($serendipity['fetchLimit']) ? $serendipity['fetchLimit'] : 15))) {
+            (count($entries) <= $serendipity['fetchLimit'])) {
         serendipity_printEntryFooter();
     } else {
         serendipity_printEntryFooter(true);

Index: genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/Attic/genpage.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- genpage.inc.php	12 Nov 2004 16:27:44 -0000	1.1.2.2
+++ genpage.inc.php	15 Nov 2004 10:22:03 -0000	1.1.2.3
@@ -29,7 +29,7 @@
             if (isset($serendipity['GET']['id'])) {
                 serendipity_printEntries(array(serendipity_fetchEntry('id', $serendipity['GET']['id'])), 1);
             } else {
-                serendipity_printEntries(serendipity_fetchEntries($serendipity['range'], true, 15));
+                serendipity_printEntries(serendipity_fetchEntries($serendipity['range'], true, $serendipity['fetchLimit']));
             }
             break;
 
@@ -57,7 +57,7 @@
 
         // Welcome screen or whatever
         default:
-            serendipity_printEntries(serendipity_fetchEntries(null, true, 15));
+            serendipity_printEntries(serendipity_fetchEntries(null, true, $serendipity['fetchLimit']));
             break;
     }
 

[php-blog-cvs] serendipity/docs NEWS,1.1.2.9,1.1.2.10

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24185/docs

Modified Files:
      Tag: branch-smarty
	NEWS 
Log Message:
New configuration variable to set amount of entries per page


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/Attic/NEWS,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- NEWS	15 Nov 2004 09:41:47 -0000	1.1.2.9
+++ NEWS	15 Nov 2004 10:21:48 -0000	1.1.2.10
@@ -3,6 +3,9 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Articles per page (default 15) can now be set within Configuration
+      (garvinhicking)
+
     * Plugin API: Event plugins using the 'entry_display' hook to set
       an entries page to not render (via 'clean_page') now need to use
       the new hook 'entries_header' for their output; the 'clean_page'

[php-blog-cvs] serendipity serendipity_config.inc.php,1.93.2.17,1.93.2.18

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24185

Modified Files:
      Tag: branch-smarty
	serendipity_config.inc.php 
Log Message:
New configuration variable to set amount of entries per page


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.93.2.17
retrieving revision 1.93.2.18
diff -u -d -r1.93.2.17 -r1.93.2.18
--- serendipity_config.inc.php	6 Nov 2004 11:22:46 -0000	1.93.2.17
+++ serendipity_config.inc.php	15 Nov 2004 10:21:48 -0000	1.93.2.18
@@ -48,6 +48,10 @@
 // How many bytes are allowed for fetching trackbacks, so that no binary files get accidently trackbacked?
 $serendipity['trackback_filelimit']  = 150 * 1024;
 
+if (!isset($serendipity['fetchLimit'])) {
+    $serendipity['fetchLimit'] = 15;
+}
+
 /*
  *   Load main language file
  */

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.15.2.9,1.15.2.10 serendipity_lang_cs.inc.php,1.61.2.9,1.61.2.10 serendipity_lang_cz.inc.php,1.61.2.8,1.61.2.9 serendipity_lang_da.inc.php,1.79.2.10,1.79.2.11 serendipity_lang_de.inc.php,1.98.2.11,1.98.2.12 serendipity_lang_en.inc.php,1.79.2.10,1.79.2.11 serendipity_lang_es.inc.php,1.77.2.10,1.77.2.11 serendipity_lang_fr.inc.php,1.58.2.11,1.58.2.12 serendipity_lang_it.inc.php,1.1.2.9,1.1.2.10 serendipity_lang_nl.inc.php,1.36.2.9,1.36.2.10 serendipity_lang_no.inc.php,1.2.2.9,1.2.2.10 serendipity_lang_pt.inc.php,1.36.2.10,1.36.2.11

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24185/lang

Modified Files:
      Tag: branch-smarty
	serendipity_lang_bg.inc.php serendipity_lang_cs.inc.php 
	serendipity_lang_cz.inc.php serendipity_lang_da.inc.php 
	serendipity_lang_de.inc.php serendipity_lang_en.inc.php 
	serendipity_lang_es.inc.php serendipity_lang_fr.inc.php 
	serendipity_lang_it.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_no.inc.php serendipity_lang_pt.inc.php 
Log Message:
New configuration variable to set amount of entries per page


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.61.2.9
retrieving revision 1.61.2.10
diff -u -d -r1.61.2.9 -r1.61.2.10
--- serendipity_lang_cs.inc.php	12 Nov 2004 15:43:25 -0000	1.61.2.9
+++ serendipity_lang_cs.inc.php	15 Nov 2004 10:22:04 -0000	1.61.2.10
@@ -591,6 +591,8 @@
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
+@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
+@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.2.2.9
retrieving revision 1.2.2.10
diff -u -d -r1.2.2.9 -r1.2.2.10
--- serendipity_lang_no.inc.php	12 Nov 2004 15:43:27 -0000	1.2.2.9
+++ serendipity_lang_no.inc.php	15 Nov 2004 10:22:05 -0000	1.2.2.10
@@ -586,5 +586,7 @@
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
+@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
+@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
 
 ?>
\ No newline at end of file

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.36.2.9
retrieving revision 1.36.2.10
diff -u -d -r1.36.2.9 -r1.36.2.10
--- serendipity_lang_nl.inc.php	12 Nov 2004 15:43:27 -0000	1.36.2.9
+++ serendipity_lang_nl.inc.php	15 Nov 2004 10:22:05 -0000	1.36.2.10
@@ -596,6 +596,8 @@
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
+@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
+@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.79.2.10
retrieving revision 1.79.2.11
diff -u -d -r1.79.2.10 -r1.79.2.11
--- serendipity_lang_en.inc.php	12 Nov 2004 15:43:26 -0000	1.79.2.10
+++ serendipity_lang_en.inc.php	15 Nov 2004 10:22:05 -0000	1.79.2.11
@@ -588,6 +588,8 @@
 @define('INSTALL_OFFSET', 'Server time Offset');
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone');
 @define('STICKY_POSTINGS', 'Sticky Postings');
+@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage');
+@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.15.2.9
retrieving revision 1.15.2.10
diff -u -d -r1.15.2.9 -r1.15.2.10
--- serendipity_lang_bg.inc.php	12 Nov 2004 15:43:25 -0000	1.15.2.9
+++ serendipity_lang_bg.inc.php	15 Nov 2004 10:22:04 -0000	1.15.2.10
@@ -573,6 +573,8 @@
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
+@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
+@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.36.2.10
retrieving revision 1.36.2.11
diff -u -d -r1.36.2.10 -r1.36.2.11
--- serendipity_lang_pt.inc.php	12 Nov 2004 15:43:27 -0000	1.36.2.10
+++ serendipity_lang_pt.inc.php	15 Nov 2004 10:22:05 -0000	1.36.2.11
@@ -592,6 +592,8 @@
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
+@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
+@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -d -r1.1.2.9 -r1.1.2.10
--- serendipity_lang_it.inc.php	12 Nov 2004 15:43:26 -0000	1.1.2.9
+++ serendipity_lang_it.inc.php	15 Nov 2004 10:22:05 -0000	1.1.2.10
@@ -588,6 +588,8 @@
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
+@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
+@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.79.2.10
retrieving revision 1.79.2.11
diff -u -d -r1.79.2.10 -r1.79.2.11
--- serendipity_lang_da.inc.php	12 Nov 2004 15:43:25 -0000	1.79.2.10
+++ serendipity_lang_da.inc.php	15 Nov 2004 10:22:04 -0000	1.79.2.11
@@ -586,6 +586,8 @@
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
+@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
+@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.58.2.11
retrieving revision 1.58.2.12
diff -u -d -r1.58.2.11 -r1.58.2.12
--- serendipity_lang_fr.inc.php	12 Nov 2004 15:43:26 -0000	1.58.2.11
+++ serendipity_lang_fr.inc.php	15 Nov 2004 10:22:05 -0000	1.58.2.12
@@ -594,6 +594,8 @@
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
+@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
+@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.61.2.8
retrieving revision 1.61.2.9
diff -u -d -r1.61.2.8 -r1.61.2.9
--- serendipity_lang_cz.inc.php	12 Nov 2004 15:43:25 -0000	1.61.2.8
+++ serendipity_lang_cz.inc.php	15 Nov 2004 10:22:04 -0000	1.61.2.9
@@ -589,6 +589,8 @@
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
+@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
+@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.77.2.10
retrieving revision 1.77.2.11
diff -u -d -r1.77.2.10 -r1.77.2.11
--- serendipity_lang_es.inc.php	12 Nov 2004 15:43:26 -0000	1.77.2.10
+++ serendipity_lang_es.inc.php	15 Nov 2004 10:22:05 -0000	1.77.2.11
@@ -597,6 +597,8 @@
 @define('INSTALL_OFFSET', 'Server time Offset'); // Translate
 @define('INSTALL_OFFSET_DESC', 'Enter the amount of hours between the date of your webserver and your desired time zone'); // Translate
 @define('STICKY_POSTINGS', 'Sticky Postings'); // Translate
+@define('INSTALL_FETCHLIMIT', 'Entries to display on frontpage'); // Translate
+@define('INSTALL_FETCHLIMIT_DESC', 'Number of entries to display for each page on the frontend'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.98.2.11
retrieving revision 1.98.2.12
diff -u -d -r1.98.2.11 -r1.98.2.12
--- serendipity_lang_de.inc.php	12 Nov 2004 15:43:26 -0000	1.98.2.11
+++ serendipity_lang_de.inc.php	15 Nov 2004 10:22:05 -0000	1.98.2.12
@@ -588,6 +588,8 @@
 @define('INSTALL_OFFSET', 'Server Zeitunterschied');
 @define('INSTALL_OFFSET_DESC', 'Wieviele Stunden liegen zwischen der Uhrzeit des Servers und der eigenen Zeitzone');
 @define('STICKY_POSTINGS', 'Dauerhafte Einträge');
+@define('INSTALL_FETCHLIMIT', 'Anzahl der Artikel auf der Startseite');
+@define('INSTALL_FETCHLIMIT_DESC', 'Wieviele Artikel sollen auf jeder Seite des Blogs angezeigt werden');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity/templates/newspaper layout.php,1.13.2.1,1.13.2.2

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/newspaper
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24185/templates/newspaper

Modified Files:
      Tag: branch-smarty
	layout.php 
Log Message:
New configuration variable to set amount of entries per page


Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/newspaper/layout.php,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -d -r1.13.2.1 -r1.13.2.2
--- layout.php	12 Nov 2004 15:43:35 -0000	1.13.2.1
+++ layout.php	15 Nov 2004 10:22:06 -0000	1.13.2.2
@@ -95,7 +95,7 @@
 
                     // Welcome screen or whatever
                     default:
-                        serendipity_printEntries(serendipity_fetchEntries(null, true, 15));
+                        serendipity_printEntries(serendipity_fetchEntries(null, true, $serendipity['fetchLimit']));
                 }
             ?>
             <?=$CLOSESHADOW?>

[php-blog-cvs] serendipity/templates/moz-modern layout.php,1.7.2.2,1.7.2.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/moz-modern
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24185/templates/moz-modern

Modified Files:
      Tag: branch-smarty
	layout.php 
Log Message:
New configuration variable to set amount of entries per page


Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/moz-modern/layout.php,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -d -r1.7.2.2 -r1.7.2.3
--- layout.php	12 Nov 2004 15:43:34 -0000	1.7.2.2
+++ layout.php	15 Nov 2004 10:22:06 -0000	1.7.2.3
@@ -44,7 +44,7 @@
         if (isset($serendipity['GET']['id'])) {
             serendipity_printEntries(array(serendipity_fetchEntry('id', $serendipity['GET']['id'])), true);
         } else {
-            serendipity_printEntries(serendipity_fetchEntries($serendipity['GET']['range'], true, 15));
+            serendipity_printEntries(serendipity_fetchEntries($serendipity['GET']['range'], true, $serendipity['fetchLimit']));
         }
         break;
 
@@ -73,7 +73,7 @@
 
     // Welcome screen or whatever
     default:
-        serendipity_printEntries(serendipity_fetchEntries(null, true, 15));
+        serendipity_printEntries(serendipity_fetchEntries(null, true, $serendipity['fetchLimit']));
 }
 ?>
     </div>

[php-blog-cvs] serendipity/templates/default entries.tpl,1.1.2.20,1.1.2.21

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16514/templates/default

Modified Files:
      Tag: branch-smarty
	entries.tpl 
Log Message:
make "clean_page" plugins actually work again, though need to use a different hook for emitting content


Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries.tpl,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -d -r1.1.2.20 -r1.1.2.21
--- entries.tpl	12 Nov 2004 15:43:33 -0000	1.1.2.20
+++ entries.tpl	15 Nov 2004 09:41:48 -0000	1.1.2.21
@@ -168,7 +168,9 @@
         {/foreach}
     </div>
     {foreachelse}
+    {if not $plugin_clean_page}
         {$CONST.NO_ENTRIES_TO_PRINT}
+    {/if}
     {/foreach}
 
     <div class='serendipity_entryFooter' style="text-align: center">

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.1.2.6,1.1.2.7

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16514/include

Modified Files:
      Tag: branch-smarty
	functions_entries.inc.php 
Log Message:
make "clean_page" plugins actually work again, though need to use a different hook for emitting content


Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/Attic/functions_entries.inc.php,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- functions_entries.inc.php	12 Nov 2004 15:43:23 -0000	1.1.2.6
+++ functions_entries.inc.php	15 Nov 2004 09:41:48 -0000	1.1.2.7
@@ -527,6 +527,8 @@
     serendipity_plugin_api::hook_event('entry_display', $entries, $addData);
 
     if (isset($entries['clean_page']) && $entries['clean_page'] === true) {
+        $serendipity['smarty']->assign('plugin_clean_page', true);
+        serendipity_smarty_fetch('ENTRIES', 'entries.tpl', true);
         return; // no display of this item
     }
 

[php-blog-cvs] serendipity/docs NEWS,1.1.2.8,1.1.2.9

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16514/docs

Modified Files:
      Tag: branch-smarty
	NEWS 
Log Message:
make "clean_page" plugins actually work again, though need to use a different hook for emitting content


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/docs/Attic/NEWS,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- NEWS	12 Nov 2004 15:43:22 -0000	1.1.2.8
+++ NEWS	15 Nov 2004 09:41:47 -0000	1.1.2.9
@@ -3,6 +3,12 @@
 Version 0.8 ()
 ------------------------------------------------------------------------
 
+    * Plugin API: Event plugins using the 'entry_display' hook to set
+      an entries page to not render (via 'clean_page') now need to use
+      the new hook 'entries_header' for their output; the 'clean_page'
+      variable still needs to be set within the hook 'entry_display'
+      though. (garvinhicking)
+
     * Support for adding timezone offsets in configuration
       (garvinhicking)
 

[php-blog-cvs] serendipity/include/admin/importers - New directory

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin/importers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13329/importers

Log Message:
Directory /cvsroot/php-blog/serendipity/include/admin/importers added to the repository
--> Using per-directory sticky tag `branch-smarty'

[php-blog-cvs] serendipity/templates/default smarty_layout.php,1.1.2.5,NONE

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4758/templates/default

Removed Files:
      Tag: branch-smarty
	smarty_layout.php 
Log Message:
- Embed smarty_layout.php into genpage, to avoid future BC problems


--- smarty_layout.php DELETED ---

[php-blog-cvs] serendipity/include genpage.inc.php,1.1.2.1,1.1.2.2

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4758/include

Modified Files:
      Tag: branch-smarty
	genpage.inc.php 
Log Message:
- Embed smarty_layout.php into genpage, to avoid future BC problems


Index: genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/Attic/genpage.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- genpage.inc.php	6 Nov 2004 11:22:49 -0000	1.1.2.1
+++ genpage.inc.php	12 Nov 2004 16:27:44 -0000	1.1.2.2
@@ -20,9 +20,47 @@
 );
 
 if ($serendipity['smarty_raw_mode']) {
+    /* For BC reasons, we have to ask for layout.php */
     include_once(serendipity_getTemplateFile('layout.php', 'serendipityPath'));
 } else {
-    include_once(serendipity_getTemplateFile('smarty_layout.php', 'serendipityPath'));
+    switch ($serendipity['GET']['action']) {
+        // User wants to read the diary
+        case 'read':
+            if (isset($serendipity['GET']['id'])) {
+                serendipity_printEntries(array(serendipity_fetchEntry('id', $serendipity['GET']['id'])), 1);
+            } else {
+                serendipity_printEntries(serendipity_fetchEntries($serendipity['range'], true, 15));
+            }
+            break;
+
+        // User searches
+        case 'search':
+            $r = serendipity_searchEntries($serendipity['GET']['searchTerm']);
+            if (strlen($serendipity['GET']['searchTerm']) <= 3) {
+                $serendipity['smarty']->assign('content_message', SEARCH_TOO_SHORT);
+                break;
+            }
+
+            if ($r === true) {
+                $serendipity['smarty']->assign('content_message', sprintf(NO_ENTRIES_BLAHBLAH, $serendipity['GET']['searchTerm']));
+                break;
+            }
+
+            $serendipity['smarty']->assign('content_message', sprintf(YOUR_SEARCH_RETURNED_BLAHBLAH, $serendipity['GET']['searchTerm'], count($r)));
+            serendipity_printEntries($r);
+            break;
+
+        // Show the archive
+        case 'archives':
+            serendipity_printArchives();
+            break;
+
+        // Welcome screen or whatever
+        default:
+            serendipity_printEntries(serendipity_fetchEntries(null, true, 15));
+            break;
+    }
+
     serendipity_smarty_fetch('CONTENT', 'content.tpl');
 }
 

[php-blog-cvs] serendipity/plugins/serendipity_plugin_shoutbox serendipity_plugin_shoutbox.php,1.10.2.3,1.10.2.4

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_shoutbox
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25986/plugins/serendipity_plugin_shoutbox

Modified Files:
      Tag: branch-smarty
	serendipity_plugin_shoutbox.php 
Log Message:
* Support for adding timezone offsets in configuration
* Fixed XHTML compliance of calendar
* Adjusted coding style in some places
* Fixed entry preview to not show comments/trackbacks
* Fixed draft display in frontend entry overview
* New variable "is_preview" for smarty template
* Removed some hard-coded language strings in smarty templates



Index: serendipity_plugin_shoutbox.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -u -d -r1.10.2.3 -r1.10.2.4
--- serendipity_plugin_shoutbox.php	29 Oct 2004 11:02:42 -0000	1.10.2.3
+++ serendipity_plugin_shoutbox.php	12 Nov 2004 15:43:32 -0000	1.10.2.4
@@ -192,7 +192,7 @@
                 $entry = array('comment' => wordwrap($comment, $wordwrap, "\n",1));
                 serendipity_plugin_api::hook_event('frontend_display', $entry);
 
-                echo "<b>" . htmlspecialchars(strftime($dateformat, $row['stamp'])) . '</b> <br />' . "\n"
+                echo "<b>" . htmlspecialchars(serendipity_strftime($dateformat, $row['stamp'])) . '</b> <br />' . "\n"
                      . $entry['comment']
                      . $deleteLink
                      . '<br /><br /><br />' . "\n\n";

[php-blog-cvs] serendipity/plugins/serendipity_plugin_remoterss serendipity_plugin_remoterss.php,1.5.2.3,1.5.2.4

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_remoterss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25986/plugins/serendipity_plugin_remoterss

Modified Files:
      Tag: branch-smarty
	serendipity_plugin_remoterss.php 
Log Message:
* Support for adding timezone offsets in configuration
* Fixed XHTML compliance of calendar
* Adjusted coding style in some places
* Fixed entry preview to not show comments/trackbacks
* Fixed draft display in frontend entry overview
* New variable "is_preview" for smarty template
* Removed some hard-coded language strings in smarty templates



Index: serendipity_plugin_remoterss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -d -r1.5.2.3 -r1.5.2.4
--- serendipity_plugin_remoterss.php	29 Oct 2004 11:02:41 -0000	1.5.2.3
+++ serendipity_plugin_remoterss.php	12 Nov 2004 15:43:31 -0000	1.5.2.4
@@ -416,7 +416,7 @@
                         $item['timestamp'] = strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date']);
                         if (!($item['timestamp'] == -1) AND ($displaydate == 'true')) {
                             $content .= '<div class="serendipitySideBarDate">'
-                                      . htmlspecialchars(serendipity_formatTime($dateformat, $item['timestamp']))
+                                      . htmlspecialchars(serendipity_formatTime($dateformat, $item['timestamp'], false))
                                       . '</div><br />';
 
                         }