merging in changes from ui-rf and fixing conflicts in templates

3 files changed, 178 insertions, 1 deletions

diff --git a/debug_toolbar/locale/es/LC_MESSAGES/django.po b/debug_toolbar/locale/es/LC_MESSAGES/django.po
index 5bd3db8..66a9d72 100644
--- a/debug_toolbar/locale/es/LC_MESSAGES/django.po
+++ b/debug_toolbar/locale/es/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-25 13:27-0700\n"
+"POT-Creation-Date: 2009-08-21 15:26-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -75,6 +75,15 @@ msgstr ""
 msgid "Breakdown"
 msgstr ""
 
+#: templates/debug_toolbar/panels/cache.html:39
+#: templates/debug_toolbar/panels/logger.html:8
+#: templates/debug_toolbar/panels/sql.html:6
+#: templates/debug_toolbar/panels/sql_explain.html:7
+#: templates/debug_toolbar/panels/sql_profile.html:7
+#: templates/debug_toolbar/panels/sql_select.html:7
+msgid "Time"
+msgstr "Tiempo"
+
 #: templates/debug_toolbar/panels/cache.html:40
 msgid "Type"
 msgstr "Tipo"
diff --git a/debug_toolbar/locale/he/LC_MESSAGES/django.mo b/debug_toolbar/locale/he/LC_MESSAGES/django.mo
new file mode 100644
index 0000000..e94f840
--- /dev/null
+++ b/debug_toolbar/locale/he/LC_MESSAGES/django.mo
diff --git a/debug_toolbar/locale/he/LC_MESSAGES/django.po b/debug_toolbar/locale/he/LC_MESSAGES/django.po
new file mode 100644
index 0000000..d97b08e
--- /dev/null
+++ b/debug_toolbar/locale/he/LC_MESSAGES/django.po
@@ -0,0 +1,168 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-24 22:59-0500\n"
+"PO-Revision-Date: 2009-08-24 23:08-0600\n"
+"Last-Translator: Alex <alex.gaynor@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: templates/debug_toolbar/base.html:24
+msgid "Hide"
+msgstr "הסתיר"
+
+#: templates/debug_toolbar/base.html:55
+msgid "Close"
+msgstr "סגור"
+
+#: templates/debug_toolbar/panels/cache.html:14
+msgid "Total Calls"
+msgstr ""
+
+#: templates/debug_toolbar/panels/cache.html:16
+msgid "Total Time"
+msgstr "זמן"
+
+#: templates/debug_toolbar/panels/cache.html:18
+msgid "Hits"
+msgstr ""
+
+#: templates/debug_toolbar/panels/cache.html:20
+msgid "Misses"
+msgstr ""
+
+#: templates/debug_toolbar/panels/cache.html:35
+msgid "Breakdown"
+msgstr ""
+
+#: templates/debug_toolbar/panels/cache.html:39
+#: templates/debug_toolbar/panels/logger.html:8
+#: templates/debug_toolbar/panels/sql.html:6
+#: templates/debug_toolbar/panels/sql_explain.html:10
+#: templates/debug_toolbar/panels/sql_profile.html:10
+#: templates/debug_toolbar/panels/sql_select.html:10
+msgid "Time"
+msgstr "זמן"
+
+#: templates/debug_toolbar/panels/cache.html:40
+msgid "Type"
+msgstr "סוג"
+
+#: templates/debug_toolbar/panels/cache.html:41
+msgid "Parameters"
+msgstr ""
+
+#: templates/debug_toolbar/panels/cache.html:42
+msgid "Function"
+msgstr ""
+
+#: templates/debug_toolbar/panels/headers.html:6
+msgid "Key"
+msgstr ""
+
+#: templates/debug_toolbar/panels/headers.html:7
+#: templates/debug_toolbar/panels/request_vars.html:13
+#: templates/debug_toolbar/panels/request_vars.html:41
+#: templates/debug_toolbar/panels/request_vars.html:65
+#: templates/debug_toolbar/panels/request_vars.html:89
+#: templates/debug_toolbar/panels/settings_vars.html:7
+#: templates/debug_toolbar/panels/timer.html:11
+msgid "Value"
+msgstr ""
+
+#: templates/debug_toolbar/panels/logger.html:7
+msgid "Level"
+msgstr ""
+
+#: templates/debug_toolbar/panels/logger.html:9
+msgid "Message"
+msgstr "הודעה"
+
+#: templates/debug_toolbar/panels/logger.html:10
+msgid "Location"
+msgstr "מקום"
+
+#: templates/debug_toolbar/panels/logger.html:25
+msgid "No messages logged"
+msgstr "אין הודעות"
+
+#: templates/debug_toolbar/panels/request_vars.html:12
+#: templates/debug_toolbar/panels/request_vars.html:40
+#: templates/debug_toolbar/panels/request_vars.html:64
+#: templates/debug_toolbar/panels/request_vars.html:88
+msgid "Variable"
+msgstr ""
+
+#: templates/debug_toolbar/panels/request_vars.html:26
+msgid "No COOKIE data"
+msgstr ""
+
+#: templates/debug_toolbar/panels/request_vars.html:54
+msgid "No SESSION data"
+msgstr ""
+
+#: templates/debug_toolbar/panels/request_vars.html:78
+msgid "No GET data"
+msgstr ""
+
+#: templates/debug_toolbar/panels/request_vars.html:102
+msgid "No POST data"
+msgstr ""
+
+#: templates/debug_toolbar/panels/settings_vars.html:6
+msgid "Setting"
+msgstr ""
+
+#: templates/debug_toolbar/panels/signals.html:6
+msgid "Signal"
+msgstr "סימן"
+
+#: templates/debug_toolbar/panels/sql.html:7
+msgid "Action"
+msgstr ""
+
+#: templates/debug_toolbar/panels/sql.html:31
+msgid "Line"
+msgstr "שורה"
+
+#: templates/debug_toolbar/panels/sql.html:32
+msgid "Method"
+msgstr ""
+
+#: templates/debug_toolbar/panels/sql.html:33
+msgid "File"
+msgstr "קובץ"
+
+#: templates/debug_toolbar/panels/sql_explain.html:3
+#: templates/debug_toolbar/panels/sql_profile.html:3
+#: templates/debug_toolbar/panels/sql_select.html:3
+#: templates/debug_toolbar/panels/template_source.html:3
+msgid "Back"
+msgstr "חזרה"
+
+#: templates/debug_toolbar/panels/sql_explain.html:8
+#: templates/debug_toolbar/panels/sql_profile.html:8
+#: templates/debug_toolbar/panels/sql_select.html:8
+msgid "Executed SQL"
+msgstr ""
+
+#: templates/debug_toolbar/panels/sql_select.html:33
+msgid "Empty set"
+msgstr ""
+
+#: templates/debug_toolbar/panels/templates.html:15
+msgid "Template"
+msgstr ""
+
+#: templates/debug_toolbar/panels/timer.html:10
+msgid "Resource"
+msgstr ""
+