[Jifty-commit] r5791 - jifty/trunk/share/po

Jifty commits jifty-commit at lists.jifty.org
Thu Sep 4 06:42:16 EDT 2008


Author: yves
Date: Thu Sep  4 06:42:06 2008
New Revision: 5791

Modified:
   jifty/trunk/share/po/en.po
   jifty/trunk/share/po/fr.po
   jifty/trunk/share/po/ja.po
   jifty/trunk/share/po/ru.po
   jifty/trunk/share/po/zh_cn.po
   jifty/trunk/share/po/zh_tw.po

Log:
* update po files
* update french po
* we need to use 'jifty po --dir plugins' to update new plugins location


Modified: jifty/trunk/share/po/en.po
==============================================================================
--- jifty/trunk/share/po/en.po	(original)
+++ jifty/trunk/share/po/en.po	Thu Sep  4 06:42:06 2008
@@ -15,6 +15,20 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lib/Jifty/Plugin/Comment/Notification/CommentPublished.pm:71
+#. ($url,        $self->parent->title,        $comment->title,         $from,         $comment->created_on->strftime('%A, %B %d, %Y @ %H:%M%P')
+msgid ""
+"\n"
+"View Comment: %1\n"
+"\n"
+"On Post: %2\n"
+"Subject: %3\n"
+"From: %4\n"
+"Date: %5\n"
+"\n"
+"%6\n"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Notification/ConfirmLostPassword.pm:38
 #. ($appname,$confirm_url)
 msgid ""
@@ -41,61 +55,72 @@
 "%2\n"
 msgstr ""
 
-#: lib/Jifty/Action/Record/Search.pm:125
+#: lib/Jifty/Plugin/Authentication/Facebook/View.pm:43
+msgid ""
+" id is 'facebook_link' };\n"
+"        span { _(\"Login to Facebook now to link it with your current account!\") };\n"
+"        a {{ href is $plugin->get_link_url };\n"
+"            img {{ src is 'http://static.ak.facebook.com/images/devsite/facebook_login.gif', border is '0' "
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Facebook/View.pm:26
+msgid ""
+" id is 'facebook_login' };\n"
+"        span { _(\"Login to Facebook now to get started!\") };\n"
+"        a {{ href is $plugin->get_login_url };\n"
+"            img {{ src is 'http://static.ak.facebook.com/images/devsite/facebook_login.gif', border is '0' "
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:172
 msgid "!=>< allowed"
 msgstr ""
 
-#: lib/Jifty/Notification.pm:94
+#: lib/Jifty/Notification.pm:108 lib/Jifty/Notification.pm:125
 #. ($appname, Jifty->config->framework('AdminEmail')
 msgid "%1 <%2>"
 msgstr ""
 
-#: lib/Jifty/Action/Record/Search.pm:115
+#: lib/Jifty/Action/Record/Search.pm:143
 #. ($label)
 msgid "%1 after"
 msgstr ""
 
-#: lib/Jifty/Action/Record/Search.pm:116
+#: lib/Jifty/Action/Record/Search.pm:146
 #. ($label)
 msgid "%1 before"
 msgstr ""
 
-#: lib/Jifty/Action/Record/Search.pm:112
+#: lib/Jifty/Action/Record/Search.pm:133
 #. ($label)
 msgid "%1 contains"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:141
-#. ($collection-> count)
-msgid "%1 entries"
-msgstr ""
-
-#: lib/Jifty/Action/Record/Search.pm:123
+#: lib/Jifty/Action/Record/Search.pm:166
 #. ($label)
 msgid "%1 greater or equal to"
 msgstr ""
 
-#: lib/Jifty/Action/Record/Search.pm:121
+#: lib/Jifty/Action/Record/Search.pm:160
 #. ($label)
 msgid "%1 greater than"
 msgstr ""
 
-#: lib/Jifty/Action/Record/Search.pm:108
+#: lib/Jifty/Action/Record/Search.pm:121
 #. ($label)
 msgid "%1 is not"
 msgstr ""
 
-#: lib/Jifty/Action/Record/Search.pm:113
+#: lib/Jifty/Action/Record/Search.pm:136
 #. ($label)
 msgid "%1 lacks"
 msgstr ""
 
-#: lib/Jifty/Action/Record/Search.pm:124
+#: lib/Jifty/Action/Record/Search.pm:169
 #. ($label)
 msgid "%1 less or equal to"
 msgstr ""
 
-#: lib/Jifty/Action/Record/Search.pm:122
+#: lib/Jifty/Action/Record/Search.pm:163
 #. ($label)
 msgid "%1 less than"
 msgstr ""
@@ -106,25 +131,29 @@
 msgid "%1 line %2"
 msgstr ""
 
-#: share/web/templates/__jifty/halo:119
+#: lib/Jifty/Plugin/SQLQueries.pm:186 share/web/templates/__jifty/halo:122
 #. ($_->[3])
 msgid "%1 seconds"
 msgstr ""
 
-#: lib/Jifty/Action/Record/Search.pm:117
+#: lib/Jifty/Action/Record/Search.pm:149
 #. ($label)
 msgid "%1 since"
 msgstr ""
 
-#: lib/Jifty/Action/Record/Search.pm:118
+#: lib/Jifty/Action/Record/Search.pm:152
 #. ($label)
 msgid "%1 until"
 msgstr ""
 
-#: lib/Jifty/Action/Record/Search.pm:77
+#: lib/Jifty/Action/Record/Search.pm:81
 msgid "(any)"
 msgstr ""
 
+#: lib/Jifty/Plugin/AutoReference.pm:95
+msgid "- none -"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/ConfirmEmail.pm:58
 msgid ". Your email address has now been confirmed."
 msgstr ""
@@ -133,32 +162,32 @@
 msgid "A link to reset your password has been sent to your email account."
 msgstr ""
 
-#: lib/Jifty/Notification.pm:96
+#: lib/Jifty/Notification.pm:110 lib/Jifty/Notification.pm:127
 #. ($appname)
 msgid "A notification from %1!"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:443
-msgid "Actions"
+#: lib/Jifty/Plugin/Comment/View.pm:165
+msgid "Add a comment"
 msgstr ""
 
-#: lib/Jifty/Plugin/SkeletonApp/Dispatcher.pm:28
+#: lib/Jifty/Plugin/AdminUI/Dispatcher.pm:34
 msgid "Administration"
 msgstr ""
 
-#: lib/Jifty/View/Declare/Helpers.pm:363 share/web/templates/_elements/wrapper:11
+#: lib/Jifty/View/Declare/Page.pm:180 share/web/templates/_elements/wrapper:11
 msgid "Administration mode is enabled."
 msgstr ""
 
-#: lib/Jifty/View/Declare/Helpers.pm:360 share/web/templates/_elements/wrapper:11
+#: lib/Jifty/View/Declare/Page.pm:177 share/web/templates/_elements/wrapper:11
 msgid "Alert"
 msgstr ""
 
-#: lib/Jifty/Action/Record/Create.pm:82
+#: lib/Jifty/Action/Record/Create.pm:105
 msgid "An error occurred.  Try again later"
 msgstr ""
 
-#: lib/Jifty/Action/Record/Search.pm:129
+#: lib/Jifty/Action/Record/Search.pm:177
 msgid "Any field contains"
 msgstr ""
 
@@ -166,20 +195,18 @@
 msgid "Anyway, the software has logged this error."
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:19
+#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:54
 msgid "Authentication token"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:489 lib/Jifty/Plugin/AdminUI/View-not-yet.pm:59
-msgid "Back to the admin console"
-msgstr ""
-
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:461
-msgid "Back to the application"
+#: lib/Jifty/Plugin/SQLQueries.pm:175 share/web/templates/__jifty/halo:120
+msgid "Bindings"
 msgstr ""
 
-#: share/web/templates/__jifty/halo:117
-msgid "Bindings"
+#: lib/Jifty/Plugin/Comment/View.pm:138 lib/Jifty/Plugin/Comment/View.pm:197
+#. ($poster,                     $created_on->strftime('%A, %B %d, %Y @ %H:%M%P')
+#. ($poster,                             $created_on->strftime('%A, %B %d, %Y @ %H:%M%P')
+msgid "By %1 %2"
 msgstr ""
 
 #: share/web/templates/helpers/calendar.html:4
@@ -187,11 +214,11 @@
 msgid "Calendar"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:338
+#: lib/Jifty/View/Declare/CRUD.pm:434
 msgid "Cancel"
 msgstr ""
 
-#: share/web/templates/__jifty/halo:81
+#: share/web/templates/__jifty/halo:84
 msgid "Children"
 msgstr ""
 
@@ -199,73 +226,64 @@
 msgid "Close window"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:382
-msgid "Confirm delete?"
+#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:94
+msgid "Confirmation resent."
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:97
-msgid "Confirmation resent."
+#: lib/Jifty/Plugin/OpenID/View.pm:65
+msgid "Continue"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:213
+#: lib/Jifty/View/Declare/CRUD.pm:723
 msgid "Create"
 msgstr ""
 
-#: lib/Jifty/Action/Record/Create.pm:81
+#: lib/Jifty/Action/Record/Create.pm:104
 #. (ref($record)
 msgid "Create of %1 failed: %2"
 msgstr ""
 
-#: lib/Jifty/Action/Record/Create.pm:105
+#: lib/Jifty/Action/Record/Create.pm:131
 msgid "Created"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:415
-msgid "Database Administration"
-msgstr ""
-
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:380
+#: lib/Jifty/View/Declare/CRUD.pm:444
 msgid "Delete"
 msgstr ""
 
-#: lib/Jifty/Action/Record/Delete.pm:76
+#: lib/Jifty/Action/Record/Delete.pm:82
 msgid "Deleted"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:458 lib/Jifty/Plugin/AdminUI/View-not-yet.pm:486 lib/Jifty/Plugin/AdminUI/View-not-yet.pm:56
-msgid "Done?"
+#: share/web/templates/__jifty/halo:2
+msgid "Draw halos"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:388 share/web/templates/__jifty/halo:126 share/web/templates/__jifty/halo:20
+#: lib/Jifty/View/Declare/CRUD.pm:366 share/web/templates/__jifty/halo:129 share/web/templates/__jifty/halo:23
 msgid "Edit"
 msgstr ""
 
-#: lib/Jifty/Mason/Halo.pm:104
-#. ($comp_name)
-msgid "Edit %1"
-msgstr ""
-
 #: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:23 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:32
 msgid "Email"
 msgstr ""
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:33
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:52
 msgid "Email address"
 msgstr ""
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:35
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:54
 msgid "Email address confirmed?"
 msgstr ""
 
-#: lib/Jifty/Action.pm:1158
+#: lib/Jifty/Action.pm:1309
 msgid "Foo cannot contain -, *, +, or ?."
 msgstr ""
 
-#: lib/Jifty/Action.pm:1152
+#: lib/Jifty/Action.pm:1303
 msgid "Foo cannot contain uppercase letters."
 msgstr ""
 
-#: lib/Jifty/Action.pm:1136
+#: lib/Jifty/Action.pm:1282
 msgid "Foo values are always in lowercase."
 msgstr ""
 
@@ -277,6 +295,10 @@
 msgid "Go back home..."
 msgstr ""
 
+#: lib/Jifty/Plugin/OpenID/View.pm:35
+msgid "Go for it!"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:34
 msgid "Hashed Password"
 msgstr ""
@@ -290,20 +312,32 @@
 msgid "Hello, %1!"
 msgstr ""
 
-#: lib/Jifty/Plugin/SkeletonApp/View.pm:31 share/web/templates/_elements/sidebar:5
-#. ($u->$method()
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:147
+#. (Jifty->web->current_user->user_object->facebook_name)
+#. (Jifty->web->current_user->user_object->name)
+msgid "Hi %1!"
+msgstr ""
+
+#: lib/Jifty/Plugin/I18N/Action/SetLang.pm:44
+#. (DateTime::Locale->load($lang)
+msgid "Hi, we speak %1."
+msgstr ""
+
+#: lib/Jifty/Plugin/SkeletonApp/View.pm:31 share/web/templates/_elements/sidebar:4
+#. ($u->username)
+#. (Jifty->web->current_user->username)
 msgid "Hiya, %1."
 msgstr ""
 
-#: lib/Jifty/Plugin/SkeletonApp/Dispatcher.pm:23
+#: lib/Jifty/Plugin/SkeletonApp/Dispatcher.pm:31
 msgid "Home"
 msgstr ""
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:30
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:49
 msgid "How should I display your name to other users?"
 msgstr ""
 
-#: lib/Jifty/Action.pm:1090
+#: lib/Jifty/Action.pm:1214
 msgid "I changed $field for you"
 msgstr ""
 
@@ -311,18 +345,30 @@
 msgid "I'm not sure how this happened."
 msgstr ""
 
-#: lib/Jifty/Plugin/ErrorTemplates/View.pm:62
+#: lib/Jifty/Plugin/OpenID/View.pm:59
+msgid "If the username provided conflicts with an existing username or contains invalid characters, you will have to give us a new one."
+msgstr ""
+
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:64
 msgid "Internal error"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:78 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
+#: lib/Jifty/Plugin/OpenID/Action/AuthenticateOpenID.pm:53
+msgid "Invalid OpenID URL.  Please check to make sure it is correct.  (@{[$csr->err]})"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:62 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
 msgid "It doesn't look like there's an account by that name."
 msgstr ""
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:89
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:107
 msgid "It looks like somebody else is using that address. Is there a chance you have another account?"
 msgstr ""
 
+#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:45
+msgid "It looks like someone is already using that OpenID."
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:75
 msgid "It looks like you already have an account. Perhaps you want to <a href=\"/login\">log in</a> instead?"
 msgstr ""
@@ -331,101 +377,136 @@
 msgid "It looks like you didn't enter the same password into both boxes. Give it another shot?"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:82
+#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:79
 msgid "It looks like you're already confirmed."
 msgstr ""
 
-#: lib/Jifty/View/Declare/Helpers.pm:375 share/web/templates/_elements/wrapper:18
+#: lib/Jifty/Plugin/I18N/Action/SetLang.pm:12
+msgid "Language"
+msgstr ""
+
+#: lib/Jifty/View/Declare/Page.pm:198 share/web/templates/_elements/wrapper:18
 msgid "Loading..."
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:106
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23 lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132
 msgid "Login"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:55
+#: lib/Jifty/Plugin/Authentication/Facebook/View.pm:24
+msgid "Login to Facebook now to get started!"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Facebook/View.pm:41
+msgid "Login to Facebook now to link it with your current account!"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:82
 msgid "Login with a password"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:40
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:28
+msgid "Login with your Ldap account"
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/View.pm:17
+msgid "Login with your OpenID"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:35
+msgid "Login with your ldap account"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:22 lib/Jifty/Plugin/Authentication/Password/View.pm:57
 msgid "Login!"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:123
+#: lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:151
 msgid "Logout"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:63
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:90
 msgid "Lost your password?"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:46 lib/Jifty/Plugin/AdminUI/View-not-yet.pm:473
-#. ($object_type)
-msgid "Manage records: [_1]"
-msgstr ""
-
 #: share/web/templates/__jifty/error/mason_internal_error:1
 msgid "Mason error"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:429
-msgid "Models"
-msgstr ""
-
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:81
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:115
 msgid "New password"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:172
+#: lib/Jifty/View/Declare/CRUD.pm:654
 msgid "Next Page"
 msgstr ""
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:29
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:48
 msgid "Nickname"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:52
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:79
 msgid "No account yet? It's quick and easy. "
 msgstr ""
 
-#: lib/Jifty/Action/Record/Search.pm:130
+#: lib/Jifty/Action/Record/Search.pm:178
 msgid "No field contains"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:139
-msgid "No items found"
+#: lib/Jifty/View/Declare/CRUD.pm:569
+msgid "No items found."
 msgstr ""
 
-#: lib/Jifty/Web.pm:302
+#: lib/Jifty/Plugin/Comment/View.pm:304
+msgid "No one has made a comment yet."
+msgstr ""
+
+#: lib/Jifty/Web.pm:306
 msgid "No request to handle"
 msgstr ""
 
+#: lib/Jifty/Plugin/UUID/Widget.pm:37
+msgid "No value yet"
+msgstr ""
+
 #: lib/Jifty/Plugin/OnlineDocs/Dispatcher.pm:26
 msgid "Online docs"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:134
+#: lib/Jifty/Plugin/OpenID/Action/AuthenticateOpenID.pm:27
+msgid "OpenID URL"
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm:48
+msgid "OpenID verification failed.  It looks like you cancelled the OpenID verification request."
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm:57
+msgid "OpenID verification failed: "
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:621
 #. ($page, $collection->pager->last_page)
 msgid "Page %1 of %2"
 msgstr ""
 
-#: share/web/templates/__jifty/halo:1
+#: share/web/templates/__jifty/halo:3
 msgid "Page info"
 msgstr ""
 
-#: share/web/templates/__jifty/halo:72
+#: share/web/templates/__jifty/halo:75
 msgid "Parent"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:29 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:26
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:29 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:60
 msgid "Password"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:88
+#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:136
 msgid "Passwords need to be at least six characters long"
 msgstr ""
 
-#: lib/Jifty/Record.pm:272 lib/Jifty/Record.pm:351 lib/Jifty/Record.pm:70
+#: lib/Jifty/Action/Record/Delete.pm:61 lib/Jifty/Action/Record/Update.pm:180 lib/Jifty/Action/Record/Update.pm:187 lib/Jifty/Record.pm:508 lib/Jifty/Record.pm:567 lib/Jifty/Record.pm:70
 msgid "Permission denied"
 msgstr ""
 
@@ -433,10 +514,18 @@
 msgid "Please email us!"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:163
+#: lib/Jifty/Plugin/Comment/View.pm:221
+msgid "Preview"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:643
 msgid "Previous Page"
 msgstr ""
 
+#: lib/Jifty/View/Declare/CRUD.pm:447
+msgid "Really delete?"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:65
 msgid "Really, really sorry."
 msgstr ""
@@ -445,55 +534,43 @@
 msgid "Remember me?"
 msgstr ""
 
-#: share/web/templates/__jifty/halo:69
+#: share/web/templates/__jifty/halo:72
 #. ($frame->{'render_time'})
 msgid "Rendered in %1s"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:78
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:108 lib/Jifty/Plugin/Authentication/Password/View.pm:112
 msgid "Reset lost password"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:53
-msgid "Run the action"
-msgstr ""
-
-#: share/web/templates/__jifty/halo:111
+#: share/web/templates/__jifty/halo:114
 msgid "SQL Statements"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:327
+#: lib/Jifty/View/Declare/CRUD.pm:425
 msgid "Save"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:304
+#: lib/Jifty/View/Declare/CRUD.pm:314
 msgid "Search"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:119
-msgid "Send"
-msgstr ""
-
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:97
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:147
 msgid "Send a link to reset your password"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:109 lib/Jifty/Plugin/Authentication/Password/View.pm:114
-msgid "Send a password reminder"
+#: lib/Jifty/Plugin/Feedback/View.pm:21
+msgid "Send us feedback!"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:111
+#: lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:137 lib/Jifty/Plugin/Authentication/Password/View.pm:42 lib/Jifty/Plugin/Authentication/Password/View.pm:47
 msgid "Sign up"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:53
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:80
 msgid "Sign up for an account!"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:30 lib/Jifty/Plugin/Authentication/Password/View.pm:35
-msgid "Signup"
-msgstr ""
-
 #: lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:108
 #. ($msg)
 msgid "Something bad happened and we couldn't create your account: %1"
@@ -503,7 +580,7 @@
 msgid "Something went awry"
 msgstr ""
 
