Permalink
Browse files

Merge remote branch 'origin/tx-master'

  • Loading branch information...
2 parents 7d2fc9b + 7586cd3 commit 421c08a9f30f6322d8df3fb3534901f810145359 @robhudson committed Sep 13, 2009
Showing with 11 additions and 18 deletions.
  1. +6 −11 debug_toolbar/locale/he/LC_MESSAGES/django.po
  2. +5 −7 debug_toolbar/locale/ru/LC_MESSAGES/django.po
View
17 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 "מפתח"
View
12 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 "Исходный код шаблона"

0 comments on commit 421c08a

Please sign in to comment.