Anonymous avatar Anonymous committed 3882d69

l10n: Updated Catalan (ca) translation to 26%

New status: 209 messages complete with 1 fuzzy and 574 untranslated.

Transmitted-via: Transifex (www.transifex.net).

Comments (0)

Files changed (1)

locale/ca/LC_MESSAGES/django.po

 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-07-06 12:19+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-10-18 22:54+0100\n"
+"Last-Translator: el_libre - - www.catmidia.cat <el.libre@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
 #: settings.py:227
 msgid "English"
-msgstr ""
+msgstr "Anglès"
 
 #: settings.py:228
 msgid "Danish"
-msgstr ""
+msgstr "Danès"
 
 #: settings.py:229
 msgid "Dutch"
-msgstr ""
+msgstr "Holandès"
 
 #: settings.py:230
 msgid "Norwegian"
-msgstr ""
+msgstr "Noruec"
 
 #: settings.py:231
 msgid "Portuguese"
-msgstr ""
+msgstr "Portuguès"
 
 #: settings.py:232
 msgid "Russian"
-msgstr ""
+msgstr "Rus"
 
 #: settings.py:233
 msgid "Turkish"
-msgstr ""
+msgstr "Turc"
 
 #: apps/account/backend.py:30
 msgid "Your account has been created. Welcome to Bitbucket!"
 msgid "Key already registered in bitbucket."
 msgstr ""
 
-#: apps/account/forms.py:131 apps/bb/models.py:2323
+#: apps/account/forms.py:131
+#: apps/bb/models.py:2323
 #: templates/account/api/index.html:26
 msgid "Key"
-msgstr ""
+msgstr "Clau"
 
 #: apps/account/forms.py:145
 msgid "Key file"
-msgstr ""
+msgstr "Fitxer de clau"
 
 #: apps/account/forms.py:151
 msgid "File is too large."
-msgstr ""
+msgstr "El fitxer és massa gran."
 
 #: apps/account/forms.py:154
 msgid "Invalid file type."
 
 #: apps/account/forms.py:173
 msgid "Recipient"
-msgstr ""
-
-#: apps/account/forms.py:174 apps/bb/models.py:1835
-#: templates/issues/issue.html:449 templates/issues/new.html:117
+msgstr "Destinatari"
+
+#: apps/account/forms.py:174
+#: apps/bb/models.py:1835
+#: templates/issues/issue.html:449
+#: templates/issues/new.html:117
 #: templates/issues/query.html:119
 msgid "Title"
-msgstr ""
-
-#: apps/account/forms.py:175 apps/bb/forms.py:136 apps/bb/forms.py:264
-#: apps/bb/forms.py:280 apps/bb/models.py:59
-#: templates/reps/admin_strip_confirm.html:35 templates/reps/index.html:63
+msgstr "Títol"
+
+#: apps/account/forms.py:175
+#: apps/bb/forms.py:136
+#: apps/bb/forms.py:264
+#: apps/bb/forms.py:280
+#: apps/bb/models.py:59
+#: templates/reps/admin_strip_confirm.html:35
+#: templates/reps/index.html:63
 msgid "Message"
-msgstr ""
+msgstr "Missatge"
 
 #: apps/account/forms.py:181
 msgid "That user does not exist."
 
 #: apps/account/forms.py:185
 msgid "Action"
-msgstr ""
-
-#: apps/account/views.py:98 apps/account/views.py:113
+msgstr "Acció"
+
+#: apps/account/views.py:98
+#: apps/account/views.py:113
 msgid "The SSH key has been added to your profile."
 msgstr ""
 
 msgid "Your profile settings have been saved."
 msgstr ""
 
-#: apps/account/views.py:171 templates/account/edit.html:156
+#: apps/account/views.py:171
+#: templates/account/edit.html:156
 msgid "Save CNAME"
 msgstr ""
 
 msgid "%i OpenID(s) successfully removed."
 msgstr ""
 
-#: apps/account/views.py:221 templates/account/api/index.html:68
+#: apps/account/views.py:221
+#: templates/account/api/index.html:68
 msgid "Create new token"
 msgstr ""
 
 msgid "Your reply has been sent."
 msgstr ""
 
-#: apps/account/views.py:511 apps/account/views.py:556
+#: apps/account/views.py:511
+#: apps/account/views.py:556
 msgid "Your message has been sent."
-msgstr ""
+msgstr "S'ha enviat el vostre missatge."
 
 #: apps/account/views.py:611
 #, python-format
 msgid "%(number)s messages %(action)s."
 msgstr ""
 
-#: apps/api/v10/forms.py:37 apps/bb/models.py:167 apps/bb/models.py:1748
-#: apps/bb/models.py:1807 apps/bb/models.py:1819 templates/reps/admin.html:23
-#: templates/reps/fork.html:44 templates/reps/hack.html:24
+#: apps/api/v10/forms.py:37
+#: apps/bb/models.py:167
+#: apps/bb/models.py:1748
+#: apps/bb/models.py:1807
+#: apps/bb/models.py:1819
+#: templates/reps/admin.html:23
+#: templates/reps/fork.html:44
+#: templates/reps/hack.html:24
 msgid "Name"
-msgstr ""
-
-#: apps/api/v10/forms.py:38 apps/bb/models.py:170
-#: templates/issues/query.html:120 templates/reps/admin.html:27
-#: templates/reps/downloads.html:85 templates/reps/fork.html:48
+msgstr "Noms"
+
+#: apps/api/v10/forms.py:38
+#: apps/bb/models.py:170
+#: templates/issues/query.html:120
+#: templates/reps/admin.html:27
+#: templates/reps/downloads.html:85
+#: templates/reps/fork.html:48
 #: templates/reps/hack.html:28
 msgid "Description"
-msgstr ""
-
-#: apps/api/v10/forms.py:43 apps/bb/forms.py:36 apps/bb/forms.py:123
+msgstr "Descripció"
+
+#: apps/api/v10/forms.py:43
+#: apps/bb/forms.py:36
+#: apps/bb/forms.py:123
 #: apps/bb/forms.py:126
 msgid "Password"
-msgstr ""
+msgstr "Contrasenya"
 
 #: apps/api/v10/views.py:116
-msgid ""
-"Application accepted. You will receive an email when the consumer is acted "
-"on."
+msgid "Application accepted. You will receive an email when the consumer is acted on."
 msgstr ""
 
 #: apps/bb/fields.py:17
 
 #: apps/bb/forms.py:34
 msgid "Username"
-msgstr ""
-
-#: apps/bb/forms.py:35 templates/help.html:38
+msgstr "Nom d'usuari/a"
+
+#: apps/bb/forms.py:35
+#: templates/help.html:38
 msgid "Email"
-msgstr ""
+msgstr "Correu electrònic"
 
 #: apps/bb/forms.py:37
 msgid "Confirm"
-msgstr ""
+msgstr "Confirma"
 
 #: apps/bb/forms.py:46
-msgid ""
-"Usernames can only contain                         letters, numbers and "
-"underscores"
+msgid "Usernames can only contain                         letters, numbers and underscores"
 msgstr ""
 
 #: apps/bb/forms.py:53
-msgid ""
-"This username is already taken.                     Please choose another."
+msgid "This username is already taken.                     Please choose another."
 msgstr ""
 
 #: apps/bb/forms.py:111
 msgid "Redirect to"
 msgstr ""
 
-#: apps/bb/forms.py:149 apps/bb/forms.py:169
+#: apps/bb/forms.py:149
+#: apps/bb/forms.py:169
 msgid "Captcha"
-msgstr ""
+msgstr "Captcha"
 
 #: apps/bb/forms.py:176
 msgid "Attachment"
-msgstr ""
+msgstr "Adjunt"
 
 #: apps/bb/forms.py:179
 msgid "Duplicate"
-msgstr ""
-
-#: apps/bb/forms.py:202 apps/bb/models.py:192
+msgstr "Duplicat"
+
+#: apps/bb/forms.py:202
+#: apps/bb/models.py:192
 msgid "Default assignee"
 msgstr ""
 
 
 #: apps/bb/forms.py:262
 msgid "Path"
-msgstr ""
+msgstr "Camí"
 
 #: apps/bb/forms.py:263
 msgid "Data"
-msgstr ""
+msgstr "Dades"
 
 #: apps/bb/forms.py:279
 msgid "Revisions"
-msgstr ""
-
-#: apps/bb/models.py:51 templates/tabs.html:56
+msgstr "Revisions"
+
+#: apps/bb/models.py:51
+#: templates/tabs.html:56
 msgid "Overview"
-msgstr ""
-
-#: apps/bb/models.py:52 templates/tabs.html:71 templates/tabs.html.py:73
+msgstr "Resum"
+
+#: apps/bb/models.py:52
+#: templates/tabs.html:71
+#: templates/tabs.html.py:73
 msgid "Source"
-msgstr ""
-
-#: apps/bb/models.py:53 apps/bb/models.py:180 templates/plans.html:121
-#: templates/tabs.html:86 templates/tabs.html.py:92
+msgstr "Origen"
+
+#: apps/bb/models.py:53
+#: apps/bb/models.py:180
+#: templates/plans.html:121
+#: templates/tabs.html:86
+#: templates/tabs.html.py:92
 msgid "Wiki"