-#: lib/Jifty/Plugin/ErrorTemplates/View.pm:124 share/web/templates/dhandler:1
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:125 share/web/templates/dhandler:1
 msgid "Something's not quite right"
 msgstr ""
 
@@ -511,28 +588,57 @@
 msgid "Sorry about this."
 msgstr ""
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:82
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:115
+msgid "Sorry, something weird happened (we couldn't create a user for you).  Try again later."
+msgstr ""
+
+#: lib/Jifty/Action/Record/Execute.pm:55
+msgid "Start"
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/View.pm:236
+msgid "Submit"
+msgstr ""
+
+#: lib/Jifty/Plugin/Feedback/View.pm:23
+#. (Jifty->config->framework('ApplicationName')
+msgid "Tell us what's good, what's bad, and what else you want %1 to do!"
+msgstr ""
+
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:100
 #. ($new_email)
 msgid "That %1 doesn't look like an email address."
 msgstr ""
 
-#: lib/Jifty/Action.pm:878
+#: lib/Jifty/Action.pm:1056
 msgid "That doesn't look like a correct value"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:71 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:72 lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:70
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46
+msgid "That doesn't look like a valid login."
+msgstr ""
+
+#: plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:47
+msgid "That doesn't look like a valid ticket."
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:68 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:72 lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:70
 msgid "That doesn't look like an email address."
 msgstr ""
 
-#: lib/Jifty/Action/Record.pm:249
+#: lib/Jifty/Action/Record.pm:351
 msgid "That doesn't look right, but I don't know why"
 msgstr ""
 
-#: lib/Jifty/Action/Record.pm:181
+#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:50
+msgid "The OpenID '$openid' has been linked to your account."
+msgstr ""
+
+#: lib/Jifty/Action/Record.pm:219
 msgid "The passwords you typed didn't match each other"
 msgstr ""
 
-#: lib/Jifty/Web.pm:365
+#: lib/Jifty/Web.pm:427
 msgid "There was an error completing the request.  Please try again later."
 msgstr ""
 
@@ -544,19 +650,11 @@
 msgid "There's a pretty good chance that error message doesn't mean anything to you, but we'd rather you have a little bit of information about what went wrong than nothing. We've logged this error, so we know we need to write something friendly explaining just what happened and how to fix it."
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:419
-msgid "This console lets you manage the records in your Jifty database. Below, you should see a list of all your database tables. Feel free to go through and add, delete or modify records."
-msgstr ""
-
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:425
-msgid "To disable this administrative console, add \"AdminMode: 0\" under the \"framework:\" settings in the config file (etc/config.yml)."
-msgstr ""
-
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:127
+#: lib/Jifty/View/Declare/CRUD.pm:533
 msgid "Toggle search"
 msgstr ""
 
-#: lib/Jifty/Plugin/ErrorTemplates/View.pm:173 share/web/templates/__jifty/error/mason_internal_error:6
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:175 share/web/templates/__jifty/error/mason_internal_error:6
 msgid "Try again"
 msgstr ""
 
@@ -568,18 +666,22 @@
 msgid "Type that again?"
 msgstr ""
 
-#: lib/Jifty/Action/Record/Update.pm:156
+#: lib/Jifty/Action/Record/Update.pm:214
 msgid "Updated"
 msgstr ""
 
-#: share/web/templates/__jifty/halo:93
+#: share/web/templates/__jifty/halo:96
 msgid "Variables"
 msgstr ""
 
-#: lib/Jifty.pm:27
+#: lib/Jifty.pm:29
 msgid "W00t"
 msgstr ""
 
+#: lib/Jifty/Plugin/OpenID/View.pm:53
+msgid "We need you to set a username or quickly check the one associated with your OpenID. Your username is what other people will see when you ask questions or make suggestions"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:114
 msgid "We've sent a confirmation message to your email box."
 msgstr ""
@@ -589,7 +691,11 @@
 msgid "Welcome %1 to the %2"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:181
+#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:66
+msgid "Welcome back, "
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:194
 #. ($user->name)
 msgid "Welcome back, %1."
 msgstr ""
@@ -599,20 +705,23 @@
 msgid "Welcome to %1!"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:113
+#: lib/Jifty/Plugin/Authentication/Password/Action/ConfirmEmail.pm:57 lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:113
 #. (Jifty->config->framework('ApplicationName')
 msgid "Welcome to %1, %2."
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/ConfirmEmail.pm:57
-#. (Jifty->config->framework('ApplicationName')
-msgid "Welcome to %1, %2. "
-msgstr ""
-
 #: lib/Jifty/Plugin/SkeletonApp/View.pm:75 share/web/templates/index.html:1
 msgid "Welcome to your new Jifty application"
 msgstr ""
 
+#: lib/Jifty/Plugin/OpenID/Action/CreateOpenIDUser.pm:94
+msgid "Welcome, "
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/View.pm:42
+msgid "You already logged in."
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:63
 msgid "You don't exist."
 msgstr ""
@@ -629,23 +738,23 @@
 msgid "You have already confirmed your account."
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:98
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:148
 msgid "You lost your password. A link to reset it will be sent to the following email address:"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:115
-msgid "You lost your password. A reminder will be send to the following mail:"
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:138
+msgid "You may have mistyped your email or password. Give it another shot."
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:152
-msgid "You may have mistyped your email address or password. Give it another shot."
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77
+msgid "You may have mistyped your login or password. Give it another shot?"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:146
-msgid "You may have mistyped your email or password. Give it another shot."
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LinkFacebookUser.pm:40
+msgid "You must be logged in to link your user to your Facebook account."
 msgstr ""
 
-#: lib/Jifty/Action.pm:865
+#: lib/Jifty/Action.pm:948
 msgid "You need to fill in this field"
 msgstr ""
 
@@ -654,32 +763,43 @@
 msgid "You said you wanted a pony. (Source %1)"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:69
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:45 lib/Jifty/Plugin/Authentication/Password/View.pm:96
 msgid "You're already logged in."
 msgstr ""
 
-#: lib/Jifty/Plugin/SkeletonApp/View.pm:34 share/web/templates/_elements/sidebar:7
+#: lib/Jifty/Plugin/SkeletonApp/View.pm:34 share/web/templates/_elements/sidebar:6
 msgid "You're not currently signed in."
 msgstr ""
 
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LinkFacebookUser.pm:72
+#. (Jifty->web->current_user->user_object->facebook_name)
+msgid "Your account has been successfully linked to your Facebook user %1!"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:38
 msgid "Your browser can remember your login for you"
 msgstr ""
 
+#: lib/Jifty/Plugin/Comment/Action/CreateComment.pm:268
+msgid "Your comment has been added. If it does not immediately appear, it may have been flagged for moderation and should appear shortly."
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:87
 msgid "Your password has been reset.  Welcome back."
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:28
+#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:63
 msgid "Your password should be at least six characters"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:246
-msgid "asc"
+#: lib/Jifty/Plugin/Comment/Notification/CommentNeedsModeration.pm:67
+#. ($appname, $comment->title)
+msgid "[%1] Moderate comment: %2"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:264
-msgid "desc"
+#: lib/Jifty/Plugin/Comment/Notification/CommentPublished.pm:65
+#. ($appname, $comment->title)
+msgid "[%1] New comment: %2"
 msgstr ""
 
 #: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:31
@@ -690,6 +810,19 @@
 msgid "for now, and try to forget that we let you down."
 msgstr ""
 
+#: lib/Jifty/Plugin/Comment/View.pm:87
+#. ($status)
+msgid "mark as %1"
+msgstr ""
+
+#: lib/Jifty/Action/Record.pm:444
+msgid "no value"
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/View.pm:100
+msgid "publish"
+msgstr ""
+
 #: lib/Jifty/Manual/PageRegions.pod:188
 msgid "text of the link"
 msgstr ""
@@ -702,6 +835,10 @@
 msgid "type your password again"
 msgstr ""
 
-#: lib/Jifty/Action.pm:1050
+#: lib/Jifty/Plugin/Comment/View.pm:100
+msgid "unpublish"
+msgstr ""
+
+#: lib/Jifty/Action.pm:1174
 msgid "warning"
 msgstr ""

Modified: jifty/trunk/share/po/fr.po
==============================================================================
--- jifty/trunk/share/po/fr.po	(original)
+++ jifty/trunk/share/po/fr.po	Thu Sep  4 06:42:06 2008
@@ -15,6 +15,29 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lib/Jifty/Plugin/Comment/Notification/CommentPublished.pm:71
+#. ($url,        $self->parent->title,        $comment->title,         $from,         $comment->created_on->strftime('%A, %B %d, %Y @ %H:%M%P')
+msgid ""
+"\n"
+"View Comment: %1\n"
+"\n"
+"On Post: %2\n"
+"Subject: %3\n"
+"From: %4\n"
+"Date: %5\n"
+"\n"
+"%6\n"
+msgstr ""
+"\n"
+"Commentaire: %1\n"
+"\n"
+"A propos de: %2\n"
+"Sujet: %3\n"
+"Par: %4\n"
+"Sujet: %5\n"
+"\n"
+"%6\n"
+
 #: lib/Jifty/Plugin/Authentication/Password/Notification/ConfirmLostPassword.pm:38
 #. ($appname,$confirm_url)
 msgid ""
@@ -136,7 +159,7 @@
 msgid "%1 line %2"
 msgstr "%1 ligne %2"
 
-#: share/web/templates/__jifty/halo:119
+#: lib/Jifty/Plugin/SQLQueries.pm:186 share/web/templates/__jifty/halo:122
 #. ($_->[3])
 msgid "%1 seconds"
 msgstr "%1 secondes"
@@ -172,19 +195,23 @@
 msgid "A notification from %1!"
 msgstr "Message de %1 !"
 
-#: lib/Jifty/Plugin/SkeletonApp/Dispatcher.pm:33
+#: lib/Jifty/Plugin/Comment/View.pm:165
+msgid "Add a comment"
+msgstr "Ajouter un commentaire"
+
+#: lib/Jifty/Plugin/AdminUI/Dispatcher.pm:34
 msgid "Administration"
 msgstr ""
 
-#: lib/Jifty/View/Declare/Page.pm:176 share/web/templates/_elements/wrapper:11
+#: lib/Jifty/View/Declare/Page.pm:180 share/web/templates/_elements/wrapper:11
 msgid "Administration mode is enabled."
 msgstr "Mode d'administration activé."
 
-#: lib/Jifty/View/Declare/Page.pm:173 share/web/templates/_elements/wrapper:11
+#: lib/Jifty/View/Declare/Page.pm:177 share/web/templates/_elements/wrapper:11
 msgid "Alert"
 msgstr "Alerte"
 
-#: lib/Jifty/Action/Record/Create.pm:92
+#: lib/Jifty/Action/Record/Create.pm:105
 msgid "An error occurred.  Try again later"
 msgstr "Erreur. Ré-essayez plus tard"
 
@@ -196,7 +223,7 @@
 msgid "Anyway, the software has logged this error."
 msgstr "Cette erreur a été enregistrée par le logiciel."
 
-#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:53
+#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:54
 msgid "Authentication token"
 msgstr "Token d'authentification"
 
@@ -208,20 +235,26 @@
 msgid "Back to the application"
 msgstr "Retour à l'application"
 
-#: share/web/templates/__jifty/halo:117
+#: lib/Jifty/Plugin/SQLQueries.pm:175 share/web/templates/__jifty/halo:120
 msgid "Bindings"
 msgstr ""
 
+#: lib/Jifty/Plugin/Comment/View.pm:138 lib/Jifty/Plugin/Comment/View.pm:197
+#. ($poster,                     $created_on->strftime('%A, %B %d, %Y @ %H:%M%P')
+#. ($poster,                             $created_on->strftime('%A, %B %d, %Y @ %H:%M%P')
+msgid "By %1 %2"
+msgstr "Par %1 %2"
+
 #: share/web/templates/helpers/calendar.html:4
 #. (_ &><body class="calpopup"><a href="#" onclick="window.close()
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: lib/Jifty/View/Declare/CRUD.pm:419
+#: lib/Jifty/View/Declare/CRUD.pm:434
 msgid "Cancel"
 msgstr "Annuler"
 
-#: share/web/templates/__jifty/halo:81
+#: share/web/templates/__jifty/halo:84
 msgid "Children"
 msgstr ""
 
@@ -231,7 +264,7 @@
 
 #:
 msgid "Confirm delete?"
-msgstr "Confirmer la suppresion ?"
+msgstr "Confirmer la suppression ?"
 
 #: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:94
 msgid "Confirmation resent."
@@ -241,16 +274,16 @@
 msgid "Continue"
 msgstr "Continuer"
 
-#: lib/Jifty/View/Declare/.CRUD.pm.swp:17 lib/Jifty/View/Declare/CRUD.pm:675
+#: lib/Jifty/View/Declare/CRUD.pm:723
 msgid "Create"
 msgstr "Enregistrer"
 
-#: lib/Jifty/Action/Record/Create.pm:91
+#: lib/Jifty/Action/Record/Create.pm:104
 #. (ref($record)
 msgid "Create of %1 failed: %2"
 msgstr "La création de %1 a échoué : %2"
 
-#: lib/Jifty/Action/Record/Create.pm:118
+#: lib/Jifty/Action/Record/Create.pm:131
 msgid "Created"
 msgstr "Création réussie"
 
@@ -258,7 +291,7 @@
 msgid "Database Administration"
 msgstr "Administration de la Base de Données"
 
-#: lib/Jifty/View/Declare/CRUD.pm:429
+#: lib/Jifty/View/Declare/CRUD.pm:444
 msgid "Delete"
 msgstr "Effacer"
 
@@ -270,12 +303,15 @@
 msgid "Done?"
 msgstr "Fini ?"
 
-#: lib/Jifty/View/Declare/CRUD.pm:349 share/web/templates/__jifty/halo:126 share/web/templates/__jifty/halo:20
+#: share/web/templates/__jifty/halo:2
+msgid "Draw halos"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:366 share/web/templates/__jifty/halo:129 share/web/templates/__jifty/halo:23
 msgid "Edit"
 msgstr "Editer"
 
-#: lib/Jifty/Mason/Halo.pm:104
-#. ($comp_name)
+#:
 msgid "Edit %1"
 msgstr "Editer %1"
 
@@ -291,15 +327,15 @@
 msgid "Email address confirmed?"
 msgstr "Adresse mail confirmée ?"
 
-#: lib/Jifty/Action.pm:1312
+#: lib/Jifty/Action.pm:1309
 msgid "Foo cannot contain -, *, +, or ?."
 msgstr "Cette donnée ne doit pas contenir -, *, +, ou ?."
 
-#: lib/Jifty/Action.pm:1306
+#: lib/Jifty/Action.pm:1303
 msgid "Foo cannot contain uppercase letters."
 msgstr "Cette donnée ne doit pas contenir de majuscule."
 
-#: lib/Jifty/Action.pm:1285
+#: lib/Jifty/Action.pm:1282
 msgid "Foo values are always in lowercase."
 msgstr "Cette donnée doit toujours être en minuscule."
 
@@ -328,15 +364,16 @@
 msgid "Hello, %1!"
 msgstr "Bonjour, %1"
 
-#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:147
 #. (Jifty->web->current_user->user_object->facebook_name)
+#. (Jifty->web->current_user->user_object->name)
 msgid "Hi %1!"
 msgstr "Bonjour %1"
 
 #: lib/Jifty/Plugin/I18N/Action/SetLang.pm:44
 #. (DateTime::Locale->load($lang)
 msgid "Hi, we speak %1."
-msgstr "Bonjour, langue disponible : %1."
+msgstr "Bonjour, langue utilisée : %1."
 
 #: lib/Jifty/Plugin/SkeletonApp/View.pm:31 share/web/templates/_elements/sidebar:4
 #. ($u->username)
@@ -344,7 +381,7 @@
 msgid "Hiya, %1."
 msgstr "Bonjour, %1"
 
-#: lib/Jifty/Plugin/SkeletonApp/Dispatcher.pm:26
+#: lib/Jifty/Plugin/SkeletonApp/Dispatcher.pm:31
 msgid "Home"
 msgstr "Accueil"
 
@@ -352,35 +389,35 @@
 msgid "How should I display your name to other users?"
 msgstr "Nom affiché"
 
-#: lib/Jifty/Action.pm:1212
+#: lib/Jifty/Action.pm:1214
 msgid "I changed $field for you"
 msgstr "$field a été changé"
 
 #: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:64
 msgid "I'm not sure how this happened."
-msgstr ""
+msgstr "Problème non identifié."
 
 #: lib/Jifty/Plugin/OpenID/View.pm:59
 msgid "If the username provided conflicts with an existing username or contains invalid characters, you will have to give us a new one."
 msgstr "Si ce nom d'utilisateur entre en conflit avec un nom existant ou contient des caractères non autorisés, vous devrez le changer."
 
-#: lib/Jifty/Plugin/ErrorTemplates/View.pm:62
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:64
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: lib/Jifty/Plugin/OpenID/Action/AuthenticateOpenID.pm:59
+#: lib/Jifty/Plugin/OpenID/Action/AuthenticateOpenID.pm:53
 msgid "Invalid OpenID URL.  Please check to make sure it is correct.  (@{[$csr->err]})"
 msgstr "URL OpenID incorrecte. Vérifiez la. (@{[$csr->err]}) "
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:63 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:62 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
 msgid "It doesn't look like there's an account by that name."
 msgstr "Il ne semble pas y avoir de compte sous ce nom."
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:106
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:107
 msgid "It looks like somebody else is using that address. Is there a chance you have another account?"
 msgstr "Cette adresse semble utilisée par quelqu'un d'autre. Vous avez peut-être un autre compte ?"
 
-#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:43
+#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:45
 msgid "It looks like someone is already using that OpenID."
 msgstr "Cette URL OpenID est déjà utilisée par un autre utilisateur."
 
@@ -400,11 +437,11 @@
 msgid "Language"
 msgstr "Langue"
 
-#: lib/Jifty/View/Declare/Page.pm:194 share/web/templates/_elements/wrapper:18
+#: lib/Jifty/View/Declare/Page.pm:198 share/web/templates/_elements/wrapper:18
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23 lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132
 msgid "Login"
 msgstr "Identification"
 
@@ -420,17 +457,25 @@
 msgid "Login with a password"
 msgstr "S'identifier avec un mot de passe"
 
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:28
+msgid "Login with your Ldap account"
+msgstr "S'identifier avec votre compte Ldap"
+
 #: lib/Jifty/Plugin/OpenID/View.pm:17
 msgid "Login with your OpenID"
 msgstr "S'identifier avec votre OpenID"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:57
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:35
+msgid "Login with your ldap account"
+msgstr "S'identifier avec votre compte Ldap"
+
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:22 lib/Jifty/Plugin/Authentication/Password/View.pm:57
 msgid "Login!"
 msgstr "Identification"
 
 #: lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:151
 msgid "Logout"
-msgstr "Déconnection"
+msgstr "Déconnexion"
 
 #: lib/Jifty/Plugin/Authentication/Password/View.pm:90
 msgid "Lost your password?"
@@ -444,11 +489,11 @@
 msgid "Models"
 msgstr "Modèles"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:114
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:115
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: lib/Jifty/View/Declare/CRUD.pm:631
+#: lib/Jifty/View/Declare/CRUD.pm:654
 msgid "Next Page"
 msgstr "Page Suivante"
 
@@ -468,11 +513,15 @@
 msgid "No items found"
 msgstr "Aucun enregistrement"
 
-#: lib/Jifty/View/Declare/CRUD.pm:550
+#: lib/Jifty/View/Declare/CRUD.pm:569
 msgid "No items found."
 msgstr "Aucun enregistrement."
 
