Merge branch 'master' of https://github.com/discourse/discourse into dutch_translation

2013-04-14 20:46:00 +02:00 · 2013-04-14 20:46:00 +02:00 · 2af902f4d1
parent f47f880f8b a1d7f24240
commit 2af902f4d1
5 changed files with 5 additions and 5 deletions
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@ -723,7 +723,7 @@ da:
        title: "Customize"
        header: "Header"
        css: "Stylesheet"
-        override_default: "Override default?"
+        override_default: "Do not include standard style sheet"
        enabled: "Enabled?"
        preview: "preview"
        undo_preview: "undo preview"
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@ -855,7 +855,7 @@ en:
        long_title: "Site Customizations"
        header: "Header"
        css: "Stylesheet"
-        override_default: "Override default?"
+        override_default: "Do not include standard style sheet"
        enabled: "Enabled?"
        preview: "preview"
        undo_preview: "undo preview"
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@ -716,7 +716,7 @@ es:
        title: "Customize"
        header: "Header"
        css: "Stylesheet"
-        override_default: "Override default?"
+        override_default: "Do not include standard style sheet"
        enabled: "Enabled?"
        preview: "preview"
        undo_preview: "undo preview"
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@ -657,7 +657,7 @@ id:
        title: "Customize"
        header: "Header"
        css: "Stylesheet"
-        override_default: "Override default?"
+        override_default: "Do not include standard style sheet"
        enabled: "Enabled?"
        preview: "preview"
        undo_preview: "undo preview"
--- a/pg_dumps/production-image.sql
+++ b/pg_dumps/production-image.sql