-msgstr ""
+msgstr "Wiki"
 
 #: apps/bb/models.py:57
 msgid "Pull Request"
 msgid "Administrator Rights"
 msgstr ""
 
-#: apps/bb/models.py:66 templates/issues/new.html:50
+#: apps/bb/models.py:66
+#: templates/issues/new.html:50
 msgid "new"
-msgstr ""
+msgstr "nou"
 
 #: apps/bb/models.py:67
 msgid "open"
-msgstr ""
+msgstr "obre"
 
 #: apps/bb/models.py:68
 msgid "resolved"
-msgstr ""
+msgstr "resolt"
 
 #: apps/bb/models.py:69
 msgid "on hold"
-msgstr ""
+msgstr "en espera"
 
 #: apps/bb/models.py:70
 msgid "invalid"
-msgstr ""
+msgstr "invàlid"
 
 #: apps/bb/models.py:71
 msgid "duplicate"
-msgstr ""
+msgstr "duplicar"
 
 #: apps/bb/models.py:72
 msgid "wontfix"
 
 #: apps/bb/models.py:76
 msgid "bug"
-msgstr ""
+msgstr "error"
 
 #: apps/bb/models.py:77
 msgid "enhancement"
-msgstr ""
+msgstr "millora"
 
 #: apps/bb/models.py:78
 msgid "proposal"
 msgid "Text area (several lines)"
 msgstr ""
 
-#: apps/bb/models.py:171 apps/bb/models.py:2157
-#: templates/profile/user_info.html:49 templates/reps/admin.html:31
-#: templates/reps/hack.html:32 templates/reps/zealots.html:34
+#: apps/bb/models.py:171
+#: apps/bb/models.py:2157
+#: templates/profile/user_info.html:49
+#: templates/reps/admin.html:31
+#: templates/reps/hack.html:32
+#: templates/reps/zealots.html:34
 msgid "Website"
-msgstr ""
+msgstr "Lloc web"
 
 #: apps/bb/models.py:174
 msgid "Private"
-msgstr ""
-
-#: apps/bb/models.py:177 templates/reps/admin.html:42
+msgstr "Privat"
+
+#: apps/bb/models.py:177
+#: templates/reps/admin.html:42
 msgid "Landing page"
 msgstr ""
 
-#: apps/bb/models.py:181 templates/reps/admin.html:73
-#: templates/reps/fork.html:85 templates/reps/hack.html:47
+#: apps/bb/models.py:181
+#: templates/reps/admin.html:73
+#: templates/reps/fork.html:85
+#: templates/reps/hack.html:47
 msgid "Wiki is private"
 msgstr ""
 
 msgid "Issue tracking"
 msgstr ""
 
-#: apps/bb/models.py:185 templates/reps/admin.html:77
-#: templates/reps/fork.html:89 templates/reps/hack.html:51
+#: apps/bb/models.py:185
+#: templates/reps/admin.html:77
+#: templates/reps/fork.html:89
+#: templates/reps/hack.html:51
 msgid "Issues are private"
 msgstr ""
 
 msgid "Default milestone"
 msgstr ""
 
-#: apps/bb/models.py:204 templates/reps/admin.html:69
-#: templates/reps/fork.html:80 templates/reps/hack.html:43
+#: apps/bb/models.py:204
+#: templates/reps/admin.html:69
+#: templates/reps/fork.html:80
+#: templates/reps/hack.html:43
 msgid "Ignore pull requests"
 msgstr ""
 
 msgid "Akismet key"
 msgstr ""
 
-#: apps/bb/models.py:223 templates/reps/admin.html:35
+#: apps/bb/models.py:223
+#: templates/reps/admin.html:35
 msgid "Analytics key"
 msgstr ""
 
 #: apps/bb/models.py:958
 #, python-format
-msgid ""
-"<a href=\"%(url)s\">%(username)s</a> <b>forked</b> <a href=\"%(repo_url)s\">%"
-"(repo_name)s</a> as <a href=\"%(fork_url)s\">%(fork_name)s</a>"
+msgid "<a href=\"%(url)s\">%(username)s</a> <b>forked</b> <a href=\"%(repo_url)s\">%(repo_name)s</a> as <a href=\"%(fork_url)s\">%(fork_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:960
 #, python-format
-msgid ""
-"%(username)s <b>forked</b> <a href=\"%(repo_url)s\">%(repo_name)s</a> as <a "
-"href=\"%(fork_url)s\">%(fork_name)s</a>"
+msgid "%(username)s <b>forked</b> <a href=\"%(repo_url)s\">%(repo_name)s</a> as <a href=\"%(fork_url)s\">%(fork_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:964
 #, python-format
-msgid ""
-"<a href=\"%(url)s\">%(username)s</a> <b>began following</b> <a href=\"%"
-"(target_user_url)s\">%(target_user)s</a>"
+msgid "<a href=\"%(url)s\">%(username)s</a> <b>began following</b> <a href=\"%(target_user_url)s\">%(target_user)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:966
 #, python-format
-msgid ""
-"<a href=\"%(url)s\">%(username)s</a> <b>began following</b> %(target_user)s"
+msgid "<a href=\"%(url)s\">%(username)s</a> <b>began following</b> %(target_user)s"
 msgstr ""
 
 #: apps/bb/models.py:968
 #, python-format
-msgid ""
-"%(username)s <b>began following</b> <a href=\"%(target_user_url)s\">%"
-"(target_user)s</a>"
+msgid "%(username)s <b>began following</b> <a href=\"%(target_user_url)s\">%(target_user)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:970
 
 #: apps/bb/models.py:974
 #, python-format
-msgid ""
-"<a href=\"%(url)s\">%(username)s</a> <b>stopped following</b> <a href=\"%"
-"(target_user_url)s\">%(target_user)s</a>"
+msgid "<a href=\"%(url)s\">%(username)s</a> <b>stopped following</b> <a href=\"%(target_user_url)s\">%(target_user)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:976
 #, python-format
-msgid ""
-"<a href=\"%(url)s\">%(username)s</a> <b>stopped following</b> %(target_user)s"
+msgid "<a href=\"%(url)s\">%(username)s</a> <b>stopped following</b> %(target_user)s"
 msgstr ""
 
 #: apps/bb/models.py:978
 #, python-format
-msgid ""
-"%(username)s <b>stopped following</b> <a href=\"%(target_user_url)s\">%"
-"(target_user)s</a>"
+msgid "%(username)s <b>stopped following</b> <a href=\"%(target_user_url)s\">%(target_user)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:980
 
 #: apps/bb/models.py:984
 #, python-format
-msgid ""
-"<a href=\"%(url)s\">%(username)s</a> <b>began following</b> <a href=\"%"
-"(repo_url)s\">%(repo_name)s</a>"
+msgid "<a href=\"%(url)s\">%(username)s</a> <b>began following</b> <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:986
 #, python-format
-msgid ""
-"%(username)s <b>began following</b> <a href=\"%(repo_url)s\">%(repo_name)s</"
-"a>"
+msgid "%(username)s <b>began following</b> <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:990
 #, python-format
-msgid ""
-"<a href=\"%(url)s\">%(username)s</a> <b>stopped following</b> <a href=\"%"
-"(repo_url)s\">%(repo_name)s</a>"
+msgid "<a href=\"%(url)s\">%(username)s</a> <b>stopped following</b> <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:992
 #, python-format
-msgid ""
-"%(username)s <b>stopped following</b> <a href=\"%(repo_url)s\">%(repo_name)"
-"s</a>"
+msgid "%(username)s <b>stopped following</b> <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:996
 #, python-format
-msgid ""
-"<a href=\"%(url)s\">%(username)s</a> <b>created</b> <a href=\"%(repo_url)s\">"
-"%(repo_name)s</a>"
+msgid "<a href=\"%(url)s\">%(username)s</a> <b>created</b> <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:998
 
 #: apps/bb/models.py:1002
 #, python-format
-msgid ""
-"<a href=\"%(url)s\">%(username)s</a> <b>deleted</b> <a href=\"%(repo_url)s\">"
-"%(repo_name)s</a>"
+msgid "<a href=\"%(url)s\">%(username)s</a> <b>deleted</b> <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:1004
 
 #: apps/bb/models.py:1008
 #, python-format
-msgid ""
-"<a href=\"%(url)s\">%(username)s</a> <b>stripped</b> %(node)s from <a href="
-"\"%(repo_url)s\">%(repo_name)s</a>"
+msgid "<a href=\"%(url)s\">%(username)s</a> <b>stripped</b> %(node)s from <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:1010
 #, python-format
-msgid ""
-"%(username)s <b>stripped</b> %(node)s from <a href=\"%(repo_url)s\">%"
-"(repo_name)s</a>"
+msgid "%(username)s <b>stripped</b> %(node)s from <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:1014
 #, python-format
-msgid ""
-"<a href=\"%(url)s\">%(username)s</a> <b>uploaded file</b> %(download)s to <a "
-"href=\"%(repo_url)s\">%(repo_name)s</a>"
+msgid "<a href=\"%(url)s\">%(username)s</a> <b>uploaded file</b> %(download)s to <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:1016
 #, python-format
-msgid ""
-"%(username)s <b>uploaded file</b> %(download)s to <a href=\"%(repo_url)s\">%"
-"(repo_name)s</a>"
+msgid "%(username)s <b>uploaded file</b> %(download)s to <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:1020
 #, python-format