-#: lib/Jifty/Web.pm:308
+#: lib/Jifty/Plugin/Comment/View.pm:304
+msgid "No one has made a comment yet."
+msgstr "Aucun commentaire pour l'instant."
+
+#: lib/Jifty/Web.pm:306
 msgid "No request to handle"
 msgstr "Aucune requête à traiter"
 
@@ -492,36 +541,36 @@
 msgid "OpenID URL"
 msgstr "URL OpenID"
 
-#: lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm:54
+#: lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm:48
 msgid "OpenID verification failed.  It looks like you cancelled the OpenID verification request."
-msgstr "Echec de la vérification OpenID. Il semblerait que vous avez annulé votre demande de vérification."
+msgstr "Échec de la vérification OpenID. Il semblerait que vous avez annulé votre demande de vérification."
 
-#: lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm:63
+#: lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm:57
 msgid "OpenID verification failed: "
-msgstr "Echec de la vérification OpenID: "
+msgstr "Échec de la vérification OpenID: "
 
-#: lib/Jifty/View/Declare/CRUD.pm:598
+#: lib/Jifty/View/Declare/CRUD.pm:621
 #. ($page, $collection->pager->last_page)
 msgid "Page %1 of %2"
 msgstr "Page %1 / %2"
 
-#: share/web/templates/__jifty/halo:1
+#: share/web/templates/__jifty/halo:3
 msgid "Page info"
 msgstr ""
 
-#: share/web/templates/__jifty/halo:72
+#: share/web/templates/__jifty/halo:75
 msgid "Parent"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:29 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:59
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:29 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:60
 msgid "Password"
 msgstr "Mot de passe"
 
-#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:134
+#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:136
 msgid "Passwords need to be at least six characters long"
 msgstr "Il faut au minimum six caractères"
 
-#: lib/Jifty/Record.pm:505 lib/Jifty/Record.pm:550 lib/Jifty/Record.pm:70
+#: lib/Jifty/Action/Record/Delete.pm:61 lib/Jifty/Action/Record/Update.pm:180 lib/Jifty/Action/Record/Update.pm:187 lib/Jifty/Record.pm:508 lib/Jifty/Record.pm:567 lib/Jifty/Record.pm:70
 msgid "Permission denied"
 msgstr "Autorisation refusée"
 
@@ -529,11 +578,15 @@
 msgid "Please email us!"
 msgstr "Envoyez nous un mail !"
 
-#: lib/Jifty/View/Declare/CRUD.pm:620
+#: lib/Jifty/Plugin/Comment/View.pm:221
+msgid "Preview"
+msgstr "Aperçu"
+
+#: lib/Jifty/View/Declare/CRUD.pm:643
 msgid "Previous Page"
 msgstr "Page précédente"
 
-#: lib/Jifty/View/Declare/CRUD.pm:432
+#: lib/Jifty/View/Declare/CRUD.pm:447
 msgid "Really delete?"
 msgstr "Confirmer l'effacement ?"
 
@@ -549,12 +602,12 @@
 msgid "Remember me?"
 msgstr "S'en rappeler"
 
-#: share/web/templates/__jifty/halo:69
+#: share/web/templates/__jifty/halo:72
 #. ($frame->{'render_time'})
 msgid "Rendered in %1s"
 msgstr ""
 
-#:
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:108 lib/Jifty/Plugin/Authentication/Password/View.pm:112
 msgid "Reset lost password"
 msgstr "Changement de mot de passe"
 
@@ -562,11 +615,11 @@
 msgid "Run the action"
 msgstr "Exécuter l'action"
 
-#: share/web/templates/__jifty/halo:111
+#: share/web/templates/__jifty/halo:114
 msgid "SQL Statements"
 msgstr ""
 
-#: lib/Jifty/View/Declare/CRUD.pm:410
+#: lib/Jifty/View/Declare/CRUD.pm:425
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -574,22 +627,18 @@
 msgid "Schema"
 msgstr "Schéma"
 
-#: lib/Jifty/View/Declare/CRUD.pm:298
+#: lib/Jifty/View/Declare/CRUD.pm:314
 msgid "Search"
 msgstr "Chercher"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:180
+#:
 msgid "Send"
 msgstr "Enregistrer"
 
-#:
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:147
 msgid "Send a link to reset your password"
 msgstr "Recevoir un lien pour changer votre mot de passe"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:175
-msgid "Send a password reminder"
-msgstr ""
-
 #: lib/Jifty/Plugin/Feedback/View.pm:21
 msgid "Send us feedback!"
 msgstr "Envoyez nous votre avis !"
@@ -615,7 +664,7 @@
 msgid "Something went awry"
 msgstr "Problème"
 
-#: lib/Jifty/Plugin/ErrorTemplates/View.pm:124 share/web/templates/dhandler:1
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:125 share/web/templates/dhandler:1
 msgid "Something's not quite right"
 msgstr "Problème"
 
@@ -623,10 +672,18 @@
 msgid "Sorry about this."
 msgstr "Désolé."
 
-#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:115
 msgid "Sorry, something weird happened (we couldn't create a user for you).  Try again later."
 msgstr "Désolé, un problème nous empêche de créer cet utilisateur. Ré-essayer plus tard."
 
+#: lib/Jifty/Action/Record/Execute.pm:55
+msgid "Start"
+msgstr "Démarrer"
+
+#: lib/Jifty/Plugin/Comment/View.pm:236
+msgid "Submit"
+msgstr "Soumettre"
+
 #:
 msgid "Table of Contents"
 msgstr "Table des matières"
@@ -636,32 +693,40 @@
 msgid "Tell us what's good, what's bad, and what else you want %1 to do!"
 msgstr "Dites nous ce qui vous plaît, vous déplaît, ou tout autre avis %1"
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:99
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:100
 #. ($new_email)
 msgid "That %1 doesn't look like an email address."
 msgstr "%1 ne ressemble pas à une adresse mail."
 
-#: lib/Jifty/Action.pm:975
+#: lib/Jifty/Action.pm:1056
 msgid "That doesn't look like a correct value"
-msgstr "Valeur incorecte"
+msgstr "Valeur incorrecte"
+
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46
+msgid "That doesn't look like a valid login."
+msgstr "Ce compte ne semble pas valide."
+
+#: plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:47
+msgid "That doesn't look like a valid ticket."
+msgstr ""
 
 #: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:68 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:72 lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:70
 msgid "That doesn't look like an email address."
 msgstr "Cela ne ressemble pas à une adresse mail."
 
-#: lib/Jifty/Action/Record.pm:304
+#: lib/Jifty/Action/Record.pm:351
 msgid "That doesn't look right, but I don't know why"
 msgstr "Problème"
 
-#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:48
+#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:50
 msgid "The OpenID '$openid' has been linked to your account."
 msgstr "L'openID '$openid' a été attaché à votre compte."
 
-#: lib/Jifty/Action/Record.pm:205
+#: lib/Jifty/Action/Record.pm:219
 msgid "The passwords you typed didn't match each other"
 msgstr "Les mots de passe tapés ne sont pas identiques"
 
-#: lib/Jifty/Web.pm:429
+#: lib/Jifty/Web.pm:427
 msgid "There was an error completing the request.  Please try again later."
 msgstr "Problème lors de l'exécution de cette requête. Ré-essayez plus tard."
 
@@ -675,17 +740,17 @@
 
 #:
 msgid "This console lets you manage the records in your Jifty database. Below, you should see a list of all your database tables. Feel free to go through and add, delete or modify records."
-msgstr "Cette page vous permet de gérer vos enregistrements dans la base. Vous trouverez ci-dessous la listes des tables. Vous pouvez ajouter, effacer ou modifier les enregistements."
+msgstr "Cette page vous permet de gérer vos enregistrements dans la base. Vous trouverez ci-dessous la listes des tables. Vous pouvez ajouter, effacer ou modifier les enregistrements."
 
 #:
 msgid "To disable this administrative console, add \"AdminMode: 0\" under the \"framework:\" settings in the config file (etc/config.yml)."
 msgstr "Pour désactiver cette console d'administration, ajoutez \"AdminMode: 0\" dans la rubrique \"framework:\" du fichier de configuration (etc/config.yml)."
 
-#: lib/Jifty/View/Declare/CRUD.pm:518
+#: lib/Jifty/View/Declare/CRUD.pm:533
 msgid "Toggle search"
 msgstr "Rechercher"
 
-#: lib/Jifty/Plugin/ErrorTemplates/View.pm:173 share/web/templates/__jifty/error/mason_internal_error:6
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:175 share/web/templates/__jifty/error/mason_internal_error:6
 msgid "Try again"
 msgstr "Ré-essayer"
 
@@ -697,15 +762,15 @@
 msgid "Type that again?"
 msgstr "Confirmez"
 
-#: lib/Jifty/Action/Record/Update.pm:170
+#: lib/Jifty/Action/Record/Update.pm:214
 msgid "Updated"
-msgstr "Modification"
+msgstr "Modification enregistrée"
 
-#: share/web/templates/__jifty/halo:93
+#: share/web/templates/__jifty/halo:96
 msgid "Variables"
 msgstr ""
 
-#: lib/Jifty.pm:27
+#: lib/Jifty.pm:29
 msgid "W00t"
 msgstr ""
 
@@ -722,11 +787,11 @@
 msgid "Welcome %1 to the %2"
 msgstr "Bienvenue %1 sur %2"
 
-#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:64
+#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:66
 msgid "Welcome back, "
 msgstr "Re-bonjour, "
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:182
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:194
 #. ($user->name)
 msgid "Welcome back, %1."
 msgstr "Re-bonjour, %1."
@@ -749,7 +814,7 @@
 msgid "Welcome to your new Jifty application"
 msgstr "Bienvenue sur votre nouvelle application Jifty"
 
-#: lib/Jifty/Plugin/OpenID/Action/CreateOpenIDUser.pm:104
+#: lib/Jifty/Plugin/OpenID/Action/CreateOpenIDUser.pm:94
 msgid "Welcome, "
 msgstr "Bienvenue, "
 
@@ -773,11 +838,11 @@
 msgid "You have already confirmed your account."
 msgstr "Votre compte à déjà été confirmé."
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:146
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:148
 msgid "You lost your password. A link to reset it will be sent to the following email address:"
 msgstr "Vous avez perdu votre mot de passe. Un lien pour changer ce mot de passe sera envoyé à l'adresse suivante :"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:176
+#:
 msgid "You lost your password. A reminder will be send to the following mail:"
 msgstr "Vous avez perdu votre mot de passe. Un lien pour changer ce mot de passe sera envoyé à l'adresse suivante :"
 
@@ -785,15 +850,19 @@
 msgid "You may have mistyped your email address or password. Give it another shot."
 msgstr "Vous vous êtes trompé dans votre mail ou votre mot de passe. Ré-essayez."
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:146 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:152
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:138
 msgid "You may have mistyped your email or password. Give it another shot."
 msgstr "Vous vous êtes trompé dans votre mail ou votre mot de passe. Ré-essayez."
 
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77
+msgid "You may have mistyped your login or password. Give it another shot?"
+msgstr "Vous vous êtes trompé dans votre compte ou votre mot de passe. Ré-essayez."
+
 #: lib/Jifty/Plugin/Authentication/Facebook/Action/LinkFacebookUser.pm:40
 msgid "You must be logged in to link your user to your Facebook account."
 msgstr "Vous devez être connecté pour lier votre compte d'utilisateur à votre compte Facebook."
 
-#: lib/Jifty/Action.pm:962
+#: lib/Jifty/Action.pm:948
 msgid "You need to fill in this field"
 msgstr "Information obligatoire"
 
@@ -802,7 +871,7 @@
 msgid "You said you wanted a pony. (Source %1)"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:96
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:45 lib/Jifty/Plugin/Authentication/Password/View.pm:96
 msgid "You're already logged in."
 msgstr "Vous êtes déjà connecté."
 
@@ -819,14 +888,28 @@
 msgid "Your browser can remember your login for you"
 msgstr "Votre navigateur peut mémoriser cette identification"
 
+#: lib/Jifty/Plugin/Comment/Action/CreateComment.pm:268
+msgid "Your comment has been added. If it does not immediately appear, it may have been flagged for moderation and should appear shortly."
+msgstr "Votre commentaire a été ajouté. S'il n'apparaît pas immédiatement, c'est qu'il est en attente de modération."
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:87
 msgid "Your password has been reset.  Welcome back."
 msgstr "Votre mot de passe à été changé."
 
-#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:61
+#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:63
 msgid "Your password should be at least six characters"
 msgstr "Votre mot de passe doit contenir au moins six caractères"
 
+#: lib/Jifty/Plugin/Comment/Notification/CommentNeedsModeration.pm:67
+#. ($appname, $comment->title)
+msgid "[%1] Moderate comment: %2"
+msgstr "[%1] Commentaire modéré : %2"
+
+#: lib/Jifty/Plugin/Comment/Notification/CommentPublished.pm:65
+#. ($appname, $comment->title)
+msgid "[%1] New comment: %2"
+msgstr "[%1] Nouveau commentaire : %2"
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:31
 msgid "email address"
 msgstr "adresse mail"
@@ -835,10 +918,19 @@
 msgid "for now, and try to forget that we let you down."
 msgstr ""
 
-#: lib/Jifty/Action/Record.pm:253
+#: lib/Jifty/Plugin/Comment/View.pm:87
+#. ($status)
+msgid "mark as %1"
+msgstr "marqué comme %1"
+
+#: lib/Jifty/Action/Record.pm:444
 msgid "no value"
 msgstr ""
 
+#: lib/Jifty/Plugin/Comment/View.pm:100
+msgid "publish"
+msgstr "publier"
+
 #: lib/Jifty/Manual/PageRegions.pod:188
 msgid "text of the link"
 msgstr ""
@@ -851,6 +943,10 @@
 msgid "type your password again"
 msgstr "confirmez votre mot de passe"
 
-#: lib/Jifty/Action.pm:1172
+#: lib/Jifty/Plugin/Comment/View.pm:100
+msgid "unpublish"
+msgstr "ne pas publier"
+
+#: lib/Jifty/Action.pm:1174
 msgid "warning"
-msgstr ""
+msgstr "attention"

Modified: jifty/trunk/share/po/ja.po
==============================================================================
--- jifty/trunk/share/po/ja.po	(original)
+++ jifty/trunk/share/po/ja.po	Thu Sep  4 06:42:06 2008
@@ -837,3 +837,831 @@
 #: lib/Jifty/Action.pm:1172
 msgid "warning"
 msgstr "警告"
