@@ -12,10 +12,10 @@ <div id="header"> <div class="column"> <ul id="navigation"> - <li class="first selected"><a href="#">Write</a></li> - <li class="second"><a href="#">Manage</a></li> - <li class="third"><a href="#">Settings</a></li> - <li class="fourth"><a href="#">Extend</a></li> + <li class="first selected"><a href="{% admin "write" %}">Write</a></li> + <li class="second"><a href="{% admin "manage" %}">Manage</a></li> + <li class="third"><a href="{% admin "settings" %}">Settings</a></li> + <li class="fourth"><a href="{% admin "extend" %}">Extend</a></li> </ul> <h1>$site.name</h1> </div> admin/layout/layout.twig feathers/audio/locale/en_US.mo @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Chyrp v1.1.3\n" +"Project-Id-Version: Chyrp v2.0\n" "Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n" "POT-Creation-Date: 2007-08-03 00:29-0500\n" -"PO-Revision-Date: 2008-04-15 19:22-0500\n" +"PO-Revision-Date: 2008-04-30 18:16-0500\n" "Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n" "Language-Team: English (en) <suracil.icio.us@gmail.com>\n" "MIME-Version: 1.0\n" @@ -28,23 +28,11 @@ msgstr "" msgid "audio" msgstr "" -#: feathers/audio/fields.php:8 -msgid "MP3 File" -msgstr "" - -#: feathers/audio/fields.php:13 -msgid "Description" -msgstr "" - -#: feathers/audio/fields.php:13 -msgid "(optional)" -msgstr "" - -#: feathers/audio/feather.php:14 +#: feathers/audio/feather.php:17 msgid "Error" msgstr "" -#: feathers/audio/feather.php:14 +#: feathers/audio/feather.php:17 msgid "Couldn't upload audio file." msgstr "" feathers/audio/locale/en_US.po feathers/chat/locale/en_US.mo @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Chyrp v1.1.3\n" +"Project-Id-Version: Chyrp v2.0\n" "Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n" "POT-Creation-Date: 2007-08-03 00:29-0500\n" -"PO-Revision-Date: 2008-04-15 19:22-0500\n" +"PO-Revision-Date: 2008-04-30 18:16-0500\n" "Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n" "Language-Team: English (en) <suracil.icio.us@gmail.com>\n" "MIME-Version: 1.0\n" @@ -24,32 +24,20 @@ msgstr "" msgid "Post logs of IRC or other chat formats." msgstr "" -#: feathers/chat/fields.php:9 -msgid "Title" -msgstr "" - -#: feathers/chat/fields.php:9 -msgid "(optional)" -msgstr "" - -#: feathers/chat/fields.php:13 -msgid "Dialogue" -msgstr "" - -#: feathers/chat/fields.php:17 +#: feathers/chat/help.php:2 msgid "To give yourself a special CSS class, append \" (me)\" to your username, like so:" msgstr "" -#: feathers/chat/fields.php:22 +#: feathers/chat/help.php:7 msgid "This only has to be done to the first occurrence of the username." msgstr "" -#: feathers/chat/feather.php:12 -#: feathers/chat/feather.php:34 +#: feathers/chat/feather.php:14 +#: feathers/chat/feather.php:36 msgid "Error" msgstr "" -#: feathers/chat/feather.php:12 +#: feathers/chat/feather.php:14 msgid "Dialogue can't be blank." msgstr "" feathers/chat/locale/en_US.po feathers/link/locale/en_US.mo @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Chyrp v1.1.3\n" +"Project-Id-Version: Chyrp v2.0\n" "Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n" "POT-Creation-Date: 2007-08-03 00:29-0500\n" -"PO-Revision-Date: 2008-04-15 19:22-0500\n" +"PO-Revision-Date: 2008-04-30 18:16-0500\n" "Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n" "Language-Team: English (en) <suracil.icio.us@gmail.com>\n" "MIME-Version: 1.0\n" @@ -24,28 +24,12 @@ msgstr "" msgid "Link to other sites, name it, and add an optional description." msgstr "" -#: feathers/link/fields.php:14 -msgid "URL" -msgstr "" - -#: feathers/link/fields.php:18 -msgid "Name" -msgstr "" - -#: feathers/link/fields.php:22 -msgid "Description" -msgstr "" - -#: feathers/link/fields.php:22 -msgid "(optional)" -msgstr "" - -#: feathers/link/feather.php:9 -#: feathers/link/feather.php:34 +#: feathers/link/feather.php:12 +#: feathers/link/feather.php:37 msgid "Error" msgstr "" -#: feathers/link/feather.php:9 +#: feathers/link/feather.php:12 msgid "URL can't be empty." msgstr "" feathers/link/locale/en_US.po feathers/photo/locale/en_US.mo @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Chyrp v1.1.3\n" +"Project-Id-Version: Chyrp v2.0\n" "Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n" "POT-Creation-Date: 2007-08-03 00:29-0500\n" -"PO-Revision-Date: 2008-04-15 19:22-0500\n" +"PO-Revision-Date: 2008-04-30 18:16-0500\n" "Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n" "Language-Team: English (en) <suracil.icio.us@gmail.com>\n" "MIME-Version: 1.0\n" @@ -33,11 +33,11 @@ msgstr "" msgid "(optional)" msgstr "" -#: feathers/photo/feather.php:12 +#: feathers/photo/feather.php:15 msgid "Error" msgstr "" -#: feathers/photo/feather.php:12 +#: feathers/photo/feather.php:15 msgid "Couldn't upload photo." msgstr "" feathers/photo/locale/en_US.po feathers/quote/locale/en_US.mo @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Chyrp v1.1.3\n" +"Project-Id-Version: Chyrp v2.0\n" "Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n" "POT-Creation-Date: 2007-08-03 00:29-0500\n" -"PO-Revision-Date: 2008-04-15 19:22-0500\n" +"PO-Revision-Date: 2008-04-30 18:16-0500\n" "Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n" "Language-Team: English (en) <suracil.icio.us@gmail.com>\n" "MIME-Version: 1.0\n" @@ -17,7 +17,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: feathers/quote/info.yaml:1 -#: feathers/quote/fields.php:11 msgid "Quote" msgstr "" @@ -25,20 +24,12 @@ msgstr "" msgid "Post quotes and cite sources." msgstr "" -#: feathers/quote/fields.php:15 -msgid "Source" -msgstr "" - -#: feathers/quote/fields.php:15 -msgid "(optional)" -msgstr "" - -#: feathers/quote/feather.php:9 -#: feathers/quote/feather.php:34 +#: feathers/quote/feather.php:11 +#: feathers/quote/feather.php:36 msgid "Error" msgstr "" -#: feathers/quote/feather.php:9 +#: feathers/quote/feather.php:11 msgid "Quote can't be empty." msgstr "" feathers/quote/locale/en_US.po feathers/text/locale/en_US.mo @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Chyrp v1.1.3\n" +"Project-Id-Version: Chyrp v2.0\n" "Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n" "POT-Creation-Date: 2007-08-03 00:29-0500\n" -"PO-Revision-Date: 2008-04-15 19:22-0500\n" +"PO-Revision-Date: 2008-04-30 18:16-0500\n" "Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n" "Language-Team: English (en) <suracil.icio.us@gmail.com>\n" "MIME-Version: 1.0\n" @@ -28,24 +28,12 @@ msgstr "" msgid "text" msgstr "" -#: feathers/text/fields.php:9 -msgid "Title" -msgstr "" - -#: feathers/text/fields.php:9 -msgid "(optional)" -msgstr "" - -#: feathers/text/fields.php:13 -msgid "Body" -msgstr "" - -#: feathers/text/feather.php:8 -#: feathers/text/feather.php:31 +#: feathers/text/feather.php:10 +#: feathers/text/feather.php:33 msgid "Error" msgstr "" -#: feathers/text/feather.php:8 +#: feathers/text/feather.php:10 msgid "Body can't be blank." msgstr "" feathers/text/locale/en_US.po feathers/video/locale/en_US.mo @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Chyrp v1.1.3\n" +"Project-Id-Version: Chyrp v2.0\n" "Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n" "POT-Creation-Date: 2007-08-03 00:29-0500\n" -"PO-Revision-Date: 2008-04-15 19:22-0500\n" +"PO-Revision-Date: 2008-04-30 18:16-0500\n" "Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n" "Language-Team: English (en) <suracil.icio.us@gmail.com>\n" "MIME-Version: 1.0\n" @@ -24,24 +24,12 @@ msgstr "" msgid "Lets you post videos to your site." msgstr "" -#: feathers/video/fields.php:9 -msgid "Embed code or YouTube URL" -msgstr "" - -#: feathers/video/fields.php:13 -msgid "Caption" -msgstr "" - -#: feathers/video/fields.php:13 -msgid "(optional)" -msgstr "" - -#: feathers/video/feather.php:8 -#: feathers/video/feather.php:32 +#: feathers/video/feather.php:10 +#: feathers/video/feather.php:34 msgid "Error" msgstr "" -#: feathers/video/feather.php:8 +#: feathers/video/feather.php:10 msgid "Video can't be blank." msgstr "" feathers/video/locale/en_US.po @@ -17,7 +17,7 @@ Find.find(basedir) do |path| end else filename = File.basename(path) - if filename =~ /\.php/ and not exclude_files.include?(filename) + if filename =~ /\.(php|twig)/ and not exclude_files.include?(filename) cleaned = path.sub("./", "") contents = File.read(path) if contents =~ /sprintf\(__\("(.*?)"(, ".*?")?\), (.*?)\)/ @@ -33,7 +33,7 @@ Find.find(basedir) do |path| output << 'msgstr "'+msgstr+'"'+"\n\n" else unless lines.include?(cleaned+":"+counter.to_s) - output = output.gsub("#, php-format\nmsgid \""+$1+"\"\nmsgstr \""+msgstr+"\"\n\n", + output = output.gsub("#, php-format\nmsgid \""+$1+"\"\nmsgstr \""+msgstr+"\"\n\n", "#: "+cleaned+":"+counter.to_s+"\n#, php-format\nmsgid \""+$1+"\"\nmsgstr \""+msgstr+"\"\n\n") end end @@ -59,7 +59,7 @@ Find.find(basedir) do |path| output << 'msgstr[1] "'+msgstr+'s"'+"\n\n" else unless lines.include?(cleaned+":"+counter.to_s) - output = output.gsub("#, php-format\nmsgid \""+$1+"\"\nmsgid_plural \""+$2+"\"\nmsgstr[0] \""+msgstr+"\"\nmsgstr[1] \""+msgstr+"x\"\n\n", + output = output.gsub("#, php-format\nmsgid \""+$1+"\"\nmsgid_plural \""+$2+"\"\nmsgstr[0] \""+msgstr+"\"\nmsgstr[1] \""+msgstr+"x\"\n\n", "#: "+cleaned+":"+counter.to_s+"\n#, php-format\nmsgid \""+$1+"\"\nmsgid_plural \""+$2+"\"\nmsgstr[0] \""+msgstr+"\"\nmsgstr[1] \""+msgstr+"s\"\n\n") end end @@ -82,7 +82,30 @@ Find.find(basedir) do |path| output << 'msgstr "'+msgstr+'"'+"\n\n" else unless lines.include?(cleaned+":"+counter.to_s) - output = output.gsub("msgid \""+$1+"\"\nmsgstr \"\"\n\n", + output = output.gsub("msgid \""+$1+"\"\nmsgstr \"\"\n\n", + "#: "+cleaned+":"+counter.to_s+"\nmsgid \""+$1+"\"\nmsgstr \""+msgstr+"\"\n\n") + end + end + strings << $1 + lines << cleaned+":"+counter.to_s + end + counter = counter + 1 + end + end + end + if contents =~ /\$\{ "(.*?)" \| translate \}/ + counter = 1 + File.open(path, "r") do |infile| + while (line = infile.gets) + line.gsub!("\\\"", "{QUOTE}") + line.gsub(/\$\{ "(.*?)" \| translate \}/) do + unless strings.include?($1) + output << '#: '+cleaned+':'+counter.to_s+"\n" + output << 'msgid "'+$1+'"'+"\n" + output << 'msgstr "'+msgstr+'"'+"\n\n" + else + unless lines.include?(cleaned+":"+counter.to_s) + output = output.gsub("msgid \""+$1+"\"\nmsgstr \"\"\n\n", "#: "+cleaned+":"+counter.to_s+"\nmsgid \""+$1+"\"\nmsgstr \""+msgstr+"\"\n\n") end end @@ -101,7 +124,7 @@ Find.find(basedir) do |path| info.each do |key, val| counter = counter + 1 next unless keys.include?(key) - + if val.class == String val.gsub!("\"", "{QUOTE}") unless strings.include?(val) @@ -110,7 +133,7 @@ Find.find(basedir) do |path| output << 'msgstr "'+msgstr+'"'+"\n\n" else unless lines.include?(cleaned+":"+counter.to_s) - output = output.gsub("msgid \""+val+"\"\nmsgstr \"\"\n\n", + output = output.gsub("msgid \""+val+"\"\nmsgstr \"\"\n\n", "#: "+cleaned+":"+counter.to_s+"\nmsgid \""+val+"\"\nmsgstr \""+msgstr+"\"\n\n") end end @@ -124,7 +147,7 @@ Find.find(basedir) do |path| output << 'msgstr "'+msgstr+'"'+"\n\n" else unless lines.include?(cleaned+":"+counter.to_s) - output = output.gsub("msgid \""+val+"\"\nmsgstr \"\"\n\n", + output = output.gsub("msgid \""+val+"\"\nmsgstr \"\"\n\n", "#: "+cleaned+":"+counter.to_s+"\nmsgid \""+val+"\"\nmsgstr \""+msgstr+"\"\n\n") end end gettext.rb includes/locale/en_US.mo @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Chyrp v1.1.3\n" +"Project-Id-Version: Chyrp v2.0\n" "Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n" "POT-Creation-Date: 2007-08-03 00:29-0500\n" -"PO-Revision-Date: 2008-04-15 19:22-0500\n" +"PO-Revision-Date: 2008-04-30 18:16-0500\n" "Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n" "Language-Team: English (en) <suracil.icio.us@gmail.com>\n" "MIME-Version: 1.0\n" @@ -20,6 +20,7 @@ msgstr "" #: upgrade.php:71 #: upgrade.php:78 #: upgrade.php:83 +#: upgrade.php:86 #, php-format msgid "Upgrading to %s&hellip;" msgstr "" @@ -28,11 +29,11 @@ msgstr "" msgid "Chyrp Upgrader" msgstr "" -#: upgrade.php:88 +#: upgrade.php:91 msgid "Upgrading&hellip;" msgstr "" -#: upgrade.php:96 +#: upgrade.php:99 #: importers/wordpress.php:223 #: importers/tumblr.php:345 #: importers/textpattern.php:168 @@ -40,185 +41,185 @@ msgstr "" msgid "All done!" msgstr "" -#: upgrade.php:97 -#: install.php:388 +#: upgrade.php:100 +#: install.php:406 msgid "Take me to my site! &rarr;" msgstr "" -#: upgrade.php:101 +#: upgrade.php:104 msgid "Upgrade" msgstr "" -#: upgrade.php:103 +#: upgrade.php:106 msgid "What are you upgrading from?" msgstr "" -#: upgrade.php:112 +#: upgrade.php:116 msgid "Upgrade &rarr;" msgstr "" -#: install.php:50 +#: install.php:47 #, php-format msgid "STOP! Before you go any further, you must create a .htaccess file in Chyrp's install directory and put this in it:\n<pre>%s</pre>." msgstr "" -#: install.php:58 +#: install.php:55 #, php-format msgid "Could not connect to the MySQL server: %s" msgstr "" -#: install.php:46 +#: install.php:43 msgid "Already Installed" msgstr "" -#: install.php:46 +#: install.php:43 msgid "Chyrp is already correctly installed and configured." msgstr "" -#: install.php:53 +#: install.php:50 msgid "Chyrp's includes directory is not writable by the server." msgstr "" -#: install.php:61 +#: install.php:58 msgid "Could not switch to the MySQL database." msgstr "" -#: install.php:64 +#: install.php:61 msgid "Please enter a name for your website." msgstr "" -#: install.php:67 +#: install.php:64 msgid "Time offset cannot be blank." msgstr "" -#: install.php:70 +#: install.php:67 msgid "Please enter a username for your account." msgstr "" -#: install.php:73 +#: install.php:70 msgid "Password cannot be blank." msgstr "" -#: install.php:76 +#: install.php:73 msgid "Passwords do not match." msgstr "" -#: install.php:79 +#: install.php:76 msgid "E-Mail address cannot be blank." msgstr "" -#: install.php:175 +#: install.php:193 msgid "Could not generate .htaccess file. Clean URLs will not be available." msgstr "" -#: install.php:336 +#: install.php:354 msgid "Database Setup" msgstr "" -#: install.php:338 +#: install.php:356 #: importers/textpattern.php:148 msgid "Host" msgstr "" -#: install.php:338 +#: install.php:356 msgid "(usually ok as \"localhost\")" msgstr "" -#: install.php:340 -#: install.php:363 +#: install.php:358 +#: install.php:381 #: importers/textpattern.php:150 -#: admin/pages/manage/user.php:91 -#: admin/pages/edit/user.php:11 +#: admin_old/pages/manage/user.php:94 +#: admin_old/pages/edit/user.php:11 msgid "Username" msgstr "" -#: install.php:342 -#: install.php:365 -#: install.php:367 +#: install.php:360 +#: install.php:383 +#: install.php:385 #: importers/textpattern.php:152 msgid "Password" msgstr "" -#: install.php:344 +#: install.php:362 #: importers/textpattern.php:154 msgid "Database" msgstr "" -#: install.php:346 +#: install.php:364 #: importers/textpattern.php:156 msgid "Table Prefix" msgstr "" -#: install.php:346 +#: install.php:364 msgid "(optional)" msgstr "" -#: install.php:350 +#: install.php:368 msgid "Website Setup" msgstr "" -#: install.php:352 -#: admin/pages/settings/website.php:4 +#: install.php:370 +#: admin_old/pages/settings/website.php:4 msgid "Site Name" msgstr "" -#: install.php:353 +#: install.php:371 msgid "My Awesome Site" msgstr "" -#: install.php:354 -#: admin/pages/settings/website.php:8 +#: install.php:372 +#: admin_old/pages/settings/website.php:8 msgid "Description" msgstr "" -#: install.php:356 -#: admin/pages/settings/website.php:44 +#: install.php:374 +#: admin_old/pages/settings/website.php:44 msgid "Time Offset" msgstr "" -#: install.php:361 +#: install.php:379 msgid "Admin Account" msgstr "" -#: install.php:367 +#: install.php:385 msgid "(again)" msgstr "" -#: install.php:369 -#: admin/pages/settings/website.php:16 +#: install.php:387 +#: admin_old/pages/settings/website.php:16 msgid "E-Mail Address" msgstr "" -#: install.php:373 +#: install.php:391 msgid "Install!" msgstr "" -#: install.php:376 -#: includes/bookmarklet.php:224 +#: install.php:394 +#: includes/bookmarklet.php:227 msgid "Done!" msgstr "" -#: install.php:378 +#: install.php:396 msgid "Chyrp has been successfully installed." msgstr "" -#: install.php:382 +#: install.php:400 msgid "<strong>Delete install.php</strong>, you won't need it anymore." msgstr "" -#: install.php:383 +#: install.php:401 msgid "Look for a translation for your language." msgstr "" -#: install.php:384 +#: install.php:402 msgid "Install some Modules." msgstr "" -#: install.php:385 +#: install.php:403 msgid "Find some Feathers you want." msgstr "" -#: install.php:386 +#: install.php:404 msgid "Read &#8220;Getting Started&#8221;" msgstr "" @@ -227,7 +228,7 @@ msgstr "" msgid "Search results for \"%s\"" msgstr "" -#: index.php:116 +#: index.php:98 #, php-format msgid "Archive of %s" msgstr "" @@ -236,445 +237,454 @@ msgstr "" msgid "Drafts" msgstr "" -#: index.php:43 -#: index.php:114 -#: index.php:145 -#: index.php:160 -#: index.php:169 -#: includes/helpers.php:724 -#: includes/controller/Main.php:205 -#: includes/controller/Main.php:236 +#: index.php:28 +#: index.php:95 +#: index.php:111 +#: index.php:121 +#: index.php:129 +#: includes/helpers.php:768 +#: includes/controller/Main.php:171 +#: includes/controller/Main.php:200 +#: includes/controller/Main.php:203 +#: includes/controller/Main.php:212 +#: includes/controller/Main.php:214 +#: includes/controller/Main.php:216 +#: includes/controller/Main.php:218 +#: includes/controller/Main.php:220 +#: includes/controller/Main.php:237 #: includes/controller/Main.php:239 -#: includes/controller/Main.php:248 -#: includes/controller/Main.php:250 -#: includes/controller/Main.php:252 -#: includes/controller/Main.php:254 -#: includes/controller/Main.php:256 -#: includes/controller/Main.php:274 -#: includes/controller/Main.php:276 -#: includes/controller/Main.php:299 -#: includes/controller/Main.php:316 -#: includes/controller/Admin.php:60 -#: includes/controller/Admin.php:69 +#: includes/controller/Main.php:261 +#: includes/controller/Main.php:277 +#: includes/controller/Admin.php:63 #: includes/controller/Admin.php:72 -#: includes/controller/Admin.php:74 -#: includes/controller/Admin.php:76 -#: includes/controller/Admin.php:78 +#: includes/controller/Admin.php:75 +#: includes/controller/Admin.php:77 +#: includes/controller/Admin.php:79 +#: includes/controller/Admin.php:81 msgid "Error" msgstr "" -#: index.php:43 +#: index.php:28 msgid "The feather theme file for this post does not exist. The post cannot be displayed." msgstr "" -#: index.php:62 +#: index.php:44 msgid "Archive" msgstr "" -#: index.php:114 +#: index.php:95 msgid "Please enter a valid year and month." msgstr "" -#: index.php:145 +#: index.php:111 msgid "You're already logged in." msgstr "" -#: index.php:147 +#: index.php:113 msgid "Log In" msgstr "" -#: index.php:158 -#: includes/controller/Main.php:234 +#: index.php:119 +#: includes/controller/Main.php:198 msgid "Registration Disabled" msgstr "" -#: index.php:158 +#: index.php:119 msgid "I'm sorry, but this site is not allowing registration." msgstr "" -#: index.php:162 +#: index.php:123 msgid "Register" msgstr "" -#: index.php:169 +#: index.php:129 msgid "You must be logged in to access this area." msgstr "" -#: index.php:171 +#: index.php:131 msgid "Controls" msgstr "" -#: index.php:187 -#: includes/controller/Main.php:73 -#: includes/controller/Admin.php:16 -#: includes/controller/Admin.php:18 -#: includes/controller/Admin.php:32 -#: includes/controller/Admin.php:34 -#: includes/controller/Admin.php:55 -#: includes/controller/Admin.php:57 -#: includes/controller/Admin.php:95 -#: includes/controller/Admin.php:97 -#: includes/controller/Admin.php:114 -#: includes/controller/Admin.php:116 -#: includes/controller/Admin.php:138 -#: includes/controller/Admin.php:140 -#: includes/controller/Admin.php:162 -#: includes/controller/Admin.php:164 -#: includes/controller/Admin.php:188 -#: includes/controller/Admin.php:190 -#: includes/controller/Admin.php:273 -#: includes/controller/Admin.php:275 -#: includes/controller/Admin.php:293 -#: includes/controller/Admin.php:295 -#: includes/controller/Admin.php:313 -#: includes/controller/Admin.php:315 -#: includes/controller/Admin.php:332 -#: includes/controller/Admin.php:334 -#: includes/controller/Admin.php:364 -#: includes/controller/Admin.php:366 -#: includes/controller/Admin.php:441 -#: includes/controller/Admin.php:443 -#: includes/common.php:207 +#: index.php:149 +#: includes/controller/Main.php:50 +#: includes/controller/Admin.php:19 +#: includes/controller/Admin.php:21 +#: includes/controller/Admin.php:35 +#: includes/controller/Admin.php:37 +#: includes/controller/Admin.php:58 +#: includes/controller/Admin.php:60 +#: includes/controller/Admin.php:98 +#: includes/controller/Admin.php:100 +#: includes/controller/Admin.php:118 +#: includes/controller/Admin.php:121 +#: includes/controller/Admin.php:143 +#: includes/controller/Admin.php:145 +#: includes/controller/Admin.php:169 +#: includes/controller/Admin.php:171 +#: includes/controller/Admin.php:197 +#: includes/controller/Admin.php:199 +#: includes/controller/Admin.php:265 +#: includes/controller/Admin.php:268 +#: includes/controller/Admin.php:285 +#: includes/controller/Admin.php:287 +#: includes/controller/Admin.php:304 +#: includes/controller/Admin.php:306 +#: includes/controller/Admin.php:323 +#: includes/controller/Admin.php:325 +#: includes/controller/Admin.php:357 +#: includes/controller/Admin.php:359 +#: includes/controller/Admin.php:435 +#: includes/controller/Admin.php:437 +#: includes/common.php:216 #: includes/bookmarklet.php:5 -#: includes/ajax.php:8 -#: includes/ajax.php:42 -#: includes/ajax.php:97 +#: includes/ajax.php:13 +#: includes/ajax.php:43 +#: includes/ajax.php:93 #: importers/wordpress.php:8 #: importers/tumblr.php:8 #: importers/textpattern.php:7 #: importers/movabletype.php:8 -#: admin/pages/write.php:110 -#: admin/pages/settings.php:4 -#: admin/pages/manage.php:31 -#: admin/pages/extend.php:4 -#: admin/index.php:19 +#: admin_old/pages/write.php:110 +#: admin_old/pages/settings.php:4 +#: admin_old/pages/manage.php:31 +#: admin_old/pages/extend.php:4 +#: admin_old/index.php:19 msgid "Access Denied" msgstr "" -#: index.php:187 +#: index.php:149 msgid "You do not have sufficient privileges to create posts." msgstr "" -#: index.php:190 +#: index.php:151 #: includes/bookmarklet.php:8 msgid "No Feathers" msgstr "" -#: index.php:190 +#: index.php:151 msgid "Please install a feather or two in order to add a post." msgstr "" -#: includes/xmlrpc.php:122 +#: includes/xmlrpc.php:125 #, php-format msgid "Pingback from %s to %s registered!" msgstr "" -#: includes/xmlrpc.php:54 +#: includes/xmlrpc.php:57 msgid "The from and to URLs cannot be the same." msgstr "" -#: includes/xmlrpc.php:57 +#: includes/xmlrpc.php:60 msgid "There doesn't seem to be a valid link in your request." msgstr "" -#: includes/xmlrpc.php:87 +#: includes/xmlrpc.php:90 msgid "I can't find a post from that URL." msgstr "" -#: includes/xmlrpc.php:106 +#: includes/xmlrpc.php:109 msgid "There isn't a title on that page." msgstr "" -#: includes/xmlrpc.php:198 -msgid "Failed to write file." -msgstr "" - -#: includes/xmlrpc.php:274 -#: includes/xmlrpc.php:338 +#: includes/xmlrpc.php:238 +#: includes/xmlrpc.php:289 msgid "Body can't be blank." msgstr "" -#: includes/xmlrpc.php:321 -#: includes/xmlrpc.php:388 -#: includes/xmlrpc.php:494 -#: includes/xmlrpc.php:517 #: includes/trackback.php:12 msgid "Fake post ID, or nonexistant post." msgstr "" -#: includes/xmlrpc.php:550 -msgid "Text feather is not enabled." -msgstr "" - -#: includes/model/User.php:257 -#: includes/model/Post.php:328 -#: includes/model/Page.php:276 -#: includes/model/Group.php:189 -#: admin/index.php:30 +#: includes/model/User.php:180 +#: includes/model/Post.php:500 +#: includes/model/Page.php:255 +#: includes/model/Group.php:187 +#: admin_old/index.php:30 msgid "Edit" msgstr "" -#: includes/model/User.php:274 -#: includes/model/Post.php:346 -#: includes/model/Page.php:295 -#: includes/model/Group.php:207 -#: admin/index.php:31 +#: includes/model/User.php:195 +#: includes/model/Post.php:517 +#: includes/model/Page.php:273 +#: includes/model/Group.php:204 +#: admin_old/index.php:31 msgid "Delete" msgstr "" -#: includes/javascript.php:39 -#: includes/javascript.php:85 +#: includes/javascript.php:37 +#: includes/javascript.php:81 msgid "Are you sure you want to delete this post?\n\nIt cannot be restored if you do this. If you wish to hide it, save it as a draft." msgstr "" -#: includes/javascript.php:57 -#: admin/js/javascript.php:18 +#: includes/javascript.php:53 +#: admin_old/js/javascript.php:18 msgid "&laquo; Fewer Options" msgstr "" -#: includes/javascript.php:60 +#: includes/javascript.php:56 #: includes/ajax.php:24 -#: admin/js/javascript.php:9 -#: admin/js/javascript.php:21 +#: admin_old/js/javascript.php:9 +#: admin_old/js/javascript.php:21 msgid "More Options &raquo;" msgstr "" -#: includes/javascript.php:74 +#: includes/javascript.php:70 msgid "Post has been saved as a draft." msgstr "" -#: includes/helpers.php:712 -#: includes/helpers.php:715 +#: includes/helpers.php:756 +#: includes/helpers.php:759 #, php-format msgid "Only %s files are supported." msgstr "" -#: includes/helpers.php:556 -#: includes/helpers.php:595 +#: includes/helpers.php:585 +#: includes/helpers.php:624 msgid "Status" msgstr "" -#: includes/helpers.php:558 -#: includes/helpers.php:598 +#: includes/helpers.php:587 +#: includes/helpers.php:627 msgid "Public" msgstr "" -#: includes/helpers.php:559 -#: includes/helpers.php:599 +#: includes/helpers.php:588 +#: includes/helpers.php:628 msgid "Private" msgstr "" -#: includes/helpers.php:560 -#: includes/helpers.php:600 +#: includes/helpers.php:589 +#: includes/helpers.php:629 msgid "Registered Only" msgstr "" -#: includes/helpers.php:565 -#: includes/helpers.php:604 +#: includes/helpers.php:594 +#: includes/helpers.php:633 msgid "Pinned?" msgstr "" -#: includes/helpers.php:566 -#: includes/helpers.php:605 +#: includes/helpers.php:595 +#: includes/helpers.php:634 msgid "(shows this post above all others)" msgstr "" -#: includes/helpers.php:569 -#: includes/helpers.php:608 -#: admin/pages/write.php:81 -#: admin/pages/edit.php:87 +#: includes/helpers.php:598 +#: includes/helpers.php:637 +#: admin_old/pages/write.php:81 +#: admin_old/pages/edit.php:87 msgid "Slug" msgstr "" -#: includes/helpers.php:573 +#: includes/helpers.php:602 msgid "Trackbacks" msgstr "" -#: includes/helpers.php:573 +#: includes/helpers.php:602 msgid "(comma separated)" msgstr "" -#: includes/helpers.php:577 -#: includes/helpers.php:612 +#: includes/helpers.php:606 +#: includes/helpers.php:641 msgid "Timestamp" msgstr "" -#: includes/helpers.php:597 +#: includes/helpers.php:626 msgid "Draft" msgstr "" -#: includes/helpers.php:724 +#: includes/helpers.php:768 msgid "Couldn't upload file. CHMOD <code>/upload</code> to 777 and try again. If this problem persists, it's probably timing out; in which case, you must contact your system administrator to increase the maximum POST and upload sizes." msgstr "" -#: includes/database.php:242 -#: includes/database.php:265 +#: includes/helpers.php:909 +#: admin_old/pages/settings.php:44 +#: admin_old/pages/manage.php:61 +#: admin_old/pages/edit.php:63 +#: admin_old/pages/delete.php:41 +#: admin_old/index.php:143 +msgid "Not Found" +msgstr "" + +#: includes/helpers.php:910 +msgid "Sorry, but you are looking for something that isn't here." +msgstr "" + +#: includes/database.php:81 +#: includes/database.php:114 msgid "Database Error" msgstr "" -#: includes/controller/Main.php:73 +#: includes/controller/Main.php:50 msgid "You do not have sufficient privileges to view drafts." msgstr "" -#: includes/controller/Main.php:205 +#: includes/controller/Main.php:171 msgid "Please specify a theme to preview." msgstr "" -#: includes/controller/Main.php:248 +#: includes/controller/Main.php:212 msgid "That username is already in use." msgstr "" -#: includes/controller/Main.php:252 +#: includes/controller/Main.php:216 msgid "E-mail address cannot be blank." msgstr "" -#: includes/controller/Main.php:256 +#: includes/controller/Main.php:220 msgid "Unsupported e-mail address." msgstr "" -#: includes/controller/Main.php:274 +#: includes/controller/Main.php:237 msgid "Login incorrect." msgstr "" -#: includes/controller/Main.php:299 +#: includes/controller/Main.php:261 msgid "You aren't logged in." msgstr "" -#: includes/controller/Admin.php:208 -#: admin/pages/edit.php:4 +#: includes/controller/Admin.php:223 +#: admin_old/pages/edit.php:4 #, php-format msgid "You do not have sufficient privileges to edit %ss." msgstr "" -#: includes/controller/Admin.php:210 +#: includes/controller/Admin.php:225 #, php-format msgid "An ID is required to edit a %s." msgstr "" -#: includes/controller/Admin.php:240 +#: includes/controller/Admin.php:245 #, php-format msgid "You do not have sufficient privileges to delete %ss." msgstr "" -#: includes/controller/Admin.php:242 +#: includes/controller/Admin.php:247 #, php-format msgid "An ID is required to delete a %s." msgstr "" -#: includes/controller/Admin.php:16 +#: includes/controller/Admin.php:19 msgid "Invalid security key." msgstr "" -#: includes/controller/Admin.php:34 +#: includes/controller/Admin.php:37 msgid "You do not have sufficient privileges to create pages." msgstr "" -#: includes/controller/Admin.php:57 +#: includes/controller/Admin.php:60 msgid "You do not have sufficient privileges to edit users." msgstr "" -#: includes/controller/Admin.php:97 +#: includes/controller/Admin.php:100 msgid "You do not have sufficient privileges to create groups." msgstr "" -#: includes/controller/Admin.php:116 +#: includes/controller/Admin.php:121 msgid "You do not have sufficient privileges to edit posts." msgstr "" -#: includes/controller/Admin.php:140 +#: includes/controller/Admin.php:145 msgid "You do not have sufficient privileges to edit pages." msgstr "" -#: includes/controller/Admin.php:190 +#: includes/controller/Admin.php:199 msgid "You do not have sufficient privileges to edit groups." msgstr "" -#: includes/controller/Admin.php:210 +#: includes/controller/Admin.php:225 msgid "No ID Specified" msgstr "" -#: includes/controller/Admin.php:275 -msgid "You do not have sufficient privileges to delete posts." +#: includes/controller/Admin.php:268 +msgid "You do not have sufficient privileges to delete this post." msgstr "" -#: includes/controller/Admin.php:295 +#: includes/controller/Admin.php:287 msgid "You do not have sufficient privileges to delete pages." msgstr "" -#: includes/controller/Admin.php:315 +#: includes/controller/Admin.php:306 msgid "You do not have sufficient privileges to delete users." msgstr "" -#: includes/controller/Admin.php:334 +#: includes/controller/Admin.php:325 msgid "You do not have sufficient privileges to delete groups." msgstr "" -#: includes/controller/Admin.php:364 +#: includes/controller/Admin.php:357 msgid "You do not have sufficient privileges to enable/disable modules." msgstr "" -#: includes/controller/Admin.php:366 +#: includes/controller/Admin.php:359 msgid "You do not have sufficient privileges to enable/disable feathers." msgstr "" -#: includes/controller/Admin.php:391 +#: includes/controller/Admin.php:383 #: importers/tumblr.php:139 -#: admin/pages/extend/modules.php:42 -#: admin/pages/extend/feathers.php:13 +#: admin_old/pages/extend/modules.php:42 +#: admin_old/pages/extend/feathers.php:13 msgid "Please create the <code>/upload</code> directory at your Chyrp install's root and CHMOD it to 777." msgstr "" -#: includes/controller/Admin.php:393 +#: includes/controller/Admin.php:385 #: importers/tumblr.php:141 -#: admin/pages/extend/modules.php:44 -#: admin/pages/extend/feathers.php:15 +#: admin_old/pages/extend/modules.php:44 +#: admin_old/pages/extend/feathers.php:15 msgid "Please CHMOD <code>/upload</code> to 777." msgstr "" -#: includes/controller/Admin.php:443 +#: includes/controller/Admin.php:437 msgid "You do not have sufficient privileges to change settings." msgstr "" -#: includes/common.php:207 +#: includes/common.php:216 msgid "You are not allowed to view this site." msgstr "" -#: includes/class/Theme.php:215 +#: includes/class/Theme.php:254 #, php-format -msgid "Couldn't load file:<br /><br />%s" +msgid "Couldn't load theme template:<br /><br />%s" msgstr "" -#: includes/class/Theme.php:24 +#: includes/class/Theme.php:42 msgid "Home" msgstr "" -#: includes/class/Theme.php:215 -msgid "Theme File Nonexistant" +#: includes/class/Theme.php:254 +msgid "Theme Template Missing" +msgstr "" + +#: includes/class/Pagination.php:63 +msgid "Next &rarr;" +msgstr "" + +#: includes/class/Pagination.php:79 +msgid "&larr; Previous" msgstr "" #: includes/bookmarklet.php:27 -#: includes/bookmarklet.php:189 +#: includes/bookmarklet.php:192 msgid "Chyrp!" msgstr "" -#: includes/bookmarklet.php:171 -#: admin/pages/write.php:60 +#: includes/bookmarklet.php:174 +#: admin_old/pages/write.php:60 msgid "Publish" msgstr "" -#: includes/bookmarklet.php:209 +#: includes/bookmarklet.php:212 msgid "or wait 1 second." msgstr "" -#: includes/bookmarklet.php:212 +#: includes/bookmarklet.php:215 msgid "or wait 2 seconds." msgstr "" -#: includes/bookmarklet.php:227 +#: includes/bookmarklet.php:230 msgid "Close this window" msgstr "" -#: includes/bookmarklet.php:230 +#: includes/bookmarklet.php:233 msgid "or wait 3 seconds." msgstr "" @@ -683,11 +693,11 @@ msgstr "" msgid "Editing &#8220;%s&#8221;" msgstr "" -#: includes/ajax.php:10 +#: includes/ajax.php:8 msgid "Unspecified ID" msgstr "" -#: includes/ajax.php:10 +#: includes/ajax.php:8 msgid "Please specify an ID of the post you would like to edit." msgstr "" @@ -704,11 +714,11 @@ msgid "Cancel" msgstr "" #: includes/ajax.php:89 -#: admin/pages/extend/themes.php:54 +#: admin_old/pages/extend/themes.php:54 msgid "Preview" msgstr "" -#: includes/ajax.php:97 +#: includes/ajax.php:93 msgid "You do not have sufficient privileges to enable/disable extensions." msgstr "" @@ -761,7 +771,7 @@ msgstr "" #: importers/tumblr.php:347 #: importers/textpattern.php:170 #: importers/movabletype.php:149 -#: admin/index.php:94 +#: admin_old/index.php:94 msgid "View Site &raquo;" msgstr "" @@ -821,758 +831,766 @@ msgstr "" msgid "MovableType .TXT File" msgstr "" -#: admin/pages/write.php:111 +#: admin_old/pages/write.php:111 #, php-format msgid "You do not have sufficient privileges to write %ss." msgstr "" -#: admin/pages/write.php:19 +#: admin_old/pages/write.php:19 msgid "Post" msgstr "" -#: admin/pages/write.php:25 +#: admin_old/pages/write.php:25 msgid "Page" msgstr "" -#: admin/pages/write.php:36 +#: admin_old/pages/write.php:36 msgid "Add Page" msgstr "" -#: admin/pages/write.php:36 +#: admin_old/pages/write.php:36 msgid "Add Post" msgstr "" -#: admin/pages/write.php:48 -#: admin/pages/manage/post.php:32 -#: admin/pages/manage/page.php:21 -#: admin/pages/edit/page.php:6 +#: admin_old/pages/write.php:48 +#: admin_old/pages/manage/post.php:32 +#: admin_old/pages/manage/page.php:23 +#: admin_old/pages/edit/page.php:6 msgid "Title" msgstr "" -#: admin/pages/write.php:52 -#: admin/pages/edit/page.php:10 +#: admin_old/pages/write.php:52 +#: admin_old/pages/edit/page.php:10 msgid "Body" msgstr "" -#: admin/pages/write.php:64 -#: admin/pages/edit.php:72 +#: admin_old/pages/write.php:64 +#: admin_old/pages/edit.php:72 msgid "Save" msgstr "" -#: admin/pages/write.php:77 -#: admin/pages/edit.php:83 +#: admin_old/pages/write.php:77 +#: admin_old/pages/edit.php:83 msgid "Show in pages list?" msgstr "" -#: admin/pages/write.php:85 -#: admin/pages/edit.php:91 +#: admin_old/pages/write.php:85 +#: admin_old/pages/edit.php:91 msgid "Parent" msgstr "" -#: admin/pages/settings.php:7 -#: admin/pages/manage/user.php:32 -#: admin/pages/manage/user.php:122 -#: admin/pages/edit/user.php:42 -#: admin/index.php:32 +#: admin_old/pages/settings.php:7 +#: admin_old/pages/manage/user.php:32 +#: admin_old/pages/manage/user.php:125 +#: admin_old/pages/edit/user.php:42 +#: admin_old/index.php:32 msgid "Website" msgstr "" -#: admin/pages/settings.php:8 -#: admin/index.php:33 +#: admin_old/pages/settings.php:8 +#: admin_old/index.php:33 msgid "Syndication" msgstr "" -#: admin/pages/settings.php:9 -#: admin/index.php:34 +#: admin_old/pages/settings.php:9 +#: admin_old/index.php:34 msgid "Routes" msgstr "" -#: admin/pages/settings.php:15 +#: admin_old/pages/settings.php:15 msgid "Settings updated." msgstr "" -#: admin/pages/settings.php:44 -#: admin/pages/manage.php:61 -#: admin/pages/edit.php:63 -#: admin/pages/delete.php:41 -#: admin/index.php:143 -msgid "Not Found" -msgstr "" - -#: admin/pages/settings.php:45 -#: admin/pages/manage.php:62 -#: admin/pages/edit.php:64 -#: admin/pages/delete.php:42 -#: admin/index.php:144 +#: admin_old/pages/settings.php:45 +#: admin_old/pages/manage.php:62 +#: admin_old/pages/edit.php:64 +#: admin_old/pages/delete.php:42 +#: admin_old/index.php:144 msgid "Requested page does not exist." msgstr "" -#: admin/pages/settings/website.php:1 +#: admin_old/pages/settings/website.php:1 msgid "Site Configuration" msgstr "" -#: admin/pages/settings/website.php:12 +#: admin_old/pages/settings/website.php:12 msgid "Website URL" msgstr "" -#: admin/pages/settings/website.php:20 +#: admin_old/pages/settings/website.php:20 msgid "Registration" msgstr "" -#: admin/pages/settings/website.php:21 +#: admin_old/pages/settings/website.php:21 msgid "Allow people to register" msgstr "" -#: admin/pages/settings/website.php:24 +#: admin_old/pages/settings/website.php:24 msgid "Default User Group" msgstr "" -#: admin/pages/settings/website.php:34 +#: admin_old/pages/settings/website.php:34 msgid "&#8220;Guest&#8221; Group" msgstr "" -#: admin/pages/settings/website.php:51 +#: admin_old/pages/settings/website.php:51 msgid "Language" msgstr "" -#: admin/pages/settings/website.php:68 +#: admin_old/pages/settings/website.php:68 msgid "Posts Per Page" msgstr "" -#: admin/pages/settings/website.php:73 -#: admin/pages/settings/syndication.php:23 -#: admin/pages/settings/routes.php:34 +#: admin_old/pages/settings/website.php:73 +#: admin_old/pages/settings/syndication.php:23 +#: admin_old/pages/settings/routes.php:36 msgid "Update Settings &rarr;" msgstr "" -#: admin/pages/settings/syndication.php:1 +#: admin_old/pages/settings/syndication.php:1 msgid "Syndication Settings" msgstr "" -#: admin/pages/settings/syndication.php:4 +#: admin_old/pages/settings/syndication.php:4 msgid "Feed Posts Limit" msgstr "" -#: admin/pages/settings/syndication.php:8 +#: admin_old/pages/settings/syndication.php:8 msgid "Enable Trackbacking" msgstr "" -#: admin/pages/settings/syndication.php:11 +#: admin_old/pages/settings/syndication.php:11 msgid "Trackbacking allows sites to notify you when they write a new entry, usually because they link to or reference yours." msgstr "" -#: admin/pages/settings/syndication.php:15 +#: admin_old/pages/settings/syndication.php:15 msgid "Send Pingbacks" msgstr "" -#: admin/pages/settings/syndication.php:18 +#: admin_old/pages/settings/syndication.php:18 msgid "Attempts to notify sites linked to from your posts. It'll slow down things a bit when you submit them, depending on how many links you've got in it." msgstr "" -#: admin/pages/settings/routes.php:1 +#: admin_old/pages/settings/routes.php:1 msgid "Route Settings" msgstr "" -#: admin/pages/settings/routes.php:4 +#: admin_old/pages/settings/routes.php:4 msgid "Clean URLs?" msgstr "" -#: admin/pages/settings/routes.php:5 +#: admin_old/pages/settings/routes.php:5 msgid "(recommended)" msgstr "" -#: admin/pages/settings/routes.php:7 +#: admin_old/pages/settings/routes.php:7 msgid "Gives your site prettier urls." msgstr "" -#: admin/pages/settings/routes.php:8 +#: admin_old/pages/settings/routes.php:8 msgid "Requires .htaccess support (pretty common). If you're unsure, it's safe to test and find out. Just come back and disable it if it breaks your site." msgstr "" -#: admin/pages/settings/routes.php:12 +#: admin_old/pages/settings/routes.php:12 msgid "Post View URL" msgstr "" -#: admin/pages/settings/routes.php:12 +#: admin_old/pages/settings/routes.php:12 msgid "(requires clean URLs)" msgstr "" -#: admin/pages/settings/routes.php:16 +#: admin_old/pages/settings/routes.php:16 msgid "Syntax:" msgstr "" -#: admin/pages/settings/routes.php:18 +#: admin_old/pages/settings/routes.php:18 msgid "Year submitted" msgstr "" -#: admin/pages/settings/routes.php:18 +#: admin_old/pages/settings/routes.php:18 msgid "(ex. 2007)" msgstr "" -#: admin/pages/settings/routes.php:19 +#: admin_old/pages/settings/routes.php:19 msgid "Month submitted" msgstr "" -#: admin/pages/settings/routes.php:19 +#: admin_old/pages/settings/routes.php:19 msgid "(ex. 12)" msgstr "" -#: admin/pages/settings/routes.php:20 +#: admin_old/pages/settings/routes.php:20 msgid "Day submitted" msgstr "" -#: admin/pages/settings/routes.php:20 +#: admin_old/pages/settings/routes.php:20 msgid "(ex. 25)" msgstr "" -#: admin/pages/settings/routes.php:21 +#: admin_old/pages/settings/routes.php:21 msgid "Hour submitted" msgstr "" -#: admin/pages/settings/routes.php:21 +#: admin_old/pages/settings/routes.php:21 msgid "(ex. 03)" msgstr "" -#: admin/pages/settings/routes.php:22 +#: admin_old/pages/settings/routes.php:22 msgid "Minute submitted" msgstr "" -#: admin/pages/settings/routes.php:22 +#: admin_old/pages/settings/routes.php:22 msgid "(ex. 59)" msgstr "" -#: admin/pages/settings/routes.php:23 +#: admin_old/pages/settings/routes.php:23 msgid "Second submitted" msgstr "" -#: admin/pages/settings/routes.php:23 +#: admin_old/pages/settings/routes.php:23 msgid "(ex. 30)" msgstr "" -#: admin/pages/settings/routes.php:24 +#: admin_old/pages/settings/routes.php:24 msgid "Post ID" msgstr "" -#: admin/pages/settings/routes.php:25 +#: admin_old/pages/settings/routes.php:25 msgid "Post author (username)" msgstr "" -#: admin/pages/settings/routes.php:25 +#: admin_old/pages/settings/routes.php:25 msgid "(ex. Alex)" msgstr "" -#: admin/pages/settings/routes.php:26 +#: admin_old/pages/settings/routes.php:26 msgid "The non-unique sanitized name" msgstr "" -#: admin/pages/settings/routes.php:26 +#: admin_old/pages/settings/routes.php:26 msgid "(ex. this_is_clean)" msgstr "" -#: admin/pages/settings/routes.php:27 +#: admin_old/pages/settings/routes.php:27 msgid "The unique form of (clean)" msgstr "" -#: admin/pages/settings/routes.php:27 +#: admin_old/pages/settings/routes.php:27 msgid "(ex. this_one_is_taken_2)" msgstr "" -#: admin/pages/settings/routes.php:28 +#: admin_old/pages/settings/routes.php:28 msgid "The post's feather" msgstr "" -#: admin/pages/settings/routes.php:28 +#: admin_old/pages/settings/routes.php:28 msgid "(ex. text)" msgstr "" -#: admin/pages/manage.php:32 +#: admin_old/pages/settings/routes.php:29 +msgid "The plural form of the post's feather" +msgstr "" + +#: admin_old/pages/settings/routes.php:29 +msgid "(ex. links)" +msgstr "" + +#: admin_old/pages/manage.php:32 #, php-format msgid "You do not have sufficient privileges to manage %s." msgstr "" -#: admin/pages/manage.php:13 -#: admin/pages/edit.php:8 -#: admin/pages/delete.php:5 -#: admin/index.php:35 +#: admin_old/pages/manage.php:13 +#: admin_old/pages/edit.php:8 +#: admin_old/pages/delete.php:5 +#: admin_old/index.php:35 msgid "Posts" msgstr "" -#: admin/pages/manage.php:16 -#: admin/pages/edit.php:11 -#: admin/pages/delete.php:6 -#: admin/index.php:36 +#: admin_old/pages/manage.php:16 +#: admin_old/pages/edit.php:11 +#: admin_old/pages/delete.php:6 +#: admin_old/index.php:36 msgid "Pages" msgstr "" -#: admin/pages/manage.php:19 -#: admin/pages/manage/user.php:26 -#: admin/pages/edit.php:14 -#: admin/pages/delete.php:7 -#: admin/index.php:37 +#: admin_old/pages/manage.php:19 +#: admin_old/pages/manage/user.php:26 +#: admin_old/pages/edit.php:14 +#: admin_old/pages/delete.php:7 +#: admin_old/index.php:37 msgid "Users" msgstr "" -#: admin/pages/manage.php:22 -#: admin/pages/manage/group.php:26 -#: admin/pages/edit.php:17 -#: admin/pages/delete.php:8 -#: admin/index.php:38 +#: admin_old/pages/manage.php:22 +#: admin_old/pages/manage/group.php:26 +#: admin_old/pages/edit.php:17 +#: admin_old/pages/delete.php:8 +#: admin_old/index.php:38 msgid "Groups" msgstr "" -#: admin/pages/manage/user.php:2 +#: admin_old/pages/manage/user.php:2 msgid "Manage Users" msgstr "" -#: admin/pages/manage/user.php:4 +#: admin_old/pages/manage/user.php:4 msgid "User updated." msgstr "" -#: admin/pages/manage/user.php:6 +#: admin_old/pages/manage/user.php:6 msgid "User deleted." msgstr "" -#: admin/pages/manage/user.php:8 +#: admin_old/pages/manage/user.php:8 msgid "User created." msgstr "" -#: admin/pages/manage/user.php:10 -#: admin/pages/manage/post.php:7 -#: admin/pages/manage/page.php:7 -#: admin/pages/manage/group.php:10 +#: admin_old/pages/manage/user.php:10 +#: admin_old/pages/manage/post.php:7 +#: admin_old/pages/manage/page.php:9 +#: admin_old/pages/manage/group.php:10 msgid "Need more detail?" msgstr "" -#: admin/pages/manage/user.php:16 -#: admin/pages/manage/user.php:87 +#: admin_old/pages/manage/user.php:16 +#: admin_old/pages/manage/user.php:90 msgid "New User" msgstr "" -#: admin/pages/manage/user.php:20 -#: admin/pages/manage/post.php:12 -#: admin/pages/manage/page.php:12 +#: admin_old/pages/manage/user.php:20 +#: admin_old/pages/manage/post.php:12 +#: admin_old/pages/manage/page.php:14 msgid "Search&hellip;" msgstr "" -#: admin/pages/manage/user.php:21 -#: admin/pages/manage/post.php:13 -#: admin/pages/manage/page.php:13 -#: admin/pages/manage/group.php:21 +#: admin_old/pages/manage/user.php:21 +#: admin_old/pages/manage/post.php:13 +#: admin_old/pages/manage/page.php:15 +#: admin_old/pages/manage/group.php:21 msgid "Search &rarr;" msgstr "" -#: admin/pages/manage/user.php:29 +#: admin_old/pages/manage/user.php:29 msgid "Login" msgstr "" -#: admin/pages/manage/user.php:30 +#: admin_old/pages/manage/user.php:30 msgid "Real&nbsp;Name" msgstr "" -#: admin/pages/manage/user.php:31 -#: admin/pages/manage/user.php:118 -#: admin/pages/edit/user.php:38 +#: admin_old/pages/manage/user.php:31 +#: admin_old/pages/manage/user.php:121 +#: admin_old/pages/edit/user.php:38 msgid "E-Mail" msgstr "" -#: admin/pages/manage/user.php:78 -#: admin/pages/manage/post.php:104 -#: admin/pages/manage/page.php:72 -#: admin/pages/manage/group.php:80 +#: admin_old/pages/manage/user.php:81 +#: admin_old/pages/manage/post.php:104 +#: admin_old/pages/manage/page.php:68 +#: admin_old/pages/manage/group.php:81 msgid "Next &raquo;" msgstr "" -#: admin/pages/manage/user.php:81 -#: admin/pages/manage/post.php:107 -#: admin/pages/manage/page.php:75 -#: admin/pages/manage/group.php:83 +#: admin_old/pages/manage/user.php:84 +#: admin_old/pages/manage/post.php:107 +#: admin_old/pages/manage/page.php:71 +#: admin_old/pages/manage/group.php:84 msgid "&laquo; Previous" msgstr "" -#: admin/pages/manage/user.php:89 -#: admin/pages/edit/user.php:9 +#: admin_old/pages/manage/user.php:92 +#: admin_old/pages/edit/user.php:9 msgid "User Settings" msgstr "" -#: admin/pages/manage/user.php:95 -#: admin/pages/edit/user.php:15 +#: admin_old/pages/manage/user.php:98 +#: admin_old/pages/edit/user.php:15 msgid "New Password?" msgstr "" -#: admin/pages/manage/user.php:99 -#: admin/pages/edit/user.php:19 +#: admin_old/pages/manage/user.php:102 +#: admin_old/pages/edit/user.php:19 msgid "(confirm)" msgstr "" -#: admin/pages/manage/user.php:103 -#: admin/pages/edit/user.php:23 +#: admin_old/pages/manage/user.php:106 +#: admin_old/pages/edit/user.php:23 msgid "Group" msgstr "" -#: admin/pages/manage/user.php:112 -#: admin/pages/edit/user.php:32 +#: admin_old/pages/manage/user.php:115 +#: admin_old/pages/edit/user.php:32 msgid "More Information" msgstr "" -#: admin/pages/manage/user.php:114 -#: admin/pages/edit/user.php:34 +#: admin_old/pages/manage/user.php:117 +#: admin_old/pages/edit/user.php:34 msgid "Full Name" msgstr "" -#: admin/pages/manage/user.php:129 +#: admin_old/pages/manage/user.php:133 msgid "Add User &rarr;" msgstr "" -#: admin/pages/manage/post.php:1 +#: admin_old/pages/manage/post.php:1 msgid "Manage Posts" msgstr "" -#: admin/pages/manage/post.php:3 +#: admin_old/pages/manage/post.php:3 msgid "Post updated." msgstr "" -#: admin/pages/manage/post.php:3 +#: admin_old/pages/manage/post.php:3 msgid "View &raquo;" msgstr "" -#: admin/pages/manage/post.php:5 +#: admin_old/pages/manage/post.php:5 msgid "Post deleted." msgstr "" -#: admin/pages/manage/post.php:16 +#: admin_old/pages/manage/post.php:16 msgid "Browse by month:" msgstr "" -#: admin/pages/manage/post.php:23 +#: admin_old/pages/manage/post.php:23 msgid "Show &rarr;" msgstr "" -#: admin/pages/manage/post.php:29 +#: admin_old/pages/manage/post.php:29 msgid "Last 25 Posts" msgstr "" -#: admin/pages/manage/post.php:33 +#: admin_old/pages/manage/post.php:33 msgid "Posted" msgstr "" -#: admin/pages/manage/post.php:34 +#: admin_old/pages/manage/post.php:34 msgid "Author" msgstr "" -#: admin/pages/manage/page.php:1 +#: admin_old/pages/manage/page.php:1 msgid "Manage Pages" msgstr "" -#: admin/pages/manage/page.php:3 +#: admin_old/pages/manage/page.php:3 msgid "Page updated." msgstr "" -#: admin/pages/manage/page.php:5 +#: admin_old/pages/manage/page.php:5 msgid "Page deleted." msgstr "" -#: admin/pages/manage/page.php:18 +#: admin_old/pages/manage/page.php:7 +msgid "Pages reordered." +msgstr "" + +#: admin_old/pages/manage/page.php:20 msgid "All Pages" msgstr "" -#: admin/pages/manage/page.php:22 +#: admin_old/pages/manage/page.php:24 msgid "Created" msgstr "" -#: admin/pages/manage/page.php:23 +#: admin_old/pages/manage/page.php:25 msgid "Updated" msgstr "" -#: admin/pages/manage/page.php:24 +#: admin_old/pages/manage/page.php:26 msgid "Owner" msgstr "" -#: admin/pages/manage/group.php:53 +#: admin_old/pages/manage/page.php:63 +msgid "Reorder &rarr;" +msgstr "" + +#: admin_old/pages/manage/group.php:54 #, php-format msgid "&#8220;%s&#8221; is the default group for guests" msgstr "" -#: admin/pages/manage/group.php:54 +#: admin_old/pages/manage/group.php:55 #, php-format msgid "&#8220;%s&#8221; has %s member" msgid_plural "&#8220;%s&#8221; has %s members" msgstr[0] "" msgstr[1] "s" -#: admin/pages/manage/group.php:2 +#: admin_old/pages/manage/group.php:2 msgid "Manage Groups" msgstr "" -#: admin/pages/manage/group.php:4 +#: admin_old/pages/manage/group.php:4 msgid "Group updated." msgstr "" -#: admin/pages/manage/group.php:6 +#: admin_old/pages/manage/group.php:6 msgid "Group deleted." msgstr "" -#: admin/pages/manage/group.php:8 +#: admin_old/pages/manage/group.php:8 msgid "Group created." msgstr "" -#: admin/pages/manage/group.php:16 -#: admin/pages/manage/group.php:89 +#: admin_old/pages/manage/group.php:16 +#: admin_old/pages/manage/group.php:90 msgid "New Group" msgstr "" -#: admin/pages/manage/group.php:20 +#: admin_old/pages/manage/group.php:20 msgid "Search Groups for User&hellip;" msgstr "" -#: admin/pages/manage/group.php:59 +#: admin_old/pages/manage/group.php:60 msgid "edit" msgstr "" -#: admin/pages/manage/group.php:60 +#: admin_old/pages/manage/group.php:61 msgid "delete" msgstr "" -#: admin/pages/manage/group.php:69 +#: admin_old/pages/manage/group.php:70 msgid "No Results" msgstr "" -#: admin/pages/manage/group.php:70 +#: admin_old/pages/manage/group.php:71 msgid "I can't find any groups with that user in them." msgstr "" -#: admin/pages/manage/group.php:74 +#: admin_old/pages/manage/group.php:75 msgid "No Groups" msgstr "" -#: admin/pages/manage/group.php:75 +#: admin_old/pages/manage/group.php:76 msgid "Strangely enough, there don't seem to be any groups. Way to go." msgstr "" -#: admin/pages/manage/group.php:91 -#: admin/pages/edit/group.php:14 +#: admin_old/pages/manage/group.php:92 +#: admin_old/pages/edit/group.php:7 msgid "Group Settings" msgstr "" -#: admin/pages/manage/group.php:93 -#: admin/pages/edit/group.php:16 +#: admin_old/pages/manage/group.php:94 +#: admin_old/pages/edit/group.php:9 msgid "Name" msgstr "" -#: admin/pages/manage/group.php:96 -#: admin/pages/edit/group.php:19 +#: admin_old/pages/manage/group.php:97 +#: admin_old/pages/edit/group.php:12 msgid "Permissions" msgstr "" -#: admin/pages/manage/group.php:115 +#: admin_old/pages/manage/group.php:115 msgid "Create &rarr;" msgstr "" -#: admin/pages/extend.php:4 +#: admin_old/pages/extend.php:4 msgid "You do not have sufficient privileges to extend this site." msgstr "" -#: admin/pages/extend.php:7 -#: admin/pages/extend/modules.php:30 -#: admin/index.php:39 +#: admin_old/pages/extend.php:7 +#: admin_old/pages/extend/modules.php:30 +#: admin_old/index.php:39 msgid "Modules" msgstr "" -#: admin/pages/extend.php:8 -#: admin/pages/extend/feathers.php:1 -#: admin/index.php:40 +#: admin_old/pages/extend.php:8 +#: admin_old/pages/extend/feathers.php:1 +#: admin_old/index.php:40 msgid "Feathers" msgstr "" -#: admin/pages/extend.php:9 -#: admin/pages/extend/themes.php:1 -#: admin/index.php:41 +#: admin_old/pages/extend.php:9 +#: admin_old/pages/extend/themes.php:1 +#: admin_old/index.php:41 msgid "Themes" msgstr "" -#: admin/pages/extend/themes.php:17 -#: admin/pages/extend/themes.php:53 +#: admin_old/pages/extend/themes.php:17 +#: admin_old/pages/extend/themes.php:53 #, php-format msgid "by <strong><a href=\"%s\">%s</a></strong>" msgstr "" -#: admin/pages/extend/themes.php:25 +#: admin_old/pages/extend/themes.php:25 #, php-format msgid "This theme's files are located at <code>%s</code>" msgstr "" -#: admin/pages/extend/themes.php:3 +#: admin_old/pages/extend/themes.php:3 msgid "Theme changed." msgstr "" -#: admin/pages/extend/themes.php:5 +#: admin_old/pages/extend/themes.php:5 msgid "Current Theme" msgstr "" -#: admin/pages/extend/themes.php:30 +#: admin_old/pages/extend/themes.php:30 msgid "Available Themes" msgstr "" -#: admin/pages/extend/themes.php:31 +#: admin_old/pages/extend/themes.php:31 msgid "Click on a theme's screenshot to use it." msgstr "" -#: admin/pages/extend/modules.php:53 +#: admin_old/pages/extend/modules.php:53 msgid "Module enabled." msgstr "" -#: admin/pages/extend/modules.php:57 +#: admin_old/pages/extend/modules.php:57 msgid "Module disabled." msgstr "" -#: admin/pages/extend/modules.php:70 -#: admin/pages/extend/feathers.php:43 -#: admin/js/javascript.php:57 +#: admin_old/pages/extend/modules.php:70 +#: admin_old/pages/extend/feathers.php:43 +#: admin_old/js/javascript.php:66 msgid "enabled" msgstr "" -#: admin/pages/extend/modules.php:70 -#: admin/js/javascript.php:61 +#: admin_old/pages/extend/modules.php:70 +#: admin_old/js/javascript.php:70 msgid "disabled" msgstr "" -#: admin/pages/extend/modules.php:83 +#: admin_old/pages/extend/modules.php:83 msgid "can't" msgstr "" -#: admin/pages/extend/modules.php:93 +#: admin_old/pages/extend/modules.php:93 msgid "Unmet Dependencies:" msgstr "" -#: admin/pages/extend/modules.php:107 +#: admin_old/pages/extend/modules.php:107 msgid "Legend:" msgstr "" -#: admin/pages/extend/modules.php:108 +#: admin_old/pages/extend/modules.php:108 msgid "Conflicting modules" msgstr "" -#: admin/pages/extend/modules.php:109 +#: admin_old/pages/extend/modules.php:109 msgid "Unmet dependency" msgstr "" -#: admin/pages/extend/feathers.php:24 +#: admin_old/pages/extend/feathers.php:24 msgid "Feather enabled." msgstr "" -#: admin/pages/extend/feathers.php:28 +#: admin_old/pages/extend/feathers.php:28 msgid "Feather disabled." msgstr "" -#: admin/pages/extend/feathers.php:41 +#: admin_old/pages/extend/feathers.php:41 msgid "disable" msgstr "" -#: admin/pages/extend/feathers.php:41 +#: admin_old/pages/extend/feathers.php:41 msgid "enable" msgstr "" -#: admin/pages/edit.php:35 +#: admin_old/pages/edit.php:35 #, php-format msgid "Edit %s" msgstr "" -#: admin/pages/edit/user.php:48 +#: admin_old/pages/edit/user.php:49 msgid "Update User &rarr;" msgstr "" -#: admin/pages/edit/group.php:38 +#: admin_old/pages/edit/group.php:31 msgid "Update Group &rarr;" msgstr "" -#: admin/pages/delete.php:13 +#: admin_old/pages/delete.php:13 #, php-format msgid "Are you sure you want to delete this %s?" msgstr "" -#: admin/pages/delete/user.php:11 +#: admin_old/pages/delete/user.php:11 msgid "Real Name:" msgstr "" -#: admin/pages/delete/user.php:12 +#: admin_old/pages/delete/user.php:12 msgid "E-Mail:" msgstr "" -#: admin/pages/delete/user.php:13 +#: admin_old/pages/delete/user.php:13 msgid "Website:" msgstr "" -#: admin/pages/delete/user.php:20 +#: admin_old/pages/delete/user.php:20 msgid "Yes, delete this user!" msgstr "" -#: admin/pages/delete/user.php:21 +#: admin_old/pages/delete/user.php:21 msgid "No, don't delete them!" msgstr "" -#: admin/pages/delete/post.php:8 +#: admin_old/pages/delete/post.php:8 msgid "Yes, delete this post!" msgstr "" -#: admin/pages/delete/post.php:9 -#: admin/pages/delete/page.php:13 -#: admin/pages/delete/group.php:53 +#: admin_old/pages/delete/post.php:9 +#: admin_old/pages/delete/page.php:13 +#: admin_old/pages/delete/group.php:53 msgid "No, don't delete it!" msgstr "" -#: admin/pages/delete/page.php:7 +#: admin_old/pages/delete/page.php:7 msgid "Warning: This will also delete any sub-pages of this page." msgstr "" -#: admin/pages/delete/page.php:12 +#: admin_old/pages/delete/page.php:12 msgid "Yes, delete this page!" msgstr "" -#: admin/pages/delete/group.php:4 +#: admin_old/pages/delete/group.php:4 msgid "Move members to:" msgstr "" -#: admin/pages/delete/group.php:19 +#: admin_old/pages/delete/group.php:19 msgid "New default group:" msgstr "" -#: admin/pages/delete/group.php:34 +#: admin_old/pages/delete/group.php:34 msgid "New &#8220;guest&#8221; group:" msgstr "" -#: admin/pages/delete/group.php:52 +#: admin_old/pages/delete/group.php:52 msgid "Yes, delete this group!" msgstr "" -#: admin/js/javascript.php:98 +#: admin_old/js/javascript.php:107 #, php-format msgid "Bookmarklet: %s" msgstr "" -#: admin/js/javascript.php:31 +#: admin_old/js/javascript.php:40 msgid "Preview &rarr;" msgstr "" -#: admin/index.php:19 +#: admin_old/index.php:19 msgid "You are not allowed to view this area." msgstr "" -#: admin/index.php:26 -#: admin/index.php:100 +#: admin_old/index.php:26 +#: admin_old/index.php:100 msgid "Write" msgstr "" -#: admin/index.php:27 -#: admin/index.php:106 +#: admin_old/index.php:27 +#: admin_old/index.php:106 msgid "Settings" msgstr "" -#: admin/index.php:28 -#: admin/index.php:103 +#: admin_old/index.php:28 +#: admin_old/index.php:103 msgid "Manage" msgstr "" -#: admin/index.php:29 -#: admin/index.php:109 +#: admin_old/index.php:29 +#: admin_old/index.php:109 msgid "Extend" msgstr "" includes/locale/en_US.po modules/comments/locale/en_US.mo @@ -6,63 +6,67 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Chyrp v1.1.3\n" +"Project-Id-Version: Chyrp v2.0\n" "Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n" "POT-Creation-Date: 2007-08-03 00:29-0500\n" -"PO-Revision-Date: 2008-04-15 19:22-0500\n" +"PO-Revision-Date: 2008-04-30 18:16-0500\n" "Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n" "Language-Team: English (en) <suracil.icio.us@gmail.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: modules/comments/pages/admin/settings/comments.php:1 -msgid "Comment Settings" +#: modules/comments/pages/admin/settings/comments.php:2 +msgid "Invalid Defensio API key." msgstr "" #: modules/comments/pages/admin/settings/comments.php:4 +msgid "Comment Settings" +msgstr "" + +#: modules/comments/pages/admin/settings/comments.php:7 msgid "Defensio API Key" msgstr "" -#: modules/comments/pages/admin/settings/comments.php:4 +#: modules/comments/pages/admin/settings/comments.php:7 msgid "(recommended)" msgstr "" -#: modules/comments/pages/admin/settings/comments.php:6 +#: modules/comments/pages/admin/settings/comments.php:9 msgid "A very good spam blocker. Get an API key by signing up at <a href=\"http://wordpress.com/\">WordPress.com</a> &ndash; they'll send it to your email." msgstr "" -#: modules/comments/pages/admin/settings/comments.php:9 +#: modules/comments/pages/admin/settings/comments.php:12 msgid "Allowed HTML Tags" msgstr "" -#: modules/comments/pages/admin/settings/comments.php:11 +#: modules/comments/pages/admin/settings/comments.php:14 msgid "Format: <code>strong, blockquote, em</code>" msgstr "" -#: modules/comments/pages/admin/settings/comments.php:14 +#: modules/comments/pages/admin/settings/comments.php:17 msgid "Default Comment Status" msgstr "" -#: modules/comments/pages/admin/settings/comments.php:16 +#: modules/comments/pages/admin/settings/comments.php:19 #: modules/comments/pages/admin/manage/comment.php:27 -#: modules/comments/pages/admin/edit/comment.php:29 -#: modules/comments/module.php:623 +#: modules/comments/pages/admin/edit/comment.php:31 +#: modules/comments/module.php:603 msgid "Approved" msgstr "" -#: modules/comments/pages/admin/settings/comments.php:17 +#: modules/comments/pages/admin/settings/comments.php:20 #: modules/comments/pages/admin/manage/comment.php:28 -#: modules/comments/pages/admin/edit/comment.php:30 -#: modules/comments/module.php:624 +#: modules/comments/pages/admin/edit/comment.php:32 +#: modules/comments/module.php:604 msgid "Denied" msgstr "" -#: modules/comments/pages/admin/settings/comments.php:21 +#: modules/comments/pages/admin/settings/comments.php:24 msgid "Comments Per Page" msgstr "" -#: modules/comments/pages/admin/settings/comments.php:26 +#: modules/comments/pages/admin/settings/comments.php:29 msgid "Update Settings &rarr;" msgstr "" @@ -110,8 +114,8 @@ msgid "Last 25 Spam" msgstr "" #: modules/comments/pages/admin/manage/spam.php:31 -#: modules/comments/pages/admin/edit/comment.php:15 -#: modules/comments/module.php:609 +#: modules/comments/pages/admin/edit/comment.php:17 +#: modules/comments/module.php:589 msgid "Author" msgstr "" @@ -123,25 +127,25 @@ msgstr "" msgid "Excerpt" msgstr "" -#: modules/comments/pages/admin/manage/spam.php:81 +#: modules/comments/pages/admin/manage/spam.php:79 msgid "Delete Selected" msgstr "" -#: modules/comments/pages/admin/manage/spam.php:84 +#: modules/comments/pages/admin/manage/spam.php:82 msgid "De-spam Selected" msgstr "" -#: modules/comments/pages/admin/manage/spam.php:94 -#: modules/comments/pages/admin/manage/comment.php:106 +#: modules/comments/pages/admin/manage/spam.php:92 +#: modules/comments/pages/admin/manage/comment.php:104 msgid "Next &raquo;" msgstr "" -#: modules/comments/pages/admin/manage/spam.php:97 -#: modules/comments/pages/admin/manage/comment.php:109 +#: modules/comments/pages/admin/manage/spam.php:95 +#: modules/comments/pages/admin/manage/comment.php:107 msgid "&laquo; Previous" msgstr "" -#: modules/comments/pages/admin/manage/comment.php:94 +#: modules/comments/pages/admin/manage/comment.php:92 #, php-format msgid "<a href=\"mailto:%s\">%s</a> (%s)" msgstr "" @@ -194,58 +198,58 @@ msgstr "" msgid "Last 25 Comments" msgstr "" -#: modules/comments/pages/admin/manage/comment.php:85 +#: modules/comments/pages/admin/manage/comment.php:83 msgid "edit" msgstr "" -#: modules/comments/pages/admin/manage/comment.php:86 +#: modules/comments/pages/admin/manage/comment.php:84 msgid "delete" msgstr "" -#: modules/comments/pages/admin/manage/comment.php:88 +#: modules/comments/pages/admin/manage/comment.php:86 msgid "deny" msgstr "" -#: modules/comments/pages/admin/manage/comment.php:90 +#: modules/comments/pages/admin/manage/comment.php:88 msgid "approve" msgstr "" -#: modules/comments/pages/admin/manage/comment.php:92 +#: modules/comments/pages/admin/manage/comment.php:90 msgid "spam" msgstr "" -#: modules/comments/pages/admin/edit/comment.php:4 -#: modules/comments/module.php:603 +#: modules/comments/pages/admin/edit/comment.php:6 +#: modules/comments/module.php:583 msgid "Body" msgstr "" -#: modules/comments/pages/admin/edit/comment.php:9 +#: modules/comments/pages/admin/edit/comment.php:11 msgid "Save" msgstr "" -#: modules/comments/pages/admin/edit/comment.php:19 -#: modules/comments/module.php:613 +#: modules/comments/pages/admin/edit/comment.php:21 +#: modules/comments/module.php:593 msgid "Author URL" msgstr "" -#: modules/comments/pages/admin/edit/comment.php:23 -#: modules/comments/module.php:617 +#: modules/comments/pages/admin/edit/comment.php:25 +#: modules/comments/module.php:597 msgid "Author E-Mail" msgstr "" -#: modules/comments/pages/admin/edit/comment.php:27 -#: modules/comments/module.php:621 +#: modules/comments/pages/admin/edit/comment.php:29 +#: modules/comments/module.php:601 msgid "Status" msgstr "" -#: modules/comments/pages/admin/edit/comment.php:31 -#: modules/comments/module.php:347 -#: modules/comments/module.php:625 +#: modules/comments/pages/admin/edit/comment.php:33 +#: modules/comments/module.php:326 +#: modules/comments/module.php:605 msgid "Spam" msgstr "" -#: modules/comments/pages/admin/edit/comment.php:35 -#: modules/comments/module.php:629 +#: modules/comments/pages/admin/edit/comment.php:37 +#: modules/comments/module.php:609 msgid "Timestamp" msgstr "" @@ -257,103 +261,99 @@ msgstr "" msgid "No, don't delete it!" msgstr "" -#: modules/comments/module.php:113 -#: modules/comments/module.php:114 -#: modules/comments/module.php:115 +#: modules/comments/module.php:73 +#: modules/comments/module.php:74 +#: modules/comments/module.php:75 msgid "Error" msgstr "" -#: modules/comments/module.php:113 +#: modules/comments/module.php:73 msgid "Author can't be blank." msgstr "" -#: modules/comments/module.php:114 +#: modules/comments/module.php:74 msgid "E-Mail address can't be blank." msgstr "" -#: modules/comments/module.php:115 +#: modules/comments/module.php:75 msgid "Message can't be blank." msgstr "" -#: modules/comments/module.php:241 -#: modules/comments/module.php:257 +#: modules/comments/module.php:212 +#: modules/comments/module.php:228 msgid "Comment Status" msgstr "" -#: modules/comments/module.php:243 -#: modules/comments/module.php:259 +#: modules/comments/module.php:214 +#: modules/comments/module.php:230 msgid "Open" msgstr "" -#: modules/comments/module.php:244 -#: modules/comments/module.php:260 +#: modules/comments/module.php:215 +#: modules/comments/module.php:231 msgid "Closed" msgstr "" -#: modules/comments/module.php:245 -#: modules/comments/module.php:261 +#: modules/comments/module.php:216 +#: modules/comments/module.php:232 msgid "Private" msgstr "" -#: modules/comments/module.php:246 -#: modules/comments/module.php:262 +#: modules/comments/module.php:217 +#: modules/comments/module.php:233 msgid "Registered Only" msgstr "" -#: modules/comments/module.php:281 -#: modules/comments/module.php:306 +#: modules/comments/module.php:252 +#: modules/comments/module.php:277 msgid "A ping from that URL is already registered." msgstr "" -#: modules/comments/module.php:338 -#: modules/comments/module.php:346 -#: modules/comments/module.php:352 +#: modules/comments/module.php:317 +#: modules/comments/module.php:325 +#: modules/comments/module.php:331 msgid "Comments" msgstr "" -#: modules/comments/module.php:382 -#: modules/comments/module.php:397 +#: modules/comments/module.php:361 +#: modules/comments/module.php:376 msgid "Are you sure you want to delete this comment?\n\nIt cannot be restored if you do this." msgstr "" -#: modules/comments/module.php:435 +#: modules/comments/module.php:414 msgid "&laquo; Fewer Options" msgstr "" -#: modules/comments/module.php:438 -#: modules/comments/module.php:606 +#: modules/comments/module.php:417 +#: modules/comments/module.php:586 msgid "More Options &raquo;" msgstr "" -#: modules/comments/module.php:638 +#: modules/comments/module.php:618 msgid "Update" msgstr "" -#: modules/comments/module.php:638 +#: modules/comments/module.php:618 msgid "or" msgstr "" -#: modules/comments/module.php:639 +#: modules/comments/module.php:619 msgid "Cancel" msgstr "" -#: modules/comments/module.php:769 -msgid "% Comment[s]" -msgstr "" - -#: modules/comments/model.Comment.php:43 +#: modules/comments/model.Comment.php:67 msgid "Spam Comment" msgstr "" -#: modules/comments/model.Comment.php:43 +#: modules/comments/model.Comment.php:67 msgid "Your comment has been marked as spam. It will have to be approved before it will show up." msgstr "" -#: modules/comments/model.Comment.php:106 +#: modules/comments/model.Comment.php:135 msgid "Edit" msgstr "" -#: modules/comments/model.Comment.php:113 +#: modules/comments/model.Comment.php:142 msgid "Delete" msgstr "" modules/comments/locale/en_US.po modules/tags/locale/en_US.mo @@ -6,44 +6,44 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Chyrp v1.1.3\n" +"Project-Id-Version: Chyrp v2.0\n" "Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n" "POT-Creation-Date: 2007-08-03 00:29-0500\n" -"PO-Revision-Date: 2008-04-15 19:22-0500\n" +"PO-Revision-Date: 2008-04-30 18:16-0500\n" "Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n" "Language-Team: English (en) <suracil.icio.us@gmail.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: modules/tags/pages/tags.php:32 +#: modules/tags/pages/tags.php:33 #, php-format msgid "%s post tagged with &quot;%s&quot;" msgid_plural "%s posts tagged with &quot;%s&quot;" msgstr[0] "" msgstr[1] "s" -#: modules/tags/pages/tags.php:10 -#: modules/tags/module.php:29 -#: modules/tags/module.php:39 -#: modules/tags/module.php:108 +#: modules/tags/pages/tags.php:11 +#: modules/tags/module.php:33 +#: modules/tags/module.php:44 +#: modules/tags/module.php:113 msgid "Tags" msgstr "" -#: modules/tags/pages/tags.php:45 +#: modules/tags/pages/tags.php:44 msgid "No Tags" msgstr "" -#: modules/tags/pages/tags.php:46 +#: modules/tags/pages/tags.php:45 msgid "There aren't any tags yet. Such a shame." msgstr "" -#: modules/tags/pages/tag.php:10 +#: modules/tags/pages/tag.php:7 #, php-format msgid "Posts tagged with \"%s\"" msgstr "" -#: modules/tags/module.php:29 +#: modules/tags/module.php:33 msgid "(comma separated)" msgstr "" modules/tags/locale/en_US.po @@ -1,15 +1,21 @@ from path import * import re -for f in path(".").walkfiles("*.php"): - source = f.text() +def walk(filename): + """docstring for walk""" + for f in path(".").walkfiles(filename): + source = f.text() - if re.search("[\t ]+\n", source): - print "/".join((f.parent, f.name)) + " has whitespace before a newline" + if re.search("[\t ]+\n", source): + print "/".join((f.parent, f.name)) + " has whitespace before a newline" - if re.search("([ ]+)\t", source): - print "/".join((f.parent, f.name)) + " has tabs after spaces" + if re.search("([ ]+)\t", source): + print "/".join((f.parent, f.name)) + " has tabs after spaces" - sanitized = re.sub("[\t ]+\n", "\n", source) - sanitized = re.sub("([ ]+)\t", "\\1 ", sanitized) - f.write_text(sanitized) \ No newline at end of file + sanitized = re.sub("[\t ]+\n", "\n", source) + sanitized = re.sub("([ ]+)\t", "\\1 ", sanitized) + f.write_text(sanitized) + +walk("*.php") +walk("*.rb") +walk("triggers_list") \ No newline at end of file sanitize.py @@ -1,6 +1,6 @@ {% extends "layouts/default.twig" %} {% block content %} - <h2>${ "Search results for &#8220;" ~ ( search | escape ) ~ "&#8221;" | translate }</h2> + <h2>${ "Search results for &#8220;" | translate } ${ search | escape } ${ "&#8221;" | translate }{# TODO: Turn this into a filter() once they accept arguments. #}</h2> {% for post in posts %} {% include "content/post.twig" %} {% endfor %} themes/default/content/search.twig @@ -1,6 +1,6 @@ {% extends "layouts/default.twig" %} {% block content %} - <h2>${ "Posts tagged with &#8220;" ~ ( tag.name | escape ) ~ "&#8221;" | translate }</h2> + <h2>${ "Posts tagged with &#8220;" | translate } ${ tag.name | escape } ${ "&#8221;" | translate }{# TODO: Turn this into a filter() once they accept arguments. #}</h2> {% for post in posts %} {% include "content/post.twig" %} {% endfor %} themes/default/content/tag.twig themes/default/locale/en_US.mo @@ -6,301 +6,230 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Chyrp v1.1.3\n" +"Project-Id-Version: Chyrp v2.0\n" "Report-Msgid-Bugs-To: suracil.icio.us@gmail.com\n" "POT-Creation-Date: 2007-08-03 00:29-0500\n" -"PO-Revision-Date: 2008-04-15 19:22-0500\n" +"PO-Revision-Date: 2008-04-30 18:16-0500\n" "Last-Translator: Alex Suraci <suracil.icio.us@gmail.com>\n" "Language-Team: English (en) <suracil.icio.us@gmail.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: themes/default/snippets.php:69 -#, php-format -msgid "Archive of %s" -msgstr "" - -#: themes/default/snippets.php:73 -#, php-format -msgid "Search results for &#8220;%s&#8221;" -msgstr "" - -#: themes/default/snippets.php:77 -#, php-format -msgid "Posts tagged with &#8220;%s&#8221;" -msgstr "" - -#: themes/default/snippets.php:144 -#, php-format -msgid "Comments on &#8220;%s&#8221;" -msgstr "" - -#: themes/default/snippets.php:4 -msgid "Read More &raquo;" -msgstr "" - -#: themes/default/snippets.php:8 -msgid "Not Found" -msgstr "" - -#: themes/default/snippets.php:9 -msgid "Sorry, but you are looking for something that isn't here." -msgstr "" - -#: themes/default/snippets.php:16 -#: themes/default/snippets.php:22 -msgid "No Posts" -msgstr "" - -#: themes/default/snippets.php:17 -msgid "There aren't any posts here yet." -msgstr "" - -#: themes/default/snippets.php:23 -msgid "There aren't any posts of that Feather." -msgstr "" - -#: themes/default/snippets.php:28 -msgid "No Results" -msgstr "" - -#: themes/default/snippets.php:29 -msgid "Your search did not match any posts." -msgstr "" - -#: themes/default/snippets.php:34 -msgid "No Drafts" -msgstr "" - -#: themes/default/snippets.php:35 -msgid "There aren't any drafts yet." -msgstr "" - -#: themes/default/snippets.php:48 +#: themes/default/layouts/default.twig:19 msgid "Write" msgstr "" -#: themes/default/snippets.php:49 +#: themes/default/layouts/default.twig:22 msgid "Add Page" msgstr "" -#: themes/default/snippets.php:50 +#: themes/default/layouts/default.twig:25 +#: themes/default/content/drafts.twig:3 msgid "Drafts" msgstr "" -#: themes/default/snippets.php:51 +#: themes/default/layouts/default.twig:28 msgid "Admin" msgstr "" -#: themes/default/snippets.php:52 +#: themes/default/layouts/default.twig:30 msgid "Close" msgstr "" -#: themes/default/snippets.php:59 -msgid "Your Drafts" -msgstr "" - -#: themes/default/snippets.php:66 -#: themes/default/layout/footer.php:34 -msgid "Tags" +#: themes/default/layouts/default.twig:47 +msgid "Powered by <a href=\"http://chyrp.net/\">Chyrp</a>" msgstr "" -#: themes/default/snippets.php:80 -msgid "This post is a draft." +#: themes/default/layouts/default.twig:55 +msgid "Pages" msgstr "" -#: themes/default/snippets.php:80 -msgid "(click to hide)" +#: themes/default/layouts/default.twig:57 +msgid "Welcome, " msgstr "" -#: themes/default/snippets.php:83 -msgid "Post added." +#: themes/default/layouts/default.twig:60 +msgid "User Controls" msgstr "" -#: themes/default/snippets.php:86 -msgid "Post updated." +#: themes/default/layouts/default.twig:62 +msgid "Toggle Admin Bar" msgstr "" -#: themes/default/snippets.php:107 -msgid "pinned" +#: themes/default/layouts/default.twig:64 +msgid "Log Out" msgstr "" -#: themes/default/snippets.php:130 -msgid " <em>/</em> Tags: " +#: themes/default/layouts/default.twig:67 +#: themes/default/forms/user/login.twig:3 +#: themes/default/forms/user/login.twig:15 +msgid "Log In" msgstr "" -#: themes/default/snippets.php:132 -msgid "Trackback" +#: themes/default/layouts/default.twig:69 +#: themes/default/forms/user/register.twig:3 +#: themes/default/forms/user/register.twig:23 +msgid "Register" msgstr "" -#: themes/default/snippets.php:155 -#: themes/default/layout/footer.php:2 -msgid "Next &rarr;" +#: themes/default/layouts/default.twig:75 +msgid "Tags" msgstr "" -#: themes/default/snippets.php:156 -#: themes/default/layout/footer.php:3 -msgid "&larr; Previous" +#: themes/default/layouts/default.twig:80 +msgid "All &rarr;" msgstr "" -#: themes/default/snippets.php:170 -msgid "Search..." +#: themes/default/layouts/default.twig:83 +msgid "Archives" msgstr "" -#: themes/default/layout/footer.php:17 -#, php-format -msgid "Welcome, %s!" +#: themes/default/layouts/default.twig:89 +msgid "Stats" msgstr "" -#: themes/default/layout/footer.php:50 -#, php-format -msgid "Queries: %s" +#: themes/default/layouts/default.twig:91 +msgid "Queries:" msgstr "" -#: themes/default/layout/footer.php:51 -#, php-format -msgid "Load Time: %s" +#: themes/default/layouts/default.twig:92 +msgid "Load time:" msgstr "" -#: themes/default/layout/footer.php:6 -msgid "theme &copy; <a href=\"http://lofisoami.com/\">Aaron MacDonald</a> 2007" +#: themes/default/info.yaml:1 +msgid "Chyrp Default" msgstr "" -#: themes/default/layout/footer.php:7 -msgid "Powered by <a href=\"http://chyrp.net/\">Chyrp</a>" +#: themes/default/info.yaml:5 +msgid "Chyrp's default theme since v.0.0.1 Alpha, developed over a long period of time on and off (mostly off) by Aaron MacDonald." msgstr "" -#: themes/default/layout/footer.php:15 -msgid "Pages" +#: themes/default/forms/user/register.twig:7 +#: themes/default/forms/user/login.twig:7 +msgid "Username" msgstr "" -#: themes/default/layout/footer.php:20 -#: themes/default/forms/user/login.php:1 -#: themes/default/forms/user/login.php:13 -msgid "Log In" +#: themes/default/forms/user/register.twig:11 +#: themes/default/forms/user/login.twig:11 +msgid "Password" msgstr "" -#: themes/default/layout/footer.php:22 -#: themes/default/forms/user/register.php:1 -#: themes/default/forms/user/register.php:20 -msgid "Register" +#: themes/default/forms/user/register.twig:15 +msgid "Password (again)" msgstr "" -#: themes/default/layout/footer.php:25 -msgid "User Controls" +#: themes/default/forms/user/register.twig:19 +#: themes/default/forms/user/controls.twig:11 +msgid "E-Mail" msgstr "" -#: themes/default/layout/footer.php:27 -msgid "Toggle Admin Bar" +#: themes/default/forms/user/controls.twig:3 +msgid "Controls" msgstr "" -#: themes/default/layout/footer.php:29 -msgid "Log Out" +#: themes/default/forms/user/controls.twig:7 +msgid "Full Name" msgstr "" -#: themes/default/layout/footer.php:39 -msgid "All &rarr;" +#: themes/default/forms/user/controls.twig:15 +msgid "Website" msgstr "" -#: themes/default/layout/footer.php:42 -msgid "Archives" +#: themes/default/forms/user/controls.twig:19 +msgid "New Password?" msgstr "" -#: themes/default/layout/footer.php:48 -msgid "Stats" +#: themes/default/forms/user/controls.twig:23 +msgid "Confirm" msgstr "" -#: themes/default/info.yaml:1 -msgid "Chyrp Default" +#: themes/default/forms/user/controls.twig:28 +msgid "Update" msgstr "" -#: themes/default/info.yaml:5 -msgid "Chyrp's default theme since v.0.0.1 Alpha, developed over a long period of time on and off (mostly off) by Aaron MacDonald." +#: themes/default/forms/comment/new.twig:3 +msgid "Logged in as" msgstr "" -#: themes/default/forms/user/register.php:4 -#: themes/default/forms/user/login.php:5 -msgid "Username" +#: themes/default/forms/comment/new.twig:4 +msgid "Log Out &rarr;" msgstr "" -#: themes/default/forms/user/register.php:8 -#: themes/default/forms/user/login.php:9 -msgid "Password" +#: themes/default/forms/comment/new.twig:10 +msgid "Your Name" msgstr "" -#: themes/default/forms/user/register.php:12 -msgid "Password (again)" +#: themes/default/forms/comment/new.twig:12 +msgid "Your E-Mail" msgstr "" -#: themes/default/forms/user/register.php:16 -msgid "Valid E-Mail Address" +#: themes/default/forms/comment/new.twig:14 +msgid "Your Website" msgstr "" -#: themes/default/forms/user/controls.php:1 -msgid "Controls" +#: themes/default/forms/comment/new.twig:21 +msgid "Speak" msgstr "" -#: themes/default/forms/user/controls.php:5 -msgid "Full Name" +#: themes/default/content/view.twig:14 +msgid "Next &rarr;" msgstr "" -#: themes/default/forms/user/controls.php:9 -msgid "E-Mail" +#: themes/default/content/view.twig:15 +msgid "&larr; Previous" msgstr "" -#: themes/default/forms/user/controls.php:13 -msgid "Website" +#: themes/default/content/view.twig:6 +msgid "Comments" msgstr "" -#: themes/default/forms/user/controls.php:17 -msgid "New Password?" +#: themes/default/content/tag.twig:3 +msgid "Posts tagged with &#8220;" msgstr "" -#: themes/default/forms/user/controls.php:21 -msgid "Confirm" +#: themes/default/content/tag.twig:3 +msgid "&#8221;" msgstr "" -#: themes/default/forms/user/controls.php:25 -msgid "Update" +#: themes/default/content/search.twig:3 +msgid "Search results for &#8220;" msgstr "" -#: themes/default/forms/comment/new.php:7 -#, php-format -msgid "Logged in as %s." +#: themes/default/content/post.twig:2 +msgid "This post is a draft." msgstr "" -#: themes/default/forms/comment/new.php:7 -msgid "Log Out &rarr;" +#: themes/default/content/post.twig:2 +msgid "(click to hide)" msgstr "" -#: themes/default/forms/comment/new.php:12 -msgid "Your Name" +#: themes/default/content/post.twig:8 +msgid "pinned" msgstr "" -#: themes/default/forms/comment/new.php:14 -msgid "Your E-Mail" +#: themes/default/content/post.twig:21 +msgid "Trackback" msgstr "" -#: themes/default/forms/comment/new.php:16 -msgid "Your Website" +#: themes/default/content/comment.twig:3 +msgid "Your comment is awaiting moderation." msgstr "" -#: themes/default/forms/comment/new.php:22 -msgid "Speak" +#: themes/default/content/comment.twig:9 +msgid "on" msgstr "" -#: themes/default/content/feathers/text.php:3 -#: themes/default/content/feathers/chat.php:3 -#, php-format -msgid "Permanent Link to %s" +#: themes/default/content/archive.twig:15 +#: themes/default/content/archive.twig:18 +msgid "Archive of" msgstr "" -#: themes/default/content/comment.php:3 -msgid "Your comment is awaiting moderation." +#: themes/default/content/404.twig:3 +msgid "Not Found" msgstr "" -#: themes/default/content/comment.php:9 -msgid "on" +#: themes/default/content/404.twig:4 +msgid "Sorry, but you are looking for something that isn't here." msgstr "" themes/default/locale/en_US.po @@ -17,14 +17,14 @@ Find.find(basedir) do |path| if filename =~ /\.php/ and not exclude_files.include?(filename) cleaned = path.sub("./", "") contents = File.read(path) - if contents =~ /\$trigger->call\("[^"]+"(.*?)\)/ + if contents =~ /(\$trigger|Twigger::current\(\))->call\("[^"]+"(.*?)\)/ counter = 1 File.open(path, "r") do |infile| while (line = infile.gets) - line.gsub(/\$trigger->call\("([^"]+)"(, (.+))?\)/) do - args = $3 || "" - output << $1 + ":\n\t" + args + "\n" - triggers << $1 + line.gsub(/(\$trigger|Twigger::current\(\))->call\("([^"]+)"(, (.+))?\)/) do + args = $4 || "" + output << $2 + ":\n\t" + args + "\n" + triggers << $2 end end end triggers.rb @@ -1,107 +1,71 @@ -controls: - -sidebar: - -head: - -controls: - -sidebar: - -controls: - -ajax: - +tags_top: + +admin_manage_nav: + +rss_comment: + $comment->id +comments_rss_item: + $comment->id +admin_manage_comments_column_header: + +manage_comments: + +admin_manage_comments_column: + $comment->id +manage_comments: + +show_comment: + $comment +update_comment: + $this +delete_comment: + new self($comment_id) top: - -above_post: - -below_post: - -no_posts: - $action -draft_view_top: - -above_post: - -below_post: - -archive_list_top: - -archive_month: - array(@date("F Y", mktime(0, 0, 0, $time->month + 1, 0, $time->year)), $route->url("archive/".when("Y/m/", $time->created_at))) -archive_list_wrapper: - $time, true) -archive_list_item: - -archive_top: - array($year, $month) -above_post: - -below_post: - -no_posts: - "archive" -not_found: - + bottom: - + pingback: array($id, $linked_to, $linked_from, $title, $excerpt) trackback_receive: - -feed_item: - $post->id -javascript_domready: - -javascript: - -override_action: - + add_user: $id update_user: - array($user_id, $login, $password, $full_name, $email, $website, $group_id) -delete_user: - $user_id -parse_post: - + array($this->id, $login, $password, $full_name, $email, $website, $group_id) add_post: array($id, $options) update_post: - array($this->id, $options) -delete_post: - $this->id + array($this, $options) +filter_post: + $this add_page: $id update_page: - $page_id -delete_page: - $id + $this->id add_group: array($id, $name, $permissions) update_group: - array($group_id, $name, $permissions) -delete_group: - $group_id -change_settings: - $_GET['sub'] -stylesheets: - -scripts: - -parse_theme_file: - array($abs_file, $scope) -read_more: - null, true).'</a>(((more)))', $text + array($this, $name, $permissions) +javascript_domready: + +ajax_post_edit_form_javascript: + +javascript: + edit_post_options: + $post_id +feed_item: $post->id +change_settings: + $_GET['sub'] +runtime: + not_found: - + below_post: - + ajax: - + import_wordpress_post: array($the_post, $id) import_wordpress_page: @@ -113,34 +77,38 @@ import_textpattern_post: import_movabletype_post: array($the_post, $id) below_post_fields: - + new_post_options: $sub new_page_options: - + admin_settings_nav: - + admin_manage_nav: - + +admin_manage_users_column_header: + +admin_manage_users_column: + $user +admin_new_user_form: + admin_manage_posts_column_header: - -manage_posts: - + admin_manage_posts_column: $post->id admin_manage_nav: - -edit_post_options: - $_GET['id'] + edit_page_options: $_GET['id'] +admin_edit_user_form: + $edit_user admin_manage_nav: - + user_delete_list: - + admin_javascript: - + admin_head: - + admin_nav: - + triggers_list 780a2afbac38b857656d00e4fe43a63d9afd040d Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/246c5cb7e524820e01453e5c3a414cde102b2f98 246c5cb7e524820e01453e5c3a414cde102b2f98 2008-04-30T15:19:30-07:00 2008-04-30T15:19:30-07:00 Gettext updates. 19fbc4ff3b2eafeb820ac58a8fb05ee4cec1ac4a Alex Suraci i.am@toogeneric.com