-msgid ""
-"<a href=\"%(url)s\">%(username)s</a> <b>began following</b> issue <a href=\"%"
-"(issue_url)s\">#%(issue_id)s</a> in <a href=\"%(repo_url)s\">%(repo_name)s</"
-"a>"
+msgid "<a href=\"%(url)s\">%(username)s</a> <b>began following</b> issue <a href=\"%(issue_url)s\">#%(issue_id)s</a> in <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:1022
 #, python-format
-msgid ""
-"%(username)s <b>began following</b> issue <a href=\"%(issue_url)s\">#%"
-"(issue_id)s</a> in <a href=\"%(repo_url)s\">%(repo_name)s</a>"
+msgid "%(username)s <b>began following</b> issue <a href=\"%(issue_url)s\">#%(issue_id)s</a> in <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:1026
 #, python-format
-msgid ""
-"<a href=\"%(url)s\">%(username)s</a> <b>stopped following</b> issue <a href="
-"\"%(issue_url)s\">#%(issue_id)s</a> in <a href=\"%(repo_url)s\">%(repo_name)"
-"s</a>"
+msgid "<a href=\"%(url)s\">%(username)s</a> <b>stopped following</b> issue <a href=\"%(issue_url)s\">#%(issue_id)s</a> in <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:1028
 #, python-format
-msgid ""
-"%(username)s <b>stopped following</b> issue <a href=\"%(issue_url)s\">#%"
-"(issue_id)s</a> in <a href=\"%(repo_url)s\">%(repo_name)s</a>"
+msgid "%(username)s <b>stopped following</b> issue <a href=\"%(issue_url)s\">#%(issue_id)s</a> in <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:1032
 #, python-format
-msgid ""
-"<a href=\"%(url)s\">%(username)s</a> <b>reported</b> issue <a href=\"%"
-"(issue_url)s\">#%(issue_id)s</a> to <a href=\"%(repo_url)s\">%(repo_name)s</"
-"a>"
+msgid "<a href=\"%(url)s\">%(username)s</a> <b>reported</b> issue <a href=\"%(issue_url)s\">#%(issue_id)s</a> to <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:1034
 #, python-format
-msgid ""
-"%(username)s <b>reported</b> issue <a href=\"%(issue_url)s\">#%(issue_id)s</"
-"a> to <a href=\"%(repo_url)s\">%(repo_name)s</a>"
+msgid "%(username)s <b>reported</b> issue <a href=\"%(issue_url)s\">#%(issue_id)s</a> to <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:1038
 #, python-format
-msgid ""
-"<a href=\"%(url)s\">%(username)s</a> <b>commented</b> on issue <a href=\"%"
-"(issue_url)s\">#%(issue_id)s</a> in <a href=\"%(repo_url)s\">%(repo_name)s</"
-"a>"
+msgid "<a href=\"%(url)s\">%(username)s</a> <b>commented</b> on issue <a href=\"%(issue_url)s\">#%(issue_id)s</a> in <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:1040
 #, python-format
-msgid ""
-"%(username)s <b>commented</b> on issue <a href=\"%(issue_url)s\">#%(issue_id)"
-"s</a> in <a href=\"%(repo_url)s\">%(repo_name)s</a>"
+msgid "%(username)s <b>commented</b> on issue <a href=\"%(issue_url)s\">#%(issue_id)s</a> in <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:1044
 #, python-format
-msgid ""
-"<a href=\"%(url)s\">%(username)s</a> <b>updated</b> issue <a href=\"%"
-"(issue_url)s\">#%(issue_id)s</a> in <a href=\"%(repo_url)s\">%(repo_name)s</"
-"a>"
+msgid "<a href=\"%(url)s\">%(username)s</a> <b>updated</b> issue <a href=\"%(issue_url)s\">#%(issue_id)s</a> in <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:1046
 #, python-format
-msgid ""
-"%(username)s <b>updated</b> issue <a href=\"%(issue_url)s\">#%(issue_id)s</"
-"a> in <a href=\"%(repo_url)s\">%(repo_name)s</a>"
+msgid "%(username)s <b>updated</b> issue <a href=\"%(issue_url)s\">#%(issue_id)s</a> in <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:1050
 #, python-format
-msgid ""
-"<a href=\"%(url)s\">%(username)s</a> <b>updated</b> wiki-page <a href=\"%"
-"(page_url)s\">%(page)s</a> in <a href=\"%(repo_url)s\">%(repo_name)s</a>"
+msgid "<a href=\"%(url)s\">%(username)s</a> <b>updated</b> wiki-page <a href=\"%(page_url)s\">%(page)s</a> in <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:1052
 #, python-format
-msgid ""
-"%(username)s <b>updated</b> wiki-page <a href=\"%(page_url)s\">%(page)s</a> "
-"in <a href=\"%(repo_url)s\">%(repo_name)s</a>"
+msgid "%(username)s <b>updated</b> wiki-page <a href=\"%(page_url)s\">%(page)s</a> in <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:1056
 #, python-format
-msgid ""
-"<a href=\"%(url)s\">%(username)s</a> <b>created</b> wiki-page <a href=\"%"
-"(page_url)s\">%(page)s</a> in <a href=\"%(repo_url)s\">%(repo_name)s</a>"
+msgid "<a href=\"%(url)s\">%(username)s</a> <b>created</b> wiki-page <a href=\"%(page_url)s\">%(page)s</a> in <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:1058
 #, python-format
-msgid ""
-"%(username)s <b>created</b> wiki-page <a href=\"%(page_url)s\">%(page)s</a> "
-"in <a href=\"%(repo_url)s\">%(repo_name)s</a>"
+msgid "%(username)s <b>created</b> wiki-page <a href=\"%(page_url)s\">%(page)s</a> in <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:1062
 #, python-format
-msgid ""
-"<a href=\"%(url)s\">%(username)s</a> <b>committed</b> <a href=\"%(cset_url)s"
-"\">%(cset)s</a> to <a href=\"%(repo_url)s\">%(repo_name)s</a>"
+msgid "<a href=\"%(url)s\">%(username)s</a> <b>committed</b> <a href=\"%(cset_url)s\">%(cset)s</a> to <a href=\"%(repo_url)s\">%(repo_name)s</a>"
 msgstr ""
 
 #: apps/bb/models.py:1064
 #, python-format
-msgid ""
-"%(username)s <b>committed</b> <a href=\"%(cset_url)s\">%(cset)s</a> to <a "
-"href=\"%(repo_url)s\">%(repo_name)s</a>"
-msgstr ""
-
-#: apps/bb/models.py:1305 apps/bb/models.py:1836 apps/bb/models.py:2056
-#: templates/issues/edit.html:71 templates/issues/new.html:121
+msgid "%(username)s <b>committed</b> <a href=\"%(cset_url)s\">%(cset)s</a> to <a href=\"%(repo_url)s\">%(repo_name)s</a>"
+msgstr ""
+
+#: apps/bb/models.py:1305
+#: apps/bb/models.py:1836
+#: apps/bb/models.py:2056
+#: templates/issues/edit.html:71
+#: templates/issues/new.html:121
 msgid "Content"
-msgstr ""
-
-#: apps/bb/models.py:1840 templates/issues/issue.html:279
+msgstr "Contingut"
+
+#: apps/bb/models.py:1840
+#: templates/issues/issue.html:279
 #: templates/issues/query.html:125
 msgid "Status"
-msgstr ""
-
-#: apps/bb/models.py:2158 templates/profile/user_info.html:52
-#: templates/profile/user_info.html:95 templates/reps/zealots.html:38
+msgstr "Estat"
+
+#: apps/bb/models.py:2158
+#: templates/profile/user_info.html:52
+#: templates/profile/user_info.html:95
+#: templates/reps/zealots.html:38
 msgid "Location"
-msgstr ""
+msgstr "Ubicació"
 
 #: apps/bb/models.py:2166
 msgid "Email notifications"
 msgstr ""
 
-#: apps/bb/models.py:2179 templates/plans.html:125
-#: templates/account/edit.html:128 templates/account/edit.html.py:146
+#: apps/bb/models.py:2179
+#: templates/plans.html:125
+#: templates/account/edit.html:128
+#: templates/account/edit.html.py:146
 msgid "CNAME"
 msgstr ""
 
 #: apps/bb/models.py:2183
 msgid "Differ"
-msgstr ""
+msgstr "Diferenciador"
 
 #: apps/bb/views.py:263
 msgid "HTTP push/pull support"
 msgstr ""
 
 #: apps/bb/views.py:267
-msgid ""
-"Plenty of \"services\" for repositories, automatic issue resolving, web "
-"hooks, etc."
+msgid "Plenty of \"services\" for repositories, automatic issue resolving, web hooks, etc."
 msgstr ""
 
 #: apps/bb/views.py:268
 msgid "The repository has been created."
 msgstr ""
 
-#: apps/bb/views.py:2322 templates/reps/admin_strip.html:60
+#: apps/bb/views.py:2322
+#: templates/reps/admin_strip.html:60
 msgid "Strip revision"
 msgstr ""
 