+
+#: lib/Jifty/Plugin/Comment/Notification/CommentPublished.pm:71
+#. ($url,        $self->parent->title,        $comment->title,         $from,         $comment->created_on->strftime('%A, %B %d, %Y @ %H:%M%P')
+msgid ""
+"\n"
+"View Comment: %1\n"
+"\n"
+"On Post: %2\n"
+"Subject: %3\n"
+"From: %4\n"
+"Date: %5\n"
+"\n"
+"%6\n"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Notification/ConfirmLostPassword.pm:38
+#. ($appname,$confirm_url)
+msgid ""
+"\n"
+"You're getting this message because you (or somebody claiming to be you)\n"
+"request to reset your password for %1.\n"
+"\n"
+"If you don't want to reset your password just ignore this message.\n"
+"\n"
+"To reset your password, click on the link below:\n"
+"\n"
+"%2\n"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Notification/ConfirmEmail.pm:41
+#. ($appname,$confirm_url)
+msgid ""
+"\n"
+"You're getting this message because you (or somebody claiming to be you)\n"
+"wants to use %1. \n"
+"\n"
+"We need to make sure that we got your email address right.  Click on the link below to get started:\n"
+"\n"
+"%2\n"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Facebook/View.pm:43
+msgid ""
+" id is 'facebook_link' };\n"
+"        span { _(\"Login to Facebook now to link it with your current account!\") };\n"
+"        a {{ href is $plugin->get_link_url };\n"
+"            img {{ src is 'http://static.ak.facebook.com/images/devsite/facebook_login.gif', border is '0' "
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Facebook/View.pm:26
+msgid ""
+" id is 'facebook_login' };\n"
+"        span { _(\"Login to Facebook now to get started!\") };\n"
+"        a {{ href is $plugin->get_login_url };\n"
+"            img {{ src is 'http://static.ak.facebook.com/images/devsite/facebook_login.gif', border is '0' "
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:172
+msgid "!=>< allowed"
+msgstr ""
+
+#: lib/Jifty/Notification.pm:108 lib/Jifty/Notification.pm:125
+#. ($appname, Jifty->config->framework('AdminEmail')
+msgid "%1 <%2>"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:143
+#. ($label)
+msgid "%1 after"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:146
+#. ($label)
+msgid "%1 before"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:133
+#. ($label)
+msgid "%1 contains"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:166
+#. ($label)
+msgid "%1 greater or equal to"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:160
+#. ($label)
+msgid "%1 greater than"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:121
+#. ($label)
+msgid "%1 is not"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:136
+#. ($label)
+msgid "%1 lacks"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:169
+#. ($label)
+msgid "%1 less or equal to"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:163
+#. ($label)
+msgid "%1 less than"
+msgstr ""
+
+#: share/web/templates/__jifty/error/mason_internal_error:31 share/web/templates/__jifty/error/mason_internal_error:35 share/web/templates/__jifty/error/mason_internal_error:39
+#. ($path, $line)
+#. ($file, $line)
+msgid "%1 line %2"
+msgstr ""
+
+#: lib/Jifty/Plugin/SQLQueries.pm:186 share/web/templates/__jifty/halo:122
+#. ($_->[3])
+msgid "%1 seconds"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:149
+#. ($label)
+msgid "%1 since"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:152
+#. ($label)
+msgid "%1 until"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:81
+msgid "(any)"
+msgstr ""
+
+#: lib/Jifty/Plugin/AutoReference.pm:95
+msgid "- none -"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/ConfirmEmail.pm:58
+msgid ". Your email address has now been confirmed."
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:96
+msgid "A link to reset your password has been sent to your email account."
+msgstr ""
+
+#: lib/Jifty/Notification.pm:110 lib/Jifty/Notification.pm:127
+#. ($appname)
+msgid "A notification from %1!"
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/View.pm:165
+msgid "Add a comment"
+msgstr ""
+
+#: lib/Jifty/Plugin/AdminUI/Dispatcher.pm:34
+msgid "Administration"
+msgstr ""
+
+#: lib/Jifty/View/Declare/Page.pm:180 share/web/templates/_elements/wrapper:11
+msgid "Administration mode is enabled."
+msgstr ""
+
+#: lib/Jifty/View/Declare/Page.pm:177 share/web/templates/_elements/wrapper:11
+msgid "Alert"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Create.pm:105
+msgid "An error occurred.  Try again later"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:177
+msgid "Any field contains"
+msgstr ""
+
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:131
+msgid "Anyway, the software has logged this error."
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:54
+msgid "Authentication token"
+msgstr ""
+
+#: lib/Jifty/Plugin/SQLQueries.pm:175 share/web/templates/__jifty/halo:120
+msgid "Bindings"
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/View.pm:138 lib/Jifty/Plugin/Comment/View.pm:197
+#. ($poster,                     $created_on->strftime('%A, %B %d, %Y @ %H:%M%P')
+#. ($poster,                             $created_on->strftime('%A, %B %d, %Y @ %H:%M%P')
+msgid "By %1 %2"
+msgstr ""
+
+#: share/web/templates/helpers/calendar.html:4
+#. (_ &><body class="calpopup"><a href="#" onclick="window.close()
+msgid "Calendar"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:434
+msgid "Cancel"
+msgstr ""
+
+#: share/web/templates/__jifty/halo:84
+msgid "Children"
+msgstr ""
+
+#: share/web/templates/helpers/calendar.html:4
+msgid "Close window"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:94
+msgid "Confirmation resent."
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/View.pm:65
+msgid "Continue"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:723
+msgid "Create"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Create.pm:104
+#. (ref($record)
+msgid "Create of %1 failed: %2"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Create.pm:131
+msgid "Created"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:444
+msgid "Delete"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Delete.pm:82
+msgid "Deleted"
+msgstr ""
+
+#: share/web/templates/__jifty/halo:2
+msgid "Draw halos"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:366 share/web/templates/__jifty/halo:129 share/web/templates/__jifty/halo:23
+msgid "Edit"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:23 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:32
+msgid "Email"
+msgstr ""
+
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:52
+msgid "Email address"
+msgstr ""
+
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:54
+msgid "Email address confirmed?"
+msgstr ""
+
+#: lib/Jifty/Action.pm:1309
+msgid "Foo cannot contain -, *, +, or ?."
+msgstr ""
+
+#: lib/Jifty/Action.pm:1303
+msgid "Foo cannot contain uppercase letters."
+msgstr ""
+
+#: lib/Jifty/Action.pm:1282
+msgid "Foo values are always in lowercase."
+msgstr ""
+
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:27
+msgid "For one reason or another, you got to a web page that caused a bit of an error. And then you got to our 'basic' error handler. Which means we haven't written a pretty, easy to understand error message for you just yet. The message we do have is :"
+msgstr ""
+
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:138 share/web/templates/dhandler:7
+msgid "Go back home..."
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/View.pm:35
+msgid "Go for it!"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:34
+msgid "Hashed Password"
+msgstr ""
+
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:44
+msgid "Head on back home"
+msgstr ""
+
+#: lib/Jifty/I18N.pm:19 lib/Jifty/I18N.pm:23
+#. ('World')
+msgid "Hello, %1!"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:147
+#. (Jifty->web->current_user->user_object->facebook_name)
+#. (Jifty->web->current_user->user_object->name)
+msgid "Hi %1!"
+msgstr ""
+
+#: lib/Jifty/Plugin/I18N/Action/SetLang.pm:44
+#. (DateTime::Locale->load($lang)
+msgid "Hi, we speak %1."
+msgstr ""
+
+#: lib/Jifty/Plugin/SkeletonApp/View.pm:31 share/web/templates/_elements/sidebar:4
+#. ($u->username)
+#. (Jifty->web->current_user->username)
+msgid "Hiya, %1."
+msgstr ""
+
+#: lib/Jifty/Plugin/SkeletonApp/Dispatcher.pm:31
+msgid "Home"
+msgstr ""
+
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:49
+msgid "How should I display your name to other users?"
+msgstr ""
+
+#: lib/Jifty/Action.pm:1214
+msgid "I changed $field for you"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:64
+msgid "I'm not sure how this happened."
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/View.pm:59
+msgid "If the username provided conflicts with an existing username or contains invalid characters, you will have to give us a new one."
+msgstr ""
+
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:64
+msgid "Internal error"
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/Action/AuthenticateOpenID.pm:53
+msgid "Invalid OpenID URL.  Please check to make sure it is correct.  (@{[$csr->err]})"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:62 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
+msgid "It doesn't look like there's an account by that name."
+msgstr ""
+
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:107
+msgid "It looks like somebody else is using that address. Is there a chance you have another account?"
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:45
+msgid "It looks like someone is already using that OpenID."
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:75
+msgid "It looks like you already have an account. Perhaps you want to <a href=\"/login\">log in</a> instead?"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:75
+msgid "It looks like you didn't enter the same password into both boxes. Give it another shot?"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:79
+msgid "It looks like you're already confirmed."
+msgstr ""
+
+#: lib/Jifty/Plugin/I18N/Action/SetLang.pm:12
+msgid "Language"
+msgstr ""
+
+#: lib/Jifty/View/Declare/Page.pm:198 share/web/templates/_elements/wrapper:18
+msgid "Loading..."
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23 lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132
+msgid "Login"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Facebook/View.pm:24
+msgid "Login to Facebook now to get started!"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Facebook/View.pm:41
+msgid "Login to Facebook now to link it with your current account!"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:82
+msgid "Login with a password"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:28
+msgid "Login with your Ldap account"
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/View.pm:17
+msgid "Login with your OpenID"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:35
+msgid "Login with your ldap account"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:22 lib/Jifty/Plugin/Authentication/Password/View.pm:57
+msgid "Login!"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:151
+msgid "Logout"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:90
+msgid "Lost your password?"
+msgstr ""
+
+#: share/web/templates/__jifty/error/mason_internal_error:1
+msgid "Mason error"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:115
+msgid "New password"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:654
+msgid "Next Page"
+msgstr ""
+
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:48
+msgid "Nickname"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:79
+msgid "No account yet? It's quick and easy. "
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:178
+msgid "No field contains"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:569
+msgid "No items found."
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/View.pm:304
+msgid "No one has made a comment yet."
+msgstr ""
+
+#: lib/Jifty/Web.pm:306
+msgid "No request to handle"
+msgstr ""
+
+#: lib/Jifty/Plugin/UUID/Widget.pm:37
+msgid "No value yet"
+msgstr ""
+
+#: lib/Jifty/Plugin/OnlineDocs/Dispatcher.pm:26
+msgid "Online docs"
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/Action/AuthenticateOpenID.pm:27
+msgid "OpenID URL"
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm:48
+msgid "OpenID verification failed.  It looks like you cancelled the OpenID verification request."
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm:57
+msgid "OpenID verification failed: "
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:621
+#. ($page, $collection->pager->last_page)
+msgid "Page %1 of %2"
+msgstr ""
+
+#: share/web/templates/__jifty/halo:3
+msgid "Page info"
+msgstr ""
+
+#: share/web/templates/__jifty/halo:75
+msgid "Parent"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:29 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:60
+msgid "Password"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:136
+msgid "Passwords need to be at least six characters long"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Delete.pm:61 lib/Jifty/Action/Record/Update.pm:180 lib/Jifty/Action/Record/Update.pm:187 lib/Jifty/Record.pm:508 lib/Jifty/Record.pm:567 lib/Jifty/Record.pm:70
+msgid "Permission denied"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:66
+msgid "Please email us!"
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/View.pm:221
+msgid "Preview"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:643
+msgid "Previous Page"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:447
+msgid "Really delete?"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:65
+msgid "Really, really sorry."
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:37
+msgid "Remember me?"
+msgstr ""
+
+#: share/web/templates/__jifty/halo:72
+#. ($frame->{'render_time'})
+msgid "Rendered in %1s"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:108 lib/Jifty/Plugin/Authentication/Password/View.pm:112
+msgid "Reset lost password"
+msgstr ""
+
+#: share/web/templates/__jifty/halo:114
+msgid "SQL Statements"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:425
+msgid "Save"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:314
+msgid "Search"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:147
+msgid "Send a link to reset your password"
+msgstr ""
+
+#: lib/Jifty/Plugin/Feedback/View.pm:21
+msgid "Send us feedback!"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:137 lib/Jifty/Plugin/Authentication/Password/View.pm:42 lib/Jifty/Plugin/Authentication/Password/View.pm:47
+msgid "Sign up"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:80
+msgid "Sign up for an account!"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:108
+#. ($msg)
+msgid "Something bad happened and we couldn't create your account: %1"
+msgstr ""
+
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:149
+msgid "Something went awry"
+msgstr ""
+
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:125 share/web/templates/dhandler:1
+msgid "Something's not quite right"
+msgstr ""
+
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:132
+msgid "Sorry about this."
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:115
+msgid "Sorry, something weird happened (we couldn't create a user for you).  Try again later."
+msgstr ""
+
+#: lib/Jifty/Action/Record/Execute.pm:55
+msgid "Start"
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/View.pm:236
+msgid "Submit"
+msgstr ""
+
+#: lib/Jifty/Plugin/Feedback/View.pm:23
+#. (Jifty->config->framework('ApplicationName')
+msgid "Tell us what's good, what's bad, and what else you want %1 to do!"
+msgstr ""
+
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:100
+#. ($new_email)
+msgid "That %1 doesn't look like an email address."
+msgstr ""
+
+#: lib/Jifty/Action.pm:1056
+msgid "That doesn't look like a correct value"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46
+msgid "That doesn't look like a valid login."
+msgstr ""
+
+#: plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:47
+msgid "That doesn't look like a valid ticket."
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:68 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:72 lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:70
+msgid "That doesn't look like an email address."
+msgstr ""
+
+#: lib/Jifty/Action/Record.pm:351
+msgid "That doesn't look right, but I don't know why"
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:50
+msgid "The OpenID '$openid' has been linked to your account."
+msgstr ""
+
+#: lib/Jifty/Action/Record.pm:219
+msgid "The passwords you typed didn't match each other"
+msgstr ""
+
+#: lib/Jifty/Web.pm:427
+msgid "There was an error completing the request.  Please try again later."
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:81
+msgid "There was an error setting your password."
+msgstr ""
+
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:37
+msgid "There's a pretty good chance that error message doesn't mean anything to you, but we'd rather you have a little bit of information about what went wrong than nothing. We've logged this error, so we know we need to write something friendly explaining just what happened and how to fix it."
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:533
+msgid "Toggle search"
+msgstr ""
+
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:175 share/web/templates/__jifty/error/mason_internal_error:6
+msgid "Try again"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:108
+msgid "Try again later. We're really, really sorry."
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:53
+msgid "Type that again?"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Update.pm:214
+msgid "Updated"
+msgstr ""
+
+#: share/web/templates/__jifty/halo:96
+msgid "Variables"
+msgstr ""
+
+#: lib/Jifty.pm:29
+msgid "W00t"
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/View.pm:53
+msgid "We need you to set a username or quickly check the one associated with your OpenID. Your username is what other people will see when you ask questions or make suggestions"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:114
+msgid "We've sent a confirmation message to your email box."
+msgstr ""
+
+#: lib/Jifty/I18N.pm:31
+#. ('Bob', 'World')
+msgid "Welcome %1 to the %2"
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:66
+msgid "Welcome back, "
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:194
+#. ($user->name)
+msgid "Welcome back, %1."
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Notification/ConfirmEmail.pm:40
+#. ($appname)
+msgid "Welcome to %1!"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/ConfirmEmail.pm:57 lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:113
+#. (Jifty->config->framework('ApplicationName')
+msgid "Welcome to %1, %2."
+msgstr ""
+
+#: lib/Jifty/Plugin/SkeletonApp/View.pm:75 share/web/templates/index.html:1
+msgid "Welcome to your new Jifty application"
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/Action/CreateOpenIDUser.pm:94
+msgid "Welcome, "
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/View.pm:42
+msgid "You already logged in."
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:63
+msgid "You don't exist."
+msgstr ""
+
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:130
+msgid "You got to a page that we don't think exists."
+msgstr ""
+
+#: share/web/templates/dhandler:5
+msgid "You got to a page that we don't think exists.  Anyway, the software has logged this error. Sorry about this."
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/ConfirmEmail.pm:44
+msgid "You have already confirmed your account."
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:148
+msgid "You lost your password. A link to reset it will be sent to the following email address:"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:138
+msgid "You may have mistyped your email or password. Give it another shot."
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77
+msgid "You may have mistyped your login or password. Give it another shot?"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LinkFacebookUser.pm:40
+msgid "You must be logged in to link your user to your Facebook account."
+msgstr ""
+
+#: lib/Jifty/Action.pm:948
+msgid "You need to fill in this field"
+msgstr ""
+
+#: lib/Jifty/Plugin/SkeletonApp/View.pm:75 share/web/templates/index.html:3
+#. ('http://hdl.loc.gov/loc.pnp/cph.3c13461')
+msgid "You said you wanted a pony. (Source %1)"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:45 lib/Jifty/Plugin/Authentication/Password/View.pm:96
+msgid "You're already logged in."
+msgstr ""
+
+#: lib/Jifty/Plugin/SkeletonApp/View.pm:34 share/web/templates/_elements/sidebar:6
+msgid "You're not currently signed in."
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LinkFacebookUser.pm:72
+#. (Jifty->web->current_user->user_object->facebook_name)
+msgid "Your account has been successfully linked to your Facebook user %1!"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:38
+msgid "Your browser can remember your login for you"
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/Action/CreateComment.pm:268
+msgid "Your comment has been added. If it does not immediately appear, it may have been flagged for moderation and should appear shortly."
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:87
+msgid "Your password has been reset.  Welcome back."
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:63
+msgid "Your password should be at least six characters"
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/Notification/CommentNeedsModeration.pm:67
+#. ($appname, $comment->title)
+msgid "[%1] Moderate comment: %2"
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/Notification/CommentPublished.pm:65
+#. ($appname, $comment->title)
+msgid "[%1] New comment: %2"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:31
+msgid "email address"
+msgstr ""
+
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:46
+msgid "for now, and try to forget that we let you down."
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/View.pm:87
+#. ($status)
+msgid "mark as %1"
+msgstr ""
+
+#: lib/Jifty/Action/Record.pm:444
+msgid "no value"
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/View.pm:100
+msgid "publish"
+msgstr ""
+
+#: lib/Jifty/Manual/PageRegions.pod:188
+msgid "text of the link"
+msgstr ""
+
+#: lib/Jifty/Manual/PageRegions.pod:225
+msgid "text of the link that hides"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:37
+msgid "type your password again"
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/View.pm:100
+msgid "unpublish"
+msgstr ""
+
+#: lib/Jifty/Action.pm:1174
+msgid "warning"
+msgstr ""

Modified: jifty/trunk/share/po/ru.po
==============================================================================
--- jifty/trunk/share/po/ru.po	(original)
+++ jifty/trunk/share/po/ru.po	Thu Sep  4 06:42:06 2008
@@ -14,6 +14,20 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lib/Jifty/Plugin/Comment/Notification/CommentPublished.pm:71
+#. ($url,        $self->parent->title,        $comment->title,         $from,         $comment->created_on->strftime('%A, %B %d, %Y @ %H:%M%P')
+msgid ""
+"\n"
+"View Comment: %1\n"
+"\n"
+"On Post: %2\n"
+"Subject: %3\n"
+"From: %4\n"
+"Date: %5\n"
+"\n"
+"%6\n"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Notification/ConfirmLostPassword.pm:38
 #. ($appname,$confirm_url)
 msgid ""
@@ -40,56 +54,72 @@
 "%2\n"
 msgstr ""
 
-#: lib/Jifty/Action/Record/Search.pm:125
+#: lib/Jifty/Plugin/Authentication/Facebook/View.pm:43
+msgid ""
+" id is 'facebook_link' };\n"
+"        span { _(\"Login to Facebook now to link it with your current account!\") };\n"
+"        a {{ href is $plugin->get_link_url };\n"
+"            img {{ src is 'http://static.ak.facebook.com/images/devsite/facebook_login.gif', border is '0' "
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Facebook/View.pm:26
+msgid ""
+" id is 'facebook_login' };\n"
+"        span { _(\"Login to Facebook now to get started!\") };\n"
+"        a {{ href is $plugin->get_login_url };\n"
+"            img {{ src is 'http://static.ak.facebook.com/images/devsite/facebook_login.gif', border is '0' "
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:172
 msgid "!=>< allowed"
 msgstr "допустимы !=><"
 
-#: lib/Jifty/Notification.pm:94
+#: lib/Jifty/Notification.pm:108 lib/Jifty/Notification.pm:125
 #. ($appname, Jifty->config->framework('AdminEmail')
 msgid "%1 <%2>"
 msgstr ""
 
-#: lib/Jifty/Action/Record/Search.pm:115
+#: lib/Jifty/Action/Record/Search.pm:143
 #. ($label)
 msgid "%1 after"
 msgstr "%1 после"
 
-#: lib/Jifty/Action/Record/Search.pm:116
+#: lib/Jifty/Action/Record/Search.pm:146
 #. ($label)
 msgid "%1 before"
 msgstr "%1 до"
 
-#: lib/Jifty/Action/Record/Search.pm:112
+#: lib/Jifty/Action/Record/Search.pm:133
 #. ($label)
 msgid "%1 contains"
 msgstr "%1 содержит"
 
-#: lib/Jifty/Action/Record/Search.pm:123
+#: lib/Jifty/Action/Record/Search.pm:166
 #. ($label)
 msgid "%1 greater or equal to"
 msgstr "%1 больше или равно"
 
-#: lib/Jifty/Action/Record/Search.pm:121
+#: lib/Jifty/Action/Record/Search.pm:160
 #. ($label)
 msgid "%1 greater than"
 msgstr "%1 больше чем"
 
-#: lib/Jifty/Action/Record/Search.pm:108
+#: lib/Jifty/Action/Record/Search.pm:121
 #. ($label)
 msgid "%1 is not"
 msgstr "%1 не"
 
-#: lib/Jifty/Action/Record/Search.pm:113
+#: lib/Jifty/Action/Record/Search.pm:136
 #. ($label)
 msgid "%1 lacks"
 msgstr "%1 не содержит"
 
-#: lib/Jifty/Action/Record/Search.pm:124
+#: lib/Jifty/Action/Record/Search.pm:169
 #. ($label)
 msgid "%1 less or equal to"
 msgstr "%1 меньше или равно"
 
-#: lib/Jifty/Action/Record/Search.pm:122
+#: lib/Jifty/Action/Record/Search.pm:163
 #. ($label)
 msgid "%1 less than"
 msgstr "%1 меньше чем"
@@ -100,25 +130,29 @@
 msgid "%1 line %2"
 msgstr "%1 строка %2"
 
-#: share/web/templates/__jifty/halo:119
+#: lib/Jifty/Plugin/SQLQueries.pm:186 share/web/templates/__jifty/halo:122
 #. ($_->[3])
 msgid "%1 seconds"
 msgstr "%1 секунд"
 
-#: lib/Jifty/Action/Record/Search.pm:117
+#: lib/Jifty/Action/Record/Search.pm:149
 #. ($label)
 msgid "%1 since"
 msgstr "%1 после"
 
-#: lib/Jifty/Action/Record/Search.pm:118
+#: lib/Jifty/Action/Record/Search.pm:152
 #. ($label)
 msgid "%1 until"
 msgstr "%1 до"
 
-#: lib/Jifty/Action/Record/Search.pm:77
+#: lib/Jifty/Action/Record/Search.pm:81
 msgid "(any)"
 msgstr "(любое)"
 
+#: lib/Jifty/Plugin/AutoReference.pm:95
+msgid "- none -"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/ConfirmEmail.pm:58
 msgid ". Your email address has now been confirmed."
 msgstr ". Ваш адрес был подтвержден."
@@ -127,28 +161,32 @@
 msgid "A link to reset your password has been sent to your email account."
 msgstr "Ссылка для сброса пароля была отправлена на ваш почтовый ящик."
 
-#: lib/Jifty/Notification.pm:96
+#: lib/Jifty/Notification.pm:110 lib/Jifty/Notification.pm:127
 #. ($appname)
 msgid "A notification from %1!"
 msgstr "Уведомление от %1!"
 
-#: lib/Jifty/Plugin/SkeletonApp/Dispatcher.pm:28
+#: lib/Jifty/Plugin/Comment/View.pm:165
+msgid "Add a comment"
+msgstr ""
+
+#: lib/Jifty/Plugin/AdminUI/Dispatcher.pm:34
 msgid "Administration"
 msgstr "Администрирование"
 
