Merge branch 'release/0.8' into develop

Conflicts:
    locale/he_IL/app.po
    locale/id/app.po

15 files changed, 140 insertions, 103 deletions

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index d93e68dab..e90f03187 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -79,7 +79,7 @@ class AdminController < ApplicationController
             return
         else
             if session[:using_admin].nil? || session[:admin_name].nil?
-                if params[:emergency].nil?
+                if params[:emergency].nil? || Configuration::disable_emergency_user
                     if authenticated?(
                                       :web => _("To log into the administrative interface"),
                                       :email => _("Then you can log into the administrative interface"),
@@ -89,7 +89,6 @@ class AdminController < ApplicationController
                             session[:using_admin] = 1
                             session[:admin_name] = @user.url_name
                         else
-
                             session[:using_admin] = nil
                             session[:user_id] = nil
                             session[:admin_name] = nil
diff --git a/app/views/admin_general/admin.coffee b/app/views/admin_general/admin.coffee
index 8f9e879ae..3d39369a4 100644
--- a/app/views/admin_general/admin.coffee
+++ b/app/views/admin_general/admin.coffee
@@ -10,7 +10,7 @@ jQuery ->
         false)
     $('#request_hidden_user_explanation_reasons input').live('click', ->
         $('#request_hidden_user_subject, #request_hidden_user_explanation, #request_hide_button').show()
-        info_request_id = $('#hide_request_form').attr('info_request_id')
+        info_request_id = $('#hide_request_form').attr('data-info-request-id')
         reason = $(this).val()
         $('#request_hidden_user_explanation_field').attr("value", "[loading default text...]")
         $.ajax "/hidden_user_explanation?reason=" + reason + "&info_request_id=" + info_request_id,
diff --git a/app/views/admin_general/admin.js b/app/views/admin_general/admin.js
index 61382dab3..9daa51459 100644
--- a/app/views/admin_general/admin.js
+++ b/app/views/admin_general/admin.js
@@ -14,7 +14,7 @@
     return $('#request_hidden_user_explanation_reasons input').live('click', function() {
       var info_request_id, reason;
       $('#request_hidden_user_subject, #request_hidden_user_explanation, #request_hide_button').show();
-      info_request_id = $('#hide_request_form').attr('info_request_id');
+      info_request_id = $('#hide_request_form').attr('data-info-request-id');
       reason = $(this).val();
       $('#request_hidden_user_explanation_field').attr("value", "[loading default text...]");
       return $.ajax("/hidden_user_explanation?reason=" + reason + "&info_request_id=" + info_request_id, {
diff --git a/app/views/admin_general/admin_js.erb b/app/views/admin_general/admin_js.erb
index 61382dab3..c8788a452 100644
--- a/app/views/admin_general/admin_js.erb
+++ b/app/views/admin_general/admin_js.erb
@@ -1,4 +1,5 @@
 (function() {
+
   jQuery(function() {
     $('.locales a:first').tab('show');
     $('.accordion-body').on('hidden', function() {
@@ -14,7 +15,7 @@
     return $('#request_hidden_user_explanation_reasons input').live('click', function() {
       var info_request_id, reason;
       $('#request_hidden_user_subject, #request_hidden_user_explanation, #request_hide_button').show();
-      info_request_id = $('#hide_request_form').attr('info_request_id');
+      info_request_id = $('#hide_request_form').attr('data-info-request-id');
       reason = $(this).val();
       $('#request_hidden_user_explanation_field').attr("value", "[loading default text...]");
       return $.ajax("/hidden_user_explanation?reason=" + reason + "&info_request_id=" + info_request_id, {
@@ -29,4 +30,5 @@
       });
     });
   });
+
 }).call(this);
diff --git a/app/views/admin_request/show.rhtml b/app/views/admin_request/show.rhtml
index 1401a7b94..8606d21fa 100644
--- a/app/views/admin_request/show.rhtml
+++ b/app/views/admin_request/show.rhtml
@@ -121,7 +121,7 @@
       <p class="help-block">(see also option to general URLs for individual incoming messages below)</p>
     </div>
   </div>
-  <% form_tag admin_request_hide_path(@info_request), :class => "form form-inline", :id => "hide_request_form" do %>
+  <% form_tag admin_request_hide_path(@info_request), :class => "form form-inline", :id => "hide_request_form", 'data-info-request-id' => @info_request.id.to_s do %>
     <div class="control-group">
       <% if  @info_request.is_external? %>
         <label class="control-label">Hide the request:</label>
diff --git a/app/views/user/sign.rhtml b/app/views/user/sign.rhtml
index 6a1979155..5e8cced91 100644
--- a/app/views/user/sign.rhtml
+++ b/app/views/user/sign.rhtml
@@ -12,7 +12,9 @@
         <% end %>
   </p>
         <% if @post_redirect.post_params["controller"] == "admin_general" %>
-         <p id="superuser_message">Don't have a superuser account yet?  <%= link_to "Sign in as the emergency user", @post_redirect.uri + "?emergency=1" %></p>
+          <% unless Configuration::disable_emergency_user %>
+           <p id="superuser_message">Don't have a superuser account yet?  <%= link_to "Sign in as the emergency user", @post_redirect.uri + "?emergency=1" %></p>
+          <% end %>
         <% end %>
 
     <%= render :partial => 'signin', :locals => { :sign_in_as_existing_user => true } %>
diff --git a/config/environment.rb b/config/environment.rb
index b1cf659bb..fae6405c4 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -43,7 +43,7 @@ require File.join(File.dirname(__FILE__), '../lib/old_rubygems_patch')
 require 'configuration'
 
 # Application version
-ALAVETELI_VERSION = '0.7'
+ALAVETELI_VERSION = '0.8'
 
 Rails::Initializer.run do |config|
   # Load intial mySociety config
diff --git a/config/general.yml-example b/config/general.yml-example
index 5005fda77..17e1aa552 100644
--- a/config/general.yml-example
+++ b/config/general.yml-example
@@ -88,6 +88,7 @@ BLACKHOLE_PREFIX: 'do-not-reply-to-this-address'
 # The emergency user
 ADMIN_USERNAME: 'adminxxxx'
 ADMIN_PASSWORD: 'passwordx'
+DISABLE_EMERGENCY_USER: false
 
 # Set this to true, and the admin interface will be available to anonymous users
 SKIP_ADMIN_AUTH: false
diff --git a/doc/ADMIN.md b/doc/ADMIN.md
index 059010e68..07fe9398d 100644
--- a/doc/ADMIN.md
+++ b/doc/ADMIN.md
@@ -16,6 +16,6 @@ The javascript is included in a funky way
 To change it, edit the coffeescript at
 `lib/view/general/admin.coffee`, and then do something like:
 
-    $ coffee -o /tmp/ -c lib/views/general/admin.coffee
-    $ mv /tmp/admin.js lib/views/general/admin_js.erb
+    $ coffee -o /tmp/ -c app/views/admin_general/admin.coffee
+    $ mv /tmp/admin.js app/views/admin_general/admin_js.erb
 
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
index 59c2d3f37..debf9d7c7 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -1,3 +1,22 @@
+# Version 0.8
+## Highlighted features
+* Support for running the site over SSL/TLS only and corresponding removal of support for a proxied admin interface, including the deprecation of the main_url and admin_url helpers.
+* Merging of the adminbootstrap theme into core Alaveteli, replacing the existing admin theme. (Matthew Landauer)
+* Move to HTML 5 (Matthew Landauer)
+* More consistent UI for links in the admin interface
+* [Security] Upgrades the Rails version to 2.3.17 to get fixes for CVE-2013-0277, CVE-2013-0276 (Although core Alaveteli does not use serialize or attr_protected), upgrade JSON gem to get fix for CVE-2013-0269.
+* A bugfix for Chrome's autofilling of signup fields (Vaughan Rouesnel)
+* Improvements to the accessibility of the search boxes (Nathan Jenkins)
+* Only one email sent when asking for admin attention to a request  [issue #789](https://github.com/mysociety/alaveteli/pull/864) (Matthew Landauer)
+* A number of XSS escaping fixes for Version 0.7 (Matthew Landauer)
+* The emergency admin account can now be disabled
+
+## Upgrade notes
+* Check out this version and run `rails-post-deploy` as usual.
+* Remove adminbootstrap from the THEME_URLS or THEME_URL config variable, and remove vendor/plugins/adminbootstraptheme, and the softlink public/adminbootstraptheme.
+* There is a new config variable FORCE_SSL, which defaults to true, meaning that Alaveteli will redirect all "http" requests to "https", set the Strict-Transport-Security header and flag all cookies as "secure". For more information about running your install over SSL/TLS, see the [install guide](https://github.com/mysociety/alaveteli/blob/develop/doc/INSTALL.md#set-up-production-web-server). If you don't want to run over SSL/TLS, add the config variable FORCE_SSL to your config/general.yml and set it to false.
+* If you would like to disable the emergency user account, set DISABLE_EMERGENCY_USER to true in you config/general.yml
+
 # Version 0.7
 ## Highlighted features
 * [Security] Upgrades the Rails version from 2.3.15 to 2.3.16 to get fix for a critical security flaw in Rails (CVE-2013-0333).
diff --git a/doc/INSTALL.md b/doc/INSTALL.md
index c8ce6390f..2156f4c4a 100644
--- a/doc/INSTALL.md
+++ b/doc/INSTALL.md
@@ -301,7 +301,7 @@ There is an emergency user account which can be accessed via
 `/admin?emergency=1`, using the credentials `ADMIN_USERNAME` and
 `ADMIN_PASSWORD`, which are set in `general.yml`.  To bootstrap the
 first `super` level accounts, you will need to log in as the emergency
-user.
+user. You can disable the emergency user account by setting `DISABLE_EMERGENCY_USER` to `true` in `general.yml`.
 
 Users with the superuser role also have extra privileges in the
 website frontend, such as being able to categorise any request, being
diff --git a/lib/configuration.rb b/lib/configuration.rb
index f155ed7a4..fca48782e 100644
--- a/lib/configuration.rb
+++ b/lib/configuration.rb
@@ -6,6 +6,7 @@ module Configuration
   DEFAULTS = {
     :ADMIN_PASSWORD => '',
     :ADMIN_USERNAME => '',
+    :DISABLE_EMERGENCY_USER => false,
     :AVAILABLE_LOCALES => '',
     :BLACKHOLE_PREFIX => 'do-not-reply-to-this-address',
     :BLOG_FEED => '',
diff --git a/locale/he_IL/app.po b/locale/he_IL/app.po
index bbff26bbe..accd6da10 100644
--- a/locale/he_IL/app.po
+++ b/locale/he_IL/app.po
@@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: alaveteli\n"
 "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
 "POT-Creation-Date: 2013-03-14 14:02-0700\n"
-"PO-Revision-Date: 2013-03-14 21:07+0000\n"
-"Last-Translator: louisecrow <louise@mysociety.org>\n"
+"PO-Revision-Date: 2013-03-18 19:01+0000\n"
+"Last-Translator: yauzi <yair.uziel@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: he_IL\n"
 "MIME-Version: 1.0\n"
@@ -57,7 +57,7 @@ msgid " Ideas on what <strong>other documents to request</strong> which the auth
 msgstr "רעיונות ל<strong>מסמכים נוספים</strong> שיש בידי הרשויות, <strong>שניתן לבקשם</strong>."
 
 msgid " If you know the address to use, then please <a href=\"%s\">send it to us</a>.\\n        You may be able to find the address on their website, or by phoning them up and asking."
-msgstr ""
+msgstr "אם אתם יודעים את הכתובת, נא <a href=\"%s\">שלחו לנו</a>.\\n        הכתובת נמצאת באתר האינטרנט שלהם, או שתבררו אותה בשיחת טלפון."
 
 msgid " Include relevant links, such as to a campaign page, your blog or a\\n            twitter account. They will be made clickable. \\n            e.g."
 msgstr "הוסיפו קישורים מתאימים כמו למשל לדף הקמפיין, לבלוג שלכם או לטוויטר. יהיה ניתן להקליק עליהם n\\. למשל"
@@ -93,7 +93,7 @@ msgid " when you send this message."
 msgstr "כאשר אתם שולחים הודעה זו."
 
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
-msgstr ""
+msgstr "\"שלום! יש לנו  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">הודעה חשובה</a> למבקרים מחוץ ל-  {{country_name}}\""
 
 msgid "%d Freedom of Information request to %s"
 msgid_plural "%d Freedom of Information requests to %s"
@@ -129,7 +129,7 @@ msgid "*unknown*"
 msgstr ""
 
 msgid ",\\n\\n\\n\\nYours,\\n\\n{{user_name}}"
-msgstr ""
+msgstr ",\\n\\n\\n\\nשלכם,\\n\\n{{user_name}}"
 
 msgid "- or -"
 msgstr "- או -"
@@ -153,7 +153,7 @@ msgid "<a href=\"%s\">Are we missing a public authority?</a>"
 msgstr "<a href=\"%s\">האם חסר לנו גוף ציבורי?</a>"
 
 msgid "<a href=\"%s\">Are you the owner of\\n            any commercial copyright on this page?</a>"
-msgstr ""
+msgstr "<a href=\"%s\">האם אתם הבעלים של\\n            זכויות יוצרים מסחריות על עמוד זה?</a>"
 
 msgid "<a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add one</a>."
 msgstr "<a href=\"%s\">צפו בכולם</a> או <a href=\"%s\">בקשו מאיתנו להוסיף אחת</a>."
@@ -195,7 +195,7 @@ msgid "<p>Thanks for updating your profile photo.</p>\\n                <p><stro
 msgstr "<p>תודה על עדכון התמונה.</p><p><strong>ועכשיו...</strong> תוכלו להוסיף גם פרטים נוספים עליכם לדף הפרופיל.</p>"
 
 msgid "<p>We recommend that you edit your request and remove the email address.\\n                If you leave it, the email address will be sent to the authority, but will not be displayed on the site.</p>"
-msgstr ""
+msgstr "<p>אנו ממליצים שתסירו את כתובת הדוא\"ל מהבקשה שלכם.\\n                אם לא תסירו אותה, הכתובת תשלח לרשות, אבל לא תוצג באתר.</p>"
 
 msgid "<p>We're glad you got all the information that you wanted. If you write about or make use of the information, please come back and add an annotation below saying what you did.</p><p>If you found {{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to the charity which runs it.</p>"
 msgstr "<p>אנו שמחים שקיבלתם את המידע שביקשתם. אם אתם כותבים על המידע או משתמשים בו, נא חזרו לדף זה והוסיפו למטה הערה על מה שעשיתם. </p><p>אם מצאתם את  {{site_name}}שימושי, <a href=\"{{donation_url}}\">הרימו תרומה</a> לגוף שמפעיל אותו.</p>"
@@ -219,7 +219,7 @@ msgid "<p>{{site_name}} is currently in maintenance. You can only view existing
 msgstr "<p>{{site_name}} נמצא כעת בתחזוקה. ניתן לצפות בבקשות בלבד. לא ניתן להגיש בקשות חדשות, לעקוב, להוסיף הערות, או לעשות כל שינוי במידע שבאתר.</p> <p>{{read_only}}</p>"
 
 msgid "<small>If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way.</small>\\n</p>"
-msgstr ""
+msgstr "<small>אם אתם משתמשים בשירות דואר מבוסס רשת, בדקו את תיבת דואר הזבל שלכם.\\nbulk/spam ייתכן וההודעה שלנו סומנה ככזו בטעות.</small>\\n</p>"
 
 msgid "<span id='follow_count'>%d</span> person is following this authority"
 msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
@@ -280,16 +280,16 @@ msgid "<strong>Note:</strong> You're sending a message to yourself, presumably\\
 msgstr "<strong>הערה:</strong> אתם שולחים בקשה לעצמכם, כנראה כדי לנסות לראות איך זה עובד."
 
 msgid "<strong>Note:</strong>\\n    We will send an email to your new email address. Follow the\\n    instructions in it to confirm changing your email."
-msgstr ""
+msgstr "<strong>הערה:</strong>\\n    אנו נשלח הודעת אימות לכתובת הדוא\"ל החדשה שלך. עקבו אחר \\n    ההוראות כדי לאשר את שינוי הכתובת."
 
 msgid "<strong>Privacy note:</strong> If you want to request private information about\\n    yourself then <a href=\"%s\">click here</a>."
-msgstr ""
+msgstr "<strong>הערת פרטיות:</strong>אם תרצו לבקש מידע פרטי על\\n    עצמכם, <a href=\"%s\">הקליקו כאן</a>."
 
 msgid "<strong>Privacy note:</strong> Your photo will be shown in public on the Internet,\\n    wherever you do something on {{site_name}}."
-msgstr ""
+msgstr "<strong>הערת פרטיות:</strong> התמונה שלכם תוצג באופן פומבי באינטרנט,\\n    בכל פעם שתעשו משהו באתר {{site_name}}."
 
 msgid "<strong>Privacy warning:</strong> Your message, and any response\\n        to it, will be displayed publicly on this website."
-msgstr ""
+msgstr "<strong>אזהרת פרטיות:</strong> <strong>אזהרת פרטיות:</strong> ההודעה שלכם והתגובה שלי\\n        יוצגו באופן פומבי באתר זה."
 
 msgid "<strong>Some of the information</strong> has been sent "
 msgstr "<strong>חלק מהמידע</strong> נשלח "
@@ -340,7 +340,7 @@ msgid "Add an annotation"
 msgstr "הוסיפו הערה"
 
 msgid "Add an annotation to your request with choice quotes, or\\n                a <strong>summary of the response</strong>."
-msgstr ""
+msgstr "הוסיפו הערה לבקשה שלכם במרכאות, או \\n                 <strong>סיכום התגובה</strong>."
 
 msgid "Added on {{date}}"
 msgstr "התווסף בתאריך {{date}}"
@@ -361,7 +361,7 @@ msgid "Advise on whether the <strong>refusal is legal</strong>, and how to compl
 msgstr "מידע באשר <strong>לחוקיות הסירוב</strong>, וכיצד להתלונן אם הסירוב אינו חוקי."
 
 msgid "Air, water, soil, land, flora and fauna (including how these effect\\n            human beings)"
-msgstr ""
+msgstr "אויר, מים, אדמה, צמחים ובעלי חיים (כולל כיצד הם משפיעים\\n           על בני האדם)"
 
 msgid "All of the information requested has been received"
 msgstr "התקבל המידע הנדרש"
@@ -382,7 +382,7 @@ msgid "Alter your subscription"
 msgstr "לאחר ההרשמה שלכם"
 
 msgid "Although all responses are automatically published, we depend on\\nyou, the original requester, to evaluate them."
-msgstr ""
+msgstr "למרות שכל התגובות מפורסמות באופן אוטומטי, אנו תלויים\\nyou, בבדיקתן על-ידי המגיש המקורי שלהן."
 
 msgid "An <a href=\"{{request_url}}\">annotation</a> to <em>{{request_title}}</em> was made by {{event_comment_user}} on {{date}}"
 msgstr "<a href=\"{{request_url}}\">הבהרה</a> לבקשה <em>{{request_title}}</em>  נעשתה ע\"י {{event_comment_user}} בתאריך {{date}}"
@@ -406,7 +406,7 @@ msgid "Annotations are so anyone, including you, can help the requester with the
 msgstr "הסברים מיועדים לכך שכל אחד, כולל אתם, יוכל לעזור למגיש הבקשה עם הבקשה. לדוגמה:"
 
 msgid "Annotations will be posted publicly here, and are\\n        <strong>not</strong> sent to {{public_body_name}}."
-msgstr ""
+msgstr "הערות יפורסמו כאן \\n        <strong>ולא</strong> יישלחו ל- {{public_body_name}}."
 
 msgid "Anonymous user"
 msgstr "משתמש אנונימי"
@@ -616,7 +616,7 @@ msgid "Crop your profile photo"
 msgstr "חתכו את תמונת הפרופיל שלכם"
 
 msgid "Cultural sites and built structures (as they may be affected by the\\n            environmental factors listed above)"
-msgstr ""
+msgstr "אתרי תרבות ומבנים (אלה עלולים להיות מושפעים\\n           מגורמים סביבתיים המופיעים למעלה)"
 
 msgid "Currently <strong>waiting for a response</strong> from {{public_body_link}}, they must respond promptly and"
 msgstr "ממתין <strong>לתגובה</strong>מ-  {{public_body_link}}, הם חייבים להגיב מייד ו-  promptly and"
@@ -652,7 +652,7 @@ msgid "Disclaimer: This message and any reply that you make will be published on
 msgstr "כתב ויתור: הודעה זו וכל הודעה הקשורה אליה שתשלחו, תפורסם באינטרנט. מדיניות הפרטיות והגנת הזכויות שלנו:"
 
 msgid "Disclosure log"
-msgstr ""
+msgstr "יומן גילוי נאות"
 
 msgid "Disclosure log URL"
 msgstr ""
@@ -679,7 +679,7 @@ msgid "Edit"
 msgstr ""
 
 msgid "Edit and add <strong>more details</strong> to the message above,\\n                explaining why you are dissatisfied with their response."
-msgstr ""
+msgstr "ערכו והוסיפו <strong>פרטים נוספים</strong> להודעה למעלה, /n המסבירים מדוע אתם לא מרוצים מהתגובה שלהם"
 
 msgid "Edit text about you"
 msgstr "ערכו את הטקסט אודותיכם"
@@ -703,7 +703,7 @@ msgid "Enter words that you want to find separated by spaces, e.g. <strong>climb
 msgstr "הכניסו את מילות החיפוש עם רווח ביניהן. לדוגמה, e.g. <strong>נתיב עליה</strong>"
 
 msgid "Enter your response below. You may attach one file (use email, or\\n  <a href=\"%s\">contact us</a> if you need more)."
-msgstr ""
+msgstr "הכניסו את תגובתכם כאן. אתם יכולים לצרף קובץ אחד (פנו באימייל או r\\n <a hצרו קשרref=\"%s\"></a> אם יש צורך ביותר מאחד)."
 
 msgid "Environmental Information Regulations"
 msgstr "מידע תקנות סביבתיות"
@@ -760,7 +760,7 @@ msgid "Filter"
 msgstr "סינון"
 
 msgid "First, type in the <strong>name of the UK public authority</strong> you'd \\n           like information from. <strong>By law, they have to respond</strong>\\n           (<a href=\"%s#%s\">why?</a>)."
-msgstr ""
+msgstr "ראשית, הקלידו את <strong>שם הגוף</strong> שממנו ברצונכם לקבל מידע.  <strong>לפי חוק, עליהם להגיב</strong>\\n (<a href=\"%s#%s\">למה?</a>)."
 
 msgid "Foi attachment"
 msgstr "מסמף מצורף עבור חוק חופש המידע"
@@ -879,7 +879,7 @@ msgid "From"
 msgstr "מאת"
 
 msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
-msgstr ""
+msgstr "מעמוד הבקשה, נסו להגיב להודעה מסוימת, ולא לשלוח תגובה כללית. /n אם ברצונכם להגיב כללית, ולקבל כתובת ישירה שתגיע למקום הנכון, /n אנא <a href=\"%s\">שלחו אותה אלינו</a>."
 
 msgid "From:"
 msgstr "מאת:"
@@ -930,7 +930,7 @@ msgid "Home page of authority"
 msgstr "עמוד הבית של הרשות"
 
 msgid "However, you have the right to request environmental\\n            information under a different law"
-msgstr ""
+msgstr "לעומת זאת, יש לכם את הזכות לבקש מידע סביבתי /n תחת חוק אחר"
 
 msgid "Human health and safety"
 msgstr "בריאות ובטחון הציבור"
@@ -954,7 +954,7 @@ msgid "I would like to <strong>withdraw this request</strong>"
 msgstr " אני מעוניין <strong>למשוך את הבקשה</strong>"
 
 msgid "I'm still <strong>waiting</strong> for my information\\n                <small>(maybe you got an acknowledgement)</small>"
-msgstr ""
+msgstr "אנו עדיין <strong>ממתינים</strong> למידע שלנו /n <small>(אולי קיבלת התייחסות)</small>"
 
 msgid "I'm still <strong>waiting</strong> for the internal review"
 msgstr "אנו עדיין <strong>ממתינים</strong> לבדיקה הפנימית"
@@ -987,10 +987,10 @@ msgid "If the error was a delivery failure, and you can find an up to date FOI e
 msgstr ""
 
 msgid "If this is incorrect, or you would like to send a late response to the request\\nor an email on another subject to {{user}}, then please\\nemail {{contact_email}} for help."
-msgstr ""
+msgstr "אם המידע אינו נכון, או אם ברצונכם לשלוח תגובה מאוחרת למבקש /n או אימייל בנושא אחר אל {{user}}, אנא צרו קשר עם  {{contact_email}}  עבור עזרה."
 
 msgid "If you are dissatisfied by the response you got from\\n            the public authority, you have the right to\\n            complain (<a href=\"%s\">details</a>)."
-msgstr ""
+msgstr "אם אתם לא מרוצים מהתגובה שקיבלתם מהגוף הציבורי, /n יש לכם את הזכות להתלונן  (<a href=\"%s\">לפרטים</a>)."
 
 msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
 msgstr "אם עדיין נתקלתם בבעיה אנא <a href=\"%s\">צרו איתנו קשר</a>."
@@ -999,7 +999,7 @@ msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view
 msgstr "אם אתם מגישי הבקשה, תרצו אולי <a href=\"%s\">להתחבר</a> כדי לצפות בבקשה."
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
-msgstr ""
+msgstr "אם אתם שוקלים שימוש בזהות בדויה, /n אנא <a href=\"%s\">קיראו זאת קודם</a>."
 
 msgid "If you are {{user_link}}, please"
 msgstr "אם אתה המשתמש {{user_link}}, בבקשה"
@@ -1008,28 +1008,28 @@ msgid "If you believe this request is not suitable, you can report it for attent
 msgstr "אם הנכם סבורים שיש להסתיר בקשה זו או להסיר אותה , תוכלו לדווח למנהלי האתר"
 
 msgid "If you can't click on it in the email, you'll have to <strong>select and copy\\nit</strong> from the email.  Then <strong>paste it into your browser</strong>, into the place\\nyou would type the address of any other webpage."
-msgstr ""
+msgstr "אם אתם לא מצליחים להקליק על זה בגוף ההודעה, עליכם  <strong>לבחור ולהעתיק \\nאת הלינק</strong> מתוך ההודעה. לאחר מכן <strong>הדביקו אותו בשורת הכתובת של הדפדפן</strong> /n כמו כל כתובת אחרת."
 
 msgid "If you can, scan in or photograph the response, and <strong>send us\\n                    a copy to upload</strong>."
-msgstr ""
+msgstr "אם אתם יכולים, סירקו או צלמו את הבקשה, <strong>ושילחו לנו עותק שנוכל להעלות</strong>."
 
 msgid "If you find this service useful as an FOI officer, please ask your web manager to link to us from your organisation's FOI page."
 msgstr "אם אתם מוצאים שירות זה כמתאים להגשת בקשות על-פי חוק חופש המידע, בקשו ממנהל הרשת שלכם לשים קישור בדף הגשת הבקשות באתר שלכם."
 
 msgid "If you got the email <strong>more than six months ago</strong>, then this login link won't work any\\nmore. Please try doing what you were doing from the beginning."
-msgstr ""
+msgstr "אם קילתם את ההודעה במייל <strong>לפני יותר משישה חודשים</strong>, אז הקישור הזה לא יעבוד יותר. /n נסו לעשות את התהליך מההתחלה."
 
 msgid "If you have not done so already, please write a message below telling the authority that you have withdrawn your request. Otherwise they will not know it has been withdrawn."
 msgstr "אם טרם עשיתם זאת, נא רשמו למטה פניה לרשות המתאימה ובה הסבר על ביטול הבקשה שלכם, אחרת לא ידעו שהבקשה בוטלה."
 
 msgid "If you reply to this message it will go directly to {{user_name}}, who will\\nlearn your email address. Only reply if that is okay."
-msgstr ""
+msgstr "תגובה על ההודעה הזו תגיע ישירות אל {{user_name}}, אשר ידע בעקבות זאת את כתובתכם. השיבו רק אם זה בסדר."
 
 msgid "If you use web-based email or have \"junk mail\" filters, also check your\\nbulk/spam mail folders. Sometimes, our messages are marked that way."
-msgstr ""
+msgstr "אם אתם משתמשים באימייל מבוסס רשת, או שיש לכם מסנני ספאם, אנא בדקו את תיקיית הספאם. ההודעות שלנו לפעמים מגיעות לשם."
 
 msgid "If you would like us to lift this ban, then you may politely\\n<a href=\"/help/contact\">contact us</a> giving reasons.\\n"
-msgstr ""
+msgstr "אם תרצו שנסיר את המגבלה הזו, אתם יכולים <a href=\"/help/contact\">ליצור איתנו קשר</a> ולספק סיבות. \\n"
 
 msgid "If you're new to {{site_name}}"
 msgstr "אם אתם חדשים באתר {{site_name}}"
@@ -1038,7 +1038,7 @@ msgid "If you've used {{site_name}} before"
 msgstr "אם השתמשתם באתר  {{site_name}} before לפני"
 
 msgid "If your browser is set to accept cookies and you are seeing this message,\\nthen there is probably a fault with our server."
-msgstr ""
+msgstr "אם הדפדפן שלכם מקבל עוגיות ואתם רואים הודעה זו, \\n אז כנראה שיש תקלה בשרת שלנו."
 
 msgid "Incoming email address"
 msgstr ""
@@ -1227,16 +1227,16 @@ msgid "Mail server log done"
 msgstr "התבצע רישום אירועים של שרת הדואר"
 
 msgid "MailServerLogDone|Filename"
-msgstr ""
+msgstr "MailServerLogDone|Filename"
 
 msgid "MailServerLogDone|Last stat"
-msgstr ""
+msgstr "MailServerLogDone|Last stat"
 
 msgid "MailServerLog|Line"
-msgstr ""
+msgstr "MailServerLog|Line"
 
 msgid "MailServerLog|Order"
-msgstr ""
+msgstr "MailServerLog|Order"
 
 msgid "Make a new <strong>Environmental Information</strong> request"
 msgstr "יצירת בקשת  <strong>מידע סביבתי</strong> חדשה"
@@ -1713,7 +1713,7 @@ msgid "Public page not available"
 msgstr ""
 
 msgid "PublicBody::Translation|Disclosure log"
-msgstr ""
+msgstr "PublicBody::Translation|Disclosure log"
 
 msgid "PublicBody::Translation|First letter"
 msgstr "PublicBody::Translation|מכתב ראשון"
@@ -1743,7 +1743,7 @@ msgid "PublicBody|Api key"
 msgstr "PublicBody|Api key"
 
 msgid "PublicBody|Disclosure log"
-msgstr ""
+msgstr "PublicBody|Disclosure log"
 
 msgid "PublicBody|First letter"
 msgstr "PublicBody|First מכתב"
diff --git a/locale/id/app.po b/locale/id/app.po
index 27cdb0097..d7d1aebea 100644
--- a/locale/id/app.po
+++ b/locale/id/app.po
@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: alaveteli\n"
 "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
 "POT-Creation-Date: 2013-03-14 14:02-0700\n"
-"PO-Revision-Date: 2013-03-14 21:10+0000\n"
-"Last-Translator: louisecrow <louise@mysociety.org>\n"
+"PO-Revision-Date: 2013-03-15 04:39+0000\n"
+"Last-Translator: njung <agung@airputih.or.id>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
@@ -131,7 +131,7 @@ msgid "'{{link_to_user}}', a person"
 msgstr "'{{link_to_user}}', seseorang"
 
 msgid "*unknown*"
-msgstr ""
+msgstr "*Tidak diketahui*"
 
 msgid ",\\n\\n\\n\\nYours,\\n\\n{{user_name}}"
 msgstr ""
@@ -382,7 +382,7 @@ msgid "A strange reponse, required attention by the {{site_name}} team"
 msgstr "Respon yang tidak biasa, membutuhkan perhatian tim {{site_name}}"
 
 msgid "A vexatious request"
-msgstr ""
+msgstr "Sebuah permintaan menjengkelkan"
 
 msgid "A {{site_name}} user"
 msgstr "Pengguna{{site_name}}"
@@ -480,7 +480,7 @@ msgid "Anyone:"
 msgstr "Siapapun:"
 
 msgid "Applies to"
-msgstr ""
+msgstr "Berlaku untuk"
 
 msgid "Ask for <strong>specific</strong> documents or information, this site is not suitable for general enquiries."
 msgstr "Meminta <strong>dokumen atau informasi</strong> spesifik, situs ini tidak cocok untuk pertanyaan umum."
@@ -524,7 +524,7 @@ msgid "By law, {{public_body_link}} should normally have responded <strong>promp
 msgstr "Berdasarkan undang-undang, {{public_body_link}} seharusnya sudah menanggapi <strong>pada waktunya</strong> dan"
 
 msgid "Calculated home page"
-msgstr ""
+msgstr "Terhitung halaman beranda"
 
 msgid "Cancel a {{site_name}} alert"
 msgstr "Membatalkan{{site_name}} tanda notifikasi"
@@ -699,7 +699,7 @@ msgid "Dear {{public_body_name}},"
 msgstr "Yang terhormat {{public_body_name}},"
 
 msgid "Default locale"
-msgstr ""
+msgstr "Locale default"
 
 msgid "Delayed response to your FOI request - "
 msgstr "Respon yang tertunda atas permintaan FOI Anda - "
@@ -711,7 +711,7 @@ msgid "Delivery error"
 msgstr "Kesalahan pengiriman"
 
 msgid "Destroy {{name}}"
-msgstr ""
+msgstr "Menghapus {{name}}"
 
 msgid "Details of request '"
 msgstr "Rincian permintaan '"
@@ -726,7 +726,7 @@ msgid "Disclosure log"
 msgstr "Pembukaan log"
 
 msgid "Disclosure log URL"
-msgstr ""
+msgstr "Pembukaan riwayat URL"
 
 msgid "Don't want to address your message to {{person_or_body}}?  You can also write to:"
 msgstr "Tidak mau mengalamatkan pesan Anda kepada {{person_or_body}}?  Anda dapat juga menulis kepada:"
@@ -747,7 +747,7 @@ msgid "EIR"
 msgstr "EIR"
 
 msgid "Edit"
-msgstr ""
+msgstr "Ubah"
 
 msgid "Edit and add <strong>more details</strong> to the message above,\\n                explaining why you are dissatisfied with their response."
 msgstr ""
@@ -794,7 +794,7 @@ msgid "Event history details"
 msgstr "Rincian sejarah peristiwa"
 
 msgid "Event {{id}}"
-msgstr ""
+msgstr "Event {{id}}"
 
 msgid "Everything that you enter on this page, including <strong>your name</strong>,\\n                will be <strong>displayed publicly</strong> on\\n                this website forever (<a href=\"%s\">why?</a>)."
 msgstr ""
@@ -815,7 +815,7 @@ msgid "FOI email address for {{public_body}}"
 msgstr "Alamat email FOI untuk{{public_body}}"
 
 msgid "FOI request – {{title}}"
-msgstr ""
+msgstr "Permintaan FOI - {{title}}"
 
 msgid "FOI requests"
 msgstr "Permintaan FOI"
@@ -1002,7 +1002,7 @@ msgstr ""
 "    Terima kasih."
 
 msgid "Hide request"
-msgstr ""
+msgstr "Sembunyikan permintaan"
 
 msgid "Holiday"
 msgstr "Liburan"
@@ -1017,7 +1017,7 @@ msgid "Home"
 msgstr "Awal"
 
 msgid "Home page"
-msgstr ""
+msgstr "Halaman beranda"
 
 msgid "Home page of authority"
 msgstr "Situs web otoritas"
@@ -1072,16 +1072,16 @@ msgid "I've received an <strong>error message</strong>"
 msgstr "Saya sudah menerima <strong>pesan error</strong>"
 
 msgid "I've received an error message"
-msgstr ""
+msgstr "Saya menerima pesan error"
 
 msgid "Id"
-msgstr ""
+msgstr "Id"
 
 msgid "If the address is wrong, or you know a better address, please <a href=\"%s\">contact us</a>."
 msgstr "Jika alamatnya salah, atau Anda tahu alamat yang lebih baik, silakan <a href=\"%s\">hubungi kami</a>."
 
 msgid "If the error was a delivery failure, and you can find an up to date FOI email address for the authority, please tell us using the form below."
-msgstr ""
+msgstr "Jika errornya adalah kegagalan pengiriman, dan Anda dapat menemukan alamat email FOI otoritas publik yang baru, silakan memberi tahu kami menggunakan form dibawah ini."
 
 msgid "If this is incorrect, or you would like to send a late response to the request\\nor an email on another subject to {{user}}, then please\\nemail {{contact_email}} for help."
 msgstr ""
@@ -1159,7 +1159,7 @@ msgstr ""
 "maka kemungkinan ada kesalahan pada server kami."
 
 msgid "Incoming email address"
-msgstr ""
+msgstr "Email masuk"
 
 msgid "Incoming message"
 msgstr "Pesan Masuk"
@@ -1281,7 +1281,7 @@ msgid "Items matching the following conditions are currently displayed on your w
 msgstr "Kesesuaian permintaan akan ditampilkan pada wall Anda."
 
 msgid "Items sent in last month"
-msgstr ""
+msgstr "Item terkirim pada akhir bulan"
 
 msgid "Joined in"
 msgstr "Bergabung di"
@@ -1290,7 +1290,7 @@ msgid "Joined {{site_name}} in"
 msgstr "Bergabung {{site_name}} di"
 
 msgid "Just one more thing"
-msgstr ""
+msgstr "Satu hal lagi"
 
 msgid "Keep it <strong>focused</strong>, you'll be more likely to get what you want (<a href=\"%s\">why?</a>)."
 msgstr "Tetap <strong>fokus</strong>, Anda akan lebih mungkin untuk mendapatkan apa yang Anda inginkan (<a href=\"%s\">mengapa?</a>)."
@@ -1313,25 +1313,25 @@ msgid "Link to this"
 msgstr "Tautan kepada ini"
 
 msgid "List all"
-msgstr ""
+msgstr "Daftar keseluruhan"
 
 msgid "List of all authorities (CSV)"
 msgstr "Daftar dari semua otoritas (CSV)"
 
 msgid "Listing FOI requests"
-msgstr ""
+msgstr "Daftar permintaan FOI"
 
 msgid "Listing public authorities"
-msgstr ""
+msgstr "Daftar otoritas publik"
 
 msgid "Listing public authorities matching '{{query}}'"
-msgstr ""
+msgstr "Daftar otoritas publik sesuai '{{query}}'"
 
 msgid "Listing tracks"
-msgstr ""
+msgstr "Daftar lacak"
 
 msgid "Listing users"
-msgstr ""
+msgstr "Daftar pengguna"
 
 msgid "Log in to download a zip file of {{info_request_title}}"
 msgstr "Masuk untuk mengunduh file zip dari  {{info_request_title}}"
@@ -1434,7 +1434,7 @@ msgid "New Freedom of Information requests"
 msgstr "Permintaan Freedom of Information baru"
 
 msgid "New censor rule"
-msgstr ""
+msgstr "Peraturan sensor baru"
 
 msgid "New e-mail:"
 msgstr "Email baru:"
@@ -1482,7 +1482,7 @@ msgid "No similar requests found."
 msgstr "Tidak ditemukan permintaan serupa."
 
 msgid "No tracked things found."
-msgstr ""
+msgstr "Tidak ditemukan hal-hal yang dilacak."
 
 msgid "Nobody has made any Freedom of Information requests to {{public_body_name}} using this site yet."
 msgstr "Belum ada orang yang membuat permintaan Freedom of Information kepada{{public_body_name}} menggunakan situs ini."
@@ -1494,7 +1494,7 @@ msgid "None made."
 msgstr "Tidak ada yang dibuat."
 
 msgid "Not a valid FOI request"
-msgstr ""
+msgstr "Permintaan FOI tidak valid"
 
 msgid "Note that the requester will not be notified about your annotation, because the request was published by {{public_body_name}} on their behalf."
 msgstr "Catat bahwa peminta informasi tidak akan mendapat pemberitahuan tentang notasi Anda, karena permintaan ditampilkan oleh {{public_body_name}} atas nama mereka."
@@ -1542,7 +1542,7 @@ msgid "One public authority found"
 msgstr "Satu otoritas publik ditemukan"
 
 msgid "Only put in abbreviations which are really used, otherwise leave blank. Short or long name is used in the URL – don't worry about breaking URLs through renaming, as the history is used to redirect"
-msgstr ""
+msgstr "Masukkan singkatan yang benar-benar digunakan, jika tidak biarkan kosong. Panjang atau pendek nama yang digunakan di URL - Jangan khawatir merusak URL melalui penggantian nama, sebagai riwayat yang digunakan untuk pengarahan"
 
 msgid "Only requests made using {{site_name}} are shown."
 msgstr "Hanya permintaan yang dibuat menggunakan {{site_name}} yang ditampilkan."
@@ -1837,7 +1837,7 @@ msgid "Public authorities {{start_count}} to {{end_count}} of {{total_count}}"
 msgstr "Ptoritas publik {{start_count}} ke{{end_count}} dari {{total_count}}"
 
 msgid "Public authority – {{name}}"
-msgstr ""
+msgstr "Otoritas publik - {{name}}"
 
 msgid "Public body"
 msgstr "Badan publik"
@@ -1846,13 +1846,13 @@ msgid "Public body/translation"
 msgstr "Public body/translation"
 
 msgid "Public notes"
-msgstr ""
+msgstr "Catatan publik"
 
 msgid "Public page"
-msgstr ""
+msgstr "Halaman publik"
 
 msgid "Public page not available"
-msgstr ""
+msgstr "Halaman publik tidak ada"
 
 msgid "PublicBody::Translation|Disclosure log"
 msgstr "PublicBody::Translation | Disclosure log"
@@ -1927,7 +1927,7 @@ msgid "Publication scheme"
 msgstr "Skema publikasi"
 
 msgid "Publication scheme URL"
-msgstr ""
+msgstr "Skema publikasi URL"
 
 msgid "Purge request"
 msgstr "Pembersihan permintaan"
@@ -1989,7 +1989,7 @@ msgid "Request an internal review from {{person_or_body}}"
 msgstr "Minta kajian internal dari {{person_or_body}}"
 
 msgid "Request email"
-msgstr ""
+msgstr "Email permintaan"
 
 msgid "Request has been removed"
 msgstr "Permintaan telah dihapus"
@@ -2092,7 +2092,7 @@ msgid "Search your contributions"
 msgstr "Cari kontribusi Anda"
 
 msgid "See bounce message"
-msgstr ""
+msgstr "Lihan pesan kembali"
 
 msgid "Select one to see more information about the authority."
 msgstr "Pilih satu untuk melihat lebih banyak informasi tentang otoritas terkait."
@@ -2128,7 +2128,7 @@ msgid "Set your profile photo"
 msgstr "Mengatur foto profil Anda"
 
 msgid "Short name"
-msgstr ""
+msgstr "Nama singkat"
 
 msgid "Short name is already taken"
 msgstr "Nama pendek sudah diambil"
@@ -2230,7 +2230,7 @@ msgid "Submit status"
 msgstr "Kirim status"
 
 msgid "Submit status and send message"
-msgstr ""
+msgstr "Kirim status dan kirim pesan"
 
 msgid "Subscribe to blog"
 msgstr "Berlangganan kepada blog"
@@ -2254,7 +2254,7 @@ msgid "Table of varieties"
 msgstr "Tabel jenis"
 
 msgid "Tags"
-msgstr ""
+msgstr "Label"
 
 msgid "Tags (separated by a space):"
 msgstr "Label (dipisahkan oleh spasi):"
@@ -2284,7 +2284,7 @@ msgid "Thank you for updating your profile photo"
 msgstr "Terima kasih telah memperbarui foto profil Anda"
 
 msgid "Thank you! We'll look into what happened and try and fix it up."
-msgstr ""
+msgstr "Terimakasih! Kami akan melihat apa yang terjadi dan mencoba memperbaikinya."
 
 msgid "Thanks for helping - your work will make it easier for everyone to find successful\\nresponses, and maybe even let us make league tables..."
 msgstr ""
@@ -2543,7 +2543,7 @@ msgstr ""
 "ditandai untuk tidak lagi menerima respon."
 
 msgid "This is the first version."
-msgstr ""
+msgstr "Ini merupakan versi pertama"
 
 msgid "This is your own request, so you will be automatically emailed when new responses arrive."
 msgstr "Ini adalah permintaan Anda sendiri, sehingga Anda akan secara otomatis dikirimi email ketika respon baru diterima."
@@ -2619,7 +2619,7 @@ msgid "This request is still in progress:"
 msgstr "Permintaan ini masih dalam proses:"
 
 msgid "This request requires administrator attention"
-msgstr ""
+msgstr "Permintaan ini membutuhkan perhatian administrator"
 
 msgid "This request was not made via {{site_name}}"
 msgstr "Permintaan ini tidak dibuat melalui {{site_name}}"
@@ -2837,7 +2837,7 @@ msgid "User info request sent alert"
 msgstr "Informasi permintaan pengguna telah mengirim notifikasi"
 
 msgid "User – {{name}}"
-msgstr ""
+msgstr "Pengguna - {{name}}"
 
 msgid "UserInfoRequestSentAlert|Alert type"
 msgstr "UserInfoRequestSentAlert|Alert type"
@@ -2894,7 +2894,7 @@ msgid "User|Url name"
 msgstr "User|Url name"
 
 msgid "Version {{version}}"
-msgstr ""
+msgstr "Versi {{version}}"
 
 msgid "View FOI email address"
 msgstr "Tampilkan alamat email FOI"
@@ -3289,7 +3289,7 @@ msgid "admin"
 msgstr "admin"
 
 msgid "alaveteli_foi:The software that runs {{site_name}}"
-msgstr ""
+msgstr "alaveteli_foi:Perangkat lunak yang berjalan {{site_name}}"
 
 msgid "all requests"
 msgstr "semua permintaan"
@@ -3325,7 +3325,7 @@ msgid "are long overdue."
 msgstr "sudah lama terlambat."
 
 msgid "at"
-msgstr ""
+msgstr "di"
 
 msgid "authorities"
 msgstr "otoritas"
@@ -3340,7 +3340,7 @@ msgid "between two dates"
 msgstr "antara dua tanggal"
 
 msgid "but followupable"
-msgstr ""
+msgstr "tetapi terikuti"
 
 msgid "by"
 msgstr "oleh"
@@ -3426,7 +3426,7 @@ msgid "messages from users"
 msgstr "pesan dari pengguna"
 
 msgid "move..."
-msgstr ""
+msgstr "pindah..."
 
 msgid "no later than"
 msgstr "tidak kurang dari"
@@ -3442,7 +3442,7 @@ msgid "normally"
 msgstr "biasanya"
 
 msgid "not requestable due to: {{reason}}"
-msgstr ""
+msgstr "Tidak mengandung permintaan karena: {{reason}}"
 
 msgid "please sign in as "
 msgstr "silakan masuk sebagai "
@@ -3468,7 +3468,7 @@ msgid "sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
 msgstr "dikirmkan ke {{public_body_name}} oleh {{info_request_user}} pada {{date}}."
 
 msgid "set to <strong>blank</strong> (empty string) if can't find an address; these emails are <strong>public</strong> as anyone can view with a CAPTCHA"
-msgstr ""
+msgstr "set <strong>kosong</strong> (string kosong) jika tidak dapat menemukan alamat; email ini <strong>publik</strong> bagi siapapun dapat melihatnya dengan sebuah CAPTCHA"
 
 msgid "show quoted sections"
 msgstr "Tampilkan bagian yang dikutip"
@@ -3608,7 +3608,7 @@ msgid "{{site_name}} users have made {{number_of_requests}} requests, including:
 msgstr "{{site_name}} users have made {{number_of_requests}} requests, including:"
 
 msgid "{{thing_changed}} was changed from <code>{{from_value}}</code> to <code>{{to_value}}</code>"
-msgstr ""
+msgstr "{{thing_changed}} telah diubah dari <code>{{from_value}}</code> ke <code>{{to_value}}</code>"
 
 msgid "{{title}} - a Freedom of Information request to {{public_body}}"
 msgstr "{{title}} - sebuah permintaan Keterbukaan Informasi kepada {{public_body}}"
diff --git a/spec/controllers/admin_public_body_controller_spec.rb b/spec/controllers/admin_public_body_controller_spec.rb
index 504ddc5cc..28182a3cd 100644
--- a/spec/controllers/admin_public_body_controller_spec.rb
+++ b/spec/controllers/admin_public_body_controller_spec.rb
@@ -215,6 +215,19 @@ describe AdminPublicBodyController, "when administering public bodies and paying
         PublicBody.count.should == n - 1
     end
 
+    it "doesn't let people with good emergency account credentials log in if the emergency user is disabled" do
+        setup_emergency_credentials('biz', 'fuz')
+        Configuration.stub!(:disable_emergency_user).and_return(true)
+        n = PublicBody.count
+        basic_auth_login(@request, "biz", "fuz")
+        post :show, { :id => public_bodies(:humpadink_public_body).id, :emergency => 1}
+        session[:using_admin].should == nil
+        n = PublicBody.count
+        post :destroy, { :id => public_bodies(:forlorn_public_body).id }
+        session[:using_admin].should == nil
+        PublicBody.count.should == n
+    end
+
     it "allows superusers to do stuff" do
         session[:user_id] = users(:admin_user).id
         @request.env["HTTP_AUTHORIZATION"] = ""