-#: apps/bb/views.py:2324 templates/reps/admin_strip_confirm.html:91
+#: apps/bb/views.py:2324
+#: templates/reps/admin_strip_confirm.html:91
 msgid "Confirm strip"
 msgstr ""
 
 msgid "Password does not match."
 msgstr ""
 
-#: apps/bb/views.py:2393 templates/services/admin.html:27
+#: apps/bb/views.py:2393
+#: templates/services/admin.html:27
 msgid "Add service"
 msgstr ""
 
 msgid "Service has been added. You may now configure it."
 msgstr ""
 
-#: apps/bb/views.py:2409 templates/account/edit.html:41
-#: templates/reps/admin-style.html:48 templates/services/admin.html:58
+#: apps/bb/views.py:2409
+#: templates/account/edit.html:41
+#: templates/reps/admin-style.html:48
+#: templates/services/admin.html:58
 msgid "Save settings"
-msgstr ""
+msgstr "Desa la configuració"
 
 #: apps/bb/views.py:2417
 msgid "Service settings have been saved."
 msgstr ""
 
-#: apps/bb/views.py:2419 templates/services/admin.html:59
+#: apps/bb/views.py:2419
+#: templates/services/admin.html:59
 msgid "Remove service"
 msgstr ""
 
 msgid "Service has been removed from this repository."
 msgstr ""
 
-#: apps/bb/views.py:2483 templates/issues/admin.html:50
+#: apps/bb/views.py:2483
+#: templates/issues/admin.html:50
 msgid "Update email preferences"
 msgstr ""
 
-#: apps/bb/views.py:2697 templates/issues/issue.html:584
+#: apps/bb/views.py:2697
+#: templates/issues/issue.html:584
 msgid "Bump!"
-msgstr ""
+msgstr "Eleva!"
 
 #: apps/bb/views.py:2709
 msgid "Issue was bumped, and the owners were notified."
 msgstr ""
 
 #: apps/bb/views.py:3005
-msgid ""
-"You cannot edit this comment because 15 minutes has passed since last edit."
-msgstr ""
-
-#: apps/bb/views.py:3247 apps/bb/views.py:3663 templates/help/edit.html:38
-#: templates/help/preview.html:62 templates/wiki/edit.html:42
+msgid "You cannot edit this comment because 15 minutes has passed since last edit."
+msgstr ""
+
+#: apps/bb/views.py:3247
+#: apps/bb/views.py:3663
+#: templates/help/edit.html:38
+#: templates/help/preview.html:62
+#: templates/wiki/edit.html:42
 #: templates/wiki/preview.html:68
 msgid "Save"
-msgstr ""
-
-#: apps/bb/views.py:3276 apps/bb/views.py:3688 templates/help/edit.html:39
-#: templates/help/preview.html:45 templates/help/preview.html.py:63
-#: templates/wiki/edit.html:43 templates/wiki/preview.html:51
+msgstr "Desa"
+
+#: apps/bb/views.py:3276
+#: apps/bb/views.py:3688
+#: templates/help/edit.html:39
+#: templates/help/preview.html:45
+#: templates/help/preview.html.py:63
+#: templates/wiki/edit.html:43
+#: templates/wiki/preview.html:51
 #: templates/wiki/preview.html.py:69
 msgid "Preview"
-msgstr ""
+msgstr "Previsualitza"
 
 #: apps/bb/views.py:3361
 msgid "You are now following this repository."
 msgid "You are no longer following this user."
 msgstr ""
 
-#: templates/404.html:5 templates/404.html.py:10
+#: templates/404.html:5
+#: templates/404.html.py:10
 msgid "404 - Not Found"
 msgstr ""
 
 msgstr ""
 
 #: templates/404.html:13
-msgid ""
-"You can perhaps find what you're looking for by doing a search in the list "
-"of <a href='/repo/all/'>public repositories</a>."
+msgid "You can perhaps find what you're looking for by doing a search in the list of <a href='/repo/all/'>public repositories</a>."
 msgstr ""
 
 #: templates/404.html:15
-msgid ""
-"If you feel that this is an error on our part, please <a href='mailto:"
-"support@bitbucket.org'>send us an email</a> with details about the error and "
-"what you were doing when it occurred."
-msgstr ""
-
-#: templates/404.html:17 templates/500.html:92
+msgid "If you feel that this is an error on our part, please <a href='mailto:support@bitbucket.org'>send us an email</a> with details about the error and what you were doing when it occurred."
+msgstr ""
+
+#: templates/404.html:17
+#: templates/500.html:92
 msgid "-- The Bitbucket team"
 msgstr ""
 
-#: templates/500.html:5 templates/500.html.py:85
+#: templates/500.html:5
+#: templates/500.html.py:85
 msgid "500 - Internal Server Error"
-msgstr ""
+msgstr "500 -Error de servidor intern"
 
 #: templates/500.html:60
 msgid "username"
-msgstr ""
+msgstr "nom d'usuari/a"
 
 #: templates/500.html:60
 msgid "password"
-msgstr ""
+msgstr "contrasenya"
 
 #: templates/500.html:66
 msgid "your OpenID URL"
 msgstr ""
 
-#: templates/500.html:73 templates/base.html:79 templates/help/nav.html:6
+#: templates/500.html:73
+#: templates/base.html:79
+#: templates/help/nav.html:6
 #: templates/wiki/nav.html:12
 msgid "Home"
-msgstr ""
-
-#: templates/500.html:74 templates/base.html:116
+msgstr "Inici"
+
+#: templates/500.html:74
+#: templates/base.html:116
 msgid "Plans"
 msgstr ""
 
 msgid "Signup"
 msgstr ""
 
-#: templates/500.html:75 templates/base.html:81
-#: templates/profile/user_info.html:76 templates/reps/list.html:6
+#: templates/500.html:75
+#: templates/base.html:81
+#: templates/profile/user_info.html:76
+#: templates/reps/list.html:6
 #: templates/reps/list.html.py:15
 msgid "Repositories"
-msgstr ""
+msgstr "Dipòsits"
 
 #: templates/500.html:76
 msgid "News"
-msgstr ""
-
-#: templates/500.html:77 templates/help.html:6 templates/help.html.py:12
-#: templates/help_page.html:5 templates/account/edit.html:88
-#: templates/help/backout.html:5 templates/help/collision.html:9
-#: templates/help/edit.html:5 templates/help/history.html:9
-#: templates/help/page.html:15 templates/help/preview.html:20
+msgstr "Notícies"
+
+#: templates/500.html:77
+#: templates/help.html:6
+#: templates/help.html.py:12
+#: templates/help_page.html:5
+#: templates/account/edit.html:88
+#: templates/help/backout.html:5
+#: templates/help/collision.html:9
+#: templates/help/edit.html:5
+#: templates/help/history.html:9
+#: templates/help/page.html:15
+#: templates/help/preview.html:20
 msgid "Help"
-msgstr ""
+msgstr "Ajuda"
 
 #: templates/500.html:78
 msgid "Login"
-msgstr ""
+msgstr "Entrada"
 
 #: templates/500.html:86
 msgid "We're sorry, but something seems to have gone wrong."
 msgstr ""
 
 #: templates/500.html:88
-msgid ""
-"An email with details about the error has already been sent to us, and we "
-"will look into the matter."
+msgid "An email with details about the error has already been sent to us, and we will look into the matter."
 msgstr ""
 
 #: templates/500.html:90
-msgid ""
-"Should this error continue to occur, please <a href='mailto:"
-"support@bitbucket.org'>send us an email</a> with details about the error and "
-"what you were doing when it occurred."
-msgstr ""
-
-#: templates/500.html:100 templates/base.html:174
+msgid "Should this error continue to occur, please <a href='mailto:support@bitbucket.org'>send us an email</a> with details about the error and what you were doing when it occurred."
+msgstr ""
+
+#: templates/500.html:100
+#: templates/base.html:174
 msgid "TOS"
-msgstr ""
-
-#: templates/500.html:100 templates/base.html:174
+msgstr "TDS"
+
+#: templates/500.html:100
+#: templates/base.html:174
 msgid "Privacy Policy"
-msgstr ""
-
-#: templates/500.html:100 templates/base.html:174
+msgstr "Política de privadesa"
+
+#: templates/500.html:100
+#: templates/base.html:174
 msgid "Blog"
-msgstr ""
-
-#: templates/500.html:100 templates/base.html:174
+msgstr "Blog"
+
+#: templates/500.html:100
+#: templates/base.html:174
 msgid "Report Bug"
-msgstr ""
-
-#: templates/500.html:100 templates/base.html:174
+msgstr "Informa d'un error"
+
+#: templates/500.html:100
+#: templates/base.html:174
 msgid "Discuss"
 msgstr ""
 
 msgid "%(username)s's public repos"
 msgstr ""
 
-#: templates/avatar_dropdown.html:35 templates/account/notification.html:52
+#: templates/avatar_dropdown.html:35
+#: templates/account/notification.html:52
 #: templates/account/notifications-send.html:29
 msgid "Send message"
-msgstr ""
+msgstr "Envia un missatge"
 
 #: templates/base.html:5
 msgid "untitled page"
-msgstr ""
-
-#: templates/base.html:83 templates/issues/nav.html:17
-#: templates/profile/frontpage.html:78 templates/reps/list.html:13
+msgstr "pàgina sense títol"
+
+#: templates/base.html:83
+#: templates/issues/nav.html:17
+#: templates/profile/frontpage.html:78
+#: templates/reps/list.html:13
 msgid "Create new"