-#: lib/Jifty/View/Declare/Helpers.pm:363 share/web/templates/_elements/wrapper:11
+#: lib/Jifty/View/Declare/Page.pm:180 share/web/templates/_elements/wrapper:11
 msgid "Administration mode is enabled."
 msgstr "Режим администрирования активирован."
 
-#: lib/Jifty/View/Declare/Helpers.pm:360 share/web/templates/_elements/wrapper:11
+#: lib/Jifty/View/Declare/Page.pm:177 share/web/templates/_elements/wrapper:11
 msgid "Alert"
 msgstr "Внимание"
 
-#: lib/Jifty/Action/Record/Create.pm:82
+#: lib/Jifty/Action/Record/Create.pm:105
 msgid "An error occurred.  Try again later"
 msgstr "Произошла ошибка. Попробуйте позже"
 
-#: lib/Jifty/Action/Record/Search.pm:129
+#: lib/Jifty/Action/Record/Search.pm:177
 msgid "Any field contains"
 msgstr "Любой поле содержит"
 
@@ -156,20 +194,30 @@
 msgid "Anyway, the software has logged this error."
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:19
+#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:54
 msgid "Authentication token"
 msgstr ""
 
-#: share/web/templates/__jifty/halo:117
+#: lib/Jifty/Plugin/SQLQueries.pm:175 share/web/templates/__jifty/halo:120
 msgid "Bindings"
 msgstr ""
 
+#: lib/Jifty/Plugin/Comment/View.pm:138 lib/Jifty/Plugin/Comment/View.pm:197
+#. ($poster,                     $created_on->strftime('%A, %B %d, %Y @ %H:%M%P')
+#. ($poster,                             $created_on->strftime('%A, %B %d, %Y @ %H:%M%P')
+msgid "By %1 %2"
+msgstr ""
+
 #: share/web/templates/helpers/calendar.html:4
 #. (_ &><body class="calpopup"><a href="#" onclick="window.close()
 msgid "Calendar"
 msgstr "Календарь"
 
-#: share/web/templates/__jifty/halo:81
+#: lib/Jifty/View/Declare/CRUD.pm:434
+msgid "Cancel"
+msgstr ""
+
+#: share/web/templates/__jifty/halo:84
 msgid "Children"
 msgstr "Потомки"
 
@@ -177,29 +225,44 @@
 msgid "Close window"
 msgstr "Закрыть окно"
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:97
+#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:94
 msgid "Confirmation resent."
 msgstr "Подтверждение выслано повторно."
 
-#: lib/Jifty/Action/Record/Create.pm:81
+#: lib/Jifty/Plugin/OpenID/View.pm:65
+msgid "Continue"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:723
+msgid "Create"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Create.pm:104
 #. (ref($record)
 msgid "Create of %1 failed: %2"
 msgstr "Создание %1 провалилось: %2"
 
-#: lib/Jifty/Action/Record/Create.pm:105
+#: lib/Jifty/Action/Record/Create.pm:131
 msgid "Created"
 msgstr "Создано"
 
-#: lib/Jifty/Action/Record/Delete.pm:76
+#: lib/Jifty/View/Declare/CRUD.pm:444
+msgid "Delete"
+msgstr ""
+
+#: lib/Jifty/Action/Record/Delete.pm:82
 msgid "Deleted"
 msgstr "Удалено"
 
-#: share/web/templates/__jifty/halo:126 share/web/templates/__jifty/halo:20
+#: share/web/templates/__jifty/halo:2
+msgid "Draw halos"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:366 share/web/templates/__jifty/halo:129 share/web/templates/__jifty/halo:23
 msgid "Edit"
 msgstr "Редактировать"
 
-#: lib/Jifty/Mason/Halo.pm:104
-#. ($comp_name)
+#:
 msgid "Edit %1"
 msgstr "Изменить %1"
 
@@ -207,14 +270,26 @@
 msgid "Email"
 msgstr "Почта"
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:33
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:52
 msgid "Email address"
 msgstr "Адрес почты"
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:35
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:54
 msgid "Email address confirmed?"
 msgstr "Адрес почты подтвержден?"
 
+#: lib/Jifty/Action.pm:1309
+msgid "Foo cannot contain -, *, +, or ?."
+msgstr ""
+
+#: lib/Jifty/Action.pm:1303
+msgid "Foo cannot contain uppercase letters."
+msgstr ""
+
+#: lib/Jifty/Action.pm:1282
+msgid "Foo values are always in lowercase."
+msgstr ""
+
 #: lib/Jifty/Plugin/ErrorTemplates/View.pm:27
 msgid "For one reason or another, you got to a web page that caused a bit of an error. And then you got to our 'basic' error handler. Which means we haven't written a pretty, easy to understand error message for you just yet. The message we do have is :"
 msgstr ""
@@ -223,6 +298,10 @@
 msgid "Go back home..."
 msgstr ""
 
+#: lib/Jifty/Plugin/OpenID/View.pm:35
+msgid "Go for it!"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:34
 msgid "Hashed Password"
 msgstr ""
@@ -236,35 +315,63 @@
 msgid "Hello, %1!"
 msgstr ""
 
-#: lib/Jifty/Plugin/SkeletonApp/View.pm:31 share/web/templates/_elements/sidebar:5
-#. ($u->$method()
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:147
+#. (Jifty->web->current_user->user_object->facebook_name)
+#. (Jifty->web->current_user->user_object->name)
+msgid "Hi %1!"
+msgstr ""
+
+#: lib/Jifty/Plugin/I18N/Action/SetLang.pm:44
+#. (DateTime::Locale->load($lang)
+msgid "Hi, we speak %1."
+msgstr ""
+
+#: lib/Jifty/Plugin/SkeletonApp/View.pm:31 share/web/templates/_elements/sidebar:4
+#. ($u->username)
+#. (Jifty->web->current_user->username)
 msgid "Hiya, %1."
 msgstr "Алоха, %1."
 
-#: lib/Jifty/Plugin/SkeletonApp/Dispatcher.pm:23
+#: lib/Jifty/Plugin/SkeletonApp/Dispatcher.pm:31
 msgid "Home"
 msgstr ""
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:30
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:49
 msgid "How should I display your name to other users?"
 msgstr "Как вас представлять другим пользователям?"
 
+#: lib/Jifty/Action.pm:1214
+msgid "I changed $field for you"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:64
 msgid "I'm not sure how this happened."
 msgstr "Я не уверен, как это произошло."
 
-#: lib/Jifty/Plugin/ErrorTemplates/View.pm:62
+#: lib/Jifty/Plugin/OpenID/View.pm:59
+msgid "If the username provided conflicts with an existing username or contains invalid characters, you will have to give us a new one."
+msgstr ""
+
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:64
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:63 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:78 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
+#: lib/Jifty/Plugin/OpenID/Action/AuthenticateOpenID.pm:53
+msgid "Invalid OpenID URL.  Please check to make sure it is correct.  (@{[$csr->err]})"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:62 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
 msgid "It doesn't look like there's an account by that name."
 msgstr "Кажется в системе нет пользователя с таким именем."
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:89
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:107
 msgid "It looks like somebody else is using that address. Is there a chance you have another account?"
 msgstr "Кто другой уже использует этот адрес. Может быть у вас уже есть учетная запись?"
 
+#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:45
+msgid "It looks like someone is already using that OpenID."
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:75
 msgid "It looks like you already have an account. Perhaps you want to <a href=\"/login\">log in</a> instead?"
 msgstr "Видимо у вас уже есть учетная запись. Возможно вы хотите <a href=\"/login\">войти</a>?"
@@ -273,31 +380,55 @@
 msgid "It looks like you didn't enter the same password into both boxes. Give it another shot?"
 msgstr "Вы ввели разные пароли в оба поля. Может еще разок?"
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:82
+#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:79
 msgid "It looks like you're already confirmed."
 msgstr "Вы уже подтверждали"
 
-#: lib/Jifty/View/Declare/Helpers.pm:375 share/web/templates/_elements/wrapper:18
+#: lib/Jifty/Plugin/I18N/Action/SetLang.pm:12
+msgid "Language"
+msgstr ""
+
+#: lib/Jifty/View/Declare/Page.pm:198 share/web/templates/_elements/wrapper:18
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:109
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23 lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132
 msgid "Login"
 msgstr "Вход"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:55
+#: lib/Jifty/Plugin/Authentication/Facebook/View.pm:24
+msgid "Login to Facebook now to get started!"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Facebook/View.pm:41
+msgid "Login to Facebook now to link it with your current account!"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:82
 msgid "Login with a password"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:40
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:28
+msgid "Login with your Ldap account"
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/View.pm:17
+msgid "Login with your OpenID"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:35
+msgid "Login with your ldap account"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:22 lib/Jifty/Plugin/Authentication/Password/View.pm:57
 msgid "Login!"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:126
+#: lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:151
 msgid "Logout"
 msgstr "Выход"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:63
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:90
 msgid "Lost your password?"
 msgstr "Забыли пароль?"
 
@@ -305,47 +436,80 @@
 msgid "Mason error"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:80
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:115
 msgid "New password"
 msgstr "Новый пароль"
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:29
+#: lib/Jifty/View/Declare/CRUD.pm:654
+msgid "Next Page"
+msgstr ""
+
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:48
 msgid "Nickname"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:52
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:79
 msgid "No account yet? It's quick and easy. "
 msgstr "Нет учетной записи? Это быстро и легко. "
 
-#: lib/Jifty/Action/Record/Search.pm:130
+#: lib/Jifty/Action/Record/Search.pm:178
 msgid "No field contains"
 msgstr ""
 
-#: lib/Jifty/Web.pm:302
+#: lib/Jifty/View/Declare/CRUD.pm:569
+msgid "No items found."
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/View.pm:304
+msgid "No one has made a comment yet."
+msgstr ""
+
+#: lib/Jifty/Web.pm:306
 msgid "No request to handle"
 msgstr ""
 
+#: lib/Jifty/Plugin/UUID/Widget.pm:37
+msgid "No value yet"
+msgstr ""
+
 #: lib/Jifty/Plugin/OnlineDocs/Dispatcher.pm:26
 msgid "Online docs"
 msgstr "Online документация"
 
-#: share/web/templates/__jifty/halo:1
+#: lib/Jifty/Plugin/OpenID/Action/AuthenticateOpenID.pm:27
+msgid "OpenID URL"
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm:48
+msgid "OpenID verification failed.  It looks like you cancelled the OpenID verification request."
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm:57
+msgid "OpenID verification failed: "
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:621
+#. ($page, $collection->pager->last_page)
+msgid "Page %1 of %2"
+msgstr ""
+
+#: share/web/templates/__jifty/halo:3
 msgid "Page info"
 msgstr "информация о странице"
 
-#: share/web/templates/__jifty/halo:72
+#: share/web/templates/__jifty/halo:75
 msgid "Parent"
 msgstr "Родитель"
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:29 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:26
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:29 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:60
 msgid "Password"
 msgstr "Пароль"
 
-#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:88
+#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:136
 msgid "Passwords need to be at least six characters long"
 msgstr "Пароль должен быть не менее шести симфолов"
 
-#: lib/Jifty/Record.pm:272 lib/Jifty/Record.pm:351 lib/Jifty/Record.pm:70
+#: lib/Jifty/Action/Record/Delete.pm:61 lib/Jifty/Action/Record/Update.pm:180 lib/Jifty/Action/Record/Update.pm:187 lib/Jifty/Record.pm:508 lib/Jifty/Record.pm:567 lib/Jifty/Record.pm:70
 msgid "Permission denied"
 msgstr "Доступ запрещен"
 
@@ -353,6 +517,18 @@
 msgid "Please email us!"
 msgstr ""
 
+#: lib/Jifty/Plugin/Comment/View.pm:221
+msgid "Preview"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:643
+msgid "Previous Page"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:447
+msgid "Really delete?"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:65
 msgid "Really, really sorry."
 msgstr "Очень сожалеем."
@@ -361,39 +537,51 @@
 msgid "Remember me?"
 msgstr "Запомнить?"
 
-#: share/web/templates/__jifty/halo:69
+#: share/web/templates/__jifty/halo:72
 #. ($frame->{'render_time'})
 msgid "Rendered in %1s"
 msgstr "Сгенерировано за %1 сек."
 
-#: share/web/templates/__jifty/halo:111
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:108 lib/Jifty/Plugin/Authentication/Password/View.pm:112
+msgid "Reset lost password"
+msgstr ""
+
+#: share/web/templates/__jifty/halo:114
 msgid "SQL Statements"
 msgstr "SQL запросы"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:118
+#: lib/Jifty/View/Declare/CRUD.pm:425
+msgid "Save"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:314
+msgid "Search"
+msgstr ""
+
+#:
 msgid "Send"
 msgstr "Отправить"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:96
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:147
 msgid "Send a link to reset your password"
 msgstr "Отправить ссылку сброса пароля"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:108 lib/Jifty/Plugin/Authentication/Password/View.pm:113
+#:
 msgid "Send a password reminder"
 msgstr "Отправить напоминание пароля"
 
-#: lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:114
+#: lib/Jifty/Plugin/Feedback/View.pm:21
+msgid "Send us feedback!"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:137 lib/Jifty/Plugin/Authentication/Password/View.pm:42 lib/Jifty/Plugin/Authentication/Password/View.pm:47
 msgid "Sign up"
 msgstr "Зарегистроваться"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:53
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:80
 msgid "Sign up for an account!"
 msgstr "Завести учетную запись!"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:30 lib/Jifty/Plugin/Authentication/Password/View.pm:35
-msgid "Signup"
-msgstr ""
-
 #: lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:108
 #. ($msg)
 msgid "Something bad happened and we couldn't create your account: %1"
@@ -403,7 +591,7 @@
 msgid "Something went awry"
 msgstr "Что-то пошло наперекосяк"
 
-#: lib/Jifty/Plugin/ErrorTemplates/View.pm:124 share/web/templates/dhandler:1
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:125 share/web/templates/dhandler:1
 msgid "Something's not quite right"
 msgstr "Что-то не совсем верно"
 
@@ -411,28 +599,57 @@
 msgid "Sorry about this."
 msgstr "Сожалеем об этом."
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:82
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:115
+msgid "Sorry, something weird happened (we couldn't create a user for you).  Try again later."
+msgstr ""
+
+#: lib/Jifty/Action/Record/Execute.pm:55
+msgid "Start"
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/View.pm:236
+msgid "Submit"
+msgstr ""
+
+#: lib/Jifty/Plugin/Feedback/View.pm:23
+#. (Jifty->config->framework('ApplicationName')
+msgid "Tell us what's good, what's bad, and what else you want %1 to do!"
+msgstr ""
+
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:100
 #. ($new_email)
 msgid "That %1 doesn't look like an email address."
 msgstr "Строка %1 не похожа на адрес почты"
 
-#: lib/Jifty/Action.pm:878
+#: lib/Jifty/Action.pm:1056
 msgid "That doesn't look like a correct value"
 msgstr "Не похоже на допустимое значение"
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:71 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:72 lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:70
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46
+msgid "That doesn't look like a valid login."
+msgstr ""
+
+#: plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:47
+msgid "That doesn't look like a valid ticket."
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:68 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:72 lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:70
 msgid "That doesn't look like an email address."
 msgstr "Не похоже на почтовый адрес"
 
-#: lib/Jifty/Action/Record.pm:249
+#: lib/Jifty/Action/Record.pm:351
 msgid "That doesn't look right, but I don't know why"
 msgstr "Неправильно, но неизвестно почему"
 
-#: lib/Jifty/Action/Record.pm:181
+#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:50
+msgid "The OpenID '$openid' has been linked to your account."
+msgstr ""
+
+#: lib/Jifty/Action/Record.pm:219
 msgid "The passwords you typed didn't match each other"
 msgstr "Введенные пароли не совпадают"
 
-#: lib/Jifty/Web.pm:365
+#: lib/Jifty/Web.pm:427
 msgid "There was an error completing the request.  Please try again later."
 msgstr "Во время выпонения запроса произошла ошибка. Пожалуйста попробуйте позже."
 
@@ -444,7 +661,11 @@
 msgid "There's a pretty good chance that error message doesn't mean anything to you, but we'd rather you have a little bit of information about what went wrong than nothing. We've logged this error, so we know we need to write something friendly explaining just what happened and how to fix it."
 msgstr ""
 
-#: lib/Jifty/Plugin/ErrorTemplates/View.pm:173 share/web/templates/__jifty/error/mason_internal_error:6
+#: lib/Jifty/View/Declare/CRUD.pm:533
+msgid "Toggle search"
+msgstr ""
+
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:175 share/web/templates/__jifty/error/mason_internal_error:6
 msgid "Try again"
 msgstr "Попробовать еще"
 
@@ -456,18 +677,22 @@
 msgid "Type that again?"
 msgstr "Введите еще раз"
 
-#: lib/Jifty/Action/Record/Update.pm:156
+#: lib/Jifty/Action/Record/Update.pm:214
 msgid "Updated"
 msgstr "Обновленно"
 
-#: share/web/templates/__jifty/halo:93
+#: share/web/templates/__jifty/halo:96
 msgid "Variables"
 msgstr "Переменные"
 
-#: lib/Jifty.pm:27
+#: lib/Jifty.pm:29
 msgid "W00t"
 msgstr ""
 
+#: lib/Jifty/Plugin/OpenID/View.pm:53
+msgid "We need you to set a username or quickly check the one associated with your OpenID. Your username is what other people will see when you ask questions or make suggestions"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:114
 msgid "We've sent a confirmation message to your email box."
 msgstr "Мы послали сообщение для потдтверждения на ваш электронный адрес."
@@ -477,7 +702,11 @@
 msgid "Welcome %1 to the %2"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:181
+#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:66
+msgid "Welcome back, "
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:194
 #. ($user->name)
 msgid "Welcome back, %1."
 msgstr "Рады вас видеть снова, %1."
@@ -487,20 +716,23 @@
 msgid "Welcome to %1!"
 msgstr "Добро пожаловать на сайт %1!"
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:113
+#: lib/Jifty/Plugin/Authentication/Password/Action/ConfirmEmail.pm:57 lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:113
 #. (Jifty->config->framework('ApplicationName')
 msgid "Welcome to %1, %2."
 msgstr "Добро пожаловать на сайт %1, %2."
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/ConfirmEmail.pm:57
-#. (Jifty->config->framework('ApplicationName')
-msgid "Welcome to %1, %2. "
-msgstr ""
-
 #: lib/Jifty/Plugin/SkeletonApp/View.pm:75 share/web/templates/index.html:1
 msgid "Welcome to your new Jifty application"
 msgstr "Добро пожаловать в ваше новое Jifty-приложение"
 
+#: lib/Jifty/Plugin/OpenID/Action/CreateOpenIDUser.pm:94
+msgid "Welcome, "
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/View.pm:42
+msgid "You already logged in."
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:63
 msgid "You don't exist."
 msgstr "Вы не существуете."
@@ -517,19 +749,27 @@
 msgid "You have already confirmed your account."
 msgstr "Вы уже подтверждали учетную запись."
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:97
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:148
 msgid "You lost your password. A link to reset it will be sent to the following email address:"
 msgstr "Вы забыли пароль. Ссылка для сброса пароля будет отправлена на адрес: %1"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:114
+#:
 msgid "You lost your password. A reminder will be send to the following mail:"
 msgstr "Вы забыли пароль. Напоминание будет отправлено на адрес: %1"
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:146
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:138
 msgid "You may have mistyped your email or password. Give it another shot."
 msgstr "Должно быть вы ввели неправильно адрес или пароль. Попробуйте еще разок."
 
