Merge remote branch 'origin/tx-master'

2 files changed, 11 insertions, 18 deletions

diff --git a/debug_toolbar/locale/he/LC_MESSAGES/django.po b/debug_toolbar/locale/he/LC_MESSAGES/django.po
index 5a4db1f..e5abf66 100644
--- a/debug_toolbar/locale/he/LC_MESSAGES/django.po
+++ b/debug_toolbar/locale/he/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@
 # 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"
@@ -55,12 +55,7 @@ msgid "Close"
 msgstr "סגור"
 
 #: templates/debug_toolbar/redirect.html:9
-msgid ""
-"The Django Debug Toolbar has intercepted a redirect to the above URL for "
-"debug viewing purposes.  You can click the above link to continue with the "
-"redirect as normal.  If you'd like to disable this feature, set the "
-"<code>DEBUG_TOOLBAR_CONFIG</code> dictionary's key "
-"<code>INTERCEPT_REDIRECTS</code> to <code>False</code>."
+msgid "The Django Debug Toolbar has intercepted a redirect to the above URL for debug viewing purposes.  You can click the above link to continue with the redirect as normal.  If you'd like to disable this feature, set the <code>DEBUG_TOOLBAR_CONFIG</code> dictionary's key <code>INTERCEPT_REDIRECTS</code> to <code>False</code>."
 msgstr ""
 
 #: templates/debug_toolbar/panels/cache.html:14
@@ -95,10 +90,6 @@ msgstr ""
 msgid "Function"
 msgstr ""
 
-#: templates/debug_toolbar/panels/headers.html:5
-msgid "Key"
-msgstr ""
-
 #: templates/debug_toolbar/panels/headers.html:6
 #: templates/debug_toolbar/panels/request_vars.html:12
 #: templates/debug_toolbar/panels/request_vars.html:38
@@ -212,3 +203,7 @@ msgstr "תבנית"
 #: templates/debug_toolbar/panels/timer.html:9
 msgid "Resource"
 msgstr ""
+
+#: templates/debug_toolbar/panels/headers.html:5
+msgid "Key"
+msgstr "מפתח"
diff --git a/debug_toolbar/locale/ru/LC_MESSAGES/django.po b/debug_toolbar/locale/ru/LC_MESSAGES/django.po
index a7de97c..e53f2c2 100644
--- a/debug_toolbar/locale/ru/LC_MESSAGES/django.po
+++ b/debug_toolbar/locale/ru/LC_MESSAGES/django.po
@@ -40,7 +40,8 @@ msgstr "Сигналы"
 msgid "Templates"
 msgstr "Шаблоны"
 
-#: panels/timer.py:35 templates/debug_toolbar/panels/cache.html:39
+#: panels/timer.py:35
+#: templates/debug_toolbar/panels/cache.html:39
 #: templates/debug_toolbar/panels/logger.html:7
 #: templates/debug_toolbar/panels/sql.html:5
 #: templates/debug_toolbar/panels/sql_explain.html:11
@@ -68,12 +69,11 @@ msgid ""
 "redirect as normal.  If you'd like to disable this feature, set the "
 "<code>DEBUG_TOOLBAR_CONFIG</code> dictionary's key "
 "<code>INTERCEPT_REDIRECTS</code> to <code>False</code>."
-msgstr ""
-"Django Debug Toolbar в отладочных целях перехватила редирект на адрес, "
+msgstr "Django Debug Toolbar в отладочных целях перехватила редирект на адрес, "
 "указанный выше. Вы можете нажать на ссылку, чтобы продолжить обычное "
-"выполнение. Если хотите отключить это поведение, установитев словаре "
+"выполнение. Если хотите отключить это поведение, установите в словаре "
 "<code>DEBUG_TOOLBAR_CONFIG</code> ключ <code>INTERCEPT_REDIRECTS</"
-"code>равным <code>False</code>."
+"code> равным <code>False</code>."
 
 #: templates/debug_toolbar/panels/cache.html:14
 msgid "Total Calls"
@@ -229,5 +229,3 @@ msgstr ""
 msgid "Resource"
 msgstr "Ресурс"
 
-#~ msgid "Template Source"
-#~ msgstr "Исходный код шаблона"