-msgstr ""
+msgstr "Crea una nova"
 
 #: templates/base.html:85
 msgid "All public repositories"
 
 #: templates/base.html:110
 msgid "Account"
-msgstr ""
-
-#: templates/base.html:112 templates/account/notification.html:13
+msgstr "Compte"
+
+#: templates/base.html:112
+#: templates/account/notification.html:13
 #: templates/account/notifications-send.html:13
 #: templates/account/notifications-sent.html:13
 #: templates/account/notifications.html:26
 msgid "Inbox"
-msgstr ""
+msgstr "Safata d'entrada"
 
 #: templates/base.html:146
-msgid ""
-"You are currently surpassing your quota. You are not limited yet, but we "
-"will manually limit the account unless space is freed or plan is upgraded."
+msgid "You are currently surpassing your quota. You are not limited yet, but we will manually limit the account unless space is freed or plan is upgraded."
 msgstr ""
 
 #: templates/base.html:151
-msgid ""
-"You currently have less than 10 MB left on your plan. If you surpass it "
-"without an upgrade, you can no longer push changes."
-msgstr ""
-
-#: templates/base.html:166 templates/three_cols.html:5
-#: templates/three_cols.html.py:6 templates/three_cols.html:7
-#: templates/two_cols.html:6 templates/two_cols.html.py:8
+msgid "You currently have less than 10 MB left on your plan. If you surpass it without an upgrade, you can no longer push changes."
+msgstr ""
+
+#: templates/base.html:166
+#: templates/three_cols.html:5
+#: templates/three_cols.html.py:6
+#: templates/three_cols.html:7
+#: templates/two_cols.html:6
+#: templates/two_cols.html.py:8
 msgid "Nothing here"
 msgstr ""
 
 
 #: templates/choose_plan.html:17
 #, python-format
-msgid ""
-"To downgrade to the <b>%(plan)s</b> plan, you have to cancel your "
-"subscription from inside Paypal. This is due to the nature of how Paypal "
-"works, and is unfortunately out of our hands."
+msgid "To downgrade to the <b>%(plan)s</b> plan, you have to cancel your subscription from inside Paypal. This is due to the nature of how Paypal works, and is unfortunately out of our hands."
 msgstr ""
 
 #: templates/choose_plan.html:21
-msgid ""
-"Please contact <a href='mailto:support@bitbucket.org'>support@bitbucket.org</"
-"a> if you have questions."
+msgid "Please contact <a href='mailto:support@bitbucket.org'>support@bitbucket.org</a> if you have questions."
 msgstr ""
 
 #: templates/choose_plan.html:24
 
 #: templates/choose_plan.html:29
 #, python-format
-msgid ""
-"You're about to upgrade to the <b>%(plan)s</b> plan. We accept Paypal, click "
-"the button below to get started."
+msgid "You're about to upgrade to the <b>%(plan)s</b> plan. We accept Paypal, click the button below to get started."
 msgstr ""
 
 #: templates/choose_plan.html:49
 msgid "Go to Paypal"
 msgstr ""
 
-#: templates/event_helper.html:39 templates/event_helper_noavatar.html:33
+#: templates/event_helper.html:39
+#: templates/event_helper_noavatar.html:33
 #, python-format
 msgid "Run <code>hg strip %(node)s</code> on your local copy"
 msgstr ""
 
-#: templates/event_helper.html:55 templates/event_helper_noavatar.html:46
+#: templates/event_helper.html:55
+#: templates/event_helper_noavatar.html:46
 #, python-format
 msgid "Get <a href=\"%(download_url)s\">%(download)s</a>"
 msgstr ""
 
-#: templates/event_helper.html:84 templates/event_helper_noavatar.html:69
+#: templates/event_helper.html:84
+#: templates/event_helper_noavatar.html:69
 msgid "Originating repository was since deleted."
 msgstr ""
 
-#: templates/help.html:6 templates/help/backout.html:5
-#: templates/help/collision.html:9 templates/help/edit.html:5
-#: templates/help/page.html:15 templates/help/preview.html:20
+#: templates/help.html:6
+#: templates/help/backout.html:5
+#: templates/help/collision.html:9
+#: templates/help/edit.html:5
+#: templates/help/page.html:15
+#: templates/help/preview.html:20
 msgid "FAQ"
-msgstr ""
+msgstr "PMF"
 
 #: templates/help.html:15
-msgid ""
-"We provide you with a set of guides that will help you get started with "
-"Mercurial and instructions on how to carry out common tasks."
+msgid "We provide you with a set of guides that will help you get started with Mercurial and instructions on how to carry out common tasks."
 msgstr ""
 
 #: templates/help.html:28
 msgstr ""
 
 #: templates/help.html:31
-msgid ""
-"If you have suggestions, feedback, want to report a bug, or just chat with "
-"fellow Bitbucket users, you can reach us at:"
+msgid "If you have suggestions, feedback, want to report a bug, or just chat with fellow Bitbucket users, you can reach us at:"
 msgstr ""
 
 #: templates/help.html:41
-msgid ""
-"For support-requests, use <a href='mailto:support@bitbucket."
-"org'>support@bitbucket.org</a>."
+msgid "For support-requests, use <a href='mailto:support@bitbucket.org'>support@bitbucket.org</a>."
 msgstr ""
 
 #: templates/help_page.html:20
 msgid "Table of Contents"
-msgstr ""
+msgstr "Continguts de la taula "
 
 #: templates/invalidpage.html:5
 msgid "Umm, yeah, no page here, sir."
 msgstr ""
 
 #: templates/new_promo.html:53
-msgid ""
-"Develop code as a team. Keep all your development in one place, be it issue "
-"tracking, documentation or sharing code."
+msgid "Develop code as a team. Keep all your development in one place, be it issue tracking, documentation or sharing code."
 msgstr ""
 
 #: templates/new_promo.html:57
 
 #: templates/new_promo.html:60
 #, python-format
-msgid ""
-"<strong>Bitbucket.org</strong> is a premium platform for doing just that. "
-"See why over %(user_count)s users already signed up, and be more productive, "
-"today."
-msgstr ""
-
-#: templates/new_promo.html:64 templates/plans.html:108
+msgid "<strong>Bitbucket.org</strong> is a premium platform for doing just that. See why over %(user_count)s users already signed up, and be more productive, today."
+msgstr ""
+
+#: templates/new_promo.html:64
+#: templates/plans.html:108
 msgid "Sign up"
-msgstr ""
+msgstr "Registra't"
 
 #: templates/new_promo.html:87
 msgid "Find code &amp; projects"
 msgstr ""
 
-#: templates/new_promo.html:92 templates/issues/nav.html:6
-#: templates/reps/index.html:45 templates/reps/search.html:21
+#: templates/new_promo.html:92
+#: templates/issues/nav.html:6
+#: templates/reps/index.html:45
+#: templates/reps/search.html:21
 msgid "Search"
-msgstr ""
+msgstr "Cerca"
 
 #: templates/new_promo.html:98
 msgid "E.g. \"django-\", \"tortoise\" or \"mercurial\""
 msgstr ""
 
 #: templates/new_promo.html:144
-msgid ""
-"Bitbucket is a code hosting site, for the popular Mercurial version control "
-"system. With Mercurial, your data is <b>distributed</b> by definition, but "
-"you still need a place to <b>share</b> it, and keep track of your "
-"development."
+msgid "Bitbucket is a code hosting site, for the popular Mercurial version control system. With Mercurial, your data is <b>distributed</b> by definition, but you still need a place to <b>share</b> it, and keep track of your development."
 msgstr ""
 
 #: templates/new_promo.html:148
-msgid ""
-"Bitbucket is that. It provides a fully featured environment for <b>managing "
-"development</b>, including a <b>wiki</b> (naturally backed by Mercurial, you "
-"can clone it!), a <b>powerful issue tracker</b>, and <b>easy collaboration</"
-"b> with others."
+msgid "Bitbucket is that. It provides a fully featured environment for <b>managing development</b>, including a <b>wiki</b> (naturally backed by Mercurial, you can clone it!), a <b>powerful issue tracker</b>, and <b>easy collaboration</b> with others."
 msgstr ""
 
 #: templates/new_promo.html:151
-msgid ""
-"Simply put, it takes the pain out of sharing code, and lets you focus on "
-"what you do best: <b>Code.</b>"
+msgid "Simply put, it takes the pain out of sharing code, and lets you focus on what you do best: <b>Code.</b>"
 msgstr ""
 
 #: templates/new_promo.html:154
 msgstr ""
 
 #: templates/new_promo.html:174
-msgid ""
-"Mercurial is a distributed version control system, or DVCS for short. It is "
-"in the ranks of Git and Bazaar, leading a <b>new paradigm</b> of working "
-"with version control."
+msgid "Mercurial is a distributed version control system, or DVCS for short. It is in the ranks of Git and Bazaar, leading a <b>new paradigm</b> of working with version control."
 msgstr ""
 
 #: templates/new_promo.html:177
-msgid ""
-"If you have been using other version control systems like CVS or SVN, you "
-"should feel right at home, as Mercurial's command set is very similar."
+msgid "If you have been using other version control systems like CVS or SVN, you should feel right at home, as Mercurial's command set is very similar."
 msgstr ""
 
 #: templates/new_promo.html:180