-#: lib/Jifty/Action.pm:865
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77
+msgid "You may have mistyped your login or password. Give it another shot?"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LinkFacebookUser.pm:40
+msgid "You must be logged in to link your user to your Facebook account."
+msgstr ""
+
+#: lib/Jifty/Action.pm:948
 msgid "You need to fill in this field"
 msgstr "Вы должны заполнить это поле"
 
@@ -538,26 +778,45 @@
 msgid "You said you wanted a pony. (Source %1)"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:69
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:45 lib/Jifty/Plugin/Authentication/Password/View.pm:96
 msgid "You're already logged in."
 msgstr "Вы уже вошли."
 
-#: lib/Jifty/Plugin/SkeletonApp/View.pm:34 share/web/templates/_elements/sidebar:7
+#: lib/Jifty/Plugin/SkeletonApp/View.pm:34 share/web/templates/_elements/sidebar:6
 msgid "You're not currently signed in."
 msgstr ""
 
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LinkFacebookUser.pm:72
+#. (Jifty->web->current_user->user_object->facebook_name)
+msgid "Your account has been successfully linked to your Facebook user %1!"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:38
 msgid "Your browser can remember your login for you"
 msgstr "Ваш браузер может запомнить ваш логин за вас"
 
+#: lib/Jifty/Plugin/Comment/Action/CreateComment.pm:268
+msgid "Your comment has been added. If it does not immediately appear, it may have been flagged for moderation and should appear shortly."
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:87
 msgid "Your password has been reset.  Welcome back."
 msgstr "ваш пароль был сброшен. Мы рады вас снова видеть."
 
-#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:28
+#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:63
 msgid "Your password should be at least six characters"
 msgstr "Ваш пароль должен состоять из шести исмволов минимум"
 
+#: lib/Jifty/Plugin/Comment/Notification/CommentNeedsModeration.pm:67
+#. ($appname, $comment->title)
+msgid "[%1] Moderate comment: %2"
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/Notification/CommentPublished.pm:65
+#. ($appname, $comment->title)
+msgid "[%1] New comment: %2"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:31
 msgid "email address"
 msgstr "адрес почты"
@@ -566,6 +825,19 @@
 msgid "for now, and try to forget that we let you down."
 msgstr ""
 
+#: lib/Jifty/Plugin/Comment/View.pm:87
+#. ($status)
+msgid "mark as %1"
+msgstr ""
+
+#: lib/Jifty/Action/Record.pm:444
+msgid "no value"
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/View.pm:100
+msgid "publish"
+msgstr ""
+
 #: lib/Jifty/Manual/PageRegions.pod:188
 msgid "text of the link"
 msgstr "текст ссылки"
@@ -578,6 +850,10 @@
 msgid "type your password again"
 msgstr "введите ваг пароль снова"
 
-#: lib/Jifty/Action.pm:1050
+#: lib/Jifty/Plugin/Comment/View.pm:100
+msgid "unpublish"
+msgstr ""
+
+#: lib/Jifty/Action.pm:1174
 msgid "warning"
 msgstr "предупреждение"

Modified: jifty/trunk/share/po/zh_cn.po
==============================================================================
--- jifty/trunk/share/po/zh_cn.po	(original)
+++ jifty/trunk/share/po/zh_cn.po	Thu Sep  4 06:42:06 2008
@@ -14,6 +14,20 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lib/Jifty/Plugin/Comment/Notification/CommentPublished.pm:71
+#. ($url,        $self->parent->title,        $comment->title,         $from,         $comment->created_on->strftime('%A, %B %d, %Y @ %H:%M%P')
+msgid ""
+"\n"
+"View Comment: %1\n"
+"\n"
+"On Post: %2\n"
+"Subject: %3\n"
+"From: %4\n"
+"Date: %5\n"
+"\n"
+"%6\n"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Notification/ConfirmLostPassword.pm:38
 #. ($appname,$confirm_url)
 msgid ""
@@ -54,61 +68,76 @@
 "\n"
 "%2\n"
 
-#: lib/Jifty/Action/Record/Search.pm:125
+#: lib/Jifty/Plugin/Authentication/Facebook/View.pm:43
+msgid ""
+" id is 'facebook_link' };\n"
+"        span { _(\"Login to Facebook now to link it with your current account!\") };\n"
+"        a {{ href is $plugin->get_link_url };\n"
+"            img {{ src is 'http://static.ak.facebook.com/images/devsite/facebook_login.gif', border is '0' "
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Facebook/View.pm:26
+msgid ""
+" id is 'facebook_login' };\n"
+"        span { _(\"Login to Facebook now to get started!\") };\n"
+"        a {{ href is $plugin->get_login_url };\n"
+"            img {{ src is 'http://static.ak.facebook.com/images/devsite/facebook_login.gif', border is '0' "
+msgstr ""
+
+#: lib/Jifty/Action/Record/Search.pm:172
 msgid "!=>< allowed"
 msgstr "可使用 !=>< 符号"
 
-#: lib/Jifty/Notification.pm:94
+#: lib/Jifty/Notification.pm:108 lib/Jifty/Notification.pm:125
 #. ($appname, Jifty->config->framework('AdminEmail')
 msgid "%1 <%2>"
 msgstr "%1 <%2>"
 
-#: lib/Jifty/Action/Record/Search.pm:115
+#: lib/Jifty/Action/Record/Search.pm:143
 #. ($label)
 msgid "%1 after"
 msgstr "%1 晚于"
 
-#: lib/Jifty/Action/Record/Search.pm:116
+#: lib/Jifty/Action/Record/Search.pm:146
 #. ($label)
 msgid "%1 before"
 msgstr "%1 早于"
 
-#: lib/Jifty/Action/Record/Search.pm:112
+#: lib/Jifty/Action/Record/Search.pm:133
 #. ($label)
 msgid "%1 contains"
 msgstr "%1 包含"
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:141
-#. ($collection-> count)
+#:
 msgid "%1 entries"
 msgstr "共 %1 条记录"
 
-#: lib/Jifty/Action/Record/Search.pm:123
+#: lib/Jifty/Action/Record/Search.pm:166
 #. ($label)
 msgid "%1 greater or equal to"
 msgstr "%1 至少为"
 
-#: lib/Jifty/Action/Record/Search.pm:121
+#: lib/Jifty/Action/Record/Search.pm:160
 #. ($label)
 msgid "%1 greater than"
 msgstr "%1 大于"
 
-#: lib/Jifty/Action/Record/Search.pm:108
+#: lib/Jifty/Action/Record/Search.pm:121
 #. ($label)
 msgid "%1 is not"
 msgstr "%1 不等于"
 
-#: lib/Jifty/Action/Record/Search.pm:113
+#: lib/Jifty/Action/Record/Search.pm:136
 #. ($label)
 msgid "%1 lacks"
 msgstr "%1 不包含"
 
-#: lib/Jifty/Action/Record/Search.pm:124
+#: lib/Jifty/Action/Record/Search.pm:169
 #. ($label)
 msgid "%1 less or equal to"
 msgstr "%1 至多为"
 
-#: lib/Jifty/Action/Record/Search.pm:122
+#: lib/Jifty/Action/Record/Search.pm:163
 #. ($label)
 msgid "%1 less than"
 msgstr "%1 小于"
@@ -119,25 +148,29 @@
 msgid "%1 line %2"
 msgstr "%1 第 %2 行"
 
-#: share/web/templates/__jifty/halo:119
+#: lib/Jifty/Plugin/SQLQueries.pm:186 share/web/templates/__jifty/halo:122
 #. ($_->[3])
 msgid "%1 seconds"
 msgstr "%1 秒"
 
-#: lib/Jifty/Action/Record/Search.pm:117
+#: lib/Jifty/Action/Record/Search.pm:149
 #. ($label)
 msgid "%1 since"
 msgstr "%1 自"
 
-#: lib/Jifty/Action/Record/Search.pm:118
+#: lib/Jifty/Action/Record/Search.pm:152
 #. ($label)
 msgid "%1 until"
 msgstr "%1 至"
 
-#: lib/Jifty/Action/Record/Search.pm:77
+#: lib/Jifty/Action/Record/Search.pm:81
 msgid "(any)"
 msgstr "(任意)"
 
+#: lib/Jifty/Plugin/AutoReference.pm:95
+msgid "- none -"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/ConfirmEmail.pm:58
 msgid ". Your email address has now been confirmed."
 msgstr ". 现已成功确认您的电子邮箱."
@@ -146,32 +179,36 @@
 msgid "A link to reset your password has been sent to your email account."
 msgstr "重设密码的链接已发送到您的电子邮箱."
 
-#: lib/Jifty/Notification.pm:96
+#: lib/Jifty/Notification.pm:110 lib/Jifty/Notification.pm:127
 #. ($appname)
 msgid "A notification from %1!"
 msgstr "从 %1 送来的消息!"
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:443
+#:
 msgid "Actions"
 msgstr "操作"
 
-#: lib/Jifty/Plugin/SkeletonApp/Dispatcher.pm:28
+#: lib/Jifty/Plugin/Comment/View.pm:165
+msgid "Add a comment"
+msgstr ""
+
+#: lib/Jifty/Plugin/AdminUI/Dispatcher.pm:34
 msgid "Administration"
 msgstr "管理界面"
 
-#: lib/Jifty/View/Declare/Helpers.pm:363 share/web/templates/_elements/wrapper:11
+#: lib/Jifty/View/Declare/Page.pm:180 share/web/templates/_elements/wrapper:11
 msgid "Administration mode is enabled."
 msgstr "系统管理模式开启中."
 
-#: lib/Jifty/View/Declare/Helpers.pm:360 share/web/templates/_elements/wrapper:11
+#: lib/Jifty/View/Declare/Page.pm:177 share/web/templates/_elements/wrapper:11
 msgid "Alert"
 msgstr "请注意"
 
-#: lib/Jifty/Action/Record/Create.pm:82
+#: lib/Jifty/Action/Record/Create.pm:105
 msgid "An error occurred.  Try again later"
 msgstr "系统无法执行此项操作, 请稍后再试"
 
-#: lib/Jifty/Action/Record/Search.pm:129
+#: lib/Jifty/Action/Record/Search.pm:177
 msgid "Any field contains"
 msgstr "任意字段包含"
 
@@ -179,32 +216,38 @@
 msgid "Anyway, the software has logged this error."
 msgstr "系统已记录该错误."
 
-#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:19
+#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:54
 msgid "Authentication token"
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:489 lib/Jifty/Plugin/AdminUI/View-not-yet.pm:59
+#:
 msgid "Back to the admin console"
 msgstr "回到管理界面"
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:461
+#:
 msgid "Back to the application"
 msgstr "回到应用程序"
 
-#: share/web/templates/__jifty/halo:117
+#: lib/Jifty/Plugin/SQLQueries.pm:175 share/web/templates/__jifty/halo:120
 msgid "Bindings"
 msgstr "快捷键"
 
+#: lib/Jifty/Plugin/Comment/View.pm:138 lib/Jifty/Plugin/Comment/View.pm:197
+#. ($poster,                     $created_on->strftime('%A, %B %d, %Y @ %H:%M%P')
+#. ($poster,                             $created_on->strftime('%A, %B %d, %Y @ %H:%M%P')
+msgid "By %1 %2"
+msgstr ""
+
 #: share/web/templates/helpers/calendar.html:4
 #. (_ &><body class="calpopup"><a href="#" onclick="window.close()
 msgid "Calendar"
 msgstr "日历"
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:338
+#: lib/Jifty/View/Declare/CRUD.pm:434
 msgid "Cancel"
 msgstr "取消"
 
-#: share/web/templates/__jifty/halo:81
+#: share/web/templates/__jifty/halo:84
 msgid "Children"
 msgstr "子组件"
 
@@ -212,36 +255,40 @@
 msgid "Close window"
 msgstr "关闭窗口"
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:382
+#:
 msgid "Confirm delete?"
 msgstr "确实要删除吗?"
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:97
+#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:94
 msgid "Confirmation resent."
 msgstr "确认信件已重新发送"
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:213
+#: lib/Jifty/Plugin/OpenID/View.pm:65
+msgid "Continue"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:723
 msgid "Create"
 msgstr "创建"
 
-#: lib/Jifty/Action/Record/Create.pm:81
+#: lib/Jifty/Action/Record/Create.pm:104
 #. (ref($record)
 msgid "Create of %1 failed: %2"
 msgstr "无法建立 %1: %2"
 
-#: lib/Jifty/Action/Record/Create.pm:105
+#: lib/Jifty/Action/Record/Create.pm:131
 msgid "Created"
 msgstr "成功建立项目."
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:415
+#:
 msgid "Database Administration"
 msgstr "数据库管理"
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:380
+#: lib/Jifty/View/Declare/CRUD.pm:444
 msgid "Delete"
 msgstr "删除"
 
-#: lib/Jifty/Action/Record/Delete.pm:76
+#: lib/Jifty/Action/Record/Delete.pm:82
 msgid "Deleted"
 msgstr "已删除"
 
@@ -249,16 +296,19 @@
 msgid "Dismiss"
 msgstr "关闭"
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:458 lib/Jifty/Plugin/AdminUI/View-not-yet.pm:486 lib/Jifty/Plugin/AdminUI/View-not-yet.pm:56
+#:
 msgid "Done?"
 msgstr "已完成?"
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:388 share/web/templates/__jifty/halo:126 share/web/templates/__jifty/halo:20
+#: share/web/templates/__jifty/halo:2
+msgid "Draw halos"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:366 share/web/templates/__jifty/halo:129 share/web/templates/__jifty/halo:23
 msgid "Edit"
 msgstr "编辑"
 
-#: lib/Jifty/Mason/Halo.pm:104
-#. ($comp_name)
+#:
 msgid "Edit %1"
 msgstr "编辑 %1"
 
@@ -266,23 +316,23 @@
 msgid "Email"
 msgstr "电子邮箱"
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:33
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:52
 msgid "Email address"
 msgstr "电子邮箱"
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:35
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:54
 msgid "Email address confirmed?"
 msgstr "已确认电子邮箱?"
 
-#: lib/Jifty/Action.pm:1158
+#: lib/Jifty/Action.pm:1309
 msgid "Foo cannot contain -, *, +, or ?."
 msgstr ""
 
-#: lib/Jifty/Action.pm:1152
+#: lib/Jifty/Action.pm:1303
 msgid "Foo cannot contain uppercase letters."
 msgstr ""
 
-#: lib/Jifty/Action.pm:1136
+#: lib/Jifty/Action.pm:1282
 msgid "Foo values are always in lowercase."
 msgstr ""
 
@@ -294,6 +344,10 @@
 msgid "Go back home..."
 msgstr "回首页..."
 
+#: lib/Jifty/Plugin/OpenID/View.pm:35
+msgid "Go for it!"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:34
 msgid "Hashed Password"
 msgstr ""
@@ -307,20 +361,32 @@
 msgid "Hello, %1!"
 msgstr "%1, 您好!"
 
-#: lib/Jifty/Plugin/SkeletonApp/View.pm:31 share/web/templates/_elements/sidebar:5
-#. ($u->$method()
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:147
+#. (Jifty->web->current_user->user_object->facebook_name)
+#. (Jifty->web->current_user->user_object->name)
+msgid "Hi %1!"
+msgstr ""
+
+#: lib/Jifty/Plugin/I18N/Action/SetLang.pm:44
+#. (DateTime::Locale->load($lang)
+msgid "Hi, we speak %1."
+msgstr ""
+
+#: lib/Jifty/Plugin/SkeletonApp/View.pm:31 share/web/templates/_elements/sidebar:4
+#. ($u->username)
+#. (Jifty->web->current_user->username)
 msgid "Hiya, %1."
 msgstr "您好, %1."
 
-#: lib/Jifty/Plugin/SkeletonApp/Dispatcher.pm:23
+#: lib/Jifty/Plugin/SkeletonApp/Dispatcher.pm:31
 msgid "Home"
 msgstr "首页"
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:30
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:49
 msgid "How should I display your name to other users?"
 msgstr "您在本系统中的名字?"
 
-#: lib/Jifty/Action.pm:1090
+#: lib/Jifty/Action.pm:1214
 msgid "I changed $field for you"
 msgstr ""
 
@@ -328,18 +394,30 @@
 msgid "I'm not sure how this happened."
 msgstr "我也不知道怎么回事."
 
-#: lib/Jifty/Plugin/ErrorTemplates/View.pm:62
+#: lib/Jifty/Plugin/OpenID/View.pm:59
+msgid "If the username provided conflicts with an existing username or contains invalid characters, you will have to give us a new one."
+msgstr ""
+
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:64
 msgid "Internal error"
 msgstr "内部错误"
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:78 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
+#: lib/Jifty/Plugin/OpenID/Action/AuthenticateOpenID.pm:53
+msgid "Invalid OpenID URL.  Please check to make sure it is correct.  (@{[$csr->err]})"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:62 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
 msgid "It doesn't look like there's an account by that name."
 msgstr "该账号不存在."
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:89
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:107
 msgid "It looks like somebody else is using that address. Is there a chance you have another account?"
 msgstr "已经有人使用了这个地址,或许您还有另外一个账号?"
 
+#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:45
+msgid "It looks like someone is already using that OpenID."
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:75
 msgid "It looks like you already have an account. Perhaps you want to <a href=\"/login\">log in</a> instead?"
 msgstr "您已经有了一个账号了,或许您是想<a href=\"/login\">登录</a>?"
@@ -348,7 +426,7 @@
 msgid "It looks like you didn't enter the same password into both boxes. Give it another shot?"
 msgstr "两次输入的密码不同. 再试一次?"
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:82
+#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:79
 msgid "It looks like you're already confirmed."
 msgstr "您的账号已经通过验证了."
 
@@ -364,27 +442,51 @@
 msgid "Jifty Pod Online"
 msgstr "Jifty 在线 POD 文档"
 
-#: lib/Jifty/View/Declare/Helpers.pm:375 share/web/templates/_elements/wrapper:18
+#: lib/Jifty/Plugin/I18N/Action/SetLang.pm:12
+msgid "Language"
+msgstr ""
+
+#: lib/Jifty/View/Declare/Page.pm:198 share/web/templates/_elements/wrapper:18
 msgid "Loading..."
 msgstr "正在加载..."
 
-#: lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:106
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23 lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132
 msgid "Login"
 msgstr "登录"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:55
+#: lib/Jifty/Plugin/Authentication/Facebook/View.pm:24
+msgid "Login to Facebook now to get started!"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Facebook/View.pm:41
+msgid "Login to Facebook now to link it with your current account!"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:82
 msgid "Login with a password"
 msgstr "使用密码登录"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:40
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:28
+msgid "Login with your Ldap account"
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/View.pm:17
+msgid "Login with your OpenID"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:35
+msgid "Login with your ldap account"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:22 lib/Jifty/Plugin/Authentication/Password/View.pm:57
 msgid "Login!"
 msgstr "登录!"
 
-#: lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:123
+#: lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:151
 msgid "Logout"
 msgstr "注销"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:63
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:90
 msgid "Lost your password?"
 msgstr "忘记密码?"
 
@@ -396,8 +498,7 @@
 msgid "Manage records:"
 msgstr "管理记录:"
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:46 lib/Jifty/Plugin/AdminUI/View-not-yet.pm:473
-#. ($object_type)
+#:
 msgid "Manage records: [_1]"
 msgstr "管理记录: [_1]"
 
