more translation fixes

author: Evgeny Fadeev <evgeny.fadeev@gmail.com> 2010-05-01 22:07:43 -0400
committer: Evgeny Fadeev <evgeny.fadeev@gmail.com> 2010-05-01 22:07:43 -0400
commit: 2f7ee397d33dc7dc15d083d2b6f6a60a0260c433 (patch)
tree: faa9b5c92517c2c5d31148adba39628793d71c26
parent: 1b3de82a577c6145fb55d078b6181ff9615821cd (diff)
download: askbot-2f7ee397d33dc7dc15d083d2b6f6a60a0260c433.tar.gz
askbot-2f7ee397d33dc7dc15d083d2b6f6a60a0260c433.tar.bz2
askbot-2f7ee397d33dc7dc15d083d2b6f6a60a0260c433.zip
16 files changed, 572 insertions, 510 deletions
diff --git a/django_authopenid/urls.py b/django_authopenid/urls.py
index e1986d19..65afc45a 100755
--- a/django_authopenid/urls.py
+++ b/django_authopenid/urls.py
@@ -33,7 +33,7 @@ urlpatterns = patterns('django_authopenid.views',
     url(r'^%s%s$' % (_('password/'), _('confirm/')), 'confirmchangepw', name='user_confirmchangepw'),
 
     # manage account settings
-    url(r'^$', _('account_settings'), name='user_account_settings'),
+    url(r'^$', 'account_settings', name='user_account_settings'),
     url(r'^%s$' % _('password/'), 'changepw', name='user_changepw'),
     url(r'^%s%s$' % (_('email/'),_('validate/')), 'changeemail', name='user_validateemail',kwargs = {'action':'validate'}),
     url(r'^%s%s$' % (_('email/'), _('change/')), 'changeemail', name='user_changeemail'),
diff --git a/forum/management/commands/once_award_badges.py b/forum/management/commands/once_award_badges.py
index 372eb3aa..60457373 100755
--- a/forum/management/commands/once_award_badges.py
+++ b/forum/management/commands/once_award_badges.py
@@ -144,22 +144,10 @@ class Command(BaseCommand):
                     new_award.save()
 
     def first_type_award(self):
-        """
-        This will award below badges for users first behaviors:
-
-        (7, '巡逻兵', 3, '巡逻兵', '第一次标记垃圾帖子', 0, 0),
-        (8, '清洁工', 3, '清洁工', '第一次撤销投票', 0, 0),
-        (9, '批评家', 3, '批评家', '第一次反对票', 0, 0),
-        (10, '小编', 3, '小编', '第一次编辑更新', 0, 0),
-        (11, '村长', 3, '村长', '第一次重新标签', 0, 0),
-        (12, '学者', 3, '学者', '第一次标记答案', 0, 0),
-        (14, '支持者', 3, '支持者', '第一次赞成票', 0, 0),
-        (16, '自传作者', 3, '自传作者', '完整填写用户资料所有选项', 0, 0),
-        """
+
         activity_types = ','.join('%s' % item for item in BADGE_AWARD_TYPE_FIRST.keys())
         # ORDER BY user_id, activity_type
         query = "SELECT id, user_id, activity_type, content_type_id, object_id FROM activity WHERE is_auditted = 0 AND activity_type IN (%s) ORDER BY user_id, activity_type" % activity_types
-
         cursor = connection.cursor()
         try:
             cursor.execute(query)
@@ -203,8 +191,6 @@ class Command(BaseCommand):
     def first_ask_be_voted(self):
         """
         For user asked question and got first upvote, we award him following badge:
-
-        (13, '学生', 3, '学生', '第一次提问并且有一次以上赞成票', 0, 0),
         """
         query = "SELECT act.user_id, q.vote_up_count, act.object_id FROM " \
                     "activity act, question q WHERE act.activity_type = %s AND " \
diff --git a/forum/management/commands/sximport.py b/forum/management/commands/sximport.py
deleted file mode 100755
index f6af4e90..00000000
--- a/forum/management/commands/sximport.py
+++ /dev/null
@@ -1,109 +0,0 @@
-from django.core.management.base import LabelCommand
-from zipfile import ZipFile
-from xml.dom import minidom as dom
-import datetime
-
-from forum.models import User
-
-class Command(LabelCommand):
-    def handle_label(self, label, **options):
-        zip = ZipFile(label)
-
-        map = {}
-
-        map['users'] = self.import_users(zip.open("Users.xml"))
-        map['questions'], map['answers'] = self.import_posts(zip.open("Posts.xml"))
-
-
-    def row_to_dic(self, row):
-        return dict([
-            (child.localName.lower(),
-            " ".join([t.nodeValue for t in child.childNodes if t.nodeType == t.TEXT_NODE]))
-            for child in row.childNodes
-            if child.nodeType == child.ELEMENT_NODE
-        ])
-
-    def from_sx_time(self, timestring):
-        if timestring is None:
-            return timestring
-
-        try:
-            return datetime.datetime.strptime(timestring, '%Y-%m-%dT%H:%M:%S')
-        except:
-            return datetime.datetime.strptime(timestring, '%Y-%m-%dT%H:%M:%S.%f')
-
-
-    def import_users(self, users):
-        pkey_map = {}
-        doc = dom.parse(users)
-
-        rows = doc.getElementsByTagName('row')
-        unknown_count = 0
-
-        added_names = []
-
-        for row in rows:
-            values = self.row_to_dic(row)
-
-            username = values.get('displayname',
-                            values.get('realname',
-                                values.get('email', None)))
-
-            if username is None:
-                unknown_count += 1
-                username = 'Unknown User %d' % unknown_count
-
-            if username in added_names:
-                cnt = 1
-                new_username = "%s %d" % (username, cnt)
-                while new_username in added_names:
-                    cnt += 1
-                    new_username = "%s %d" % (username, cnt)
-
-                username = new_username
-
-            added_names.append(username)
-
-            user = User(username=username, email=values.get('email', ''))
-
-            user.reputation = values['reputation']
-            user.last_seen = self.from_sx_time(values['lastaccessdate'])
-
-            user.real_name = values.get('realname', '')
-            user.about = values.get('aboutme', '')
-            user.website = values.get('websiteurl', '')
-            user.date_of_birth = self.from_sx_time(values.get('birthday', None))
-            user.location = values.get('location', '')
-
-            user.is_active = True
-            user.email_isvalid = True
-
-
-            if int(values['usertypeid']) == 5:
-                user.is_superuser = True
-
-            if int(values['usertypeid']) == 5:
-                user.is_staff = True
-
-            user.save()
-
-            pkey_map[values['id']] = user
-
-        return users
-
-    def import_posts(self, posts, map):
-        pkey_map = {}
-        doc = dom.parse(posts)
-
-        rows = doc.getElementsByTagName('row')
-
-        for row in rows:
-            map = {
-                'title': row['']    
-            }
-
-            pass
-        pass
-            
-        
-        
diff --git a/forum/migrations/0005_install_badges.py b/forum/migrations/0005_install_badges.py
index e260bcf6..5c05ecdd 100644
--- a/forum/migrations/0005_install_badges.py
+++ b/forum/migrations/0005_install_badges.py
@@ -35,7 +35,7 @@ INITIAL_BADGE_DATA = (
     (_('Civic duty'), 2, _('civic-duty'), _('Voted 300 times'), False, 0),
     (_('Strunk & White'), 2, _('strunk-and-white'), _('Edited 100 entries'), False, 0),
     (_('Generalist'), 2, _('generalist'), _('Active in many different tags'), False, 0),
-    (_('Expert'), 2, _('export'), _('Very active in one tag'), False, 0),
+    (_('Expert'), 2, _('expert'), _('Very active in one tag'), False, 0),
     (_('Yearling'), 2, _('yearling'), _('Active member for a year'), False, 0),
     (_('Notable Question'), 2, _('notable-question'), _('Asked a question with 2,500 views'), True, 0),
     (_('Enlightened'), 2, _('enlightened'), _('First answer was accepted with at least 10 up votes'), False, 0),
diff --git a/forum/skins/default/templates/badge.html b/forum/skins/default/templates/badge.html
index af6aa2a2..12a12512 100644
--- a/forum/skins/default/templates/badge.html
+++ b/forum/skins/default/templates/badge.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load extra_tags %}
 {% load humanize %}
-{% block title %}{% spaceless %}{{ badge.name }} - {% trans "Badge" %}{% endspaceless %}{% endblock %}
+{% block title %}{% spaceless %}{% trans badge.name %} - {% trans "Badge" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
        <script type="text/javascript">
         $().ready(function(){
@@ -18,7 +18,7 @@
 </div>
 <div id="main-body" style="width:100%;margin-bottom:20px">
     <p>
-        <a href="{{badge.get_absolute_url}}" title="{{ badge.get_type_display }} : {{ badge.description }}" class="medal"><span class="badge{{ badge.type }}">&#9679;</span>&nbsp;{{ badge.name }}</a> {{ badge.description }}
+        <a href="{{badge.get_absolute_url}}" title="{{ badge.get_type_display }} : {% trans badge.description %}" class="medal"><span class="badge{{ badge.type }}">&#9679;</span>&nbsp;{% trans badge.name %}</a> {% trans badge.description %}
     </p>
     <div>
         {% if badge.awarded_count %}
diff --git a/forum/skins/default/templates/badges.html b/forum/skins/default/templates/badges.html
index 8de93df5..9fbd6395 100644
--- a/forum/skins/default/templates/badges.html
+++ b/forum/skins/default/templates/badges.html
@@ -34,11 +34,12 @@
             {% endfor %}
             </div>
             <div style="float:left;width:230px;">
-                <a href="{{badge.get_absolute_url}}" title="{{ badge.get_type_display }} : {{ badge.description }}" class="medal"><span class="badge{{ badge.type }}">&#9679;</span>&nbsp;{{ badge.name }}</a><strong> &#215; {{ badge.awarded_count|intcomma }}</strong>
+                <a href="{{badge.get_absolute_url}}" 
+                    title="{% trans badge.get_type_display %} : {% trans badge.description %}" 
+                    class="medal"><span class="badge{{ badge.type }}">&#9679;</span>&nbsp;{% trans badge.name %}</a><strong> 
+                    &#215; {{ badge.awarded_count|intcomma }}</strong>
             </div>
-            <p style="float:left;margin-top:8px;">
-                {{ badge.description }}
-            </p>
+            <p style="float:left;margin-top:8px;">{% trans badge.description %}</p>
         </div>
         {% endfor %}
     </div>
diff --git a/forum/skins/default/templates/user_recent.html b/forum/skins/default/templates/user_recent.html
index b704ab25..85957599 100644
--- a/forum/skins/default/templates/user_recent.html
+++ b/forum/skins/default/templates/user_recent.html
@@ -12,7 +12,7 @@
                 </div>
                 <div style="float:left;overflow:hidden;">
                     {% ifequal act.type_id 7 %}
-                    <a href="{{act.badge.get_absolute_url}}" title="{{ act.badge.get_type_display }} : {{ act.badge.description }}" class="medal"><span class="badge{{ act.badge.type }}">&#9679;</span>&nbsp;{{ act.badge.name }}</a>
+                    <a href="{{act.badge.get_absolute_url}}" title="{{ act.badge.get_type_display }} : {% act.badge.description %}" class="medal"><span class="badge{{ act.badge.type }}">&#9679;</span>&nbsp;{% trans act.badge.name %}</a>
                     {% else %}
                     <span class="post-type-{{ act.type_id }}"><a href="{{ act.title_link }}">{{ act.title }}</a></span>
                     {% if act.summary %}<span class="revision-summary">{{ act.summary }}</span>{% endif %}
diff --git a/forum/skins/default/templates/user_stats.html b/forum/skins/default/templates/user_stats.html
index 269230c7..ae24a374 100644
--- a/forum/skins/default/templates/user_stats.html
+++ b/forum/skins/default/templates/user_stats.html
@@ -8,24 +8,12 @@
 	
         <a name="questions"></a>
         {% spaceless %}
-            <h2>
-                {% blocktrans count questions|length as counter %}
-                <span class="count">1</span> Question
-                {% plural %}
-                <span class="count">{{counter}}</span> Questions
-                {% endblocktrans %}
-            </h2>
+            <h2>{% blocktrans count questions|length as counter %}<span class="count">1</span> Question{% plural %}<span class="count">{{counter}}</span> Questions{% endblocktrans %}</h2>
         {% endspaceless %}
 		{% include "users_questions.html" %}
         <a name="answers"></a>
         {% spaceless %}
-            <h2>
-                {% blocktrans count answered_questions|length as counter %}
-                <span class="count">1</span> Answer
-                {% plural %}
-                <span class="count">{{counter}}</span> Answers
-                {% endblocktrans %}
-            </h2>
+            <h2>{% blocktrans count answered_questions|length as counter %}<span class="count">1</span> Answer{% plural %}<span class="count">{{counter}}</span> Answers{% endblocktrans %}</h2>
         {% endspaceless %}
         <div class="user-stats-table">
             {% for answered_question in answered_questions %}
@@ -53,13 +41,7 @@
         <br/>
         <a name="votes"></a>
         {% spaceless %}
-            <h2>
-                {% blocktrans count total_votes as cnt %}
-                    <span class="count">1</span> Vote
-                {% plural %}
-                    <span class="count">{{cnt}}</span> Votes
-                {% endblocktrans %}
-            </h2>
+            <h2>{% blocktrans count total_votes as cnt %}<span class="count">1</span> Vote{% plural %}<span class="count">{{cnt}}</span> Votes {% endblocktrans %}</h2>
         {% endspaceless %}
         <div class="user-stats-table">
             <table>
@@ -79,9 +61,7 @@
         </div>
         <a name="tags"></a>
         {% spaceless %}
-            <h2>
-                {% blocktrans count user_tags|length as counter %}<span class="count">1</span> Tag{% plural %}<span class="count">{{counter}}</span> Tags{% endblocktrans %}
-            </h2>
+            <h2>{% blocktrans count user_tags|length as counter %}<span class="count">1</span> Tag{% plural %}<span class="count">{{counter}}</span> Tags{% endblocktrans %}</h2>
         {% endspaceless %}
         <div class="user-stats-table">
             <table class="tags">
@@ -103,20 +83,14 @@
         </div>
         <a name="badges"></a>
         {% spaceless %}
-        <h2>
-            {% blocktrans count total_awards as counter %}
-            <span class="count">1</span> Badge
-            {% plural %}
-            <span class="count">{{counter}}</span> Badges
-            {% endblocktrans %}
-        </h2>
+        <h2>{% blocktrans count total_awards as counter %}<span class="count">1</span> Badge{% plural %}<span class="count">{{counter}}</span> Badges{% endblocktrans %}</h2>
         {% endspaceless %}
         <div class="user-stats-table">
             <table>
                 <tr>
                     <td width="180" style="line-height:35px">
-                        {% for award in awards %}
-                            <a href="{% url badges %}{{award.id}}/{{award.name}}" title="{{ award.description }}" class="medal"><span class="badge{{ award.type }}">&#9679;</span>&nbsp;{{ award.name }}</a><span class="tag-number"> &#215; {{ award.count|intcomma }}</span><br/>
+                        {% for award in awards %}{% comment %}todo: translate badge name properly{% endcomment %}
+                            <a href="{% url badge award.id %}{{award.name}}" title="{% trans award.description %}" class="medal"><span class="badge{{ award.type }}">&#9679;</span>&nbsp;{% trans award.name %}</a><span class="tag-number"> &#215; {{ award.count|intcomma }}</span><br/>
                             {% if forloop.counter|divisibleby:"6" %}
                                 </td>
                                 <td width="180" style="line-height:35px">
diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
index 8674de54..d58963c8 100644
--- a/locale/de/LC_MESSAGES/django.mo
+++ b/locale/de/LC_MESSAGES/django.mo
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index d760ad21..82732cdf 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:44-0400\n"
+"POT-Creation-Date: 2010-05-01 20:53-0400\n"
 "PO-Revision-Date: 2010-04-30 05:58\n"
 "Last-Translator: <post@pekkagaiser.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -894,14 +894,12 @@ msgid "Nice answer"
 msgstr "überarbeitete Antwort"
 
 #: forum/migrations/0005_install_badges.py:12
-#, fuzzy
 msgid "nice-answer"
-msgstr "antworten/"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:12
-#, fuzzy
 msgid "Answer voted up 10 times"
-msgstr "Von mir beantwortet"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:13
 #, fuzzy
@@ -909,9 +907,8 @@ msgid "Nice Question"
 msgstr "überarbeitete Frage"
 
 #: forum/migrations/0005_install_badges.py:13
-#, fuzzy
 msgid "nice-question"
-msgstr "frage_stellen/"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:13
 #, fuzzy
@@ -931,9 +928,8 @@ msgid "Left 10 comments with score of 10 or more"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:15
-#, fuzzy
 msgid "Popular Question"
-msgstr "Ask Your Question"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:15
 #, fuzzy
@@ -986,9 +982,8 @@ msgid "Editor"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:19
-#, fuzzy
 msgid "editor"
-msgstr "bearbeiten/"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:19
 msgid "First edit"
@@ -1079,20 +1074,12 @@ msgid "self-learner"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:26
-#, fuzzy
 msgid "Answered your own question with at least 3 up votes"
 msgstr ""
-"<span class='big strong'>You are welcome to answer your own question</span>, "
-"but please make sure to give an <strong>answer</strong>. Remember that you "
-"can always <strong>revise your original question</strong>. Please "
-"<strong>use comments for discussions</strong>  and <strong>please don't "
-"forget to vote :)</strong> for the answers that you liked (or perhaps did "
-"not like)! "
 
 #: forum/migrations/0005_install_badges.py:27
-#, fuzzy
 msgid "Great Answer"
-msgstr "Antwort"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:27
 #, fuzzy
@@ -1119,28 +1106,24 @@ msgid "Question voted up 100 times"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:29
-#, fuzzy
 msgid "Stellar Question"
-msgstr "überarbeitete Frage"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:29
-#, fuzzy
 msgid "stellar-question"
-msgstr "Frage"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:29
 msgid "Question favorited by 100 users"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:30
-#, fuzzy
 msgid "Famous question"
-msgstr "Neueste Fragen"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:30
-#, fuzzy
 msgid "famous-question"
-msgstr "Frage"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:30
 msgid "Asked a question with 10,000 views"
@@ -1159,43 +1142,36 @@ msgid "Actively participated in the private alpha"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:32
-#, fuzzy
 msgid "Good Answer"
-msgstr "oldest"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:32
-#, fuzzy
 msgid "good-answer"
-msgstr "Antwort"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:32
-#, fuzzy
 msgid "Answer voted up 25 times"
-msgstr "Von mir beantwortet"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:33
-#, fuzzy
 msgid "Good Question"
-msgstr "Frage"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:33
-#, fuzzy
 msgid "good-question"
-msgstr "Frage"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:33
 msgid "Question voted up 25 times"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:34
-#, fuzzy
 msgid "Favorite Question"
-msgstr "überarbeitete Frage"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:34
-#, fuzzy
 msgid "favorite-question"
-msgstr "überarbeitete Frage"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:34
 msgid "Question favorited by 25 users"
@@ -1242,7 +1218,7 @@ msgid "Expert"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:38
-msgid "export"
+msgid "expert"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:38
@@ -1262,14 +1238,12 @@ msgid "Active member for a year"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:40
-#, fuzzy
 msgid "Notable Question"
-msgstr "Keine echte Frage"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:40
-#, fuzzy
 msgid "notable-question"
-msgstr "Keine echte Frage"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:40
 msgid "Asked a question with 2,500 views"
@@ -1360,15 +1334,15 @@ msgstr ""
 msgid "%(people)s commented an answer"
 msgstr ""
 
-#: forum/models/repute.py:13 forum/skins/default/templates/badges.html:53
+#: forum/models/repute.py:13 forum/skins/default/templates/badges.html:54
 msgid "gold"
 msgstr ""
 
-#: forum/models/repute.py:14 forum/skins/default/templates/badges.html:61
+#: forum/models/repute.py:14 forum/skins/default/templates/badges.html:62
 msgid "silver"
 msgstr ""
 
-#: forum/models/repute.py:15 forum/skins/default/templates/badges.html:68
+#: forum/models/repute.py:15 forum/skins/default/templates/badges.html:69
 msgid "bronze"
 msgstr ""
 
@@ -1770,27 +1744,27 @@ msgstr ""
 "s'>feedback</a></strong> - what kinds of badges would you like to see and "
 "suggest the activity for which those badges might be awarded."
 
-#: forum/skins/default/templates/badges.html:50
+#: forum/skins/default/templates/badges.html:51
 msgid "Community badges"
 msgstr "Badge levels"
 
-#: forum/skins/default/templates/badges.html:56
+#: forum/skins/default/templates/badges.html:57
 msgid "gold badge description"
 msgstr ""
 "Gold badge is the highest award in this community. To obtain it have to show "
 "profound knowledge and ability in addition to your active participation."
 
-#: forum/skins/default/templates/badges.html:64
+#: forum/skins/default/templates/badges.html:65
 msgid "silver badge description"
 msgstr ""
 "Obtaining silver badge requires significant patience. If you have received "
 "one, that means you have greatly contributed to this community."
 
-#: forum/skins/default/templates/badges.html:67
+#: forum/skins/default/templates/badges.html:68
 msgid "bronze badge: often given as a special honor"
 msgstr ""
 
-#: forum/skins/default/templates/badges.html:71
+#: forum/skins/default/templates/badges.html:72
 msgid "bronze badge description"
 msgstr ""
 "If you are an active participant in this community, you will be recognized "
@@ -3159,100 +3133,76 @@ msgstr ""
 msgid "%(user_name)s's karma change log"
 msgstr ""
 
-#: forum/skins/default/templates/user_stats.html:12
+#: forum/skins/default/templates/user_stats.html:11
 #, python-format
-msgid ""
-"\n"
-"                <span class=\"count\">1</span> Question\n"
-"                "
-msgid_plural ""
-"\n"
-"                <span class=\"count\">%(counter)s</span> Questions\n"
-"                "
+msgid "<span class=\"count\">1</span> Question"
+msgid_plural "<span class=\"count\">%(counter)s</span> Questions"
 msgstr[0] ""
 msgstr[1] ""
 
-#: forum/skins/default/templates/user_stats.html:23
+#: forum/skins/default/templates/user_stats.html:16
 #, python-format
-msgid ""
-"\n"
-"                <span class=\"count\">1</span> Answer\n"
-"                "
-msgid_plural ""
-"\n"
-"                <span class=\"count\">%(counter)s</span> Answers\n"
-"                "
+msgid "<span class=\"count\">1</span> Answer"
+msgid_plural "<span class=\"count\">%(counter)s</span> Answers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: forum/skins/default/templates/user_stats.html:36
+#: forum/skins/default/templates/user_stats.html:24
 #, python-format
 msgid "the answer has been voted for %(answer_score)s times"
 msgstr ""
 
-#: forum/skins/default/templates/user_stats.html:36
+#: forum/skins/default/templates/user_stats.html:24
 msgid "this answer has been selected as correct"
 msgstr ""
 
-#: forum/skins/default/templates/user_stats.html:46
+#: forum/skins/default/templates/user_stats.html:34
 #, fuzzy, python-format
 msgid "(one comment)"
 msgid_plural "the answer has been commented %(comment_count)s times"
 msgstr[0] "post a comment"
 msgstr[1] "post a comment"
 
-#: forum/skins/default/templates/user_stats.html:57
+#: forum/skins/default/templates/user_stats.html:44
 #, python-format
-msgid ""
-"\n"
-"                    <span class=\"count\">1</span> Vote\n"
-"                "
-msgid_plural ""
-"\n"
-"                    <span class=\"count\">%(cnt)s</span> Votes\n"
-"                "
+msgid "<span class=\"count\">1</span> Vote"
+msgid_plural "<span class=\"count\">%(cnt)s</span> Votes "
 msgstr[0] ""
 msgstr[1] ""
 
-#: forum/skins/default/templates/user_stats.html:68
+#: forum/skins/default/templates/user_stats.html:50
 msgid "thumb up"
 msgstr ""
 
-#: forum/skins/default/templates/user_stats.html:69
+#: forum/skins/default/templates/user_stats.html:51
 msgid "user has voted up this many times"
 msgstr ""
 
-#: forum/skins/default/templates/user_stats.html:73
+#: forum/skins/default/templates/user_stats.html:55
 msgid "thumb down"
 msgstr ""
 
-#: forum/skins/default/templates/user_stats.html:74
+#: forum/skins/default/templates/user_stats.html:56
 msgid "user voted down this many times"
 msgstr ""
 
-#: forum/skins/default/templates/user_stats.html:83
+#: forum/skins/default/templates/user_stats.html:64
 #, python-format
 msgid "<span class=\"count\">1</span> Tag"
 msgid_plural "<span class=\"count\">%(counter)s</span> Tags"
 msgstr[0] ""
 msgstr[1] ""
 
-#: forum/skins/default/templates/user_stats.html:92
+#: forum/skins/default/templates/user_stats.html:72
 #, python-format
 msgid ""
 "see other questions with %(view_user)s's contributions tagged '%(tag_name)s' "
 msgstr ""
 
-#: forum/skins/default/templates/user_stats.html:107
+#: forum/skins/default/templates/user_stats.html:86
 #, python-format
-msgid ""
-"\n"
-"            <span class=\"count\">1</span> Badge\n"
-"            "
-msgid_plural ""
-"\n"
-"            <span class=\"count\">%(counter)s</span> Badges\n"
-"            "
+msgid "<span class=\"count\">1</span> Badge"
+msgid_plural "<span class=\"count\">%(counter)s</span> Badges"
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index ca392ff1..d2607d13 100644
--- a/locale/en/LC_MESSAGES/django.mo
+++ b/locale/en/LC_MESSAGES/django.mo
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 843ea8a7..3e34dacb 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -1700,12 +1700,9 @@ msgid ""
 "(feedback_faq_url)s.\n"
 "    "
 msgstr ""
-"Currently badges differ only by their level: <strong>gold</strong>, "
-"<strong>silver</strong> and <strong>bronze</strong> (their meanings are "
-"described on the right). In the future there will be many types of badges at "
-"each level. <strong>Please give us your <a href='%(feedback_faq_url)"
-"s'>feedback</a></strong> - what kinds of badges would you like to see and "
-"suggest the activity for which those badges might be awarded."
+"Below is the list of available badges and number \n"
+"    of times each type of badge has been awarded. Have ideas about fun badges? "
+"Please, give us your <a href='%(feedback_faq_url)s'>feedback</a>"
 
 #: forum/skins/default/templates/badges.html:50
 msgid "Community badges"
diff --git a/locale/ru/LC_MESSAGES/django.mo b/locale/ru/LC_MESSAGES/django.mo
index 5a99b360..8ea9e22c 100644
--- a/locale/ru/LC_MESSAGES/django.mo
+++ b/locale/ru/LC_MESSAGES/django.mo
diff --git a/locale/ru/LC_MESSAGES/django.po b/locale/ru/LC_MESSAGES/django.po
index 81ee37d8..e0f960de 100644
--- a/locale/ru/LC_MESSAGES/django.po
+++ b/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:44-0400\n"
+"POT-Creation-Date: 2010-05-01 20:26-0400\n"
 "PO-Revision-Date: 2010-04-30 21:06\n"
 "Last-Translator: <evgeny.fadeev@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -892,34 +892,28 @@ msgid "Deleted own post with score of -3 or lower"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:12
-#, fuzzy
 msgid "Nice answer"
-msgstr "отредактировали ответ"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:12
-#, fuzzy
 msgid "nice-answer"
-msgstr "новый-ответ/"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:12
-#, fuzzy
 msgid "Answer voted up 10 times"
-msgstr "Отвеченные мной"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:13
-#, fuzzy
 msgid "Nice Question"
-msgstr "новый вопрос"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:13
-#, fuzzy
 msgid "nice-question"
-msgstr "новый-вопрос/"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:13
-#, fuzzy
 msgid "Question voted up 10 times"
-msgstr "содержание вопроса должно быть более 10-ти букв"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:14
 msgid "Pundit"
@@ -934,14 +928,12 @@ msgid "Left 10 comments with score of 10 or more"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:15
-#, fuzzy
 msgid "Popular Question"
-msgstr "Задайте Ваш вопрос"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:15
-#, fuzzy
 msgid "popular-question"
-msgstr "вопрос"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:15
 msgid "Asked a question with 1,000 views"
@@ -980,18 +972,16 @@ msgid "critic"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:18
-#, fuzzy
 msgid "First down vote"
-msgstr "отрицательный голос"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:19
 msgid "Editor"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:19
-#, fuzzy
 msgid "editor"
-msgstr "править/"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:19
 msgid "First edit"
@@ -1034,19 +1024,16 @@ msgid "Asked first question with at least one up vote"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:23
-#, fuzzy
 msgid "Supporter"
-msgstr "положительный голос"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:23
-#, fuzzy
 msgid "supporter"
-msgstr "положительный голос"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:23
-#, fuzzy
 msgid "First up vote"
-msgstr "больше голосов"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:24
 msgid "Teacher"
@@ -1069,9 +1056,8 @@ msgid "autobiographer"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:25
-#, fuzzy
 msgid "Completed all user profile fields"
-msgstr "полное завершение учётной записи"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:26
 msgid "Self-Learner"
@@ -1086,57 +1072,48 @@ msgid "Answered your own question with at least 3 up votes"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:27
-#, fuzzy
 msgid "Great Answer"
-msgstr "ответ"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:27
-#, fuzzy
 msgid "great-answer"
-msgstr "ответ"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:27
-#, fuzzy
 msgid "Answer voted up 100 times"
-msgstr "Отвеченные мной"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:28
-#, fuzzy
 msgid "Great Question"
-msgstr "новый вопрос"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:28
-#, fuzzy
 msgid "great-question"
-msgstr "вопрос"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:28
 msgid "Question voted up 100 times"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:29
-#, fuzzy
 msgid "Stellar Question"
-msgstr "смотреть все вопросы"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:29
-#, fuzzy
 msgid "stellar-question"
-msgstr "смотреть все вопросы"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:29
 msgid "Question favorited by 100 users"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:30
-#, fuzzy
 msgid "Famous question"
-msgstr "самые новые вопросы"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:30
-#, fuzzy
 msgid "famous-question"
-msgstr "вопрос"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:30
 msgid "Asked a question with 10,000 views"
@@ -1155,43 +1132,36 @@ msgid "Actively participated in the private alpha"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:32
-#, fuzzy
 msgid "Good Answer"
-msgstr "Править ответ"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:32
-#, fuzzy
 msgid "good-answer"
-msgstr "ответ"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:32
-#, fuzzy
 msgid "Answer voted up 25 times"
-msgstr "Отвеченные мной"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:33
-#, fuzzy
 msgid "Good Question"
-msgstr "вопрос"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:33
-#, fuzzy
 msgid "good-question"
-msgstr "вопрос"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:33
 msgid "Question voted up 25 times"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:34
-#, fuzzy
 msgid "Favorite Question"
-msgstr "отредактировали ответ"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:34
-#, fuzzy
 msgid "favorite-question"
-msgstr "просмотр отмеченных вопросов"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:34
 msgid "Question favorited by 25 users"
@@ -1238,9 +1208,8 @@ msgid "Expert"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:38
-#, fuzzy
-msgid "export"
-msgstr "текст"
+msgid "expert"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:38
 msgid "Very active in one tag"
@@ -1259,14 +1228,12 @@ msgid "Active member for a year"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:40
-#, fuzzy
 msgid "Notable Question"
-msgstr "на вопрос не похоже"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:40
-#, fuzzy
 msgid "notable-question"
-msgstr "на вопрос не похоже"
+msgstr ""
 
 #: forum/migrations/0005_install_badges.py:40
 msgid "Asked a question with 2,500 views"
@@ -1357,15 +1324,15 @@ msgstr "%(people)s комментировали вопросы"
 msgid "%(people)s commented an answer"
 msgstr "%(people)s комментировали ответы"
 
-#: forum/models/repute.py:13 forum/skins/default/templates/badges.html:53
+#: forum/models/repute.py:13 forum/skins/default/templates/badges.html:54
 msgid "gold"
 msgstr "золотая"
 
-#: forum/models/repute.py:14 forum/skins/default/templates/badges.html:61
+#: forum/models/repute.py:14 forum/skins/default/templates/badges.html:62
 msgid "silver"
 msgstr "серебряная"
 
-#: forum/models/repute.py:15 forum/skins/default/templates/badges.html:68
+#: forum/models/repute.py:15 forum/skins/default/templates/badges.html:69
 msgid "bronze"
 msgstr "бронзовая"
 
@@ -1763,23 +1730,23 @@ msgid ""
 "    "
 msgstr ""
 
-#: forum/skins/default/templates/badges.html:50
+#: forum/skins/default/templates/badges.html:51
 msgid "Community badges"
 msgstr ""
 
-#: forum/skins/default/templates/badges.html:56
+#: forum/skins/default/templates/badges.html:57
 msgid "gold badge description"
 msgstr ""
 
-#: forum/skins/default/templates/badges.html:64
+#: forum/skins/default/templates/badges.html:65
 msgid "silver badge description"
 msgstr ""
 
-#: forum/skins/default/templates/badges.html:67
+#: forum/skins/default/templates/badges.html:68
 msgid "bronze badge: often given as a special honor"
 msgstr ""
 
-#: forum/skins/default/templates/badges.html:71
+#: forum/skins/default/templates/badges.html:72
 msgid "bronze badge description"
 msgstr ""
 
diff --git a/locale/tr/LC_MESSAGES/django.mo b/locale/tr/LC_MESSAGES/django.mo
index 5f71beb9..74106032 100644
--- a/locale/tr/LC_MESSAGES/django.mo
+++ b/locale/tr/LC_MESSAGES/django.mo
diff --git a/locale/tr/LC_MESSAGES/django.po b/locale/tr/LC_MESSAGES/django.po
index 79d8b2dd..ab6375bc 100644
--- a/locale/tr/LC_MESSAGES/django.po
+++ b/locale/tr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-01 16:46-0400\n"
+"POT-Creation-Date: 2010-05-01 20:42-0400\n"
 "PO-Revision-Date: 2010-04-30 02:23\n"
 "Last-Translator: <oktayxy@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -176,13 +176,16 @@ msgid "Password changed."
 msgstr "Şifre değiştirildi."
 
 #: django_authopenid/views.py:732 django_authopenid/views.py:738
-#, python-format
+#, fuzzy, python-format
 msgid "your email needs to be validated see %(details_url)s"
-msgstr "E-mail adresiniz doğrulanmalı. Lütfen bakın %(details_url)s"
+msgstr ""
+"Your email needs to be validated. Please see details <a "
+"id='validate_email_alert' href='%(details_url)s'>here</a>."
 
 #: django_authopenid/views.py:759
+#, fuzzy
 msgid "Email verification subject line"
-msgstr "E-mail doğrulaması"
+msgstr "Verification Email from Q&A forum"
 
 #: django_authopenid/views.py:850
 msgid "your email was not changed"
@@ -792,11 +795,15 @@ msgid "email update message subject"
 msgstr "e-mail güncelleme mesajı"
 
 #: forum/management/commands/send_email_alerts.py:238
-#, python-format
+#, fuzzy, python-format
 msgid "%(name)s, this is an update message header for a question"
 msgid_plural "%(name)s, this is an update message header for %(num)d questions"
-msgstr[0] "%(name)s için güncellenen soru bildirisi"
-msgstr[1] "%(name)s,  %(num)d sorusu için güncellendi"
+msgstr[0] ""
+"<p>Dear %(name)s,</p></p>The following question has been updated on the Q&A "
+"forum:</p>"
+msgstr[1] ""
+"<p>Dear %(name)s,</p><p>The following %(num)d questions have been updated on "
+"the Q&A forum:</p>"
 
 #: forum/management/commands/send_email_alerts.py:255
 msgid "new question"
@@ -836,13 +843,16 @@ msgid ""
 msgstr "Ölen linkleri önceden görme şansın olabilir. "
 
 #: forum/management/commands/send_email_alerts.py:311
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "go to %(link)s to change frequency of email updates or %(email)s "
 "administrator"
 msgstr ""
-"%(link)s linkine giderek site yönetiminden alacağınız  %(email)s mesajların "
-"sıklığını değiştirebilirsiniz"
+"<p>Please remember that you can always <a href='%(link)s'>adjust</a> "
+"frequency of the email updates or turn them off entirely.<br/>If you believe "
+"that this message was sent in an error, please email about it the forum "
+"administrator at %(email)s.</p><p>Sincerely,</p><p>Your friendly Q&A forum "
+"server.</p>"
 
 #: forum/middleware/anon_user.py:34
 #, python-format
@@ -1192,7 +1202,7 @@ msgid "Expert"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:38
-msgid "export"
+msgid "expert"
 msgstr ""
 
 #: forum/migrations/0005_install_badges.py:38
@@ -1311,15 +1321,15 @@ msgstr ""
 msgid "%(people)s commented an answer"
 msgstr "%(people)s bir cevabı yorumladı"
 
-#: forum/models/repute.py:13 forum/skins/default/templates/badges.html:53
+#: forum/models/repute.py:13 forum/skins/default/templates/badges.html:54
 msgid "gold"
 msgstr "altın"
 
-#: forum/models/repute.py:14 forum/skins/default/templates/badges.html:61
+#: forum/models/repute.py:14 forum/skins/default/templates/badges.html:62
 msgid "silver"
 msgstr "gümüş"
 
-#: forum/models/repute.py:15 forum/skins/default/templates/badges.html:68
+#: forum/models/repute.py:15 forum/skins/default/templates/badges.html:69
 msgid "bronze"
 msgstr "bronz"
 
@@ -1639,18 +1649,27 @@ msgstr "Soru sor"
 
 #: forum/skins/default/templates/ask.html:69
 #: forum/skins/default/templates/ask_form.html:11
+#, fuzzy
 msgid "login to post question info"
-msgstr "soru yazmak için giriş yapmalısınız"
+msgstr ""
+"<span class=\"strong big\">You are welcome to start submitting your question "
+"anonymously</span>. When you submit the post, you will be redirected to the "
+"login/signup page. Your question will be saved in the current session and "
+"will be published after you log in. Login/signup process is very simple. "
+"Login takes about 30 seconds, initial signup takes a minute or less."
 
 #: forum/skins/default/templates/ask.html:75
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "must have valid %(email)s to post, \n"
 "                            see %(email_validation_faq_url)s\n"
 "                            "
 msgstr ""
-"mesaj yollayabilmek için %(email)s geçerli olmalıdır. Yardım için lütfen "
-"bakın: %(email_validation_faq_url)s"
+"<span class='strong big'>Looks like your email address, %(email)s has not "
+"yet been validated.</span> To post messages you must verify your email, "
+"please see <a href='%(email_validation_faq_url)s'>more details here</a>."
+"<br>You can submit your question now and validate email after that. Your "
+"question will saved as pending meanwhile. "
 
 #: forum/skins/default/templates/ask.html:113
 #: forum/skins/default/templates/ask_form.html:54
@@ -1668,14 +1687,17 @@ msgid "Ask your question"
 msgstr "Soru yazın"
 
 #: forum/skins/default/templates/ask_form.html:15
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "must have valid %(email)s to post, \n"
 "                                see %(email_validation_faq_url)s\n"
 "                                "
 msgstr ""
-"Mesaj yollayabilmek için geçerli bir %(email)s adresiniz olmalıdır. Lütfen "
-"bakınız:  %(email_validation_faq_url)s"
+"<span class='strong big'>Looks like your email address, %(email)s has not "
+"yet been validated.</span> To post messages you must verify your email, "
+"please see <a href='%(email_validation_faq_url)s'>more details here</a>."
+"<br>You can submit your question now and validate email after that. Your "
+"question will saved as pending meanwhile. "
 
 #: forum/skins/default/templates/badge.html:6
 #: forum/skins/default/templates/badge.html:17
@@ -1695,41 +1717,52 @@ msgid "Badges"
 msgstr "Ödüller"
 
 #: forum/skins/default/templates/badges.html:21
+#, fuzzy
 msgid "Community gives you awards for your questions, answers and votes."
 msgstr ""
-"Sevgili site sakinleri... Sorularınız, cevaplarınız ya da oylarınız için "
-"ödül alabilirsiniz."
+"If your questions and answers are highly voted, your contribution to this "
+"Q&amp;A community will be recognized with the variety of badges."
 
 #: forum/skins/default/templates/badges.html:22
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "Below is the list of available badges and number \n"
 "    of times each type of badge has been awarded. Give us feedback at %"
 "(feedback_faq_url)s.\n"
 "    "
 msgstr ""
-"Aşağıda alınabilecek ödüller ve kaç defa verildikleri görülmektedir.<BR> "
-"Görüşlerinizi bekliyoruz: %(feedback_faq_url)s"
+"Below is the list of available badges and number \n"
+"    of times each type of badge has been awarded. Have ideas about fun badges? "
+"Please, give us your <a href='%(feedback_faq_url)s'>feedback</a>"
 
-#: forum/skins/default/templates/badges.html:50
+#: forum/skins/default/templates/badges.html:51
 msgid "Community badges"
 msgstr "Site ödülleri"
 
-#: forum/skins/default/templates/badges.html:56
+#: forum/skins/default/templates/badges.html:57
+#, fuzzy
 msgid "gold badge description"
-msgstr "altın madalya açıklaması"
+msgstr ""
+"Gold badge is the highest award in this community. To obtain it have to show "
+"profound knowledge and ability in addition to your active participation."
 
-#: forum/skins/default/templates/badges.html:64
+#: forum/skins/default/templates/badges.html:65
+#, fuzzy
 msgid "silver badge description"
-msgstr "gümüş madalya açıklaması"
+msgstr ""
+"Obtaining silver badge requires significant patience. If you have received "
+"one, that means you have greatly contributed to this community."
 
-#: forum/skins/default/templates/badges.html:67
+#: forum/skins/default/templates/badges.html:68
 msgid "bronze badge: often given as a special honor"
 msgstr "bronz madalya: genellikle özel bir onur olarak verilir"
 
-#: forum/skins/default/templates/badges.html:71
+#: forum/skins/default/templates/badges.html:72
+#, fuzzy
 msgid "bronze badge description"
-msgstr "bronz madalya açıklaması"
+msgstr ""
+"If you are an active participant in this community, you will be recognized "
+"with this badge."
 
 #: forum/skins/default/templates/book.html:7
 msgid "reading channel"
@@ -1928,8 +1961,13 @@ msgid "How does reputation system work?"
 msgstr "İtibar sistemi nasıl çalışmaktadır?"
 
 #: forum/skins/default/templates/faq.html:41
+#, fuzzy
 msgid "Rep system summary"
-msgstr "Puanlama sistemi özeti"
+msgstr ""
+"When a question or answer is upvoted, the user who posted them will gain "
+"some points, which are called \"karma points\". These points serve as a "
+"rough measure of the community trust to him/her. Various moderation tasks "
+"are gradually assigned to the users based on those points."
 
 #: forum/skins/default/templates/faq.html:42
 msgid ""
@@ -2003,23 +2041,45 @@ msgstr "E-mail doğrulama"
 
 #: forum/skins/default/templates/faq.html:105
 #, python-format
+#, fuzzy
 msgid ""
 "how to validate email info with %(send_email_key_url)s %(gravatar_faq_url)s"
 msgstr ""
-"E-mail adresinizi nasıl doğrulayabilirsiniz? %(send_email_key_url)s %"
-"(gravatar_faq_url)s"
+"<form style='margin:0;padding:0;' action='%(send_email_key_url)s'><p><span "
+"class=\"bigger strong\">How?</span> If you have just set or changed your "
+"email address - <strong>check your email and click the included link</"
+"strong>.<br>The link contains a key generated specifically for you. You can "
+"also <button style='display:inline' type='submit'><strong>get a new key</"
+"strong></button> and check your email again.</p></form><span class=\"bigger "
+"strong\">Why?</span> Email validation is required to make sure that "
+"<strong>only you can post messages</strong> on your behalf and to "
+"<strong>minimize spam</strong> posts.<br>With email you can "
+"<strong>subscribe for updates</strong> on the most interesting questions. "
+"Also, when you sign up for the first time - create a unique <a href='%"
+"(gravatar_faq_url)s'><strong>gravatar</strong></a> personal image.</p>"
 
 #: forum/skins/default/templates/faq.html:110
+#, fuzzy
 msgid "what is gravatar"
-msgstr "Gravatar nedir?"
+msgstr "How to change my picture (gravatar) and what is gravatar?"
 
 #: forum/skins/default/templates/faq.html:111
+#, fuzzy
 msgid "gravatar faq info"
-msgstr "gravatar hakkında bilgi bu kısımda verilecektir."
-
-#: forum/skins/default/templates/faq.html:114
-msgid "To register, do I need to create new password?"
-msgstr "Kaydolmak için, yeni bir şifremi oluşturmalıyım?"
+msgstr ""
+"<p>The picture that appears on the users profiles is called "
+"<strong>gravatar</strong> (which means <strong>g</strong>lobally <strong>r</"
+"strong>ecognized <strong>avatar</strong>).</p><p>Here is how it works: a "
+"<strong>cryptographic key</strong> (unbreakable code) is calculated from "
+"your email address. You upload your picture (or your favorite alter ego "
+"image) the website <a href='http://gravatar.com'><strong>gravatar.com</"
+"strong></a> from where we later retreive your image using the key.</"
+"p><p>This way all the websites you trust can show your image next to your "
+"posts and your email address remains private.</p><p>Please "
+"<strong>personalize your account</strong> with an image - just register at "
+"<a href='http://gravatar.com'><strong>gravatar.com</strong></a> (just please "
+"be sure to use the same email address that you used to register with us). "
+"Default image that looks like a kitchen tile is generated automatically.</p>"
 
 #: forum/skins/default/templates/faq.html:115
 msgid ""
@@ -2065,11 +2125,13 @@ msgid "Still have questions?"
 msgstr "Hala aklınıza takılan bir soru mu var?"
 
 #: forum/skins/default/templates/faq.html:128
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "Please ask your question at %(ask_question_url)s, help make our community "
 "better!"
 msgstr ""
+"Please <a href='%(ask_question_url)s'>ask</a> your question, help make our "
+"community better!"
 "Lütfen sorularınızı %(ask_question_url)s kısmına yazın. Böylelikle bize daha "
 "fazla yardımcı olmuş olursunuz."
 
@@ -2214,10 +2276,14 @@ msgid "Logout"
 msgstr "Çıkış"
 
 #: forum/skins/default/templates/logout.html:19
+#, fuzzy
 msgid ""
 "As a registered user you can login with your OpenID, log out of the site or "
 "permanently remove your account."
 msgstr ""
+"Clicking <strong>Logout</strong> will log you out from the forumbut will not "
+"sign you off from your OpenID provider.</p><p>If you wish to sign off "
+"completely - please make sure to log out from your OpenID provider as well."
 "OpenID hesaplarından birisi ile (mesela Facebook, Twitter, Googlemail, "
 "Yahoo, MSN) giriş yapabilirsiniz. Şifreniz sitemizde kimse tarafından "
 "görünmeyecek, sitemizde kaydedilmeyecektir. Bize güvenebilirsiniz..."
@@ -2286,44 +2352,70 @@ msgid "Privacy policy"
 msgstr "Gizlilik politikası"
 
 #: forum/skins/default/templates/privacy.html:15
+#, fuzzy
 msgid "general message about privacy"
-msgstr "gizlilik hakkında genel mesaj"
+msgstr ""
+"Respecting users privacy is an important core principle of this Q&amp;A "
+"forum. Information on this page details how this forum protects your "
+"privacy, and what type of information is collected."
 
 #: forum/skins/default/templates/privacy.html:18
 msgid "Site Visitors"
 msgstr "Site ziyaretçileri"
 
 #: forum/skins/default/templates/privacy.html:20
+#, fuzzy
 msgid "what technical information is collected about visitors"
-msgstr "ziyaretçiler hakkında toplanan bilgiler"
+msgstr ""
+"Information on question views, revisions of questions and answers - both "
+"times and content are recorded for each user in order to correctly count "
+"number of views, maintain data integrity and report relevant updates."
 
 #: forum/skins/default/templates/privacy.html:23
 msgid "Personal Information"
 msgstr "Kişisel bilgiler"
 
 #: forum/skins/default/templates/privacy.html:25
+#, fuzzy
 msgid "details on personal information policies"
-msgstr "kişisel bilgilerin gizliliği ile ilgili ayrıntılar"
+msgstr ""
+"Members of this community may choose to display personally identifiable "
+"information in their profiles. Forum will never display such information "
+"without a request from the user."
 
 #: forum/skins/default/templates/privacy.html:28
 msgid "Other Services"
 msgstr "Diğer Hizmetler"
 
 #: forum/skins/default/templates/privacy.html:30
+#, fuzzy
 msgid "details on sharing data with third parties"
-msgstr "üçüncü şahıslarla paylaşılacak veriler ile ilgili ayrıntılar"
+msgstr ""
+"None of the data that is not openly shown on the forum by the choice of the "
+"user is shared with any third party."
+"üçüncü şahıslarla paylaşılacak veriler ile ilgili ayrıntılar"
 
 #: forum/skins/default/templates/privacy.html:35
+#, fuzzy
 msgid "cookie policy details"
-msgstr "çerezler hakkında"
+msgstr ""
+"Forum software relies on the internet cookie technology to keep track of "
+"user sessions. Cookies must be enabled in your browser so that forum can "
+"work for you."
+"çerezler hakkında"
 
 #: forum/skins/default/templates/privacy.html:37
 msgid "Policy Changes"
 msgstr "Site kurallarındaki değişiklikler"
 
 #: forum/skins/default/templates/privacy.html:38
+#, fuzzy
 msgid "how privacy policies can be changed"
-msgstr "gizlilik politikaları nasıl değiştirilebilir?"
+msgstr ""
+"These policies may be adjusted to improve protection of user's privacy. "
+"Whenever such changes occur, users will be notified via the internal "
+"messaging system. "
+"gizlilik politikaları nasıl değiştirilebilir?"
 
 #: forum/skins/default/templates/question.html:78
 #: forum/skins/default/templates/question.html:79
@@ -2501,24 +2593,38 @@ msgstr "silineni geri al"
 
 #: forum/skins/default/templates/question.html:364
 #: forum/skins/default/templates/question.html:367
+#, fuzzy
 msgid "Notify me once a day when there are any new answers"
-msgstr "Soruya cevap verilirse bana bildir"
+msgstr ""
+"<strong>Notify me</strong> once a day by email when there are any new "
+"answers or updates"
+"Soruya cevap verilirse bana bildir"
 
 #: forum/skins/default/templates/question.html:370
+#, fuzzy
 msgid "Notify me weekly when there are any new answers"
-msgstr "Yeni cevapları bana haftalık olarak bildir"
+msgstr ""
+"<strong>Notify me</strong> weekly when there are any new answers or updates"
+"Yeni cevapları bana haftalık olarak bildir"
 
 #: forum/skins/default/templates/question.html:375
 #, python-format
+#, fuzzy
 msgid ""
 "You can always adjust frequency of email updates from your %(profile_url)s"
 msgstr ""
+"(note: you can always <strong><a href='%(profile_url)s?"
+"sort=email_subscriptions'>change</a></strong> how often you receive updates)"
 "%(profile_url)s adresinden E-mail güncellemelerini alma sıklığını "
 "ayarlayabilirsiniz."
 
 #: forum/skins/default/templates/question.html:380
+#, fuzzy
 msgid "once you sign in you will be able to subscribe for any updates here"
-msgstr "güncellemelerden haberdar olmak için kaydolun."
+msgstr ""
+"<span class='strong'>Here</span> (once you log in) you will be able to sign "
+"up for the periodic email updates about this question."
+"güncellemelerden haberdar olmak için kaydolun."
 
 #: forum/skins/default/templates/question.html:391
 msgid "Your answer"
@@ -2529,20 +2635,41 @@ msgid "Be the first one to answer this question!"
 msgstr "Bu soruya ilk cevabı sen yaz!"
 
 #: forum/skins/default/templates/question.html:399
+#, fuzzy
 msgid "you can answer anonymously and then login"
 msgstr ""
+"<span class='strong big'>Please start posting your answer anonymously</span> "
+"- your answer will be saved within the current session and published after "
+"you log in or create a new account. Please try to give a <strong>substantial "
+"answer</strong>, for discussions, <strong>please use comments</strong> and "
+"<strong>please do remember to vote</strong> (after you log in)!"
 "şimdi hemen cevap yazabilir, yollamak için daha sonra üye girişi "
 "yapabilirsiniz."
 
 #: forum/skins/default/templates/question.html:403
+#, fuzzy
 msgid "answer your own question only to give an answer"
 msgstr ""
+"<span class='big strong'>You are welcome to answer your own question</span>, "
+"but please make sure to give an <strong>answer</strong>. Remember that you "
+"can always <strong>revise your original question</strong>. Please "
+"<strong>use comments for discussions</strong>  and <strong>please don't "
+"forget to vote :)</strong> for the answers that you liked (or perhaps did "
+"not like)! "
 "Kendi soruna cevap vermek üzeresin. Ya da sorunu daha da açıklamak mı "
 "istiyorsun?"
 
 #: forum/skins/default/templates/question.html:405
+#, fuzzy
 msgid "please only give an answer, no discussions"
-msgstr "sadece cevap yazınız, tartışmaya girmeyiniz."
+msgstr ""
+"<span class='big strong'>Please try to give a substantial answer</span>. If "
+"you wanted to comment on the question or answer, just <strong>use the "
+"commenting tool</strong>. Please remember that you can always <strong>revise "
+"your answers</strong> - no need to answer the same question twice. Also, "
+"please <strong>don't forget to vote</strong> - it really helps to select the "
+"best questions and answers!"
+"sadece cevap yazınız, tartışmaya girmeyiniz."
 
 #: forum/skins/default/templates/question.html:441
 msgid "Login/Signup to Post Your Answer"
@@ -2558,7 +2685,7 @@ msgstr "Soru cevapla"
 
 #: forum/skins/default/templates/question.html:460
 msgid "Question tags"
-msgstr "Soru etiketleri"
+msgstr "Etiketleri"
 
 #: forum/skins/default/templates/question.html:465
 #: forum/skins/default/templates/questions.html:257
@@ -2746,16 +2873,20 @@ msgstr "güncel olmayan soruları görmek için tıklayın"
 
 #: forum/skins/default/templates/questions.html:102
 #: forum/skins/default/templates/questions.html:113
+#, fuzzy
 msgid "click to see hottest questions"
-msgstr "en beğenilen cevaplar için tıklayın"
+msgstr "questions with most answers"
+"en beğenilen cevaplar için tıklayın"
 
 #: forum/skins/default/templates/questions.html:102
 msgid "less answers"
 msgstr "az cevaplananlar"
 
 #: forum/skins/default/templates/questions.html:108
+#, fuzzy
 msgid "click to see coldest questions"
-msgstr "en beğenilmeyen soruları gör"
+msgstr "questions with fewest answers"
+"en beğenilmeyen soruları gör"
 
 #: forum/skins/default/templates/questions.html:108
 #: forum/skins/default/templates/questions.html:113
@@ -3011,8 +3142,15 @@ msgid "Email subscription settings"
 msgstr "E-mail abonelik ayarları"
 
 #: forum/skins/default/templates/user_email_subscriptions.html:9
+#, fuzzy
 msgid "email subscription settings info"
-msgstr "E-mail abonelik ayarları bilgisi"
+msgstr ""
+"<span class='big strong'>Adjust frequency of email updates.</span> Receive "
+"updates on interesting questions by email, <strong><br/>help the community</"
+"strong> by answering questions of your colleagues. If you do not wish to "
+"receive emails - select 'no email' on all items below.<br/>Updates are only "
+"sent when there is any new activity on selected items."
+"E-mail abonelik ayarları bilgisi"
 
 #: forum/skins/default/templates/user_email_subscriptions.html:21
 msgid "Stop sending email"
@@ -3080,118 +3218,78 @@ msgstr "Karma değişiklik kayıtları"
 msgid "%(user_name)s's karma change log"
 msgstr "%(user_name)s 'nin karma değişim günlüğü"
 
-#: forum/skins/default/templates/user_stats.html:12
-#, python-format
-msgid ""
-"\n"
-"                <span class=\"count\">1</span> Question\n"
-"                "
-msgid_plural ""
-"\n"
-"                <span class=\"count\">%(counter)s</span> Questions\n"
-"                "
-msgstr[0] ""
-"\n"
-"<span class=\"count\">1</span> Soru"
-msgstr[1] ""
-"\n"
-"<span class=\"count\">%(counter)s</span> Soru"
+#: forum/skins/default/templates/user_stats.html:11
+#, fuzzy, python-format
+msgid "<span class=\"count\">1</span> Question"
+msgid_plural "<span class=\"count\">%(counter)s</span> Questions"
+msgstr[0] "<span class=\"count\">1</span> Madalya"
+msgstr[1] "<span class=\"count\">%(counter)s</span> Madalya"
 
-#: forum/skins/default/templates/user_stats.html:23
-#, python-format
-msgid ""
-"\n"
-"                <span class=\"count\">1</span> Answer\n"
-"                "
-msgid_plural ""
-"\n"
-"                <span class=\"count\">%(counter)s</span> Answers\n"
-"                "
-msgstr[0] ""
-"\n"
-"<span class=\"count\">1</span> Cevap"
-msgstr[1] ""
-"\n"
-"<span class=\"count\">%(counter)s</span> Cevap"
+#: forum/skins/default/templates/user_stats.html:16
+#, fuzzy, python-format
+msgid "<span class=\"count\">1</span> Answer"
+msgid_plural "<span class=\"count\">%(counter)s</span> Answers"
+msgstr[0] "<span class=\"count\">1</span> Madalya"
+msgstr[1] "<span class=\"count\">%(counter)s</span> Madalya"
 
-#: forum/skins/default/templates/user_stats.html:36
+#: forum/skins/default/templates/user_stats.html:24
 #, python-format
 msgid "the answer has been voted for %(answer_score)s times"
 msgstr "cevap için %(answer_score)s kez oy kullanıldı"
 
-#: forum/skins/default/templates/user_stats.html:36
+#: forum/skins/default/templates/user_stats.html:24
 msgid "this answer has been selected as correct"
 msgstr "bu cevap doğru olarak seçildi"
 
-#: forum/skins/default/templates/user_stats.html:46
+#: forum/skins/default/templates/user_stats.html:34
 #, fuzzy, python-format
 msgid "(one comment)"
 msgid_plural "the answer has been commented %(comment_count)s times"
 msgstr[0] "yorum ekle"
 msgstr[1] "yorum ekle"
 
-#: forum/skins/default/templates/user_stats.html:57
-#, python-format
-msgid ""
-"\n"
-"                    <span class=\"count\">1</span> Vote\n"
-"                "
-msgid_plural ""
-"\n"
-"                    <span class=\"count\">%(cnt)s</span> Votes\n"
-"                "
-msgstr[0] ""
-"\n"
-"<span class=\"count\">1</span> oy"
-msgstr[1] ""
-"\n"
-"<span class=\"count\">%(cnt)s</span> oy"
+#: forum/skins/default/templates/user_stats.html:44
+#, fuzzy, python-format
+msgid "<span class=\"count\">1</span> Vote"
+msgid_plural "<span class=\"count\">%(cnt)s</span> Votes "
+msgstr[0] "<span class=\"count\">1</span> Madalya"
+msgstr[1] "<span class=\"count\">%(counter)s</span> Madalya"
 
-#: forum/skins/default/templates/user_stats.html:68
+#: forum/skins/default/templates/user_stats.html:50
 msgid "thumb up"
 msgstr "beğen"
 
-#: forum/skins/default/templates/user_stats.html:69
+#: forum/skins/default/templates/user_stats.html:51
 msgid "user has voted up this many times"
 msgstr "kullanıcılar tarafından defalarca beğendi"
 
-#: forum/skins/default/templates/user_stats.html:73
+#: forum/skins/default/templates/user_stats.html:55
 msgid "thumb down"
 msgstr "beğenme"
 
-#: forum/skins/default/templates/user_stats.html:74
+#: forum/skins/default/templates/user_stats.html:56
 msgid "user voted down this many times"
 msgstr "kullanıcılar tarafından defalarca beğenilmedi"
 
-#: forum/skins/default/templates/user_stats.html:83
+#: forum/skins/default/templates/user_stats.html:64
 #, fuzzy, python-format
 msgid "<span class=\"count\">1</span> Tag"
 msgid_plural "<span class=\"count\">%(counter)s</span> Tags"
 msgstr[0] "<span class=\"count\">1</span> Madalya"
 msgstr[1] "<span class=\"count\">%(counter)s</span> Madalya"
 
-#: forum/skins/default/templates/user_stats.html:92
+#: forum/skins/default/templates/user_stats.html:72
 #, python-format
 msgid ""
 "see other questions with %(view_user)s's contributions tagged '%(tag_name)s' "
 msgstr "%(view_user)s 'nin diğer '%(tag_name)s' etiketli diğer sorularını gör"
 
-#: forum/skins/default/templates/user_stats.html:107
+#: forum/skins/default/templates/user_stats.html:86
 #, python-format
-msgid ""
-"\n"
-"            <span class=\"count\">1</span> Badge\n"
-"            "
-msgid_plural ""
-"\n"
-"            <span class=\"count\">%(counter)s</span> Badges\n"
-"            "
-msgstr[0] ""
-"\n"
-"<span class=\"count\">1</span> Madalya"
-msgstr[1] ""
-"\n"
-"<span class=\"count\">%(counter)s</span> Madalya"
+msgid "<span class=\"count\">1</span> Badge"
+msgid_plural "<span class=\"count\">%(counter)s</span> Badges"
+msgstr[0] "<span class=\"count\">1</span> Madalya"
+msgstr[1] "<span class=\"count\">%(counter)s</span> Madalya"
 
 #: forum/skins/default/templates/user_tabs.html:7
 msgid "User profile"
@@ -3290,20 +3388,34 @@ msgid "Save your email address"
 msgstr "E-mail adresinizi kaydedin"
 
 #: forum/skins/default/templates/authopenid/changeemail.html:16
-#, python-format
+#, fuzzy, python-format
 msgid "change %(email)s info"
-msgstr "%(email)s değişiklik bilgisi"
+msgstr ""
+"<span class=\"strong big\">Enter your new email into the box below</span> if "
+"you'd like to use another email for <strong>update subscriptions</strong>."
+"<br>Currently you are using <strong>%(email)s</strong>"
+"%(email)s değişiklik bilgisi"
 
 #: forum/skins/default/templates/authopenid/changeemail.html:18
-#, python-format
+#, fuzzy, python-format
 msgid "here is why email is required, see %(gravatar_faq_url)s"
 msgstr ""
+"<span class='strong big'>Please enter your email address in the box below.</"
+"span> Valid email address is required on this Q&amp;A forum. If you like, "
+"you can <strong>receive updates</strong> on interesting questions or entire "
+"forum via email. Also, your email is used to create a unique <a href='%"
+"(gravatar_faq_url)s'><strong>gravatar</strong></a> image for your account. "
+"Email addresses are never shown or otherwise shared with anybody else."
 "buraya bakarak neden E-mail adresinin gerekli olduğunu görebilirsiniz: %"
 "(gravatar_faq_url)s"
 
 #: forum/skins/default/templates/authopenid/changeemail.html:31
+#, fuzzy
 msgid "Your new Email"
-msgstr "Yeni E-mail adresiniz"
+msgstr ""
+"<strong>Your new Email:</strong> (will <strong>not</strong> be shown to "
+"anyone, must be valid)"
+"Yeni E-mail adresiniz"
 
 #: forum/skins/default/templates/authopenid/changeemail.html:31
 msgid "Your Email"
@@ -3318,9 +3430,15 @@ msgid "Validate email"
 msgstr "E-mail adresini doğrula"
 
 #: forum/skins/default/templates/authopenid/changeemail.html:52
-#, python-format
+#, fuzzy, python-format
 msgid "validate %(email)s info or go to %(change_email_url)s"
 msgstr ""
+"<span class=\"strong big\">An email with a validation link has been sent to %"
+"(email)s.</span> Please <strong>follow the emailed link</strong> with your "
+"web browser. Email validation is necessary to help insure the proper use of "
+"email on <span class=\"orange\">Q&amp;A</span>. If you would like to use "
+"<strong>another email</strong>, please <a href='%(change_email_url)"
+"s'><strong>change it again</strong></a>."
 " %(email)s adresini doğrulayın ya da  %(change_email_url)s adresine gidin."
 
 #: forum/skins/default/templates/authopenid/changeemail.html:57
@@ -3328,9 +3446,13 @@ msgid "Email not changed"
 msgstr "E-mail değişmedi"
 
 #: forum/skins/default/templates/authopenid/changeemail.html:60
-#, python-format
+#, fuzzy, python-format
 msgid "old %(email)s kept, if you like go to %(change_email_url)s"
 msgstr ""
+"<span class=\"strong big\">Your email address %(email)s has not been changed."
+"</span> If you decide to change it later - you can always do it by editing "
+"it in your user profile or by using the <a href='%(change_email_url)"
+"s'><strong>previous form</strong></a> again."
 "eski %(email)s saklansın diyorsanız, %(change_email_url)s adresi size "
 "yardımcı olacaktır."
 
@@ -3340,20 +3462,38 @@ msgstr "E-mail değiştirildi"
 
 #: forum/skins/default/templates/authopenid/changeemail.html:68
 #, python-format
+#, fuzzy
 msgid "your current %(email)s can be used for this"
-msgstr "şu anki geçerli %(email)s bunun için kullanılabilir"
+msgstr ""
+"<span class='big strong'>Your email address is now set to %(email)s.</span> "
+"Updates on the questions that you like most will be sent to this address. "
+"Email notifications are sent once a day or less frequently - only when there "
+"are any news."
+"şu anki geçerli %(email)s bunun için kullanılabilir"
 
 #: forum/skins/default/templates/authopenid/changeemail.html:73
 msgid "Email verified"
 msgstr "E-mail doğrulandı"
 
 #: forum/skins/default/templates/authopenid/changeemail.html:76
+#, fuzzy
 msgid "thanks for verifying email"
-msgstr "E-mail doğrulaması için teşekkürler..."
+msgstr ""
+"<span class=\"big strong\">Thank you for verifying your email!</span> Now "
+"you can <strong>ask</strong> and <strong>answer</strong> questions. Also if "
+"you find a very interesting question you can <strong>subscribe for the "
+"updates</strong> - then will be notified about changes <strong>once a day</"
+"strong> or less frequently."
+"E-mail doğrulaması için teşekkürler..."
 
 #: forum/skins/default/templates/authopenid/changeemail.html:81
+#, fuzzy
 msgid "email key not sent"
-msgstr "E-mail anahtarı yollanmadı"
+msgstr ""
+"<span class='big strong'>Your current email address %(email)s has been "
+"validated before</span> so the new key was not sent. You can <a href='%"
+"(change_link)s'>change</a> email used for update subscriptions if necessary."
+"E-mail anahtarı yollanmadı"
 
 #: forum/skins/default/templates/authopenid/changeemail.html:84
 #, python-format
@@ -3388,8 +3528,11 @@ msgid "Account: change password"
 msgstr "Hesabınız: Şifremi değiştir"
 
 #: forum/skins/default/templates/authopenid/changepw.html:8
+#, fuzzy
 msgid "This is where you can change your password. Make sure you remember it!"
 msgstr ""
+"<span class='strong'>To change your password</span> please fill out and "
+"submit this form"
 "Burada şifrenizi değiştirebilirsiniz. Yeni şifrenizin, hatırlıyacağınız bir "
 "şifre olduğundan emin olun!"
 
@@ -3402,34 +3545,63 @@ msgid "Connect your OpenID with your account on this site"
 msgstr "Bu siteye OpenID hesabınızla giriş yapın"
 
 #: forum/skins/default/templates/authopenid/complete.html:27
-#, python-format
+#, fuzzy, python-format
 msgid "register new %(provider)s account info, see %(gravatar_faq_url)s"
 msgstr ""
+"<p><span class=\"big strong\">You are here for the first time with your %"
+"(provider)s login.</span> Please create your <strong>screen name</strong> "
+"and save your <strong>email</strong> address. Saved email address will let "
+"you <strong>subscribe for the updates</strong> on the most interesting "
+"questions and will be used to create and retrieve your unique avatar image - "
+"<a href='%(gravatar_faq_url)s'><strong>gravatar</strong></a>.</p>"
 "Yeni %(provider)s hesabı kayıt bilgisi için lütfen bakınız: %"
 "(gravatar_faq_url)s"
 
 #: forum/skins/default/templates/authopenid/complete.html:31
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "%(username)s already exists, choose another name for \n"
 "                            %(provider)s. Email is required too, see %"
 "(gravatar_faq_url)s\n"
 "                        "
 msgstr ""
+"<p><span class='strong big'>Oops... looks like screen name %(username)s is "
+"already used in another account.</span></p><p>Please choose another screen "
+"name to use with your %(provider)s login. Also, a valid email address is "
+"required on the <span class='orange'>Q&amp;A</span> forum. Your email is "
+"used to create a unique <a href='%(gravatar_faq_url)s'><strong>gravatar</"
+"strong></a> image for your account. If you like, you can <strong>receive "
+"updates</strong> on the interesting questions or entire forum by email. "
+"Email addresses are never shown or otherwise shared with anybody else.</p>"
 "%(username)s kullanıcı adı, %(provider)s için başka birisi tarafından "
 "alınmıştır. Başka bir isim deneyin.  Lütfen okuyun: %(gravatar_faq_url)s"
 
 #: forum/skins/default/templates/authopenid/complete.html:35
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "register new external %(provider)s account info, see %(gravatar_faq_url)s"
 msgstr ""
+"<p><span class=\"big strong\">You are here for the first time with your %"
+"(provider)s login.</span></p><p>You can either keep your <strong>screen "
+"name</strong> the same as your %(provider)s login name  or choose some other "
+"nickname.</p><p>Also, please save a valid <strong>email</strong> address. "
+"With the email you can <strong>subscribe for the updates</strong> on the "
+"most interesting questions. Email address is also used to create and "
+"retrieve your unique avatar image - <a href='%(gravatar_faq_url)"
+"s'><strong>gravatar</strong></a>.</p>"
 "başka bir %(provider)s hesabı kaydetmek için bakınız:  %(gravatar_faq_url)s"
 
 #: forum/skins/default/templates/authopenid/complete.html:38
-#, python-format
+#, fuzzy, python-format
 msgid "register new Facebook connect account info, see %(gravatar_faq_url)s"
-msgstr "Yeni Facebook hesabı ile bağlanma kaydı bilgisi: %(gravatar_faq_url)s"
+msgstr ""
+"<p><span class=\"big strong\">You are here for the first time with your "
+"Facebook login.</span> Please create your <strong>screen name</strong> and "
+"save your <strong>email</strong> address. Saved email address will let you "
+"<strong>subscribe for the updates</strong> on the most interesting questions "
+"and will be used to create and retrieve your unique avatar image - <a href='%"
+"(gravatar_faq_url)s'><strong>gravatar</strong></a>.</p>"
+"Yeni Facebook hesabı ile bağlanma kaydı bilgisi: %(gravatar_faq_url)s"
 
 #: forum/skins/default/templates/authopenid/complete.html:42
 msgid "This account already exists, please use another."
@@ -3445,13 +3617,22 @@ msgid "Screen name label"
 msgstr "Görünen isim etiketi"
 
 #: forum/skins/default/templates/authopenid/complete.html:89
+#, fuzzy
 msgid "Email address label"
-msgstr "E-mail etiketi"
+msgstr ""
+"<strong>Email Address</strong> (<i>will <strong>not</strong> be shared with "
+"anyone, must be valid</i>)"
 
 #: forum/skins/default/templates/authopenid/complete.html:95
 #: forum/skins/default/templates/authopenid/signup.html:18
+#, fuzzy
 msgid "receive updates motivational blurb"
-msgstr "Blurb güncellemelerini al"
+msgstr ""
+"<strong>Receive forum updates by email</strong> - this will help our "
+"community grow and become more useful.<br/>By default <span "
+"class='orange'>Q&amp;A</span> forum sends up to <strong>one email digest per "
+"week</strong>  - only when there is anything new.<br/>If you like, please "
+"adjust this now or any time later from your user account."
 
 #: forum/skins/default/templates/authopenid/complete.html:99
 #: forum/skins/default/templates/authopenid/signup.html:22
@@ -3591,8 +3772,15 @@ msgid "Send new password"
 msgstr "Yeni şifre gönder"
 
 #: forum/skins/default/templates/authopenid/sendpw.html:10
+#, fuzzy
 msgid "password recovery information"
-msgstr "şifre kurtarma bilgisi"
+msgstr ""
+"<span class='big strong'>Forgot you password? No problems - just get a new "
+"one!</span><br/>Please follow the following steps:<br/>&bull; submit your "
+"user name below and check your email<br/>&bull; <strong>follow the "
+"activation link</strong> for the new password - sent to you by email and "
+"login with the suggested password<br/>&bull; at this you might want to "
+"change your password to something you can remember better"
 
 #: forum/skins/default/templates/authopenid/sendpw.html:21
 msgid "Reset password"
@@ -3614,10 +3802,15 @@ msgstr ""
 
 #: forum/skins/default/templates/authopenid/sendpw_email.txt:5
 #, python-format
+#, fuzzy
 msgid ""
 "email explanation how to use new %(password)s for %(username)s\n"
 "with the %(key_link)s"
 msgstr ""
+"To change your password, please follow these steps:\n"
+"* visit this link: %(key_link)s\n"
+"* login with user name %(username)s and password %(password)s\n"
+"* go to your user profile and set the password to something you can remember"
 "%(username)s için yeni şifre %(password)s ve kullanım açıklaması için link:  "
 "%(key_link)s"
 
@@ -3627,7 +3820,7 @@ msgid "User login"
 msgstr "Kullanıcı girişi"
 
 #: forum/skins/default/templates/authopenid/signin.html:28
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "\n"
 "                Your answer to %(title)s %(summary)s will be posted once you "
@@ -3635,34 +3828,54 @@ msgid ""
 "                "
 msgstr ""
 "\n"
+"<span class=\"strong big\">Your answer to </span> <i>\"<strong>%(title)s</"
+"strong> %(summary)s...\"</i> <span class=\"strong big\">is saved and will be "
+"posted once you log in.</span>"
 "\"%(title)s\" başlıklı soruya yazdığınız \"%(summary)s\" cevabını yollamak "
 "için giriş yapmalısınız."
 
 #: forum/skins/default/templates/authopenid/signin.html:35
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "Your question \n"
 "                %(title)s %(summary)s will be posted once you log in\n"
 "                "
 msgstr ""
+"<span class=\"strong big\">Your question</span> <i>\"<strong>%(title)s</"
+"strong> %(summary)s...\"</i> <span class=\"strong big\">is saved and will be "
+"posted once you log in.</span>"
 "\"%(title)s\" başlıklı \"%(summary)s\" sorunuzu yollamak için giriş "
 "yapmalısınız."
 
 #: forum/skins/default/templates/authopenid/signin.html:42
+#, fuzzy
 msgid "Click to sign in through any of these services."
-msgstr "Bu hizmetlerden yararlanmak için üye girişi yapın."
+msgstr ""
+"<p><span class=\"big strong\">Please select your favorite login method below."
+"</span></p><p><font color=\"gray\">External login services use <a href="
+"\"http://openid.net\"><b>OpenID</b></a> technology, where your password "
+"always stays confidential between you and your login provider and you don't "
+"have to remember another one.</font></p>"
+"Bu hizmetlerden yararlanmak için üye girişi yapın."
 
 #: forum/skins/default/templates/authopenid/signin.html:144
+#, fuzzy
 msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>"
-msgstr "<span id=\"enter_your_what\">Provider kullanıcı adınız</span>"
+msgstr ""
+"<span class=\"big strong\">Enter your </span><span id=\"enter_your_what\" "
+"class='big strong'>Provider user name</span><br/><span class='grey'>(or "
+"select another login method above)</span>"
+"<span id=\"enter_your_what\">Provider kullanıcı adınız</span>"
 
 #: forum/skins/default/templates/authopenid/signin.html:151
+#, fuzzy
 msgid ""
 "Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> "
 "web address"
 msgstr ""
-"<a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> adresinizi "
-"girin"
+"<span class=\"big strong\">Enter your <a class=\"openid_logo\" href=\"http://"
+"openid.net\">OpenID</a> web address</span><br/><span class='grey'>(or choose "
+"another login method above)</span>"
 
 #: forum/skins/default/templates/authopenid/signin.html:153
 #: forum/skins/default/templates/authopenid/signin.html:166
@@ -3690,20 +3903,27 @@ msgid "Why use OpenID?"
 msgstr "Neden OpenID kullanıyoruz?"
 
 #: forum/skins/default/templates/authopenid/signin.html:181
+#, fuzzy
 msgid "with openid it is easier"
-msgstr "OpenID ile üye girişleri daha kolay"
+msgstr "With the OpenID you don't need to create new username and password."
 
 #: forum/skins/default/templates/authopenid/signin.html:184
+#, fuzzy
 msgid "reuse openid"
-msgstr "OpenID yeni kullanıyorum"
+msgstr "You can safely re-use the same login for all OpenID-enabled websites."
 
 #: forum/skins/default/templates/authopenid/signin.html:187
+#, fuzzy
 msgid "openid is widely adopted"
-msgstr "OpenID yaygın olarak benimsenmiştir"
+msgstr ""
+"There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-"
+"enabled."
 
 #: forum/skins/default/templates/authopenid/signin.html:190
+#, fuzzy
 msgid "openid is supported open standard"
-msgstr "OpenID açık kaynak standartları ile desteklenmektedir"
+msgstr "OpenID is based on an open standard, supported by many organizations."
+"OpenID açık kaynak standartları ile desteklenmektedir"
 
 #: forum/skins/default/templates/authopenid/signin.html:195
 msgid "Find out more"
@@ -3722,8 +3942,14 @@ msgid "Create login name and password"
 msgstr "Kullanıcı adı ve şifre oluştur"
 
 #: forum/skins/default/templates/authopenid/signup.html:10
+#, fuzzy
 msgid "Traditional signup info"
-msgstr "Normal giriş bilgileri hakkında bilgi"
+msgstr ""
+"<span class='strong big'>If you prefer, create your forum login name and "
+"password here. However</span>, please keep in mind that we also support "
+"<strong>OpenID</strong> login method. With <strong>OpenID</strong> you can "
+"simply reuse your external login (e.g. Gmail or AOL) without ever sharing "
+"your login details with anyone and having to remember yet another password."
 
 #: forum/skins/default/templates/authopenid/signup.html:25
 msgid ""
@@ -3822,8 +4048,10 @@ msgid "user name can only consist of letters, empty space and underscore"
 msgstr "kullanıcı adı sadece harf, rakam veya altçizgiden oluşur"
 
 #: forum/utils/forms.py:109
+#, fuzzy
 msgid "your email address"
-msgstr "E-mail adresiniz"
+msgstr "Your email <i>(never shared)</i>"
+"E-mail adresiniz"
 
 #: forum/utils/forms.py:110
 msgid "email address is required"
@@ -3848,8 +4076,10 @@ msgid "password is required"
 msgstr "şifre yazmalısınız."
 
 #: forum/utils/forms.py:144
+#, fuzzy
 msgid "retype password"
-msgstr "şifreyi yeniden yazın"
+msgstr "Password <i>(please retype)</i>"
+"şifreyi yeniden yazın"
 
 #: forum/utils/forms.py:145
 msgid "please, retype your password"
@@ -3863,6 +4093,8 @@ msgstr "Üzgünüm, şifreler uyuşmuyor lütfen tekrar deneyin."
 #, python-format
 msgid "subscription saved, %(email)s needs validation, see %(details_url)s"
 msgstr ""
+"Your subscription is saved, but email address %(email)s needs to be "
+"validated, please see <a href='%(details_url)s'>more details here</a>"
 "aboneliğiniz kaydedildi %(email)s adresindeki doğrulama linkini "
 "tıklamalısınız. Ayrıntılar için: %(details_url)s"
 
@@ -3913,12 +4145,16 @@ msgid "profile - responses"
 msgstr "profil - cevapları"
 
 #: forum/views/users.py:925
+#, fuzzy
 msgid "user reputation in the community"
-msgstr "sitemizde kullanıcının itibarı"
+msgstr "user karma"
+"sitemizde kullanıcının itibarı"
 
 #: forum/views/users.py:926
+#, fuzzy
 msgid "profile - user reputation"
-msgstr "profil - kullanıcı itibarı"
+msgstr "Profile - User's Karma"
+"profil - kullanıcı itibarı"
 
 #: forum/views/users.py:932
 msgid "favorite questions"
@@ -3989,6 +4225,66 @@ msgstr "kitaplar/"
 
 #~ msgid ""
 #~ "\n"
+#~ "                <span class=\"count\">1</span> Question\n"
+#~ "                "
+#~ msgid_plural ""
+#~ "\n"
+#~ "                <span class=\"count\">%(counter)s</span> Questions\n"
+#~ "                "
+#~ msgstr[0] ""
+#~ "\n"
+#~ "<span class=\"count\">1</span> Soru"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "<span class=\"count\">%(counter)s</span> Soru"
+
+#~ msgid ""
+#~ "\n"
+#~ "                <span class=\"count\">1</span> Answer\n"
+#~ "                "
+#~ msgid_plural ""
+#~ "\n"
+#~ "                <span class=\"count\">%(counter)s</span> Answers\n"
+#~ "                "
+#~ msgstr[0] ""
+#~ "\n"
+#~ "<span class=\"count\">1</span> Cevap"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "<span class=\"count\">%(counter)s</span> Cevap"
+
+#~ msgid ""
+#~ "\n"
+#~ "                    <span class=\"count\">1</span> Vote\n"
+#~ "                "
+#~ msgid_plural ""
+#~ "\n"
+#~ "                    <span class=\"count\">%(cnt)s</span> Votes\n"
+#~ "                "
+#~ msgstr[0] ""
+#~ "\n"
+#~ "<span class=\"count\">1</span> oy"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "<span class=\"count\">%(cnt)s</span> oy"
+
+#~ msgid ""
+#~ "\n"
+#~ "            <span class=\"count\">1</span> Badge\n"
+#~ "            "
+#~ msgid_plural ""
+#~ "\n"
+#~ "            <span class=\"count\">%(counter)s</span> Badges\n"
+#~ "            "
+#~ msgstr[0] ""
+#~ "\n"
+#~ "<span class=\"count\">1</span> Madalya"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "<span class=\"count\">%(counter)s</span> Madalya"
+
+#~ msgid ""
+#~ "\n"
 #~ "                                            see <strong>one</strong> "
 #~ "more \n"
 #~ "                                            "
author	Evgeny Fadeev <evgeny.fadeev@gmail.com>	2010-05-01 22:07:43 -0400
committer	Evgeny Fadeev <evgeny.fadeev@gmail.com>	2010-05-01 22:07:43 -0400
commit	2f7ee397d33dc7dc15d083d2b6f6a60a0260c433 (patch)
tree	faa9b5c92517c2c5d31148adba39628793d71c26
parent	1b3de82a577c6145fb55d078b6181ff9615821cd (diff)
download	askbot-2f7ee397d33dc7dc15d083d2b6f6a60a0260c433.tar.gz askbot-2f7ee397d33dc7dc15d083d2b6f6a60a0260c433.tar.bz2 askbot-2f7ee397d33dc7dc15d083d2b6f6a60a0260c433.zip