-msgid ""
-"The main difference between a traditional version control system and a "
-"<b>distributed one</b> is that the distributed system does not rely on one "
-"central server. Every person with a repository also has the <b>full history</"
-"b> of changes. Each repository is independent."
+msgid "The main difference between a traditional version control system and a <b>distributed one</b> is that the distributed system does not rely on one central server. Every person with a repository also has the <b>full history</b> of changes. Each repository is independent."
 msgstr ""
 
 #: templates/new_promo.html:183
-msgid ""
-"In Subversion, for example, each developer checks out a copy from the main "
-"server, works on changes, and commits them back in. In case of conflicting "
-"changes made by other developers, you will be notified and asked to merge "
-"the changes. In a DVCS world, this is different, as <b>commits are local</"
-"b>, and you can commit several dozens of changes locally without ever "
-"communicating with anyone else."
+msgid "In Subversion, for example, each developer checks out a copy from the main server, works on changes, and commits them back in. In case of conflicting changes made by other developers, you will be notified and asked to merge the changes. In a DVCS world, this is different, as <b>commits are local</b>, and you can commit several dozens of changes locally without ever communicating with anyone else."
 msgstr ""
 
 #: templates/new_promo.html:191
 
 #: templates/new_promo.html:258
 msgid "Learn more"
-msgstr ""
+msgstr "Més informació"
 
 #: templates/new_promo.html:264
 msgid "Free Mercurial book"
 msgid "Mercurial Wiki"
 msgstr ""
 
-#: templates/news.html:6 templates/news.html.py:12
+#: templates/news.html:6
+#: templates/news.html.py:12
 #: templates/profile/frontpage.html:28
 msgid "Public newsfeed"
 msgstr ""
 
-#: templates/news.html:53 templates/services/admin.html:72
+#: templates/news.html:53
+#: templates/services/admin.html:72
 msgid "What is this?"
-msgstr ""
+msgstr "Què és aixó?"
 
 #: templates/news.html:54
 msgid "These are the latest events for public repositories."
 
 #: templates/news.html:58
 #, python-format
-msgid ""
-"<a href=\"%(plans_url)s\">Sign up</a> to start following repositories and/or "
-"users to make your own custom newsfeed."
+msgid "<a href=\"%(plans_url)s\">Sign up</a> to start following repositories and/or users to make your own custom newsfeed."
 msgstr ""
 
 #: templates/news.html:60
-msgid ""
-"<a href='/'>Your private newsfeed</a> contains events only for your own "
-"repositories and users/repositories you are following."
-msgstr ""
-
-#: templates/payment_done.html:5 templates/payment_done.html.py:11
+msgid "<a href='/'>Your private newsfeed</a> contains events only for your own repositories and users/repositories you are following."
+msgstr ""
+
+#: templates/payment_done.html:5
+#: templates/payment_done.html.py:11
 msgid "Payment received"
 msgstr ""
 
 #: templates/payment_done.html:16
-msgid ""
-"Thank you for upgrading your plan. Your new plan should be active within a "
-"few minutes. If it takes longer than that, please contact us, on <a "
-"href='mailto:support@bitbucket.org'>support@bitbucket.org</a>."
+msgid "Thank you for upgrading your plan. Your new plan should be active within a few minutes. If it takes longer than that, please contact us, on <a href='mailto:support@bitbucket.org'>support@bitbucket.org</a>."
 msgstr ""
 
 #: templates/plans.html:112
 #, python-format
-msgid ""
-"If you want a <strong>free</strong> account, <a href=\"%(signup_url)s\">go "
-"to the signup page</a>. You may upgrade to a paid plan after creating your "
-"account."
+msgid "If you want a <strong>free</strong> account, <a href=\"%(signup_url)s\">go to the signup page</a>. You may upgrade to a paid plan after creating your account."
 msgstr ""
 
 #: templates/plans.html:115
 msgid "Disk space"
-msgstr ""
+msgstr "Espai al disc"
 
 #: templates/plans.html:116
 msgid "Private repositories"
 
 #: templates/plans.html:118
 msgid "Unlimited"
-msgstr ""
+msgstr "Il·limitat"
 
 #: templates/plans.html:119
 msgid "HTTP push/pull"
 
 #: templates/plans.html:128
 msgid "Free!"
-msgstr ""
+msgstr "Lliure!"
 
 #: templates/plans.html:130
-msgid ""
-"If you need anything bigger than this, contact us on <a href='mailto:"
-"support@bitbucket.org'>support@bitbucket.org</a>. All data is backed up and "
-"stored in a secure location."
+msgid "If you need anything bigger than this, contact us on <a href='mailto:support@bitbucket.org'>support@bitbucket.org</a>. All data is backed up and stored in a secure location."
 msgstr ""
 
 #: templates/plans.html:131
-msgid ""
-"* Integration with Lighthouse, Twitter, FogBugz, Basecamp, CIA.vc and more "
-"is included with all plans."
+msgid "* Integration with Lighthouse, Twitter, FogBugz, Basecamp, CIA.vc and more is included with all plans."
 msgstr ""
 
 #: templates/plans.html:134
 #, python-format
-msgid ""
-"** All paid plans may optionally associate a CNAME with their account. "
-"Example: http://hg.noehr.org/cx/ -> http://bitbucket.org/jespern/cx/. See "
-"\"<a href=\"%(help_url)s\">using CNAME</a>\" for more information."
-msgstr ""
-
-#: templates/spam_found.html:6 templates/issues/issue.html:252
+msgid "** All paid plans may optionally associate a CNAME with their account. Example: http://hg.noehr.org/cx/ -> http://bitbucket.org/jespern/cx/. See \"<a href=\"%(help_url)s\">using CNAME</a>\" for more information."
+msgstr ""
+
+#: templates/spam_found.html:6
+#: templates/issues/issue.html:252
 #: templates/issues/issue.html.py:391
 msgid "Spam"
-msgstr ""
+msgstr "spam"
 
 #: templates/spam_found.html:13
-msgid ""
-"The administrator for this repository has enabled <a href='http://www."
-"akismet.com/'>Akismet</a> spam protection, and your comment was marked as "
-"spam."
+msgid "The administrator for this repository has enabled <a href='http://www.akismet.com/'>Akismet</a> spam protection, and your comment was marked as spam."
 msgstr ""
 
 #: templates/spam_found.html:16
-msgid ""
-"If you think there has been a mistake, contact the repository administrator."
+msgid "If you think there has been a mistake, contact the repository administrator."
 msgstr ""
 
 #: templates/tabs.html:60
 msgid "Downloads"
-msgstr ""
+msgstr "Baixades"
 
 #: templates/tabs.html:65
 msgid "Patch Series"
 msgstr ""
 
-#: templates/tabs.html:78 templates/help/history.html:47
-#: templates/reps/changesets.html:65 templates/reps/file_history.html:43
+#: templates/tabs.html:78
+#: templates/help/history.html:47
+#: templates/reps/changesets.html:65
+#: templates/reps/file_history.html:43
 #: templates/wiki/history.html:49
 msgid "Changesets"
 msgstr ""
 
-#: templates/tabs.html:102 templates/tabs.html.py:118
-#: templates/tabs_issues.html:14 templates/tabs_issues.html.py:30
-#: templates/reps/index-issues.html:22 templates/reps/index-issues.html:38
+#: templates/tabs.html:102
+#: templates/tabs.html.py:118
+#: templates/tabs_issues.html:14
+#: templates/tabs_issues.html.py:30
+#: templates/reps/index-issues.html:22
+#: templates/reps/index-issues.html:38
 msgid "Issues"
 msgstr ""
 
-#: templates/tabs.html:104 templates/tabs.html.py:120
-#: templates/tabs_issues.html:16 templates/tabs_issues.html.py:32
-#: templates/reps/index-issues.html:24 templates/reps/index-issues.html:40
+#: templates/tabs.html:104
+#: templates/tabs.html.py:120
+#: templates/tabs_issues.html:16
+#: templates/tabs_issues.html.py:32
+#: templates/reps/index-issues.html:24
+#: templates/reps/index-issues.html:40
 msgid "New issues"
 msgstr ""
 
-#: templates/tabs.html:105 templates/tabs.html.py:121
-#: templates/tabs_issues.html:17 templates/tabs_issues.html.py:33
-#: templates/reps/index-issues.html:25 templates/reps/index-issues.html:41
+#: templates/tabs.html:105
+#: templates/tabs.html.py:121
+#: templates/tabs_issues.html:17
+#: templates/tabs_issues.html.py:33
+#: templates/reps/index-issues.html:25
+#: templates/reps/index-issues.html:41
 msgid "Open issues"
 msgstr ""
 
-#: templates/tabs.html:106 templates/tabs.html.py:122
-#: templates/tabs_issues.html:18 templates/tabs_issues.html.py:34
+#: templates/tabs.html:106
+#: templates/tabs.html.py:122
+#: templates/tabs_issues.html:18
+#: templates/tabs_issues.html.py:34
 #: templates/reps/index-issues.html:42
 msgid "Closed issues"
 msgstr ""
 