@@ -405,38 +506,50 @@
 msgid "Mason error"
 msgstr "Mason 系统错误"
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:429
+#:
 msgid "Models"
 msgstr "模型"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:81
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:115
 msgid "New password"
 msgstr "新密码"
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:172
+#: lib/Jifty/View/Declare/CRUD.pm:654
 msgid "Next Page"
 msgstr "下一页"
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:29
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:48
 msgid "Nickname"
 msgstr "昵称"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:52
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:79
 msgid "No account yet? It's quick and easy. "
 msgstr "还没有账号?您可以很容易就注册一个. "
 
-#: lib/Jifty/Action/Record/Search.pm:130
+#: lib/Jifty/Action/Record/Search.pm:178
 msgid "No field contains"
 msgstr "没有字段包含"
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:139
+#:
 msgid "No items found"
 msgstr "未找到记录"
 
-#: lib/Jifty/Web.pm:302
+#: lib/Jifty/View/Declare/CRUD.pm:569
+msgid "No items found."
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/View.pm:304
+msgid "No one has made a comment yet."
+msgstr ""
+
+#: lib/Jifty/Web.pm:306
 msgid "No request to handle"
 msgstr "没有可处理的请求"
 
+#: lib/Jifty/Plugin/UUID/Widget.pm:37
+msgid "No value yet"
+msgstr ""
+
 #:
 msgid "Online Documentation"
 msgstr "在线文档"
@@ -445,28 +558,40 @@
 msgid "Online docs"
 msgstr "在线文档"
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:134
+#: lib/Jifty/Plugin/OpenID/Action/AuthenticateOpenID.pm:27
+msgid "OpenID URL"
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm:48
+msgid "OpenID verification failed.  It looks like you cancelled the OpenID verification request."
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm:57
+msgid "OpenID verification failed: "
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:621
 #. ($page, $collection->pager->last_page)
 msgid "Page %1 of %2"
 msgstr "第 %1 页, 共 %2 页"
 
-#: share/web/templates/__jifty/halo:1
+#: share/web/templates/__jifty/halo:3
 msgid "Page info"
 msgstr "页面信息"
 
-#: share/web/templates/__jifty/halo:72
+#: share/web/templates/__jifty/halo:75
 msgid "Parent"
 msgstr "父组件"
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:29 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:26
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:29 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:60
 msgid "Password"
 msgstr "密码"
 
-#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:88
+#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:136
 msgid "Passwords need to be at least six characters long"
 msgstr "密码长度至少为6位"
 
-#: lib/Jifty/Record.pm:272 lib/Jifty/Record.pm:351 lib/Jifty/Record.pm:70
+#: lib/Jifty/Action/Record/Delete.pm:61 lib/Jifty/Action/Record/Update.pm:180 lib/Jifty/Action/Record/Update.pm:187 lib/Jifty/Record.pm:508 lib/Jifty/Record.pm:567 lib/Jifty/Record.pm:70
 msgid "Permission denied"
 msgstr "权限不足"
 
@@ -474,10 +599,18 @@
 msgid "Please email us!"
 msgstr "请给我们发邮件!"
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:163
+#: lib/Jifty/Plugin/Comment/View.pm:221
+msgid "Preview"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:643
 msgid "Previous Page"
 msgstr "前一页"
 
+#: lib/Jifty/View/Declare/CRUD.pm:447
+msgid "Really delete?"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:65
 msgid "Really, really sorry."
 msgstr "非常非常抱歉"
@@ -490,24 +623,24 @@
 msgid "Remember me?"
 msgstr "记住我?"
 
-#: share/web/templates/__jifty/halo:69
+#: share/web/templates/__jifty/halo:72
 #. ($frame->{'render_time'})
 msgid "Rendered in %1s"
 msgstr "页面生成时间: %1 秒"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:78
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:108 lib/Jifty/Plugin/Authentication/Password/View.pm:112
 msgid "Reset lost password"
 msgstr "重设密码"
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:53
+#:
 msgid "Run the action"
 msgstr "执行动作"
 
-#: share/web/templates/__jifty/halo:111
+#: share/web/templates/__jifty/halo:114
 msgid "SQL Statements"
 msgstr "SQL 语句"
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:327
+#: lib/Jifty/View/Declare/CRUD.pm:425
 msgid "Save"
 msgstr "保存"
 
@@ -515,31 +648,35 @@
 msgid "Schema"
 msgstr "纲要"
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:304
+#: lib/Jifty/View/Declare/CRUD.pm:314
 msgid "Search"
 msgstr "查找"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:119
+#:
 msgid "Send"
 msgstr "发送"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:97
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:147
 msgid "Send a link to reset your password"
 msgstr "发送重设密码的链接"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:109 lib/Jifty/Plugin/Authentication/Password/View.pm:114
+#:
 msgid "Send a password reminder"
 msgstr "发送密码提示"
 
-#: lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:111
+#: lib/Jifty/Plugin/Feedback/View.pm:21
+msgid "Send us feedback!"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:137 lib/Jifty/Plugin/Authentication/Password/View.pm:42 lib/Jifty/Plugin/Authentication/Password/View.pm:47
 msgid "Sign up"
 msgstr "注册"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:53
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:80
 msgid "Sign up for an account!"
 msgstr "现在就注册!"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:30 lib/Jifty/Plugin/Authentication/Password/View.pm:35
+#:
 msgid "Signup"
 msgstr "注册"
 
@@ -552,7 +689,7 @@
 msgid "Something went awry"
 msgstr "出了一点岔子"
 
-#: lib/Jifty/Plugin/ErrorTemplates/View.pm:124 share/web/templates/dhandler:1
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:125 share/web/templates/dhandler:1
 msgid "Something's not quite right"
 msgstr "系统错误"
 
@@ -560,32 +697,61 @@
 msgid "Sorry about this."
 msgstr "非常抱歉"
 
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:115
+msgid "Sorry, something weird happened (we couldn't create a user for you).  Try again later."
+msgstr ""
+
+#: lib/Jifty/Action/Record/Execute.pm:55
+msgid "Start"
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/View.pm:236
+msgid "Submit"
+msgstr ""
+
 #:
 msgid "Table of Contents"
 msgstr "目录"
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:82
+#: lib/Jifty/Plugin/Feedback/View.pm:23
+#. (Jifty->config->framework('ApplicationName')
+msgid "Tell us what's good, what's bad, and what else you want %1 to do!"
+msgstr ""
+
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:100
 #. ($new_email)
 msgid "That %1 doesn't look like an email address."
 msgstr "%1 不是合法的电子邮箱"
 
-#: lib/Jifty/Action.pm:878
+#: lib/Jifty/Action.pm:1056
 msgid "That doesn't look like a correct value"
 msgstr "字段格式错误."
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:71 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:72 lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:70
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46
+msgid "That doesn't look like a valid login."
+msgstr ""
+
+#: plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:47
+msgid "That doesn't look like a valid ticket."
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:68 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:72 lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:70
 msgid "That doesn't look like an email address."
 msgstr "不是合法的电子邮箱."
 
-#: lib/Jifty/Action/Record.pm:249
+#: lib/Jifty/Action/Record.pm:351
 msgid "That doesn't look right, but I don't know why"
 msgstr "字段内容错误."
 
-#: lib/Jifty/Action/Record.pm:181
+#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:50
+msgid "The OpenID '$openid' has been linked to your account."
+msgstr ""
+
+#: lib/Jifty/Action/Record.pm:219
 msgid "The passwords you typed didn't match each other"
 msgstr "密码不匹配."
 
-#: lib/Jifty/Web.pm:365
+#: lib/Jifty/Web.pm:427
 msgid "There was an error completing the request.  Please try again later."
 msgstr "系统执行错误, 请稍候再试."
 
@@ -597,19 +763,19 @@
 msgid "There's a pretty good chance that error message doesn't mean anything to you, but we'd rather you have a little bit of information about what went wrong than nothing. We've logged this error, so we know we need to write something friendly explaining just what happened and how to fix it."
 msgstr ""
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:419
+#:
 msgid "This console lets you manage the records in your Jifty database. Below, you should see a list of all your database tables. Feel free to go through and add, delete or modify records."
 msgstr "您可利用此界面来管理数据库的内容. 请选择表格名称, 进行增删或者编辑."
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:425
+#:
 msgid "To disable this administrative console, add \"AdminMode: 0\" under the \"framework:\" settings in the config file (etc/config.yml)."
 msgstr "如果想禁用管理界面, 请在配置文件 (etc/config.yml) 的 \"framework:\" 配置项内加上 \"AdminMode: 0\" 即可."
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:127
+#: lib/Jifty/View/Declare/CRUD.pm:533
 msgid "Toggle search"
 msgstr "切换搜索页面"
 
-#: lib/Jifty/Plugin/ErrorTemplates/View.pm:173 share/web/templates/__jifty/error/mason_internal_error:6
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:175 share/web/templates/__jifty/error/mason_internal_error:6
 msgid "Try again"
 msgstr "重试"
 
@@ -621,18 +787,22 @@
 msgid "Type that again?"
 msgstr "再输入一次?"
 
-#: lib/Jifty/Action/Record/Update.pm:156
+#: lib/Jifty/Action/Record/Update.pm:214
 msgid "Updated"
 msgstr "成功更新项目."
 
-#: share/web/templates/__jifty/halo:93
+#: share/web/templates/__jifty/halo:96
 msgid "Variables"
 msgstr "变项"
 
-#: lib/Jifty.pm:27
+#: lib/Jifty.pm:29
 msgid "W00t"
 msgstr ""
 
+#: lib/Jifty/Plugin/OpenID/View.pm:53
+msgid "We need you to set a username or quickly check the one associated with your OpenID. Your username is what other people will see when you ask questions or make suggestions"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:114
 msgid "We've sent a confirmation message to your email box."
 msgstr "系统已将确认信发送到您的电子邮箱."
@@ -642,7 +812,11 @@
 msgid "Welcome %1 to the %2"
 msgstr "%2, 欢迎来到 %1"
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:181
+#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:66
+msgid "Welcome back, "
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:194
 #. ($user->name)
 msgid "Welcome back, %1."
 msgstr "欢迎回来, %1."
@@ -652,13 +826,12 @@
 msgid "Welcome to %1!"
 msgstr "欢迎来到 %1!"
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:113
+#: lib/Jifty/Plugin/Authentication/Password/Action/ConfirmEmail.pm:57 lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:113
 #. (Jifty->config->framework('ApplicationName')
 msgid "Welcome to %1, %2."
 msgstr "%2, 欢迎来到 %1"
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/ConfirmEmail.pm:57
-#. (Jifty->config->framework('ApplicationName')
+#:
 msgid "Welcome to %1, %2. "
 msgstr "%2, 欢迎来到 %1"
 
@@ -666,6 +839,14 @@
 msgid "Welcome to your new Jifty application"
 msgstr "欢迎光临您崭新的 Jifty 应用程序"
 
+#: lib/Jifty/Plugin/OpenID/Action/CreateOpenIDUser.pm:94
+msgid "Welcome, "
+msgstr ""
+
+#: lib/Jifty/Plugin/OpenID/View.pm:42
+msgid "You already logged in."
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:63
 msgid "You don't exist."
 msgstr "该账号不存在."
@@ -682,23 +863,31 @@
 msgid "You have already confirmed your account."
 msgstr "您的账号已经通过验证了."
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:98
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:148
 msgid "You lost your password. A link to reset it will be sent to the following email address:"
 msgstr "您忘记了密码. 重置密码的链接将被发送到以下的电子信箱中:"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:115
+#:
 msgid "You lost your password. A reminder will be send to the following mail:"
 msgstr "您忘记了密码. 密码提醒将被发送到以下的电子信箱中:"
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:152
+#:
 msgid "You may have mistyped your email address or password. Give it another shot."
 msgstr "您或许输错了电子邮箱或密码,请重试."
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:146
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:138
 msgid "You may have mistyped your email or password. Give it another shot."
 msgstr "您或许输错了电子邮箱或密码,请重试."
 
-#: lib/Jifty/Action.pm:865
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77
+msgid "You may have mistyped your login or password. Give it another shot?"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LinkFacebookUser.pm:40
+msgid "You must be logged in to link your user to your Facebook account."
+msgstr ""
+
+#: lib/Jifty/Action.pm:948
 msgid "You need to fill in this field"
 msgstr "此字段非空."
 
@@ -707,31 +896,50 @@
 msgid "You said you wanted a pony. (Source %1)"
 msgstr "您不正想要一匹小马吗? (参见 %1)"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:69
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:45 lib/Jifty/Plugin/Authentication/Password/View.pm:96
 msgid "You're already logged in."
 msgstr "您已经登录了."
 
-#: lib/Jifty/Plugin/SkeletonApp/View.pm:34 share/web/templates/_elements/sidebar:7
+#: lib/Jifty/Plugin/SkeletonApp/View.pm:34 share/web/templates/_elements/sidebar:6
 msgid "You're not currently signed in."
 msgstr "您目前尚未登录."
 
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LinkFacebookUser.pm:72
+#. (Jifty->web->current_user->user_object->facebook_name)
+msgid "Your account has been successfully linked to your Facebook user %1!"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:38
 msgid "Your browser can remember your login for you"
 msgstr "下次开启浏览器时, 是否保持登录状态?"
 
+#: lib/Jifty/Plugin/Comment/Action/CreateComment.pm:268
+msgid "Your comment has been added. If it does not immediately appear, it may have been flagged for moderation and should appear shortly."
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:87
 msgid "Your password has been reset.  Welcome back."
 msgstr "您的密码已被重设. 欢迎回来."
 
-#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:28
+#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:63
 msgid "Your password should be at least six characters"
 msgstr "密码长度至少为6位"
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:246
+#: lib/Jifty/Plugin/Comment/Notification/CommentNeedsModeration.pm:67
+#. ($appname, $comment->title)
+msgid "[%1] Moderate comment: %2"
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/Notification/CommentPublished.pm:65
+#. ($appname, $comment->title)
+msgid "[%1] New comment: %2"
+msgstr ""
+
+#:
 msgid "asc"
 msgstr "升序"
 
-#: lib/Jifty/Plugin/AdminUI/View-not-yet.pm:264
+#:
 msgid "desc"
 msgstr "降序"
 
@@ -743,6 +951,19 @@
 msgid "for now, and try to forget that we let you down."
 msgstr ""
 
+#: lib/Jifty/Plugin/Comment/View.pm:87
+#. ($status)
+msgid "mark as %1"
+msgstr ""
+
+#: lib/Jifty/Action/Record.pm:444
+msgid "no value"
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/View.pm:100
+msgid "publish"
+msgstr ""
+
 #: lib/Jifty/Manual/PageRegions.pod:188
 msgid "text of the link"
 msgstr "链接文字"
@@ -755,6 +976,10 @@
 msgid "type your password again"
 msgstr "重新输入密码"
 
-#: lib/Jifty/Action.pm:1050
+#: lib/Jifty/Plugin/Comment/View.pm:100
+msgid "unpublish"
+msgstr ""
+
+#: lib/Jifty/Action.pm:1174
 msgid "warning"
 msgstr "警告"

Modified: jifty/trunk/share/po/zh_tw.po
==============================================================================
--- jifty/trunk/share/po/zh_tw.po	(original)
+++ jifty/trunk/share/po/zh_tw.po	Thu Sep  4 06:42:06 2008
@@ -14,6 +14,20 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lib/Jifty/Plugin/Comment/Notification/CommentPublished.pm:71
+#. ($url,        $self->parent->title,        $comment->title,         $from,         $comment->created_on->strftime('%A, %B %d, %Y @ %H:%M%P')
+msgid ""
+"\n"
+"View Comment: %1\n"
+"\n"
+"On Post: %2\n"
+"Subject: %3\n"
+"From: %4\n"
+"Date: %5\n"
+"\n"
+"%6\n"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Notification/ConfirmLostPassword.pm:38
 #. ($appname,$confirm_url)
 msgid ""
@@ -134,7 +148,7 @@
 msgid "%1 line %2"
 msgstr "%1 第 %2 列"
 
-#: share/web/templates/__jifty/halo:119
+#: lib/Jifty/Plugin/SQLQueries.pm:186 share/web/templates/__jifty/halo:122
 #. ($_->[3])
 msgid "%1 seconds"
 msgstr "%1 秒"
@@ -153,6 +167,10 @@
 msgid "(any)"
 msgstr "(不限)"
 
+#: lib/Jifty/Plugin/AutoReference.pm:95
+msgid "- none -"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/ConfirmEmail.pm:58
 msgid ". Your email address has now been confirmed."
 msgstr ". 現已成功確認您的電郵地址."
@@ -170,19 +188,23 @@
 msgid "Actions"
 msgstr "操作"
 
-#: lib/Jifty/Plugin/SkeletonApp/Dispatcher.pm:33
+#: lib/Jifty/Plugin/Comment/View.pm:165
+msgid "Add a comment"
+msgstr ""
+
+#: lib/Jifty/Plugin/AdminUI/Dispatcher.pm:34
 msgid "Administration"
 msgstr "管理介面"
 
-#: lib/Jifty/View/Declare/Page.pm:176 share/web/templates/_elements/wrapper:11
+#: lib/Jifty/View/Declare/Page.pm:180 share/web/templates/_elements/wrapper:11
 msgid "Administration mode is enabled."
 msgstr "系統管理模式開啟中."
 
-#: lib/Jifty/View/Declare/Page.pm:173 share/web/templates/_elements/wrapper:11
+#: lib/Jifty/View/Declare/Page.pm:177 share/web/templates/_elements/wrapper:11
 msgid "Alert"
 msgstr "請注意"
 
-#: lib/Jifty/Action/Record/Create.pm:92
+#: lib/Jifty/Action/Record/Create.pm:105
 msgid "An error occurred.  Try again later"
 msgstr "系統無法執行此項操作, 請稍後再試"
 
@@ -194,7 +216,7 @@
 msgid "Anyway, the software has logged this error."
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:53
+#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:54
 msgid "Authentication token"
 msgstr ""
 
@@ -206,20 +228,26 @@
 msgid "Back to the application"
 msgstr "回到應用程式"
 
-#: share/web/templates/__jifty/halo:117
+#: lib/Jifty/Plugin/SQLQueries.pm:175 share/web/templates/__jifty/halo:120
 msgid "Bindings"
 msgstr "快速鍵"
 
+#: lib/Jifty/Plugin/Comment/View.pm:138 lib/Jifty/Plugin/Comment/View.pm:197
+#. ($poster,                     $created_on->strftime('%A, %B %d, %Y @ %H:%M%P')
+#. ($poster,                             $created_on->strftime('%A, %B %d, %Y @ %H:%M%P')
+msgid "By %1 %2"
+msgstr ""
+
 #: share/web/templates/helpers/calendar.html:4
 #. (_ &><body class="calpopup"><a href="#" onclick="window.close()
 msgid "Calendar"
 msgstr "日曆"
 
-#: lib/Jifty/View/Declare/CRUD.pm:417
+#: lib/Jifty/View/Declare/CRUD.pm:434
 msgid "Cancel"
 msgstr "取消"
 
-#: share/web/templates/__jifty/halo:81
+#: share/web/templates/__jifty/halo:84
 msgid "Children"
 msgstr "子元件"
 
@@ -239,16 +267,16 @@
 msgid "Continue"
 msgstr ""
 
-#: lib/Jifty/View/Declare/CRUD.pm:668
+#: lib/Jifty/View/Declare/CRUD.pm:723
 msgid "Create"
 msgstr "建立"
 
-#: lib/Jifty/Action/Record/Create.pm:91
+#: lib/Jifty/Action/Record/Create.pm:104
 #. (ref($record)
 msgid "Create of %1 failed: %2"
 msgstr "無法建立 %1: %2"
 
-#: lib/Jifty/Action/Record/Create.pm:118
+#: lib/Jifty/Action/Record/Create.pm:131
 msgid "Created"
 msgstr "成功建立項目."
 