-#: templates/tabs.html:108 templates/tabs.html.py:124
-#: templates/tabs_issues.html:20 templates/tabs_issues.html.py:36
-#: templates/reps/index-issues.html:28 templates/reps/index-issues.html:44
+#: templates/tabs.html:108
+#: templates/tabs.html.py:124
+#: templates/tabs_issues.html:20
+#: templates/tabs_issues.html.py:36
+#: templates/reps/index-issues.html:28
+#: templates/reps/index-issues.html:44
 #, python-format
 msgid "%(username)s's issues"
 msgstr ""
 
-#: templates/tabs.html:110 templates/tabs.html.py:126
-#: templates/tabs_issues.html:22 templates/tabs_issues.html.py:38
-#: templates/reps/index-issues.html:30 templates/reps/index-issues.html:46
+#: templates/tabs.html:110
+#: templates/tabs.html.py:126
+#: templates/tabs_issues.html:22
+#: templates/tabs_issues.html.py:38
+#: templates/reps/index-issues.html:30
+#: templates/reps/index-issues.html:46
 msgid "All issues"
 msgstr ""
 
-#: templates/tabs.html:111 templates/tabs.html.py:128
-#: templates/tabs_issues.html:23 templates/tabs_issues.html.py:40
-#: templates/issues/new.html:114 templates/reps/index-issues.html:31
+#: templates/tabs.html:111
+#: templates/tabs.html.py:128
+#: templates/tabs_issues.html:23
+#: templates/tabs_issues.html.py:40
+#: templates/issues/new.html:114
+#: templates/reps/index-issues.html:31
 #: templates/reps/index-issues.html:48
 msgid "Create new issue"
 msgstr ""
 
-#: templates/tabs.html:127 templates/tabs_issues.html:39
-#: templates/issues/nav.html:23 templates/reps/index-issues.html:47
+#: templates/tabs.html:127
+#: templates/tabs_issues.html:39
+#: templates/issues/nav.html:23
+#: templates/reps/index-issues.html:47
 msgid "Advanced query"
 msgstr ""
 
 #: templates/tabs.html:137
 msgid "Admin"
-msgstr ""
-
-#: templates/tabs.html:143 templates/reps/descendants.html:57
+msgstr "administració"
+
+#: templates/tabs.html:143
+#: templates/reps/descendants.html:57
 msgid "Forks"
 msgstr ""
 
 msgid "Queues"
 msgstr ""
 
-#: templates/tabs.html:147 templates/profile/user_info.html:114
+#: templates/tabs.html:147
+#: templates/profile/user_info.html:114
 msgid "Followers"
-msgstr ""
-
-#: templates/tabs.html:156 templates/tabs.html.py:234
-#: templates/help/backout.html:11 templates/help/collision.html:15
-#: templates/help/edit.html:11 templates/help/history.html:15
-#: templates/help/page.html:21 templates/reps/admin-style.html:31
-#: templates/reps/admin.html:9 templates/reps/changeset-several.html:13
-#: templates/reps/changeset-too-large.html:13 templates/reps/changeset.html:13
-#: templates/reps/changesets.html:18 templates/reps/downloads.html:12
-#: templates/reps/file_history.html:9 templates/reps/index.html:30
-#: templates/reps/search.html:9 templates/reps/source.html:12
-#: templates/services/admin.html:9 templates/wiki/edit.html:11
-#: templates/wiki/history.html:15 templates/wiki/page.html:21
+msgstr "Seguidors"
+
+#: templates/tabs.html:156
+#: templates/tabs.html.py:234
+#: templates/help/backout.html:11
+#: templates/help/collision.html:15
+#: templates/help/edit.html:11
+#: templates/help/history.html:15
+#: templates/help/page.html:21
+#: templates/reps/admin-style.html:31
+#: templates/reps/admin.html:9
+#: templates/reps/changeset-several.html:13
+#: templates/reps/changeset-too-large.html:13
+#: templates/reps/changeset.html:13
+#: templates/reps/changesets.html:18
+#: templates/reps/downloads.html:12
+#: templates/reps/file_history.html:9
+#: templates/reps/index.html:30
+#: templates/reps/search.html:9
+#: templates/reps/source.html:12
+#: templates/services/admin.html:9
+#: templates/wiki/edit.html:11
+#: templates/wiki/history.html:15
+#: templates/wiki/page.html:21
 #: templates/wiki/preview.html:28
 #, python-format
 msgid "RSS Feed for %(name)s"
 msgstr ""
 
-#: templates/tabs.html:156 templates/profile/frontpage.html:30
+#: templates/tabs.html:156
+#: templates/profile/frontpage.html:30
 msgid "RSS"
-msgstr ""
-
-#: templates/tabs.html:159 templates/tabs.html.py:237
+msgstr "RSS"
+
+#: templates/tabs.html:159
+#: templates/tabs.html.py:237
 #: templates/reps/index.html:31
 #, python-format
 msgid "Atom Feed for %(name)s"
 
 #: templates/tabs.html:159
 msgid "Atom"
-msgstr ""
+msgstr "Àtom"
 
 #: templates/tabs.html:164
 msgid "pull request"
 msgstr ""
 
-#: templates/tabs.html:168 templates/reps/fork.html:6
+#: templates/tabs.html:168
+#: templates/reps/fork.html:6
 msgid "fork"
-msgstr ""
+msgstr "derivat"
 
 #: templates/tabs.html:170
 msgid "patch queue"
 msgstr ""
 
-#: templates/tabs.html:174 templates/issues/issue.html:224
+#: templates/tabs.html:174
+#: templates/issues/issue.html:224
 msgid "following"
-msgstr ""
-
-#: templates/tabs.html:174 templates/tabs.html.py:176
-#: templates/issues/issue.html:224 templates/issues/issue.html.py:226
-#: templates/profile/user_info.html:26 templates/profile/user_info.html:30
+msgstr "següent"
+
+#: templates/tabs.html:174
+#: templates/tabs.html.py:176
+#: templates/issues/issue.html:224
+#: templates/issues/issue.html.py:226
+#: templates/profile/user_info.html:26
+#: templates/profile/user_info.html:30
 msgid "follow"
 msgstr ""
 
 msgid "branches"
 msgstr ""
 
-#: templates/tabs.html:212 templates/reps/big_info_header.html:34
+#: templates/tabs.html:212
+#: templates/reps/big_info_header.html:34
 msgid "tags"
-msgstr ""
+msgstr "etiquetes"
 
 #: templates/tabs.html:241
 msgid "Pull request"
 msgstr ""
 
-#: templates/tabs.html:244 templates/reps/fork.html:28
+#: templates/tabs.html:244
+#: templates/reps/fork.html:28
 msgid "Fork"
-msgstr ""
+msgstr "Bifurcació"
 
 #: templates/tabs.html:246
 msgid "Patch queue"
 msgid "Get source"
 msgstr ""
 
-#: templates/tabs.html:272 templates/reps/list.html:27
+#: templates/tabs.html:272
+#: templates/reps/list.html:27
 #, python-format
 msgid "Repository '%(repo_name)s' is private"
 msgstr ""
 msgid "and patch queue"
 msgstr ""
 
-#: templates/tabs.html:300 templates/reps/source.html:137
+#: templates/tabs.html:300
+#: templates/reps/source.html:137
 msgid "size"
-msgstr ""
-
-#: templates/tabs_issues.html:54 templates/reps/index-issues.html:62
+msgstr "mida"
+
+#: templates/tabs_issues.html:54
+#: templates/reps/index-issues.html:62
 #, python-format
 msgid "This repository (%(name)s) is private, but has an open issue tracker."
 msgstr ""
 
-#: templates/tabs_issues.html:56 templates/reps/index-issues.html:64
-msgid ""
-"You can view all issues and add comments, as well as creating new issues, "
-"but not make other changes."
-msgstr ""
-
-#: templates/account/edit.html:6 templates/account/edit.html.py:12
+#: templates/tabs_issues.html:56
+#: templates/reps/index-issues.html:64
+msgid "You can view all issues and add comments, as well as creating new issues, but not make other changes."
+msgstr ""
+
+#: templates/account/edit.html:6
+#: templates/account/edit.html.py:12
 #: templates/account/api/index.html:5
 msgid "Account settings"
-msgstr ""
+msgstr "Paràmetres del compte"
 
 #: templates/account/edit.html:25
 msgid "Avatar"
 msgstr ""
 
-#: templates/account/edit.html:41 templates/account/notifications-send.html:29
-#: templates/help/backout.html:56 templates/help/edit.html:40
-#: templates/help/preview.html:64 templates/issues/admin.html:30
-#: templates/issues/admin.html.py:65 templates/issues/edit.html:86
-#: templates/issues/issue.html:584 templates/issues/new.html:165
-#: templates/issues/query.html:130 templates/oauth/authenticate.html:22
-#: templates/reps/admin-style.html:49 templates/reps/admin.html:103
+#: templates/account/edit.html:41
+#: templates/account/notifications-send.html:29
+#: templates/help/backout.html:56
+#: templates/help/edit.html:40
+#: templates/help/preview.html:64
+#: templates/issues/admin.html:30
+#: templates/issues/admin.html.py:65
+#: templates/issues/edit.html:86
+#: templates/issues/issue.html:584
+#: templates/issues/new.html:165
+#: templates/issues/query.html:130
+#: templates/oauth/authenticate.html:22
+#: templates/reps/admin-style.html:49
+#: templates/reps/admin.html:103
 #: templates/reps/admin_strip.html:61
-#: templates/reps/admin_strip_confirm.html:92 templates/reps/create.html:39
-#: templates/reps/delete.html:61 templates/reps/fork.html:145
-#: templates/reps/hack.html:70 templates/reps/pullrequest.html:83
-#: templates/services/admin.html:28 templates/wiki/edit.html:44
+#: templates/reps/admin_strip_confirm.html:92
+#: templates/reps/create.html:39
+#: templates/reps/delete.html:61
+#: templates/reps/fork.html:145
+#: templates/reps/hack.html:70
+#: templates/reps/pullrequest.html:83
+#: templates/services/admin.html:28
+#: templates/wiki/edit.html:44
 #: templates/wiki/preview.html:70
 msgid "Cancel"
-msgstr ""
+msgstr "Cancel·la"
 
 #: templates/account/edit.html:71
 msgid "Language"
-msgstr ""
+msgstr "Idioma"
 
 #: templates/account/edit.html:82
 msgid "Set language"
-msgstr ""
+msgstr "Especifica l'idioma"
 
 #: templates/account/edit.html:87
 msgid "SSH Keys"
 
 #: templates/account/edit.html:135
 msgid "For more information, click here."
-msgstr ""
+msgstr "Feu clic aquí per a més informació."
 
 #: templates/account/edit.html:151
 msgid "Don't include 'http://' or the trailing slash!"
 
 #: templates/account/edit.html:178
 #, python-format
-msgid ""
-"You are currently on the <b>%(plan_name)s</b> plan, using <b>%(used_space)s</"
-"b> out of <b>%(disk_space)s</b> total"
+msgid "You are currently on the <b>%(plan_name)s</b> plan, using <b>%(used_space)s</b> out of <b>%(disk_space)s</b> total"
 msgstr ""
 
 #: templates/account/edit.html:182
-msgid ""
-"If you would like to upgrade, head over to <a href='/plans/'>the plans page</"
-"a>."
+msgid "If you would like to upgrade, head over to <a href='/plans/'>the plans page</a>."
 msgstr ""
 
 #: templates/account/notification-reply.html:15
 msgid "From"
-msgstr ""
+msgstr "De"
 
 #: templates/account/notification.html:5
 #: templates/account/notifications-send.html:5
 msgid "notification"
-msgstr ""
+msgstr "notificació"
 
 #: templates/account/notification.html:16
 #: templates/account/notifications-send.html:16
 #: templates/account/notifications-sent.html:16
 #: templates/account/notifications.html:29
 msgid "Sent messages"
-msgstr ""
+msgstr "Missatges enviats"
 
 #: templates/account/notification.html:19
 #: templates/account/notifications-send.html:19
 #: templates/account/notifications-sent.html:19
 #: templates/account/notifications.html:32
 msgid "Compose message"
-msgstr ""
+msgstr "Redacta un missatge"
 
 #: templates/account/notification.html:43
 msgid "Reply to"
-msgstr ""
+msgstr "Respon a"
 
 #: templates/account/notification.html:52
 msgid "Back to inbox"
 
 #: templates/account/notifications-send.html:5
 msgid "compose"
-msgstr ""
+msgstr "composa"
 
 #: templates/account/notifications-sent.html:5
 #: templates/account/notifications.html:5
 msgid "notifications"
-msgstr ""
+msgstr "notificacions"
 
 #: templates/account/notifications-sent.html:63
 msgid "To"
-msgstr ""
+msgstr "Per a"
 
 #: templates/account/notifications-sent.html:71
 #: templates/account/notifications.html:103
 
 #: templates/account/notifications.html:48
 msgid "Go"
-msgstr ""
+msgstr "Vés"
 
 #: templates/account/notifications.html:96
-#, python-format
+#, fuzzy, python-format
 msgid "1 reply"
 msgid_plural "%(counter)s replies"
-msgstr[0] ""
+msgstr[0] "_Respon"
 msgstr[1] ""
 
 #: templates/account/welcome.html:6
 msgid "Welcome"
-msgstr ""
+msgstr "Benvingut/da"
 
 #: templates/account/welcome.html:11
 #, python-format
 msgstr ""
 
 #: templates/account/welcome.html:14
-msgid ""
-"And welcome to Bitbucket! We hope you enjoy using it as much as we did "
-"making it."
+msgid "And welcome to Bitbucket! We hope you enjoy using it as much as we did making it."
 msgstr ""
 
 #: templates/account/welcome.html:18
-msgid ""
-"We've sent you a confirmation email containing your username and password, "
-"lest you forget it."
+msgid "We've sent you a confirmation email containing your username and password, lest you forget it."
 msgstr ""
 
 #: templates/account/welcome.html:25
 msgstr ""
 
 #: templates/account/welcome.html:28
-msgid ""
-"Now would be an excellent time to set up your account further. You are "
-"currently on the <b>free</b> plan, which is fine in most cases, but perhaps "
-"you want to upgrade straight away."
+msgid "Now would be an excellent time to set up your account further. You are currently on the <b>free</b> plan, which is fine in most cases, but perhaps you want to upgrade straight away."
 msgstr ""
 
 #: templates/account/welcome.html:33
 msgid "We also have some guides"
 msgstr ""
 
-#: templates/account/welcome.html:52 templates/reps/index.html:116
+#: templates/account/welcome.html:52
+#: templates/reps/index.html:116
 msgid "Getting started with Mercurial"
 msgstr ""
 
-#: templates/account/welcome.html:55 templates/reps/index.html:114
+#: templates/account/welcome.html:55
+#: templates/reps/index.html:114
 #: templates/reps/index.html.py:132
 msgid "Using Bitbucket"
 msgstr ""
 
 #: templates/account/api/index.html:27
 msgid "Created on"
-msgstr ""
+msgstr "Creat el "
 
 #: templates/account/api/index.html:28
 msgid "Revoke"
-msgstr ""
+msgstr "Revoca"
 
 #: templates/account/api/index.html:38
 msgid "revoke access"
 msgstr ""
 
 #: templates/account/api/index.html:59
-msgid ""
-"This is for creating tokens directly. You usually don't need to do this."
+msgid "This is for creating tokens directly. You usually don't need to do this."
 msgstr ""
 
 #: templates/account/api/index.html:78
 
 #: templates/account/api/token.html:5
 msgid "token"
-msgstr ""
+msgstr "testimoni"
 
 #: templates/account/api/token.html:11
 msgid "Token settings"
 
 #: templates/account/api/token.html:22
 msgid "Token"
-msgstr ""
+msgstr "Testimoni"
 
 #: templates/account/api/token.html:25
 msgid "Secret"
-msgstr ""
+msgstr "Secret"
 
 #: templates/account/api/token.html:28
 msgid "Callback"
-msgstr ""
+msgstr "Crida de retorn"
 
 #: templates/account/api/token.html:31
 msgid "Verifier"
 msgstr ""
 
-#: templates/auth/baseerror.html:5 templates/auth/baseerror.html.py:11
-#: templates/help/collision.html:29 templates/wiki/collision.html:33
+#: templates/auth/baseerror.html:5
+#: templates/auth/baseerror.html.py:11
+#: templates/help/collision.html:29
+#: templates/wiki/collision.html:33
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #: templates/auth/baseerror.html:15
 msgid "A generic error has occurred."
 msgid "Backout"
 msgstr ""
 
-#: templates/help/collision.html:9 templates/help/edit.html:5
-#: templates/help/preview.html:20 templates/wiki/collision.html:9
-#: templates/wiki/edit.html:5 templates/wiki/history.html:9
-#: templates/wiki/page.html:15 templates/wiki/preview.html:22
+#: templates/help/collision.html:9
+#: templates/help/edit.html:5
+#: templates/help/preview.html:20
+#: templates/wiki/collision.html:9
+#: templates/wiki/edit.html:5
+#: templates/wiki/history.html:9
+#: templates/wiki/page.html:15
+#: templates/wiki/preview.html:22
 msgid "wiki"
-msgstr ""
-
-#: templates/help/collision.html:9 templates/wiki/collision.html:9
+msgstr "wiki"
+
+#: templates/help/collision.html:9
+#: templates/wiki/collision.html:9
 msgid "error"
-msgstr ""
-
-#: templates/help/collision.html:22 templates/wiki/collision.html:26
+msgstr "error"
+
+#: templates/help/collision.html:22
+#: templates/wiki/collision.html:26
 msgid "Collision detected"
 msgstr ""
 
-#: templates/help/collision.html:25 templates/wiki/collision.html:29
-msgid ""
-"Oops, it seems that someone else has edited the page you were editing while "
-"you were making your changes. This is most unfortunate, but we ended up not "
-"being able to merge your changes."
-msgstr ""
-
-#: templates/help/collision.html:33 templates/wiki/collision.html:37
+#: templates/help/collision.html:25
+#: templates/wiki/collision.html:29
+msgid "Oops, it seems that someone else has edited the page you were editing while you were making your changes. This is most unfortunate, but we ended up not being able to merge your changes."
+msgstr ""
+
+#: templates/help/collision.html:33
+#: templates/wiki/collision.html:37
 msgid "You can go back and refresh the page to try again."
 msgstr ""
 
 #: templates/help/history.html:9