@@ -256,7 +284,7 @@
 msgid "Database Administration"
 msgstr "資料庫管理"
 
-#: lib/Jifty/View/Declare/CRUD.pm:427
+#: lib/Jifty/View/Declare/CRUD.pm:444
 msgid "Delete"
 msgstr "刪除"
 
@@ -272,12 +300,15 @@
 msgid "Done?"
 msgstr "設定完畢?"
 
-#: lib/Jifty/View/Declare/CRUD.pm:347 share/web/templates/__jifty/halo:126 share/web/templates/__jifty/halo:20
+#: share/web/templates/__jifty/halo:2
+msgid "Draw halos"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:366 share/web/templates/__jifty/halo:129 share/web/templates/__jifty/halo:23
 msgid "Edit"
 msgstr "編輯"
 
-#: lib/Jifty/Mason/Halo.pm:104
-#. ($comp_name)
+#:
 msgid "Edit %1"
 msgstr "編輯 %1"
 
@@ -293,19 +324,19 @@
 msgid "Email address confirmed?"
 msgstr "已確認電郵地址?"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:209
+#:
 msgid "Fill in your address below, and we'll send out another confirmation email to you. "
 msgstr "請填入您的電郵,我們會再寄一封確認信給您."
 
-#: lib/Jifty/Action.pm:1312
+#: lib/Jifty/Action.pm:1309
 msgid "Foo cannot contain -, *, +, or ?."
 msgstr ""
 
-#: lib/Jifty/Action.pm:1306
+#: lib/Jifty/Action.pm:1303
 msgid "Foo cannot contain uppercase letters."
 msgstr ""
 
-#: lib/Jifty/Action.pm:1285
+#: lib/Jifty/Action.pm:1282
 msgid "Foo values are always in lowercase."
 msgstr ""
 
@@ -334,18 +365,24 @@
 msgid "Hello, %1!"
 msgstr "%1 您好!"
 
-#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:103 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:137 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:147
 #. (Jifty->web->current_user->user_object->facebook_name)
+#. (Jifty->web->current_user->user_object->name)
 msgid "Hi %1!"
 msgstr ""
 
+#: lib/Jifty/Plugin/I18N/Action/SetLang.pm:44
+#. (DateTime::Locale->load($lang)
+msgid "Hi, we speak %1."
+msgstr ""
+
 #: lib/Jifty/Plugin/SkeletonApp/View.pm:31 share/web/templates/_elements/sidebar:4
 #. ($u->username)
 #. (Jifty->web->current_user->username)
 msgid "Hiya, %1."
 msgstr "%1 您好."
 
-#: lib/Jifty/Plugin/SkeletonApp/Dispatcher.pm:26
+#: lib/Jifty/Plugin/SkeletonApp/Dispatcher.pm:31
 msgid "Home"
 msgstr "首頁"
 
@@ -353,7 +390,7 @@
 msgid "How should I display your name to other users?"
 msgstr "您在本系統的代號"
 
-#: lib/Jifty/Action.pm:1212
+#: lib/Jifty/Action.pm:1214
 msgid "I changed $field for you"
 msgstr ""
 
@@ -365,27 +402,23 @@
 msgid "If the username provided conflicts with an existing username or contains invalid characters, you will have to give us a new one."
 msgstr ""
 
-#: lib/Jifty/Plugin/OpenID/View.pm:27
-msgid "If you have a Livejournal or other OpenID account, you don't even need to sign up. Just log in."
-msgstr ""
-
-#: lib/Jifty/Plugin/ErrorTemplates/View.pm:62
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:64
 msgid "Internal error"
 msgstr ""
 
-#: lib/Jifty/Plugin/OpenID/Action/AuthenticateOpenID.pm:59
+#: lib/Jifty/Plugin/OpenID/Action/AuthenticateOpenID.pm:53
 msgid "Invalid OpenID URL.  Please check to make sure it is correct.  (@{[$csr->err]})"
 msgstr "不正確的 OpenID 網址. (@{[$csr->err]})"
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:63 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:62 lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:75 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:79
 msgid "It doesn't look like there's an account by that name."
 msgstr "沒有這個帳號."
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:106
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:107
 msgid "It looks like somebody else is using that address. Is there a chance you have another account?"
 msgstr "已經有其他人使用這個電郵地址. 您是否已經有其他帳號了?"
 
-#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:43
+#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:45
 msgid "It looks like someone is already using that OpenID."
 msgstr "已經有其他人使用此 OpenID."
 
@@ -413,11 +446,15 @@
 msgid "Jifty Pod Online"
 msgstr "Jifty 線上 POD 文件"
 
-#: lib/Jifty/View/Declare/Page.pm:194 share/web/templates/_elements/wrapper:18
+#: lib/Jifty/Plugin/I18N/Action/SetLang.pm:12
+msgid "Language"
+msgstr ""
+
+#: lib/Jifty/View/Declare/Page.pm:198 share/web/templates/_elements/wrapper:18
 msgid "Loading..."
 msgstr "請稍候..."
 
-#: lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132 lib/Jifty/Plugin/Authentication/Password/View.pm:88
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:23 lib/Jifty/Plugin/Authentication/Password/Dispatcher.pm:132
 msgid "Login"
 msgstr "登入"
 
@@ -433,11 +470,19 @@
 msgid "Login with a password"
 msgstr "使用密碼登入"
 
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:28
+msgid "Login with your Ldap account"
+msgstr ""
+
 #: lib/Jifty/Plugin/OpenID/View.pm:17
 msgid "Login with your OpenID"
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:57
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:35
+msgid "Login with your ldap account"
+msgstr ""
+
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:22 lib/Jifty/Plugin/Authentication/Password/View.pm:57
 msgid "Login!"
 msgstr "登入!"
 
@@ -465,11 +510,11 @@
 msgid "Models"
 msgstr "模型"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:114
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:115
 msgid "New password"
 msgstr "新的密碼"
 
-#: lib/Jifty/View/Declare/CRUD.pm:628
+#: lib/Jifty/View/Declare/CRUD.pm:654
 msgid "Next Page"
 msgstr "下一頁"
 
@@ -489,11 +534,15 @@
 msgid "No items found"
 msgstr "未找到記錄"
 
-#: lib/Jifty/View/Declare/CRUD.pm:547
+#: lib/Jifty/View/Declare/CRUD.pm:569
 msgid "No items found."
 msgstr ""
 
-#: lib/Jifty/Web.pm:307
+#: lib/Jifty/Plugin/Comment/View.pm:304
+msgid "No one has made a comment yet."
+msgstr ""
+
+#: lib/Jifty/Web.pm:306
 msgid "No request to handle"
 msgstr "沒有可處理的要求"
 
@@ -513,36 +562,36 @@
 msgid "OpenID URL"
 msgstr "OpenID 網址"
 
-#: lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm:54
+#: lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm:48
 msgid "OpenID verification failed.  It looks like you cancelled the OpenID verification request."
 msgstr ""
 
-#: lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm:63
+#: lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm:57
 msgid "OpenID verification failed: "
 msgstr ""
 
-#: lib/Jifty/View/Declare/CRUD.pm:595
+#: lib/Jifty/View/Declare/CRUD.pm:621
 #. ($page, $collection->pager->last_page)
 msgid "Page %1 of %2"
 msgstr "第 %1 頁, 共 %2 頁"
 
-#: share/web/templates/__jifty/halo:1
+#: share/web/templates/__jifty/halo:3
 msgid "Page info"
 msgstr "頁面資訊"
 
-#: share/web/templates/__jifty/halo:72
+#: share/web/templates/__jifty/halo:75
 msgid "Parent"
 msgstr "上層元件"
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:29 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:59
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:28 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:29 lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:32 lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:60
 msgid "Password"
 msgstr "密碼"
 
-#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:134
+#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:136
 msgid "Passwords need to be at least six characters long"
 msgstr "密碼至少需要有六個字"
 
-#: lib/Jifty/Record.pm:485 lib/Jifty/Record.pm:564 lib/Jifty/Record.pm:71
+#: lib/Jifty/Action/Record/Delete.pm:61 lib/Jifty/Action/Record/Update.pm:180 lib/Jifty/Action/Record/Update.pm:187 lib/Jifty/Record.pm:508 lib/Jifty/Record.pm:567 lib/Jifty/Record.pm:70
 msgid "Permission denied"
 msgstr "權限不足."
 
@@ -550,11 +599,15 @@
 msgid "Please email us!"
 msgstr "請寫信通知我們!"
 
-#: lib/Jifty/View/Declare/CRUD.pm:617
+#: lib/Jifty/Plugin/Comment/View.pm:221
+msgid "Preview"
+msgstr ""
+
+#: lib/Jifty/View/Declare/CRUD.pm:643
 msgid "Previous Page"
 msgstr "上一頁"
 
-#: lib/Jifty/View/Declare/CRUD.pm:430
+#: lib/Jifty/View/Declare/CRUD.pm:447
 msgid "Really delete?"
 msgstr ""
 
@@ -570,12 +623,12 @@
 msgid "Remember me?"
 msgstr "記住我?"
 
-#: share/web/templates/__jifty/halo:69
+#: share/web/templates/__jifty/halo:72
 #. ($frame->{'render_time'})
 msgid "Rendered in %1s"
 msgstr "頁面繪製時間: %1 秒"
 
-#:
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:108 lib/Jifty/Plugin/Authentication/Password/View.pm:112
 msgid "Reset lost password"
 msgstr "重設密碼"
 
@@ -583,11 +636,11 @@
 msgid "Run the action"
 msgstr "執行動作"
 
-#: share/web/templates/__jifty/halo:111
+#: share/web/templates/__jifty/halo:114
 msgid "SQL Statements"
 msgstr "SQL 陳述式"
 
-#: lib/Jifty/View/Declare/CRUD.pm:408
+#: lib/Jifty/View/Declare/CRUD.pm:425
 msgid "Save"
 msgstr "儲存"
 
@@ -595,19 +648,19 @@
 msgid "Schema"
 msgstr "綱要"
 
-#: lib/Jifty/View/Declare/CRUD.pm:298
+#: lib/Jifty/View/Declare/CRUD.pm:314
 msgid "Search"
 msgstr "搜尋"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:150 lib/Jifty/Plugin/Authentication/Password/View.pm:180
+#:
 msgid "Send"
 msgstr "寄出"
 
-#:
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:147
 msgid "Send a link to reset your password"
 msgstr "寄送重設密碼的鏈結"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:175
+#:
 msgid "Send a password reminder"
 msgstr "重設密碼"
 
@@ -636,7 +689,7 @@
 msgid "Something went awry"
 msgstr ""
 
-#: lib/Jifty/Plugin/ErrorTemplates/View.pm:124 share/web/templates/dhandler:1
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:125 share/web/templates/dhandler:1
 msgid "Something's not quite right"
 msgstr "系統錯誤"
 
@@ -644,10 +697,18 @@
 msgid "Sorry about this."
 msgstr "非常抱歉."
 
-#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62
+#: lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm:62 lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:107 plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:115
 msgid "Sorry, something weird happened (we couldn't create a user for you).  Try again later."
 msgstr ""
 
+#: lib/Jifty/Action/Record/Execute.pm:55
+msgid "Start"
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/View.pm:236
+msgid "Submit"
+msgstr ""
+
 #:
 msgid "Table of Contents"
 msgstr "目錄"
@@ -657,32 +718,40 @@
 msgid "Tell us what's good, what's bad, and what else you want %1 to do!"
 msgstr ""
 
-#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:99
+#: lib/Jifty/Plugin/User/Mixin/Model/User.pm:100
 #. ($new_email)
 msgid "That %1 doesn't look like an email address."
 msgstr ""
 
-#: lib/Jifty/Action.pm:975
+#: lib/Jifty/Action.pm:1056
 msgid "That doesn't look like a correct value"
 msgstr "欄位格式錯誤."
 
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:46
+msgid "That doesn't look like a valid login."
+msgstr ""
+
+#: plugins/Authentication-CAS/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm:47
+msgid "That doesn't look like a valid ticket."
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm:68 lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm:72 lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm:70
 msgid "That doesn't look like an email address."
 msgstr ""
 
-#: lib/Jifty/Action/Record.pm:300
+#: lib/Jifty/Action/Record.pm:351
 msgid "That doesn't look right, but I don't know why"
 msgstr "欄位內容錯誤."
 
-#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:48
+#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:50
 msgid "The OpenID '$openid' has been linked to your account."
 msgstr ""
 
-#: lib/Jifty/Action/Record.pm:205
+#: lib/Jifty/Action/Record.pm:219
 msgid "The passwords you typed didn't match each other"
 msgstr "兩組密碼不符合."
 
-#: lib/Jifty/Web.pm:428
+#: lib/Jifty/Web.pm:427
 msgid "There was an error completing the request.  Please try again later."
 msgstr "系統執行錯誤, 請稍候再試."
 
@@ -702,11 +771,11 @@
 msgid "To disable this administrative console, add \"AdminMode: 0\" under the \"framework:\" settings in the config file (etc/config.yml)."
 msgstr "如欲停用管理介面, 請在設定檔 (etc/config.yml) 的 \"framework:\" 設定內加上 \"AdminMode: 0\" 即可."
 
-#: lib/Jifty/View/Declare/CRUD.pm:515
+#: lib/Jifty/View/Declare/CRUD.pm:533
 msgid "Toggle search"
 msgstr "切換搜尋畫面"
 
-#: lib/Jifty/Plugin/ErrorTemplates/View.pm:173 share/web/templates/__jifty/error/mason_internal_error:6
+#: lib/Jifty/Plugin/ErrorTemplates/View.pm:175 share/web/templates/__jifty/error/mason_internal_error:6
 msgid "Try again"
 msgstr "再試一下"
 
@@ -718,15 +787,15 @@
 msgid "Type that again?"
 msgstr "請再輸入一次"
 
-#: lib/Jifty/Action/Record/Update.pm:168
+#: lib/Jifty/Action/Record/Update.pm:214
 msgid "Updated"
 msgstr "成功更新項目."
 
-#: share/web/templates/__jifty/halo:93
+#: share/web/templates/__jifty/halo:96
 msgid "Variables"
 msgstr "變數"
 
-#: lib/Jifty.pm:27
+#: lib/Jifty.pm:29
 msgid "W00t"
 msgstr "喔耶"
 
@@ -743,11 +812,11 @@
 msgid "Welcome %1 to the %2"
 msgstr "歡迎 %1 蒞臨 %2"
 
-#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:64
+#: lib/Jifty/Plugin/OpenID/Dispatcher.pm:66
 msgid "Welcome back, "
 msgstr ""
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:182
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:194
 #. ($user->name)
 msgid "Welcome back, %1."
 msgstr "歡迎回來, %1."
@@ -766,11 +835,11 @@
 msgid "Welcome to %1, %2. "
 msgstr "歡迎光臨 %1, %2. "
 
-#: lib/Jifty/Plugin/SkeletonApp/View.pm:76 share/web/templates/index.html:1
+#: lib/Jifty/Plugin/SkeletonApp/View.pm:75 share/web/templates/index.html:1
 msgid "Welcome to your new Jifty application"
 msgstr "歡迎光臨您嶄新的 Jifty 應用程式"
 
-#: lib/Jifty/Plugin/OpenID/Action/CreateOpenIDUser.pm:104
+#: lib/Jifty/Plugin/OpenID/Action/CreateOpenIDUser.pm:94
 msgid "Welcome, "
 msgstr ""
 
@@ -794,32 +863,36 @@
 msgid "You have already confirmed your account."
 msgstr "您已經確認過這個帳號了."
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:146
+#: lib/Jifty/Plugin/Authentication/Password/View.pm:148
 msgid "You lost your password. A link to reset it will be sent to the following email address:"
 msgstr "您忘記密碼了.我們會寄送一個重設密碼的連結到下面的電郵地址:"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:176
+#:
 msgid "You lost your password. A reminder will be send to the following mail:"
 msgstr "您忘記密碼了.我們會寄送一份提示到下面的電郵地址:"
 
-#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:146 lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:152
+#: lib/Jifty/Plugin/Authentication/Password/Action/Login.pm:138
 msgid "You may have mistyped your email or password. Give it another shot."
 msgstr "你可能打錯了電郵或密碼.請再試一次"
 
+#: lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm:77
+msgid "You may have mistyped your login or password. Give it another shot?"
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Facebook/Action/LinkFacebookUser.pm:40
 msgid "You must be logged in to link your user to your Facebook account."
 msgstr ""
 
-#: lib/Jifty/Action.pm:962
+#: lib/Jifty/Action.pm:948
 msgid "You need to fill in this field"
 msgstr "此欄位不能留空."
 
-#: lib/Jifty/Plugin/SkeletonApp/View.pm:76 share/web/templates/index.html:3
+#: lib/Jifty/Plugin/SkeletonApp/View.pm:75 share/web/templates/index.html:3
 #. ('http://hdl.loc.gov/loc.pnp/cph.3c13461')
 msgid "You said you wanted a pony. (Source %1)"
 msgstr "您可不正是想要一匹小馬嗎? (參見 %1)"
 
-#: lib/Jifty/Plugin/Authentication/Password/View.pm:96
+#: lib/Jifty/Plugin/Authentication/Ldap/View.pm:45 lib/Jifty/Plugin/Authentication/Password/View.pm:96
 msgid "You're already logged in."
 msgstr "您已經登入了."
 
@@ -836,14 +909,28 @@
 msgid "Your browser can remember your login for you"
 msgstr "下次開啟瀏覽器時, 是否保留您的登入狀態?"
 
+#: lib/Jifty/Plugin/Comment/Action/CreateComment.pm:268
+msgid "Your comment has been added. If it does not immediately appear, it may have been flagged for moderation and should appear shortly."
+msgstr ""
+
 #: lib/Jifty/Plugin/Authentication/Password/Action/ResetLostPassword.pm:87
 msgid "Your password has been reset.  Welcome back."
 msgstr "成功重設您的密碼. 歡迎回來."
 
-#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:61
+#: lib/Jifty/Plugin/Authentication/Password/Mixin/Model/User.pm:63
 msgid "Your password should be at least six characters"
 msgstr "您的密碼必須至少有六個字"
 
+#: lib/Jifty/Plugin/Comment/Notification/CommentNeedsModeration.pm:67
+#. ($appname, $comment->title)
+msgid "[%1] Moderate comment: %2"
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/Notification/CommentPublished.pm:65
+#. ($appname, $comment->title)
+msgid "[%1] New comment: %2"
+msgstr ""
+
 #:
 msgid "asc"
 msgstr "遞增"
@@ -860,6 +947,19 @@
 msgid "for now, and try to forget that we let you down."
 msgstr ""
 
+#: lib/Jifty/Plugin/Comment/View.pm:87
+#. ($status)
+msgid "mark as %1"
+msgstr ""
+
+#: lib/Jifty/Action/Record.pm:444
+msgid "no value"
+msgstr ""
+
+#: lib/Jifty/Plugin/Comment/View.pm:100
+msgid "publish"
+msgstr ""
+
 #: lib/Jifty/Manual/PageRegions.pod:188
 msgid "text of the link"
 msgstr "連結文字"
@@ -872,6 +972,10 @@
 msgid "type your password again"
 msgstr "請再次鍵入您的密碼"
 
-#: lib/Jifty/Action.pm:1172
+#: lib/Jifty/Plugin/Comment/View.pm:100
+msgid "unpublish"
+msgstr ""
+
+#: lib/Jifty/Action.pm:1174
 msgid "warning"
 msgstr ""


More information about the Jifty-commit mailing list